summaryrefslogtreecommitdiffstats
path: root/message-router
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-12-13 12:42:39 -0500
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-12-13 12:42:39 -0500
commitbc18e2c019f4b16752ae25fa50b436e7cd65c8e8 (patch)
tree7e1c5f91d12f8fc854105d888938e572e3c76737 /message-router
parent9ed4144aa7a72da788306a420b8a9a26fd0d4401 (diff)
Refactor features to separate installer
Refactor karaf feature.xml files to separate installer Change-Id: I4dc4ad3c139522b12f41f1786ef16bfdd556f2b9 Issue-ID: CCSDK-1754 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'message-router')
-rwxr-xr-xmessage-router/consumer/features/ccsdk-messagerouter-consumer/pom.xml30
-rwxr-xr-xmessage-router/consumer/features/features-messagerouter-consumer/pom.xml33
-rwxr-xr-xmessage-router/consumer/features/pom.xml33
-rwxr-xr-xmessage-router/consumer/features/src/main/feature/feature.xml12
-rwxr-xr-xmessage-router/consumer/installer/pom.xml7
-rwxr-xr-xmessage-router/consumer/pom.xml1
-rwxr-xr-xmessage-router/publisher/features/ccsdk-messagerouter-publisher/pom.xml30
-rwxr-xr-xmessage-router/publisher/features/features-messagerouter-publisher/pom.xml33
-rw-r--r--message-router/publisher/features/pom.xml33
-rwxr-xr-xmessage-router/publisher/features/src/main/feature/feature.xml16
-rw-r--r--message-router/publisher/installer/pom.xml7
-rwxr-xr-xmessage-router/publisher/pom.xml1
12 files changed, 0 insertions, 236 deletions
diff --git a/message-router/consumer/features/ccsdk-messagerouter-consumer/pom.xml b/message-router/consumer/features/ccsdk-messagerouter-consumer/pom.xml
deleted file mode 100755
index 6ab191e6..00000000
--- a/message-router/consumer/features/ccsdk-messagerouter-consumer/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.onap.ccsdk.parent</groupId>
- <artifactId>single-feature-parent</artifactId>
- <version>1.5.1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
- <artifactId>ccsdk-messagerouter-consumer</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>feature</packaging>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>consumer.api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>consumer.provider</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
-
-</project>
diff --git a/message-router/consumer/features/features-messagerouter-consumer/pom.xml b/message-router/consumer/features/features-messagerouter-consumer/pom.xml
deleted file mode 100755
index f90de46c..00000000
--- a/message-router/consumer/features/features-messagerouter-consumer/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.onap.ccsdk.parent</groupId>
- <artifactId>feature-repo-parent</artifactId>
- <version>1.5.1-SNAPSHOT</version>
- <relativePath/>
- </parent>
-
- <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
- <artifactId>features-messagerouter-consumer</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>feature</packaging>
-
- <name>ccsdk-sli-adaptors :: messagerouter :: ${project.artifactId}</name>
-
- <properties>
- <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ccsdk-messagerouter-consumer</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
-
- </dependencies>
-</project>
diff --git a/message-router/consumer/features/pom.xml b/message-router/consumer/features/pom.xml
deleted file mode 100755
index 46e289ac..00000000
--- a/message-router/consumer/features/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ============LICENSE_START=======================================================
- ONAP : APPC ================================================================================
- Copyright (C) 2017 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. ECOMP is
- a trademark and service mark of AT&T Intellectual Property. ============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>odlparent-lite</artifactId>
- <groupId>org.onap.ccsdk.parent</groupId>
- <version>1.5.1-SNAPSHOT</version>
- <relativePath/>
- </parent>
- <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
- <artifactId>consumer.features</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <name>ccsdk-sli-adaptors :: messagerouter :: ${project.artifactId}</name>
-
- <packaging>pom</packaging>
-
- <modules>
- <module>ccsdk-messagerouter-consumer</module>
- <module>features-messagerouter-consumer</module>
- </modules>
-</project>
diff --git a/message-router/consumer/features/src/main/feature/feature.xml b/message-router/consumer/features/src/main/feature/feature.xml
deleted file mode 100755
index 3541270c..00000000
--- a/message-router/consumer/features/src/main/feature/feature.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<features name="messagerouter-consumer-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-
- <feature name='messagerouter-consumer' description="exposes message router consumer" version='${project.version}'>
- <bundle>mvn:${project.groupId}/consumer.api/${project.version}</bundle>
- <bundle>mvn:${project.groupId}/consumer.provider/${project.version}</bundle>
- </feature>
-
-</features>
diff --git a/message-router/consumer/installer/pom.xml b/message-router/consumer/installer/pom.xml
index 876232b1..a3015062 100755
--- a/message-router/consumer/installer/pom.xml
+++ b/message-router/consumer/installer/pom.xml
@@ -23,13 +23,6 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>ccsdk-messagerouter-consumer</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>consumer.api</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/message-router/consumer/pom.xml b/message-router/consumer/pom.xml
index 0960b8f0..5b7984a0 100755
--- a/message-router/consumer/pom.xml
+++ b/message-router/consumer/pom.xml
@@ -13,7 +13,6 @@
<modules>
<module>api</module>
- <module>features</module>
<module>provider</module>
<module>installer</module>
</modules>
diff --git a/message-router/publisher/features/ccsdk-messagerouter-publisher/pom.xml b/message-router/publisher/features/ccsdk-messagerouter-publisher/pom.xml
deleted file mode 100755
index 21b498d1..00000000
--- a/message-router/publisher/features/ccsdk-messagerouter-publisher/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.onap.ccsdk.parent</groupId>
- <artifactId>single-feature-parent</artifactId>
- <version>1.5.1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
- <artifactId>ccsdk-messagerouter-publisher</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>feature</packaging>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>publisher.api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>publisher.provider</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
-
-</project>
diff --git a/message-router/publisher/features/features-messagerouter-publisher/pom.xml b/message-router/publisher/features/features-messagerouter-publisher/pom.xml
deleted file mode 100755
index 860b46c0..00000000
--- a/message-router/publisher/features/features-messagerouter-publisher/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.onap.ccsdk.parent</groupId>
- <artifactId>feature-repo-parent</artifactId>
- <version>1.5.1-SNAPSHOT</version>
- <relativePath/>
- </parent>
-
- <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
- <artifactId>features-messagerouter-publisher</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>feature</packaging>
-
- <name>ccsdk-sli-adaptors :: messagerouter :: ${project.artifactId}</name>
-
- <properties>
- <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ccsdk-messagerouter-publisher</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
-
- </dependencies>
-</project>
diff --git a/message-router/publisher/features/pom.xml b/message-router/publisher/features/pom.xml
deleted file mode 100644
index 38ad37c7..00000000
--- a/message-router/publisher/features/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ============LICENSE_START=======================================================
- ONAP : APPC ================================================================================
- Copyright (C) 2017 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. ECOMP is
- a trademark and service mark of AT&T Intellectual Property. ============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>odlparent-lite</artifactId>
- <groupId>org.onap.ccsdk.parent</groupId>
- <version>1.5.1-SNAPSHOT</version>
- <relativePath/>
- </parent>
- <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
- <artifactId>publisher.features</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <name>ccsdk-sli-adaptors :: messagerouter :: ${project.artifactId}</name>
-
- <packaging>pom</packaging>
-
- <modules>
- <module>ccsdk-messagerouter-publisher</module>
- <module>features-messagerouter-publisher</module>
- </modules>
-</project>
diff --git a/message-router/publisher/features/src/main/feature/feature.xml b/message-router/publisher/features/src/main/feature/feature.xml
deleted file mode 100755
index b5332357..00000000
--- a/message-router/publisher/features/src/main/feature/feature.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<features name="messagerouter-publisher-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-
- <feature name='messagerouter-publisher' description="exposes message router publisher service" version='${project.version}'>
- <bundle>mvn:${project.groupId}/publisher.api/${project.version}</bundle>
- <bundle>mvn:${project.groupId}/publisher.provider/${project.version}</bundle>
- </feature>
-
- <feature name='sample-client' description="initializes a dummy client" version='${project.version}'>
- <bundle>mvn:${project.groupId}/sample.client/${project.version}</bundle>
- </feature>
-
-</features>
diff --git a/message-router/publisher/installer/pom.xml b/message-router/publisher/installer/pom.xml
index b6fb5b02..5f489062 100644
--- a/message-router/publisher/installer/pom.xml
+++ b/message-router/publisher/installer/pom.xml
@@ -23,13 +23,6 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>ccsdk-messagerouter-publisher</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>publisher.api</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/message-router/publisher/pom.xml b/message-router/publisher/pom.xml
index daad3646..be5207e0 100755
--- a/message-router/publisher/pom.xml
+++ b/message-router/publisher/pom.xml
@@ -13,7 +13,6 @@
<modules>
<module>api</module>
- <module>features</module>
<module>provider</module>
<module>sample.client</module>
<module>installer</module>