From ed12890b0bb0c07acd3eb7bcbd10bfcca3046a2b Mon Sep 17 00:00:00 2001
From: sheetalm <sheetal.mudholkar@amdocs.com>
Date: Tue, 13 Mar 2018 19:32:08 +0530
Subject: [PATCH] Activity Spec Service - Dockerization

Resolving merge conflict
Fixing todo items after rebase.
URL to be /activity-spec-api. Removing unused image. Renaming css
Configuring docker registry to push images and adding docker profile
Add maven docker module to generate below docker images
1 activity-spec-init:1.2.0-SNAPSHOT - creates cassandra keyspace and tables
  in already running cassandra docker image
2 activity-spec-be:1.2.0-SNAPSHOT - deploys activity spec war and swagger war on base jetty docker image

Change-Id: Ic638e2cb9c224e9e6c91cf0f7198594593a77ae5
Issue-ID: SDC-1048
Signed-off-by: sheetalm <sheetal.mudholkar@amdocs.com>
---
 .../activity-spec-init/.maven-dockerignore         |   1 +
 .../activity-spec/activity-spec-init/Dockerfile    |  10 ++
 .../create_activityspec_db.cql                     |   0
 services/activity-spec/activity-spec-init/pom.xml  |  47 ++++++++
 services/activity-spec/activity-spec-init/start.sh |   8 ++
 .../activity-spec-web/.maven-dockerignore          |   1 +
 .../activity-spec/activity-spec-web/Dockerfile     |  24 ++++
 .../activity-spec-api-docs}/WEB-INF/jetty-web.xml  |   0
 .../activity-spec-api-docs}/assembly/swagger.xml   |   0
 .../activity-spec-api-docs/css/custom-style.css}   |   0
 .../activity-spec-api-docs}/css/print.css          |   0
 .../activity-spec-api-docs}/css/reset.css          |   0
 .../activity-spec-api-docs}/css/screen.css         |   0
 .../activity-spec-api-docs}/css/style.css          |   0
 .../activity-spec-api-docs}/css/typography.css     |   0
 .../fonts/droid-sans-v6-latin-700.eot              | Bin
 .../fonts/droid-sans-v6-latin-700.svg              |   0
 .../fonts/droid-sans-v6-latin-700.ttf              | Bin
 .../fonts/droid-sans-v6-latin-700.woff             | Bin
 .../fonts/droid-sans-v6-latin-700.woff2            | Bin
 .../fonts/droid-sans-v6-latin-regular.eot          | Bin
 .../fonts/droid-sans-v6-latin-regular.svg          |   0
 .../fonts/droid-sans-v6-latin-regular.ttf          | Bin
 .../fonts/droid-sans-v6-latin-regular.woff         | Bin
 .../fonts/droid-sans-v6-latin-regular.woff2        | Bin
 .../images/explorer_icons.png                      | Bin
 .../images/favicon-16x16.png                       | Bin
 .../images/favicon-32x32.png                       | Bin
 .../activity-spec-api-docs}/images/favicon.ico     | Bin
 .../activity-spec-api-docs}/images/logo_small.png  | Bin
 .../activity-spec-api-docs}/images/throbber.gif    | Bin
 .../activity-spec-api-docs}/images/wordnik_api.png | Bin
 .../activity-spec-api-docs}/index.html             |   2 +-
 .../activity-spec-api-docs}/lang/en.js             |   0
 .../activity-spec-api-docs}/lang/es.js             |   0
 .../activity-spec-api-docs}/lang/ja.js             |   0
 .../activity-spec-api-docs}/lang/pt.js             |   0
 .../activity-spec-api-docs}/lang/ru.js             |   0
 .../activity-spec-api-docs}/lang/tr.js             |   0
 .../activity-spec-api-docs}/lang/translator.js     |   0
 .../activity-spec-api-docs}/lang/zh-cn.js          |   0
 .../activity-spec-api-docs}/lib/backbone-min.js    |   0
 .../lib/handlebars-2.0.0.js                        |   0
 .../lib/highlight.7.3.pack.js                      |   0
 .../lib/jquery-1.8.0.min.js                        |   0
 .../lib/jquery.ba-bbq.min.js                       |   0
 .../lib/jquery.slideto.min.js                      |   0
 .../lib/jquery.wiggle.min.js                       |   0
 .../activity-spec-api-docs}/lib/marked.js          |   0
 .../activity-spec-api-docs}/lib/swagger-oauth.js   |   0
 .../activity-spec-api-docs}/lib/underscore-min.js  |   0
 .../activity-spec-api-docs}/lib/underscore-min.map |   0
 .../activity-spec-api-docs}/o2c.html               |   0
 .../activity-spec-api-docs/pom.xml                 |  70 +++++++++++
 .../activity-spec-api-docs}/swagger-ui.js          |   0
 .../activity-spec-assembly/configuration.yaml      |   9 ++
 .../activity-spec-assembly/start.sh                |  11 ++
 .../activity-spec-service/pom.xml                  |  21 +---
 .../activityspec/mocks/ItemManagerMock.java        |  15 ++-
 .../activity-spec-web/activity-spec-war/pom.xml    | 131 +++++++++++----------
 .../src/main/webapp/WEB-INF/jetty-web.xml          |   2 +-
 services/activity-spec/activity-spec-web/pom.xml   |  35 +++++-
 services/activity-spec/config/readme.txt           |   1 -
 services/activity-spec/pom.xml                     |  87 +++++++++-----
 .../swagger-ui/images/pet_store_api.png            | Bin 824 -> 0 bytes
 services/activity-spec/swagger-ui/pom.xml          |  98 ---------------
 66 files changed, 352 insertions(+), 221 deletions(-)
 create mode 100644 services/activity-spec/activity-spec-init/.maven-dockerignore
 create mode 100644 services/activity-spec/activity-spec-init/Dockerfile
 rename services/activity-spec/{setup => activity-spec-init}/create_activityspec_db.cql (100%)
 create mode 100644 services/activity-spec/activity-spec-init/pom.xml
 create mode 100644 services/activity-spec/activity-spec-init/start.sh
 create mode 100644 services/activity-spec/activity-spec-web/.maven-dockerignore
 create mode 100644 services/activity-spec/activity-spec-web/Dockerfile
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/WEB-INF/jetty-web.xml (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/assembly/swagger.xml (100%)
 rename services/activity-spec/{swagger-ui/css/ncso-style.css => activity-spec-web/activity-spec-api-docs/css/custom-style.css} (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/css/print.css (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/css/reset.css (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/css/screen.css (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/css/style.css (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/css/typography.css (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/fonts/droid-sans-v6-latin-700.eot (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/fonts/droid-sans-v6-latin-700.svg (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/fonts/droid-sans-v6-latin-700.ttf (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/fonts/droid-sans-v6-latin-700.woff (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/fonts/droid-sans-v6-latin-700.woff2 (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/fonts/droid-sans-v6-latin-regular.eot (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/fonts/droid-sans-v6-latin-regular.svg (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/fonts/droid-sans-v6-latin-regular.ttf (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/fonts/droid-sans-v6-latin-regular.woff (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/fonts/droid-sans-v6-latin-regular.woff2 (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/images/explorer_icons.png (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/images/favicon-16x16.png (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/images/favicon-32x32.png (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/images/favicon.ico (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/images/logo_small.png (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/images/throbber.gif (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/images/wordnik_api.png (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/index.html (99%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/lang/en.js (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/lang/es.js (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/lang/ja.js (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/lang/pt.js (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/lang/ru.js (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/lang/tr.js (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/lang/translator.js (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/lang/zh-cn.js (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/lib/backbone-min.js (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/lib/handlebars-2.0.0.js (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/lib/highlight.7.3.pack.js (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/lib/jquery-1.8.0.min.js (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/lib/jquery.ba-bbq.min.js (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/lib/jquery.slideto.min.js (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/lib/jquery.wiggle.min.js (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/lib/marked.js (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/lib/swagger-oauth.js (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/lib/underscore-min.js (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/lib/underscore-min.map (100%)
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/o2c.html (100%)
 create mode 100644 services/activity-spec/activity-spec-web/activity-spec-api-docs/pom.xml
 rename services/activity-spec/{swagger-ui => activity-spec-web/activity-spec-api-docs}/swagger-ui.js (100%)
 create mode 100644 services/activity-spec/activity-spec-web/activity-spec-assembly/configuration.yaml
 create mode 100644 services/activity-spec/activity-spec-web/activity-spec-assembly/start.sh
 delete mode 100644 services/activity-spec/config/readme.txt
 delete mode 100644 services/activity-spec/swagger-ui/images/pet_store_api.png
 delete mode 100644 services/activity-spec/swagger-ui/pom.xml

diff --git a/services/activity-spec/activity-spec-init/.maven-dockerignore b/services/activity-spec/activity-spec-init/.maven-dockerignore
new file mode 100644
index 0000000000..9f970225ad
--- /dev/null
+++ b/services/activity-spec/activity-spec-init/.maven-dockerignore
@@ -0,0 +1 @@
+target/
\ No newline at end of file
diff --git a/services/activity-spec/activity-spec-init/Dockerfile b/services/activity-spec/activity-spec-init/Dockerfile
new file mode 100644
index 0000000000..25fcd38411
--- /dev/null
+++ b/services/activity-spec/activity-spec-init/Dockerfile
@@ -0,0 +1,10 @@
+FROM cassandra:2.1.9
+
+ENV CASSANDRA_PORT=9042
+
+COPY create_activityspec_db.cql .
+COPY start.sh .
+
+RUN chmod 744 start.sh
+
+ENTRYPOINT ["/start.sh"]
\ No newline at end of file
diff --git a/services/activity-spec/setup/create_activityspec_db.cql b/services/activity-spec/activity-spec-init/create_activityspec_db.cql
similarity index 100%
rename from services/activity-spec/setup/create_activityspec_db.cql
rename to services/activity-spec/activity-spec-init/create_activityspec_db.cql
diff --git a/services/activity-spec/activity-spec-init/pom.xml b/services/activity-spec/activity-spec-init/pom.xml
new file mode 100644
index 0000000000..7873876846
--- /dev/null
+++ b/services/activity-spec/activity-spec-init/pom.xml
@@ -0,0 +1,47 @@
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         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>
+
+    <artifactId>activity-spec-init</artifactId>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>org.openecomp.activityspec</groupId>
+        <artifactId>activity-spec</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
+    </parent>
+
+    <profiles>
+        <profile>
+            <id>docker</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <name>onap/activity-spec-init</name>
+                                    <build>
+                                        <tags>
+                                            <tag>${project.version}</tag>
+                                        </tags>
+                                        <dockerFileDir>${project.basedir}</dockerFileDir>
+                                        <dockerFile>Dockerfile</dockerFile>
+                                    </build>
+                                </image>
+                            </images>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>
\ No newline at end of file
diff --git a/services/activity-spec/activity-spec-init/start.sh b/services/activity-spec/activity-spec-init/start.sh
new file mode 100644
index 0000000000..5242bd5d9e
--- /dev/null
+++ b/services/activity-spec/activity-spec-init/start.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [[ -z "${CASSANDRA_HOST}" ]]; then
+	echo "CASSANDRA_HOST environment variable must be set"
+	exit 1
+fi
+
+cqlsh -f /create_activityspec_db.cql $CASSANDRA_HOST $CASSANDRA_PORT
\ No newline at end of file
diff --git a/services/activity-spec/activity-spec-web/.maven-dockerignore b/services/activity-spec/activity-spec-web/.maven-dockerignore
new file mode 100644
index 0000000000..9f970225ad
--- /dev/null
+++ b/services/activity-spec/activity-spec-web/.maven-dockerignore
@@ -0,0 +1 @@
+target/
\ No newline at end of file
diff --git a/services/activity-spec/activity-spec-web/Dockerfile b/services/activity-spec/activity-spec-web/Dockerfile
new file mode 100644
index 0000000000..9d8bbeaf1b
--- /dev/null
+++ b/services/activity-spec/activity-spec-web/Dockerfile
@@ -0,0 +1,24 @@
+FROM jetty:alpine
+
+EXPOSE 8080
+EXPOSE 8443
+EXPOSE 5005
+
+ARG ARTIFACT_VERSION
+
+# See https://hub.docker.com/_/jetty/
+ARG WEBAPPS_DIR=${JETTY_BASE}/webapps/
+
+COPY activity-spec-api-docs/target/activity-spec-api-docs-${ARTIFACT_VERSION}.war ${WEBAPPS_DIR}
+
+COPY activity-spec-war/target/activity-spec-war-${ARTIFACT_VERSION}.war ${WEBAPPS_DIR}
+
+COPY activity-spec-assembly/configuration.yaml .
+COPY activity-spec-assembly/start.sh .
+
+USER root
+
+RUN chown jetty:jetty start.sh
+RUN chmod 744 start.sh
+
+ENTRYPOINT ["./start.sh"]
\ No newline at end of file
diff --git a/services/activity-spec/swagger-ui/WEB-INF/jetty-web.xml b/services/activity-spec/activity-spec-web/activity-spec-api-docs/WEB-INF/jetty-web.xml
similarity index 100%
rename from services/activity-spec/swagger-ui/WEB-INF/jetty-web.xml
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/WEB-INF/jetty-web.xml
diff --git a/services/activity-spec/swagger-ui/assembly/swagger.xml b/services/activity-spec/activity-spec-web/activity-spec-api-docs/assembly/swagger.xml
similarity index 100%
rename from services/activity-spec/swagger-ui/assembly/swagger.xml
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/assembly/swagger.xml
diff --git a/services/activity-spec/swagger-ui/css/ncso-style.css b/services/activity-spec/activity-spec-web/activity-spec-api-docs/css/custom-style.css
similarity index 100%
rename from services/activity-spec/swagger-ui/css/ncso-style.css
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/css/custom-style.css
diff --git a/services/activity-spec/swagger-ui/css/print.css b/services/activity-spec/activity-spec-web/activity-spec-api-docs/css/print.css
similarity index 100%
rename from services/activity-spec/swagger-ui/css/print.css
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/css/print.css
diff --git a/services/activity-spec/swagger-ui/css/reset.css b/services/activity-spec/activity-spec-web/activity-spec-api-docs/css/reset.css
similarity index 100%
rename from services/activity-spec/swagger-ui/css/reset.css
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/css/reset.css
diff --git a/services/activity-spec/swagger-ui/css/screen.css b/services/activity-spec/activity-spec-web/activity-spec-api-docs/css/screen.css
similarity index 100%
rename from services/activity-spec/swagger-ui/css/screen.css
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/css/screen.css
diff --git a/services/activity-spec/swagger-ui/css/style.css b/services/activity-spec/activity-spec-web/activity-spec-api-docs/css/style.css
similarity index 100%
rename from services/activity-spec/swagger-ui/css/style.css
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/css/style.css
diff --git a/services/activity-spec/swagger-ui/css/typography.css b/services/activity-spec/activity-spec-web/activity-spec-api-docs/css/typography.css
similarity index 100%
rename from services/activity-spec/swagger-ui/css/typography.css
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/css/typography.css
diff --git a/services/activity-spec/swagger-ui/fonts/droid-sans-v6-latin-700.eot b/services/activity-spec/activity-spec-web/activity-spec-api-docs/fonts/droid-sans-v6-latin-700.eot
similarity index 100%
rename from services/activity-spec/swagger-ui/fonts/droid-sans-v6-latin-700.eot
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/fonts/droid-sans-v6-latin-700.eot
diff --git a/services/activity-spec/swagger-ui/fonts/droid-sans-v6-latin-700.svg b/services/activity-spec/activity-spec-web/activity-spec-api-docs/fonts/droid-sans-v6-latin-700.svg
similarity index 100%
rename from services/activity-spec/swagger-ui/fonts/droid-sans-v6-latin-700.svg
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/fonts/droid-sans-v6-latin-700.svg
diff --git a/services/activity-spec/swagger-ui/fonts/droid-sans-v6-latin-700.ttf b/services/activity-spec/activity-spec-web/activity-spec-api-docs/fonts/droid-sans-v6-latin-700.ttf
similarity index 100%
rename from services/activity-spec/swagger-ui/fonts/droid-sans-v6-latin-700.ttf
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/fonts/droid-sans-v6-latin-700.ttf
diff --git a/services/activity-spec/swagger-ui/fonts/droid-sans-v6-latin-700.woff b/services/activity-spec/activity-spec-web/activity-spec-api-docs/fonts/droid-sans-v6-latin-700.woff
similarity index 100%
rename from services/activity-spec/swagger-ui/fonts/droid-sans-v6-latin-700.woff
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/fonts/droid-sans-v6-latin-700.woff
diff --git a/services/activity-spec/swagger-ui/fonts/droid-sans-v6-latin-700.woff2 b/services/activity-spec/activity-spec-web/activity-spec-api-docs/fonts/droid-sans-v6-latin-700.woff2
similarity index 100%
rename from services/activity-spec/swagger-ui/fonts/droid-sans-v6-latin-700.woff2
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/fonts/droid-sans-v6-latin-700.woff2
diff --git a/services/activity-spec/swagger-ui/fonts/droid-sans-v6-latin-regular.eot b/services/activity-spec/activity-spec-web/activity-spec-api-docs/fonts/droid-sans-v6-latin-regular.eot
similarity index 100%
rename from services/activity-spec/swagger-ui/fonts/droid-sans-v6-latin-regular.eot
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/fonts/droid-sans-v6-latin-regular.eot
diff --git a/services/activity-spec/swagger-ui/fonts/droid-sans-v6-latin-regular.svg b/services/activity-spec/activity-spec-web/activity-spec-api-docs/fonts/droid-sans-v6-latin-regular.svg
similarity index 100%
rename from services/activity-spec/swagger-ui/fonts/droid-sans-v6-latin-regular.svg
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/fonts/droid-sans-v6-latin-regular.svg
diff --git a/services/activity-spec/swagger-ui/fonts/droid-sans-v6-latin-regular.ttf b/services/activity-spec/activity-spec-web/activity-spec-api-docs/fonts/droid-sans-v6-latin-regular.ttf
similarity index 100%
rename from services/activity-spec/swagger-ui/fonts/droid-sans-v6-latin-regular.ttf
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/fonts/droid-sans-v6-latin-regular.ttf
diff --git a/services/activity-spec/swagger-ui/fonts/droid-sans-v6-latin-regular.woff b/services/activity-spec/activity-spec-web/activity-spec-api-docs/fonts/droid-sans-v6-latin-regular.woff
similarity index 100%
rename from services/activity-spec/swagger-ui/fonts/droid-sans-v6-latin-regular.woff
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/fonts/droid-sans-v6-latin-regular.woff
diff --git a/services/activity-spec/swagger-ui/fonts/droid-sans-v6-latin-regular.woff2 b/services/activity-spec/activity-spec-web/activity-spec-api-docs/fonts/droid-sans-v6-latin-regular.woff2
similarity index 100%
rename from services/activity-spec/swagger-ui/fonts/droid-sans-v6-latin-regular.woff2
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/fonts/droid-sans-v6-latin-regular.woff2
diff --git a/services/activity-spec/swagger-ui/images/explorer_icons.png b/services/activity-spec/activity-spec-web/activity-spec-api-docs/images/explorer_icons.png
similarity index 100%
rename from services/activity-spec/swagger-ui/images/explorer_icons.png
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/images/explorer_icons.png
diff --git a/services/activity-spec/swagger-ui/images/favicon-16x16.png b/services/activity-spec/activity-spec-web/activity-spec-api-docs/images/favicon-16x16.png
similarity index 100%
rename from services/activity-spec/swagger-ui/images/favicon-16x16.png
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/images/favicon-16x16.png
diff --git a/services/activity-spec/swagger-ui/images/favicon-32x32.png b/services/activity-spec/activity-spec-web/activity-spec-api-docs/images/favicon-32x32.png
similarity index 100%
rename from services/activity-spec/swagger-ui/images/favicon-32x32.png
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/images/favicon-32x32.png
diff --git a/services/activity-spec/swagger-ui/images/favicon.ico b/services/activity-spec/activity-spec-web/activity-spec-api-docs/images/favicon.ico
similarity index 100%
rename from services/activity-spec/swagger-ui/images/favicon.ico
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/images/favicon.ico
diff --git a/services/activity-spec/swagger-ui/images/logo_small.png b/services/activity-spec/activity-spec-web/activity-spec-api-docs/images/logo_small.png
similarity index 100%
rename from services/activity-spec/swagger-ui/images/logo_small.png
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/images/logo_small.png
diff --git a/services/activity-spec/swagger-ui/images/throbber.gif b/services/activity-spec/activity-spec-web/activity-spec-api-docs/images/throbber.gif
similarity index 100%
rename from services/activity-spec/swagger-ui/images/throbber.gif
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/images/throbber.gif
diff --git a/services/activity-spec/swagger-ui/images/wordnik_api.png b/services/activity-spec/activity-spec-web/activity-spec-api-docs/images/wordnik_api.png
similarity index 100%
rename from services/activity-spec/swagger-ui/images/wordnik_api.png
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/images/wordnik_api.png
diff --git a/services/activity-spec/swagger-ui/index.html b/services/activity-spec/activity-spec-web/activity-spec-api-docs/index.html
similarity index 99%
rename from services/activity-spec/swagger-ui/index.html
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/index.html
index 77a3656a29..2526769188 100644
--- a/services/activity-spec/swagger-ui/index.html
+++ b/services/activity-spec/activity-spec-web/activity-spec-api-docs/index.html
@@ -10,7 +10,7 @@
   <link href='css/reset.css' media='print' rel='stylesheet' type='text/css'/>
   <link href='css/print.css' media='print' rel='stylesheet' type='text/css'/>
   <!--Custom: Take from application\frontend\nfv-client\dist\optimize\resources\nfv\css\style.css-->
-  <link href='css/ncso-style.css' rel='stylesheet' type='text/css'/>
+  <link href='css/custom-style.css' rel='stylesheet' type='text/css'/>
   <!--/Custom: Take from application\frontend\nfv-client\dist\optimize\resources\nfv\css\style.css-->
 
   <script src='lib/jquery-1.8.0.min.js' type='text/javascript'></script>
diff --git a/services/activity-spec/swagger-ui/lang/en.js b/services/activity-spec/activity-spec-web/activity-spec-api-docs/lang/en.js
similarity index 100%
rename from services/activity-spec/swagger-ui/lang/en.js
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/lang/en.js
diff --git a/services/activity-spec/swagger-ui/lang/es.js b/services/activity-spec/activity-spec-web/activity-spec-api-docs/lang/es.js
similarity index 100%
rename from services/activity-spec/swagger-ui/lang/es.js
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/lang/es.js
diff --git a/services/activity-spec/swagger-ui/lang/ja.js b/services/activity-spec/activity-spec-web/activity-spec-api-docs/lang/ja.js
similarity index 100%
rename from services/activity-spec/swagger-ui/lang/ja.js
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/lang/ja.js
diff --git a/services/activity-spec/swagger-ui/lang/pt.js b/services/activity-spec/activity-spec-web/activity-spec-api-docs/lang/pt.js
similarity index 100%
rename from services/activity-spec/swagger-ui/lang/pt.js
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/lang/pt.js
diff --git a/services/activity-spec/swagger-ui/lang/ru.js b/services/activity-spec/activity-spec-web/activity-spec-api-docs/lang/ru.js
similarity index 100%
rename from services/activity-spec/swagger-ui/lang/ru.js
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/lang/ru.js
diff --git a/services/activity-spec/swagger-ui/lang/tr.js b/services/activity-spec/activity-spec-web/activity-spec-api-docs/lang/tr.js
similarity index 100%
rename from services/activity-spec/swagger-ui/lang/tr.js
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/lang/tr.js
diff --git a/services/activity-spec/swagger-ui/lang/translator.js b/services/activity-spec/activity-spec-web/activity-spec-api-docs/lang/translator.js
similarity index 100%
rename from services/activity-spec/swagger-ui/lang/translator.js
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/lang/translator.js
diff --git a/services/activity-spec/swagger-ui/lang/zh-cn.js b/services/activity-spec/activity-spec-web/activity-spec-api-docs/lang/zh-cn.js
similarity index 100%
rename from services/activity-spec/swagger-ui/lang/zh-cn.js
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/lang/zh-cn.js
diff --git a/services/activity-spec/swagger-ui/lib/backbone-min.js b/services/activity-spec/activity-spec-web/activity-spec-api-docs/lib/backbone-min.js
similarity index 100%
rename from services/activity-spec/swagger-ui/lib/backbone-min.js
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/lib/backbone-min.js
diff --git a/services/activity-spec/swagger-ui/lib/handlebars-2.0.0.js b/services/activity-spec/activity-spec-web/activity-spec-api-docs/lib/handlebars-2.0.0.js
similarity index 100%
rename from services/activity-spec/swagger-ui/lib/handlebars-2.0.0.js
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/lib/handlebars-2.0.0.js
diff --git a/services/activity-spec/swagger-ui/lib/highlight.7.3.pack.js b/services/activity-spec/activity-spec-web/activity-spec-api-docs/lib/highlight.7.3.pack.js
similarity index 100%
rename from services/activity-spec/swagger-ui/lib/highlight.7.3.pack.js
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/lib/highlight.7.3.pack.js
diff --git a/services/activity-spec/swagger-ui/lib/jquery-1.8.0.min.js b/services/activity-spec/activity-spec-web/activity-spec-api-docs/lib/jquery-1.8.0.min.js
similarity index 100%
rename from services/activity-spec/swagger-ui/lib/jquery-1.8.0.min.js
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/lib/jquery-1.8.0.min.js
diff --git a/services/activity-spec/swagger-ui/lib/jquery.ba-bbq.min.js b/services/activity-spec/activity-spec-web/activity-spec-api-docs/lib/jquery.ba-bbq.min.js
similarity index 100%
rename from services/activity-spec/swagger-ui/lib/jquery.ba-bbq.min.js
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/lib/jquery.ba-bbq.min.js
diff --git a/services/activity-spec/swagger-ui/lib/jquery.slideto.min.js b/services/activity-spec/activity-spec-web/activity-spec-api-docs/lib/jquery.slideto.min.js
similarity index 100%
rename from services/activity-spec/swagger-ui/lib/jquery.slideto.min.js
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/lib/jquery.slideto.min.js
diff --git a/services/activity-spec/swagger-ui/lib/jquery.wiggle.min.js b/services/activity-spec/activity-spec-web/activity-spec-api-docs/lib/jquery.wiggle.min.js
similarity index 100%
rename from services/activity-spec/swagger-ui/lib/jquery.wiggle.min.js
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/lib/jquery.wiggle.min.js
diff --git a/services/activity-spec/swagger-ui/lib/marked.js b/services/activity-spec/activity-spec-web/activity-spec-api-docs/lib/marked.js
similarity index 100%
rename from services/activity-spec/swagger-ui/lib/marked.js
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/lib/marked.js
diff --git a/services/activity-spec/swagger-ui/lib/swagger-oauth.js b/services/activity-spec/activity-spec-web/activity-spec-api-docs/lib/swagger-oauth.js
similarity index 100%
rename from services/activity-spec/swagger-ui/lib/swagger-oauth.js
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/lib/swagger-oauth.js
diff --git a/services/activity-spec/swagger-ui/lib/underscore-min.js b/services/activity-spec/activity-spec-web/activity-spec-api-docs/lib/underscore-min.js
similarity index 100%
rename from services/activity-spec/swagger-ui/lib/underscore-min.js
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/lib/underscore-min.js
diff --git a/services/activity-spec/swagger-ui/lib/underscore-min.map b/services/activity-spec/activity-spec-web/activity-spec-api-docs/lib/underscore-min.map
similarity index 100%
rename from services/activity-spec/swagger-ui/lib/underscore-min.map
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/lib/underscore-min.map
diff --git a/services/activity-spec/swagger-ui/o2c.html b/services/activity-spec/activity-spec-web/activity-spec-api-docs/o2c.html
similarity index 100%
rename from services/activity-spec/swagger-ui/o2c.html
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/o2c.html
diff --git a/services/activity-spec/activity-spec-web/activity-spec-api-docs/pom.xml b/services/activity-spec/activity-spec-web/activity-spec-api-docs/pom.xml
new file mode 100644
index 0000000000..b920b91860
--- /dev/null
+++ b/services/activity-spec/activity-spec-web/activity-spec-api-docs/pom.xml
@@ -0,0 +1,70 @@
+<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>
+
+    <artifactId>activity-spec-api-docs</artifactId>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>org.openecomp.activityspec</groupId>
+        <artifactId>activity-spec</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
+    </parent>
+
+    <properties>
+        <output.name>activity-spec-api-docs</output.name>
+        <generated.swagger.dir>${project.basedir}/../activity-spec-war/target/generated</generated.swagger.dir>
+        <api.json.file>api.json</api.json.file>
+        <api.html.file>api.html</api.html.file>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>package</phase>
+                        <configuration>
+                            <tasks>
+                                <echo message="Copy api json files"/>
+                                <echo message="${generated.swagger.dir}"/>
+                                <copy file="${generated.swagger.dir}/swagger-ui/swagger.json"
+                                      tofile="${project.build.directory}/${api.json.file}"/>
+                                <copy file="${generated.swagger.dir}/${api.html.file}"
+                                      tofile="${project.build.directory}/${api.html.file}"/>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>${mvn.assembly.version}</version>
+                <configuration>
+                    <descriptor>assembly/swagger.xml</descriptor>
+                    <finalName>${output.name}-${project.version}</finalName>
+                    <outputDirectory>${project.build.directory}</outputDirectory>
+                    <appendAssemblyId>false</appendAssemblyId>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/services/activity-spec/swagger-ui/swagger-ui.js b/services/activity-spec/activity-spec-web/activity-spec-api-docs/swagger-ui.js
similarity index 100%
rename from services/activity-spec/swagger-ui/swagger-ui.js
rename to services/activity-spec/activity-spec-web/activity-spec-api-docs/swagger-ui.js
diff --git a/services/activity-spec/activity-spec-web/activity-spec-assembly/configuration.yaml b/services/activity-spec/activity-spec-web/activity-spec-assembly/configuration.yaml
new file mode 100644
index 0000000000..cc54430ba3
--- /dev/null
+++ b/services/activity-spec/activity-spec-web/activity-spec-assembly/configuration.yaml
@@ -0,0 +1,9 @@
+cassandraConfig:
+    cassandraHosts: ['CASSANDRA_HOST']
+    reconnectTimeout : 30000
+    authenticate: false
+    username: asdc_user
+    password: Aa1234%^!
+    ssl: false
+    truststorePath : /path/path
+    truststorePassword : Aa123456
\ No newline at end of file
diff --git a/services/activity-spec/activity-spec-web/activity-spec-assembly/start.sh b/services/activity-spec/activity-spec-web/activity-spec-assembly/start.sh
new file mode 100644
index 0000000000..f81247580b
--- /dev/null
+++ b/services/activity-spec/activity-spec-web/activity-spec-assembly/start.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+if [[ -z "${CASSANDRA_HOST}" ]]; then
+	echo "CASSANDRA_HOST environment variable must be set"
+	exit 1
+fi
+
+#Replace 'CASSANDRA_HOST' in configuration.yaml with value of CASSANDRA_HOST environment variable
+sed -i "s/CASSANDRA_HOST/${CASSANDRA_HOST}/" configuration.yaml
+
+java -jar -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 "$JETTY_HOME/start.jar" -Dconfiguration.yaml=configuration.yaml
\ No newline at end of file
diff --git a/services/activity-spec/activity-spec-web/activity-spec-service/pom.xml b/services/activity-spec/activity-spec-web/activity-spec-service/pom.xml
index 13d0268fde..6247184afb 100644
--- a/services/activity-spec/activity-spec-web/activity-spec-service/pom.xml
+++ b/services/activity-spec/activity-spec-web/activity-spec-service/pom.xml
@@ -1,19 +1,20 @@
 <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>
 
     <artifactId>activity-spec-service</artifactId>
-    <name>activity-spec-service</name>
 
     <parent>
         <groupId>org.openecomp.activityspec</groupId>
-        <artifactId>activity-spec-web</artifactId>
+        <artifactId>activity-spec</artifactId>
         <version>1.2.0-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
     </parent>
 
-
     <properties>
+        <!-- TODO: Is it required -->
         <errorcode.dir>${project.build.directory}/generated-sources/error-codes</errorcode.dir>
     </properties>
 
@@ -24,15 +25,12 @@
             <artifactId>openecomp-sdc-common-rest</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- CXF -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
             <version>${cxf.version}</version>
             <scope>runtime</scope>
         </dependency>
-
-        <!-- Java Stuff -->
         <dependency>
             <groupId>org.openecomp.sdc</groupId>
             <artifactId>openecomp-sdc-versioning-core</artifactId>
@@ -49,7 +47,6 @@
             <version>${project.version}</version>
             <scope>runtime</scope>
         </dependency>
-
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-jaxrs</artifactId>
@@ -76,14 +73,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${mvn.surefire.version}</version>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
diff --git a/services/activity-spec/activity-spec-web/activity-spec-service/src/test/java/org/openecomp/activityspec/mocks/ItemManagerMock.java b/services/activity-spec/activity-spec-web/activity-spec-service/src/test/java/org/openecomp/activityspec/mocks/ItemManagerMock.java
index 2a0586c003..060e29ccb1 100644
--- a/services/activity-spec/activity-spec-web/activity-spec-service/src/test/java/org/openecomp/activityspec/mocks/ItemManagerMock.java
+++ b/services/activity-spec/activity-spec-web/activity-spec-service/src/test/java/org/openecomp/activityspec/mocks/ItemManagerMock.java
@@ -54,34 +54,33 @@ public class ItemManagerMock implements ItemManager {
 
   @Override
   public void updateVersionStatus(String itemId, VersionStatus addedVersionStatus,
-                                  VersionStatus removedVersionStatus) {
-
+      VersionStatus removedVersionStatus) {
+    // noop
   }
 
   @Override
   public void archive(Item item) {
-
+    // noop
   }
 
-  @Override
   public void restore(Item item) {
-
+    // noop
   }
 
 
   @Override
   public void updateName(String itemId, String name) {
-
+    // noop
   }
 
   @Override
   public void update(Item item) {
-
+    // noop
   }
 
   @Override
   public void delete(Item item) {
-
+    // noop
   }
 
 }
diff --git a/services/activity-spec/activity-spec-web/activity-spec-war/pom.xml b/services/activity-spec/activity-spec-web/activity-spec-war/pom.xml
index dba32097a8..7d9c2c7f0b 100644
--- a/services/activity-spec/activity-spec-web/activity-spec-war/pom.xml
+++ b/services/activity-spec/activity-spec-web/activity-spec-war/pom.xml
@@ -1,78 +1,85 @@
 <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">
+         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>
-        
-    <artifactId>activityspec-war</artifactId>
-    <name>activityspec-war</name>
+
+    <artifactId>activity-spec-war</artifactId>
     <packaging>war</packaging>
-        
+
     <parent>
         <groupId>org.openecomp.activityspec</groupId>
-        <artifactId>activity-spec-web</artifactId>
+        <artifactId>activity-spec</artifactId>
         <version>1.2.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
+        <relativePath>../..</relativePath>
     </parent>
-        
+
     <dependencies>
         <dependency>
-                <groupId>org.openecomp.activityspec</groupId>
-                <artifactId>activity-spec-service</artifactId>
-                <version>${project.version}</version>
+            <groupId>org.openecomp.activityspec</groupId>
+            <artifactId>activity-spec-service</artifactId>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 
     <build>
         <plugins>
-                <plugin>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <version>${mvn.war.version}</version>
-                    <configuration>
-                        <attachClasses>true</attachClasses>
-                        <webResources>
-                            <resource>
-                                <!-- this is relative to the pom.xml directory -->
-                                <directory>${basedir}/target/generated/swagger-ui</directory>
-                            </resource>
-                        </webResources>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>com.github.kongchen</groupId>
-                    <artifactId>swagger-maven-plugin</artifactId>
-                    <version>${mvn.swagger.version}</version>
-                    <configuration>
-                        <apiSources>
-                            <apiSource>
-                                <springmvc>false</springmvc>
-                                <locations>org.openecomp.activityspec</locations>
-                                <schemes>http</schemes>
-                                <basePath>/activityspec-api</basePath>
-                                <info>
-                                    <title>Rest API</title>
-                                    <version>v1.0, build #${buildNumber}</version>
-                                    <description>Rest API Documentation</description>
-                                    <termsOfService>
-                                        http://www.github.com/kongchen/swagger-maven-plugin
-                                    </termsOfService>
-                                </info>
-                                <templatePath>${basedir}/templates/strapdown.html.hbs</templatePath>
-                                <outputPath>${basedir}/target/generated/api.html</outputPath>
-                                <swaggerDirectory>${basedir}/target/generated/swagger-ui
-                                </swaggerDirectory>
-                            </apiSource>
-                        </apiSources>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <phase>compile</phase>
-                            <goals>
-                                <goal>generate</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>none</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>${mvn.war.version}</version>
+                <configuration>
+                    <attachClasses>false</attachClasses>
+                    <packagingExcludes>WEB-INF/web.xml</packagingExcludes>
+                    <webResources>
+                        <resource>
+                            <directory>${project.build.directory}/generated/swagger-ui</directory>
+                        </resource>
+                    </webResources>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.github.kongchen</groupId>
+                <artifactId>swagger-maven-plugin</artifactId>
+                <version>${mvn.swagger.version}</version>
+                <configuration>
+                    <apiSources>
+                        <apiSource>
+                            <springmvc>false</springmvc>
+                            <locations>org.openecomp.activityspec</locations>
+                            <schemes>http</schemes>
+                            <basePath>/activity-spec-api</basePath>
+                            <info>
+                                <title>Activity Spec REST API Documentation</title>
+                                <version>${project.version}</version>
+                                <description>Activity Spec REST API Documentation</description>
+                                <termsOfService>
+                                    http://www.github.com/kongchen/swagger-maven-plugin
+                                </termsOfService>
+                            </info>
+                            <templatePath>${basedir}/templates/strapdown.html.hbs</templatePath>
+                            <outputPath>${project.build.directory}/generated/api.html</outputPath>
+                            <swaggerDirectory>${project.build.directory}/generated/swagger-ui</swaggerDirectory>
+                        </apiSource>
+                    </apiSources>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
-        
+
 </project>
\ No newline at end of file
diff --git a/services/activity-spec/activity-spec-web/activity-spec-war/src/main/webapp/WEB-INF/jetty-web.xml b/services/activity-spec/activity-spec-web/activity-spec-war/src/main/webapp/WEB-INF/jetty-web.xml
index 9426b13ccc..aa9afe9f7e 100644
--- a/services/activity-spec/activity-spec-web/activity-spec-war/src/main/webapp/WEB-INF/jetty-web.xml
+++ b/services/activity-spec/activity-spec-web/activity-spec-war/src/main/webapp/WEB-INF/jetty-web.xml
@@ -4,5 +4,5 @@
         "http://www.eclipse.org/jetty/configure_9_0.dtd">
 
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
-    <Set name="contextPath">/activityspec-api</Set>
+    <Set name="contextPath">/activity-spec-api</Set>
 </Configure>
diff --git a/services/activity-spec/activity-spec-web/pom.xml b/services/activity-spec/activity-spec-web/pom.xml
index c67a9c54f0..799c9d2b9e 100644
--- a/services/activity-spec/activity-spec-web/pom.xml
+++ b/services/activity-spec/activity-spec-web/pom.xml
@@ -3,7 +3,6 @@
          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>
 
-    <groupId>org.openecomp.activityspec</groupId>
     <artifactId>activity-spec-web</artifactId>
     <packaging>pom</packaging>
 
@@ -16,6 +15,40 @@
     <modules>
         <module>activity-spec-service</module>
         <module>activity-spec-war</module>
+        <module>activity-spec-api-docs</module>
     </modules>
 
+    <profiles>
+        <profile>
+            <id>docker</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <name>onap/activity-spec</name>
+                                    <build>
+                                        <tags>
+                                            <tag>${project.version}</tag>
+                                        </tags>
+                                        <dockerFileDir>${project.basedir}</dockerFileDir>
+                                        <dockerFile>Dockerfile</dockerFile>
+                                        <args>
+                                            <ARTIFACT_VERSION>${project.version}</ARTIFACT_VERSION>
+                                        </args>
+                                    </build>
+                                </image>
+                            </images>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
\ No newline at end of file
diff --git a/services/activity-spec/config/readme.txt b/services/activity-spec/config/readme.txt
deleted file mode 100644
index b0db3b859b..0000000000
--- a/services/activity-spec/config/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-Add here any configurations if required
\ No newline at end of file
diff --git a/services/activity-spec/pom.xml b/services/activity-spec/pom.xml
index 5e71480c71..72b3bf5c62 100644
--- a/services/activity-spec/pom.xml
+++ b/services/activity-spec/pom.xml
@@ -1,20 +1,20 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          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>
 
     <groupId>org.openecomp.activityspec</groupId>
     <artifactId>activity-spec</artifactId>
-    <packaging>pom</packaging>
     <version>1.2.0-SNAPSHOT</version>
-
-    <modules>
-        <module>activity-spec-web</module>
-        <module>swagger-ui</module>
-    </modules>
+    <packaging>pom</packaging>
 
     <properties>
-        <mockito.all.version>1.10.19</mockito.all.version>
+
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
         <mvn.surefire.version>2.19.1</mvn.surefire.version>
         <jacoco.version>0.7.9</jacoco.version>
         <mvn.compiler.version>2.5.1</mvn.compiler.version>
@@ -24,8 +24,10 @@
         <mvn.jar.version>2.4</mvn.jar.version>
         <mvn.war.version>2.1.1</mvn.war.version>
         <mvn.swagger.version>3.1.0</mvn.swagger.version>
-        <java.source>1.8</java.source>
-        <java.target>1.8</java.target>
+        <mvn.resources.version>3.0.2</mvn.resources.version>
+        <mvn.docker.version>0.24.0</mvn.docker.version>
+
+        <mockito.all.version>1.10.19</mockito.all.version>
         <spring.framework.version>4.1.3.RELEASE</spring.framework.version>
         <cxf.version>3.1.8</cxf.version>
         <ws.rs.version>2.0.1</ws.rs.version>
@@ -33,24 +35,54 @@
         <jersey.multipart.version>1.18.1</jersey.multipart.version>
         <javax.servlet.version>2.5</javax.servlet.version>
         <org.codehaus.jackson.version>1.9.13</org.codehaus.jackson.version>
+
     </properties>
 
+    <modules>
+        <module>activity-spec-web</module>
+        <module>activity-spec-init</module>
+    </modules>
+
     <build>
         <pluginManagement>
-        <plugins>
-            <!-- ================================================== -->
-            <!-- Set the JDK compiler version.                      -->
-            <!-- ================================================== -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${mvn.compiler.version}</version>
-                <configuration>
-                    <source>${java.source}</source>
-                    <target>${java.target}</target>
-                </configuration>
-            </plugin>
-        </plugins>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>${mvn.compiler.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>io.fabric8</groupId>
+                    <artifactId>docker-maven-plugin</artifactId>
+                    <version>${mvn.docker.version}</version>
+                    <configuration>
+                        <verbose>false</verbose>
+                        <registry>nexus3.onap.org:10001</registry>
+                        <authConfig>
+                            <pull>
+                                <username>docker</username>
+                                <password>docker</password>
+                            </pull>
+                        </authConfig>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>docker-build</id>
+                            <phase>install</phase>
+                            <goals>
+                                <goal>build</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>push-images</id>
+                            <phase>deploy</phase>
+                            <goals>
+                                <goal>push</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
         </pluginManagement>
     </build>
 
@@ -65,13 +97,4 @@
         </dependencies>
     </dependencyManagement>
 
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>${jacoco.version}</version>
-            </plugin>
-        </plugins>
-    </reporting>
 </project>
\ No newline at end of file
diff --git a/services/activity-spec/swagger-ui/images/pet_store_api.png b/services/activity-spec/swagger-ui/images/pet_store_api.png
deleted file mode 100644
index f9f9cd4aeb35a108c4b2f1dddb59977d56c595d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 824
zcmV-81IPS{P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o
zcW-iQb09-gHF34$HUIzuvPnciR7i=fl}Tt6K@>n=Rd;8mVwQ<w7Vu!yh)%}+A_y4|
z-UNe}fD5=LMo};*QSmG;(NPF0A}$9}@FM6z1efSh#09bl12MQ@5|hbdlCI2Ty1bZM
z2B)3;YyJP;ug@<^05qRC<;3Ih6RztX_B>NY4k4xJQ%YT}s;WA7;r!W@XgqjG_4og}
z8w>{OB9REiMa8-B85td+y}bji^~2KA`Md4j-u{zw=H%Da@83%_8qEnl9k1WK;pWX-
zb-lg)pQYAreK@>)*5Clqni{IZVYGG+NY67Bp-^bn;L{Nbh44I6CIK+n7p8#U?;fCA
zYMFcy%UEjup4fgnli%NyzSe*@419QuU9lJ|T$?f9w?HIQ$RwEJGK7^!y7LhxIgVJp
z9c!kB{0aydM1epU1NJ=h(<e-{>}2X?Y{qn70yEN$dwm~favs=VbQ+T?!AvSl{P~PE
zS&zsJbTQttne>kdM4$jBhLMFy@I1)3u-4cAzrY*l!o9eK^w%+jqY!oi(Ri8sMauvK
zwnCP#%3hEH#FtNqq{iT(?=_JA_8XC>5Y8Y@!wmxKb|A87ZbpHA`+%v~0pt{5Nko1L
zLKR^25YExt1lH7L1<xo5e7uJ-X(+4!X+Qw(Fk<f&f<EAoVT;7lP2gydL*Q621)^}0
zf)y)$!86{#+1P{#mE*;qp`Sg$Py%CM#x#`r6J&e`_Udg|)my<$z<3`7B_hx9N9P}F
zYK3c24KdPPZP*+3AQ!CtKY<XLC+kF;aH37V!P87BrTCdh4EhHAD~1vYq?CP9Db?E1
z*~P0@ZL<b%YkN(5M<+_DR&nfjv(wYlb0-iC>{t<rP*hZu6MS@Zbo$f3zhue6T>{|P
z@n)yHyZf~3>LZ@#&CNw1rA#OlY^|)UJQKUrlKKO&x%wPhH}6&e0000<MNUMnLSTZR
CaCsR3

diff --git a/services/activity-spec/swagger-ui/pom.xml b/services/activity-spec/swagger-ui/pom.xml
deleted file mode 100644
index dd50998c02..0000000000
--- a/services/activity-spec/swagger-ui/pom.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<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>
-    <artifactId>activity-spec-api-docs</artifactId>
-    <parent>
-        <groupId>org.openecomp.activityspec</groupId>
-        <artifactId>activity-spec</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
-    </parent>
-
-    <properties>
-        <plugin.name>activity-spec-api-docs</plugin.name>
-        <package.dir>${basedir}/api-docs</package.dir>
-        <rest.api.dir>${basedir}/../activity-spec-web/activity-spec-war</rest.api.dir>
-        <api.json.file>api.json</api.json.file>
-        <api.html.file>api.html</api.html.file>
-    </properties>
-    <build>
-        <plugins>
-            <!-- ============================================= -->
-            <!-- Clean api-docs folder -->
-            <!-- ============================================= -->
-            <plugin>
-                <artifactId>maven-clean-plugin</artifactId>
-                <version>2.6.1</version>
-                <executions>
-                    <execution>
-                        <id>clean.dist.folder</id>
-                        <phase>clean</phase>
-                        <goals>
-                            <goal>clean</goal>
-                        </goals>
-                        <configuration>
-                            <filesets>
-                                <fileset>
-                                    <directory>${basedir}/target/api-docs</directory>
-                                </fileset>
-                            </filesets>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>${mvn.jar.version}</version>
-                <executions>
-                    <execution>
-                        <id>default-jar</id>
-                        <phase>none</phase>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy</id>
-                        <phase>package</phase>
-                        <configuration>
-                            <tasks>
-                                <echo message="Copy api json files"/>
-                                <echo message= "${rest.api.dir}" />
-                                <copy file="${rest.api.dir}/target/generated/swagger-ui/swagger.json" tofile="${basedir}/target/${api.json.file}"/>
-                                <copy file="${rest.api.dir}/target/generated/swagger-ui/swagger.json" tofile="${package.dir}/${api.json.file}"/>
-                                <copy file="${rest.api.dir}/target/generated/${api.html.file}" tofile="${package.dir}/${api.html.file}"/>
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>${mvn.assembly.version}</version>
-                <configuration>
-                    <descriptor>assembly/swagger.xml</descriptor>
-                    <finalName>${plugin.name}</finalName>
-                    <outputDirectory>${package.dir}</outputDirectory>
-					<appendAssemblyId>false</appendAssemblyId>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
-- 
2.16.6