From ca4f7e16fc35f9f1a8c0a885e3ad8c62c64c3c37 Mon Sep 17 00:00:00 2001
From: Patrick Brady <pb071s@att.com>
Date: Mon, 13 Aug 2018 22:38:26 -0700
Subject: Karaf 4 for appc-inbound

Change-Id: I94f8b31e509d0e231e36b8b8d2871ad10bdf02f8
Issue-ID: APPC-1148
Signed-off-by: Patrick Brady <pb071s@att.com>
---
 .../features-appc-artifact-handler/.gitignore      |   1 +
 .../features-appc-artifact-handler/pom.xml         |  48 +++++++
 .../features/onap-appc-artifact-handler/.gitignore |   1 +
 .../features/onap-appc-artifact-handler/pom.xml    | 100 ++++++++++++++
 .../src/main/feature/feature.xml                   |  26 ++++
 .../appc-artifact-handler/features/pom.xml         | 150 +++++----------------
 .../appc-artifact-handler/installer/pom.xml        |  18 ++-
 appc-inbound/appc-artifact-handler/model/pom.xml   |   6 +-
 appc-inbound/appc-artifact-handler/pom.xml         |  12 +-
 .../appc-artifact-handler/provider/pom.xml         |  11 +-
 10 files changed, 238 insertions(+), 135 deletions(-)
 create mode 100644 appc-inbound/appc-artifact-handler/features/features-appc-artifact-handler/.gitignore
 create mode 100644 appc-inbound/appc-artifact-handler/features/features-appc-artifact-handler/pom.xml
 create mode 100644 appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/.gitignore
 create mode 100644 appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/pom.xml
 create mode 100644 appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/src/main/feature/feature.xml
 mode change 100755 => 100644 appc-inbound/appc-artifact-handler/features/pom.xml

(limited to 'appc-inbound/appc-artifact-handler')

diff --git a/appc-inbound/appc-artifact-handler/features/features-appc-artifact-handler/.gitignore b/appc-inbound/appc-artifact-handler/features/features-appc-artifact-handler/.gitignore
new file mode 100644
index 000000000..eacf31a67
--- /dev/null
+++ b/appc-inbound/appc-artifact-handler/features/features-appc-artifact-handler/.gitignore
@@ -0,0 +1 @@
+/target-ide/
diff --git a/appc-inbound/appc-artifact-handler/features/features-appc-artifact-handler/pom.xml b/appc-inbound/appc-artifact-handler/features/features-appc-artifact-handler/pom.xml
new file mode 100644
index 000000000..35de7a50b
--- /dev/null
+++ b/appc-inbound/appc-artifact-handler/features/features-appc-artifact-handler/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-artifact-handler</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name></name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>onap-appc-artifact-handler</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/.gitignore b/appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/.gitignore
new file mode 100644
index 000000000..eacf31a67
--- /dev/null
+++ b/appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/.gitignore
@@ -0,0 +1 @@
+/target-ide/
diff --git a/appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/pom.xml b/appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/pom.xml
new file mode 100644
index 000000000..df20fbb87
--- /dev/null
+++ b/appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/pom.xml
@@ -0,0 +1,100 @@
+<?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-artifact-handler</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.openecomp.sdc.common</groupId>
+            <artifactId>openecomp-tosca-datatype</artifactId>
+            <version>${tosca.datatype.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-config-params-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-artifact-handler-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-artifact-handler-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-yang-generator</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>
+                         <excludedArtifactId>httpcore</excludedArtifactId>
+                         <excludedArtifactId>httpclient</excludedArtifactId>
+                         <excludedArtifactId>org.eclipse.osgi</excludedArtifactId>
+                         
+                    </excludedArtifactIds>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/src/main/feature/feature.xml b/appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/src/main/feature/feature.xml
new file mode 100644
index 000000000..0e5ddcfac
--- /dev/null
+++ b/appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/src/main/feature/feature.xml
@@ -0,0 +1,26 @@
+<?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=========================================================
+  -->
+<features name="onap-appc-artifact-handler" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
+    <feature name="onap-appc-artifact-handler" version="${project.version}">
+       <configfile finalname="etc/opendaylight/karaf/200-artifact-handler-provider.xml">mvn:org.onap.appc/appc-artifact-handler-provider/${project.version}/xml/config</configfile>
+    </feature>
+</features>
\ No newline at end of file
diff --git a/appc-inbound/appc-artifact-handler/features/pom.xml b/appc-inbound/appc-artifact-handler/features/pom.xml
old mode 100755
new mode 100644
index ec0d117dd..e65e1d678
--- a/appc-inbound/appc-artifact-handler/features/pom.xml
+++ b/appc-inbound/appc-artifact-handler/features/pom.xml
@@ -1,120 +1,42 @@
 <?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-artifact-handler</artifactId>
-		<groupId>org.onap.appc</groupId>
-		<version>1.4.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>appc-artifact-handler-features</artifactId>
-	<name>APPC Artifact Handler - Feature</name>
-	<packaging>jar</packaging>
+============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
 
-	<dependencies>
-		<dependency>
-			<groupId>org.onap.appc</groupId>
-			<artifactId>appc-artifact-handler-model</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.onap.appc</groupId>
-			<artifactId>appc-artifact-handler-provider</artifactId>
-			<classifier>config</classifier>
-			<type>xml</type>
-		</dependency>
-		<dependency>
-			<groupId>org.opendaylight.mdsal</groupId>
-			<artifactId>features-mdsal</artifactId>
-			<classifier>features</classifier>
-			<type>xml</type>
-			<scope>runtime</scope>
-		</dependency>
-		<!-- dependency for opendaylight-karaf-empty for use by testing -->
-		<dependency>
-			<groupId>org.opendaylight.controller</groupId>
-			<artifactId>opendaylight-karaf-empty</artifactId>
-			<type>zip</type>
-		</dependency>
+      http://www.apache.org/licenses/LICENSE-2.0
 
-		<dependency>
-			<!-- Required for launching the feature tests -->
-			<groupId>org.opendaylight.odlparent</groupId>
-			<artifactId>features-test</artifactId>
-			<scope>test</scope>
-			<version>${odl.commons.opendaylight.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.opendaylight.yangtools</groupId>
-			<artifactId>features-yangtools</artifactId>
-			<classifier>features</classifier>
-			<type>xml</type>
-			<scope>runtime</scope>
-		</dependency>
-	</dependencies>
+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>
 
-	<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>
-			<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>
+    <parent>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.4.0-SNAPSHOT</version>
+        <relativePath />
+    </parent>
+
+    <groupId>org.onap.appc</groupId>
+    <artifactId>appc-artifact-handler-feature-aggregator</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name></name>
+
+    <modules>
+        <module>onap-appc-artifact-handler</module>
+        <module>features-appc-artifact-handler</module>
+    </modules>
 </project>
diff --git a/appc-inbound/appc-artifact-handler/installer/pom.xml b/appc-inbound/appc-artifact-handler/installer/pom.xml
index 1c8e3358e..c1ef46446 100755
--- a/appc-inbound/appc-artifact-handler/installer/pom.xml
+++ b/appc-inbound/appc-artifact-handler/installer/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>
-	<parent>
-		<artifactId>appc-artifact-handler</artifactId>
-		<groupId>org.onap.appc</groupId>
-		<version>1.4.0-SNAPSHOT</version>
-	</parent>
+    <parent>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.4.0-SNAPSHOT</version>
+        <relativePath />
+    </parent>
+  <groupId>org.onap.appc</groupId>
 	<artifactId>appc-artifact-handler-installer</artifactId>
 	<name>appc-artifact-handler-installer</name>
 	<packaging>pom</packaging>
@@ -34,7 +36,7 @@
 	<properties>
 		<application.name>appc-artifact-handler</application.name>
 		<features.boot>appc-artifact-handler</features.boot>
-		<features.repositories>mvn:org.onap.appc/appc-artifact-handler-features/${project.version}/xml/features</features.repositories>
+		<features.repositories>mvn:org.onap.appc/onap-appc-artifact-handler/${project.version}/xml/features</features.repositories>
 		<include.transitive.dependencies>false</include.transitive.dependencies>
 	</properties>
 
@@ -42,8 +44,9 @@
 
 		<dependency>
 			<groupId>org.onap.appc</groupId>
-			<artifactId>appc-artifact-handler-features</artifactId>
+			<artifactId>onap-appc-artifact-handler</artifactId>
 			<classifier>features</classifier>
+			<version>${project.version}</version>
 			<type>xml</type>
 			<exclusions>
 				<exclusion>
@@ -55,6 +58,7 @@
 		<dependency>
 			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-artifact-handler-provider</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		
 		<dependency>
diff --git a/appc-inbound/appc-artifact-handler/model/pom.xml b/appc-inbound/appc-artifact-handler/model/pom.xml
index 84d528dee..90030bb84 100755
--- a/appc-inbound/appc-artifact-handler/model/pom.xml
+++ b/appc-inbound/appc-artifact-handler/model/pom.xml
@@ -23,10 +23,12 @@
 	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-artifact-handler</artifactId>
-		<groupId>org.onap.appc</groupId>
+		<groupId>org.onap.appc.parent</groupId>
+		<artifactId>binding-parent</artifactId>
 		<version>1.4.0-SNAPSHOT</version>
+                <relativePath />
 	</parent>
+        <groupId>org.onap.appc</groupId>
 	<artifactId>appc-artifact-handler-model</artifactId>
 	<name>APPC Artifact Handler - Model</name>
 	<packaging>bundle</packaging>
diff --git a/appc-inbound/appc-artifact-handler/pom.xml b/appc-inbound/appc-artifact-handler/pom.xml
index 10b0ec281..d2098e64d 100755
--- a/appc-inbound/appc-artifact-handler/pom.xml
+++ b/appc-inbound/appc-artifact-handler/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">
 
-	<parent>
-		<groupId>org.onap.appc</groupId>
-		<artifactId>appc-inbound</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
-	</parent>
+    <parent>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.4.0-SNAPSHOT</version>
+        <relativePath />
+    </parent>
+  <groupId>org.onap.appc</groupId>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
 	<artifactId>appc-artifact-handler</artifactId>
diff --git a/appc-inbound/appc-artifact-handler/provider/pom.xml b/appc-inbound/appc-artifact-handler/provider/pom.xml
index ed25b1684..c82cf2e27 100755
--- a/appc-inbound/appc-artifact-handler/provider/pom.xml
+++ b/appc-inbound/appc-artifact-handler/provider/pom.xml
@@ -25,10 +25,12 @@ limitations under the License.
 	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-artifact-handler</artifactId>
-		<groupId>org.onap.appc</groupId>
+		<groupId>org.onap.appc.parent</groupId>
+		<artifactId>binding-parent</artifactId>
 		<version>1.4.0-SNAPSHOT</version>
+                <relativePath />
 	</parent>
+        <groupId>org.onap.appc</groupId>
 	<artifactId>appc-artifact-handler-provider</artifactId>
 	<packaging>bundle</packaging>
 
@@ -170,11 +172,6 @@ limitations under the License.
 			<groupId>org.opendaylight.controller</groupId>
 			<scope>test</scope>
 			</dependency>
-		<dependency>
-			<artifactId>sal-rest-connector</artifactId>
-			<groupId>org.opendaylight.netconf</groupId>
-			<scope>test</scope>
-			</dependency>
 		<dependency>
 			<groupId>org.opendaylight.controller</groupId>
 			<artifactId>sal-binding-broker-impl</artifactId>
-- 
cgit 1.2.3-korg