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-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 +
 4 files changed, 27 insertions(+), 5 deletions(-)

(limited to 'client/client-full')

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