diff options
Diffstat (limited to 'appc-config/appc-config-adaptor')
9 files changed, 209 insertions, 118 deletions
diff --git a/appc-config/appc-config-adaptor/features/features-appc-config-adaptor/.gitignore b/appc-config/appc-config-adaptor/features/features-appc-config-adaptor/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-config/appc-config-adaptor/features/features-appc-config-adaptor/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-config/appc-config-adaptor/features/features-appc-config-adaptor/pom.xml b/appc-config/appc-config-adaptor/features/features-appc-config-adaptor/pom.xml new file mode 100644 index 000000000..0be7434ba --- /dev/null +++ b/appc-config/appc-config-adaptor/features/features-appc-config-adaptor/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-config-adaptor</artifactId> + <version>1.4.0-SNAPSHOT</version> + <packaging>feature</packaging> + + <name></name> + + <dependencies> + <dependency> + <groupId>org.onap.appc</groupId> + <artifactId>onap-appc-config-adaptor</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + + </dependencies> +</project> diff --git a/appc-config/appc-config-adaptor/features/onap-appc-config-adaptor/.gitignore b/appc-config/appc-config-adaptor/features/onap-appc-config-adaptor/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-config/appc-config-adaptor/features/onap-appc-config-adaptor/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-config/appc-config-adaptor/features/onap-appc-config-adaptor/pom.xml b/appc-config/appc-config-adaptor/features/onap-appc-config-adaptor/pom.xml new file mode 100644 index 000000000..c431e98fa --- /dev/null +++ b/appc-config/appc-config-adaptor/features/onap-appc-config-adaptor/pom.xml @@ -0,0 +1,82 @@ +<?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-config-adaptor</artifactId> + <version>1.4.0-SNAPSHOT</version> + <packaging>feature</packaging> + + <name></name> + + <dependencies> + <dependency> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>ccsdk-sli</artifactId> + <type>xml</type> + <classifier>features</classifier> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + </dependency> + <dependency> + <groupId>org.onap.appc</groupId> + <artifactId>appc-config-adaptor-provider</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-config/appc-config-adaptor/features/onap-appc-config-adaptor/src/main/feature/feature.xml b/appc-config/appc-config-adaptor/features/onap-appc-config-adaptor/src/main/feature/feature.xml new file mode 100644 index 000000000..9333307c9 --- /dev/null +++ b/appc-config/appc-config-adaptor/features/onap-appc-config-adaptor/src/main/feature/feature.xml @@ -0,0 +1,27 @@ +<?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-sequence-generator" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"> + <feature name="onap-appc-sequence-generator" version="${project.version}"> + <configfile finalname="etc/opendaylight/karaf/201-appc-sequence-generator.xml"> + mvn:org.onap.appc/appc-sequence-generator-bundle/${project.version}/xml/config</configfile> + </feature> +</features>
\ No newline at end of file diff --git a/appc-config/appc-config-adaptor/features/pom.xml b/appc-config/appc-config-adaptor/features/pom.xml index d6d58d8fe..09d4f8c9f 100644 --- a/appc-config/appc-config-adaptor/features/pom.xml +++ b/appc-config/appc-config-adaptor/features/pom.xml @@ -1,119 +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========================================================= - --> +============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</groupId> - <artifactId>appc-config-adaptor</artifactId> + <groupId>org.onap.appc.parent</groupId> + <artifactId>odlparent-lite</artifactId> <version>1.4.0-SNAPSHOT</version> + <relativePath /> </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>appc-config-adaptor-features</artifactId> - <name>Config Component Adaptor - Features</name> - - <packaging>jar</packaging> - - <dependencies> - <dependency> - <groupId>org.onap.appc</groupId> - <artifactId>appc-config-adaptor-provider</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <!-- <groupId>org.opendaylight.controller</groupId> --> - <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> - <version>${odl.karaf.empty.distro.version}</version> - <type>zip</type> - </dependency> - - <dependency> - <!-- Required for launching the feature tests --> - <!-- <groupId>org.opendaylight.yangtools</groupId> --> - <groupId>org.opendaylight.odlparent</groupId> - <artifactId>features-test</artifactId> - <!-- <version>${odl.yangtools.version}</version> --> - <version>${odl.commons.opendaylight.version}</version> - <scope>test</scope> - </dependency> - </dependencies> + <groupId>org.onap.appc</groupId> + <artifactId>appc-config-adaptor-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> + <name></name> - <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-config-adaptor</module> + <module>features-appc-config-adaptor</module> + </modules> </project> diff --git a/appc-config/appc-config-adaptor/installer/pom.xml b/appc-config/appc-config-adaptor/installer/pom.xml index 6b0fbac50..742fd343a 100644 --- a/appc-config/appc-config-adaptor/installer/pom.xml +++ b/appc-config/appc-config-adaptor/installer/pom.xml @@ -22,25 +22,29 @@ <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</groupId> - <artifactId>appc-config-adaptor</artifactId> + <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-config-adaptor-installer</artifactId> <name>Config Component Adaptor - Installer</name> <packaging>pom</packaging> <properties> <application.name>appc-config-adaptor</application.name> <features.boot>appc-config-adaptor</features.boot> - <features.repositories>mvn:org.onap.appc/appc-config-adaptor-features/${project.version}/xml/features</features.repositories> + <features.repositories>mvn:org.onap.appc/onap-appc-config-adaptor/${project.version}/xml/features</features.repositories> <include.transitive.dependencies>false</include.transitive.dependencies> </properties> <dependencies> <dependency> <groupId>org.onap.appc</groupId> - <artifactId>appc-config-adaptor-features</artifactId> + <artifactId>onap-appc-config-adaptor</artifactId> <classifier>features</classifier> + <version>${project.version}</version> <type>xml</type> <exclusions> <exclusion> diff --git a/appc-config/appc-config-adaptor/pom.xml b/appc-config/appc-config-adaptor/pom.xml index fd25cb80d..a91e32006 100644 --- a/appc-config/appc-config-adaptor/pom.xml +++ b/appc-config/appc-config-adaptor/pom.xml @@ -23,11 +23,14 @@ 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-config</artifactId> + <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> <artifactId>appc-config-adaptor</artifactId> <packaging>pom</packaging> diff --git a/appc-config/appc-config-adaptor/provider/pom.xml b/appc-config/appc-config-adaptor/provider/pom.xml index ea4f61996..a5c90e48a 100644 --- a/appc-config/appc-config-adaptor/provider/pom.xml +++ b/appc-config/appc-config-adaptor/provider/pom.xml @@ -26,11 +26,13 @@ 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> - <artifactId>appc-config-adaptor</artifactId> - <version>1.4.0-SNAPSHOT</version> - </parent> <artifactId>appc-config-adaptor-provider</artifactId> <packaging>bundle</packaging> |