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>

2 files changed, 7 insertions, 7 deletions

diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbum.java b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbum.java
index 27f9b8b9b..32555662e 100644
--- a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbum.java
+++ b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbum.java
@@ -62,7 +62,7 @@ import org.onap.policy.apex.model.utilities.Assertions;
  * read objects from the context album.
  * <p>
  * Validation checks that the album key and the context schema key are not null and that the scope field is not
- * undefined and matches the regular expression {@link SCOPE_REGEXP}.
+ * undefined and matches the regular expression SCOPE_REGEXP.
  */
 @Entity
 @Table(name = "AxContextAlbum")
@@ -113,7 +113,7 @@ public class AxContextAlbum extends AxConcept {
 
     /**
      * The default constructor creates a context album with a null artifact key. The scope of the context album is set
-     * as {@link SCOPE_UNDEFINED}, the album is writable, and the artifact key of the context schema is set to the null
+     * as SCOPE_UNDEFINED, the album is writable, and the artifact key of the context schema is set to the null
      * artifact key.
      */
     public AxContextAlbum() {
@@ -134,7 +134,7 @@ public class AxContextAlbum extends AxConcept {
 
     /**
      * The keyed constructor creates a context album with the specified artifact key. The scope of the context album is
-     * set as {@link SCOPE_UNDEFINED}, the album is writable, and the artifact key of the context schema is set to the
+     * set as SCOPE_UNDEFINED, the album is writable, and the artifact key of the context schema is set to the
      * null artifact key.
      *
      * @param key the key of the context album
@@ -147,7 +147,7 @@ public class AxContextAlbum extends AxConcept {
      * Constructor that sets all the fields of the context album.
      *
      * @param key the key of the context album
-     * @param scope the scope field, must match the regular expression {@link SCOPE_REGEXP}
+     * @param scope the scope field, must match the regular expression SCOPE_REGEXP
      * @param isWritable specifies whether the context album will be writable or not
      * @param itemSchema the artifact key of the context schema to use for this context album
      */
diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java
index bf8289ecb..87c89376e 100644
--- a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java
+++ b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java
@@ -58,7 +58,7 @@ import org.onap.policy.apex.model.utilities.Assertions;
  * {@link AxContextSchema} being defined as @code cell} objects.
  * <p>
  * Validation checks that the schema key is not null. It also checks that the schema flavour is defined and matches the
- * regular expression {@link SCHEMA_FLAVOUR_REGEXP}. Finally, validation checks that the defined schema is not a blank
+ * regular expression SCHEMA_FLAVOUR_REGEXP. Finally, validation checks that the defined schema is not a blank
  * or empty string.
  */
 @Entity
@@ -100,7 +100,7 @@ public class AxContextSchema extends AxConcept {
 
     /**
      * The default constructor creates a context schema with a null artifact key. The flavour of the context album is
-     * set as {@link SCHEMA_FLAVOUR_UNDEFINED} and the schema itself is defined as an empty string.
+     * set as SCHEMA_FLAVOUR_UNDEFINED and the schema itself is defined as an empty string.
      */
     public AxContextSchema() {
         this(new AxArtifactKey());
@@ -118,7 +118,7 @@ public class AxContextSchema extends AxConcept {
 
     /**
      * The key constructor creates a context schema with the given artifact key. The flavour of the context album is set
-     * as {@link SCHEMA_FLAVOUR_UNDEFINED} and the schema itself is defined as an empty string.
+     * as SCHEMA_FLAVOUR_UNDEFINED and the schema itself is defined as an empty string.
      *
      * @param key the key
      */