summaryrefslogtreecommitdiffstats
path: root/client/client-full
diff options
context:
space:
mode:
Diffstat (limited to 'client/client-full')
-rw-r--r--client/client-full/pom.xml27
-rw-r--r--client/client-full/src/main/resources/webapp/css/styles.css4
-rw-r--r--client/client-full/src/main/resources/webapp/images/Apex.pngbin341009 -> 161205 bytes
-rw-r--r--client/client-full/src/site/site.xml1
4 files changed, 27 insertions, 5 deletions
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>
@@ -89,7 +89,27 @@
<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
--- a/client/client-full/src/main/resources/webapp/images/Apex.png
+++ b/client/client-full/src/main/resources/webapp/images/Apex.png
Binary files 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"/>