From 7ab5d3b5150f3941f61f40bc27c94909bcbdfe7d Mon Sep 17 00:00:00 2001 From: Guangrong Fu Date: Mon, 7 Aug 2017 12:36:54 +0800 Subject: [PATCH] Change the groupid from openo to onap Change the groupid and package paths to onap. Change-Id: Ie2f9926d418fbb434509a0d740efa95148ab58de Issue-ID: HOLMES-8 Signed-off-by: Guangrong Fu --- engine-d-standalone/pom.xml | 10 ++--- .../src/main/assembly/bin/initDB.bat | 2 +- .../src/main/assembly/bin/initDB.sh | 2 +- engine-d-standalone/src/main/assembly/bin/run.bat | 2 +- engine-d-standalone/src/main/assembly/bin/run.sh | 2 +- engine-d-standalone/src/main/assembly/bin/stop.bat | 2 +- engine-d-standalone/src/main/assembly/bin/stop.sh | 2 +- .../src/main/assembly/conf/engine-d.yml | 2 +- engine-d/pom.xml | 12 ++---- .../holmes/engine/EngineDActiveApp.java | 12 +++--- .../holmes/engine/EngineDAppConfig.java | 4 +- .../holmes/engine/db/CorrelationRuleDao.java | 6 +-- .../engine/db/mapper/CorrelationRuleMapper.java | 4 +- .../holmes/engine/manager/DroolsEngine.java | 48 ++++++++-------------- .../holmes/engine/request/CompileRuleRequest.java | 2 +- .../holmes/engine/request/DeployRuleRequest.java | 2 +- .../holmes/engine/resources/EngineResources.java | 16 ++++---- .../engine/response/CorrelationRuleResponse.java | 2 +- .../holmes/engine/utils/AlarmUtil.java | 6 +-- .../holmes/engine/wrapper/RuleMgtWrapper.java | 11 +++-- .../holmes/engine/EngineDActiveAppTest.java | 2 +- .../holmes/engine/EnginedAppConfigTest.java | 4 +- .../holmes/engine/db/CorrelationRuleDaoTest.java | 4 +- .../db/mapper/CorrelationRuleMapperTest.java | 2 +- .../holmes/engine/manager/DroolsEngineTest.java | 16 ++++---- .../engine/request/CompileRuleRequestTest.java | 2 +- .../engine/request/DeployRuleRequestTest.java | 2 +- .../engine/resources/EngineResourcesTest.java | 10 ++--- .../response/CorrelationRuleResponseTest.java | 3 +- .../holmes/engine/utils/AlarmUtilTest.java | 6 +-- .../holmes/engine/wrapper/RuleMgtWrapperTest.java | 10 ++--- pom.xml | 26 ++++-------- 32 files changed, 101 insertions(+), 135 deletions(-) rename engine-d/src/main/java/org/{openo => onap}/holmes/engine/EngineDActiveApp.java (83%) rename engine-d/src/main/java/org/{openo => onap}/holmes/engine/EngineDAppConfig.java (95%) rename engine-d/src/main/java/org/{openo => onap}/holmes/engine/db/CorrelationRuleDao.java (87%) rename engine-d/src/main/java/org/{openo => onap}/holmes/engine/db/mapper/CorrelationRuleMapper.java (95%) rename engine-d/src/main/java/org/{openo => onap}/holmes/engine/manager/DroolsEngine.java (80%) rename engine-d/src/main/java/org/{openo => onap}/holmes/engine/request/CompileRuleRequest.java (95%) rename engine-d/src/main/java/org/{openo => onap}/holmes/engine/request/DeployRuleRequest.java (95%) rename engine-d/src/main/java/org/{openo => onap}/holmes/engine/resources/EngineResources.java (88%) rename engine-d/src/main/java/org/{openo => onap}/holmes/engine/response/CorrelationRuleResponse.java (95%) rename engine-d/src/main/java/org/{openo => onap}/holmes/engine/utils/AlarmUtil.java (96%) rename engine-d/src/main/java/org/{openo => onap}/holmes/engine/wrapper/RuleMgtWrapper.java (78%) rename engine-d/src/test/java/org/{openo => onap}/holmes/engine/EngineDActiveAppTest.java (93%) rename engine-d/src/test/java/org/{openo => onap}/holmes/engine/EnginedAppConfigTest.java (93%) rename engine-d/src/test/java/org/{openo => onap}/holmes/engine/db/CorrelationRuleDaoTest.java (91%) rename engine-d/src/test/java/org/{openo => onap}/holmes/engine/db/mapper/CorrelationRuleMapperTest.java (95%) rename engine-d/src/test/java/org/{openo => onap}/holmes/engine/manager/DroolsEngineTest.java (93%) rename engine-d/src/test/java/org/{openo => onap}/holmes/engine/request/CompileRuleRequestTest.java (93%) rename engine-d/src/test/java/org/{openo => onap}/holmes/engine/request/DeployRuleRequestTest.java (94%) rename engine-d/src/test/java/org/{openo => onap}/holmes/engine/resources/EngineResourcesTest.java (92%) rename engine-d/src/test/java/org/{openo => onap}/holmes/engine/response/CorrelationRuleResponseTest.java (88%) rename engine-d/src/test/java/org/{openo => onap}/holmes/engine/utils/AlarmUtilTest.java (94%) rename engine-d/src/test/java/org/{openo => onap}/holmes/engine/wrapper/RuleMgtWrapperTest.java (85%) diff --git a/engine-d-standalone/pom.xml b/engine-d-standalone/pom.xml index dc573d1..bb72317 100644 --- a/engine-d-standalone/pom.xml +++ b/engine-d-standalone/pom.xml @@ -20,9 +20,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.openo.holmes.engine-management + org.onap.holmes.engine-management holmes-engine-parent - 1.1.0-SNAPSHOT + 1.0.0-SNAPSHOT holmes-engine-d-standalone @@ -96,7 +96,7 @@ - org.openo.holmes.engine-management + org.onap.holmes.engine-management holmes-engine-d jar true @@ -115,7 +115,7 @@ - org.openo.holmes.engine-management + org.onap.holmes.engine-management holmes-engine-d jar true @@ -166,7 +166,7 @@ - org.openo.holmes.engine-management + org.onap.holmes.engine-management holmes-engine-d ${project.version} diff --git a/engine-d-standalone/src/main/assembly/bin/initDB.bat b/engine-d-standalone/src/main/assembly/bin/initDB.bat index 29a795c..84b2e54 100644 --- a/engine-d-standalone/src/main/assembly/bin/initDB.bat +++ b/engine-d-standalone/src/main/assembly/bin/initDB.bat @@ -24,7 +24,7 @@ echo start init holmes engine-d db echo HOME=%HOME% set main_path=%HOME%..\ cd /d %main_path% -mysql -u%user% -p%password% -P%port% -h%host% < %main_path%\dbscripts\mysql\openo-holmes_engine_d-createobj.sql +mysql -u%user% -p%password% -P%port% -h%host% < %main_path%\dbscripts\mysql\onap-holmes_engine_d-createobj.sql set "err=%errorlevel%" if "%err%"=="0" ( echo init engine-d db success diff --git a/engine-d-standalone/src/main/assembly/bin/initDB.sh b/engine-d-standalone/src/main/assembly/bin/initDB.sh index a02391b..97361ea 100644 --- a/engine-d-standalone/src/main/assembly/bin/initDB.sh +++ b/engine-d-standalone/src/main/assembly/bin/initDB.sh @@ -24,7 +24,7 @@ host=$4 echo "start init holmes engine-d db" main_path=$HOME/../ cat $main_path -mysql -u$user -p$password -P$port -h$host <$main_path/dbscripts/mysql/openo-holmes_engine_d-createobj.sql +mysql -u$user -p$password -P$port -h$host <$main_path/dbscripts/mysql/onap-holmes_engine_d-createobj.sql sql_result=$? if [ $sql_result != 0 ] ; then echo "failed to init engine-d database!" diff --git a/engine-d-standalone/src/main/assembly/bin/run.bat b/engine-d-standalone/src/main/assembly/bin/run.bat index 89151e8..e61f25a 100644 --- a/engine-d-standalone/src/main/assembly/bin/run.bat +++ b/engine-d-standalone/src/main/assembly/bin/run.bat @@ -30,7 +30,7 @@ set class_path=%main_path%;%main_path%holmes-engine-d.jar echo ### jvm_opts: %jvm_opts% echo ### class_path: %class_path% -%JAVA% -classpath %class_path% %jvm_opts% org.openo.holmes.engine.EngineDActiveApp server %main_path%conf/engine-d.yml +%JAVA% -classpath %class_path% %jvm_opts% EngineDActiveApp server %main_path%conf/engine-d.yml IF ERRORLEVEL 1 goto showerror exit diff --git a/engine-d-standalone/src/main/assembly/bin/run.sh b/engine-d-standalone/src/main/assembly/bin/run.sh index 4a93b50..a403aeb 100644 --- a/engine-d-standalone/src/main/assembly/bin/run.sh +++ b/engine-d-standalone/src/main/assembly/bin/run.sh @@ -31,5 +31,5 @@ echo @JAVA_OPTS@ $JAVA_OPTS class_path="$main_path/:$main_path/holmes-engine-d.jar" echo @class_path@ $class_path -"$JAVA" $JAVA_OPTS -classpath "$class_path" org.openo.holmes.engine.EngineDActiveApp server "$main_path/conf/engine-d.yml" +"$JAVA" $JAVA_OPTS -classpath "$class_path" EngineDActiveApp server "$main_path/conf/engine-d.yml" diff --git a/engine-d-standalone/src/main/assembly/bin/stop.bat b/engine-d-standalone/src/main/assembly/bin/stop.bat index 22280e7..f4ed01b 100644 --- a/engine-d-standalone/src/main/assembly/bin/stop.bat +++ b/engine-d-standalone/src/main/assembly/bin/stop.bat @@ -18,7 +18,7 @@ title stopping engine-d-service set HOME=%~dp0 -set Main_Class="org.openo.holmes.engine.EngineDActiveApp" +set Main_Class="EngineDActiveApp" echo ================== engine-d-service info ============================================= echo HOME=$HOME diff --git a/engine-d-standalone/src/main/assembly/bin/stop.sh b/engine-d-standalone/src/main/assembly/bin/stop.sh index 8f81bda..5c217f1 100644 --- a/engine-d-standalone/src/main/assembly/bin/stop.sh +++ b/engine-d-standalone/src/main/assembly/bin/stop.sh @@ -17,7 +17,7 @@ DIRNAME=`dirname $0` HOME=`cd $DIRNAME/; pwd` -Main_Class="org.openo.holmes.engine.EngineDActiveApp" +Main_Class="EngineDActiveApp" echo ================== engine-d-service info ============================================= echo HOME=$HOME diff --git a/engine-d-standalone/src/main/assembly/conf/engine-d.yml b/engine-d-standalone/src/main/assembly/conf/engine-d.yml index c16bf71..de129c4 100644 --- a/engine-d-standalone/src/main/assembly/conf/engine-d.yml +++ b/engine-d-standalone/src/main/assembly/conf/engine-d.yml @@ -15,7 +15,7 @@ # server: type: simple - rootPath: '/openoapi/holmes-engine-mgmt/v1/*' + rootPath: '/onapapi/holmes-engine-mgmt/v1/*' applicationContextPath: / adminContextPath: /admin connector: diff --git a/engine-d/pom.xml b/engine-d/pom.xml index b47bf62..c5aa87d 100644 --- a/engine-d/pom.xml +++ b/engine-d/pom.xml @@ -20,9 +20,9 @@ 4.0.0 - org.openo.holmes.engine-management + org.onap.holmes.engine-management holmes-engine-parent - 1.1.0-SNAPSHOT + 1.0.0-SNAPSHOT holmes-engine-d @@ -36,7 +36,7 @@ - org.openo.holmes.actions + org.onap.holmes.common holmes-actions @@ -120,10 +120,6 @@ org.slf4j slf4j-api - - org.openo.client.cli - swagger-sdk - io.swagger swagger-jersey2-jaxrs @@ -196,7 +192,7 @@ implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> - org.openo.holmes.engine.EngineDActiveApp + org.onap.holmes.engine.EngineDActiveApp diff --git a/engine-d/src/main/java/org/openo/holmes/engine/EngineDActiveApp.java b/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java similarity index 83% rename from engine-d/src/main/java/org/openo/holmes/engine/EngineDActiveApp.java rename to engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java index 3169f1b..ef671e3 100644 --- a/engine-d/src/main/java/org/openo/holmes/engine/EngineDActiveApp.java +++ b/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.holmes.engine; +package org.onap.holmes.engine; import io.dropwizard.setup.Environment; import java.io.IOException; import lombok.extern.slf4j.Slf4j; -import org.openo.dropwizard.ioc.bundle.IOCApplication; -import org.openo.holmes.common.api.entity.ServiceRegisterEntity; -import org.openo.holmes.common.config.MicroServiceConfig; -import org.openo.holmes.common.utils.MSBRegisterUtil; +import org.onap.holmes.common.dropwizard.ioc.bundle.IOCApplication; +import org.onap.holmes.common.api.entity.ServiceRegisterEntity; +import org.onap.holmes.common.config.MicroServiceConfig; +import org.onap.holmes.common.utils.MSBRegisterUtil; @Slf4j public class EngineDActiveApp extends IOCApplication { @@ -46,7 +46,7 @@ public class EngineDActiveApp extends IOCApplication { serviceRegisterEntity.setServiceName("holmes-engine-mgmt"); serviceRegisterEntity.setProtocol("REST"); serviceRegisterEntity.setVersion("v1"); - serviceRegisterEntity.setUrl("/openoapi/holmes-engine-mgmt/v1"); + serviceRegisterEntity.setUrl("/onapapi/holmes-engine-mgmt/v1"); serviceRegisterEntity.setSingleNode(MicroServiceConfig.getServiceIp(), "9102", 0); serviceRegisterEntity.setVisualRange("1|0"); return serviceRegisterEntity; diff --git a/engine-d/src/main/java/org/openo/holmes/engine/EngineDAppConfig.java b/engine-d/src/main/java/org/onap/holmes/engine/EngineDAppConfig.java similarity index 95% rename from engine-d/src/main/java/org/openo/holmes/engine/EngineDAppConfig.java rename to engine-d/src/main/java/org/onap/holmes/engine/EngineDAppConfig.java index 66944a1..c42e9d9 100644 --- a/engine-d/src/main/java/org/openo/holmes/engine/EngineDAppConfig.java +++ b/engine-d/src/main/java/org/onap/holmes/engine/EngineDAppConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.holmes.engine; +package org.onap.holmes.engine; import com.fasterxml.jackson.annotation.JsonProperty; import io.dropwizard.Configuration; @@ -22,7 +22,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; import org.hibernate.validator.constraints.NotEmpty; import org.jvnet.hk2.annotations.Service; -import org.openo.holmes.common.config.MQConfig; +import org.onap.holmes.common.config.MQConfig; @Service public class EngineDAppConfig extends Configuration { diff --git a/engine-d/src/main/java/org/openo/holmes/engine/db/CorrelationRuleDao.java b/engine-d/src/main/java/org/onap/holmes/engine/db/CorrelationRuleDao.java similarity index 87% rename from engine-d/src/main/java/org/openo/holmes/engine/db/CorrelationRuleDao.java rename to engine-d/src/main/java/org/onap/holmes/engine/db/CorrelationRuleDao.java index 4370054..4e01778 100644 --- a/engine-d/src/main/java/org/openo/holmes/engine/db/CorrelationRuleDao.java +++ b/engine-d/src/main/java/org/onap/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.engine.db; +package org.onap.holmes.engine.db; import java.util.List; -import org.openo.holmes.common.api.entity.CorrelationRule; -import org.openo.holmes.engine.db.mapper.CorrelationRuleMapper; +import org.onap.holmes.engine.db.mapper.CorrelationRuleMapper; +import org.onap.holmes.common.api.entity.CorrelationRule; 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/engine/db/mapper/CorrelationRuleMapper.java b/engine-d/src/main/java/org/onap/holmes/engine/db/mapper/CorrelationRuleMapper.java similarity index 95% rename from engine-d/src/main/java/org/openo/holmes/engine/db/mapper/CorrelationRuleMapper.java rename to engine-d/src/main/java/org/onap/holmes/engine/db/mapper/CorrelationRuleMapper.java index 9c46b58..a682824 100644 --- a/engine-d/src/main/java/org/openo/holmes/engine/db/mapper/CorrelationRuleMapper.java +++ b/engine-d/src/main/java/org/onap/holmes/engine/db/mapper/CorrelationRuleMapper.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.holmes.engine.db.mapper; +package org.onap.holmes.engine.db.mapper; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Properties; -import org.openo.holmes.common.api.entity.CorrelationRule; +import org.onap.holmes.common.api.entity.CorrelationRule; import org.skife.jdbi.v2.StatementContext; import org.skife.jdbi.v2.tweak.ResultSetMapper; diff --git a/engine-d/src/main/java/org/openo/holmes/engine/manager/DroolsEngine.java b/engine-d/src/main/java/org/onap/holmes/engine/manager/DroolsEngine.java similarity index 80% rename from engine-d/src/main/java/org/openo/holmes/engine/manager/DroolsEngine.java rename to engine-d/src/main/java/org/onap/holmes/engine/manager/DroolsEngine.java index f8d9626..c8835cc 100644 --- a/engine-d/src/main/java/org/openo/holmes/engine/manager/DroolsEngine.java +++ b/engine-d/src/main/java/org/onap/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.engine.manager; +package org.onap.holmes.engine.manager; import java.io.Serializable; @@ -49,15 +49,14 @@ import org.drools.runtime.StatefulKnowledgeSession; import org.drools.runtime.rule.FactHandle; import org.glassfish.hk2.api.IterableProvider; import org.jvnet.hk2.annotations.Service; -import org.openo.holmes.common.api.entity.CorrelationRule; -import org.openo.holmes.common.api.stat.Alarm; -import org.openo.holmes.common.config.MQConfig; -import org.openo.holmes.common.constant.AlarmConst; -import org.openo.holmes.common.exception.CorrelationException; -import org.openo.holmes.common.utils.ExceptionUtil; -import org.openo.holmes.common.utils.I18nProxy; -import org.openo.holmes.engine.request.DeployRuleRequest; -import org.openo.holmes.engine.wrapper.RuleMgtWrapper; +import org.onap.holmes.engine.request.DeployRuleRequest; +import org.onap.holmes.common.api.entity.CorrelationRule; +import org.onap.holmes.common.api.stat.Alarm; +import org.onap.holmes.common.config.MQConfig; +import org.onap.holmes.common.constant.AlarmConst; +import org.onap.holmes.common.exception.CorrelationException; +import org.onap.holmes.common.utils.ExceptionUtil; +import org.onap.holmes.engine.wrapper.RuleMgtWrapper; @Slf4j @Service @@ -82,8 +81,8 @@ public class DroolsEngine { // 2. start mq listener registerAlarmTopicListener(); } catch (Exception e) { - log.error("Start service failed: " + e.getMessage(), e); - throw ExceptionUtil.buildExceptionResponse("Start service failed!"); + log.error("Failed to start the service: " + e.getMessage(), e); + throw ExceptionUtil.buildExceptionResponse("Failed to start the drools engine!"); } } @@ -169,10 +168,7 @@ public class DroolsEngine { packageNames.add(packageName); kbase.addKnowledgePackages(kbuilder.getKnowledgePackages()); } catch (Exception e) { - - String errorMsg = - I18nProxy.getInstance().getValue(locale, I18nProxy.ENGINE_DEPLOY_RULE_FAILED); - throw new CorrelationException(errorMsg, e); + throw new CorrelationException("Failed to deploy the rule.", e); } ksession.fireAllRules(); @@ -185,19 +181,13 @@ public class DroolsEngine { KnowledgePackage pkg = kbase.getKnowledgePackage(packageName); if (null == pkg) { - String errorMsg = I18nProxy.getInstance().getValueByArgs(locale, - I18nProxy.ENGINE_DELETE_RULE_NULL, - new String[]{packageName}); - throw new CorrelationException(errorMsg); + throw new CorrelationException("The rule " + packageName + " does not exist!"); } try { - kbase.removeKnowledgePackage(pkg.getName()); } catch (Exception e) { - String errorMsg = I18nProxy.getInstance().getValueByArgs(locale, - I18nProxy.ENGINE_DELETE_RULE_FAILED, new String[]{packageName}); - throw new CorrelationException(errorMsg, e); + throw new CorrelationException("Failed to delete the rule: " + packageName, e); } } @@ -216,9 +206,7 @@ public class DroolsEngine { private void judgeRuleContent(Locale locale, KnowledgeBuilder kbuilder, boolean judgePackageName) throws CorrelationException { if (kbuilder.hasErrors()) { - String errorMsg = I18nProxy.getInstance().getValueByArgs(locale, - I18nProxy.ENGINE_CONTENT_ILLEGALITY, - new String[]{kbuilder.getErrors().toString()}); + String errorMsg = "There are errors in the rule: " + kbuilder.getErrors().toString(); log.error(errorMsg); throw new CorrelationException(errorMsg); } @@ -226,11 +214,7 @@ public class DroolsEngine { String packageName = kbuilder.getKnowledgePackages().iterator().next().getName(); if (packageNames.contains(packageName) && judgePackageName) { - String errorMsg = I18nProxy.getInstance().getValueByArgs(locale, - I18nProxy.ENGINE_CONTENT_ILLEGALITY, new String[]{ - I18nProxy.getInstance().getValue(locale, I18nProxy.ENGINE_CONTAINS_PACKAGE)}); - - throw new CorrelationException(errorMsg); + throw new CorrelationException("The rule " + packageName + " already exists in the drools engine."); } } diff --git a/engine-d/src/main/java/org/openo/holmes/engine/request/CompileRuleRequest.java b/engine-d/src/main/java/org/onap/holmes/engine/request/CompileRuleRequest.java similarity index 95% rename from engine-d/src/main/java/org/openo/holmes/engine/request/CompileRuleRequest.java rename to engine-d/src/main/java/org/onap/holmes/engine/request/CompileRuleRequest.java index 692deb5..6e0da48 100644 --- a/engine-d/src/main/java/org/openo/holmes/engine/request/CompileRuleRequest.java +++ b/engine-d/src/main/java/org/onap/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.engine.request; +package org.onap.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/engine/request/DeployRuleRequest.java b/engine-d/src/main/java/org/onap/holmes/engine/request/DeployRuleRequest.java similarity index 95% rename from engine-d/src/main/java/org/openo/holmes/engine/request/DeployRuleRequest.java rename to engine-d/src/main/java/org/onap/holmes/engine/request/DeployRuleRequest.java index 979c5bf..de9d773 100644 --- a/engine-d/src/main/java/org/openo/holmes/engine/request/DeployRuleRequest.java +++ b/engine-d/src/main/java/org/onap/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.engine.request; +package org.onap.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/engine/resources/EngineResources.java b/engine-d/src/main/java/org/onap/holmes/engine/resources/EngineResources.java similarity index 88% rename from engine-d/src/main/java/org/openo/holmes/engine/resources/EngineResources.java rename to engine-d/src/main/java/org/onap/holmes/engine/resources/EngineResources.java index 5be8eb9..3480dbb 100644 --- a/engine-d/src/main/java/org/openo/holmes/engine/resources/EngineResources.java +++ b/engine-d/src/main/java/org/onap/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.engine.resources; +package org.onap.holmes.engine.resources; import com.codahale.metrics.annotation.Timed; @@ -32,13 +32,13 @@ import javax.ws.rs.core.Context; 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.utils.ExceptionUtil; -import org.openo.holmes.common.utils.LanguageUtil; -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; +import org.onap.holmes.common.exception.CorrelationException; +import org.onap.holmes.common.utils.ExceptionUtil; +import org.onap.holmes.common.utils.LanguageUtil; +import org.onap.holmes.engine.manager.DroolsEngine; +import org.onap.holmes.engine.request.CompileRuleRequest; +import org.onap.holmes.engine.request.DeployRuleRequest; +import org.onap.holmes.engine.response.CorrelationRuleResponse; @Service @Path("/rule") diff --git a/engine-d/src/main/java/org/openo/holmes/engine/response/CorrelationRuleResponse.java b/engine-d/src/main/java/org/onap/holmes/engine/response/CorrelationRuleResponse.java similarity index 95% rename from engine-d/src/main/java/org/openo/holmes/engine/response/CorrelationRuleResponse.java rename to engine-d/src/main/java/org/onap/holmes/engine/response/CorrelationRuleResponse.java index f033a1b..b234f91 100644 --- a/engine-d/src/main/java/org/openo/holmes/engine/response/CorrelationRuleResponse.java +++ b/engine-d/src/main/java/org/onap/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.engine.response; +package org.onap.holmes.engine.response; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; diff --git a/engine-d/src/main/java/org/openo/holmes/engine/utils/AlarmUtil.java b/engine-d/src/main/java/org/onap/holmes/engine/utils/AlarmUtil.java similarity index 96% rename from engine-d/src/main/java/org/openo/holmes/engine/utils/AlarmUtil.java rename to engine-d/src/main/java/org/onap/holmes/engine/utils/AlarmUtil.java index 558d97b..ca93066 100644 --- a/engine-d/src/main/java/org/openo/holmes/engine/utils/AlarmUtil.java +++ b/engine-d/src/main/java/org/onap/holmes/engine/utils/AlarmUtil.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.holmes.engine.utils; +package org.onap.holmes.engine.utils; import java.util.HashMap; import java.util.Map; import org.jvnet.hk2.annotations.Service; -import org.openo.holmes.common.api.stat.Alarm; -import org.openo.holmes.common.producer.MQProducer; +import org.onap.holmes.common.api.stat.Alarm; +import org.onap.holmes.common.producer.MQProducer; @Service public class AlarmUtil { diff --git a/engine-d/src/main/java/org/openo/holmes/engine/wrapper/RuleMgtWrapper.java b/engine-d/src/main/java/org/onap/holmes/engine/wrapper/RuleMgtWrapper.java similarity index 78% rename from engine-d/src/main/java/org/openo/holmes/engine/wrapper/RuleMgtWrapper.java rename to engine-d/src/main/java/org/onap/holmes/engine/wrapper/RuleMgtWrapper.java index 5a9ce8f..1fbbfe7 100644 --- a/engine-d/src/main/java/org/openo/holmes/engine/wrapper/RuleMgtWrapper.java +++ b/engine-d/src/main/java/org/onap/holmes/engine/wrapper/RuleMgtWrapper.java @@ -13,18 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.holmes.engine.wrapper; +package org.onap.holmes.engine.wrapper; import java.util.List; import javax.inject.Inject; import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import org.jvnet.hk2.annotations.Service; -import org.openo.holmes.common.api.entity.CorrelationRule; -import org.openo.holmes.common.exception.CorrelationException; -import org.openo.holmes.common.utils.DbDaoUtil; -import org.openo.holmes.common.utils.I18nProxy; -import org.openo.holmes.engine.db.CorrelationRuleDao; +import org.onap.holmes.engine.db.CorrelationRuleDao; +import org.onap.holmes.common.api.entity.CorrelationRule; +import org.onap.holmes.common.exception.CorrelationException; +import org.onap.holmes.common.utils.DbDaoUtil; @Service diff --git a/engine-d/src/test/java/org/openo/holmes/engine/EngineDActiveAppTest.java b/engine-d/src/test/java/org/onap/holmes/engine/EngineDActiveAppTest.java similarity index 93% rename from engine-d/src/test/java/org/openo/holmes/engine/EngineDActiveAppTest.java rename to engine-d/src/test/java/org/onap/holmes/engine/EngineDActiveAppTest.java index b69f9db..362211b 100644 --- a/engine-d/src/test/java/org/openo/holmes/engine/EngineDActiveAppTest.java +++ b/engine-d/src/test/java/org/onap/holmes/engine/EngineDActiveAppTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.holmes.engine; +package org.onap.holmes.engine; /** * Created by Administrator on 2017/2/20. diff --git a/engine-d/src/test/java/org/openo/holmes/engine/EnginedAppConfigTest.java b/engine-d/src/test/java/org/onap/holmes/engine/EnginedAppConfigTest.java similarity index 93% rename from engine-d/src/test/java/org/openo/holmes/engine/EnginedAppConfigTest.java rename to engine-d/src/test/java/org/onap/holmes/engine/EnginedAppConfigTest.java index b7bcf34..9642474 100644 --- a/engine-d/src/test/java/org/openo/holmes/engine/EnginedAppConfigTest.java +++ b/engine-d/src/test/java/org/onap/holmes/engine/EnginedAppConfigTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.holmes.engine; +package org.onap.holmes.engine; import io.dropwizard.db.DataSourceFactory; import org.hamcrest.core.IsEqual; @@ -22,7 +22,7 @@ import org.hamcrest.core.IsNull; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.openo.holmes.common.config.MQConfig; +import org.onap.holmes.common.config.MQConfig; import org.powermock.api.easymock.PowerMock; public class EnginedAppConfigTest { diff --git a/engine-d/src/test/java/org/openo/holmes/engine/db/CorrelationRuleDaoTest.java b/engine-d/src/test/java/org/onap/holmes/engine/db/CorrelationRuleDaoTest.java similarity index 91% rename from engine-d/src/test/java/org/openo/holmes/engine/db/CorrelationRuleDaoTest.java rename to engine-d/src/test/java/org/onap/holmes/engine/db/CorrelationRuleDaoTest.java index 073f590..128f58a 100644 --- a/engine-d/src/test/java/org/openo/holmes/engine/db/CorrelationRuleDaoTest.java +++ b/engine-d/src/test/java/org/onap/holmes/engine/db/CorrelationRuleDaoTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.openo.holmes.engine.db; +package org.onap.holmes.engine.db; import org.easymock.EasyMock; import org.hamcrest.core.IsNull; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.openo.holmes.common.api.entity.CorrelationRule; +import org.onap.holmes.common.api.entity.CorrelationRule; import org.powermock.api.easymock.PowerMock; import java.util.ArrayList; diff --git a/engine-d/src/test/java/org/openo/holmes/engine/db/mapper/CorrelationRuleMapperTest.java b/engine-d/src/test/java/org/onap/holmes/engine/db/mapper/CorrelationRuleMapperTest.java similarity index 95% rename from engine-d/src/test/java/org/openo/holmes/engine/db/mapper/CorrelationRuleMapperTest.java rename to engine-d/src/test/java/org/onap/holmes/engine/db/mapper/CorrelationRuleMapperTest.java index 6e43f86..acf62c6 100644 --- a/engine-d/src/test/java/org/openo/holmes/engine/db/mapper/CorrelationRuleMapperTest.java +++ b/engine-d/src/test/java/org/onap/holmes/engine/db/mapper/CorrelationRuleMapperTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.holmes.engine.db.mapper; +package org.onap.holmes.engine.db.mapper; import org.junit.Test; import org.powermock.api.easymock.PowerMock; diff --git a/engine-d/src/test/java/org/openo/holmes/engine/manager/DroolsEngineTest.java b/engine-d/src/test/java/org/onap/holmes/engine/manager/DroolsEngineTest.java similarity index 93% rename from engine-d/src/test/java/org/openo/holmes/engine/manager/DroolsEngineTest.java rename to engine-d/src/test/java/org/onap/holmes/engine/manager/DroolsEngineTest.java index 54d9bf5..5487177 100644 --- a/engine-d/src/test/java/org/openo/holmes/engine/manager/DroolsEngineTest.java +++ b/engine-d/src/test/java/org/onap/holmes/engine/manager/DroolsEngineTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.holmes.engine.manager; +package org.onap.holmes.engine.manager; import static org.easymock.EasyMock.anyBoolean; import static org.easymock.EasyMock.anyInt; @@ -44,13 +44,13 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.openo.holmes.common.api.entity.CorrelationRule; -import org.openo.holmes.common.api.stat.Alarm; -import org.openo.holmes.common.config.MQConfig; -import org.openo.holmes.common.constant.AlarmConst; -import org.openo.holmes.common.exception.CorrelationException; -import org.openo.holmes.engine.request.DeployRuleRequest; -import org.openo.holmes.engine.wrapper.RuleMgtWrapper; +import org.onap.holmes.engine.request.DeployRuleRequest; +import org.onap.holmes.common.api.entity.CorrelationRule; +import org.onap.holmes.common.api.stat.Alarm; +import org.onap.holmes.common.config.MQConfig; +import org.onap.holmes.common.constant.AlarmConst; +import org.onap.holmes.common.exception.CorrelationException; +import org.onap.holmes.engine.wrapper.RuleMgtWrapper; import org.powermock.api.easymock.PowerMock; import org.powermock.modules.junit4.rule.PowerMockRule; import org.powermock.reflect.Whitebox; diff --git a/engine-d/src/test/java/org/openo/holmes/engine/request/CompileRuleRequestTest.java b/engine-d/src/test/java/org/onap/holmes/engine/request/CompileRuleRequestTest.java similarity index 93% rename from engine-d/src/test/java/org/openo/holmes/engine/request/CompileRuleRequestTest.java rename to engine-d/src/test/java/org/onap/holmes/engine/request/CompileRuleRequestTest.java index e1baae7..3c938fd 100644 --- a/engine-d/src/test/java/org/openo/holmes/engine/request/CompileRuleRequestTest.java +++ b/engine-d/src/test/java/org/onap/holmes/engine/request/CompileRuleRequestTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.holmes.engine.request; +package org.onap.holmes.engine.request; import org.junit.Test; diff --git a/engine-d/src/test/java/org/openo/holmes/engine/request/DeployRuleRequestTest.java b/engine-d/src/test/java/org/onap/holmes/engine/request/DeployRuleRequestTest.java similarity index 94% rename from engine-d/src/test/java/org/openo/holmes/engine/request/DeployRuleRequestTest.java rename to engine-d/src/test/java/org/onap/holmes/engine/request/DeployRuleRequestTest.java index 1f9b12f..8170668 100644 --- a/engine-d/src/test/java/org/openo/holmes/engine/request/DeployRuleRequestTest.java +++ b/engine-d/src/test/java/org/onap/holmes/engine/request/DeployRuleRequestTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.holmes.engine.request; +package org.onap.holmes.engine.request; import org.junit.Test; diff --git a/engine-d/src/test/java/org/openo/holmes/engine/resources/EngineResourcesTest.java b/engine-d/src/test/java/org/onap/holmes/engine/resources/EngineResourcesTest.java similarity index 92% rename from engine-d/src/test/java/org/openo/holmes/engine/resources/EngineResourcesTest.java rename to engine-d/src/test/java/org/onap/holmes/engine/resources/EngineResourcesTest.java index 51f46a6..3c68182 100644 --- a/engine-d/src/test/java/org/openo/holmes/engine/resources/EngineResourcesTest.java +++ b/engine-d/src/test/java/org/onap/holmes/engine/resources/EngineResourcesTest.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.openo.holmes.engine.resources; +package org.onap.holmes.engine.resources; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.openo.holmes.common.exception.CorrelationException; -import org.openo.holmes.engine.manager.DroolsEngine; -import org.openo.holmes.engine.request.CompileRuleRequest; -import org.openo.holmes.engine.request.DeployRuleRequest; +import org.onap.holmes.common.exception.CorrelationException; +import org.onap.holmes.engine.manager.DroolsEngine; +import org.onap.holmes.engine.request.CompileRuleRequest; +import org.onap.holmes.engine.request.DeployRuleRequest; import org.powermock.api.easymock.PowerMock; import org.powermock.reflect.Whitebox; diff --git a/engine-d/src/test/java/org/openo/holmes/engine/response/CorrelationRuleResponseTest.java b/engine-d/src/test/java/org/onap/holmes/engine/response/CorrelationRuleResponseTest.java similarity index 88% rename from engine-d/src/test/java/org/openo/holmes/engine/response/CorrelationRuleResponseTest.java rename to engine-d/src/test/java/org/onap/holmes/engine/response/CorrelationRuleResponseTest.java index f8899e6..85659f2 100644 --- a/engine-d/src/test/java/org/openo/holmes/engine/response/CorrelationRuleResponseTest.java +++ b/engine-d/src/test/java/org/onap/holmes/engine/response/CorrelationRuleResponseTest.java @@ -14,10 +14,9 @@ * limitations under the License. */ -package org.openo.holmes.engine.response; +package org.onap.holmes.engine.response; import org.junit.Test; -import org.openo.holmes.engine.request.DeployRuleRequest; import static org.hamcrest.core.IsEqual.equalTo; import static org.junit.Assert.assertThat; diff --git a/engine-d/src/test/java/org/openo/holmes/engine/utils/AlarmUtilTest.java b/engine-d/src/test/java/org/onap/holmes/engine/utils/AlarmUtilTest.java similarity index 94% rename from engine-d/src/test/java/org/openo/holmes/engine/utils/AlarmUtilTest.java rename to engine-d/src/test/java/org/onap/holmes/engine/utils/AlarmUtilTest.java index 107d6e9..97330a7 100644 --- a/engine-d/src/test/java/org/openo/holmes/engine/utils/AlarmUtilTest.java +++ b/engine-d/src/test/java/org/onap/holmes/engine/utils/AlarmUtilTest.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.openo.holmes.engine.utils; +package org.onap.holmes.engine.utils; import org.hamcrest.core.IsEqual; import org.hamcrest.core.IsNull; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.openo.holmes.common.api.stat.Alarm; -import org.openo.holmes.common.producer.MQProducer; +import org.onap.holmes.common.api.stat.Alarm; +import org.onap.holmes.common.producer.MQProducer; import org.powermock.api.easymock.PowerMock; import org.powermock.reflect.Whitebox; diff --git a/engine-d/src/test/java/org/openo/holmes/engine/wrapper/RuleMgtWrapperTest.java b/engine-d/src/test/java/org/onap/holmes/engine/wrapper/RuleMgtWrapperTest.java similarity index 85% rename from engine-d/src/test/java/org/openo/holmes/engine/wrapper/RuleMgtWrapperTest.java rename to engine-d/src/test/java/org/onap/holmes/engine/wrapper/RuleMgtWrapperTest.java index fab68df..cd7aff4 100644 --- a/engine-d/src/test/java/org/openo/holmes/engine/wrapper/RuleMgtWrapperTest.java +++ b/engine-d/src/test/java/org/onap/holmes/engine/wrapper/RuleMgtWrapperTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.holmes.engine.wrapper; +package org.onap.holmes.engine.wrapper; import static org.easymock.EasyMock.anyInt; import static org.easymock.EasyMock.anyObject; @@ -25,10 +25,10 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.openo.holmes.common.api.entity.CorrelationRule; -import org.openo.holmes.common.exception.CorrelationException; -import org.openo.holmes.common.utils.DbDaoUtil; -import org.openo.holmes.engine.db.CorrelationRuleDao; +import org.onap.holmes.common.api.entity.CorrelationRule; +import org.onap.holmes.common.exception.CorrelationException; +import org.onap.holmes.common.utils.DbDaoUtil; +import org.onap.holmes.engine.db.CorrelationRuleDao; import org.powermock.api.easymock.PowerMock; import org.powermock.reflect.Whitebox; diff --git a/pom.xml b/pom.xml index 06c8aa4..b3b0e19 100644 --- a/pom.xml +++ b/pom.xml @@ -19,13 +19,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.openo.oparent - oparent - 1.1.0-SNAPSHOT - ../oparent + org.onap.oparent + version + 1.0.0-SNAPSHOT + ../../oparent - org.openo.holmes.engine-management + org.onap.holmes.engine-management holmes-engine-parent pom holmes-engine-parent @@ -56,7 +56,7 @@ 1.6.1 2.2.1 - openo-holmes-engine-d + onap-holmes-engine-d linux64 win64 target/assembly/${linux64id} @@ -71,7 +71,7 @@ 3.0 - org.openo.holmes.actions + org.onap.holmes.common holmes-actions ${project.version} @@ -117,12 +117,6 @@ ${stringtemplate.version} - - org.openo.common-services.common-utilities - dropwizard-ioc-container - ${project.version} - - org.quartz-scheduler quartz @@ -150,12 +144,6 @@ test - - org.openo.client.cli - swagger-sdk - 1.1.0-SNAPSHOT - - org.apache.httpcomponents httpclient -- 2.16.6