aboutsummaryrefslogtreecommitdiffstats
path: root/src/site-docs/adoc/fragments/howto-build
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 /src/site-docs/adoc/fragments/howto-build
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 'src/site-docs/adoc/fragments/howto-build')
-rw-r--r--src/site-docs/adoc/fragments/howto-build/introduction.adoc9
-rw-r--r--src/site-docs/adoc/fragments/howto-build/site.adoc12
-rw-r--r--src/site-docs/adoc/fragments/howto-build/standard.adoc6
-rw-r--r--src/site-docs/adoc/fragments/howto-build/with-tests.adoc12
4 files changed, 19 insertions, 20 deletions
diff --git a/src/site-docs/adoc/fragments/howto-build/introduction.adoc b/src/site-docs/adoc/fragments/howto-build/introduction.adoc
index 02ba21fbd..546a769d7 100644
--- a/src/site-docs/adoc/fragments/howto-build/introduction.adoc
+++ b/src/site-docs/adoc/fragments/howto-build/introduction.adoc
@@ -34,6 +34,15 @@ The examples in this document assume that the APEX source repositories are clone
- Windows: `C:\dev\apex`
- Cygwin: `/cygdrive/c/dev/apex`
+
+[IMPORTANT]
+.A Build requires ONAP Nexus
+====
+APEX has a dependency to ONAP parent projects.
+You might need to adjust your Maven M2 settings.
+The most current settings can be found in the ONAP oparent repo: link:https://git.onap.org/oparent/plain/settings.xml[Settings].
+====
+
[IMPORTANT]
.A Build needs Space
====
diff --git a/src/site-docs/adoc/fragments/howto-build/site.adoc b/src/site-docs/adoc/fragments/howto-build/site.adoc
index 42cbda525..6ec453c9e 100644
--- a/src/site-docs/adoc/fragments/howto-build/site.adoc
+++ b/src/site-docs/adoc/fragments/howto-build/site.adoc
@@ -18,9 +18,9 @@ Use Maven to build the APEX Site.
Stage the APEX web site.
The target folder for the staged site is
-- Unix: `/usr/local/src/apex/target/gh-pages`
-- Windows: `C:\dev\apex\target\gh-pages`
-- Cygwin: `/cygdrive/c/dev/apex/target/gh-pages`
+- Unix: `/usr/local/src/apex/target/ad-site`
+- Windows: `C:\dev\apex\target\ad-site`
+- Cygwin: `/cygdrive/c/dev/apex/target/ad-site`
Once the web site is staged, copy the full site to a folder of choice or into a web server.
@@ -45,20 +45,20 @@ Then go to the APEX packaging directory.
[source%nowrap,sh]
----
cd /usr/local/src/apex
-rm -fr target/gh-pages
+rm -fr target/ad-site
----
|
[source%nowrap,bat]
----
c:
cd \dev\apex
-rmdir /s /q target\gh-pages
+rmdir /s /q target\ad-site
----
|
[source%nowrap,sh]
----
cd /cygdrive/c/dev/apex
-rm -fr target/gh-pages
+rm -fr target/ad-site
----
|====================
diff --git a/src/site-docs/adoc/fragments/howto-build/standard.adoc b/src/site-docs/adoc/fragments/howto-build/standard.adoc
index 76ebfc2bf..97013742b 100644
--- a/src/site-docs/adoc/fragments/howto-build/standard.adoc
+++ b/src/site-docs/adoc/fragments/howto-build/standard.adoc
@@ -33,7 +33,7 @@ Use Maven to for a standard build without any tests.
----
|====================
-The build takes 2-3 minutes on a standard development laptop.
+The build takes about 6 minutes on a standard development laptop.
It should run through without errors, but with a lot of messages from the build process.
When Maven is finished with the build, the final screen should look similar to this (omitting some `success` lines):
@@ -53,7 +53,7 @@ The following example show how to change to the target directory and how it shou
|
[source%nowrap,sh,numbered]
----
-# cd modules/apex-apps/apex-apps.uservice/apex-apps.uservice-packaging/apex-apps.uservice-package-full/target
+# cd packages/apex-pdp-package-full/target
# ls -l
----
@@ -72,7 +72,7 @@ include::{adsite-main-dir}/site-docs/adoc/fragments/screens/target-ls-unix.txt[s
|
[source%nowrap,bat,numbered]
----
->cd modules\apex-apps\apex-apps.uservice\apex-apps.uservice-packaging\apex-apps.uservice-package-full\target
+>cd packages\apex-pdp-package-full\target
>dir
----
diff --git a/src/site-docs/adoc/fragments/howto-build/with-tests.adoc b/src/site-docs/adoc/fragments/howto-build/with-tests.adoc
index f8d300c45..e923ece60 100644
--- a/src/site-docs/adoc/fragments/howto-build/with-tests.adoc
+++ b/src/site-docs/adoc/fragments/howto-build/with-tests.adoc
@@ -41,17 +41,7 @@ If this happens, reduce the load on your build machine and restart the build.
----
|====================
-The build takes about 5-6 minutes with tests on a standard development laptop.
+The build takes about 10 minutes with tests on a standard development laptop.
It should run through without errors, but with a lot of messages from the build process.
If build with tests (i.e. without `-DskipTests`), there will be error messages and stack trace prints from some tests.
This is normal, as long as the build finishes successful.
-
-When Maven is finished with the build, the final screen should look similar to this (omitting some `success` lines):
-
-[source%nowrap,sh,numbered,subs="attributes+"]
-----
-include::{adsite-main-dir}/site-docs/adoc/fragments/screens/mvn-install-skiptests.txt[mvn build, with tests]
-----
-
-The build will have created all artifacts required for an APEX installation.
-