Skip to content
Browse files

Test Fixes

  • Loading branch information...
1 parent 2badf9b commit 326c2e0f8a52b77c7dbfa541d01a05eebf37c120 @michaelhashimoto michaelhashimoto committed with Nov 17, 2011
Showing with 21 additions and 5 deletions.
  1. +3 −3 build-test-jetty.xml
  2. +18 −2 build.xml
View
6 build-test-jetty.xml
@@ -36,8 +36,8 @@
</if>
<replace file="${app.server.jetty.bin.dir}/run.bat">
- <replacetoken>set "JAVA_OPTS=-Djetty.version=7.5.1 -Djetty.version.date=20110908 -Dfile.encoding=UTF8 -Djava.io.tmpdir=../temp -Djava.net.preferIPv4Stack=true -Duser.timezone=GMT -Xmx1024m -XX:MaxPermSize=256m"</replacetoken>
- <replacevalue expandProperties="true">set "JAVA_OPTS=-Djetty.version=7.5.1 -Djetty.version.date=20110908 -Dfile.encoding=UTF8 -Djava.io.tmpdir=../temp -Djava.net.preferIPv4Stack=true -Duser.timezone=GMT -Xmx1024m -XX:MaxPermSize=256m -DSTOP.PORT=8079 -DSTOP.KEY=secret"</replacevalue>
+ <replacetoken>set "JAVA_OPTS=-D</replacetoken>
+ <replacevalue>set "JAVA_OPTS=-DSTOP.PORT=8079 -DSTOP.KEY=secret -D</replacevalue>
</replace>
<copy
@@ -47,7 +47,7 @@
<replace file="${app.server.jetty.bin.dir}/shutdown.bat">
<replacetoken>"%JAVA_HOME%/bin/java" %JAVA_OPTS% -jar ../start.jar</replacetoken>
- <replacevalue expandProperties="true">"%JAVA_HOME%/bin/java" %JAVA_OPTS% -jar ../start.jar --stop</replacevalue>
+ <replacevalue>"%JAVA_HOME%/bin/java" %JAVA_OPTS% -jar ../start.jar --stop</replacevalue>
</replace>
<antcall target="revert-test-properties" />
View
20 build.xml
@@ -413,8 +413,16 @@ JAVA_OPTS="$JAVA_OPTS -Dfile.encoding=UTF-8 -Djava.net.preferIPv4Stack=true -Dus
<replace file="${app.server.jetty.bin.dir}/run.bat">
<replacetoken>set "JAVA_OPTS=-D</replacetoken>
- <replacevalue expandProperties="true">set "JAVA_OPTS=-Djetty.version=${app.server.jetty.version} -Djetty.version.date=${app.server.jetty.version.date} -D</replacevalue>
+ <replacevalue>set "JAVA_OPTS=-Djetty.version=${app.server.jetty.version} -Djetty.version.date=${app.server.jetty.version.date} -D</replacevalue>
</replace>
+
+ <loadfile property="run.bat.content" srcfile="${app.server.jetty.bin.dir}/run.bat">
+ <filterchain>
+ <expandproperties />
+ </filterchain>
+ </loadfile>
+
+ <echo file="${app.server.jetty.bin.dir}/run.bat">${run.bat.content}</echo>
</then>
</if>
@@ -435,8 +443,16 @@ JAVA_OPTS="$JAVA_OPTS -Dfile.encoding=UTF-8 -Djava.net.preferIPv4Stack=true -Dus
<replace file="${app.server.jetty.bin.dir}/run.sh">
<replacetoken>export JAVA_OPTS="-D</replacetoken>
- <replacevalue expandProperties="true">export JAVA_OPTS="-Djetty.version=${app.server.jetty.version} -Djetty.version.date=${app.server.jetty.version.date} -D</replacevalue>
+ <replacevalue>export JAVA_OPTS="-Djetty.version=${app.server.jetty.version} -Djetty.version.date=${app.server.jetty.version.date} -D</replacevalue>
</replace>
+
+ <loadfile property="run.sh.content" srcfile="${app.server.jetty.bin.dir}/run.sh">
+ <filterchain>
+ <expandproperties />
+ </filterchain>
+ </loadfile>
+
+ <echo file="${app.server.jetty.bin.dir}/run.sh">${run.sh.content}</echo>
</then>
</if>

0 comments on commit 326c2e0

Please sign in to comment.
Something went wrong with that request. Please try again.