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: 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-web/activity-spec-war/pom.xml    | 131 +++++++++++----------
 1 file changed, 69 insertions(+), 62 deletions(-)

(limited to 'services/activity-spec/activity-spec-web/activity-spec-war/pom.xml')

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
-- 
cgit 1.2.3-korg