aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvarun gudisena <vg411h@att.com>2018-10-19 10:48:16 +0000
committerGerrit Code Review <gerrit@onap.org>2018-10-19 10:48:16 +0000
commit7d8fa29803b9d9328106702910e47a4596f84cc9 (patch)
treef0d3803f033a448940ec113b90c7e0db7a726657
parent3c7f6dc59bd79fb91a7449276ea6d0ccc85d8f0b (diff)
parent4aac89d82eb72c9e3415f99e089a0799927aaa37 (diff)
Merge "Create ZIP with Dmaap DR docker-compose stuff"
-rw-r--r--datarouter-docker-compose/pom.xml61
-rw-r--r--datarouter-docker-compose/src/assembly/zip.xml50
-rw-r--r--datarouter-docker-compose/src/main/resources/database/sql_init_01.sql (renamed from docker-compose/database/sql_init_01.sql)0
-rw-r--r--datarouter-docker-compose/src/main/resources/docker-compose.yml (renamed from docker-compose/docker-compose.yml)0
-rwxr-xr-xdatarouter-docker-compose/src/main/resources/node_data/aaf_certs/org.onap.dmaap-dr.jks (renamed from docker-compose/node_data/aaf_certs/org.onap.dmaap-dr.jks)bin3659 -> 3659 bytes
-rwxr-xr-xdatarouter-docker-compose/src/main/resources/node_data/aaf_certs/org.onap.dmaap-dr.trust.jks (renamed from docker-compose/node_data/aaf_certs/org.onap.dmaap-dr.trust.jks)bin1413 -> 1413 bytes
-rw-r--r--datarouter-docker-compose/src/main/resources/node_data/node.properties (renamed from docker-compose/node_data/node.properties)0
-rwxr-xr-xdatarouter-docker-compose/src/main/resources/prov_data/aaf_certs/org.onap.dmaap-dr.jks (renamed from docker-compose/prov_data/aaf_certs/org.onap.dmaap-dr.jks)bin3660 -> 3660 bytes
-rwxr-xr-xdatarouter-docker-compose/src/main/resources/prov_data/aaf_certs/org.onap.dmaap-dr.trust.jks (renamed from docker-compose/prov_data/aaf_certs/org.onap.dmaap-dr.trust.jks)bin1413 -> 1413 bytes
-rw-r--r--datarouter-docker-compose/src/main/resources/prov_data/addFeed3.txt (renamed from docker-compose/prov_data/addFeed3.txt)0
-rw-r--r--datarouter-docker-compose/src/main/resources/prov_data/addSubscriber.txt (renamed from docker-compose/prov_data/addSubscriber.txt)0
-rwxr-xr-xdatarouter-docker-compose/src/main/resources/prov_data/provserver.properties (renamed from docker-compose/prov_data/provserver.properties)0
-rw-r--r--datarouter-docker-compose/src/main/resources/subscriber_data/subscriber.properties (renamed from docker-compose/subscriber_data/subscriber.properties)0
-rwxr-xr-xpom.xml1
14 files changed, 112 insertions, 0 deletions
diff --git a/datarouter-docker-compose/pom.xml b/datarouter-docker-compose/pom.xml
new file mode 100644
index 00000000..8ee75885
--- /dev/null
+++ b/datarouter-docker-compose/pom.xml
@@ -0,0 +1,61 @@
+<!--
+ ============LICENSE_START==================================================
+ * org.onap.dmaap
+ * ===========================================================================
+ * Copyright (C) 2018 Nokia. 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====================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ *
+-->
+<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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.onap.dmaap.datarouter</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>datarouter-docker-compose</artifactId>
+ <packaging>pom</packaging>
+ <name>datarouter-docker-compose</name>
+ <properties>
+ <sonar.skip>true</sonar.skip>
+ </properties>
+ <build>
+ <finalName>datarouter-docker-compose</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/assembly/zip.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/datarouter-docker-compose/src/assembly/zip.xml b/datarouter-docker-compose/src/assembly/zip.xml
new file mode 100644
index 00000000..44ec73bd
--- /dev/null
+++ b/datarouter-docker-compose/src/assembly/zip.xml
@@ -0,0 +1,50 @@
+<!--
+ ============LICENSE_START==================================================
+ * org.onap.dmaap
+ * ===========================================================================
+ * Copyright (C) 2018 Nokia. 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====================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ *
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>zip</id>
+ <includeBaseDirectory>true</includeBaseDirectory>
+
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}/src/main/resources</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>**</include>
+ <include>*/*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <excludes>
+ <exclude>${project.groupId}:${project.artifactId}:jar:*</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+</assembly> \ No newline at end of file
diff --git a/docker-compose/database/sql_init_01.sql b/datarouter-docker-compose/src/main/resources/database/sql_init_01.sql
index 356a67a9..356a67a9 100644
--- a/docker-compose/database/sql_init_01.sql
+++ b/datarouter-docker-compose/src/main/resources/database/sql_init_01.sql
diff --git a/docker-compose/docker-compose.yml b/datarouter-docker-compose/src/main/resources/docker-compose.yml
index beb79a0f..beb79a0f 100644
--- a/docker-compose/docker-compose.yml
+++ b/datarouter-docker-compose/src/main/resources/docker-compose.yml
diff --git a/docker-compose/node_data/aaf_certs/org.onap.dmaap-dr.jks b/datarouter-docker-compose/src/main/resources/node_data/aaf_certs/org.onap.dmaap-dr.jks
index 4529cccb..4529cccb 100755
--- a/docker-compose/node_data/aaf_certs/org.onap.dmaap-dr.jks
+++ b/datarouter-docker-compose/src/main/resources/node_data/aaf_certs/org.onap.dmaap-dr.jks
Binary files differ
diff --git a/docker-compose/node_data/aaf_certs/org.onap.dmaap-dr.trust.jks b/datarouter-docker-compose/src/main/resources/node_data/aaf_certs/org.onap.dmaap-dr.trust.jks
index 096fbb26..096fbb26 100755
--- a/docker-compose/node_data/aaf_certs/org.onap.dmaap-dr.trust.jks
+++ b/datarouter-docker-compose/src/main/resources/node_data/aaf_certs/org.onap.dmaap-dr.trust.jks
Binary files differ
diff --git a/docker-compose/node_data/node.properties b/datarouter-docker-compose/src/main/resources/node_data/node.properties
index 03096570..03096570 100644
--- a/docker-compose/node_data/node.properties
+++ b/datarouter-docker-compose/src/main/resources/node_data/node.properties
diff --git a/docker-compose/prov_data/aaf_certs/org.onap.dmaap-dr.jks b/datarouter-docker-compose/src/main/resources/prov_data/aaf_certs/org.onap.dmaap-dr.jks
index 155991ab..155991ab 100755
--- a/docker-compose/prov_data/aaf_certs/org.onap.dmaap-dr.jks
+++ b/datarouter-docker-compose/src/main/resources/prov_data/aaf_certs/org.onap.dmaap-dr.jks
Binary files differ
diff --git a/docker-compose/prov_data/aaf_certs/org.onap.dmaap-dr.trust.jks b/datarouter-docker-compose/src/main/resources/prov_data/aaf_certs/org.onap.dmaap-dr.trust.jks
index c8f9ee66..c8f9ee66 100755
--- a/docker-compose/prov_data/aaf_certs/org.onap.dmaap-dr.trust.jks
+++ b/datarouter-docker-compose/src/main/resources/prov_data/aaf_certs/org.onap.dmaap-dr.trust.jks
Binary files differ
diff --git a/docker-compose/prov_data/addFeed3.txt b/datarouter-docker-compose/src/main/resources/prov_data/addFeed3.txt
index 21000d0a..21000d0a 100644
--- a/docker-compose/prov_data/addFeed3.txt
+++ b/datarouter-docker-compose/src/main/resources/prov_data/addFeed3.txt
diff --git a/docker-compose/prov_data/addSubscriber.txt b/datarouter-docker-compose/src/main/resources/prov_data/addSubscriber.txt
index 45e12732..45e12732 100644
--- a/docker-compose/prov_data/addSubscriber.txt
+++ b/datarouter-docker-compose/src/main/resources/prov_data/addSubscriber.txt
diff --git a/docker-compose/prov_data/provserver.properties b/datarouter-docker-compose/src/main/resources/prov_data/provserver.properties
index c37bd4fb..c37bd4fb 100755
--- a/docker-compose/prov_data/provserver.properties
+++ b/datarouter-docker-compose/src/main/resources/prov_data/provserver.properties
diff --git a/docker-compose/subscriber_data/subscriber.properties b/datarouter-docker-compose/src/main/resources/subscriber_data/subscriber.properties
index 771fdd34..771fdd34 100644
--- a/docker-compose/subscriber_data/subscriber.properties
+++ b/datarouter-docker-compose/src/main/resources/subscriber_data/subscriber.properties
diff --git a/pom.xml b/pom.xml
index 84dbfa10..a615605c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -68,6 +68,7 @@
<module>datarouter-prov</module>
<module>datarouter-node</module>
<module>datarouter-subscriber</module>
+ <module>datarouter-docker-compose</module>
</modules>
<build>
<plugins>