Merge "Omaha #4884 Removed Collaboration ties" into omaha_16.2.1
Former-commit-id: 9b07e7188ecb21f5d204c0d9ad513441c632335b
This commit is contained in:
David Lovely
Gerrit Code Review
commit
4cb12f23fd
15 changed files with 3 additions and 630 deletions
|
|
@ -268,9 +268,6 @@
|
|||
<antcall target="p2.build.repo">
|
||||
<param name="feature" value="com.raytheon.uf.viz.d2d.gfe.feature" />
|
||||
</antcall>
|
||||
<antcall target="p2.build.repo">
|
||||
<param name="feature" value="com.raytheon.uf.viz.collaboration.feature" />
|
||||
</antcall>
|
||||
<antcall target="p2.build.repo">
|
||||
<param name="feature" value="com.raytheon.uf.viz.d2d.damagepath.feature" />
|
||||
</antcall>
|
||||
|
|
|
|||
|
|
@ -1,103 +0,0 @@
|
|||
%define _ant_opts -Dfile.encoding=iso-8859-1 -Dworkspace='..' -Dworkspace_edexOsgi='..' -Dworkspace_javaUtilities='..' -Dworkspace_cots='..' -Ddataserver.root.directory='${RPM_BUILD_ROOT}/awips2/collab-dataserver'
|
||||
|
||||
Name: awips2-collab-dataserver
|
||||
Summary: AWIPSII Collaboration HTTP Dataserver
|
||||
Version: %{_component_version}
|
||||
Release: %{_component_release}
|
||||
Group: AWIPSII
|
||||
BuildRoot: %{_build_root}
|
||||
BuildArch: %{_build_arch}
|
||||
URL: N/A
|
||||
License: N/A
|
||||
Distribution: N/A
|
||||
Vendor: Raytheon
|
||||
Packager: Bradley Gonzales
|
||||
|
||||
AutoReq: no
|
||||
provides: awips2-collab-dataserver
|
||||
requires: awips2-java, awips2-ant
|
||||
|
||||
%description
|
||||
%{_component_desc}
|
||||
|
||||
%prep
|
||||
# Ensure that a "buildroot" has been specified.
|
||||
if [ "%{_build_root}" = "" ]; then
|
||||
echo "ERROR: A BuildRoot has not been specified."
|
||||
echo "FATAL: Unable to Continue ... Terminating."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -d %{_build_root} ]; then
|
||||
rm -rf %{_build_root}
|
||||
fi
|
||||
/bin/mkdir -p %{_build_root}
|
||||
if [ $? -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
%build
|
||||
cd %{_baseline_workspace}/collaboration.dataserver
|
||||
export ANT_OPTS="%{_ant_opts}"
|
||||
/awips2/ant/bin/ant -f build.xml build
|
||||
if [ $? -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
%install
|
||||
dataserver_project="%{_baseline_workspace}/rpms/awips2.core/Installer.collab-dataserver"
|
||||
config_directory="${dataserver_project}/configuration"
|
||||
cd %{_baseline_workspace}/collaboration.dataserver
|
||||
export ANT_OPTS="%{_ant_opts}"
|
||||
/awips2/ant/bin/ant -f build.xml deploy
|
||||
if [ $? -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cp -r ${config_directory}/etc ${RPM_BUILD_ROOT}
|
||||
|
||||
%pre
|
||||
%post
|
||||
chmod ug+x /awips2/collab-dataserver/bin/*.sh
|
||||
chmod 755 /etc/init.d/collab-dataserver
|
||||
/sbin/chkconfig --add collab-dataserver
|
||||
|
||||
%preun
|
||||
# Remove and unregister the collab-dataserver service.
|
||||
if [ -f /etc/init.d/collab-dataserver ]; then
|
||||
/sbin/chkconfig collab-dataserver off
|
||||
/sbin/chkconfig --del collab-dataserver
|
||||
|
||||
rm -f /etc/init.d/collab-dataserver
|
||||
fi
|
||||
|
||||
%postun
|
||||
|
||||
%clean
|
||||
cd %{_baseline_workspace}/collaboration.dataserver
|
||||
export ANT_OPTS="%{_ant_opts}"
|
||||
/awips2/ant/bin/ant -f build.xml clean
|
||||
if [ $? -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
rm -rf ${RPM_BUILD_ROOT}
|
||||
|
||||
%files
|
||||
%defattr(644,awips,fxalpha,755)
|
||||
%dir /awips2
|
||||
%dir /awips2/collab-dataserver
|
||||
%dir /awips2/collab-dataserver/bin
|
||||
/awips2/collab-dataserver/bin/*
|
||||
%dir /awips2/collab-dataserver/lib
|
||||
/awips2/collab-dataserver/lib/*
|
||||
|
||||
%defattr(775,awips,fxalpha,775)
|
||||
%dir /awips2/collab-dataserver/lib/uframe
|
||||
/awips2/collab-dataserver/lib/uframe/*
|
||||
%dir /awips2/collab-dataserver/lib/foss
|
||||
/awips2/collab-dataserver/lib/foss/*
|
||||
%dir /awips2/collab-dataserver/config
|
||||
/awips2/collab-dataserver/config/*
|
||||
|
||||
%defattr(755,root,root,755)
|
||||
/etc/init.d/collab-dataserver
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# Startup script for the HTTP Collaboration Dataserver servlet
|
||||
#
|
||||
# chkconfig: - 85 15
|
||||
# description: Servlet for storing and retrieving collaboration data objects.
|
||||
# processname: collabserver
|
||||
# pidfile: /var/run/collabserver.pid
|
||||
|
||||
# Source function library.
|
||||
. /etc/rc.d/init.d/functions
|
||||
|
||||
COLLAB_BIN=/awips2/collab-dataserver/bin
|
||||
PROG=`basename $0`
|
||||
|
||||
start() {
|
||||
echo $"Starting HTTP Collaboration Dataserver"
|
||||
# start.sh script starts the service using nohup.
|
||||
${COLLAB_BIN}/start.sh
|
||||
return $?
|
||||
}
|
||||
|
||||
status() {
|
||||
${COLLAB_BIN}/status.sh
|
||||
return $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
echo $"Stopping HTTP Collaboration Dataserver"
|
||||
${COLLAB_BIN}/stop.sh
|
||||
return
|
||||
}
|
||||
|
||||
# See how we were called.
|
||||
case "$1" in
|
||||
start)
|
||||
start
|
||||
RETVAL=$?
|
||||
;;
|
||||
stop)
|
||||
stop
|
||||
RETVAL=$?
|
||||
;;
|
||||
status)
|
||||
status $httpd
|
||||
RETVAL=$?
|
||||
;;
|
||||
restart)
|
||||
stop
|
||||
start
|
||||
RETVAL=$?
|
||||
;;
|
||||
*)
|
||||
echo $"Usage: $PROG {start|stop|restart|status}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
exit $RETVAL
|
||||
|
|
@ -1,137 +0,0 @@
|
|||
#
|
||||
# Generic AWIPS II XMPP Specs File
|
||||
#
|
||||
|
||||
# Variables
|
||||
# -----------------------------------------------------------------------------
|
||||
%define _xmpp_server openfire
|
||||
%define _xmpp_software_version 3.9.1
|
||||
%define _xmpp_software_url http://www.igniterealtime.org/projects/openfire
|
||||
%define _xmpp_software_license Apache License Version 2.0
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
Name: awips2-%{_xmpp_server}
|
||||
Summary: AWIPS II XMPP Server
|
||||
Version: %{_xmpp_software_version}
|
||||
Release: 3
|
||||
Group: AWIPSII
|
||||
BuildRoot: /tmp
|
||||
URL: %{_xmpp_software_url}
|
||||
License: %{_xmpp_software_license}
|
||||
Distribution: N/A
|
||||
Vendor: Raytheon
|
||||
Packager: Bryan Kowal
|
||||
|
||||
AutoReq: no
|
||||
requires: awips2-java
|
||||
requires: awips2-collab-dataserver
|
||||
provides: awips2-%{_xmpp_server}
|
||||
|
||||
%description
|
||||
The AWIPS II XMPP Server - %{_xmpp_server}
|
||||
|
||||
%prep
|
||||
# Ensure that a valid build root has been supplied.
|
||||
if [ "${RPM_BUILD_ROOT}" = "/tmp" ] ||
|
||||
[ "${RPM_BUILD_ROOT}" = "" ]; then
|
||||
echo "An Actual BuildRoot Must Be Specified. Use The --buildroot Parameter."
|
||||
echo "Unable To Continue ... Terminating"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Ensure that the required "generic" scripts are available.
|
||||
xmpp_project="%{_baseline_workspace}/rpms/awips2.core/Installer.xmpp"
|
||||
dist_scripts="${xmpp_project}/dist/scripts"
|
||||
|
||||
# the "packaging" script.
|
||||
package_script="${dist_scripts}/package.sh"
|
||||
if [ ! -f ${package_script} ]; then
|
||||
echo "ERROR: The package script does not exist - ${package_script}."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# the configuration script.
|
||||
configuration_script="${dist_scripts}/configure.sh"
|
||||
if [ ! -f ${configuration_script} ]; then
|
||||
echo "ERROR: The configuration script does not exist - ${configuration_script}."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
%install
|
||||
xmpp_project="%{_baseline_workspace}/rpms/awips2.core/Installer.xmpp"
|
||||
dist_directory="${xmpp_project}/dist"
|
||||
dist_scripts="${dist_directory}/scripts"
|
||||
package_script="${dist_scripts}/package.sh"
|
||||
configuration_script="${dist_scripts}/configure.sh"
|
||||
filelist_txt="${dist_directory}/%{_xmpp_server}-files.txt"
|
||||
|
||||
# run the packaging script.
|
||||
/bin/bash ${package_script} "%{_baseline_workspace}" "${RPM_BUILD_ROOT}"
|
||||
if [ $? -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# copy the file list.
|
||||
cp -v ${filelist_txt} %{_topdir}/BUILD
|
||||
if [ $? -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# copy the configuration script.
|
||||
mkdir -p ${RPM_BUILD_ROOT}/awips2/%{_xmpp_server}/tmp
|
||||
if [ $? -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
cp ${configuration_script} \
|
||||
${RPM_BUILD_ROOT}/awips2/%{_xmpp_server}/tmp
|
||||
if [ $? -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
%pre
|
||||
|
||||
%post
|
||||
configuration_script=/awips2/%{_xmpp_server}/tmp/configure.sh
|
||||
|
||||
# run the configuration script.
|
||||
/bin/bash ${configuration_script}
|
||||
if [ $? -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# remove the configuration script.
|
||||
rm -rf /awips2/%{_xmpp_server}/tmp
|
||||
|
||||
%preun
|
||||
if [ "${1}" = "2" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Remove the openfire.sh link.
|
||||
pushd . > /dev/null 2>&1
|
||||
cd /awips2/openfire/bin
|
||||
if [ -L openfire.sh ]; then
|
||||
rm -f openfire.sh
|
||||
fi
|
||||
popd > /dev/null 2>&1
|
||||
|
||||
# Remove and unregister the openfired service.
|
||||
if [ -f /etc/init.d/openfired ]; then
|
||||
/sbin/chkconfig openfired off
|
||||
/sbin/chkconfig --del openfired
|
||||
|
||||
rm -f /etc/init.d/openfired
|
||||
fi
|
||||
|
||||
%postun
|
||||
|
||||
%clean
|
||||
rm -f %{_topdir}/BUILD/%{_xmpp_server}-files.txt
|
||||
rm -rf ${RPM_BUILD_ROOT}
|
||||
|
||||
%files -f %{_xmpp_server}-files.txt
|
||||
%defattr(644,awips,fxalpha,755)
|
||||
%dir /awips2
|
||||
|
||||
%defattr(755,root,root,755)
|
||||
/awips2/%{_xmpp_server}/tmp/configure.sh
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
%defattr(644,awips,fxalpha,755)
|
||||
%dir /awips2/openfire
|
||||
%dir /awips2/openfire/bin
|
||||
%dir /awips2/openfire/conf
|
||||
%docdir /awips2/openfire/documentation
|
||||
%dir /awips2/openfire/documentation
|
||||
%dir /awips2/openfire/lib
|
||||
%dir /awips2/openfire/logs
|
||||
%dir /awips2/openfire/plugins
|
||||
%dir /awips2/openfire/resources
|
||||
%dir /awips2/openfire/.install4j
|
||||
|
||||
# the bin directory
|
||||
%dir /awips2/openfire/bin/extra
|
||||
%dir /awips2/openfire/bin/extra/redhat
|
||||
/awips2/openfire/bin/openfirectl
|
||||
/awips2/openfire/bin/extra/embedded-db.rc
|
||||
/awips2/openfire/bin/extra/redhat/*
|
||||
|
||||
# the conf directory
|
||||
/awips2/openfire/conf/*
|
||||
|
||||
# the documentation directory
|
||||
/awips2/openfire/documentation/*
|
||||
|
||||
# the lib directory
|
||||
/awips2/openfire/lib/*
|
||||
|
||||
# the logs directory
|
||||
/awips2/openfire/logs/*
|
||||
|
||||
# the plugins directory
|
||||
/awips2/openfire/plugins/*
|
||||
|
||||
# the resources directory
|
||||
/awips2/openfire/resources/*
|
||||
|
||||
# the .install4j directory
|
||||
/awips2/openfire/.install4j/*
|
||||
|
||||
# loose files
|
||||
%doc /awips2/openfire/changelog.html
|
||||
%doc /awips2/openfire/LICENSE.html
|
||||
%doc /awips2/openfire/README.html
|
||||
|
||||
|
||||
# executable files
|
||||
%defattr(755,awips,fxalpha,755)
|
||||
/awips2/openfire/bin/openfire
|
||||
/awips2/openfire/bin/extra/embedded-db-viewer.sh
|
||||
/awips2/openfire/bin/extra/openfired
|
||||
/awips2/openfire/bin/extra/openfire-launchd-wrapper.sh
|
||||
/awips2/openfire/bin/extra/redhat-postinstall.sh
|
||||
|
|
@ -1,57 +0,0 @@
|
|||
diff -crB openfire-a/bin/extra/openfired openfire-b/bin/extra/openfired
|
||||
*** openfire-a/bin/extra/openfired 2011-10-01 16:51:23.000000000 -0500
|
||||
--- openfire-b/bin/extra/openfired 2012-04-16 12:15:57.000000000 -0500
|
||||
***************
|
||||
*** 25,35 ****
|
||||
|
||||
# Set this to tell this script where openfire lives
|
||||
# If this is not set the script will look for /opt/openfire, then /usr/local/openfire
|
||||
! #export OPENFIRE_HOME=
|
||||
|
||||
# If there is a different user you would like to run this script as,
|
||||
# change the following line
|
||||
! export OPENFIRE_USER=jive
|
||||
|
||||
# -----------------------------------------------------------------
|
||||
|
||||
--- 25,38 ----
|
||||
|
||||
# Set this to tell this script where openfire lives
|
||||
# If this is not set the script will look for /opt/openfire, then /usr/local/openfire
|
||||
! export OPENFIRE_HOME=/awips2/openfire
|
||||
|
||||
# If there is a different user you would like to run this script as,
|
||||
# change the following line
|
||||
! export OPENFIRE_USER=awips
|
||||
!
|
||||
! # The location of the awips2-java jdk / jre.
|
||||
! export app_java_home=/awips2/java
|
||||
|
||||
# -----------------------------------------------------------------
|
||||
|
||||
diff -crB openfire-a/bin/extra/redhat-postinstall.sh openfire-b/bin/extra/redhat-postinstall.sh
|
||||
*** openfire-a/bin/extra/redhat-postinstall.sh 2011-10-01 16:51:23.000000000 -0500
|
||||
--- openfire-b/bin/extra/redhat-postinstall.sh 2012-04-16 12:11:52.000000000 -0500
|
||||
***************
|
||||
*** 10,19 ****
|
||||
|
||||
# If you used an non standard directory name of location
|
||||
# Please specify it here
|
||||
! # OPENFIRE_HOME=
|
||||
|
||||
! OPENFIRE_USER="jive"
|
||||
! OPENFIRE_GROUP="jive"
|
||||
|
||||
if [ ! $OPENFIRE_HOME ]; then
|
||||
if [ -d "/opt/openfire" ]; then
|
||||
--- 10,19 ----
|
||||
|
||||
# If you used an non standard directory name of location
|
||||
# Please specify it here
|
||||
! OPENFIRE_HOME=/awips2/openfire
|
||||
|
||||
! OPENFIRE_USER="awips"
|
||||
! OPENFIRE_GROUP="fxalpha"
|
||||
|
||||
if [ ! $OPENFIRE_HOME ]; then
|
||||
if [ -d "/opt/openfire" ]; then
|
||||
|
|
@ -1,71 +0,0 @@
|
|||
diff -crB openfire-a/lib/log4j.xml openfire-b/lib/log4j.xml
|
||||
*** openfire-a/lib/log4j.xml 2014-02-06 15:39:44.000000000 -0500
|
||||
--- openfire-b/lib/log4j.xml 2014-02-07 10:48:34.000000000 -0500
|
||||
***************
|
||||
*** 3,9 ****
|
||||
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
|
||||
|
||||
<appender name="debug-out" class="org.apache.log4j.RollingFileAppender">
|
||||
! <param name="File" value="${openfireHome}/logs/debug.log" />
|
||||
<param name="MaxFileSize" value="1024KB"/>
|
||||
<param name="MaxBackupIndex" value="5"/>
|
||||
<layout class="org.apache.log4j.PatternLayout">
|
||||
--- 3,9 ----
|
||||
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
|
||||
|
||||
<appender name="debug-out" class="org.apache.log4j.RollingFileAppender">
|
||||
! <param name="File" value="/awips2/openfire/logs/debug.log" />
|
||||
<param name="MaxFileSize" value="1024KB"/>
|
||||
<param name="MaxBackupIndex" value="5"/>
|
||||
<layout class="org.apache.log4j.PatternLayout">
|
||||
***************
|
||||
*** 16,22 ****
|
||||
</appender>
|
||||
|
||||
<appender name="info-out" class="org.apache.log4j.RollingFileAppender">
|
||||
! <param name="File" value="${openfireHome}/logs/info.log" />
|
||||
<param name="MaxFileSize" value="1024KB"/>
|
||||
<param name="MaxBackupIndex" value="5"/>
|
||||
<layout class="org.apache.log4j.PatternLayout">
|
||||
--- 16,22 ----
|
||||
</appender>
|
||||
|
||||
<appender name="info-out" class="org.apache.log4j.RollingFileAppender">
|
||||
! <param name="File" value="/awips2/openfire/logs/info.log" />
|
||||
<param name="MaxFileSize" value="1024KB"/>
|
||||
<param name="MaxBackupIndex" value="5"/>
|
||||
<layout class="org.apache.log4j.PatternLayout">
|
||||
***************
|
||||
*** 30,36 ****
|
||||
</appender>
|
||||
|
||||
<appender name="warn-out" class="org.apache.log4j.RollingFileAppender">
|
||||
! <param name="File" value="${openfireHome}/logs/warn.log" />
|
||||
<param name="MaxFileSize" value="1024KB"/>
|
||||
<param name="MaxBackupIndex" value="5"/>
|
||||
<layout class="org.apache.log4j.PatternLayout">
|
||||
--- 30,36 ----
|
||||
</appender>
|
||||
|
||||
<appender name="warn-out" class="org.apache.log4j.RollingFileAppender">
|
||||
! <param name="File" value="/awips2/openfire/logs/warn.log" />
|
||||
<param name="MaxFileSize" value="1024KB"/>
|
||||
<param name="MaxBackupIndex" value="5"/>
|
||||
<layout class="org.apache.log4j.PatternLayout">
|
||||
***************
|
||||
*** 44,50 ****
|
||||
</appender>
|
||||
|
||||
<appender name="error-out" class="org.apache.log4j.RollingFileAppender">
|
||||
! <param name="File" value="${openfireHome}/logs/error.log" />
|
||||
<param name="MaxFileSize" value="1024KB"/>
|
||||
<param name="MaxBackupIndex" value="5"/>
|
||||
<layout class="org.apache.log4j.PatternLayout">
|
||||
--- 44,50 ----
|
||||
</appender>
|
||||
|
||||
<appender name="error-out" class="org.apache.log4j.RollingFileAppender">
|
||||
! <param name="File" value="/awips2/openfire/logs/error.log" />
|
||||
<param name="MaxFileSize" value="1024KB"/>
|
||||
<param name="MaxBackupIndex" value="5"/>
|
||||
<layout class="org.apache.log4j.PatternLayout">
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,32 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# configure.sh - this script will configure the openfire instance that has
|
||||
# been installed.
|
||||
|
||||
# Expected Arguments:
|
||||
# NONE
|
||||
|
||||
pushd . > /dev/null 2>&1
|
||||
|
||||
# run the redhat-postinstall.sh script.
|
||||
cd /awips2/openfire/bin/extra
|
||||
/bin/bash redhat-postinstall.sh > /dev/null 2>&1
|
||||
if [ $? -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# create a link to the openfire script.
|
||||
cd /awips2/openfire/bin
|
||||
if [ -L openfire.sh ]; then
|
||||
rm -f openfire.sh
|
||||
if [ $? -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
ln -s openfire openfire.sh
|
||||
if [ $? -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
exit 0
|
||||
|
||||
popd > /dev/null 2>&1
|
||||
|
|
@ -1,72 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# package.sh - this script will unpack (untar) the openfire binaries,
|
||||
# apply any required patches to the configuration, and
|
||||
# prepare openfire for packaging in the rpm.
|
||||
|
||||
# Expected Arguments:
|
||||
# ${1} == the baseline workspace
|
||||
# ${2} == the 'RPM_BUILD_ROOT'
|
||||
|
||||
baseline_workspace="${1}"
|
||||
RPM_BUILD_ROOT="${2}"
|
||||
|
||||
AWIPS2_STATIC=${AWIPSCM_SHARE}/awips2-static
|
||||
|
||||
srcdir="${baseline_workspace}/rpms/awips2.core/Installer.xmpp/dist"
|
||||
source_tar="${AWIPS2_STATIC}/foss/openfire/openfire_3_9_1.tar.gz"
|
||||
patch_file0="${srcdir}/openfire.patch0"
|
||||
patch_file1="${srcdir}/openfire.patch1"
|
||||
plugin_dir="${srcdir}/plugins"
|
||||
|
||||
# Prepare the installation directory.
|
||||
if [ -d ${RPM_BUILD_ROOT} ]; then
|
||||
rm -rf ${RPM_BUILD_ROOT}
|
||||
if [ $? -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
mkdir -p ${RPM_BUILD_ROOT}/awips2
|
||||
if [ $? -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Unpack the source.
|
||||
tar -xf ${source_tar} \
|
||||
-C ${RPM_BUILD_ROOT}/awips2
|
||||
if [ $? -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Apply the patch.
|
||||
pushd .
|
||||
cd ${RPM_BUILD_ROOT}/awips2/openfire
|
||||
patch -p1 -i ${patch_file0}
|
||||
if [ $? -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
patch -p1 -i ${patch_file1}
|
||||
if [ $? -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
popd
|
||||
|
||||
# Build and include any openfire plugins.
|
||||
cd ${baseline_workspace}/build.openfire.plugin
|
||||
if [ $? -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
/awips2/ant/bin/ant -f build.xml \
|
||||
-Ddestination.directory=${RPM_BUILD_ROOT}/awips2/openfire/plugins
|
||||
if [ $? -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
# Include the non-Raytheon openfire plugins
|
||||
cp -v ${plugin_dir}/*.jar \
|
||||
${RPM_BUILD_ROOT}/awips2/openfire/plugins
|
||||
if [ $? -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
exit 0
|
||||
|
|
@ -267,14 +267,6 @@ function lookupRPM()
|
|||
export RPM_SPECIFICATION="${awips2_ade_dir}/Installer.eclipse"
|
||||
return 0
|
||||
fi
|
||||
if [ "${1}" = "awips2-openfire" ]; then
|
||||
export RPM_SPECIFICATION="${awips2_core_dir}/Installer.xmpp"
|
||||
return 0
|
||||
fi
|
||||
if [ "${1}" = "awips2-collab-dataserver" ]; then
|
||||
export RPM_SPECIFICATION="${awips2_core_dir}/Installer.collab-dataserver"
|
||||
return 0
|
||||
fi
|
||||
if [ "${1}" = "awips2-yajsw" ]; then
|
||||
export RPM_SPECIFICATION="${installer_dir}/yajsw-11.11"
|
||||
return 0
|
||||
|
|
|
|||
|
|
@ -1,34 +1,5 @@
|
|||
#!/bin/bash
|
||||
|
||||
function buildOpenfire()
|
||||
{
|
||||
lookupRPM "awips2-openfire"
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "ERROR: '${1}' is not a recognized AWIPS II RPM."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
/usr/bin/rpmbuild -ba --target=i386 \
|
||||
--define '_topdir %(echo ${AWIPSII_TOP_DIR})' \
|
||||
--define '_baseline_workspace %(echo ${WORKSPACE})' \
|
||||
--define '_uframe_eclipse %(echo ${UFRAME_ECLIPSE})' \
|
||||
--define '_awipscm_share %(echo ${AWIPSCM_SHARE})' \
|
||||
--define '_build_root %(echo ${AWIPSII_BUILD_ROOT})' \
|
||||
--define '_component_version %(echo ${AWIPSII_VERSION})' \
|
||||
--define '_component_release %(echo ${AWIPSII_RELEASE})' \
|
||||
--define '_component_build_date %(echo ${COMPONENT_BUILD_DATE})' \
|
||||
--define '_component_build_time %(echo ${COMPONENT_BUILD_TIME})' \
|
||||
--define '_component_build_system %(echo ${COMPONENT_BUILD_SYSTEM})' \
|
||||
--buildroot ${AWIPSII_BUILD_ROOT} \
|
||||
${RPM_SPECIFICATION}/component.spec
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "ERROR: Failed to build RPM ${1}."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
function buildJava()
|
||||
{
|
||||
pushd . > /dev/null 2>&1
|
||||
|
|
|
|||
|
|
@ -39,6 +39,6 @@ function WA_rpm_build()
|
|||
buildRPMExec "${RPM_SPECIFICATION}"
|
||||
done
|
||||
|
||||
return 0
|
||||
done
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ fi
|
|||
|
||||
if [ "${1}" = "-buildRPM" -a -n "${2}" ]; then
|
||||
echo "Building RPM: ${2}"
|
||||
# also allow buildJava, buildOpenfire... buildRPM args
|
||||
# also allow buildJava, buildRPM args
|
||||
buildName=`echo ${2} | cut -c1-5`
|
||||
if [ ${#2} -gt 5 -a "$buildName" = "build" ]; then
|
||||
${2}
|
||||
|
|
@ -201,7 +201,6 @@ if [ "${1}" = "-rh6" ]; then
|
|||
exit 1
|
||||
fi
|
||||
buildRPM "awips2-httpd-pypies"
|
||||
buildRPM "awips2-collab-dataserver"
|
||||
buildQPID
|
||||
if [ $? -ne 0 ]; then
|
||||
exit 1
|
||||
|
|
@ -235,8 +234,6 @@ if [ "${1}" = "-rh6" ]; then
|
|||
buildRPM "awips2-data.hdf5-topo"
|
||||
buildRPM "awips2"
|
||||
buildRPM "awips2-yajsw"
|
||||
buildOpenfire
|
||||
|
||||
exit 0
|
||||
fi
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue