aboutsummaryrefslogtreecommitdiffstats
path: root/generic-resource-api/installer
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2017-10-13 12:07:01 -0400
committerDan Timoney <dtimoney@att.com>2017-10-13 12:07:01 -0400
commit03575373024593fd1cac6812f0992152edde4d37 (patch)
tree689a8dadbfa42740e2b160d7584df423705ced9b /generic-resource-api/installer
parentdd3f74074787dfd14e8aec0b48883b780dd8ccba (diff)
Fix installation issues with generic-resource-api
Updated generic-resource-api to use Aries blueprint to install and resolved issues preventing it from installing properly in karaf. Change-Id: Iaef8bdb7a9e6aaf149a8e8a0d847197cf3f704a9 Issue-ID: SDNC-109 Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'generic-resource-api/installer')
-rwxr-xr-xgeneric-resource-api/installer/pom.xml10
-rw-r--r--generic-resource-api/installer/src/assembly/assemble_mvnrepo_zip.xml43
2 files changed, 20 insertions, 33 deletions
diff --git a/generic-resource-api/installer/pom.xml b/generic-resource-api/installer/pom.xml
index b190ff7b..e1f2d513 100755
--- a/generic-resource-api/installer/pom.xml
+++ b/generic-resource-api/installer/pom.xml
@@ -12,9 +12,9 @@
<packaging>pom</packaging>
<properties>
- <application.name>sdnc-generic-resources-api</application.name>
- <features.boot>sdnc-generic-resources-api</features.boot>
- <features.repositories>mvn:org.onap.sdnc.northbound/generic-resources-api-features/${project.version}/xml/features</features.repositories>
+ <application.name>sdnc-generic-resource-api</application.name>
+ <features.boot>sdnc-generic-resource-api</features.boot>
+ <features.repositories>mvn:org.onap.sdnc.northbound/generic-resource-api-features/${project.version}/xml/features</features.repositories>
<include.transitive.dependencies>false</include.transitive.dependencies>
</properties>
@@ -22,7 +22,7 @@
<dependency>
<groupId>org.onap.sdnc.northbound</groupId>
- <artifactId>generic-resource-api.features</artifactId>
+ <artifactId>generic-resource-api-features</artifactId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.onap.sdnc.northbound</groupId>
- <artifactId>generic-resource-api.provider</artifactId>
+ <artifactId>generic-resource-api-provider</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/generic-resource-api/installer/src/assembly/assemble_mvnrepo_zip.xml b/generic-resource-api/installer/src/assembly/assemble_mvnrepo_zip.xml
index c1b6357f..89d9c14f 100644
--- a/generic-resource-api/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/generic-resource-api/installer/src/assembly/assemble_mvnrepo_zip.xml
@@ -1,21 +1,13 @@
-<!--
- ============LICENSE_START=======================================================
- openECOMP : SDN-C
- ================================================================================
- Copyright (C) 2017 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=========================================================
- -->
+<!-- ============LICENSE_START=======================================================
+ openECOMP : SDN-C ================================================================================
+ Copyright (C) 2017 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========================================================= -->
<!-- Defines how we build the .zip file which is our distribution. -->
@@ -28,9 +20,8 @@
<format>zip</format>
</formats>
- <!-- we want "system" and related files right at the root level
- as this file is suppose to be unzip on top of a karaf
- distro. -->
+ <!-- we want "system" and related files right at the root level as this
+ file is suppose to be unzip on top of a karaf distro. -->
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
@@ -44,14 +35,10 @@
<files>
<file>
- <source>../provider/src/main/resources/initial/${feature-name}-provider.xml</source>
- <destName>./etc/opendaylight/karaf/200-${feature-name}-provider.xml</destName>
- </file>
- <file>
- <source>../model/target/generic-resource-api.properties</source>
- <destName>./configuration/generic-resource-api.properties</destName>
+ <source>../model/target/generic-resource-api.properties</source>
+ <destName>./configuration/generic-resource-api.properties</destName>
- </file>
+ </file>
</files>
</assembly>