Omaha #3945 Moved the ESB folder to deploy.edex.awips2 and updated the build scripts.

Former-commit-id: b8a10c4336 [formerly b9868fc974226fe6b003b0361ce1b18507b2d810]
Former-commit-id: fa557d08e3

build/deploy.edex.awips2/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>deploy.edex.awips2</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.python.pydev.pythonNature</nature>
+	</natures>
+</projectDescription>

build/deploy.edex.awips2/.pydevproject

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?><pydev_project>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
+</pydev_project>

build/deploy.edex.awips2/deploy/deploy-esb.xml

@@ -1,5 +1,5 @@
 <project name="deploy.esb" default="main">	
-	<import file="deploy-web.xml" />
+	<!-- <import file="deploy-web.xml" /> -->
 	
 	<target name="main">		
 		<!-- on a developer machine, the following directories should

edexOsgi/build.edex/deploy-common/deploy-setup.xml

@@ -11,6 +11,8 @@
 		<echo message="ANT FILE DIR:${antfile.dir}"/>
 		<dirname property="base.dir" file="${antfile.dir}" />
 		<echo message="BASE DIR:${base.dir}"/>
+		<dirname property="repo.dir" file="${base.dir}" />
+		<echo message="REPO DIR:${repo.dir}"/>
 		<basename property="base.name" file="${base.dir}"/>
 		<echo message="BASE NAME:${base.name}"/>
 		<if>

edexOsgi/build.edex/deploy-install.xml

@@ -10,13 +10,14 @@
             <include name="*.jar" />
         </fileset>
     </path>
-	<property name="esb.directory" value="${basedir}/esb" />
+	
 	
 	<target name="main" depends="init, setup">
+		<property name="esb.directory" value="${repo.dir}/build/deploy.edex.awips2/esb" />
 		<!-- deploy esb {optionally: data, web} -->
-		<ant antfile="${basedir}/deploy-common/deploy-esb.xml" />
+		<ant antfile="${repo.dir}/build/deploy.edex.awips2/deploy/deploy-esb.xml" />
 		<!-- deploy esb configuration -->
-		<ant antfile="${basedir}/deploy-common/deploy-esb-configuration.xml" />
+		<ant antfile="${repo.dir}/build/deploy.edex.awips2/deploy/deploy-esb-configuration.xml" />
 		<!-- optionally: deploy gfesuite -->
 		<if>
 			<equals arg1="${deploy.gfesuite}" arg2="true" />

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

@@ -7,7 +7,7 @@ Version: %{_component_version}
 Release: %{_component_release}
 Group: AWIPSII
 BuildRoot: %{_build_root}
-BuildArch: noarch
+#BuildArch: noarch
 URL: N/A
 License: N/A
 Distribution: N/A
@@ -41,21 +41,59 @@ mkdir -p %{_build_root}/awips2/edex
 if [ $? -ne 0 ]; then
    exit 1
 fi
+mkdir -p %{_build_root}/awips2/edex/logs
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+mkdir -p %{_build_root}/awips2/edex/webapps
+if [ $? -ne 0 ]; then
+   exit 1
+fi
 
-DEPLOY_SCRIPT="build.edex/deploy-common/deploy-esb-configuration.xml"
+DEPLOY_SCRIPT="deploy.edex.awips2/deploy/deploy-esb-configuration.xml"
 
 # use deploy-install to deploy edex-configuration.
 pushd . > /dev/null
 cd %{_baseline_workspace}
 /awips2/ant/bin/ant -f ${DEPLOY_SCRIPT} \
    -Desb.overwrite=true \
-   -Desb.directory=%{_baseline_workspace}/build.edex/esb \
+   -Desb.directory=%{_baseline_workspace}/deploy.edex.awips2/esb \
    -Dedex.root.directory=${RPM_BUILD_ROOT}/awips2/edex
 if [ $? -ne 0 ]; then
    exit 1
 fi
 popd > /dev/null
 
+DEPLOY_SCRIPT="deploy.edex.awips2/deploy/deploy-esb.xml"
+
+BUILD_ARCH="%{_build_arch}"
+if [ "${BUILD_ARCH}" = "i386" ]; then
+   BUILD_ARCH="x86"
+fi
+
+# use deploy-install to deploy edex.
+pushd . > /dev/null
+cd %{_baseline_workspace}
+/awips2/ant/bin/ant -f ${DEPLOY_SCRIPT} \
+   -Ddeploy.data=true -Ddeploy.web=true \
+   -Desb.overwrite=true \
+   -Desb.directory=%{_baseline_workspace}/deploy.edex.awips2/esb \
+   -Dedex.root.directory=${RPM_BUILD_ROOT}/awips2/edex \
+   -Dbasedir=%{_baseline_workspace}/deploy.edex.awips2 \
+   -Dbasedirectories=%{_baseline_workspace} \
+   -Darchitecture=${BUILD_ARCH}
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+popd > /dev/null
+
+# remove any .gitignore files
+# currently, the ebxml webapp includes a .gitignore file
+/usr/bin/find ${RPM_BUILD_ROOT}/awips2/edex -name .gitignore -exec rm -f {} \;
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
 %pre
 
 %post
@@ -126,5 +164,17 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(644,awips,fxalpha,755)
 %dir /awips2
 %dir /awips2/edex
-%dir /awips2/edex/bin
+%dir /awips2/edex/bin/*
+%dir /awips2/edex/conf
+/awips2/edex/conf/*
+%dir /awips2/edex/data
+/awips2/edex/data/*
+%dir /awips2/edex/etc
+/awips2/edex/etc/*
+%dir /awips2/edex/lib
+/awips2/edex/lib/*
+%dir /awips2/edex/logs
+%dir /awips2/edex/webapps
 %config(noreplace) /awips2/edex/bin/setup.env
+%defattr(755,awips,fxalpha,755)
+/awips2/edex/bin/*.sh

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

@@ -47,7 +47,7 @@ mkdir -p %{_build_root}/awips2/edex
 if [ $? -ne 0 ]; then
    exit 1
 fi
-mkdir -p %{_build_root}/awips2/edex/logs
+mkdir -p %{_build_root}/awips2/edex/bin
 if [ $? -ne 0 ]; then
    exit 1
 fi
@@ -55,35 +55,12 @@ mkdir -p %{_build_root}/etc/init.d
 if [ $? -ne 0 ]; then
    exit 1
 fi
-mkdir -p %{_build_root}/awips2/edex/webapps
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-
-
-DEPLOY_SCRIPT="build.edex/deploy-common/deploy-esb.xml"
 
 BUILD_ARCH="%{_build_arch}"
 if [ "${BUILD_ARCH}" = "i386" ]; then
    BUILD_ARCH="x86"
 fi
 
-# use deploy-install to deploy edex.
-pushd . > /dev/null
-cd %{_baseline_workspace}
-/awips2/ant/bin/ant -f ${DEPLOY_SCRIPT} \
-   -Ddeploy.data=true -Ddeploy.web=true \
-   -Desb.overwrite=true \
-   -Desb.directory=%{_baseline_workspace}/build.edex/esb \
-   -Dedex.root.directory=${RPM_BUILD_ROOT}/awips2/edex \
-   -Dbasedir=%{_baseline_workspace}/build.edex \
-   -Dbasedirectories=%{_baseline_workspace} \
-   -Darchitecture=${BUILD_ARCH}
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-popd > /dev/null
-
 # remove any .gitignore files
 # currently, the ebxml webapp includes a .gitignore file
 /usr/bin/find ${RPM_BUILD_ROOT}/awips2/edex -name .gitignore -exec rm -f {} \;
@@ -163,16 +140,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(644,awips,fxalpha,755)
 %dir /awips2
 %dir /awips2/edex
-%dir /awips2/edex/conf
-/awips2/edex/conf/*
-%dir /awips2/edex/data
-/awips2/edex/data/*
-%dir /awips2/edex/etc
-/awips2/edex/etc/*
-%dir /awips2/edex/lib
-/awips2/edex/lib/*
-%dir /awips2/edex/logs
-%dir /awips2/edex/webapps
 
 %defattr(755,awips,fxalpha,755)
 %dir /awips2/edex/bin