From c182c8b95eda734f9d12dfa41e2959a1fc32ce42 Mon Sep 17 00:00:00 2001 From: "Gao, Chenfei (cg287m)" Date: Fri, 21 Jul 2017 17:03:44 -0400 Subject: [POLICY-76] Remove/rename ATT internal stuffs Change-Id: I251bd2c4f6852a563a4899024d138ebad6c52999 Signed-off-by: Gao, Chenfei (cg287m) --- .../src/main/resources/archetype-resources/pom.xml | 14 +++++++------- .../main/config/__artifactId__-controller.rest.json | 20 ++++++++++---------- .../ControlLoopDemo__closedLoopControlName__.drl | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-) (limited to 'controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main') diff --git a/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/pom.xml b/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/pom.xml index c3973a7d9..370431dfb 100644 --- a/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/pom.xml +++ b/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/pom.xml @@ -37,37 +37,37 @@ - org.openecomp.policy.drools-applications + org.onap.policy.drools-applications demo ${dependenciesVersion} - org.openecomp.policy.drools-applications + org.onap.policy.drools-applications controlloop ${dependenciesVersion} - org.openecomp.policy.drools-applications + org.onap.policy.drools-applications rest ${dependenciesVersion} - org.openecomp.policy.drools-applications + org.onap.policy.drools-applications appc ${dependenciesVersion} - org.openecomp.policy.drools-applications + org.onap.policy.drools-applications aai ${dependenciesVersion} - org.openecomp.policy.drools-applications + org.onap.policy.drools-applications mso ${dependenciesVersion} - org.openecomp.policy.drools-applications + org.onap.policy.drools-applications trafficgenerator ${dependenciesVersion} diff --git a/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.rest.json b/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.rest.json index de5db52df..712cf7034 100644 --- a/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.rest.json +++ b/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.rest.json @@ -6,30 +6,30 @@ "ueb.source.topics.${dcaeTopic}.servers": "${dcaeServers}", "ueb.source.topics.${dcaeTopic}.apiKey": "${dcaeApiKey}", "ueb.source.topics.${dcaeTopic}.apiSecret": "${dcaeApiSecret}", - "ueb.source.topics.${dcaeTopic}.events": "org.openecomp.policy.controlloop.VirtualControlLoopEvent", - "ueb.source.topics.${dcaeTopic}.events.org.openecomp.policy.controlloop.VirtualControlLoopEvent.filter": "closedLoopEventStatus=.*", - "ueb.source.topics.${dcaeTopic}.events.custom.gson": "org.openecomp.policy.controlloop.util.Serialization,gsonPretty", + "ueb.source.topics.${dcaeTopic}.events": "org.onap.policy.controlloop.VirtualControlLoopEvent", + "ueb.source.topics.${dcaeTopic}.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter": "closedLoopEventStatus=.*", + "ueb.source.topics.${dcaeTopic}.events.custom.gson": "org.onap.policy.controlloop.util.Serialization,gsonPretty", "ueb.source.topics.${appcTopic}.servers": "${appcServers}", "ueb.source.topics.${appcTopic}.apiKey": "${appcApiKey}", "ueb.source.topics.${appcTopic}.apiSecret": "${appcApiSecret}", - "ueb.source.topics.${appcTopic}.events": "org.openecomp.policy.appc.Response", - "ueb.source.topics.${appcTopic}.events.org.openecomp.policy.appc.Response.filter": "CommonHeader=.*,Status=.*", - "ueb.source.topics.${appcTopic}.events.custom.gson": "org.openecomp.policy.appc.util.Serialization,gsonPretty", + "ueb.source.topics.${appcTopic}.events": "org.onap.policy.appc.Response", + "ueb.source.topics.${appcTopic}.events.org.onap.policy.appc.Response.filter": "CommonHeader=.*,Status=.*", + "ueb.source.topics.${appcTopic}.events.custom.gson": "org.onap.policy.appc.util.Serialization,gsonPretty", "ueb.sink.topics": "${appcTopic},${notificationTopic}", "ueb.sink.topics.${appcTopic}.servers": "${appcServers}", "ueb.sink.topics.${appcTopic}.apiKey": "${appcApiKey}", "ueb.sink.topics.${appcTopic}.apiSecret": "${appcApiSecret}", - "ueb.sink.topics.${appcTopic}.events": "org.openecomp.policy.appc.Request", - "ueb.sink.topics.${appcTopic}.events.custom.gson": "org.openecomp.policy.appc.util.Serialization,gsonPretty", + "ueb.sink.topics.${appcTopic}.events": "org.onap.policy.appc.Request", + "ueb.sink.topics.${appcTopic}.events.custom.gson": "org.onap.policy.appc.util.Serialization,gsonPretty", "ueb.sink.topics.${notificationTopic}.servers": "${notificationServers}", "ueb.sink.topics.${notificationTopic}.apiKey": "${notificationApiKey}", "ueb.sink.topics.${notificationTopic}.apiSecret": "${notificationApiSecret}", - "ueb.sink.topics.${notificationTopic}.events": "org.openecomp.policy.controlloop.VirtualControlLoopNotification", - "ueb.sink.topics.${notificationTopic}.events.custom.gson": "org.openecomp.policy.controlloop.util.Serialization,gsonPretty", + "ueb.sink.topics.${notificationTopic}.events": "org.onap.policy.controlloop.VirtualControlLoopNotification", + "ueb.sink.topics.${notificationTopic}.events.custom.gson": "org.onap.policy.controlloop.util.Serialization,gsonPretty", "rules.groupId": "${groupId}", "rules.artifactId": "${artifactId}", diff --git a/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/resources/ControlLoopDemo__closedLoopControlName__.drl b/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/resources/ControlLoopDemo__closedLoopControlName__.drl index 98b7b060c..ff5d82e5e 100644 --- a/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/resources/ControlLoopDemo__closedLoopControlName__.drl +++ b/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/resources/ControlLoopDemo__closedLoopControlName__.drl @@ -78,7 +78,7 @@ import org.onap.policy.mso.MSORelatedInstanceListElement; import org.onap.policy.mso.MSORelatedInstance; import org.onap.policy.mso.MSOResponse; -import org.openecomp.policy.drools.system.PolicyEngine; +import org.onap.policy.drools.system.PolicyEngine; // // These parameters are required to build the runtime policy -- cgit 1.2.3-korg