Author: fhanik
Date: Wed Jul 11 22:01:17 2012
New Revision: 1360433
URL: http://svn.apache.org/viewvc?rev=1360433&view=rev
Log:
Add IPv4Stack flag one can control from build.properties and
build.properties.default
default value is false but can be overridden even from command line
default compile source/target is 1.7, but has to be changed in
build.properties.default to take into effect
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1360433&r1=1360432&r2=1360433&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Wed Jul 11 22:01:17 2012
@@ -203,3 +203,5 @@ dojo-js.home=${base.path}/dojo-release-1
dojo-js.loc=http://download.dojotoolkit.org/release-1.1.1/dojo-release-1.1.1.tar.gz
dojo-js.jar=${dojo-js.home}/dojo/dojo.js
+# ----- JVM settings for unit tests
+java.net.preferIPv4Stack=false
\ No newline at end of file
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1360433&r1=1360432&r2=1360433&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Jul 11 22:01:17 2012
@@ -74,9 +74,9 @@
<!-- build output directory for jdbc-pool -->
<property name="tomcat.pool" value="${tomcat.output}/jdbc-pool"/>
- <!-- Servlet 3.0 spec requires 1.6+ -->
- <property name="compile.source" value="1.6"/>
- <property name="compile.target" value="1.6"/>
+ <!-- Servlet 3.1 spec requires 1.7+ - these get overriden by
build.properties(.default)-->
+ <property name="compile.source" value="1.7"/>
+ <property name="compile.target" value="1.7"/>
<!-- Locations to create the JAR artifacts -->
<!-- Standard JARs -->
@@ -1197,6 +1197,8 @@
<jvmarg value="${test.jvmarg.egd}"/>
<jvmarg value="-Djava.library.path=${test.apr.loc}"/>
<jvmarg value="${test.formatter}"/>
+ <jvmarg
value="-Djava.net.preferIPv4Stack=${java.net.preferIPv4Stack}"/>
+ <jvmarg
value="-Dorg.apache.tomcat.util.net.NioSelectorShared=${org.apache.tomcat.util.net.NioSelectorShared}"/>
<classpath refid="tomcat.test.classpath" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
