[jboss-cvs] JBossAS SVN: r110811 - in branches/JBPAPP_5_1: console/src/bin and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Mar 1 17:35:52 EST 2011


Author: rachmatowicz at jboss.com
Date: 2011-03-01 17:35:51 -0500 (Tue, 01 Mar 2011)
New Revision: 110811

Modified:
   branches/JBPAPP_5_1/build/build-distr.xml
   branches/JBPAPP_5_1/console/src/bin/twiddle.bat
   branches/JBPAPP_5_1/console/src/bin/twiddle.sh
   branches/JBPAPP_5_1/main/src/bin/probe.bat
   branches/JBPAPP_5_1/main/src/bin/probe.sh
   branches/JBPAPP_5_1/main/src/bin/run.bat
   branches/JBPAPP_5_1/main/src/bin/run.sh
   branches/JBPAPP_5_1/server/src/bin/shutdown.bat
   branches/JBPAPP_5_1/server/src/bin/shutdown.sh
Log:
Force use of IPv4 stack in command-line scripts (JBPAPP-2868)

Modified: branches/JBPAPP_5_1/build/build-distr.xml
===================================================================
--- branches/JBPAPP_5_1/build/build-distr.xml	2011-03-01 21:14:44 UTC (rev 110810)
+++ branches/JBPAPP_5_1/build/build-distr.xml	2011-03-01 22:35:51 UTC (rev 110811)
@@ -1758,8 +1758,32 @@
         <include name="wstools.sh"/>
       </fileset>
     </copy>
-  </target>
+	
+	<!-- add a -Djava.net.preferIPv4Stack=true to JAVA_OPTS -->
+    <replace dir="${install.bin}" token="JAVA_OPTS=&quot;$JAVA_OPTS&quot;">
+      <include name="wsconsume.sh"/>
+      <include name="wsprovide.sh"/>
+      <include name="wsrunclient.sh"/>
+      <include name="wstools.sh"/>
+    <replacevalue><![CDATA[# Force use of IPv4 stack
+JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true"]]> </replacevalue>
+    </replace>
 
+	<!-- add a -Djava.net.preferIPv4Stack=true to JAVA_OPTS -->
+    <replace dir="${install.bin}" token="rem Execute the command">
+      <include name="wsconsume.bat"/>
+      <include name="wsprovide.bat"/>
+      <include name="wsrunclient.bat"/>
+      <include name="wstools.bat"/>
+      <replacevalue><![CDATA[rem Force use of IPv4 stack
+JAVA_OPTS=%JAVA_OPTS% -Djava.net.preferIPv4Stack=true
+
+rem Execute the command]]> </replacevalue>
+	</replace>
+
+
+</target>
+
   <target name="install-jbossws-to-client">
     <!-- Install JBossWS jars to client directory -->
     <copy todir="${install.client}" flatten="true" overwrite="true">

Modified: branches/JBPAPP_5_1/console/src/bin/twiddle.bat
===================================================================
--- branches/JBPAPP_5_1/console/src/bin/twiddle.bat	2011-03-01 21:14:44 UTC (rev 110810)
+++ branches/JBPAPP_5_1/console/src/bin/twiddle.bat	2011-03-01 22:35:51 UTC (rev 110811)
@@ -52,6 +52,9 @@
 
 set JBOSS_CLASSPATH=%JBOSS_CLASSPATH%;%MAIN_JAR%
 
+REM Force use of IPv4 stack
+set JAVA_OPTS=%JAVA_OPTS% -Djava.net.preferIPv4Stack=true
+
 rem Setup JBoss sepecific properties
 set JBOSS_HOME=%DIRNAME%\..
 set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed

Modified: branches/JBPAPP_5_1/console/src/bin/twiddle.sh
===================================================================
--- branches/JBPAPP_5_1/console/src/bin/twiddle.sh	2011-03-01 21:14:44 UTC (rev 110810)
+++ branches/JBPAPP_5_1/console/src/bin/twiddle.sh	2011-03-01 22:35:51 UTC (rev 110811)
@@ -27,6 +27,9 @@
         ;;
 esac
 
+# Force use of IPv4 stack
+JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true"
+
 # For Cygwin, ensure paths are in UNIX format before anything is touched
 if $cygwin ; then
     [ -n "$JBOSS_HOME" ] &&

Modified: branches/JBPAPP_5_1/main/src/bin/probe.bat
===================================================================
--- branches/JBPAPP_5_1/main/src/bin/probe.bat	2011-03-01 21:14:44 UTC (rev 110810)
+++ branches/JBPAPP_5_1/main/src/bin/probe.bat	2011-03-01 22:35:51 UTC (rev 110811)
@@ -7,7 +7,9 @@
 REM Probe [-help] [-addr <addr>] [-port <port>] [-ttl <ttl>] [-timeout <timeout>]
 
 set CLASSPATH=..\lib\commons-logging.jar;..\server\all\lib\jgroups.jar
-
 set CP=%CLASSPATH%
 
-java -cp %CP% org.jgroups.tests.Probe %*
+REM Force use of IPv4 stack
+set JAVA_OPTS=%JAVA_OPTS% -Djava.net.preferIPv4Stack=true
+
+java %JAVA_OPTS% -cp %CP% org.jgroups.tests.Probe %*

Modified: branches/JBPAPP_5_1/main/src/bin/probe.sh
===================================================================
--- branches/JBPAPP_5_1/main/src/bin/probe.sh	2011-03-01 21:14:44 UTC (rev 110810)
+++ branches/JBPAPP_5_1/main/src/bin/probe.sh	2011-03-01 22:35:51 UTC (rev 110811)
@@ -18,10 +18,13 @@
         ;;
 esac
 
+# Force use of IPv4 stack
+JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true"
+
 if [ $cygwin = "true" ]; then
    CP=`cygpath -wp $CLASSPATH`
 else
    CP=$CLASSPATH
 fi
 
-java -cp $CP org.jgroups.tests.Probe $*
+java $JAVA_OPTS -cp $CP org.jgroups.tests.Probe $*

Modified: branches/JBPAPP_5_1/main/src/bin/run.bat
===================================================================
--- branches/JBPAPP_5_1/main/src/bin/run.bat	2011-03-01 21:14:44 UTC (rev 110810)
+++ branches/JBPAPP_5_1/main/src/bin/run.bat	2011-03-01 22:35:51 UTC (rev 110811)
@@ -39,6 +39,9 @@
   set "PROGNAME=run.bat"
 )
 
+REM Force use of IPv4 stack
+set JAVA_OPTS=%JAVA_OPTS% -Djava.net.preferIPv4Stack=true
+
 rem Setup JBoss specific properties
 set JAVA_OPTS=%JAVA_OPTS% -Dprogram.name=%PROGNAME%
 

Modified: branches/JBPAPP_5_1/main/src/bin/run.sh
===================================================================
--- branches/JBPAPP_5_1/main/src/bin/run.sh	2011-03-01 21:14:44 UTC (rev 110810)
+++ branches/JBPAPP_5_1/main/src/bin/run.sh	2011-03-01 22:35:51 UTC (rev 110811)
@@ -90,10 +90,8 @@
     . "$RUN_CONF"
 fi
 
-# Force IPv4 on Linux systems since IPv6 doesn't work correctly with jdk5 and lower
-if [ "$linux" = "true" ]; then
-   JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true"
-fi
+# Force use of IPv4 stack
+JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true"
 
 # For Cygwin, ensure paths are in UNIX format before anything is touched
 if $cygwin ; then

Modified: branches/JBPAPP_5_1/server/src/bin/shutdown.bat
===================================================================
--- branches/JBPAPP_5_1/server/src/bin/shutdown.bat	2011-03-01 21:14:44 UTC (rev 110810)
+++ branches/JBPAPP_5_1/server/src/bin/shutdown.bat	2011-03-01 22:35:51 UTC (rev 110811)
@@ -42,6 +42,9 @@
 
 set JBOSS_CLASSPATH=%JBOSS_CLASSPATH%;%MAIN_JAR%;%DIRNAME%/../client/jbossall-client.jar
 
+REM Force use of IPv4 stack
+set JAVA_OPTS=%JAVA_OPTS% -Djava.net.preferIPv4Stack=true
+
 rem Setup JBoss sepecific properties
 set JAVA_OPTS=%JAVA_OPTS% -Djboss.boot.loader.name=%PROGNAME%
 

Modified: branches/JBPAPP_5_1/server/src/bin/shutdown.sh
===================================================================
--- branches/JBPAPP_5_1/server/src/bin/shutdown.sh	2011-03-01 21:14:44 UTC (rev 110810)
+++ branches/JBPAPP_5_1/server/src/bin/shutdown.sh	2011-03-01 22:35:51 UTC (rev 110811)
@@ -27,6 +27,9 @@
         ;;
 esac
 
+# Force use of IPv4 stack
+JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true"
+
 # For Cygwin, ensure paths are in UNIX format before anything is touched
 if $cygwin ; then
     [ -n "$JBOSS_HOME" ] &&



More information about the jboss-cvs-commits mailing list