diff options
| author |   sheetalm <sheetal.mudholkar@amdocs.com> | 2018-03-13 19:32:08 +0530 |
|---|---|---|
| committer | sheetalm <sheetal.mudholkar@amdocs.com> | 2018-03-26 14:38:06 +0530 |
| commit | ed12890b0bb0c07acd3eb7bcbd10bfcca3046a2b (patch) | |
| tree | bd37e0e117fc9e8a1b818f94a9e5a120ca4df0a6 | |
| parent | f2cee7829ae7d8fae58239dd0018b2aa790c0251 (diff) | |
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>
66 files changed, 352 insertions, 221 deletions
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 index 2216c33867..2216c33867 100644 --- a/services/activity-spec/setup/create_activityspec_db.cql +++ b/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 index 53a97bcd31..53a97bcd31 100644 --- 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 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 index 37911dc627..37911dc627 100644 --- a/services/activity-spec/swagger-ui/assembly/swagger.xml +++ b/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 index fd1283918f..fd1283918f 100644 --- 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 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 index c90e9f568e..c90e9f568e 100644 --- a/services/activity-spec/swagger-ui/css/print.css +++ b/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 index b2b078943c..b2b078943c 100644 --- a/services/activity-spec/swagger-ui/css/reset.css +++ b/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 index 96f54548c0..96f54548c0 100644 --- a/services/activity-spec/swagger-ui/css/screen.css +++ b/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 index fc21a31db5..fc21a31db5 100644 --- a/services/activity-spec/swagger-ui/css/style.css +++ b/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 index 27c3751ac2..27c3751ac2 100644 --- a/services/activity-spec/swagger-ui/css/typography.css +++ b/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 Binary files differindex d8524983ad..d8524983ad 100644 --- 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 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 index a54bbbbf25..a54bbbbf25 100644 --- 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 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 Binary files differindex 15896c441f..15896c441f 100644 --- 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 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 Binary files differindex 67e3e25f83..67e3e25f83 100644 --- 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 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 Binary files differindex 1e726a7cfc..1e726a7cfc 100644 --- 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 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 Binary files differindex ac2698e85a..ac2698e85a 100644 --- 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 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 index d9f2a214f9..d9f2a214f9 100644 --- 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 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 Binary files differindex fb8cea662b..fb8cea662b 100644 --- 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 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 Binary files differindex abf19899f7..abf19899f7 100644 --- 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 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 Binary files differindex 9f93f74c3b..9f93f74c3b 100644 --- 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 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 Binary files differindex ed9d2fffb6..ed9d2fffb6 100644 --- 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 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 Binary files differindex 66b1a5bfb9..66b1a5bfb9 100644 --- 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 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 Binary files differindex 32f319f89b..32f319f89b 100644 --- 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 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 Binary files differindex 36c02749fc..36c02749fc 100644 --- a/services/activity-spec/swagger-ui/images/favicon.ico +++ b/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 Binary files differindex 5496a65579..5496a65579 100644 --- 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 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 Binary files differindex 0639388924..0639388924 100644 --- a/services/activity-spec/swagger-ui/images/throbber.gif +++ b/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 Binary files differindex dca4f1455a..dca4f1455a 100644 --- 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 diff --git a/services/activity-spec/swagger-ui/index.html b/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 index 776a8b72e0..776a8b72e0 100644 --- a/services/activity-spec/swagger-ui/lang/en.js +++ b/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 index a8dff60b6a..a8dff60b6a 100644 --- a/services/activity-spec/swagger-ui/lang/es.js +++ b/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 index 3207bfc0ba..3207bfc0ba 100644 --- a/services/activity-spec/swagger-ui/lang/ja.js +++ b/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 index f2e7c13d41..f2e7c13d41 100644 --- a/services/activity-spec/swagger-ui/lang/pt.js +++ b/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 index 065100f73f..065100f73f 100644 --- a/services/activity-spec/swagger-ui/lang/ru.js +++ b/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 index 16426a9c34..16426a9c34 100644 --- a/services/activity-spec/swagger-ui/lang/tr.js +++ b/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 index 591f6d4094..591f6d4094 100644 --- a/services/activity-spec/swagger-ui/lang/translator.js +++ b/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 index 570319ba15..570319ba15 100644 --- 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 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 index a3f544be6d..a3f544be6d 100644 --- 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 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 index 53cf921d4f..53cf921d4f 100644 --- 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 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 index 9a95a75ea1..9a95a75ea1 100644 --- 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 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 index 066d72c7e3..066d72c7e3 100644 --- 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 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 index bcbf24834a..bcbf24834a 100644 --- 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 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 index ba32cff365..ba32cff365 100644 --- 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 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 index 2adb0d6d54..2adb0d6d54 100644 --- 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 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 index c2a678d550..c2a678d550 100644 --- a/services/activity-spec/swagger-ui/lib/marked.js +++ b/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 index 3bb1c2773a..3bb1c2773a 100644 --- 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 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 index 11f1d96f53..11f1d96f53 100644 --- 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 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 index b31e43590a..b31e43590a 100644 --- 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 diff --git a/services/activity-spec/swagger-ui/o2c.html b/services/activity-spec/activity-spec-web/activity-spec-api-docs/o2c.html index 88e8bf114b..88e8bf114b 100644 --- a/services/activity-spec/swagger-ui/o2c.html +++ b/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 index 68eb4f829f..68eb4f829f 100644 --- a/services/activity-spec/swagger-ui/swagger-ui.js +++ b/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 Binary files differdeleted file mode 100644 index f9f9cd4aeb..0000000000 --- a/services/activity-spec/swagger-ui/images/pet_store_api.png +++ /dev/null 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> |
