From a41c877a6b1980e0e866699633e0289d9a3fdbb5 Mon Sep 17 00:00:00 2001 From: liamfallon 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 --- src/site/asciidoc/apex-publications.adoc | 3 +++ .../user-manual/install/um-install-monitoring.adoc | 14 -------------- .../user-manual/install/um-install-resteditor.adoc | 14 -------------- src/site/asciidoc/user-manual/install/um-install-wars.adoc | 14 ++++++++++++++ src/site/site.xml | 3 +-- src/site/xdoc/index.xml | 5 +++-- 6 files changed, 21 insertions(+), 32 deletions(-) delete mode 100644 src/site/asciidoc/user-manual/install/um-install-monitoring.adoc delete mode 100644 src/site/asciidoc/user-manual/install/um-install-resteditor.adoc create mode 100644 src/site/asciidoc/user-manual/install/um-install-wars.adoc (limited to 'src/site') diff --git a/src/site/asciidoc/apex-publications.adoc b/src/site/asciidoc/apex-publications.adoc index dbf5ce8eb..6c030aeb4 100644 --- a/src/site/asciidoc/apex-publications.adoc +++ b/src/site/asciidoc/apex-publications.adoc @@ -25,6 +25,8 @@ include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/im-20 include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/noms-2018a.adoc[leveloffset=+1] +include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/noms-2018d.adoc[leveloffset=+1] + include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/noms-2018c.adoc[leveloffset=+1] @@ -43,3 +45,4 @@ include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/5g-20 include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/noms-2018b.adoc[leveloffset=+1] +include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/noms-2018e.adoc[leveloffset=+1] diff --git a/src/site/asciidoc/user-manual/install/um-install-monitoring.adoc b/src/site/asciidoc/user-manual/install/um-install-monitoring.adoc deleted file mode 100644 index 79889ec97..000000000 --- a/src/site/asciidoc/user-manual/install/um-install-monitoring.adoc +++ /dev/null @@ -1,14 +0,0 @@ -// -// ============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-main-dir}/site-docs/adoc/fragments/install-guide/install-monitoring.adoc[] diff --git a/src/site/asciidoc/user-manual/install/um-install-resteditor.adoc b/src/site/asciidoc/user-manual/install/um-install-resteditor.adoc deleted file mode 100644 index 1d2741ab5..000000000 --- a/src/site/asciidoc/user-manual/install/um-install-resteditor.adoc +++ /dev/null @@ -1,14 +0,0 @@ -// -// ============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-main-dir}/site-docs/adoc/fragments/install-guide/install-resteditor.adoc[] diff --git a/src/site/asciidoc/user-manual/install/um-install-wars.adoc b/src/site/asciidoc/user-manual/install/um-install-wars.adoc new file mode 100644 index 000000000..1640bc957 --- /dev/null +++ b/src/site/asciidoc/user-manual/install/um-install-wars.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-main-dir}/site-docs/adoc/fragments/install-guide/install-wars.adoc[] diff --git a/src/site/site.xml b/src/site/site.xml index 20d77ae4e..11ae2c15a 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -36,8 +36,7 @@ - - + diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml index fe215c5dc..a18539b3c 100644 --- a/src/site/xdoc/index.xml +++ b/src/site/xdoc/index.xml @@ -140,7 +140,7 @@
  • examples-pcvs - An example policy for managing customers and link failures showing video streaming for a simple VPN scenario
  • examples-onap-vcpe - An example policy for managing vCPE's in ONAP
  • examples-periodic - An example periodic policy
    • -
  • examples-aadm - An APEX Servlet Example
    • +
  • examples-servlet - An APEX Servlet Example
  • examples-adaptive - A simple adaptive policy
  • examples-aadm - A policy realizing a complex scenario for Autonomic Anomaly Detection and Mitigation (AADM)
    • @@ -307,9 +307,10 @@ - APEX Issue Management (Github) + APEX Issue Management (ONAP, JIRA) Issues with the APEX software and integrated documentation are managed here. + This link requires a Linux Foundation ID. -- cgit 1.2.3-korg