enhancements to archetype and apps packaging

Change-Id: I3e659d35d3cb397c011657f39ef12b10b0564fc9
Issue-ID: POLICY-162
Signed-off-by: Jorge Hernandez <jh1730@att.com>

4 files changed, 51 insertions, 21 deletions

diff --git a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/pom.xml b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/pom.xml
index e0a967f3d..12d2b944c 100644
--- a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/pom.xml
+++ b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/pom.xml
@@ -129,6 +129,11 @@
 			<version>${dependenciesVersion}</version>
 		</dependency>
 		<dependency>
+			<groupId>com.att.research.xacml</groupId>
+			<artifactId>xacml-pdp</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+		<dependency>
 		   <groupId>org.onap.policy.drools-pdp</groupId>
 		   <artifactId>policy-management</artifactId>
 		   <version>${dependenciesVersion}</version>
diff --git a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties
index ddc70d784..18daf6a50 100644
--- a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties
+++ b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties
@@ -33,22 +33,22 @@ ueb.source.topics.APPC-CL.servers=${dmaapServers}
 ueb.source.topics.APPC-CL.apiKey=
 ueb.source.topics.APPC-CL.apiSecret=
 ueb.source.topics.APPC-CL.events=org.onap.policy.appclcm.LCMResponseWrapper
-ueb.source.topics.APPC-CL.events.org.onap.policy.appclcm.LCMResponseWrapper.filter=body\=.*
+ueb.source.topics.APPC-CL.events.org.onap.policy.appclcm.LCMResponseWrapper.filter=type\=response
 ueb.source.topics.APPC-CL.events.custom.gson=org.onap.policy.appclcm.util.Serialization,gson
 
-ueb.sink.topics=APPC-CL,POLICY-CL-MGT
+noop.sink.topics=APPC-CL,POLICY-CL-MGT
 
-ueb.sink.topics.APPC-CL.servers=${dmaapServers}
-ueb.sink.topics.APPC-CL.apiKey=
-ueb.sink.topics.APPC-CL.apiSecret=
-ueb.sink.topics.APPC-CL.events=org.onap.policy.appclcm.LCMRequestWrapper
-ueb.sink.topics.APPC-CL.events.custom.gson=org.onap.policy.appclcm.util.Serialization,gson
+noop.sink.topics.APPC-CL.servers=${dmaapServers}
+noop.sink.topics.APPC-CL.apiKey=
+noop.sink.topics.APPC-CL.apiSecret=
+noop.sink.topics.APPC-CL.events=org.onap.policy.appclcm.LCMRequestWrapper
+noop.sink.topics.APPC-CL.events.custom.gson=org.onap.policy.appclcm.util.Serialization,gson
 
-ueb.sink.topics.POLICY-CL-MGT.servers=${dmaapServers}
-ueb.sink.topics.POLICY-CL-MGT.apiKey=
-ueb.sink.topics.POLICY-CL-MGT.apiSecret=
-ueb.sink.topics.POLICY-CL-MGT.events=org.onap.policy.controlloop.VirtualControlLoopNotification
-ueb.sink.topics.POLICY-CL-MGT.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty
+noop.sink.topics.POLICY-CL-MGT.servers=${dmaapServers}
+noop.sink.topics.POLICY-CL-MGT.apiKey=
+noop.sink.topics.POLICY-CL-MGT.apiSecret=
+noop.sink.topics.POLICY-CL-MGT.events=org.onap.policy.controlloop.VirtualControlLoopNotification
+noop.sink.topics.POLICY-CL-MGT.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty
 
 rules.groupId=${groupId}
 rules.artifactId=${artifactId}
diff --git a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.rest.json b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.rest.json
index 68d565dcd..356af7d99 100644
--- a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.rest.json
+++ b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.rest.json
@@ -10,18 +10,18 @@
 	
 	"ueb.source.topics.APPC-CL.servers": "${dmaapServers}",
 	"ueb.source.topics.APPC-CL.events": "org.onap.policy.appclcm.LCMResponseWrapper",
-	"ueb.source.topics.APPC-CL.events.org.onap.policy.appclcm.LCMResponseWrapper.filter": "common-header=.*,status=.*",
+	"ueb.source.topics.APPC-CL.events.org.onap.policy.appclcm.LCMResponseWrapper.filter": "type=response",
 	"ueb.source.topics.APPC-CL.events.custom.gson": "org.onap.policy.appclcm.util.Serialization,gson",
 	
-	"ueb.sink.topics": "APPC-CL,POLICY-CL-MGT",
+	"noop.sink.topics": "APPC-CL,POLICY-CL-MGT",
 
-	"ueb.sink.topics.APPC-CL.servers": "${dmaapServers}",
-	"ueb.sink.topics.APPC-CL.events": "org.onap.policy.appclcm.LCMRequestWrapper",
-	"ueb.sink.topics.APPC-CL.events.custom.gson": "org.onap.policy.appclcm.util.Serialization,gson",
+	"noop.sink.topics.APPC-CL.servers": "${dmaapServers}",
+	"noop.sink.topics.APPC-CL.events": "org.onap.policy.appclcm.LCMRequestWrapper",
+	"noop.sink.topics.APPC-CL.events.custom.gson": "org.onap.policy.appclcm.util.Serialization,gson",
 	
-	"ueb.sink.topics.POLICY-CL-MGT.servers": "${dmaapServers}",
-	"ueb.sink.topics.POLICY-CL-MGT.events": "org.onap.policy.controlloop.VirtualControlLoopNotification",
-	"ueb.sink.topics.POLICY-CL-MGT.events.custom.gson": "org.onap.policy.controlloop.util.Serialization,gson",
+	"noop.sink.topics.POLICY-CL-MGT.servers": "${dmaapServers}",
+	"noop.sink.topics.POLICY-CL-MGT.events": "org.onap.policy.controlloop.VirtualControlLoopNotification",
+	"noop.sink.topics.POLICY-CL-MGT.events.custom.gson": "org.onap.policy.controlloop.util.Serialization,gson",
 	
 	"rules.groupId": "${groupId}",
 	"rules.artifactId": "${artifactId}",
diff --git a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
index 3e4f76c2f..5e90f052d 100644
--- a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
+++ b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
@@ -106,12 +106,37 @@ rule "${policyName}.SETUP"
     params.setControlLoopYaml("${controlLoopYaml}");
     insert(params);
 
-
     // Note: globals have bad behavior when persistence is used,
     //       hence explicitly getting the logger vs using a global
     
     Logger logger = LoggerFactory.getLogger(drools.getRule().getPackage());
     logger.info("{}: {} : YAML=[{}]", params.getClosedLoopControlName(), drools.getRule().getName(), params.getControlLoopYaml());
+    
+    String sqlDbUsername = PolicyEngine.manager.getEnvironmentProperty("sql.db.username");
+    String sqlDbPassword = PolicyEngine.manager.getEnvironmentProperty("sql.db.password");
+    
+    String aaiUrl = PolicyEngine.manager.getEnvironmentProperty("aai.url");
+    String aaiUsername = PolicyEngine.manager.getEnvironmentProperty("aai.username");
+    String aaiPassword = PolicyEngine.manager.getEnvironmentProperty("aai.password");
+    
+    String soUrl =PolicyEngine.manager.getEnvironmentProperty("so.url");
+    String soUsername = PolicyEngine.manager.getEnvironmentProperty("so.username");
+    String soPassword = PolicyEngine.manager.getEnvironmentProperty("so.password");
+    
+    String vfcUrl =PolicyEngine.manager.getEnvironmentProperty("vfc.url");
+    String vfcUsername = PolicyEngine.manager.getEnvironmentProperty("vfc.username");
+    String vfcPassword = PolicyEngine.manager.getEnvironmentProperty("vfc.password");
+    
+    String guardUrl =PolicyEngine.manager.getEnvironmentProperty("guard.url");
+    String guardUsername = PolicyEngine.manager.getEnvironmentProperty("guard.username");
+    String guardPassword = PolicyEngine.manager.getEnvironmentProperty("guard.password");
+    String guardJdbcUrl = PolicyEngine.manager.getEnvironmentProperty("guard.jdbc.url");
+    
+    logger.info("{}: {} : AAI=[{}:{}]", params.getClosedLoopControlName(), drools.getRule().getName(), aaiUrl, aaiUsername);
+    logger.info("{}: {} : SO=[{}:{}]", params.getClosedLoopControlName(), drools.getRule().getName(), soUrl, soUsername);
+    logger.info("{}: {} : VFC=[{}:{}]", params.getClosedLoopControlName(), drools.getRule().getName(), vfcUrl, vfcUsername);
+    logger.info("{}: {} : GUARD=[{}:{}:{}]", params.getClosedLoopControlName(), drools.getRule().getName(), guardUrl, guardUsername, guardJdbcUrl);
+    logger.info("{}: {} : DB=[{}:{}]", params.getClosedLoopControlName(), drools.getRule().getName(), sqlDbUsername, sqlDbPassword);
 end
 
 /*