aboutsummaryrefslogtreecommitdiffstats
path: root/client/client-full
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@ericsson.com>2018-11-10 00:39:12 +0000
committerliamfallon <liam.fallon@ericsson.com>2018-11-12 11:07:31 +0000
commit32497610bd7bc721bb73f0d753fc1426bba677e2 (patch)
tree44167f3feb03c84b3cff784d9758b03528f1eb0b /client/client-full
parent53d8916cc60d97e2ce7ae345f8cc25f5602567da (diff)
Clean up eclipse and document warnings
Parent versions in some POMs only called on the test profile were incorrect Warnings in Eclipse on POM including from outside its project are fixed Some checkstyle fixes Some javadoc warnings fixed Issue-ID: POLICY-954 Change-Id: I640bc842dc79a9fa580015abb9a76c84a7845efe Signed-off-by: liamfallon <liam.fallon@ericsson.com>
Diffstat (limited to 'client/client-full')
-rw-r--r--client/client-full/pom.xml164
-rw-r--r--client/client-full/src/main/java/org/onap/policy/apex/client/full/rest/ApexServicesRestMain.java1
2 files changed, 132 insertions, 33 deletions
diff --git a/client/client-full/pom.xml b/client/client-full/pom.xml
index a157d7657..ae987c55c 100644
--- a/client/client-full/pom.xml
+++ b/client/client-full/pom.xml
@@ -17,7 +17,8 @@
SPDX-License-Identifier: Apache-2.0
============LICENSE_END=========================================================
-->
-<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">
+<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>
<parent>
<groupId>org.onap.policy.apex-pdp.client</groupId>
@@ -60,51 +61,92 @@
<include>webapp/**/*.*</include>
</includes>
</resource>
- <resource>
- <directory>../client-monitoring/target/classes/webapp</directory>
- <includes>
- <include>**/*.*</include>
- </includes>
- <targetPath>webapp/monitoring</targetPath>
- </resource>
- <resource>
- <directory>../client-editor/target/classes/webapp</directory>
- <includes>
- <include>**/*.*</include>
- </includes>
- <targetPath>webapp/editor</targetPath>
- </resource>
- <resource>
- <directory>../client-deployment/target/classes/webapp</directory>
- <includes>
- <include>**/*.*</include>
- </includes>
- <targetPath>webapp/deployment</targetPath>
- </resource>
</resources>
<defaultGoal>install</defaultGoal>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<plugins>
+ <!-- Copy sub-clients this client's webapp directory -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>unpack-client-editor-shared-resources</id>
+ <id>unpack-examples</id>
+ <phase>validate</phase>
<goals>
- <goal>unpack-dependencies</goal>
+ <goal>unpack</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>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.onap.policy.apex-pdp.client</groupId>
+ <artifactId>client-monitoring</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>${project.build.directory}/classes/webapp/monitoring-temp</outputDirectory>
+ <excludes>META-INF/, org/</excludes>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.onap.policy.apex-pdp.client</groupId>
+ <artifactId>client-deployment</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>${project.build.directory}/classes/webapp/deployment-temp</outputDirectory>
+ <excludes>META-INF/, org/</excludes>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.onap.policy.apex-pdp.client</groupId>
+ <artifactId>client-editor</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>${project.build.directory}/classes/webapp/editor-temp</outputDirectory>
+ <excludes>META-INF/, org/</excludes>
+ </artifactItem>
+ </artifactItems>
+ <overWriteReleases>true</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <configuration>
+ <target>
+ <copy todir="${project.build.directory}/classes/webapp/deployment">
+ <fileset dir="${project.build.directory}/classes/webapp/deployment-temp/webapp"
+ includes="**" />
+ </copy>
+ <copy todir="${project.build.directory}/classes/webapp/monitoring">
+ <fileset dir="${project.build.directory}/classes/webapp/monitoring-temp/webapp"
+ includes="**" />
+ </copy>
+ <copy todir="${project.build.directory}/classes/webapp/editor">
+ <fileset dir="${project.build.directory}/classes/webapp/editor-temp/webapp"
+ includes="**" />
+ </copy>
+ <delete dir="${project.build.directory}/classes/webapp/deployment-temp"/>
+ <delete dir="${project.build.directory}/classes/webapp/monitoring-temp"/>
+ <delete dir="${project.build.directory}/classes/webapp/editor-temp"/>
+ </target>
</configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
@@ -136,14 +178,18 @@
</filter>
</filters>
<transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
- <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>reference.conf</resource>
</transformer>
- <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
<resource>log4j.properties</resource>
</transformer>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.onap.policy.apex.client.full.rest.ApexServicesRestMain</mainClass>
</transformer>
</transformers>
@@ -197,6 +243,58 @@
<profiles>
<profile>
+ <id>only-eclipse</id>
+ <activation>
+ <property>
+ <name>m2e.version</name>
+ </property>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <versionRange>[2.0,)</versionRange>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <versionRange>[1.0,)</versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+
+ <profile>
<id>apexSite</id>
<activation>
<property>
diff --git a/client/client-full/src/main/java/org/onap/policy/apex/client/full/rest/ApexServicesRestMain.java b/client/client-full/src/main/java/org/onap/policy/apex/client/full/rest/ApexServicesRestMain.java
index 7b9f4187d..02670511c 100644
--- a/client/client-full/src/main/java/org/onap/policy/apex/client/full/rest/ApexServicesRestMain.java
+++ b/client/client-full/src/main/java/org/onap/policy/apex/client/full/rest/ApexServicesRestMain.java
@@ -199,6 +199,7 @@ public class ApexServicesRestMain {
}
}
}
+
/**
* Main method, main entry point for command.
*