From: Jorge Hernandez Date: Thu, 17 Aug 2017 19:46:36 +0000 (-0500) Subject: installation improvements and renaming archetype X-Git-Tag: v1.1.0~126^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=05aceee2186ee6cf05f6963e2435f8b44b389e62;p=policy%2Fdrools-applications.git installation improvements and renaming archetype Two changes: - remove hardcoding of the DMaaP hosts, and DCAE topic to make it configurable. - rename archetype to better name. Change-Id: Ic50b9d1f06a138230c76cc6c50ca8072dc5da148 Issue-ID: POLICY-159 Signed-off-by: Jorge Hernandez --- diff --git a/controlloop/packages/artifacts/pom.xml b/controlloop/packages/artifacts/pom.xml index cce85c710..27ec28a84 100644 --- a/controlloop/packages/artifacts/pom.xml +++ b/controlloop/packages/artifacts/pom.xml @@ -146,7 +146,7 @@ org.onap.policy.drools-applications - archetype-closedloop-demo-rules + archetype-cl-legacy ${project.version} jar diff --git a/controlloop/packages/basex/src/files/bin/create-closed-loop-demo.sh b/controlloop/packages/basex/src/files/bin/create-cl-legacy similarity index 99% rename from controlloop/packages/basex/src/files/bin/create-closed-loop-demo.sh rename to controlloop/packages/basex/src/files/bin/create-cl-legacy index be9801294..9aaa3c875 100644 --- a/controlloop/packages/basex/src/files/bin/create-closed-loop-demo.sh +++ b/controlloop/packages/basex/src/files/bin/create-cl-legacy @@ -199,7 +199,7 @@ if [ ! -w "${DIR_TMP}" ]; then fi ARCHETYPE_GROUP_ID="org.onap.policy.drools-applications" -ARCHETYPE_ARTIFACT_ID="archetype-closedloop-demo-rules" +ARCHETYPE_ARTIFACT_ID="archetype-cl-legacy" if [ -d "${DIR_TMP}/${ARTIFACTID}/" ]; then if [ "$(ls -A "${DIR_TMP}/${ARTIFACTID}"/)" ]; then @@ -234,7 +234,6 @@ cd "${DIR_TMP}" mvn archetype:generate \ -B \ - -DarchetypeCatalog=local \ -DarchetypeGroupId="${ARCHETYPE_GROUP_ID}" \ -DarchetypeArtifactId="${ARCHETYPE_ARTIFACT_ID}" \ -DarchetypeVersion="${VERSION}" \ diff --git a/controlloop/packages/basex/src/files/config/vDNS-controller.properties b/controlloop/packages/basex/src/files/config/vDNS-controller.properties index 7da128f29..8f1371dc5 100644 --- a/controlloop/packages/basex/src/files/config/vDNS-controller.properties +++ b/controlloop/packages/basex/src/files/config/vDNS-controller.properties @@ -20,16 +20,16 @@ controller.name=vDNS -ueb.source.topics=DCAE-CL-EVENT,APPC-CL +ueb.source.topics=${{DCAE_TOPIC}},APPC-CL -ueb.source.topics.DCAE-CL-EVENT.servers=vm1.mr.simpledemo.openecomp.org -ueb.source.topics.DCAE-CL-EVENT.apiKey= -ueb.source.topics.DCAE-CL-EVENT.apiSecret= -ueb.source.topics.DCAE-CL-EVENT.events=org.onap.policy.controlloop.VirtualControlLoopEvent -ueb.source.topics.DCAE-CL-EVENT.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=closedLoopEventStatus\=.*,closedLoopControlName\=.*DNS.* -ueb.source.topics.DCAE-CL-EVENT.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty +ueb.source.topics.${{DCAE_TOPIC}}.servers=${{DCAE_SERVERS}} +ueb.source.topics.${{DCAE_TOPIC}}.apiKey= +ueb.source.topics.${{DCAE_TOPIC}}.apiSecret= +ueb.source.topics.${{DCAE_TOPIC}}.events=org.onap.policy.controlloop.VirtualControlLoopEvent +ueb.source.topics.${{DCAE_TOPIC}}.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=closedLoopEventStatus\=.*,closedLoopControlName\=.*DNS.* +ueb.source.topics.${{DCAE_TOPIC}}.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty -ueb.source.topics.APPC-CL.servers=vm1.mr.simpledemo.openecomp.org +ueb.source.topics.APPC-CL.servers=${{DMAAP_SERVERS}} ueb.source.topics.APPC-CL.apiKey= ueb.source.topics.APPC-CL.apiSecret= ueb.source.topics.APPC-CL.events=org.onap.policy.appc.Response @@ -38,13 +38,13 @@ ueb.source.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serializa ueb.sink.topics=APPC-CL,POLICY-CL-MGT -ueb.sink.topics.APPC-CL.servers=vm1.mr.simpledemo.openecomp.org +ueb.sink.topics.APPC-CL.servers=${{DMAAP_SERVERS}} ueb.sink.topics.APPC-CL.apiKey= ueb.sink.topics.APPC-CL.apiSecret= ueb.sink.topics.APPC-CL.events=org.onap.policy.appc.Request ueb.sink.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty -ueb.sink.topics.POLICY-CL-MGT.servers=vm1.mr.simpledemo.openecomp.org +ueb.sink.topics.POLICY-CL-MGT.servers=${{DMAAP_SERVERS}} 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 diff --git a/controlloop/packages/basex/src/files/config/vFW-controller.properties b/controlloop/packages/basex/src/files/config/vFW-controller.properties index 8b8587504..10a0bf474 100644 --- a/controlloop/packages/basex/src/files/config/vFW-controller.properties +++ b/controlloop/packages/basex/src/files/config/vFW-controller.properties @@ -20,16 +20,16 @@ controller.name=vFW -ueb.source.topics=DCAE-CL-EVENT,APPC-CL +ueb.source.topics=${{DCAE_TOPIC}},APPC-CL -ueb.source.topics.DCAE-CL-EVENT.servers=vm1.mr.simpledemo.openecomp.org -ueb.source.topics.DCAE-CL-EVENT.apiKey= -ueb.source.topics.DCAE-CL-EVENT.apiSecret= -ueb.source.topics.DCAE-CL-EVENT.events=org.onap.policy.controlloop.VirtualControlLoopEvent -ueb.source.topics.DCAE-CL-EVENT.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=closedLoopEventStatus\=.*,closedLoopControlName\=.*FRWL.* -ueb.source.topics.DCAE-CL-EVENT.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty +ueb.source.topics.${{DCAE_TOPIC}}.servers=${{DCAE_SERVERS}} +ueb.source.topics.${{DCAE_TOPIC}}.apiKey= +ueb.source.topics.${{DCAE_TOPIC}}.apiSecret= +ueb.source.topics.${{DCAE_TOPIC}}.events=org.onap.policy.controlloop.VirtualControlLoopEvent +ueb.source.topics.${{DCAE_TOPIC}}.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=closedLoopEventStatus\=.*,closedLoopControlName\=.*FRWL.* +ueb.source.topics.${{DCAE_TOPIC}}.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty -ueb.source.topics.APPC-CL.servers=vm1.mr.simpledemo.openecomp.org +ueb.source.topics.APPC-CL.servers=${{DMAAP_SERVERS}} ueb.source.topics.APPC-CL.apiKey= ueb.source.topics.APPC-CL.apiSecret= ueb.source.topics.APPC-CL.events=org.onap.policy.appc.Response @@ -38,13 +38,13 @@ ueb.source.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serializa ueb.sink.topics=APPC-CL,POLICY-CL-MGT -ueb.sink.topics.APPC-CL.servers=vm1.mr.simpledemo.openecomp.org +ueb.sink.topics.APPC-CL.servers=${{DMAAP_SERVERS}} ueb.sink.topics.APPC-CL.apiKey= ueb.sink.topics.APPC-CL.apiSecret= ueb.sink.topics.APPC-CL.events=org.onap.policy.appc.Request ueb.sink.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty -ueb.sink.topics.POLICY-CL-MGT.servers=vm1.mr.simpledemo.openecomp.org +ueb.sink.topics.POLICY-CL-MGT.servers=${{DMAAP_SERVERS}} 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 diff --git a/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/pom.xml b/controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/pom.xml similarity index 91% rename from controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/pom.xml rename to controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/pom.xml index 6eae97484..c8691c505 100644 --- a/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/pom.xml +++ b/controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/pom.xml @@ -29,11 +29,11 @@ 1.1.0-SNAPSHOT - archetype-closedloop-demo-rules + archetype-cl-legacy maven-archetype - archetype-closed-loop-demo-rules - archetype to generate a closed loop demo rules jar + archetype-cl-legacy + archetype to generate a control loop rules jar not using yaml diff --git a/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/META-INF/maven/archetype-metadata.xml b/controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/main/resources/META-INF/maven/archetype-metadata.xml similarity index 100% rename from controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/META-INF/maven/archetype-metadata.xml rename to controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/main/resources/META-INF/maven/archetype-metadata.xml 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-cl-legacy/src/main/resources/archetype-resources/pom.xml similarity index 97% rename from controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/pom.xml rename to controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/main/resources/archetype-resources/pom.xml index b0a7639d1..ee5adc80c 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-cl-legacy/src/main/resources/archetype-resources/pom.xml @@ -28,7 +28,7 @@ ${version} ${artifactId} - Closed Loop Demo Rules + Control Loop Legacy Rules for 1.0.0 1.8 diff --git a/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties b/controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties similarity index 100% rename from controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties rename to controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties 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-cl-legacy/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.rest.json similarity index 100% rename from controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.rest.json rename to controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.rest.json diff --git a/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/config/appc.accepted.json b/controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/main/resources/archetype-resources/src/main/config/appc.accepted.json similarity index 100% rename from controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/config/appc.accepted.json rename to controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/main/resources/archetype-resources/src/main/config/appc.accepted.json diff --git a/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/config/appc.success.json b/controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/main/resources/archetype-resources/src/main/config/appc.success.json similarity index 100% rename from controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/config/appc.success.json rename to controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/main/resources/archetype-resources/src/main/config/appc.success.json diff --git a/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/config/dcae.onset.json b/controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/main/resources/archetype-resources/src/main/config/dcae.onset.json similarity index 100% rename from controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/config/dcae.onset.json rename to controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/main/resources/archetype-resources/src/main/config/dcae.onset.json 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-cl-legacy/src/main/resources/archetype-resources/src/main/resources/ControlLoopDemo__closedLoopControlName__.drl similarity index 100% rename from controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/resources/ControlLoopDemo__closedLoopControlName__.drl rename to controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/main/resources/archetype-resources/src/main/resources/ControlLoopDemo__closedLoopControlName__.drl diff --git a/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/resources/META-INF/kmodule.xml b/controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/main/resources/archetype-resources/src/main/resources/META-INF/kmodule.xml similarity index 100% rename from controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/resources/META-INF/kmodule.xml rename to controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/main/resources/archetype-resources/src/main/resources/META-INF/kmodule.xml diff --git a/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/test/resources/projects/basic/archetype.properties b/controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/test/resources/projects/basic/archetype.properties similarity index 100% rename from controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/test/resources/projects/basic/archetype.properties rename to controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/test/resources/projects/basic/archetype.properties diff --git a/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/test/resources/projects/basic/goal.txt b/controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/test/resources/projects/basic/goal.txt similarity index 100% rename from controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/test/resources/projects/basic/goal.txt rename to controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/test/resources/projects/basic/goal.txt diff --git a/controlloop/templates/template.demo.v1.0.0/pom.xml b/controlloop/templates/template.demo.v1.0.0/pom.xml index 4a746135a..f32ed27bf 100644 --- a/controlloop/templates/template.demo.v1.0.0/pom.xml +++ b/controlloop/templates/template.demo.v1.0.0/pom.xml @@ -24,18 +24,17 @@ 4.0.0 template.demo.v1.0.0 - pom + pom - - org.onap.policy.drools-applications - templates - 1.1.0-SNAPSHOT - - - - archetype-closedloop-demo-rules - template.demo - + + org.onap.policy.drools-applications + templates + 1.1.0-SNAPSHOT + + + archetype-cl-legacy + template.demo +