Karaf 4 for appc-iaas-adapter

Change-Id: Ic6eb6f8025f2521b1b5b0a7df926ecc9bca582ac
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-1022

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml
index 7892ad9..331773f 100644 (file)
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml
@@ -22,11 +22,13 @@
 <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>
 <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>

-    <parent>
+       <parent>
+               <groupId>org.onap.appc.parent</groupId>
+               <artifactId>binding-parent</artifactId>
+               <version>1.4.0-SNAPSHOT</version>
+                <relativePath />
+       </parent>

         <groupId>org.onap.appc</groupId>
         <groupId>org.onap.appc</groupId>

-        <artifactId>appc-iaas-adapter</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
-    </parent>

 
     <artifactId>appc-iaas-adapter-bundle</artifactId>
     <packaging>bundle</packaging>
 
     <artifactId>appc-iaas-adapter-bundle</artifactId>
     <packaging>bundle</packaging>


@@ -35,7 +37,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onap.appc</groupId>
     <dependencies>
         <dependency>
             <groupId>org.onap.appc</groupId>

-            <artifactId>appc-common</artifactId>
+            <artifactId>appc-common-bundle</artifactId>

             <version>${project.version}</version>
             <scope>compile</scope>
             <exclusions>
             <version>${project.version}</version>
             <scope>compile</scope>
             <exclusions>


@@ -50,6 +52,7 @@
             <groupId>com.att.cdp</groupId>
             <artifactId>cdp-pal-openstack</artifactId>
             <scope>compile</scope>
             <groupId>com.att.cdp</groupId>
             <artifactId>cdp-pal-openstack</artifactId>
             <scope>compile</scope>

+            <version>${cdp.pal.version}</version>

         </dependency>
 
         <dependency>
         </dependency>
 
         <dependency>


@@ -227,7 +230,6 @@
                         <Bundle-SymbolicName>appc-iaas-adapter</Bundle-SymbolicName>
                         <Bundle-Activator>org.onap.appc.adapter.iaas.AppcProviderAdapterActivator</Bundle-Activator>
                         <Export-Package>org.onap.appc.adapter.iaas,com.att.cdp.zones.model</Export-Package>
                         <Bundle-SymbolicName>appc-iaas-adapter</Bundle-SymbolicName>
                         <Bundle-Activator>org.onap.appc.adapter.iaas.AppcProviderAdapterActivator</Bundle-Activator>
                         <Export-Package>org.onap.appc.adapter.iaas,com.att.cdp.zones.model</Export-Package>

-                        <DynamicImport-Package>javax.*</DynamicImport-Package>

                         <Import-Package>org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,javax.net.ssl,org.xml.sax</Import-Package>
                         <!-- <Import-Package>org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,javax.ws.rs.*,javax.net.*,javax.xml.*,org.xml.*</Import-Package> -->
                         <!-- <Import-Package>org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*,javax.xml.*</Import-Package> -->
                         <Import-Package>org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,javax.net.ssl,org.xml.sax</Import-Package>
                         <!-- <Import-Package>org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,javax.ws.rs.*,javax.net.*,javax.xml.*,org.xml.*</Import-Package> -->
                         <!-- <Import-Package>org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*,javax.xml.*</Import-Package> -->

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/features-appc-iaas-adapter/pom.xml b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/features-appc-iaas-adapter/pom.xml
new file mode 100644 (file)
index 0000000..7ff2425
--- /dev/null
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/features-appc-iaas-adapter/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+============LICENSE_START=======================================================
+ONAP : APPC
+================================================================================
+Copyright (C) 2018 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=========================================================
+-->
+<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>
+
+    <parent>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>feature-repo-parent</artifactId>
+        <version>1.4.0-SNAPSHOT</version>
+        <relativePath />
+    </parent>
+
+    <groupId>org.onap.appc</groupId>
+    <artifactId>features-appc-iaas-adapter</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name></name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>onap-appc-iaas-adapter</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+    </dependencies>
+</project>

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/onap-appc-iaas-adapter/pom.xml b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/onap-appc-iaas-adapter/pom.xml
new file mode 100644 (file)
index 0000000..dd50e5a
--- /dev/null
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/onap-appc-iaas-adapter/pom.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+============LICENSE_START=======================================================
+ONAP : APPC
+================================================================================
+Copyright (C) 2018 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=========================================================
+-->
+<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>
+
+    <parent>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.4.0-SNAPSHOT</version>
+        <relativePath />
+    </parent>
+
+    <groupId>org.onap.appc</groupId>
+    <artifactId>onap-appc-iaas-adapter</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name></name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>ccsdk-sli</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-iaas-adapter-bundle</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.karaf.tooling</groupId>
+                <artifactId>karaf-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <includeTransitiveDependency>false</includeTransitiveDependency>
+                    <excludedArtifactIds>
+                        <excludedArtifactId>slf4j-api</excludedArtifactId>
+                        <excludedArtifactId>tomcat-jdbc</excludedArtifactId>
+                        <excludedArtifactId>tomcat-juli</excludedArtifactId>
+                    </excludedArtifactIds>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/pom.xml b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/pom.xml
index b98e543..bab92ad 100644 (file)
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/pom.xml
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/pom.xml
@@ -1,129 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 <?xml version="1.0" encoding="UTF-8"?>
 <!--

-  ============LICENSE_START=======================================================
-  ONAP : APPC
-  ================================================================================
-  Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
-  Copyright (C) 2017 Amdocs
-  ================================================================================
-  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=========================================================
-  -->
-<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>
-  <parent>
-    <artifactId>appc-iaas-adapter</artifactId>
-    <groupId>org.onap.appc</groupId>
-    <version>1.4.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>appc-iaas-adapter-features</artifactId>
-  <name>IaaS Adaptor - Features</name>
+============LICENSE_START=======================================================
+ONAP : APPC
+================================================================================
+Copyright (C) 2018 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

 
 

-  <packaging>jar</packaging>
+      http://www.apache.org/licenses/LICENSE-2.0

 
 

-  <dependencies>
-    <dependency>
-      <groupId>org.onap.appc</groupId>
-      <artifactId>appc-iaas-adapter-bundle</artifactId>
-      <version>${project.version}</version>
-    </dependency>
+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=========================================================
+-->
+<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>

 
 

-    <dependency>
-      <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>features-mdsal</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
+    <parent>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.4.0-SNAPSHOT</version>
+        <relativePath />
+    </parent>

 
 

-    <!-- dependency for opendaylight-karaf-empty for use by testing -->
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>opendaylight-karaf-empty</artifactId>
-      <type>zip</type>
-    </dependency>
+    <groupId>org.onap.appc</groupId>
+    <artifactId>appc-iaas-adapter-feature-aggregator</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>pom</packaging>

 
 

-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-yangtools</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
+    <name></name>

 
 

-  <build>
-    <resources>
-      <resource>
-        <filtering>true</filtering>
-        <directory>src/main/resources</directory>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>filter</id>
-            <goals>
-              <goal>resources</goal>
-            </goals>
-            <phase>generate-resources</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- launches the feature test, which validates that your karaf feature 
-        can be installed inside of a karaf container. It doesn't validate that your 
-        functionality works correctly, just that you have all of the dependent bundles 
-        defined correctly. -->
-      <!-- <plugin> -->
-      <!-- <groupId>org.apache.maven.plugins</groupId> -->
-      <!-- <artifactId>maven-surefire-plugin</artifactId> -->
-      <!-- <version>2.16</version> -->
-      <!-- <configuration> -->
-      <!-- <systemPropertyVariables> -->
-      <!-- <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId> -->
-      <!-- <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId> -->
-      <!-- <karaf.distro.version>${odl.karaf.empty.distro.version}</karaf.distro.version> -->
-      <!-- </systemPropertyVariables> -->
-      <!-- <dependenciesToScan> -->
-      <!-- <dependency>org.opendaylight.yangtools:features-test</dependency> -->
-      <!-- </dependenciesToScan> -->
-      <!-- </configuration> -->
-      <!-- </plugin> -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-artifacts</id>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${project.build.directory}/classes/${features.file}</file>
-                  <type>xml</type>
-                  <classifier>features</classifier>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+    <modules>
+        <module>onap-appc-iaas-adapter</module>
+        <module>features-appc-iaas-adapter</module>
+    </modules>

 </project>
 </project>

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/pom.xml b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/pom.xml
index af038d1..765809e 100644 (file)
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/pom.xml
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/pom.xml
@@ -22,10 +22,12 @@
 <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>
   <parent>
 <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>
   <parent>

-    <artifactId>appc-iaas-adapter</artifactId>
-    <groupId>org.onap.appc</groupId>
+    <artifactId>odlparent-lite</artifactId>
+    <groupId>org.onap.appc.parent</groupId>

     <version>1.4.0-SNAPSHOT</version>
     <version>1.4.0-SNAPSHOT</version>

+    <relativePath />

   </parent>
   </parent>

+  <groupId>org.onap.appc</groupId>

   <artifactId>appc-iaas-adapter-installer</artifactId>
   <name>IaaS Adapter - Karaf Installer</name>
   <packaging>pom</packaging>
   <artifactId>appc-iaas-adapter-installer</artifactId>
   <name>IaaS Adapter - Karaf Installer</name>
   <packaging>pom</packaging>


@@ -33,15 +35,16 @@
   <properties>
     <application.name>appc-iaas-adapter</application.name>
     <features.boot>appc-iaas-adapter</features.boot>
   <properties>
     <application.name>appc-iaas-adapter</application.name>
     <features.boot>appc-iaas-adapter</features.boot>

-    <features.repositories>mvn:org.onap.appc/appc-iaas-adapter-features/${project.version}/xml/features</features.repositories>
+    <features.repositories>mvn:org.onap.appc/onap-appc-iaas-adapter/${project.version}/xml/features</features.repositories>

     <include.transitive.dependencies>false</include.transitive.dependencies>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>org.onap.appc</groupId>
     <include.transitive.dependencies>false</include.transitive.dependencies>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>org.onap.appc</groupId>

-      <artifactId>appc-iaas-adapter-features</artifactId>
+      <artifactId>onap-appc-iaas-adapter</artifactId>

       <classifier>features</classifier>
       <classifier>features</classifier>

+      <version>${project.version}</version>

       <type>xml</type>
       <exclusions>
         <exclusion>
       <type>xml</type>
       <exclusions>
         <exclusion>

diff --git a/appc-adapters/appc-iaas-adapter/pom.xml b/appc-adapters/appc-iaas-adapter/pom.xml
index 717e595..cf2f13d 100644 (file)
--- a/appc-adapters/appc-iaas-adapter/pom.xml
+++ b/appc-adapters/appc-iaas-adapter/pom.xml
@@ -22,11 +22,13 @@
 <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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
 <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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>

-    <groupId>org.onap.appc</groupId>
-    <artifactId>appc-adapters</artifactId>
+    <groupId>org.onap.appc.parent</groupId>
+    <artifactId>odlparent-lite</artifactId>

     <version>1.4.0-SNAPSHOT</version>
     <version>1.4.0-SNAPSHOT</version>

+    <relativePath />

   </parent>
 
   </parent>
 

+  <groupId>org.onap.appc</groupId>

   <artifactId>appc-iaas-adapter</artifactId>
   <name>IaaS Adaptor</name>
   <description>Abstraction to connect to and utilize the services of cloud providers such as OpenStack or VMWare.</description>
   <artifactId>appc-iaas-adapter</artifactId>
   <name>IaaS Adaptor</name>
   <description>Abstraction to connect to and utilize the services of cloud providers such as OpenStack or VMWare.</description>