[embjopr-commits] EMBJOPR SVN: r898 - branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/testdata.

[embjopr-commits at lists.jboss.org]

Author: ozizka at redhat.com
Date: 2010-03-29 13:02:09 -0400 (Mon, 29 Mar 2010)
New Revision: 898

Modified:
   branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/testdata/hudson_shell_script.sh
Log:
* hudson script: unzip -n (never overwrite)

Modified: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/testdata/hudson_shell_script.sh
===================================================================
--- branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/testdata/hudson_shell_script.sh	2010-03-29 13:52:55 UTC (rev 897)
+++ branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/testdata/hudson_shell_script.sh	2010-03-29 17:02:09 UTC (rev 898)
@@ -1,4 +1,17 @@
+##
+##  Input params:
+##
+##  PROVIDE_WAR:  Automatically try to prepare the WAR from JBOSS_HOME/server/default/admin-console.war.
+##  PROVIDED_WAR: Use the specified war instead of the built one.
+##                If one of these two is specified, RHQ is not built.
+##
+##  RHQ_REV       RHQ revision to build. GIT hash.
+##
 
+
+
+
+
 ##  OS-specific settings
 
 # --binary is used for Windows, which interpret \n as \r\n. Solaris 10 complains about it.
@@ -8,6 +21,7 @@
 
 
 
+
 ###  Clean embjopr dir
 echo `pwd`
 rm -rf embjopr/target
@@ -53,7 +67,7 @@
       EAP_ZIP_PATH=eap5.zip
     fi
     rm -rf jboss-eap-5.0
-    unzip $EAP_ZIP_PATH
+    unzip -n $EAP_ZIP_PATH
 
     ###  Set JBoss AS home dir
     export JBOSS_HOME=$WORKSPACE/jboss-eap-5.0/jboss-as
@@ -63,6 +77,26 @@
 echo "JBOSS_HOME: $JBOSS_HOME"
 
 
+
+
+
+if [ -n "$PROVIDE_WAR" ] ; then
+	echo "Zipping the AS console war from '$JBOSS_HOME/server/all/admin-console.war' to $WORKSPACE/admin-console-DIST.war."
+	cd $JBOSS_HOME/server/all/admin-console.war
+	zip $WORKSPACE/admin-console-DIST.war *
+	PROVIDED_WAR=$WORKSPACE/admin-console-DIST.war
+fi
+
+if [ -n "$PROVIDED_WAR" ] ; then
+	echo "Provided WAR: $PROVIDED_WAR"
+	if [ ! -f "$PROVIDED_WAR" ] ; then echo "Provided WAR file does not exist: '$PROVIDED_WAR'"; exit -2; fi
+	PROVIDED_WAR=-Das.dist.war=$PROVIDED_WAR
+fi
+
+
+
+
+
 cd $WORKSPACE
 
 #  Remove bundled AS console
@@ -105,6 +139,7 @@
   ##  Dump settings - with explicitely set settings file
   #mvn $M2_SETTINGS -Pjboss5x help:effective-settings
 
+  echo "Building EmbJopr..."
   mvn install -Dmaven.test.skip=true --update-snapshots
 
 
@@ -113,19 +148,7 @@
     rm pom.xml
     svn up
 
-    if [ -n "$PROVIDE_WAR" ] ; then
-       echo "Zipping the AS console war from '$JBOSS_HOME/server/all/admin-console.war' to $WORKSPACE/admin-console-DIST.war."
-       cd $JBOSS_HOME/server/all/admin-console.war
-       zip $WORKSPACE/admin-console-DIST.war *
-       PROVIDED_WAR=$WORKSPACE/admin-console-DIST.war
-    fi
 
-    if [ -n "$PROVIDED_WAR" ] ; then
-       echo "Provided WAR: $PROVIDED_WAR"
-       if [ ! -f "$PROVIDED_WAR" ] ; then echo "Provided WAR file does not exist: '$PROVIDED_WAR'"; exit -2; fi
-       PROVIDED_WAR=-Das.dist.war=$PROVIDED_WAR
-    fi
-
     if [ -n "$NO_GC_LIMIT" ] ; then ADD_PROFILES=",no_GC_limit"; fi
 
     echo "Launching tests; binding JBoss AS to MYTESTIP_1 == $MYTESTIP_1"