From a41c877a6b1980e0e866699633e0289d9a3fdbb5 Mon Sep 17 00:00:00 2001
From: liamfallon <liam.fallon@ericsson.com>
Date: Wed, 5 Sep 2018 15:46:31 +0100
Subject: Fix package of apex examples and documents

The examples are not packaged correctly in the apex build
and the client wars are missing

The links and location of the documents are corrected.

Some POM duplicate dependencies removed.

Javadoc warnings removed.

Issue-ID: POLICY-867
Change-Id: I555c29191c61c0a9887365d95005dbc584eddf04
Signed-off-by: liamfallon <liam.fallon@ericsson.com>
---
 client/client-deployment/pom.xml                   |  47 ++++++++++++++++++++-
 client/client-deployment/src/site/site.xml         |   1 +
 client/client-editor/pom.xml                       |  45 +++++++++++++++++++-
 .../src/main/resources/webapp/css/styles.css       |   4 +-
 .../src/main/resources/webapp/images/Apex.png      | Bin 341009 -> 161205 bytes
 client/client-editor/src/site/site.xml             |   1 +
 client/client-full/pom.xml                         |  27 ++++++++++--
 .../src/main/resources/webapp/css/styles.css       |   4 +-
 .../src/main/resources/webapp/images/Apex.png      | Bin 341009 -> 161205 bytes
 client/client-full/src/site/site.xml               |   1 +
 client/client-monitoring/pom.xml                   |  45 +++++++++++++++++++-
 client/client-monitoring/src/site/site.xml         |   1 +
 12 files changed, 165 insertions(+), 11 deletions(-)

(limited to 'client')

diff --git a/client/client-deployment/pom.xml b/client/client-deployment/pom.xml
index ee4038c7a..aacf34a02 100644
--- a/client/client-deployment/pom.xml
+++ b/client/client-deployment/pom.xml
@@ -79,11 +79,11 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>unpack-client-deployment-shared-resources</id>
+                        <id>unpack-client-deployment-shared-resources-war</id>
                         <goals>
                             <goal>unpack-dependencies</goal>
                         </goals>
-                        <phase>generate-resources</phase>
+                        <phase>validate</phase>
                         <configuration>
                             <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}</outputDirectory>
                             <includeArtifacIds>client-common</includeArtifacIds>
@@ -93,9 +93,51 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <id>copy-common-resources-to-jar</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/classes/webapp</outputDirectory>
+                            <filtering>false</filtering>
+                            <resources>
+                                <resource>
+                                    <directory>../client-common/src/main/resources</directory>
+                                </resource>
+                            </resources>
+                            <overwrite>true</overwrite>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-local-resources-to-jar</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/classes/webapp</outputDirectory>
+                            <filtering>false</filtering>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources/webapp</directory>
+                                </resource>
+                            </resources>
+                            <overwrite>true</overwrite>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
+                <version>2.4.3</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -144,6 +186,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
+                <version>2.6</version>
                 <configuration>
                     <classifier>ui</classifier>
                     <warSourceDirectory>src/main/resources/webapp</warSourceDirectory>
diff --git a/client/client-deployment/src/site/site.xml b/client/client-deployment/src/site/site.xml
index 69399deef..aeb592ea6 100644
--- a/client/client-deployment/src/site/site.xml
+++ b/client/client-deployment/src/site/site.xml
@@ -16,6 +16,7 @@
 <project name="APEX Client Deployment">
     <body>
         <menu name="APEX Client Deployment">
+            <item href="javadocs/index.html" name="API Doc" />
         </menu>
         <menu ref="reports" inherit="top" />
         <menu ref="modules" />
diff --git a/client/client-editor/pom.xml b/client/client-editor/pom.xml
index 33d534993..3e250e0f4 100644
--- a/client/client-editor/pom.xml
+++ b/client/client-editor/pom.xml
@@ -109,7 +109,7 @@
                         <goals>
                             <goal>unpack-dependencies</goal>
                         </goals>
-                        <phase>generate-resources</phase>
+                        <phase>validate</phase>
                         <configuration>
                             <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}</outputDirectory>
                             <includeArtifacIds>client-common</includeArtifacIds>
@@ -119,9 +119,51 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <id>copy-common-resources-to-jar</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/classes/webapp</outputDirectory>
+                            <filtering>false</filtering>
+                            <resources>
+                                <resource>
+                                    <directory>../client-common/src/main/resources</directory>
+                                </resource>
+                            </resources>
+                            <overwrite>true</overwrite>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-local-resources-to-jar</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/classes/webapp</outputDirectory>
+                            <filtering>false</filtering>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources/webapp</directory>
+                                </resource>
+                            </resources>
+                            <overwrite>true</overwrite>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
+                <version>2.4.3</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -170,6 +212,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
+                <version>2.6</version>
                 <configuration>
                     <classifier>ui</classifier>
                     <warSourceDirectory>src/main/resources/webapp</warSourceDirectory>
diff --git a/client/client-editor/src/main/resources/webapp/css/styles.css b/client/client-editor/src/main/resources/webapp/css/styles.css
index 1372ac8b3..0a0bb06c9 100644
--- a/client/client-editor/src/main/resources/webapp/css/styles.css
+++ b/client/client-editor/src/main/resources/webapp/css/styles.css
@@ -512,12 +512,12 @@ input:disabled {
 
 .onapLogo {
     padding-right: 100px;
-    height: 250px;
+    height: 75px;
     width: 350px;
 }
 
 .apexLogo {
-    height: 250px;
+    height: 267px;
     width: 350px;
 }
 
diff --git a/client/client-editor/src/main/resources/webapp/images/Apex.png b/client/client-editor/src/main/resources/webapp/images/Apex.png
index 6abacdc3e..e71451fee 100644
Binary files a/client/client-editor/src/main/resources/webapp/images/Apex.png and b/client/client-editor/src/main/resources/webapp/images/Apex.png differ
diff --git a/client/client-editor/src/site/site.xml b/client/client-editor/src/site/site.xml
index 1f2d5ffdb..e8c9b868f 100644
--- a/client/client-editor/src/site/site.xml
+++ b/client/client-editor/src/site/site.xml
@@ -16,6 +16,7 @@
 <project name="APEX Client Editor">
     <body>
         <menu name="APEX Client Editor">
+            <item href="javadocs/index.html" name="API Doc" />
         </menu>
         <menu ref="reports" inherit="top" />
         <menu ref="modules" />
diff --git a/client/client-full/pom.xml b/client/client-full/pom.xml
index 0d9ee277f..788bb1534 100644
--- a/client/client-full/pom.xml
+++ b/client/client-full/pom.xml
@@ -62,21 +62,21 @@
                 </includes>
             </resource>
             <resource>
-                <directory>../client-monitoring/target/client-monitoring-${project.version}</directory>
+                <directory>../client-monitoring/target/classes/webapp</directory>
                 <includes>
                     <include>**/*.*</include>
                 </includes>
                 <targetPath>webapp/monitoring</targetPath>
             </resource>
             <resource>
-                <directory>../client-editor/target/client-editor-${project.version}</directory>
+                <directory>../client-editor/target/classes/webapp</directory>
                 <includes>
                     <include>**/*.*</include>
                 </includes>
                 <targetPath>webapp/editor</targetPath>
             </resource>
             <resource>
-                <directory>../client-deployment/target/client-deployment-${project.version}</directory>
+                <directory>../client-deployment/target/classes/webapp</directory>
                 <includes>
                     <include>**/*.*</include>
                 </includes>
@@ -87,9 +87,29 @@
         <defaultGoal>install</defaultGoal>
         <outputDirectory>${project.build.directory}/classes</outputDirectory>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack-client-editor-shared-resources</id>
+                        <goals>
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}</outputDirectory>
+                            <includeArtifacIds>client-common</includeArtifacIds>
+                            <includeGroupIds>${project.groupId}</includeGroupIds>
+                            <excludeTransitive>true</excludeTransitive>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
+                <version>2.4.3</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -138,6 +158,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
+                <version>2.6</version>
                 <configuration>
                     <classifier>ui</classifier>
                     <warSourceDirectory>target/classes/webapp</warSourceDirectory>
diff --git a/client/client-full/src/main/resources/webapp/css/styles.css b/client/client-full/src/main/resources/webapp/css/styles.css
index dfdb1803d..1592c2f09 100644
--- a/client/client-full/src/main/resources/webapp/css/styles.css
+++ b/client/client-full/src/main/resources/webapp/css/styles.css
@@ -279,14 +279,14 @@
 
 .onapLogo {
     display: block;
-    height: 225px;
+    height: 59px;
     width: 325px;
     padding-bottom: 31px;
 }
 
 .apexLogo {
     display: block;
-    height: 225px;
+    height: 248px;
     width: 325px;
 }
 
diff --git a/client/client-full/src/main/resources/webapp/images/Apex.png b/client/client-full/src/main/resources/webapp/images/Apex.png
index 6abacdc3e..e71451fee 100644
Binary files a/client/client-full/src/main/resources/webapp/images/Apex.png and b/client/client-full/src/main/resources/webapp/images/Apex.png differ
diff --git a/client/client-full/src/site/site.xml b/client/client-full/src/site/site.xml
index 35e49fe79..044a76667 100644
--- a/client/client-full/src/site/site.xml
+++ b/client/client-full/src/site/site.xml
@@ -16,6 +16,7 @@
 <project name="APEX Client Full">
     <body>
         <menu name="APEX Client Full">
+            <item href="javadocs/index.html" name="API Doc" />
         </menu>
         <menu ref="reports" inherit="top" />
         <menu ref="modules"/>
diff --git a/client/client-monitoring/pom.xml b/client/client-monitoring/pom.xml
index 5bfda41c0..274ac23f3 100644
--- a/client/client-monitoring/pom.xml
+++ b/client/client-monitoring/pom.xml
@@ -78,7 +78,7 @@
                         <goals>
                             <goal>unpack-dependencies</goal>
                         </goals>
-                        <phase>generate-resources</phase>
+                        <phase>validate</phase>
                         <configuration>
                             <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}</outputDirectory>
                             <includeArtifacIds>client-common</includeArtifacIds>
@@ -88,9 +88,51 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <id>copy-common-resources-to-jar</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/classes/webapp</outputDirectory>
+                            <filtering>false</filtering>
+                            <resources>
+                                <resource>
+                                    <directory>../client-common/src/main/resources</directory>
+                                </resource>
+                            </resources>
+                            <overwrite>true</overwrite>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-local-resources-to-jar</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/classes/webapp</outputDirectory>
+                            <filtering>false</filtering>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources/webapp</directory>
+                                </resource>
+                            </resources>
+                            <overwrite>true</overwrite>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
+                <version>2.4.3</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -139,6 +181,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
+                <version>2.6</version>
                 <configuration>
                     <classifier>ui</classifier>
                     <warSourceDirectory>src/main/resources/webapp</warSourceDirectory>
diff --git a/client/client-monitoring/src/site/site.xml b/client/client-monitoring/src/site/site.xml
index 510752296..d3a31d2bf 100644
--- a/client/client-monitoring/src/site/site.xml
+++ b/client/client-monitoring/src/site/site.xml
@@ -16,6 +16,7 @@
 <project name="APEX Client Monitoring">
     <body>
         <menu name="APEX Client Monitoring">
+            <item href="javadocs/index.html" name="API Doc" />
         </menu>
         <menu ref="reports" inherit="top" />
         <menu ref="modules" />
-- 
cgit 1.2.3-korg