aboutsummaryrefslogtreecommitdiffstats
path: root/packages/apex-pdp-docker
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@ericsson.com>2018-09-05 15:46:31 +0100
committerliamfallon <liam.fallon@ericsson.com>2018-09-06 13:26:24 +0100
commita41c877a6b1980e0e866699633e0289d9a3fdbb5 (patch)
tree4f8d15559549760c2e74880871ec08c3b8df2d0e /packages/apex-pdp-docker
parent825ae627d4378c5cc7ab4b7d5f4b4ffefcb7977e (diff)
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>
Diffstat (limited to 'packages/apex-pdp-docker')
-rw-r--r--packages/apex-pdp-docker/pom.xml3
-rwxr-xr-xpackages/apex-pdp-docker/src/site-docs/adoc/fragments/dockerfile.adoc20
-rwxr-xr-xpackages/apex-pdp-docker/src/site/asciidoc/dockerfile.adoc14
-rw-r--r--packages/apex-pdp-docker/src/site/site.xml1
4 files changed, 38 insertions, 0 deletions
diff --git a/packages/apex-pdp-docker/pom.xml b/packages/apex-pdp-docker/pom.xml
index 5bc27cb61..ac3994fe7 100644
--- a/packages/apex-pdp-docker/pom.xml
+++ b/packages/apex-pdp-docker/pom.xml
@@ -114,6 +114,9 @@
<name>apexSite</name>
</property>
</activation>
+ <properties>
+ <adsite-packages-docker-dir>${project.basedir}/src</adsite-packages-docker-dir>
+ </properties>
<distributionManagement>
<site>
<id>${project.artifactId}-site</id>
diff --git a/packages/apex-pdp-docker/src/site-docs/adoc/fragments/dockerfile.adoc b/packages/apex-pdp-docker/src/site-docs/adoc/fragments/dockerfile.adoc
new file mode 100755
index 000000000..ec5ae9a01
--- /dev/null
+++ b/packages/apex-pdp-docker/src/site-docs/adoc/fragments/dockerfile.adoc
@@ -0,0 +1,20 @@
+//
+// ============LICENSE_START=======================================================
+// Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+//
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+== APEX Dockerfile
+
+.APEX Dockerfile
+[source%nowrap,sh,numbered,subs="attributes+"]
+----
+include::{adsite-packages-docker-dir}/main/docker/Dockerfile[APEX Dockerfile]
+----
diff --git a/packages/apex-pdp-docker/src/site/asciidoc/dockerfile.adoc b/packages/apex-pdp-docker/src/site/asciidoc/dockerfile.adoc
new file mode 100755
index 000000000..5c3ffb57a
--- /dev/null
+++ b/packages/apex-pdp-docker/src/site/asciidoc/dockerfile.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+// Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+//
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-packages-docker-dir}/site-docs/adoc/fragments/dockerfile.adoc[]
diff --git a/packages/apex-pdp-docker/src/site/site.xml b/packages/apex-pdp-docker/src/site/site.xml
index 7bf7f444a..ee59d8a00 100644
--- a/packages/apex-pdp-docker/src/site/site.xml
+++ b/packages/apex-pdp-docker/src/site/site.xml
@@ -16,6 +16,7 @@
<project name="APEX Packages Docker">
<body>
<menu name="APEX Packages Docker">
+ <item href="dockerfile.html" name="APEX Dockerfile" />
</menu>
<menu ref="reports" inherit="top" />
<menu ref="modules" />