summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-x.gitignore2
-rw-r--r--README.md2
-rwxr-xr-xaai-service/pom.xml82
-rw-r--r--example-settings.xml163
-rw-r--r--jenkins-settings.xml168
-rwxr-xr-xmdsal-resource/pom.xml2
-rwxr-xr-xpom.xml29
-rwxr-xr-xresource-assignment/pom.xml2
-rwxr-xr-xsql-resource/pom.xml2
9 files changed, 61 insertions, 391 deletions
diff --git a/.gitignore b/.gitignore
index 2932cb92..f7a3d77c 100755
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,6 @@ provider/src/main/java/META-INF/
provider/src/main/java/inventory/
## BlackDuck generated file
-sdnc-adaptors_bdio.jsonld
+ccsdk-adaptors_bdio.jsonld
blackDuckHubProjectName.txt
blackDuckHubProjectVersionName.txt
diff --git a/README.md b/README.md
index c1e7af92..c906c67d 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
This source repository contains the code for the SDN Controller adaptors.
To compile this code:
-1. Make sure your local Maven settings file ($HOME/.m2/settings.xml) contains references to the OpenECOMP repositories and OpenDaylight repositories. See example-settings.xml for an example.
+1. Make sure your local Maven settings file ($HOME/.m2/settings.xml) contains references to the ONAP repositories and OpenDaylight repositories. See example-settings.xml for an example.
2. To compile, run "mvn clean install".
diff --git a/aai-service/pom.xml b/aai-service/pom.xml
index 9c89a177..857ada4d 100755
--- a/aai-service/pom.xml
+++ b/aai-service/pom.xml
@@ -1,45 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<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.ccsdk.sli.adaptors</groupId>
- <artifactId>sdnc-adaptors</artifactId>
- <version>0.1.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
- <groupId>org.onap.ccsdk.sli.adaptors</groupId>
- <artifactId>aai-service</artifactId>
-
-
- <name>AAI Interface Service</name>
- <description>The AAI Interface service exposes an interface to AAI as an OSGi service</description>
-
- <version>0.1.0-SNAPSHOT</version>
- <dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>org.onap.ccsdk.sli.adaptors</groupId>
- <artifactId>aai-service-features</artifactId>
- <classifier>features</classifier>
- <version>${project.version}</version>
- <type>xml</type>
- </dependency>
-
- <dependency>
- <groupId>org.onap.ccsdk.sli.adaptors</groupId>
- <artifactId>aai-service-provider</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
- <modules>
- <module>provider</module>
- <module>features</module>
- <module>installer</module>
- </modules>
+ <parent>
+ <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+ <artifactId>ccsdk-adaptors</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>pom</packaging>
+ <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+ <artifactId>aai-service</artifactId>
+
+
+ <name>AAI Interface Service</name>
+ <description>The AAI Interface service exposes an interface to AAI as an OSGi service</description>
+
+ <version>0.1.0-SNAPSHOT</version>
+ <dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+ <artifactId>aai-service-features</artifactId>
+ <classifier>features</classifier>
+ <version>${project.version}</version>
+ <type>xml</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+ <artifactId>aai-service-provider</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
+ <modules>
+ <module>provider</module>
+ <module>features</module>
+ <module>installer</module>
+ </modules>
</project>
diff --git a/example-settings.xml b/example-settings.xml
deleted file mode 100644
index 2e7ce644..00000000
--- a/example-settings.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=2 tabstop=2: -->
-<!--
- Copyright (c) 2014, 2015 Cisco Systems, Inc. and others. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
-
- <profiles>
- <profile>
- <id>openecomp-release</id>
- <repositories>
- <repository>
- <id>openecomp-release</id>
- <name>openecomp-release</name>
- <url>https://ecomp-nexus:8443/repository/maven-releases/</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>openecomp-release</id>
- <name>openecomp-release</name>
- <url>https://ecomp-nexus:8443/repository/maven-releases/</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
-
- <profile>
- <id>openecomp-snapshots</id>
- <repositories>
- <repository>
- <id>openecomp-snapshot</id>
- <name>openecomp-snapshot</name>
- <url>https://ecomp-nexus:8443/repository/maven-snapshots/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>openecomp-snapshot</id>
- <name>openecomp-snapshot</name>
- <url>https://ecomp-nexus:8443/repository/maven-snapshots/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
- <profile>
- <id>opendaylight-release</id>
- <repositories>
- <repository>
- <id>opendaylight-mirror</id>
- <name>opendaylight-mirror</name>
- <url>https://nexus.opendaylight.org/content/repositories/public/</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>opendaylight-mirror</id>
- <name>opendaylight-mirror</name>
- <url>https://nexus.opendaylight.org/content/repositories/public/</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
-
- <profile>
- <id>opendaylight-snapshots</id>
- <repositories>
- <repository>
- <id>opendaylight-snapshot</id>
- <name>opendaylight-snapshot</name>
- <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>opendaylight-snapshot</id>
- <name>opendaylight-snapshot</name>
- <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
- </profiles>
-
- <activeProfiles>
- <activeProfile>openecomp-release</activeProfile>
- <activeProfile>openecomp-snapshots</activeProfile>
- <activeProfile>opendaylight-release</activeProfile>
- <activeProfile>opendaylight-snapshots</activeProfile>
- </activeProfiles>
-
- <servers>
- <server>
- <id>nexus</id>
- <username>USERNAME</username>
- <password>PASSWORD</password>
- </server>
- <server>
- <id>openecomp-release</id>
- <username>USERNAME</username>
- <password>PASSWORD</password>
- </server>
- <server>
- <id>openecomp-snapshot</id>
- <username>USERNAME</username>
- <password>PASSWORD</password>
- </server>
- </servers>
-</settings>
diff --git a/jenkins-settings.xml b/jenkins-settings.xml
deleted file mode 100644
index 344994f8..00000000
--- a/jenkins-settings.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=2 tabstop=2: -->
-<!--
- Copyright (c) 2014, 2015 Cisco Systems, Inc. and others. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
-
- <profiles>
- <profile>
- <id>openecomp-release</id>
- <repositories>
- <repository>
- <id>openecomp-release</id>
- <name>openecomp-release</name>
- <url>https://ecomp-nexus:8443/repository/maven-releases/</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>openecomp-release</id>
- <name>openecomp-release</name>
- <url>https://ecomp-nexus:8443/repository/maven-releases/</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
-
- <profile>
- <id>openecomp-snapshots</id>
- <repositories>
- <repository>
- <id>openecomp-snapshot</id>
- <name>openecomp-snapshot</name>
- <url>https://ecomp-nexus:8443/repository/maven-snapshots/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>openecomp-snapshot</id>
- <name>openecomp-snapshot</name>
- <url>https://ecomp-nexus:8443/repository/maven-snapshots/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
- <profile>
- <id>opendaylight-release</id>
- <repositories>
- <repository>
- <id>opendaylight-mirror</id>
- <name>opendaylight-mirror</name>
- <url>https://nexus.opendaylight.org/content/repositories/public/</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>opendaylight-mirror</id>
- <name>opendaylight-mirror</name>
- <url>https://nexus.opendaylight.org/content/repositories/public/</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
-
- <profile>
- <id>opendaylight-snapshots</id>
- <repositories>
- <repository>
- <id>opendaylight-snapshot</id>
- <name>opendaylight-snapshot</name>
- <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>opendaylight-snapshot</id>
- <name>opendaylight-snapshot</name>
- <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
- </profiles>
-
- <activeProfiles>
- <activeProfile>openecomp-release</activeProfile>
- <activeProfile>openecomp-snapshots</activeProfile>
- <activeProfile>opendaylight-release</activeProfile>
- <activeProfile>opendaylight-snapshots</activeProfile>
- </activeProfiles>
-
- <servers>
- <server>
- <id>nexus</id>
- <username>${ecomp.nexus.user}</username>
- <password>${ecomp.nexus.password}</password>
- </server>
- <server>
- <id>openecomp-release</id>
- <username>${ecomp.nexus.user}</username>
- <password>${ecomp.nexus.password}</password>
- </server>
- <server>
- <id>openecomp-snapshot</id>
- <username>${ecomp.nexus.user}</username>
- <password>${ecomp.nexus.password}</password>
- </server>
- <server>
- <id>sdnc-javadoc</id>
- <username>${ecomp.nexus.user}</username>
- <password>${ecomp.nexus.password}</password>
- </server>
- </servers>
-</settings>
diff --git a/mdsal-resource/pom.xml b/mdsal-resource/pom.xml
index eddff303..ba4b9442 100755
--- a/mdsal-resource/pom.xml
+++ b/mdsal-resource/pom.xml
@@ -2,7 +2,7 @@
<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.ccsdk.sli.adaptors</groupId>
- <artifactId>sdnc-adaptors</artifactId>
+ <artifactId>ccsdk-adaptors</artifactId>
<version>0.1.0-SNAPSHOT</version>
</parent>
diff --git a/pom.xml b/pom.xml
index f4e8fcb5..5544f1be 100755
--- a/pom.xml
+++ b/pom.xml
@@ -11,34 +11,35 @@
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
- <artifactId>sdnc-adaptors</artifactId>
+ <artifactId>ccsdk-adaptors</artifactId>
- <name>SDN-C Adaptors</name>
- <url>https://wiki.openecomp.org</url>
- <description>The SDN-C core components contains the SLI, dblib and root pom</description>
+ <name>CCSDK SLI Adaptors</name>
+ <url>https://wiki.onap.org</url>
+ <description>The CCSDK core components contains the SLI, dblib and root pom</description>
<issueManagement>
<system>JIRA</system>
- <url>https://jira.openecomp.org/</url>
+ <url>https://jira.onap.org/</url>
</issueManagement>
<scm>
- <connection>scm:git:ssh://git@${openecomp.git.host}/sdnc-adaptors.git</connection>
- <developerConnection>scm:git:ssh://${openecomp.git.host}:${openecomp.git.port}/${openecomp.git.project}/sdnc-adaptors.git</developerConnection>
- <url>${openecomp.git.protocol}://${openecomp.git.host}/projects/${openecomp.git.project}/repos/sdnc-adaptors/browse</url>
+ <connection>scm:git:ssh://git@${onap.git.host}/ccsdk/sli/adaptors</connection>
+ <developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/ccsdk/sli/adaptors</developerConnection>
+ <url>${onap.git.protocol}://${onap.git.host}/ccsdk/sli/adaptors</url>
+ <tag>ccsdk-adaptors-${project.version}</tag>
</scm>
<ciManagement>
<system>Jenkins</system>
- <url>https://jenkins.openecomp.org/</url>
+ <url>https://jenkins.onap.org/</url>
</ciManagement>
<distributionManagement>
<site>
<id>sdnc-javadoc</id>
- <url>dav:https://${openecomp.nexus.host}/content/sites/site/org/onap/sdnc/adaptors/${project.artifactId}/${project.version}</url>
+ <url>dav:https://${onap.nexus.host}/content/sites/site/org/onap/sdnc/adaptors/${project.artifactId}/${project.version}</url>
</site>
</distributionManagement>
@@ -96,9 +97,9 @@
<version>1.6.7</version>
<extensions>true</extensions>
<configuration>
- <nexusUrl>https://${openecomp.nexus.host}</nexusUrl>
- <stagingProfileId>${openecomp.nexus.staging.profile-id}</stagingProfileId>
- <serverId>${openecomp.nexus.staging.server-id}</serverId>
+ <nexusUrl>https://${onap.nexus.host}</nexusUrl>
+ <stagingProfileId>${onap.nexus.staging.profile-id}</stagingProfileId>
+ <serverId>${onap.nexus.staging.server-id}</serverId>
</configuration>
</plugin>
</plugins>
@@ -111,7 +112,7 @@
<module>sql-resource</module>
</modules>
<organization>
- <name>OpenECOMP</name>
+ <name>ONAP</name>
</organization>
<version>0.1.0-SNAPSHOT</version>
diff --git a/resource-assignment/pom.xml b/resource-assignment/pom.xml
index 37889db0..17860829 100755
--- a/resource-assignment/pom.xml
+++ b/resource-assignment/pom.xml
@@ -2,7 +2,7 @@
<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.ccsdk.sli.adaptors</groupId>
- <artifactId>sdnc-adaptors</artifactId>
+ <artifactId>ccsdk-adaptors</artifactId>
<version>0.1.0-SNAPSHOT</version>
</parent>
diff --git a/sql-resource/pom.xml b/sql-resource/pom.xml
index ffec0c42..a84e7e4e 100755
--- a/sql-resource/pom.xml
+++ b/sql-resource/pom.xml
@@ -2,7 +2,7 @@
<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.ccsdk.sli.adaptors</groupId>
- <artifactId>sdnc-adaptors</artifactId>
+ <artifactId>ccsdk-adaptors</artifactId>
<version>0.1.0-SNAPSHOT</version>
</parent>