xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #2702 Removed openfire 3.7.1 tar. Fixed openfire patch to work with openfire 3.9.1. Updated package.sh to use openfire tar from awips2-static directory. Added a -buildRPM target to build.sh to build a specific RPM." into development

Browse source 
Former-commit-id: 1b11e23257 [formerly 1b11e23257 [formerly 8d4e32df3a8374e571a3a9d3994e45ea825c418f]]
Former-commit-id: a1bf3e9874
Former-commit-id: 2e21069300
This commit is contained in:
Nate Jensen 2014-03-11 12:35:53 -05:00 • committed by Gerrit Code Review
commit 8e0947136f
4 changed files with 14 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
rpms/awips2.core/Installer.xmpp/dist/openfire.patch1 vendored
View file

@ -1,26 +1,6 @@
diff -crB openfire-a/bin/openfire openfire-b/bin/openfire
*** openfire-a/bin/openfire 2011-10-01 16:52:44.000000000 -0500
--- openfire-b/bin/openfire 2012-05-17 10:54:53.000000000 -0500
***************
*** 259,265 ****
start)
echo "Starting openfire"
! nohup "$app_java_home/bin/java" -server -Dinstall4j.jvmDir="$app_java_home" -Dexe4j.moduleName="$prg_dir/$progname" $INSTALL4J_ADD_VM_PARAMS -classpath "$local_classpath" com.install4j.runtime.Launcher start org.jivesoftware.openfire.starter.ServerStarter false false "$prg_dir/../logs/stderror.log" "$prg_dir/../logs/stdoutt.log" true true false "" true true 0 0 "" 20 20 "Arial" "0,0,0" 8 500 "version 3.7.1" 20 40 "Arial" "0,0,0" 8 500 -1 -DopenfireHome="$prg_dir/../" -Dopenfire.lib.dir="$app_home/lib" &
;;
--- 259,265 ----
start)
echo "Starting openfire"
! nohup "$app_java_home/bin/java" -server -Dinstall4j.jvmDir="$app_java_home" -Dexe4j.moduleName="$prg_dir/$progname" $INSTALL4J_ADD_VM_PARAMS -classpath "$local_classpath" com.install4j.runtime.Launcher start org.jivesoftware.openfire.starter.ServerStarter false false "$prg_dir/../logs/stderror.log" "$prg_dir/../logs/stdoutt.log" true true false "" true true 0 0 "" 20 20 "Arial" "0,0,0" 8 500 "version 3.7.1" 20 40 "Arial" "0,0,0" 8 500 -1 -DopenfireHome="$prg_dir/../" -Dopenfire.lib.dir="$app_home/lib" > /dev/null 2>&1 &
;;
diff -crB openfire-a/lib/log4j.xml openfire-b/lib/log4j.xml
*** openfire-a/lib/log4j.xml 2011-10-01 16:51:23.000000000 -0500
--- openfire-b/lib/log4j.xml 2012-05-17 10:48:34.000000000 -0500
*** 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/">

BIN
rpms/awips2.core/Installer.xmpp/dist/openfire_3_7_1.tar.gz vendored
View file

Binary file not shown.

4
rpms/awips2.core/Installer.xmpp/dist/scripts/package.sh vendored
View file

@ -11,8 +11,10 @@
baseline_workspace="${1}"
RPM_BUILD_ROOT="${2}"
AWIPS2_STATIC=${AWIPSCM_SHARE}/awips2-static
srcdir="${baseline_workspace}/rpms/awips2.core/Installer.xmpp/dist"
source_tar="${srcdir}/openfire_3_7_1.tar.gz"
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"

9
rpms/build/x86_64/build.sh
View file

@ -84,6 +84,15 @@ if [ "${2}" = "-nobinlightning" ]; then
LIGHTNING=false
fi
if [ "${1}" = "-buildRPM" -a -n "${2}" ]; then
echo "Building RPM: ${2}"
buildRPM ${2}
if [ $? -ne 0 ]; then
exit 1
fi
exit 0
fi
if [ "${1}" = "-64bit" ]; then
buildCAVE
if [ $? -ne 0 ]; then