Merge "Fix install script/examples on apex"

6 files changed, 17 insertions, 17 deletions

diff --git a/examples/examples-servlet/src/main/resources/webapp/WEB-INF/classes/events/SampleDomain/EventsIn.jsons b/examples/examples-servlet/src/main/resources/webapp/WEB-INF/classes/events/SampleDomain/EventsIn.json
index da11b2c94..da11b2c94 100644
--- a/examples/examples-servlet/src/main/resources/webapp/WEB-INF/classes/events/SampleDomain/EventsIn.jsons
+++ b/examples/examples-servlet/src/main/resources/webapp/WEB-INF/classes/events/SampleDomain/EventsIn.json
diff --git a/packages/apex-pdp-package-full/pom.xml b/packages/apex-pdp-package-full/pom.xml
index 65520e83f..fbfce9ade 100644
--- a/packages/apex-pdp-package-full/pom.xml
+++ b/packages/apex-pdp-package-full/pom.xml
@@ -500,7 +500,7 @@
                                     <dst>lib</dst>
                                     <mapper>
                                         <type>perm</type>
-                                        <prefix>/opt/app/policy/apex-pdp/${project.artifactId}-${project.version}/lib</prefix>
+                                        <prefix>/opt/app/policy/${project.artifactId}-${project.version}/lib</prefix>
                                         <filemode>755</filemode>
                                     </mapper>
                                 </data>
@@ -510,7 +510,7 @@
                                     <dst>etc</dst>
                                     <mapper>
                                         <type>perm</type>
-                                        <prefix>/opt/app/policy/apex-pdp/${project.artifactId}-${project.version}/bin</prefix>
+                                        <prefix>/opt/app/policy/${project.artifactId}-${project.version}/bin</prefix>
                                     </mapper>
                                 </data>
                                 <data>
@@ -519,7 +519,7 @@
                                     <dst>etc</dst>
                                     <mapper>
                                         <type>perm</type>
-                                        <prefix>/opt/app/policy/apex-pdp/${project.artifactId}-${project.version}/etc</prefix>
+                                        <prefix>/opt/app/policy/${project.artifactId}-${project.version}/etc</prefix>
                                     </mapper>
                                 </data>
                                 <data>
@@ -528,7 +528,7 @@
                                     <dst>etc</dst>
                                     <mapper>
                                         <type>perm</type>
-                                        <prefix>/opt/app/policy/apex-pdp/${install.package.name}-${project.version}/war</prefix>
+                                        <prefix>/opt/app/policy/${install.package.name}-${project.version}/war</prefix>
                                     </mapper>
                                 </data>
                                 <data>
@@ -537,7 +537,7 @@
                                     <dst>etc</dst>
                                     <mapper>
                                         <type>perm</type>
-                                        <prefix>/opt/app/policy/apex-pdp/${project.artifactId}-${project.version}/examples</prefix>
+                                        <prefix>/opt/app/policy/${project.artifactId}-${project.version}/examples</prefix>
                                     </mapper>
                                 </data>
                             </dataSet>
@@ -589,7 +589,7 @@
                             </defineStatements>
                             <mappings>
                                 <mapping>
-                                    <directory>/opt/app/policy/apex-pdp/${project.artifactId}-${project.version}/lib</directory>
+                                    <directory>/opt/app/policy/${project.artifactId}-${project.version}/lib</directory>
                                     <username>root</username>
                                     <groupname>root</groupname>
                                     <sources>
@@ -599,7 +599,7 @@
                                     </sources>
                                 </mapping>
                                 <mapping>
-                                    <directory>/opt/app/policy/apex-pdp/${project.artifactId}-${project.version}/bin</directory>
+                                    <directory>/opt/app/policy/${project.artifactId}-${project.version}/bin</directory>
                                     <username>root</username>
                                     <groupname>root</groupname>
                                     <sources>
@@ -609,7 +609,7 @@
                                     </sources>
                                 </mapping>
                                 <mapping>
-                                    <directory>/opt/app/policy/apex-pdp/${project.artifactId}-${project.version}/etc</directory>
+                                    <directory>/opt/app/policy/${project.artifactId}-${project.version}/etc</directory>
                                     <username>root</username>
                                     <groupname>root</groupname>
                                     <sources>
@@ -619,7 +619,7 @@
                                     </sources>
                                 </mapping>
                                 <mapping>
-                                    <directory>/opt/app/policy/apex-pdp/${install.package.name}-${project.version}/war</directory>
+                                    <directory>/opt/app/policy/${install.package.name}-${project.version}/war</directory>
                                     <username>root</username>
                                     <groupname>root</groupname>
                                     <sources>
@@ -629,7 +629,7 @@
                                     </sources>
                                 </mapping>
                                 <mapping>
-                                    <directory>/opt/app/policy/apex-pdp/${project.artifactId}-${project.version}/examples</directory>
+                                    <directory>/opt/app/policy/${project.artifactId}-${project.version}/examples</directory>
                                     <username>root</username>
                                     <groupname>root</groupname>
                                     <sources>
diff --git a/packages/apex-pdp-package-full/src/main/package/control/postinst b/packages/apex-pdp-package-full/src/main/package/control/postinst
index dab0fded7..1b12f5f2a 100644
--- a/packages/apex-pdp-package-full/src/main/package/control/postinst
+++ b/packages/apex-pdp-package-full/src/main/package/control/postinst
@@ -40,7 +40,7 @@ if [ -L "/opt/app/policy/apex-pdp" ]; then
 fi
 
 # Add soft link for latest version of Apex
-ln -s `ls /opt/app/policy/apex-pdp | grep -i '^apex-*' | sort | tail -1` /opt/app/policy/apex-pdp
+ln -s `ls /opt/app/policy | grep -i '^apex-*' | sort | tail -1` /opt/app/policy/apex-pdp
 
 # Add Apex-specific directories and set ownership as the Apex admin user
 mkdir -p /var/log/onap/policy/apex-pdp
@@ -49,11 +49,11 @@ chown -R apexuser:apexuser /var/log/onap/policy/apex-pdp
 # Ensure everything has the correct permissions
 find /opt/app -type d -perm 755 
 find /opt/app -type f -perm 644 
-chmod a+x /opt/app/policy/apex-pdp/apex/bin/*
+chmod a+x /opt/app/policy/apex-pdp/bin/*
 
 # Copy examples to Apex user area
 if [ -e /home/apexuser/examples ]
 then
 	rm -rf /home/apexuser/examples
 fi
-cp -pr /opt/app/policy/apex-pdp/apex/examples /home/apexuser
+cp -pr /opt/app/policy/apex-pdp/examples /home/apexuser
diff --git a/packages/apex-pdp-package-full/src/main/package/control/postrm b/packages/apex-pdp-package-full/src/main/package/control/postrm
index f57fd70ba..2383820e5 100644
--- a/packages/apex-pdp-package-full/src/main/package/control/postrm
+++ b/packages/apex-pdp-package-full/src/main/package/control/postrm
@@ -40,9 +40,9 @@ if [ -L "/opt/app/policy/apex-pdp" ]; then
 fi
 
 DIRS_TO_DELETE="
-        /var/log/onap/policy/apex-pdp
-       /opt/app/policy/apex-pdp
-        "
+    /var/log/onap/policy/apex-pdp
+    /opt/app/policy/apex-pdp
+"
 
 for DIR in $DIRS_TO_DELETE
 do
diff --git a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh
index d0e3f2efe..246906b56 100755
--- a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh
+++ b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh
@@ -36,7 +36,7 @@
 
 if [ -z $APEX_HOME ]
 then
-    APEX_HOME="/opt/app/policy/apex-pdp/apex-pdp"
+    APEX_HOME="/opt/app/policy/apex-pdp"
 fi
 
 if [ ! -d $APEX_HOME ]
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/events/SampleDomain/EventsIn.jsons b/testsuites/integration/integration-common/src/main/resources/examples/events/SampleDomain/EventsIn.json
index da11b2c94..da11b2c94 100644
--- a/testsuites/integration/integration-common/src/main/resources/examples/events/SampleDomain/EventsIn.jsons
+++ b/testsuites/integration/integration-common/src/main/resources/examples/events/SampleDomain/EventsIn.json