Restructuring packaged features installation

Some cleaning on the installation.

feature-controlloop-management will be installed by default and will contain
new capabilities plus common functionality from amsterdam and casablanca.

Change-Id: Ic751d3002b5b05342138c77f61209b6c32010ce9
Issue-ID: POLICY-1367
Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>

diff --git a/controlloop/common/controller-casablanca/pom.xml b/controlloop/common/controller-casablanca/pom.xml
index 078f0f4..0769386 100644 (file)
--- a/controlloop/common/controller-casablanca/pom.xml
+++ b/controlloop/common/controller-casablanca/pom.xml
@@ -3,7 +3,7 @@
   ============LICENSE_START=======================================================
   ONAP
   ================================================================================
-  Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -76,101 +76,121 @@
             <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
             <artifactId>events</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
             <artifactId>appc</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
             <artifactId>appclcm</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
             <artifactId>sdnr</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
             <artifactId>vfc</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
             <artifactId>sdnc</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
             <artifactId>so</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
             <artifactId>aai</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
             <artifactId>sdc</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
             <artifactId>trafficgenerator</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
             <artifactId>eventmanager</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
             <artifactId>guard</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
             <artifactId>actorServiceProvider</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
             <artifactId>actor.appc</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
             <artifactId>actor.appclcm</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
             <artifactId>actor.sdnr</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
             <artifactId>actor.so</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
             <artifactId>actor.vfc</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
             <artifactId>actor.sdnc</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
             <artifactId>policy-yaml</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.att.research.xacml</groupId>

diff --git a/controlloop/common/feature-controlloop-amsterdam/pom.xml b/controlloop/common/feature-controlloop-amsterdam/pom.xml
index 1672728..ef67282 100644 (file)
--- a/controlloop/common/feature-controlloop-amsterdam/pom.xml
+++ b/controlloop/common/feature-controlloop-amsterdam/pom.xml
@@ -2,7 +2,7 @@
   ============LICENSE_START=======================================================
   ONAP
   ================================================================================
-  Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -89,199 +89,11 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-            <artifactId>events</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-            <artifactId>appc</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-            <artifactId>appclcm</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-            <artifactId>sdnr</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-            <artifactId>sdnc</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-            <artifactId>vfc</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-            <artifactId>so</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-            <artifactId>aai</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-            <artifactId>sdc</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-            <artifactId>trafficgenerator</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-            <artifactId>eventmanager</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-            <artifactId>guard</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
-            <artifactId>actorServiceProvider</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>guava</artifactId>
-                    <groupId>com.google.guava</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
-            <artifactId>actor.appc</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>guava</artifactId>
-                    <groupId>com.google.guava</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
-            <artifactId>actor.appclcm</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>guava</artifactId>
-                    <groupId>com.google.guava</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
-            <artifactId>actor.sdnr</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>guava</artifactId>
-                    <groupId>com.google.guava</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
-            <artifactId>actor.so</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>guava</artifactId>
-                    <groupId>com.google.guava</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
-            <artifactId>actor.vfc</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>guava</artifactId>
-                    <groupId>com.google.guava</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
-            <artifactId>actor.sdnc</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>guava</artifactId>
-                    <groupId>com.google.guava</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-            <artifactId>policy-yaml</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>guava</artifactId>
-                    <groupId>com.google.guava</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>snakeyaml</artifactId>
-                    <groupId>org.yaml</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.att.research.xacml</groupId>
-            <artifactId>xacml-pdp</artifactId>
-            <version>1.0.2</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-codec</artifactId>
-                    <groupId>commons-codec</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>guava</artifactId>
-                    <groupId>com.google.guava</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>commons-lang3</artifactId>
-                    <groupId>org.apache.commons</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>jackson-databind</artifactId>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>commons-collections</artifactId>
-                    <groupId>commons-collections</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>commons-lang</artifactId>
-                    <groupId>commons-lang</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.onap.policy.drools-pdp</groupId>
             <artifactId>policy-management</artifactId>
             <version>${version.policy.drools-pdp}</version>
             <scope>provided</scope>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/controlloop/common/feature-controlloop-casablanca/pom.xml b/controlloop/common/feature-controlloop-casablanca/pom.xml
index 4cee383..a72a44d 100644 (file)
--- a/controlloop/common/feature-controlloop-casablanca/pom.xml
+++ b/controlloop/common/feature-controlloop-casablanca/pom.xml
@@ -2,7 +2,7 @@
   ============LICENSE_START=======================================================
   ONAP
   ================================================================================
-  Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -86,7 +86,7 @@
                             <addParentPoms>false</addParentPoms>
                             <copyPom>false</copyPom>
                             <includeScope>runtime</includeScope>
-                            <excludeTransitive>false</excludeTransitive>
+                            <excludeTransitive>true</excludeTransitive>
                         </configuration>
                     </execution>
                 </executions>
@@ -95,199 +95,16 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-            <artifactId>events</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-            <artifactId>appc</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-            <artifactId>appclcm</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-            <artifactId>sdnr</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-            <artifactId>vfc</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-            <artifactId>sdnc</artifactId>
-            <version>${project.version}</version>
-        </dependency>        
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-            <artifactId>so</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-            <artifactId>aai</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-            <artifactId>sdc</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-            <artifactId>trafficgenerator</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-            <artifactId>eventmanager</artifactId>
+            <artifactId>controller-casablanca</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-            <artifactId>guard</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
-            <artifactId>actorServiceProvider</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>guava</artifactId>
-                    <groupId>com.google.guava</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
-            <artifactId>actor.appc</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>guava</artifactId>
-                    <groupId>com.google.guava</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
-            <artifactId>actor.appclcm</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>guava</artifactId>
-                    <groupId>com.google.guava</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
-            <artifactId>actor.sdnr</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>guava</artifactId>
-                    <groupId>com.google.guava</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
-            <artifactId>actor.so</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>guava</artifactId>
-                    <groupId>com.google.guava</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
-            <artifactId>actor.vfc</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>guava</artifactId>
-                    <groupId>com.google.guava</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
-            <artifactId>actor.sdnc</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>guava</artifactId>
-                    <groupId>com.google.guava</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>        
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-            <artifactId>policy-yaml</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>guava</artifactId>
-                    <groupId>com.google.guava</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>snakeyaml</artifactId>
-                    <groupId>org.yaml</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.att.research.xacml</groupId>
-            <artifactId>xacml-pdp</artifactId>
-            <version>1.0.2</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-codec</artifactId>
-                    <groupId>commons-codec</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>guava</artifactId>
-                    <groupId>com.google.guava</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>commons-lang3</artifactId>
-                    <groupId>org.apache.commons</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>jackson-databind</artifactId>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>commons-collections</artifactId>
-                    <groupId>commons-collections</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>commons-lang</artifactId>
-                    <groupId>commons-lang</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.onap.policy.drools-pdp</groupId>
             <artifactId>policy-management</artifactId>
             <version>${version.policy.drools-pdp}</version>
             <scope>provided</scope>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/controlloop/common/feature-controlloop-casablanca/src/assembly/assemble_zip.xml b/controlloop/common/feature-controlloop-casablanca/src/assembly/assemble_zip.xml
index 7cb6379..9bee6bc 100644 (file)
--- a/controlloop/common/feature-controlloop-casablanca/src/assembly/assemble_zip.xml
+++ b/controlloop/common/feature-controlloop-casablanca/src/assembly/assemble_zip.xml
@@ -2,7 +2,7 @@
   ============LICENSE_START=======================================================
   ONAP
   ================================================================================
-  Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -39,12 +39,22 @@
                                <include>feature-controlloop-casablanca-${project.version}.jar</include>
                        </includes>
                </fileSet>
+               <fileSet>
+                       <directory>target/assembly/lib</directory>
+                       <outputDirectory>artifacts</outputDirectory>
+                       <includes>
+                               <include>controller-casablanca-${project.version}.jar</include>
+                       </includes>
+               </fileSet>
                <fileSet>
                        <directory>target/assembly/lib</directory>
                        <outputDirectory>lib/dependencies</outputDirectory>
                        <includes>
                                <include>*.jar</include>
                        </includes>
+                       <excludes>
+                               <exclude>controller-casablanca-${project.version}.jar</exclude>
+                       </excludes>
                </fileSet>
                <fileSet>
                        <directory>target/classes/config</directory>

diff --git a/controlloop/common/feature-controlloop-management/pom.xml b/controlloop/common/feature-controlloop-management/pom.xml
index aed6563..ed145ac 100644 (file)
--- a/controlloop/common/feature-controlloop-management/pom.xml
+++ b/controlloop/common/feature-controlloop-management/pom.xml
@@ -2,7 +2,7 @@
   ============LICENSE_START=======================================================
   ONAP
   ================================================================================
-  Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -112,17 +112,17 @@
         </dependency>
         <dependency>
             <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-            <artifactId>sdnr</artifactId>
+            <artifactId>sdnc</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-            <artifactId>vfc</artifactId>
+            <artifactId>sdnr</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-            <artifactId>sdnc</artifactId>
+            <artifactId>vfc</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -287,7 +287,6 @@
             <artifactId>policy-management</artifactId>
             <version>${version.policy.drools-pdp}</version>
             <scope>provided</scope>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/controlloop/packages/basex-controlloop/src/files/bin/create-cl-amsterdam b/controlloop/common/feature-controlloop-management/src/main/feature/bin/create-cl-amsterdam
similarity index 98%
rename from controlloop/packages/basex-controlloop/src/files/bin/create-cl-amsterdam
rename to controlloop/common/feature-controlloop-management/src/main/feature/bin/create-cl-amsterdam
index 5beb6e1..b26c04c 100644 (file)
--- a/controlloop/packages/basex-controlloop/src/files/bin/create-cl-amsterdam
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/bin/create-cl-amsterdam
@@ -2,9 +2,9 @@
 
 ###
 # ============LICENSE_START=======================================================
-# PDP-D APPS Base Package
+# ONAP
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ echo
 
 GROUP_ID="org.onap.policy.rules.amsterdam"
 ARTIFACT_ID="amsterdam"
-VERSION="${version:-1.1.1}"
+VERSION="${version:-1.3.4}"
 PACKAGE="org.onap.policy.rules.amsterdam"
 CONTROL_LOOP_NAME="ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e"
 POLICY_SCOPE="amsterdam"

diff --git a/controlloop/packages/basex-controlloop/src/files/bin/create-cl-casablanca b/controlloop/common/feature-controlloop-management/src/main/feature/bin/create-cl-casablanca
similarity index 99%
rename from controlloop/packages/basex-controlloop/src/files/bin/create-cl-casablanca
rename to controlloop/common/feature-controlloop-management/src/main/feature/bin/create-cl-casablanca
index 5e3d26c..b1924d5 100644 (file)
--- a/controlloop/packages/basex-controlloop/src/files/bin/create-cl-casablanca
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/bin/create-cl-casablanca
@@ -1,10 +1,10 @@
-#! /bin/bash
+#!/bin/bash
 
 ###
 # ============LICENSE_START=======================================================
-# PDP-D APPS Base Package
+# ONAP
 # ================================================================================
-# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ echo
 
 GROUP_ID="org.onap.policy.rules.casablanca"
 ARTIFACT_ID="casablanca"
-VERSION="${version:-1.2.0}"
+VERSION="${version:-1.3.4}"
 PACKAGE="org.onap.policy.rules.casablanca"
 
 # vCPE Policy Parameters

diff --git a/controlloop/packages/basex-controlloop/src/files/bin/push-policies-casablanca b/controlloop/common/feature-controlloop-management/src/main/feature/bin/push-policies-casablanca
similarity index 98%
rename from controlloop/packages/basex-controlloop/src/files/bin/push-policies-casablanca
rename to controlloop/common/feature-controlloop-management/src/main/feature/bin/push-policies-casablanca
index 97c4373..2289aea 100644 (file)
--- a/controlloop/packages/basex-controlloop/src/files/bin/push-policies-casablanca
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/bin/push-policies-casablanca
@@ -1,10 +1,10 @@
-#! /bin/bash
+#!/usr/bin/env bash
 
 ###
 # ============LICENSE_START=======================================================
-# PDP-D APPS Base Package
+# ONAP
 # ================================================================================
-# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/controlloop/packages/basex-controlloop/src/files/config/controlloop.properties.environment b/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment
similarity index 94%
rename from controlloop/packages/basex-controlloop/src/files/config/controlloop.properties.environment
rename to controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment
index 4e53b3e..2b63d51 100644 (file)
--- a/controlloop/packages/basex-controlloop/src/files/config/controlloop.properties.environment
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment
@@ -1,15 +1,15 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP APPS Base Package
+# ONAP
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #      http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

diff --git a/controlloop/packages/apps-controlloop/pom.xml b/controlloop/packages/apps-controlloop/pom.xml
index 31875fc..22f6764 100644 (file)
--- a/controlloop/packages/apps-controlloop/pom.xml
+++ b/controlloop/packages/apps-controlloop/pom.xml
@@ -1,15 +1,15 @@
 <!--
   ============LICENSE_START=======================================================
-  PDP-D Application Installation Packages
+  ONAP
   ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

diff --git a/controlloop/packages/apps-controlloop/src/files/apps-controlloop-installer b/controlloop/packages/apps-controlloop/src/files/apps-controlloop-installer
index 4d75ec8..95fef71 100644 (file)
--- a/controlloop/packages/apps-controlloop/src/files/apps-controlloop-installer
+++ b/controlloop/packages/apps-controlloop/src/files/apps-controlloop-installer
@@ -1,17 +1,17 @@
-#!/bin/bash -x
+#!/bin/bash
 
 ###
 # ============LICENSE_START=======================================================
 # Apps Installation Package
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #      http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,15 +31,8 @@ echo "     CONTROL LOOP APP INSTALL     "
 echo "**********************************"
 echo
 
-source ${POLICY_HOME}/etc/build.info
-
-# nothing to do except enabling some features
-
-features install controlloop-trans
-features install controlloop-amsterdam
-features install controlloop-casablanca
-
 features enable controlloop-trans
+features enable controlloop-management
 features enable controlloop-amsterdam
 
 

diff --git a/controlloop/packages/basex-controlloop/pom.xml b/controlloop/packages/basex-controlloop/pom.xml
index e2b57af..5930168 100644 (file)
--- a/controlloop/packages/basex-controlloop/pom.xml
+++ b/controlloop/packages/basex-controlloop/pom.xml
@@ -1,15 +1,15 @@
 <!--
   ============LICENSE_START=======================================================
-  PDP-D Application Installation Packages
+  ONAP
   ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,42 +18,73 @@
   ============LICENSE_END=========================================================
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <packaging>pom</packaging>
-
-  <parent>
-    <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId>
-    <artifactId>packages</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>basex-controlloop</artifactId>
-
-  <name>basex-controlloop</name>
-  <description>Control Loop Drools Applications Base Extension Package</description>
-
-  <build>
-    <plugins>
-      <plugin>
-       <artifactId>maven-assembly-plugin</artifactId>
-       <executions>
-         <execution>
-           <goals>
-             <goal>single</goal>
-           </goals>
-           <phase>package</phase>
-           <configuration>
-             <descriptors>
-                   <descriptor>src/assembly/zip.xml</descriptor>
-             </descriptors>
-             <appendAssemblyId>false</appendAssemblyId>
-           </configuration>
-         </execution>
-       </executions>
-      </plugin>
-    </plugins>
-  </build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId>
+        <artifactId>packages</artifactId>
+        <version>1.4.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>basex-controlloop</artifactId>
+
+    <name>basex-controlloop</name>
+    <description>Control Loop Drools Applications Base Extension Package</description>
+
+    <build>
+
+        <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.basedir}/target</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <includes>
+                                        <include>apps-controlloop-version</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/assembly/zip.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>false</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+
+    </build>
 
 </project>
 

diff --git a/controlloop/packages/basex-controlloop/src/assembly/zip.xml b/controlloop/packages/basex-controlloop/src/assembly/zip.xml
index 1020327..caa943c 100644 (file)
--- a/controlloop/packages/basex-controlloop/src/assembly/zip.xml
+++ b/controlloop/packages/basex-controlloop/src/assembly/zip.xml
@@ -1,15 +1,15 @@
 <!--
   ============LICENSE_START=======================================================
-  PDP-D APPS Base Package
+  ONAP
   ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,18 +19,26 @@
   -->
 
 <assembly>
-       <id>basex-controlloop</id>
-       <formats>
-               <format>tar.gz</format>
-       </formats>
-       <includeBaseDirectory>false</includeBaseDirectory>
-       <fileSets>
-               <fileSet>
-                       <directory>src/files</directory>
-                       <outputDirectory>.</outputDirectory>
-                       <fileMode>755</fileMode>
-                       <directoryMode>700</directoryMode>
-               </fileSet>
-       </fileSets>
+    <id>basex-controlloop</id>
+    <formats>
+        <format>tar.gz</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>src/files</directory>
+            <outputDirectory>.</outputDirectory>
+            <fileMode>755</fileMode>
+            <directoryMode>700</directoryMode>
+        </fileSet>
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory>etc/apps</outputDirectory>
+            <fileMode>755</fileMode>
+            <directoryMode>700</directoryMode>
+            <includes>
+                <include>apps-controlloop-version</include>
+            </includes>
+        </fileSet>
+    </fileSets>
 </assembly>
-

diff --git a/controlloop/packages/basex-controlloop/src/main/resources/apps-controlloop-version b/controlloop/packages/basex-controlloop/src/main/resources/apps-controlloop-version
new file mode 100644 (file)
index 0000000..066e571
--- /dev/null
+++ b/controlloop/packages/basex-controlloop/src/main/resources/apps-controlloop-version
@@ -0,0 +1,21 @@
+###
+# ============LICENSE_START=======================================================
+# ONAP
+# ================================================================================
+# Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+###
+
+APPS_CONTROLLOOP_VERSION=${project.version}

diff --git a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/META-INF/maven/archetype-metadata.xml b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/META-INF/maven/archetype-metadata.xml
index 5d9f9c0..2eadf96 100644 (file)
--- a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-  archetype-closed-loop-demo-rules
+  ONAP
   ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,7 +23,7 @@
     name="closed-loop-rules"
     xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    
+
  <requiredProperties>
      <requiredProperty key="closedLoopControlName">
        <defaultValue>ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e</defaultValue>
@@ -36,24 +36,24 @@
      </requiredProperty>
      <requiredProperty key="policyScope">
        <defaultValue>DCAE</defaultValue>
-     </requiredProperty>     
+     </requiredProperty>
      <requiredProperty key="policyVersion">
        <defaultValue>1.1.1</defaultValue>
      </requiredProperty>
      <requiredProperty key="dmaapServers">
-       <defaultValue>vm1.mr.simpledemo.openecomp.org</defaultValue>
-     </requiredProperty>    
+       <defaultValue>vm1.mr.simpledemo.onap.org</defaultValue>
+     </requiredProperty>
      <requiredProperty key="dcaeTopic">
        <defaultValue>unauthenticated.DCAE_CL_OUTPUT</defaultValue>
      </requiredProperty>
      <requiredProperty key="dcaeServers">
-               <defaultValue>vm1.mr.simpledemo.openecomp.org</defaultValue>
+               <defaultValue>vm1.mr.simpledemo.onap.org</defaultValue>
      </requiredProperty>
      <requiredProperty key="dependenciesVersion">
-       <defaultValue>1.1.1</defaultValue>
+       <defaultValue>1.3.4</defaultValue>
      </requiredProperty>
   </requiredProperties>
-      
+
   <fileSets>
     <fileSet filtered="true" encoding="UTF-8">
       <directory>src/main/resources</directory>