[POLICY-72] replace openecomp for drools-pdp 99/5799/4
authorGuo Ruijing <ruijing.guo@intel.com>
Fri, 28 Jul 2017 08:23:01 +0000 (08:23 +0000)
committerGuo Ruijing <ruijing.guo@intel.com>
Fri, 28 Jul 2017 08:23:30 +0000 (08:23 +0000)
Change-Id: I8aa8e32d3ba10f7c655b50e97aaf6865514d4777
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
107 files changed:
README.md
feature-eelf/pom.xml
feature-eelf/src/main/java/org/onap/policy/drools/eelf/EelfFeature.java [moved from feature-eelf/src/main/java/org/openecomp/policy/drools/eelf/EelfFeature.java with 86% similarity]
feature-eelf/src/main/resources/META-INF/services/org.Onap.policy.drools.features.PolicyEngineFeatureAPI [new file with mode: 0644]
feature-eelf/src/main/resources/META-INF/services/org.openecomp.policy.drools.features.PolicyEngineFeatureAPI [deleted file]
feature-eelf/src/test/java/org/onap/policy/drools/eelf/test/EElfTest.java [moved from feature-eelf/src/test/java/org/openecomp/policy/drools/eelf/test/EElfTest.java with 93% similarity]
feature-healthcheck/pom.xml
feature-healthcheck/src/main/feature/config/feature-healthcheck.properties
feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheck.java [moved from feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/HealthCheck.java with 94% similarity]
feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheckFeature.java [moved from feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/HealthCheckFeature.java with 92% similarity]
feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/RestHealthCheck.java [moved from feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/RestHealthCheck.java with 95% similarity]
feature-healthcheck/src/main/resources/META-INF/services/org.Onap.policy.drools.features.PolicyEngineFeatureAPI [new file with mode: 0644]
feature-healthcheck/src/main/resources/META-INF/services/org.openecomp.policy.drools.features.PolicyEngineFeatureAPI [deleted file]
packages/base/pom.xml
packages/install/pom.xml
packages/install/src/files/policy-management.conf
packages/pom.xml
policy-core/pom.xml
policy-core/src/main/java/org/onap/policy/drools/core/PolicyContainer.java [moved from policy-core/src/main/java/org/openecomp/policy/drools/core/PolicyContainer.java with 99% similarity]
policy-core/src/main/java/org/onap/policy/drools/core/PolicySession.java [moved from policy-core/src/main/java/org/openecomp/policy/drools/core/PolicySession.java with 99% similarity]
policy-core/src/main/java/org/onap/policy/drools/core/PolicySessionFeatureAPI.java [moved from policy-core/src/main/java/org/openecomp/policy/drools/core/PolicySessionFeatureAPI.java with 96% similarity]
policy-core/src/main/java/org/onap/policy/drools/core/jmx/PdpJmx.java [moved from policy-core/src/main/java/org/openecomp/policy/drools/core/jmx/PdpJmx.java with 97% similarity]
policy-core/src/main/java/org/onap/policy/drools/core/jmx/PdpJmxListener.java [moved from policy-core/src/main/java/org/openecomp/policy/drools/core/jmx/PdpJmxListener.java with 98% similarity]
policy-core/src/main/java/org/onap/policy/drools/core/jmx/PdpJmxMBean.java [moved from policy-core/src/main/java/org/openecomp/policy/drools/core/jmx/PdpJmxMBean.java with 95% similarity]
policy-core/src/main/java/org/onap/policy/drools/properties/Lockable.java [moved from policy-core/src/main/java/org/openecomp/policy/drools/properties/Lockable.java with 96% similarity]
policy-core/src/main/java/org/onap/policy/drools/properties/PolicyProperties.java [moved from policy-core/src/main/java/org/openecomp/policy/drools/properties/PolicyProperties.java with 99% similarity]
policy-core/src/main/java/org/onap/policy/drools/properties/Startable.java [moved from policy-core/src/main/java/org/openecomp/policy/drools/properties/Startable.java with 97% similarity]
policy-endpoints/pom.xml
policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/Topic.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/Topic.java with 92% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicEndpoint.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicEndpoint.java with 97% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicListener.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicListener.java with 96% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicRegisterable.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicRegisterable.java with 96% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicSink.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicSink.java with 97% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicSource.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicSource.java with 96% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/ApiKeyEnabled.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/ApiKeyEnabled.java with 95% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/BusTopicSink.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/BusTopicSink.java with 93% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/BusTopicSource.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/BusTopicSource.java with 94% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSink.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSink.java with 95% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSinkFactory.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSinkFactory.java with 98% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSource.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSource.java with 95% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSourceFactory.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSourceFactory.java with 99% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/NoopTopicSink.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/NoopTopicSink.java with 94% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/NoopTopicSinkFactory.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/NoopTopicSinkFactory.java with 98% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSink.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSink.java with 96% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSinkFactory.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSinkFactory.java with 98% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSource.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSource.java with 96% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSourceFactory.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSourceFactory.java with 98% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusConsumer.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/BusConsumer.java with 98% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusPublisher.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/BusPublisher.java with 98% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusTopicBase.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/BusTopicBase.java with 95% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/InlineBusTopicSink.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/InlineBusTopicSink.java with 97% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/InlineDmaapTopicSink.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/InlineDmaapTopicSink.java with 96% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/InlineUebTopicSink.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/InlineUebTopicSink.java with 94% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/SingleThreadedBusTopicSource.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/SingleThreadedBusTopicSource.java with 97% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/SingleThreadedDmaapTopicSource.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/SingleThreadedDmaapTopicSource.java with 97% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/SingleThreadedUebTopicSource.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/SingleThreadedUebTopicSource.java with 94% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/TopicBase.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/TopicBase.java with 97% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/http/client/HttpClient.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/http/client/HttpClient.java with 93% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/http/client/HttpClientFactory.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/http/client/HttpClientFactory.java with 97% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/http/client/internal/JerseyClient.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/http/client/internal/JerseyClient.java with 98% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/http/server/HttpServletServer.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/HttpServletServer.java with 96% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/http/server/HttpServletServerFactory.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/HttpServletServerFactory.java with 98% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/http/server/internal/JettyJerseyServer.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/internal/JettyJerseyServer.java with 99% similarity]
policy-endpoints/src/main/java/org/onap/policy/drools/http/server/internal/JettyServletServer.java [moved from policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/internal/JettyServletServer.java with 98% similarity]
policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/HttpClientTest.java [moved from policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/HttpClientTest.java with 97% similarity]
policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/HttpServerTest.java [moved from policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/HttpServerTest.java with 98% similarity]
policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/NoopTopicTest.java [moved from policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/NoopTopicTest.java with 88% similarity]
policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/RestEchoService.java [moved from policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/RestEchoService.java with 96% similarity]
policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/RestEndpoints.java [moved from policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/RestEndpoints.java with 92% similarity]
policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/RestMockHealthCheck.java [moved from policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/RestMockHealthCheck.java with 96% similarity]
policy-endpoints/src/test/resources/logback-test.xml
policy-management/config/policy-engine.properties
policy-management/pom.xml
policy-management/src/main/java/org/onap/policy/drools/controller/DroolsController.java [moved from policy-management/src/main/java/org/openecomp/policy/drools/controller/DroolsController.java with 94% similarity]
policy-management/src/main/java/org/onap/policy/drools/controller/DroolsControllerFactory.java [moved from policy-management/src/main/java/org/openecomp/policy/drools/controller/DroolsControllerFactory.java with 94% similarity]
policy-management/src/main/java/org/onap/policy/drools/controller/internal/MavenDroolsController.java [moved from policy-management/src/main/java/org/openecomp/policy/drools/controller/internal/MavenDroolsController.java with 96% similarity]
policy-management/src/main/java/org/onap/policy/drools/controller/internal/NullDroolsController.java [moved from policy-management/src/main/java/org/openecomp/policy/drools/controller/internal/NullDroolsController.java with 94% similarity]
policy-management/src/main/java/org/onap/policy/drools/features/PolicyControllerFeatureAPI.java [moved from policy-management/src/main/java/org/openecomp/policy/drools/features/PolicyControllerFeatureAPI.java with 96% similarity]
policy-management/src/main/java/org/onap/policy/drools/features/PolicyEngineFeatureAPI.java [moved from policy-management/src/main/java/org/openecomp/policy/drools/features/PolicyEngineFeatureAPI.java with 97% similarity]
policy-management/src/main/java/org/onap/policy/drools/persistence/SystemPersistence.java [moved from policy-management/src/main/java/org/openecomp/policy/drools/persistence/SystemPersistence.java with 98% similarity]
policy-management/src/main/java/org/onap/policy/drools/protocol/coders/EventProtocolCoder.java [moved from policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/EventProtocolCoder.java with 99% similarity]
policy-management/src/main/java/org/onap/policy/drools/protocol/coders/JsonProtocolFilter.java [moved from policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/JsonProtocolFilter.java with 98% similarity]
policy-management/src/main/java/org/onap/policy/drools/protocol/coders/ProtocolCoderToolset.java [moved from policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/ProtocolCoderToolset.java with 97% similarity]
policy-management/src/main/java/org/onap/policy/drools/protocol/coders/TopicCoderFilterConfiguration.java [moved from policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/TopicCoderFilterConfiguration.java with 99% similarity]
policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/ControllerConfiguration.java [moved from policy-management/src/main/java/org/openecomp/policy/drools/protocol/configuration/ControllerConfiguration.java with 97% similarity]
policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/DroolsConfiguration.java [moved from policy-management/src/main/java/org/openecomp/policy/drools/protocol/configuration/DroolsConfiguration.java with 99% similarity]
policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/PdpdConfiguration.java [moved from policy-management/src/main/java/org/openecomp/policy/drools/protocol/configuration/PdpdConfiguration.java with 97% similarity]
policy-management/src/main/java/org/onap/policy/drools/server/restful/RestManager.java [moved from policy-management/src/main/java/org/openecomp/policy/drools/server/restful/RestManager.java with 98% similarity]
policy-management/src/main/java/org/onap/policy/drools/system/Main.java [moved from policy-management/src/main/java/org/openecomp/policy/drools/system/Main.java with 96% similarity]
policy-management/src/main/java/org/onap/policy/drools/system/PolicyController.java [moved from policy-management/src/main/java/org/openecomp/policy/drools/system/PolicyController.java with 87% similarity]
policy-management/src/main/java/org/onap/policy/drools/system/PolicyControllerFactory.java [moved from policy-management/src/main/java/org/openecomp/policy/drools/system/PolicyControllerFactory.java with 97% similarity]
policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java [moved from policy-management/src/main/java/org/openecomp/policy/drools/system/PolicyEngine.java with 97% similarity]
policy-management/src/main/java/org/onap/policy/drools/system/internal/AggregatedPolicyController.java [moved from policy-management/src/main/java/org/openecomp/policy/drools/system/internal/AggregatedPolicyController.java with 95% similarity]
policy-management/src/main/server-gen/bin/features
policy-management/src/main/server-gen/bin/policy-management-controller
policy-management/src/main/server/config/policy-engine.properties
policy-management/src/test/java/org/onap/policy/drools/system/test/PolicyEngineTest.java [moved from policy-management/src/test/java/org/openecomp/policy/drools/system/test/PolicyEngineTest.java with 90% similarity]
policy-management/src/test/resources/logback-test.xml
policy-utils/pom.xml
policy-utils/src/main/java/org/onap/policy/drools/utils/OrderedService.java [moved from policy-utils/src/main/java/org/openecomp/policy/drools/utils/OrderedService.java with 97% similarity]
policy-utils/src/main/java/org/onap/policy/drools/utils/OrderedServiceImpl.java [moved from policy-utils/src/main/java/org/openecomp/policy/drools/utils/OrderedServiceImpl.java with 99% similarity]
policy-utils/src/main/java/org/onap/policy/drools/utils/Pair.java [moved from policy-utils/src/main/java/org/openecomp/policy/drools/utils/Pair.java with 97% similarity]
policy-utils/src/main/java/org/onap/policy/drools/utils/PropertyUtil.java [moved from policy-utils/src/main/java/org/openecomp/policy/drools/utils/PropertyUtil.java with 99% similarity]
policy-utils/src/main/java/org/onap/policy/drools/utils/ReflectionUtil.java [moved from policy-utils/src/main/java/org/openecomp/policy/drools/utils/ReflectionUtil.java with 98% similarity]
policy-utils/src/main/java/org/onap/policy/drools/utils/Triple.java [moved from policy-utils/src/main/java/org/openecomp/policy/drools/utils/Triple.java with 97% similarity]
policy-utils/src/test/java/org/onap/policy/drools/utils/PropertyUtilTest.java [moved from policy-utils/src/test/java/org/openecomp/policy/drools/utils/PropertyUtilTest.java with 99% similarity]
pom.xml

index 6614ee6..8eae27b 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
-This source repository contains the OpenECOMP Policy DroolsPDP code. The settings file only needs to support the standard Maven repositories (e.g. central = http://repo1.maven.org/maven2/), and any proxy settings needed in your environment.
+This source repository contains the ONAP Policy DroolsPDP code. The settings file only needs to support the standard Maven repositories (e.g. central = http://repo1.maven.org/maven2/), and any proxy settings needed in your environment.
 
 To build it using Maven 3, first build 'policy-common-modules' (which contains dependencies), and then run: mvn clean install
index 3138c8d..a18b289 100644 (file)
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine - Drools PDP
+  ONAP Policy Engine - Drools PDP
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -24,7 +24,7 @@
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
-               <groupId>org.openecomp.policy.drools-pdp</groupId>
+               <groupId>org.onap.policy.drools-pdp</groupId>
                <artifactId>drools-pdp</artifactId>
                <version>1.1.0-SNAPSHOT</version>
        </parent>
                        <version>1.0.0</version>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.policy.common</groupId>
-                       <artifactId>ECOMP-Logging</artifactId>
+                       <groupId>org.onap.policy.common</groupId>
+                       <artifactId>ONAP-Logging</artifactId>
                        <version>${common-modules.version}</version>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.policy.drools-pdp</groupId>
+                       <groupId>org.onap.policy.drools-pdp</groupId>
                        <artifactId>policy-management</artifactId>
                        <version>${project.version}</version>
                        <scope>provided</scope>
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.eelf;
+package org.onap.policy.drools.eelf;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import org.openecomp.policy.common.logging.eelf.Configuration;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.drools.features.PolicyEngineFeatureAPI;
-import org.openecomp.policy.drools.system.Main;
-import org.openecomp.policy.drools.system.PolicyEngine;
+import org.onap.policy.common.logging.eelf.Configuration;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.drools.features.PolicyEngineFeatureAPI;
+import org.onap.policy.drools.system.Main;
+import org.onap.policy.drools.system.PolicyEngine;
 
 /**
  * Feature EELF : Enables EELF Logging Libraries 
diff --git a/feature-eelf/src/main/resources/META-INF/services/org.Onap.policy.drools.features.PolicyEngineFeatureAPI b/feature-eelf/src/main/resources/META-INF/services/org.Onap.policy.drools.features.PolicyEngineFeatureAPI
new file mode 100644 (file)
index 0000000..f2bcc4c
--- /dev/null
@@ -0,0 +1 @@
+org.onap.policy.drools.eelf.EelfFeature
diff --git a/feature-eelf/src/main/resources/META-INF/services/org.openecomp.policy.drools.features.PolicyEngineFeatureAPI b/feature-eelf/src/main/resources/META-INF/services/org.openecomp.policy.drools.features.PolicyEngineFeatureAPI
deleted file mode 100644 (file)
index 70d1bb8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-org.openecomp.policy.drools.eelf.EelfFeature
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.drools.eelf.test;
+package org.onap.policy.drools.eelf.test;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -26,10 +26,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.junit.Test;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.drools.eelf.EelfFeature;
-import org.openecomp.policy.drools.system.Main;
-import org.openecomp.policy.drools.system.PolicyEngine;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.drools.eelf.EelfFeature;
+import org.onap.policy.drools.system.Main;
+import org.onap.policy.drools.system.PolicyEngine;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -116,7 +116,7 @@ public class EElfTest {
                
                EELFLogger eelfAuditLogger = EELFManager.getInstance().getAuditLogger();
                Logger slf4jAuditLogger = org.slf4j.LoggerFactory.getLogger(Configuration.AUDIT_LOGGER_NAME);
-               org.openecomp.policy.common.logging.flexlogger.Logger flexLogger = 
+               org.onap.policy.common.logging.flexlogger.Logger flexLogger = 
                                                                                                FlexLogger.getLogger(EElfTest.class, true);
                
                /* generate an error entry */
index 12c6b4d..3355a2a 100644 (file)
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine - Drools PDP
+  ONAP Policy Engine - Drools PDP
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -24,7 +24,7 @@
   <modelVersion>4.0.0</modelVersion>
   
   <parent>
-    <groupId>org.openecomp.policy.drools-pdp</groupId>
+    <groupId>org.onap.policy.drools-pdp</groupId>
     <artifactId>drools-pdp</artifactId>
     <version>1.1.0-SNAPSHOT</version>
   </parent>
          <scope>provided</scope>
        </dependency>
     <dependency>
-      <groupId>org.openecomp.policy.drools-pdp</groupId>
+      <groupId>org.onap.policy.drools-pdp</groupId>
       <artifactId>policy-core</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.openecomp.policy.drools-pdp</groupId>
+      <groupId>org.onap.policy.drools-pdp</groupId>
       <artifactId>policy-endpoints</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.openecomp.policy.drools-pdp</groupId>
+      <groupId>org.onap.policy.drools-pdp</groupId>
       <artifactId>policy-management</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
index d91c2cc..cb31e8f 100644 (file)
@@ -21,7 +21,7 @@
 http.server.services=HEALTHCHECK
 http.server.services.HEALTHCHECK.host=0.0.0.0
 http.server.services.HEALTHCHECK.port=6969
-http.server.services.HEALTHCHECK.restClasses=org.openecomp.policy.drools.healthcheck.RestHealthCheck
+http.server.services.HEALTHCHECK.restClasses=org.onap.policy.drools.healthcheck.RestHealthCheck
 http.server.services.HEALTHCHECK.managed=false
 http.server.services.HEALTHCHECK.swagger=true
 
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.healthcheck;
+package org.onap.policy.drools.healthcheck;
 
 import java.util.ArrayList;
 import java.util.Properties;
 
 import javax.ws.rs.core.Response;
 
-import org.openecomp.policy.drools.http.client.HttpClient;
-import org.openecomp.policy.drools.http.server.HttpServletServer;
-import org.openecomp.policy.drools.persistence.SystemPersistence;
-import org.openecomp.policy.drools.properties.Startable;
-import org.openecomp.policy.drools.system.PolicyEngine;
+import org.onap.policy.drools.http.client.HttpClient;
+import org.onap.policy.drools.http.server.HttpServletServer;
+import org.onap.policy.drools.persistence.SystemPersistence;
+import org.onap.policy.drools.properties.Startable;
+import org.onap.policy.drools.system.PolicyEngine;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.healthcheck;
+package org.onap.policy.drools.healthcheck;
 
-import org.openecomp.policy.drools.features.PolicyEngineFeatureAPI;
-import org.openecomp.policy.drools.system.PolicyEngine;
+import org.onap.policy.drools.features.PolicyEngineFeatureAPI;
+import org.onap.policy.drools.system.PolicyEngine;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.drools.healthcheck;
+package org.onap.policy.drools.healthcheck;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -25,7 +25,7 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.openecomp.policy.drools.healthcheck.HealthCheck.Reports;
+import org.onap.policy.drools.healthcheck.HealthCheck.Reports;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
diff --git a/feature-healthcheck/src/main/resources/META-INF/services/org.Onap.policy.drools.features.PolicyEngineFeatureAPI b/feature-healthcheck/src/main/resources/META-INF/services/org.Onap.policy.drools.features.PolicyEngineFeatureAPI
new file mode 100644 (file)
index 0000000..2ae820a
--- /dev/null
@@ -0,0 +1 @@
+org.onap.policy.drools.healthcheck.HealthCheckFeature
diff --git a/feature-healthcheck/src/main/resources/META-INF/services/org.openecomp.policy.drools.features.PolicyEngineFeatureAPI b/feature-healthcheck/src/main/resources/META-INF/services/org.openecomp.policy.drools.features.PolicyEngineFeatureAPI
deleted file mode 100644 (file)
index 7e307d0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-org.openecomp.policy.drools.healthcheck.HealthCheckFeature
index 47486bf..4e57cd9 100644 (file)
@@ -24,7 +24,7 @@
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
-               <groupId>org.openecomp.policy.drools-pdp</groupId>
+               <groupId>org.onap.policy.drools-pdp</groupId>
                <artifactId>packages</artifactId>
                <version>1.1.0-SNAPSHOT</version>
        </parent>
index 7a00999..e85dc53 100644 (file)
@@ -24,7 +24,7 @@
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
-               <groupId>org.openecomp.policy.drools-pdp</groupId>
+               <groupId>org.onap.policy.drools-pdp</groupId>
                <artifactId>packages</artifactId>
                <version>1.1.0-SNAPSHOT</version>
        </parent>
        <!--  List any dependencies here that should be included in the installer zip -->
        <dependencies>
                <dependency>
-                       <groupId>org.openecomp.policy.drools-pdp</groupId>
+                       <groupId>org.onap.policy.drools-pdp</groupId>
                        <artifactId>base</artifactId>
                        <version>${project.version}</version>
                        <type>tar.gz</type>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.policy.drools-pdp</groupId>
+                       <groupId>org.onap.policy.drools-pdp</groupId>
                        <artifactId>policy-management</artifactId>
                        <version>${project.version}</version>
                        <type>zip</type>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.policy.drools-pdp</groupId>
+                       <groupId>org.onap.policy.drools-pdp</groupId>
                        <artifactId>feature-healthcheck</artifactId>
                        <version>${project.version}</version>
                        <type>zip</type>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.policy.drools-pdp</groupId>
+                       <groupId>org.onap.policy.drools-pdp</groupId>
                        <artifactId>feature-eelf</artifactId>
                        <version>${project.version}</version>
                        <type>zip</type>
index 609aa86..1e5fd76 100644 (file)
@@ -1,5 +1,5 @@
 CONTROLLER_ARTIFACT_ID=policy-management
 CONTROLLER_NAME=policy-management-controller
 CONTROLLER_PORT=9696
-RULES_ARTIFACT=org.openecomp.policy:dummy-artifact:1.0.0-SNAPSHOT
+RULES_ARTIFACT=org.onap.policy:dummy-artifact:1.0.0-SNAPSHOT
 UEB_TOPIC=policyengine-develop
index 9ed60d1..50021c1 100644 (file)
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine - Drools PDP
+  ONAP Policy Engine - Drools PDP
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -24,7 +24,7 @@
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
-               <groupId>org.openecomp.policy.drools-pdp</groupId>
+               <groupId>org.onap.policy.drools-pdp</groupId>
                <artifactId>drools-pdp</artifactId>
                <version>1.1.0-SNAPSHOT</version>
        </parent>
index d0cd873..902c38c 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine - Drools PDP
+  ONAP Policy Engine - Drools PDP
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -25,7 +25,7 @@
 
   <artifactId>policy-core</artifactId>
   <parent>
-    <groupId>org.openecomp.policy.drools-pdp</groupId>
+    <groupId>org.onap.policy.drools-pdp</groupId>
     <artifactId>drools-pdp</artifactId>
     <version>1.1.0-SNAPSHOT</version>
   </parent>
@@ -54,7 +54,7 @@
       <version>6.5.0.Final</version>
     </dependency>
     <dependency>
-       <groupId>org.openecomp.policy.drools-pdp</groupId>
+       <groupId>org.onap.policy.drools-pdp</groupId>
        <artifactId>policy-utils</artifactId>
        <version>${project.version}</version>  
      </dependency>
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.core;
+package org.onap.policy.drools.core;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -34,7 +34,7 @@ import org.kie.api.builder.ReleaseId;
 import org.kie.api.builder.Results;
 import org.kie.api.runtime.KieContainer;
 import org.kie.api.runtime.KieSession;
-import org.openecomp.policy.drools.properties.Startable;
+import org.onap.policy.drools.properties.Startable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.core;
+package org.onap.policy.drools.core;
 
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -36,7 +36,7 @@ import org.kie.api.event.rule.RuleFlowGroupActivatedEvent;
 import org.kie.api.event.rule.RuleFlowGroupDeactivatedEvent;
 import org.kie.api.event.rule.RuleRuntimeEventListener;
 import org.kie.api.runtime.KieSession;
-import org.openecomp.policy.drools.core.jmx.PdpJmx;
+import org.onap.policy.drools.core.jmx.PdpJmx;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.core;
+package org.onap.policy.drools.core;
 
 import org.kie.api.runtime.KieSession;
-import org.openecomp.policy.drools.utils.OrderedService;
-import org.openecomp.policy.drools.utils.OrderedServiceImpl;
+import org.onap.policy.drools.utils.OrderedService;
+import org.onap.policy.drools.utils.OrderedServiceImpl;
 
 /**
  * This interface provides a way to invoke optional features at various
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.core.jmx;
+package org.onap.policy.drools.core.jmx;
 
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.core.jmx;
+package org.onap.policy.drools.core.jmx;
 
 import java.lang.management.ManagementFactory;
 
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.core.jmx;
+package org.onap.policy.drools.core.jmx;
 
 public interface PdpJmxMBean {
 
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.properties;
+package org.onap.policy.drools.properties;
 
 /**
  * Marks a entity as able to lock and unlock.
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.properties;
+package org.onap.policy.drools.properties;
 
 public interface PolicyProperties {
        
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.properties;
+package org.onap.policy.drools.properties;
 
 /**
  * Declares the Startable property of any class class implementing
index 18d338c..b34b6d3 100644 (file)
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine - Drools PDP
+  ONAP Policy Engine - Drools PDP
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -24,7 +24,7 @@
        <modelVersion>4.0.0</modelVersion>
   
        <parent>
-               <groupId>org.openecomp.policy.drools-pdp</groupId>
+               <groupId>org.onap.policy.drools-pdp</groupId>
                <artifactId>drools-pdp</artifactId>
                <version>1.1.0-SNAPSHOT</version>
        </parent>
                </dependency> 
 
                <dependency>
-                       <groupId>org.openecomp.policy.drools-pdp</groupId>
+                       <groupId>org.onap.policy.drools-pdp</groupId>
                        <artifactId>policy-core</artifactId>
                        <version>${project.version}</version>
                </dependency>
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm;
+package org.onap.policy.drools.event.comm;
 
 import java.util.List;
 
-import org.openecomp.policy.drools.properties.Lockable;
-import org.openecomp.policy.drools.properties.Startable;
+import org.onap.policy.drools.properties.Lockable;
+import org.onap.policy.drools.properties.Startable;
 
 /**
  * Essential Topic Data
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm;
+package org.onap.policy.drools.event.comm;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
-import org.openecomp.policy.drools.event.comm.bus.DmaapTopicSink;
-import org.openecomp.policy.drools.event.comm.bus.DmaapTopicSource;
-import org.openecomp.policy.drools.event.comm.bus.NoopTopicSink;
-import org.openecomp.policy.drools.event.comm.bus.UebTopicSink;
-import org.openecomp.policy.drools.event.comm.bus.UebTopicSource;
+import org.onap.policy.drools.event.comm.bus.DmaapTopicSink;
+import org.onap.policy.drools.event.comm.bus.DmaapTopicSource;
+import org.onap.policy.drools.event.comm.bus.NoopTopicSink;
+import org.onap.policy.drools.event.comm.bus.UebTopicSink;
+import org.onap.policy.drools.event.comm.bus.UebTopicSource;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
-import org.openecomp.policy.drools.properties.Lockable;
-import org.openecomp.policy.drools.properties.Startable;
+import org.onap.policy.drools.properties.Lockable;
+import org.onap.policy.drools.properties.Startable;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 /**
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm;
+package org.onap.policy.drools.event.comm;
 
 /**
  * Listener for event messages entering the Policy Engine
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm;
+package org.onap.policy.drools.event.comm;
 
 /**
  * Marks a given Topic Endpoint as able to send messages over a topic
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm;
+package org.onap.policy.drools.event.comm;
 
 /**
  * Marker for a Topic Entity, indicating that the entity is able to read
@@ -18,9 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus;
+package org.onap.policy.drools.event.comm.bus;
 
-import org.openecomp.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.event.comm.TopicSink;
 
 /**
  * Topic Sink over Bus Infrastructure (DMAAP/UEB)
@@ -18,9 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus;
+package org.onap.policy.drools.event.comm.bus;
 
-import org.openecomp.policy.drools.event.comm.TopicSource;
+import org.onap.policy.drools.event.comm.TopicSource;
 
 /**
  * Generic Topic Source for UEB/DMAAP Communication Infrastructure
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus;
+package org.onap.policy.drools.event.comm.bus;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -29,8 +29,8 @@ import java.util.Properties;
 
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
-import org.openecomp.policy.drools.event.comm.bus.internal.InlineDmaapTopicSink;
-import org.openecomp.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.event.comm.bus.internal.InlineDmaapTopicSink;
+import org.onap.policy.drools.properties.PolicyProperties;
 
 /**
  * DMAAP Topic Sink Factory
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus;
+package org.onap.policy.drools.event.comm.bus;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,10 +27,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
-import org.openecomp.policy.drools.event.comm.bus.internal.SingleThreadedDmaapTopicSource;
+import org.onap.policy.drools.event.comm.bus.internal.SingleThreadedDmaapTopicSource;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
-import org.openecomp.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.properties.PolicyProperties;
 
 /**
  * DMAAP Topic Source Factory
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.drools.event.comm.bus;
+package org.onap.policy.drools.event.comm.bus;
 
 import java.util.List;
 
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.event.comm.bus.internal.TopicBase;
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.event.comm.bus.internal.TopicBase;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.drools.event.comm.bus;
+package org.onap.policy.drools.event.comm.bus;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,7 +25,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Properties;
 
-import org.openecomp.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.properties.PolicyProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus;
+package org.onap.policy.drools.event.comm.bus;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -26,10 +26,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Properties;
 
-import org.openecomp.policy.drools.event.comm.bus.internal.InlineUebTopicSink;
+import org.onap.policy.drools.event.comm.bus.internal.InlineUebTopicSink;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
-import org.openecomp.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.properties.PolicyProperties;
 
 /**
  * UEB Topic Sink Factory
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus;
+package org.onap.policy.drools.event.comm.bus;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -26,10 +26,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Properties;
 
-import org.openecomp.policy.drools.event.comm.bus.internal.SingleThreadedUebTopicSource;
+import org.onap.policy.drools.event.comm.bus.internal.SingleThreadedUebTopicSource;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
-import org.openecomp.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.properties.PolicyProperties;
 
 /**
  * UEB Topic Source Factory
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus.internal;
+package org.onap.policy.drools.event.comm.bus.internal;
 
 import java.net.MalformedURLException;
 import java.security.GeneralSecurityException;
@@ -27,8 +27,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
-import org.openecomp.policy.drools.event.comm.bus.DmaapTopicSinkFactory;
-import org.openecomp.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.event.comm.bus.DmaapTopicSinkFactory;
+import org.onap.policy.drools.properties.PolicyProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus.internal;
+package org.onap.policy.drools.event.comm.bus.internal;
 
 import java.net.MalformedURLException;
 import java.security.GeneralSecurityException;
@@ -28,8 +28,8 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
-import org.openecomp.policy.drools.event.comm.bus.DmaapTopicSinkFactory;
-import org.openecomp.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.event.comm.bus.DmaapTopicSinkFactory;
+import org.onap.policy.drools.properties.PolicyProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus.internal;
+package org.onap.policy.drools.event.comm.bus.internal;
 
 import java.util.List;
 
-import org.openecomp.policy.drools.event.comm.bus.ApiKeyEnabled;
+import org.onap.policy.drools.event.comm.bus.ApiKeyEnabled;
 
 /**
  * Bus Topic Base
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus.internal;
+package org.onap.policy.drools.event.comm.bus.internal;
 
 import java.util.List;
 import java.util.UUID;
 
-import org.openecomp.policy.drools.event.comm.bus.BusTopicSink;
+import org.onap.policy.drools.event.comm.bus.BusTopicSink;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
 
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus.internal;
+package org.onap.policy.drools.event.comm.bus.internal;
 
 import java.util.List;
 import java.util.Map;
 
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
-import org.openecomp.policy.drools.event.comm.Topic;
-import org.openecomp.policy.drools.event.comm.bus.DmaapTopicSink;
+import org.onap.policy.drools.event.comm.Topic;
+import org.onap.policy.drools.event.comm.bus.DmaapTopicSink;
 
 /**
  * This implementation publishes events for the associated DMAAP topic,
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus.internal;
+package org.onap.policy.drools.event.comm.bus.internal;
 
 import java.util.List;
 
-import org.openecomp.policy.drools.event.comm.Topic;
-import org.openecomp.policy.drools.event.comm.bus.UebTopicSink;
+import org.onap.policy.drools.event.comm.Topic;
+import org.onap.policy.drools.event.comm.bus.UebTopicSink;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
 
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus.internal;
+package org.onap.policy.drools.event.comm.bus.internal;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,8 +27,8 @@ import java.util.UUID;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.openecomp.policy.drools.event.comm.TopicListener;
-import org.openecomp.policy.drools.event.comm.bus.BusTopicSource;
+import org.onap.policy.drools.event.comm.TopicListener;
+import org.onap.policy.drools.event.comm.bus.BusTopicSource;
 
 /**
  * This topic source implementation specializes in reading messages
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus.internal;
+package org.onap.policy.drools.event.comm.bus.internal;
 
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.policy.drools.event.comm.Topic;
-import org.openecomp.policy.drools.event.comm.bus.DmaapTopicSource;
+import org.onap.policy.drools.event.comm.Topic;
+import org.onap.policy.drools.event.comm.bus.DmaapTopicSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus.internal;
+package org.onap.policy.drools.event.comm.bus.internal;
 
 import java.util.List;
 
-import org.openecomp.policy.drools.event.comm.Topic;
-import org.openecomp.policy.drools.event.comm.bus.UebTopicSource;
+import org.onap.policy.drools.event.comm.Topic;
+import org.onap.policy.drools.event.comm.bus.UebTopicSource;
 
 /**
  * This topic source implementation specializes in reading messages
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus.internal;
+package org.onap.policy.drools.event.comm.bus.internal;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.collections4.queue.CircularFifoQueue;
-import org.openecomp.policy.drools.event.comm.Topic;
-import org.openecomp.policy.drools.event.comm.TopicListener;
+import org.onap.policy.drools.event.comm.Topic;
+import org.onap.policy.drools.event.comm.TopicListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.drools.http.client;
+package org.onap.policy.drools.http.client;
 
 import javax.ws.rs.core.Response;
 
-import org.openecomp.policy.drools.properties.Startable;
+import org.onap.policy.drools.properties.Startable;
 
 public interface HttpClient extends Startable {
        
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.drools.http.client;
+package org.onap.policy.drools.http.client;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,8 +25,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Properties;
 
-import org.openecomp.policy.drools.http.client.internal.JerseyClient;
-import org.openecomp.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.http.client.internal.JerseyClient;
+import org.onap.policy.drools.properties.PolicyProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.http.client.internal;
+package org.onap.policy.drools.http.client.internal;
 
 import java.security.SecureRandom;
 import java.security.cert.CertificateException;
@@ -34,7 +34,7 @@ import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.core.Response;
 
 import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
-import org.openecomp.policy.drools.http.client.HttpClient;
+import org.onap.policy.drools.http.client.HttpClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -17,9 +17,9 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.drools.http.server;
+package org.onap.policy.drools.http.server;
 
-import org.openecomp.policy.drools.properties.Startable;
+import org.onap.policy.drools.properties.Startable;
 
 /**
  * A Jetty Server to server REST Requests
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.drools.http.server;
+package org.onap.policy.drools.http.server;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,8 +27,8 @@ import java.util.Properties;
 
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
-import org.openecomp.policy.drools.http.server.internal.JettyJerseyServer;
-import org.openecomp.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.http.server.internal.JettyJerseyServer;
+import org.onap.policy.drools.properties.PolicyProperties;
 
 /**
  * Factory of HTTP Servlet-Enabled Servlets
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.drools.http.server.internal;
+package org.onap.policy.drools.http.server.internal;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.drools.http.server.internal;
+package org.onap.policy.drools.http.server.internal;
 
 import org.eclipse.jetty.security.ConstraintMapping;
 import org.eclipse.jetty.security.ConstraintSecurityHandler;
@@ -28,7 +28,7 @@ import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.util.security.Constraint;
 import org.eclipse.jetty.util.security.Credential;
-import org.openecomp.policy.drools.http.server.HttpServletServer;
+import org.onap.policy.drools.http.server.HttpServletServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.http.server.test;
+package org.onap.policy.drools.http.server.test;
 
 import static org.junit.Assert.assertTrue;
 
@@ -30,9 +30,9 @@ import javax.ws.rs.core.Response;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.openecomp.policy.drools.http.client.HttpClient;
-import org.openecomp.policy.drools.http.server.HttpServletServer;
-import org.openecomp.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.http.client.HttpClient;
+import org.onap.policy.drools.http.server.HttpServletServer;
+import org.onap.policy.drools.properties.PolicyProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.drools.http.server.test;
+package org.onap.policy.drools.http.server.test;
 
 import static org.junit.Assert.assertTrue;
 
@@ -28,7 +28,7 @@ import java.net.URL;
 import java.util.UUID;
 
 import org.junit.Test;
-import org.openecomp.policy.drools.http.server.HttpServletServer;
+import org.onap.policy.drools.http.server.HttpServletServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.drools.http.server.test;
+package org.onap.policy.drools.http.server.test;
 
 import static org.junit.Assert.assertTrue;
 
@@ -25,12 +25,12 @@ import java.util.List;
 import java.util.Properties;
 
 import org.junit.Test;
-import org.openecomp.policy.drools.event.comm.Topic.CommInfrastructure;
-import org.openecomp.policy.drools.event.comm.TopicEndpoint;
-import org.openecomp.policy.drools.event.comm.TopicListener;
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.event.comm.bus.NoopTopicSink;
-import org.openecomp.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.event.comm.Topic.CommInfrastructure;
+import org.onap.policy.drools.event.comm.TopicEndpoint;
+import org.onap.policy.drools.event.comm.TopicListener;
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.event.comm.bus.NoopTopicSink;
+import org.onap.policy.drools.properties.PolicyProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.http.server.test;
+package org.onap.policy.drools.http.server.test;
 
 import java.util.List;
 
@@ -27,7 +27,7 @@ import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import org.openecomp.policy.drools.http.server.HttpServletServer;
+import org.onap.policy.drools.http.server.HttpServletServer;
 
 @Path("/junit/endpoints")
 public class RestEndpoints {
index 607a60d..d93bc4a 100644 (file)
@@ -8,7 +8,7 @@
         </encoder>
     </appender>
     
-    <logger name="org.openecomp.policy.drools.http.server.test" level="INFO"/>
+    <logger name="org.onap.policy.drools.http.server.test" level="INFO"/>
 
     <root level="warn">
         <appender-ref ref="STDOUT"/>
index 27bd765..bf28bc8 100644 (file)
@@ -22,9 +22,9 @@ http.server.services.CONFIG.host=0.0.0.0
 http.server.services.CONFIG.port=9696
 http.server.services.CONFIG.userName=x
 http.server.services.CONFIG.password=y
-http.server.services.CONFIG.restPackages=org.openecomp.policy.drools.server.restful
-#http.server.services.CONFIG.restPackages=org.openecomp.policy.drools.server.restful,org.openecomp.policy.drools.healthcheck
-#http.server.services.CONFIG.restClasses=org.openecomp.policy.drools.server.restful.RestManager,org.openecomp.policy.drools.healthcheck.RestHealthCheck
-#http.server.services.CONFIG.restClasses=org.openecomp.policy.drools.server.restful.RestManager
+http.server.services.CONFIG.restPackages=org.onap.policy.drools.server.restful
+#http.server.services.CONFIG.restPackages=org.onap.policy.drools.server.restful,org.onap.policy.drools.healthcheck
+#http.server.services.CONFIG.restClasses=org.onap.policy.drools.server.restful.RestManager,org.onap.policy.drools.healthcheck.RestHealthCheck
+#http.server.services.CONFIG.restClasses=org.onap.policy.drools.server.restful.RestManager
 http.server.services.CONFIG.managed=false
 http.server.services.CONFIG.swagger=true
index e7d8385..4e375d5 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine - Drools PDP
+  ONAP Policy Engine - Drools PDP
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -24,7 +24,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openecomp.policy.drools-pdp</groupId>
+    <groupId>org.onap.policy.drools-pdp</groupId>
     <artifactId>drools-pdp</artifactId>
     <version>1.1.0-SNAPSHOT</version>
   </parent>
   <dependencies>
     
     <dependency>
-      <groupId>org.openecomp.policy.drools-pdp</groupId>
+      <groupId>org.onap.policy.drools-pdp</groupId>
       <artifactId>policy-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     
     <dependency>
-      <groupId>org.openecomp.policy.drools-pdp</groupId>
+      <groupId>org.onap.policy.drools-pdp</groupId>
       <artifactId>policy-endpoints</artifactId>
       <version>${project.version}</version>
     </dependency>
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.controller;
+package org.onap.policy.drools.controller;
 
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.policy.drools.core.PolicyContainer;
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.properties.Lockable;
-import org.openecomp.policy.drools.properties.Startable;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration;
+import org.onap.policy.drools.core.PolicyContainer;
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.properties.Lockable;
+import org.onap.policy.drools.properties.Startable;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration;
 
 /**
  * Drools Controller is the abstractions that wraps the
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.controller;
+package org.onap.policy.drools.controller;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -26,21 +26,21 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Properties;
 
-import org.openecomp.policy.drools.controller.internal.MavenDroolsController;
-import org.openecomp.policy.drools.controller.internal.NullDroolsController;
-import org.openecomp.policy.drools.event.comm.Topic;
-import org.openecomp.policy.drools.event.comm.Topic.CommInfrastructure;
+import org.onap.policy.drools.controller.internal.MavenDroolsController;
+import org.onap.policy.drools.controller.internal.NullDroolsController;
+import org.onap.policy.drools.event.comm.Topic;
+import org.onap.policy.drools.event.comm.Topic.CommInfrastructure;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.openecomp.policy.drools.event.comm.TopicSource;
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.properties.PolicyProperties;
-import org.openecomp.policy.drools.protocol.coders.JsonProtocolFilter;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomGsonCoder;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomJacksonCoder;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.PotentialCoderFilter;
-import org.openecomp.policy.drools.utils.Pair;
+import org.onap.policy.drools.event.comm.TopicSource;
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.protocol.coders.JsonProtocolFilter;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomGsonCoder;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomJacksonCoder;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.PotentialCoderFilter;
+import org.onap.policy.drools.utils.Pair;
 
 /**
  * Drools Controller Factory to manage controller creation, destruction,
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.controller.internal;
+package org.onap.policy.drools.controller.internal;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -36,18 +36,18 @@ import org.kie.api.runtime.rule.QueryResults;
 import org.kie.api.runtime.rule.QueryResultsRow;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.openecomp.policy.drools.controller.DroolsController;
-import org.openecomp.policy.drools.core.PolicyContainer;
-import org.openecomp.policy.drools.core.PolicySession;
-import org.openecomp.policy.drools.core.jmx.PdpJmx;
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.protocol.coders.EventProtocolCoder;
-import org.openecomp.policy.drools.protocol.coders.JsonProtocolFilter;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomGsonCoder;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomJacksonCoder;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.PotentialCoderFilter;
-import org.openecomp.policy.drools.utils.ReflectionUtil;
+import org.onap.policy.drools.controller.DroolsController;
+import org.onap.policy.drools.core.PolicyContainer;
+import org.onap.policy.drools.core.PolicySession;
+import org.onap.policy.drools.core.jmx.PdpJmx;
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.protocol.coders.EventProtocolCoder;
+import org.onap.policy.drools.protocol.coders.JsonProtocolFilter;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomGsonCoder;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomJacksonCoder;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.PotentialCoderFilter;
+import org.onap.policy.drools.utils.ReflectionUtil;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.controller.internal;
+package org.onap.policy.drools.controller.internal;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.policy.drools.controller.DroolsController;
-import org.openecomp.policy.drools.core.PolicyContainer;
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration;
+import org.onap.policy.drools.controller.DroolsController;
+import org.onap.policy.drools.core.PolicyContainer;
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration;
 
 /**
  * no-op Drools Controller
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.features;
+package org.onap.policy.drools.features;
 
 import java.util.Properties;
 
-import org.openecomp.policy.drools.event.comm.Topic.CommInfrastructure;
-import org.openecomp.policy.drools.system.PolicyController;
-import org.openecomp.policy.drools.utils.OrderedService;
-import org.openecomp.policy.drools.utils.OrderedServiceImpl;
+import org.onap.policy.drools.event.comm.Topic.CommInfrastructure;
+import org.onap.policy.drools.system.PolicyController;
+import org.onap.policy.drools.utils.OrderedService;
+import org.onap.policy.drools.utils.OrderedServiceImpl;
 
 public interface PolicyControllerFeatureAPI extends OrderedService {
 
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.features;
+package org.onap.policy.drools.features;
 
 import java.util.Properties;
 
-import org.openecomp.policy.drools.system.PolicyEngine;
-import org.openecomp.policy.drools.utils.OrderedService;
-import org.openecomp.policy.drools.utils.OrderedServiceImpl;
+import org.onap.policy.drools.system.PolicyEngine;
+import org.onap.policy.drools.utils.OrderedService;
+import org.onap.policy.drools.utils.OrderedServiceImpl;
 
 /**
  * Policy Engine Feature API.
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.persistence;
+package org.onap.policy.drools.persistence;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -28,7 +28,7 @@ import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.util.Properties;
 
-import org.openecomp.policy.drools.utils.PropertyUtil;
+import org.onap.policy.drools.utils.PropertyUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.protocol.coders;
+package org.onap.policy.drools.protocol.coders;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -26,11 +26,11 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.policy.drools.controller.DroolsController;
-import org.openecomp.policy.drools.protocol.coders.EventProtocolCoder.CoderFilters;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomGsonCoder;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomJacksonCoder;
-import org.openecomp.policy.drools.utils.Pair;
+import org.onap.policy.drools.controller.DroolsController;
+import org.onap.policy.drools.protocol.coders.EventProtocolCoder.CoderFilters;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomGsonCoder;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomJacksonCoder;
+import org.onap.policy.drools.utils.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.protocol.coders;
+package org.onap.policy.drools.protocol.coders;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.openecomp.policy.drools.utils.Pair;
+import org.onap.policy.drools.utils.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.protocol.coders;
+package org.onap.policy.drools.protocol.coders;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -30,11 +30,11 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.openecomp.policy.drools.controller.DroolsController;
-import org.openecomp.policy.drools.protocol.coders.EventProtocolCoder.CoderFilters;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomCoder;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomGsonCoder;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomJacksonCoder;
+import org.onap.policy.drools.controller.DroolsController;
+import org.onap.policy.drools.protocol.coders.EventProtocolCoder.CoderFilters;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomCoder;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomGsonCoder;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomJacksonCoder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.protocol.configuration;
+package org.onap.policy.drools.protocol.configuration;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -214,7 +214,7 @@ public class ControllerConfiguration {
                 if (value instanceof DroolsConfiguration) {
                     setDrools(((DroolsConfiguration) value));
                 } else {
-                    throw new IllegalArgumentException(("property \"drools\" is of type \"org.openecomp.policy.drools.protocol.configuration.Drools\", but got "+ value.getClass().toString()));
+                    throw new IllegalArgumentException(("property \"drools\" is of type \"org.onap.policy.drools.protocol.configuration.Drools\", but got "+ value.getClass().toString()));
                 }
                 return true;
             default:
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.protocol.configuration;
+package org.onap.policy.drools.protocol.configuration;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -217,7 +217,7 @@ public class PdpdConfiguration {
                 if (value instanceof List) {
                     setControllers(((List<ControllerConfiguration> ) value));
                 } else {
-                    throw new IllegalArgumentException(("property \"controllers\" is of type \"java.util.List<org.openecomp.policy.drools.protocol.configuration.Controller>\", but got "+ value.getClass().toString()));
+                    throw new IllegalArgumentException(("property \"controllers\" is of type \"java.util.List<org.onap.policy.drools.protocol.configuration.Controller>\", but got "+ value.getClass().toString()));
                 }
                 return true;
             default:
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.server.restful;
+package org.onap.policy.drools.server.restful;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -43,26 +43,26 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 
-import org.openecomp.policy.drools.controller.DroolsController;
-import org.openecomp.policy.drools.event.comm.TopicEndpoint;
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.event.comm.TopicSource;
-import org.openecomp.policy.drools.event.comm.bus.DmaapTopicSink;
-import org.openecomp.policy.drools.event.comm.bus.DmaapTopicSource;
-import org.openecomp.policy.drools.event.comm.bus.UebTopicSink;
-import org.openecomp.policy.drools.event.comm.bus.UebTopicSource;
-import org.openecomp.policy.drools.features.PolicyControllerFeatureAPI;
-import org.openecomp.policy.drools.features.PolicyEngineFeatureAPI;
-import org.openecomp.policy.drools.properties.PolicyProperties;
-import org.openecomp.policy.drools.protocol.coders.EventProtocolCoder;
-import org.openecomp.policy.drools.protocol.coders.EventProtocolCoder.CoderFilters;
-import org.openecomp.policy.drools.protocol.coders.JsonProtocolFilter;
-import org.openecomp.policy.drools.protocol.coders.JsonProtocolFilter.FilterRule;
-import org.openecomp.policy.drools.protocol.coders.ProtocolCoderToolset;
-import org.openecomp.policy.drools.protocol.configuration.ControllerConfiguration;
-import org.openecomp.policy.drools.protocol.configuration.PdpdConfiguration;
-import org.openecomp.policy.drools.system.PolicyController;
-import org.openecomp.policy.drools.system.PolicyEngine;
+import org.onap.policy.drools.controller.DroolsController;
+import org.onap.policy.drools.event.comm.TopicEndpoint;
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.event.comm.TopicSource;
+import org.onap.policy.drools.event.comm.bus.DmaapTopicSink;
+import org.onap.policy.drools.event.comm.bus.DmaapTopicSource;
+import org.onap.policy.drools.event.comm.bus.UebTopicSink;
+import org.onap.policy.drools.event.comm.bus.UebTopicSource;
+import org.onap.policy.drools.features.PolicyControllerFeatureAPI;
+import org.onap.policy.drools.features.PolicyEngineFeatureAPI;
+import org.onap.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.protocol.coders.EventProtocolCoder;
+import org.onap.policy.drools.protocol.coders.EventProtocolCoder.CoderFilters;
+import org.onap.policy.drools.protocol.coders.JsonProtocolFilter;
+import org.onap.policy.drools.protocol.coders.JsonProtocolFilter.FilterRule;
+import org.onap.policy.drools.protocol.coders.ProtocolCoderToolset;
+import org.onap.policy.drools.protocol.configuration.ControllerConfiguration;
+import org.onap.policy.drools.protocol.configuration.PdpdConfiguration;
+import org.onap.policy.drools.system.PolicyController;
+import org.onap.policy.drools.system.PolicyEngine;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.system;
+package org.onap.policy.drools.system;
 
 import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Properties;
 
-import org.openecomp.policy.drools.persistence.SystemPersistence;
-import org.openecomp.policy.drools.utils.PropertyUtil;
+import org.onap.policy.drools.persistence.SystemPersistence;
+import org.onap.policy.drools.utils.PropertyUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.system;
+package org.onap.policy.drools.system;
 
 import java.util.List;
 import java.util.Properties;
 
-import org.openecomp.policy.drools.controller.DroolsController;
-import org.openecomp.policy.drools.event.comm.TopicSource;
-import org.openecomp.policy.drools.event.comm.Topic.CommInfrastructure;
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.properties.Lockable;
-import org.openecomp.policy.drools.properties.Startable;
-import org.openecomp.policy.drools.protocol.configuration.DroolsConfiguration;
+import org.onap.policy.drools.controller.DroolsController;
+import org.onap.policy.drools.event.comm.TopicSource;
+import org.onap.policy.drools.event.comm.Topic.CommInfrastructure;
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.properties.Lockable;
+import org.onap.policy.drools.properties.Startable;
+import org.onap.policy.drools.protocol.configuration.DroolsConfiguration;
 
 /**
  * A Policy Controller is the higher level unit of control.  It corresponds to
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.system;
+package org.onap.policy.drools.system;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -27,10 +27,10 @@ import java.util.Properties;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.openecomp.policy.drools.controller.DroolsController;
-import org.openecomp.policy.drools.features.PolicyControllerFeatureAPI;
-import org.openecomp.policy.drools.protocol.configuration.DroolsConfiguration;
-import org.openecomp.policy.drools.system.internal.AggregatedPolicyController;
+import org.onap.policy.drools.controller.DroolsController;
+import org.onap.policy.drools.features.PolicyControllerFeatureAPI;
+import org.onap.policy.drools.protocol.configuration.DroolsConfiguration;
+import org.onap.policy.drools.system.internal.AggregatedPolicyController;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.system;
+package org.onap.policy.drools.system;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,25 +26,25 @@ import java.util.Properties;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.openecomp.policy.drools.controller.DroolsController;
-import org.openecomp.policy.drools.core.PolicyContainer;
-import org.openecomp.policy.drools.core.jmx.PdpJmxListener;
-import org.openecomp.policy.drools.event.comm.Topic;
-import org.openecomp.policy.drools.event.comm.Topic.CommInfrastructure;
-import org.openecomp.policy.drools.event.comm.TopicEndpoint;
-import org.openecomp.policy.drools.event.comm.TopicListener;
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.event.comm.TopicSource;
-import org.openecomp.policy.drools.features.PolicyControllerFeatureAPI;
-import org.openecomp.policy.drools.features.PolicyEngineFeatureAPI;
-import org.openecomp.policy.drools.http.server.HttpServletServer;
-import org.openecomp.policy.drools.persistence.SystemPersistence;
-import org.openecomp.policy.drools.properties.Lockable;
-import org.openecomp.policy.drools.properties.PolicyProperties;
-import org.openecomp.policy.drools.properties.Startable;
-import org.openecomp.policy.drools.protocol.coders.EventProtocolCoder;
-import org.openecomp.policy.drools.protocol.configuration.ControllerConfiguration;
-import org.openecomp.policy.drools.protocol.configuration.PdpdConfiguration;
+import org.onap.policy.drools.controller.DroolsController;
+import org.onap.policy.drools.core.PolicyContainer;
+import org.onap.policy.drools.core.jmx.PdpJmxListener;
+import org.onap.policy.drools.event.comm.Topic;
+import org.onap.policy.drools.event.comm.Topic.CommInfrastructure;
+import org.onap.policy.drools.event.comm.TopicEndpoint;
+import org.onap.policy.drools.event.comm.TopicListener;
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.event.comm.TopicSource;
+import org.onap.policy.drools.features.PolicyControllerFeatureAPI;
+import org.onap.policy.drools.features.PolicyEngineFeatureAPI;
+import org.onap.policy.drools.http.server.HttpServletServer;
+import org.onap.policy.drools.persistence.SystemPersistence;
+import org.onap.policy.drools.properties.Lockable;
+import org.onap.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.properties.Startable;
+import org.onap.policy.drools.protocol.coders.EventProtocolCoder;
+import org.onap.policy.drools.protocol.configuration.ControllerConfiguration;
+import org.onap.policy.drools.protocol.configuration.PdpdConfiguration;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.system.internal;
+package org.onap.policy.drools.system.internal;
 
 import java.util.HashMap;
 import java.util.List;
@@ -26,17 +26,17 @@ import java.util.Properties;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.openecomp.policy.drools.controller.DroolsController;
-import org.openecomp.policy.drools.event.comm.Topic;
-import org.openecomp.policy.drools.event.comm.TopicEndpoint;
-import org.openecomp.policy.drools.event.comm.TopicListener;
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.event.comm.TopicSource;
-import org.openecomp.policy.drools.features.PolicyControllerFeatureAPI;
-import org.openecomp.policy.drools.persistence.SystemPersistence;
-import org.openecomp.policy.drools.properties.PolicyProperties;
-import org.openecomp.policy.drools.protocol.configuration.DroolsConfiguration;
-import org.openecomp.policy.drools.system.PolicyController;
+import org.onap.policy.drools.controller.DroolsController;
+import org.onap.policy.drools.event.comm.Topic;
+import org.onap.policy.drools.event.comm.TopicEndpoint;
+import org.onap.policy.drools.event.comm.TopicListener;
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.event.comm.TopicSource;
+import org.onap.policy.drools.features.PolicyControllerFeatureAPI;
+import org.onap.policy.drools.persistence.SystemPersistence;
+import org.onap.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.protocol.configuration.DroolsConfiguration;
+import org.onap.policy.drools.system.PolicyController;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
index 7b14644..e21562f 100644 (file)
@@ -51,7 +51,7 @@
 #        │   │   ├── logback-eelf.xml
 #        │   └── lib/
 #        │   │   └── dependencies/
-#        │   │   │   └── ECOMP-Logging-1.1.0-SNAPSHOT.jar
+#        │   │   │   └── ONAP-Logging-1.1.0-SNAPSHOT.jar
 #        │   │   │   └── eelf-core-1.0.0.jar
 #        │   │   └── feature/
 #        │   │       └── feature-eelf-1.1.0-SNAPSHOT.jar
index d77a870..a9f8ce0 100644 (file)
@@ -22,7 +22,7 @@
 
 SNAME="Policy Management"
 PNAME=policy-management
-CLASS=org.openecomp.policy.drools.system.Main
+CLASS=org.onap.policy.drools.system.Main
 
 
 function start() {
index dbaf72a..70a5dcc 100644 (file)
@@ -42,6 +42,6 @@ http.server.services.CONFIG.host=${{ENGINE_MANAGEMENT_HOST}}
 http.server.services.CONFIG.port=${{ENGINE_MANAGEMENT_PORT}}
 http.server.services.CONFIG.userName=${{ENGINE_MANAGEMENT_USER}}
 http.server.services.CONFIG.password=${{ENGINE_MANAGEMENT_PASSWORD}}
-http.server.services.CONFIG.restPackages=org.openecomp.policy.drools.server.restful
+http.server.services.CONFIG.restPackages=org.onap.policy.drools.server.restful
 http.server.services.CONFIG.managed=false
 http.server.services.CONFIG.swagger=true
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.drools.system.test;
+package org.onap.policy.drools.system.test;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -29,10 +29,10 @@ import javax.ws.rs.core.Response;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.openecomp.policy.drools.http.client.HttpClient;
-import org.openecomp.policy.drools.http.server.HttpServletServer;
-import org.openecomp.policy.drools.system.PolicyController;
-import org.openecomp.policy.drools.system.PolicyEngine;
+import org.onap.policy.drools.http.client.HttpClient;
+import org.onap.policy.drools.http.server.HttpServletServer;
+import org.onap.policy.drools.system.PolicyController;
+import org.onap.policy.drools.system.PolicyEngine;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -50,7 +50,7 @@ public class PolicyEngineTest {
                engineProperties.put("http.server.services", "CONFIG");
                engineProperties.put("http.server.services.CONFIG.host", "0.0.0.0");
                engineProperties.put("http.server.services.CONFIG.port", "9696");
-               engineProperties.put("http.server.services.CONFIG.restPackages", "org.openecomp.policy.drools.server.restful");
+               engineProperties.put("http.server.services.CONFIG.restPackages", "org.onap.policy.drools.server.restful");
                
                assertFalse(PolicyEngine.manager.isAlive());
                
index e48b9a1..58e3248 100644 (file)
@@ -8,7 +8,7 @@
         </encoder>
     </appender>
     
-    <logger name="org.openecomp.policy.drools.system.test" level="INFO"/>
+    <logger name="org.onap.policy.drools.system.test" level="INFO"/>
 
     <root level="warn">
         <appender-ref ref="STDOUT"/>
index 108d66d..309839d 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine - Drools PDP
+  ONAP Policy Engine - Drools PDP
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -26,7 +26,7 @@
   <artifactId>policy-utils</artifactId>
 
   <parent>
-    <groupId>org.openecomp.policy.drools-pdp</groupId>
+    <groupId>org.onap.policy.drools-pdp</groupId>
     <artifactId>drools-pdp</artifactId>
     <version>1.1.0-SNAPSHOT</version>
   </parent>
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.utils;
+package org.onap.policy.drools.utils;
 
 /**
  * This is a base interface that is used to control the order of a list
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.utils;
+package org.onap.policy.drools.utils;
 
 import java.util.Collections;
 import java.util.Comparator;
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.utils;
+package org.onap.policy.drools.utils;
 
 public class Pair<F,S> {
        
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.utils;
+package org.onap.policy.drools.utils;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.utils;
+package org.onap.policy.drools.utils;
 
 public class Triple<F,S,T> {
        
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.utils;
+package org.onap.policy.drools.utils;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/pom.xml b/pom.xml
index 91ebb24..8529f9d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine - Drools PDP
+  ONAP Policy Engine - Drools PDP
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
 
-       <groupId>org.openecomp.policy.drools-pdp</groupId>
+       <groupId>org.onap.policy.drools-pdp</groupId>
        <artifactId>drools-pdp</artifactId>
        <version>1.1.0-SNAPSHOT</version>
        <packaging>pom</packaging>
        <name>Policy Engine - Drools PDP</name>
 
-       <description>The ECOMP Policy Engine drools-based PDP Project</description>
+       <description>The ONAP Policy Engine drools-based PDP Project</description>
 
        <properties>
                <maven.compiler.source>1.8</maven.compiler.source>
 
        <repositories>
                <repository>
-                       <id>ecomp-snapshots</id>
-                       <name>OpenECOMP Snapshot Repository</name>
+                       <id>onap-snapshots</id>
+                       <name>ONAP Snapshot Repository</name>
                        <url>${nexusproxy}/${snapshots.path}</url>
                </repository>
                <repository>
-                       <id>ecomp-releases</id>
-                       <name>OpenECOMP Release Repository</name>
+                       <id>onap-releases</id>
+                       <name>ONAP Release Repository</name>
                        <url>${nexusproxy}/${releases.path}</url>
                </repository>
                <repository>
-                       <id>ecomp-staging</id>
-                       <name>OpenECOMP Staging Repository</name>
+                       <id>onap-staging</id>
+                       <name>ONAP Staging Repository</name>
                        <url>${nexusproxy}/${staging.path}</url>
                </repository>
        </repositories>
 
        <distributionManagement>
                <repository>
-                       <id>ecomp-releases</id>
-                       <name>OpenECOMP Release Repository</name>
+                       <id>onap-releases</id>
+                       <name>ONAP Release Repository</name>
                        <url>${nexusproxy}/${releases.path}</url>
                </repository>
                <snapshotRepository>
-                       <id>ecomp-snapshots</id>
-                       <name>OpenECOMP Snapshot Repository</name>
+                       <id>onap-snapshots</id>
+                       <name>ONAP Snapshot Repository</name>
                        <url>${nexusproxy}/${snapshots.path}</url>
                </snapshotRepository>
                <site>
-                       <id>ecomp-site</id>
+                       <id>onap-site</id>
                        <url>dav:${nexusproxy}${sitePath}</url>
                </site>
        </distributionManagement>
                                <configuration>
                                        <nexusUrl>${nexusproxy}</nexusUrl>
                                        <stagingProfileId>176c31dfe190a</stagingProfileId>
-                                       <serverId>ecomp-staging</serverId>
+                                       <serverId>onap-staging</serverId>
                                </configuration>
                        </plugin>
                        <plugin>
                                        <configuration>
                                                <dumpOnExit>true</dumpOnExit>
                                                <includes>
-                                                       <include>org.openecomp.*</include>
+                                                       <include>org.onap.*</include>
                                                </includes>
                                        </configuration>
                                        <executions>