diff options
author | FengLiang <feng.liang1@zte.com.cn> | 2017-02-21 15:38:26 +0800 |
---|---|---|
committer | FengLiang <feng.liang1@zte.com.cn> | 2017-02-21 15:38:26 +0800 |
commit | 8da3962249701031b715edf9003e4120aea46799 (patch) | |
tree | a34970538c1967ce0a1a9d0f908275199147af5a /engine-d/src/main/java/org | |
parent | 350402a45fbf6f2beda430a2bad9f2f253c32685 (diff) |
Modify package name
Change-Id: I1341290d6e5375967ec12b5cd578c3cab684cd78
Issue-ID:HOLMES-19
Signed-off-by: FengLiang <feng.liang1@zte.com.cn>
Diffstat (limited to 'engine-d/src/main/java/org')
-rw-r--r-- | engine-d/src/main/java/org/openo/holmes/engine/EngineDActiveApp.java (renamed from engine-d/src/main/java/org/openo/holmes/enginemgt/EngineActiveApp.java) | 6 | ||||
-rw-r--r-- | engine-d/src/main/java/org/openo/holmes/engine/EngineDAppConfig.java (renamed from engine-d/src/main/java/org/openo/holmes/enginemgt/EngineAppConfig.java) | 5 | ||||
-rw-r--r-- | engine-d/src/main/java/org/openo/holmes/engine/db/CorrelationRuleDao.java (renamed from engine-d/src/main/java/org/openo/holmes/enginemgt/db/CorrelationRuleDao.java) | 4 | ||||
-rw-r--r-- | engine-d/src/main/java/org/openo/holmes/engine/db/mapper/CorrelationRuleMapper.java (renamed from engine-d/src/main/java/org/openo/holmes/enginemgt/db/mapper/CorrelationRuleMapper.java) | 2 | ||||
-rw-r--r-- | engine-d/src/main/java/org/openo/holmes/engine/manager/DroolsEngine.java (renamed from engine-d/src/main/java/org/openo/holmes/enginemgt/manager/DroolsEngine.java) | 7 | ||||
-rw-r--r-- | engine-d/src/main/java/org/openo/holmes/engine/request/CompileRuleRequest.java (renamed from engine-d/src/main/java/org/openo/holmes/enginemgt/request/CompileRuleRequest.java) | 2 | ||||
-rw-r--r-- | engine-d/src/main/java/org/openo/holmes/engine/request/DeployRuleRequest.java (renamed from engine-d/src/main/java/org/openo/holmes/enginemgt/request/DeployRuleRequest.java) | 2 | ||||
-rw-r--r-- | engine-d/src/main/java/org/openo/holmes/engine/resources/EngineResources.java (renamed from engine-d/src/main/java/org/openo/holmes/enginemgt/resources/EngineResources.java) | 13 | ||||
-rw-r--r-- | engine-d/src/main/java/org/openo/holmes/engine/response/CorrelationRuleResponse.java (renamed from engine-d/src/main/java/org/openo/holmes/enginemgt/response/CorrelationRuleResponse.java) | 2 | ||||
-rw-r--r-- | engine-d/src/main/java/org/openo/holmes/engine/utils/AlarmUtil.java (renamed from engine-d/src/main/java/org/openo/holmes/enginemgt/utils/AlarmUtil.java) | 2 | ||||
-rw-r--r-- | engine-d/src/main/java/org/openo/holmes/engine/wrapper/RuleMgtWrapper.java (renamed from engine-d/src/main/java/org/openo/holmes/enginemgt/wrapper/RuleMgtWrapper.java) | 4 |
11 files changed, 22 insertions, 27 deletions
diff --git a/engine-d/src/main/java/org/openo/holmes/enginemgt/EngineActiveApp.java b/engine-d/src/main/java/org/openo/holmes/engine/EngineDActiveApp.java index ddaed97..24bff21 100644 --- a/engine-d/src/main/java/org/openo/holmes/enginemgt/EngineActiveApp.java +++ b/engine-d/src/main/java/org/openo/holmes/engine/EngineDActiveApp.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.holmes.enginemgt; +package org.openo.holmes.engine; import org.openo.dropwizard.ioc.bundle.IOCApplication; -public class EngineActiveApp extends IOCApplication<EngineAppConfig> { +public class EngineDActiveApp extends IOCApplication<EngineDAppConfig> { public static void main(String[] args) throws Exception { - new EngineActiveApp().run(args); + new EngineDActiveApp().run(args); } } diff --git a/engine-d/src/main/java/org/openo/holmes/enginemgt/EngineAppConfig.java b/engine-d/src/main/java/org/openo/holmes/engine/EngineDAppConfig.java index b01d173..8b20ac1 100644 --- a/engine-d/src/main/java/org/openo/holmes/enginemgt/EngineAppConfig.java +++ b/engine-d/src/main/java/org/openo/holmes/engine/EngineDAppConfig.java @@ -13,18 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.holmes.enginemgt; +package org.openo.holmes.engine; import com.fasterxml.jackson.annotation.JsonProperty; import io.dropwizard.Configuration; import io.dropwizard.db.DataSourceFactory; import javax.validation.Valid; import javax.validation.constraints.NotNull; -import lombok.Getter; import org.hibernate.validator.constraints.NotEmpty; import org.openo.holmes.common.config.MQConfig; -public class EngineAppConfig extends Configuration { +public class EngineDAppConfig extends Configuration { @NotEmpty private String defaultName = "Correlation-Rule"; diff --git a/engine-d/src/main/java/org/openo/holmes/enginemgt/db/CorrelationRuleDao.java b/engine-d/src/main/java/org/openo/holmes/engine/db/CorrelationRuleDao.java index 2393417..4370054 100644 --- a/engine-d/src/main/java/org/openo/holmes/enginemgt/db/CorrelationRuleDao.java +++ b/engine-d/src/main/java/org/openo/holmes/engine/db/CorrelationRuleDao.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.holmes.enginemgt.db; +package org.openo.holmes.engine.db; import java.util.List; import org.openo.holmes.common.api.entity.CorrelationRule; -import org.openo.holmes.enginemgt.db.mapper.CorrelationRuleMapper; +import org.openo.holmes.engine.db.mapper.CorrelationRuleMapper; import org.skife.jdbi.v2.sqlobject.Bind; import org.skife.jdbi.v2.sqlobject.SqlQuery; import org.skife.jdbi.v2.sqlobject.customizers.RegisterMapper; diff --git a/engine-d/src/main/java/org/openo/holmes/enginemgt/db/mapper/CorrelationRuleMapper.java b/engine-d/src/main/java/org/openo/holmes/engine/db/mapper/CorrelationRuleMapper.java index 7d9ed97..4af2980 100644 --- a/engine-d/src/main/java/org/openo/holmes/enginemgt/db/mapper/CorrelationRuleMapper.java +++ b/engine-d/src/main/java/org/openo/holmes/engine/db/mapper/CorrelationRuleMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.holmes.enginemgt.db.mapper; +package org.openo.holmes.engine.db.mapper; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/engine-d/src/main/java/org/openo/holmes/enginemgt/manager/DroolsEngine.java b/engine-d/src/main/java/org/openo/holmes/engine/manager/DroolsEngine.java index ae2ba11..473b929 100644 --- a/engine-d/src/main/java/org/openo/holmes/enginemgt/manager/DroolsEngine.java +++ b/engine-d/src/main/java/org/openo/holmes/engine/manager/DroolsEngine.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.holmes.enginemgt.manager; +package org.openo.holmes.engine.manager; import java.io.StringReader; @@ -21,7 +21,6 @@ import java.util.List; import java.util.Locale; import javax.annotation.PostConstruct; import javax.inject.Inject; -import javax.inject.Singleton; import javax.jms.Connection; import javax.jms.ConnectionFactory; import javax.jms.Destination; @@ -55,8 +54,8 @@ import org.openo.holmes.common.exception.EngineException; import org.openo.holmes.common.exception.RuleIllegalityException; import org.openo.holmes.common.utils.ExceptionUtil; import org.openo.holmes.common.utils.I18nProxy; -import org.openo.holmes.enginemgt.request.DeployRuleRequest; -import org.openo.holmes.enginemgt.wrapper.RuleMgtWrapper; +import org.openo.holmes.engine.request.DeployRuleRequest; +import org.openo.holmes.engine.wrapper.RuleMgtWrapper; @Slf4j @Service diff --git a/engine-d/src/main/java/org/openo/holmes/enginemgt/request/CompileRuleRequest.java b/engine-d/src/main/java/org/openo/holmes/engine/request/CompileRuleRequest.java index bf056be..692deb5 100644 --- a/engine-d/src/main/java/org/openo/holmes/enginemgt/request/CompileRuleRequest.java +++ b/engine-d/src/main/java/org/openo/holmes/engine/request/CompileRuleRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.holmes.enginemgt.request; +package org.openo.holmes.engine.request; import com.fasterxml.jackson.annotation.JsonProperty; import javax.validation.constraints.NotNull; diff --git a/engine-d/src/main/java/org/openo/holmes/enginemgt/request/DeployRuleRequest.java b/engine-d/src/main/java/org/openo/holmes/engine/request/DeployRuleRequest.java index b1d9346..979c5bf 100644 --- a/engine-d/src/main/java/org/openo/holmes/enginemgt/request/DeployRuleRequest.java +++ b/engine-d/src/main/java/org/openo/holmes/engine/request/DeployRuleRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.holmes.enginemgt.request; +package org.openo.holmes.engine.request; import com.fasterxml.jackson.annotation.JsonProperty; import javax.validation.constraints.NotNull; diff --git a/engine-d/src/main/java/org/openo/holmes/enginemgt/resources/EngineResources.java b/engine-d/src/main/java/org/openo/holmes/engine/resources/EngineResources.java index 054ce52..94fc040 100644 --- a/engine-d/src/main/java/org/openo/holmes/enginemgt/resources/EngineResources.java +++ b/engine-d/src/main/java/org/openo/holmes/engine/resources/EngineResources.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.holmes.enginemgt.resources; +package org.openo.holmes.engine.resources; import com.codahale.metrics.annotation.Timed; @@ -33,15 +33,12 @@ import javax.ws.rs.core.MediaType; import lombok.extern.slf4j.Slf4j; import org.jvnet.hk2.annotations.Service; import org.openo.holmes.common.exception.CorrelationException; -import org.openo.holmes.common.exception.EngineException; -import org.openo.holmes.common.exception.RuleIllegalityException; import org.openo.holmes.common.utils.ExceptionUtil; -import org.openo.holmes.common.utils.I18nProxy; import org.openo.holmes.common.utils.LanguageUtil; -import org.openo.holmes.enginemgt.manager.DroolsEngine; -import org.openo.holmes.enginemgt.request.CompileRuleRequest; -import org.openo.holmes.enginemgt.request.DeployRuleRequest; -import org.openo.holmes.enginemgt.response.CorrelationRuleResponse; +import org.openo.holmes.engine.manager.DroolsEngine; +import org.openo.holmes.engine.request.CompileRuleRequest; +import org.openo.holmes.engine.request.DeployRuleRequest; +import org.openo.holmes.engine.response.CorrelationRuleResponse; @Service @Path("/rule") diff --git a/engine-d/src/main/java/org/openo/holmes/enginemgt/response/CorrelationRuleResponse.java b/engine-d/src/main/java/org/openo/holmes/engine/response/CorrelationRuleResponse.java index 6c9842c..f033a1b 100644 --- a/engine-d/src/main/java/org/openo/holmes/enginemgt/response/CorrelationRuleResponse.java +++ b/engine-d/src/main/java/org/openo/holmes/engine/response/CorrelationRuleResponse.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.holmes.enginemgt.response; +package org.openo.holmes.engine.response; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; diff --git a/engine-d/src/main/java/org/openo/holmes/enginemgt/utils/AlarmUtil.java b/engine-d/src/main/java/org/openo/holmes/engine/utils/AlarmUtil.java index 2d5b5ca..558d97b 100644 --- a/engine-d/src/main/java/org/openo/holmes/enginemgt/utils/AlarmUtil.java +++ b/engine-d/src/main/java/org/openo/holmes/engine/utils/AlarmUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.holmes.enginemgt.utils; +package org.openo.holmes.engine.utils; import java.util.HashMap; import java.util.Map; diff --git a/engine-d/src/main/java/org/openo/holmes/enginemgt/wrapper/RuleMgtWrapper.java b/engine-d/src/main/java/org/openo/holmes/engine/wrapper/RuleMgtWrapper.java index 35890ca..34dab1f 100644 --- a/engine-d/src/main/java/org/openo/holmes/enginemgt/wrapper/RuleMgtWrapper.java +++ b/engine-d/src/main/java/org/openo/holmes/engine/wrapper/RuleMgtWrapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.holmes.enginemgt.wrapper; +package org.openo.holmes.engine.wrapper; import java.util.List; import javax.inject.Inject; @@ -24,7 +24,7 @@ import org.openo.holmes.common.api.entity.CorrelationRule; import org.openo.holmes.common.exception.DbException; import org.openo.holmes.common.utils.DbDaoUtil; import org.openo.holmes.common.utils.I18nProxy; -import org.openo.holmes.enginemgt.db.CorrelationRuleDao; +import org.openo.holmes.engine.db.CorrelationRuleDao; @Service |