Issue #1739 - updates for recent CAVE and EDEX feature-refactoring

- resolved EDEX rpm naming conflict
- resolved CAVE junit dependency issue

Change-Id: I8d868188ad8eff5f55ec9894477f1f772fa4d2dc

Former-commit-id: 7028a07133a943fe15b094bbd439cbd885463b2e

cave/build/p2-build.xml

@@ -157,11 +157,11 @@
 		</antcall>
 		<antcall target="p2.build.repo">
 			<param name="feature"
-				value="com.raytheon.uf.viz.cots.feature" />
+				value="com.raytheon.uf.common.base.feature" />
 		</antcall>
 		<antcall target="p2.build.repo">
 			<param name="feature"
-				value="com.raytheon.uf.common.base.feature" />
+				value="com.raytheon.uf.viz.cots.feature" />
 		</antcall>
 		<antcall target="p2.build.repo">
 			<param name="feature"

cave/com.raytheon.uf.viz.common.core.feature/feature.xml

@@ -19,7 +19,6 @@
 
    <requires>
       <import feature="com.raytheon.uf.viz.cots.feature" version="1.0.0.qualifier"/>
-      <import feature="com.raytheon.uf.common.base.feature" version="1.0.0.qualifier"/>
    </requires>
 
    <plugin

cave/com.raytheon.uf.viz.cots.feature/feature.xml

@@ -16,6 +16,10 @@
    <license url="http://www.example.com/license">
       [Enter License Description here.]
    </license>
+   
+   <requires>
+      <import feature="com.raytheon.uf.common.base.feature" version="1.0.0.qualifier"/>
+   </requires>
 
    <plugin
          id="javax.media.opengl"
@@ -131,12 +135,6 @@
          install-size="0"
          version="0.0.0"/>
 
-   <plugin
-         id="org.junit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
    <plugin
          id="com.sun.jna"
          download-size="0"

edexOsgi/com.raytheon.uf.common.base.feature/feature.xml

@@ -124,6 +124,12 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+         
+   <plugin
+         id="org.junit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
 
    <plugin
          id="com.raytheon.uf.common.message"

rpms/awips2.cave/deploy.builder/build.sh

@@ -187,21 +187,21 @@ function buildFeatureRPMs()
       if [ "${feature}" = "com.raytheon.uf.common.base.feature" ]; then
          echo 'export COMPONENT_NAME="awips2-cave-common-base"' > \
             ${CONST_SETUP_DIR}/feature.setup
-         echo 'export COMPONENT_FEATURE="com.raytheon.uf.common.base.feature"' >> \
+         echo 'export COMPONENT_FEATURE="${feature}"' >> \
             ${CONST_SETUP_DIR}/feature.setup
          echo 'export COMPONENT_DESC="awips2-cave-common-base"' >> \
             ${CONST_SETUP_DIR}/feature.setup
 	 echo 'export DOWNSTREAM_REQUIRES="awips2-cave"' >> \
 	    ${CONST_SETUP_DIR}/feature.setup
       else
-         if [ "${feature}" = "com.raytheon.uf.viz.common.core.feature" ]; then
+         if [ "${feature}" = "com.raytheon.uf.viz.cots.feature" ]; then
-            echo 'export COMPONENT_NAME="awips2-cave-viz-common-core"' > \
+            echo 'export COMPONENT_NAME="awips2-cave-viz-cots"' > \
                ${CONST_SETUP_DIR}/feature.setup
-            echo 'export COMPONENT_FEATURE="com.raytheon.uf.viz.common.core.feature"' >> \
+            echo 'export COMPONENT_FEATURE="${feature}"' >> \
                ${CONST_SETUP_DIR}/feature.setup
-            echo 'export COMPONENT_DESC="awips2-cave-viz-common-core"' >> \
+            echo 'export COMPONENT_DESC="awips2-cave-viz-cots"' >> \
                ${CONST_SETUP_DIR}/feature.setup
-            echo 'export DOWNSTREAM_REQUIRES="awips2-cave-viz-cots awips2-cave-common-base"' >> \
+            echo 'export DOWNSTREAM_REQUIRES="awips2-cave-common-base"' >> \
                ${CONST_SETUP_DIR}/feature.setup         
          else
             java -jar ${PROCESS_FEATURE_JAR} \

rpms/awips2.edex/Installer.edex/component.spec

@@ -1,7 +1,7 @@
 #
-# AWIPS II edex-base Spec File
+# AWIPS II EDEX Spec File
 #
-Name: awips2-edex-base
+Name: awips2-edex
 Summary: AWIPS II Edex
 Version: %{_component_version}
 Release: %{_component_release}
@@ -13,14 +13,14 @@ Distribution: N/A
 Vendor: Raytheon
 Packager: Bryan Kowal
 
-provides: awips2-edex-base
+provides: awips2-edex
 provides: awips2-base-component
 requires: awips2-python
 requires: awips2-java
 requires: awips2-psql
 
 %description
-AWIPS II Edex Installation - Installs and configures AWIPS II Edex "Base".
+AWIPS II Edex Installation - Installs and configures AWIPS II Edex.
 
 # Turn off the brp-python-bytecompile script
 %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
@@ -56,7 +56,7 @@ if [ "${BUILD_ARCH}" = "i386" ]; then
    BUILD_ARCH="x86"
 fi
 
-# use deploy-install to deploy edex-base.
+# use deploy-install to deploy edex.
 pushd . > /dev/null
 cd %{_baseline_workspace}
 /awips2/ant/bin/ant -f ${DEPLOY_SCRIPT} \
@@ -74,7 +74,7 @@ popd > /dev/null
 
 INSTALLER_RPM="%{_baseline_workspace}/rpms"
 # copy the service script.
-EDEX_BASE="${INSTALLER_RPM}/awips2.edex/Installer.edex-base"
+EDEX_BASE="${INSTALLER_RPM}/awips2.edex/Installer.edex"
 cp -v ${EDEX_BASE}/scripts/init.d/* \
    %{_build_root}/etc/init.d
 if [ $? -ne 0 ]; then

rpms/awips2.edex/deploy.builder/build.sh

@@ -151,7 +151,7 @@ setTargetArchitecture
 # Adjust Our Execution Position.
 cd ../
 
-buildRPM "Installer.edex-base"
+buildRPM "Installer.edex"
 buildRPM "Installer.edex-configuration"
 buildRPM "Installer.edex-shapefiles"
 # build the edex-datadelivery rpm