aboutsummaryrefslogtreecommitdiffstats
path: root/appc-dispatcher
diff options
context:
space:
mode:
Diffstat (limited to 'appc-dispatcher')
-rw-r--r--appc-dispatcher/appc-dispatcher-installer/pom.xml8
-rw-r--r--appc-dispatcher/appc-license-manager/appc-license-manager-api/pom.xml7
-rw-r--r--appc-dispatcher/appc-license-manager/appc-license-manager-core/pom.xml10
-rw-r--r--appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml4
-rw-r--r--appc-dispatcher/appc-license-manager/appc-license-manager-features/features-appc-license-manager/pom.xml48
-rw-r--r--appc-dispatcher/appc-license-manager/appc-license-manager-features/onap-appc-license-manager/pom.xml110
-rw-r--r--appc-dispatcher/appc-license-manager/appc-license-manager-features/pom.xml154
-rw-r--r--appc-dispatcher/appc-license-manager/pom.xml7
8 files changed, 213 insertions, 135 deletions
diff --git a/appc-dispatcher/appc-dispatcher-installer/pom.xml b/appc-dispatcher/appc-dispatcher-installer/pom.xml
index a0cc963da..2850cb666 100644
--- a/appc-dispatcher/appc-dispatcher-installer/pom.xml
+++ b/appc-dispatcher/appc-dispatcher-installer/pom.xml
@@ -50,10 +50,10 @@
mvn:org.onap.appc/appc-command-executor-features/${project.version}/xml/features
</features.repo.commandExecutor>
<features.repo.lifecycleManagement>
- mvn:org.onap.appc/appc-lifecycle-management-features/${project.version}/xml/features
+ mvn:org.onap.appc/onap-appc-lifecycle-management/${project.version}/xml/features
</features.repo.lifecycleManagement>
<features.repo.licenseManager>
- mvn:org.onap.appc/appc-license-manager-features/${project.version}/xml/features
+ mvn:org.onap.appc/onap-appc-license-manager/${project.version}/xml/features
</features.repo.licenseManager>
<features.repo.workflowManagement>
mvn:org.onap.appc/appc-workflow-management-features/${project.version}/xml/features
@@ -92,7 +92,7 @@
<dependency>
<groupId>org.onap.appc</groupId>
- <artifactId>appc-lifecycle-management-features</artifactId>
+ <artifactId>onap-appc-lifecycle-management</artifactId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
@@ -108,7 +108,7 @@
<dependency>
<groupId>org.onap.appc</groupId>
- <artifactId>appc-license-manager-features</artifactId>
+ <artifactId>onap-appc-license-manager</artifactId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-api/pom.xml b/appc-dispatcher/appc-license-manager/appc-license-manager-api/pom.xml
index 3287dd68c..6d159aee8 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-api/pom.xml
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-api/pom.xml
@@ -26,11 +26,14 @@
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</groupId>
- <artifactId>appc-license-manager</artifactId>
+ <groupId>org.onap.appc.parent</groupId>
+ <artifactId>binding-parent</artifactId>
<version>1.4.0-SNAPSHOT</version>
+ <relativePath />
</parent>
<artifactId>appc-license-manager-api</artifactId>
+ <groupId>org.onap.appc</groupId>
+ <version>1.4.0-SNAPSHOT</version>
<name>APPC License Manager - API</name>
<packaging>bundle</packaging>
<url>http://maven.apache.org</url>
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/pom.xml b/appc-dispatcher/appc-license-manager/appc-license-manager-core/pom.xml
index 09b699f00..d650a33dc 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/pom.xml
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/pom.xml
@@ -26,12 +26,15 @@
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</groupId>
- <artifactId>appc-license-manager</artifactId>
+ <groupId>org.onap.appc.parent</groupId>
+ <artifactId>binding-parent</artifactId>
<version>1.4.0-SNAPSHOT</version>
+ <relativePath />
</parent>
<artifactId>appc-license-manager-core</artifactId>
+ <groupId>org.onap.appc</groupId>
+ <version>1.4.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>APPC License Manager - Core</name>
<description>appc-license-manager-core OSGi bundle project.</description>
@@ -43,7 +46,7 @@
<dependencies>
<dependency>
<groupId>org.onap.appc</groupId>
- <artifactId>appc-common</artifactId>
+ <artifactId>appc-common-bundle</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -70,6 +73,7 @@
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
+ <version>${assertj.version}</version>
</dependency>
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 6f56ee8c9..ffe865974 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -29,9 +29,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
- <reference id="dbLibServiceRef" availability="mandatory" activation="eager" interface="org.onap.ccsdk.sli.core.dblib.DbLibService" />
+ <reference id="dbLibServiceRef" interface="org.onap.ccsdk.sli.core.dblib.DbLibService" />
- <bean id="licenseDataServiceBean" class="org.onap.appc.licmgr.impl.LicenseDataAccessServiceImpl" scope="singleton" activation="eager">
+ <bean id="licenseDataServiceBean" class="org.onap.appc.licmgr.impl.LicenseDataAccessServiceImpl" scope="singleton">
<property name="dbLibService" ref="dbLibServiceRef" />
<property name="schema" value="sdnctl" />
</bean>
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-features/features-appc-license-manager/pom.xml b/appc-dispatcher/appc-license-manager/appc-license-manager-features/features-appc-license-manager/pom.xml
new file mode 100644
index 000000000..93003cb7e
--- /dev/null
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-features/features-appc-license-manager/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-license-manager</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <packaging>feature</packaging>
+
+ <name></name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>onap-appc-license-manager</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+
+ </dependencies>
+</project>
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-features/onap-appc-license-manager/pom.xml b/appc-dispatcher/appc-license-manager/appc-license-manager-features/onap-appc-license-manager/pom.xml
new file mode 100644
index 000000000..92ca4f6fd
--- /dev/null
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-features/onap-appc-license-manager/pom.xml
@@ -0,0 +1,110 @@
+<?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-license-manager</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <packaging>feature</packaging>
+
+ <name></name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.ccsdk.sli.core</groupId>
+ <artifactId>ccsdk-dblib</artifactId>
+ <version>${ccsdk.sli.core.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>appc-license-manager-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>appc-license-manager-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ <version>1.5.0</version>
+ </dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.glassfish.jersey.core</groupId> -->
+<!-- <artifactId>jersey-server</artifactId> -->
+<!-- <version>2.22.1</version> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>com.fasterxml.jackson.jaxrs</groupId> -->
+<!-- <artifactId>jackson-jaxrs-base</artifactId> -->
+<!-- <version>2.5.4</version> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>com.fasterxml.jackson.jaxrs</groupId> -->
+<!-- <artifactId>jackson-jaxrs-json-provider</artifactId> -->
+<!-- <version>2.5.4</version> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.apache.httpcomponents</groupId> -->
+<!-- <artifactId>httpclient-osgi</artifactId> -->
+<!-- <version>4.5.3</version> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.apache.httpcomponents</groupId> -->
+<!-- <artifactId>httpcore-osgi</artifactId> -->
+<!-- <version>4.4</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-dispatcher/appc-license-manager/appc-license-manager-features/pom.xml b/appc-dispatcher/appc-license-manager/appc-license-manager-features/pom.xml
index 6d9ff733e..c723fe40b 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-features/pom.xml
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-features/pom.xml
@@ -1,132 +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">
+============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>
- <artifactId>appc-license-manager</artifactId>
- <groupId>org.onap.appc</groupId>
+ <groupId>org.onap.appc.parent</groupId>
+ <artifactId>odlparent-lite</artifactId>
<version>1.4.0-SNAPSHOT</version>
+ <relativePath />
</parent>
- <name>APPC License Manager - Features</name>
- <artifactId>appc-license-manager-features</artifactId>
- <packaging>jar</packaging>
-
-
- <dependencies>
- <dependency>
- <groupId>org.onap.appc</groupId>
- <artifactId>appc-license-manager-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.onap.appc</groupId>
- <artifactId>appc-license-manager-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>appc-license-manager-feature-aggregator</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
- <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> -->
- <!-- 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. -->
- <!-- <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> -->
- <!-- <classpathDependencyExcludes> -->
- <!-- The dependencies which bring in AbstractDataBrokerTest class brings
- in a second PaxExam container which results in the feature tests failing
- with a message similar to: "ERROR o.ops4j.pax.exam.spi.PaxExamRuntime - Ambiguous
- TestContainer ..." This excludes the container we don't want to use. -->
- <!-- <classpathDependencyExcludes>org.ops4j.pax.exam:pax-exam-container-native</classpathDependencyExcludes> -->
- <!-- </classpathDependencyExcludes> -->
- <!-- </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>
+ <name></name>
- <!-- Skipping ODL feature test -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <modules>
+ <module>onap-appc-license-manager</module>
+ <module>features-appc-license-manager</module>
+ </modules>
</project>
diff --git a/appc-dispatcher/appc-license-manager/pom.xml b/appc-dispatcher/appc-license-manager/pom.xml
index 2c1428d11..46bebd41c 100644
--- a/appc-dispatcher/appc-license-manager/pom.xml
+++ b/appc-dispatcher/appc-license-manager/pom.xml
@@ -26,12 +26,15 @@
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</groupId>
- <artifactId>appc-dispatcher</artifactId>
+ <groupId>org.onap.appc.parent</groupId>
+ <artifactId>odlparent-lite</artifactId>
<version>1.4.0-SNAPSHOT</version>
+ <relativePath />
</parent>
<artifactId>appc-license-manager</artifactId>
+ <groupId>org.onap.appc</groupId>
+ <version>1.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>APPC License Manager</name>
<description>APPC License Manager</description>