Merge "ONAP log files consolidation"

diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml
index 9be5c30..f64c35a 100644 (file)
--- a/BRMSGateway/pom.xml
+++ b/BRMSGateway/pom.xml
@@ -162,7 +162,7 @@
                         <manifest>
                             <addClasspath>true</addClasspath>
                             <classpathPrefix>lib/</classpathPrefix>
-                            <mainClass>org.onap.policy.brmsInterface.BRMSGateway</mainClass>
+                            <mainClass>org.onap.policy.brms.api.BrmsGateway</mainClass>
                         </manifest>
                     </archive>
                     <descriptorRefs>

diff --git a/docs/platform/swarch_pdp.rst b/docs/platform/swarch_pdp.rst
index e6537a7..9b087b5 100644 (file)
--- a/docs/platform/swarch_pdp.rst
+++ b/docs/platform/swarch_pdp.rst
@@ -51,14 +51,14 @@ Extensions are optional modules that are commonly known as **features** that ext
 
 The current extensions supported are:
 
-- Feature Test Transaction  (disabled by default)
-- Feature State Management (disabled by default)
-- Feature EELF (disabled by default)
-- Feature Healthcheck (enabled by default)
-- Feature Session Persistence (disabled by default)
-- Feature Active/Standby Management (disabled by default)
-
-.. seealso:: Please see the individual feature wiki pages for more information 
+- `Feature Test Transaction  <feature_testtransaction.html>`_ (disabled by default)
+- `Feature State Management <feature_statemgmt.html>`_ (disabled by default)
+- `Feature EELF <feature_eelf.html>`_ (disabled by default)
+- `Feature Healthcheck <feature_healthcheck.html>`_ (enabled by default)
+- `Feature Session Persistence <feature_sesspersist.html>`_ (disabled by default)
+- `Feature Active/Standby Management <feature_activestdbymgmt.html>`_ (disabled by default)
+
+.. seealso:: Click on the individual feature links for more information 
 
 
 .. _Control Loop Operational Policy: https://wiki.onap.org/display/DW/Control+Loop+Operational+Policy

diff --git a/packages/base/pom.xml b/packages/base/pom.xml
index a08307d..4f66079 100755 (executable)
--- a/packages/base/pom.xml
+++ b/packages/base/pom.xml
@@ -120,6 +120,11 @@
                                                                        <artifactId>tomcat</artifactId>
                                                                        <version>8.0.50</version>
                                                                        <type>tar.gz</type>
+                                                                       <!--
+                                                                       Please note that if you change this version, you must
+                                                                       update the docker-install.sh script to ensure the right
+                                                                       file name is installed. 
+                                                                        -->
                                                                        <destFileName>apache-tomcat-8.0.50.tar.gz</destFileName>
                                                                </artifactItem>
                                                        </artifactItems>

diff --git a/packages/docker/src/main/docker/docker-install.sh b/packages/docker/src/main/docker/docker-install.sh
index 5c85611..1dd57ab 100644 (file)
--- a/packages/docker/src/main/docker/docker-install.sh
+++ b/packages/docker/src/main/docker/docker-install.sh
@@ -578,7 +578,7 @@ DEBUG=n
 
 BASE_CONF=base.conf
 
-TOMCAT_PACKAGE_NAME=apache-tomcat-8.0.23
+TOMCAT_PACKAGE_NAME=apache-tomcat-8.0.50
 
 INSTALL_DIR="$(pwd)"