forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject svn commit: rev 46298 - in forrest/trunk: . src/core src/core/targets
Date Sat, 18 Sep 2004 16:43:13 GMT
Author: brondsem
Date: Sat Sep 18 09:43:12 2004
New Revision: 46298

Modified:
   forrest/trunk/src/core/forrest.build.xml
   forrest/trunk/src/core/targets/context.xml
   forrest/trunk/src/core/targets/site.xml
   forrest/trunk/status.xml
Log:
fix FOR-267; Allow forrest to run in a project directory with a space in the name.  the problem
was that ${forrest.basic.jvmargs} had multiple arguments in it so we had to use line= instead
of value= so quotes weren't handled properly.  the <syspropertyset> I added earlier
contains all the arguments that ${forrest.basic.jvmargs} had so it was ok to just remove it.

Modified: forrest/trunk/src/core/forrest.build.xml
==============================================================================
--- forrest/trunk/src/core/forrest.build.xml	(original)
+++ forrest/trunk/src/core/forrest.build.xml	Sat Sep 18 09:43:12 2004
@@ -136,10 +136,6 @@
     <filter token="forrest.home" value="${forrest.home}"/>
     <filter token="project.home" value="${project.home}"/>
 
-    <!-- These are used by Forrest to resolve all other values -->
-    <property name="forrest.basic.jvmargs" value="-Dproject.home=&quot;${project.home}&quot;
-Dforrest.home=&quot;${forrest.home}&quot;"/>
-    <echo>forrest.basic.jvmargs:${forrest.basic.jvmargs}</echo>
-
     <!-- 
     Skin aliasing for backwards compatability
         0.5 => 0.6

Modified: forrest/trunk/src/core/targets/context.xml
==============================================================================
--- forrest/trunk/src/core/targets/context.xml	(original)
+++ forrest/trunk/src/core/targets/context.xml	Sat Sep 18 09:43:12 2004
@@ -146,7 +146,6 @@
         failonerror="true"
         maxmemory="${forrest.maxmemory}">
         <jvmarg line="${forrest.jvmargs}"/>
-        <jvmarg line="${forrest.basic.jvmargs}"/>
         <jvmarg value="-Djava.endorsed.dirs=${forrest.endorsed.lib-dir}${path.separator}${java.endorsed.dirs}"/>
         <arg value="--logLevel=${project.debuglevel}"/>
         <arg value="--Logger=${project.logger}"/>

Modified: forrest/trunk/src/core/targets/site.xml
==============================================================================
--- forrest/trunk/src/core/targets/site.xml	(original)
+++ forrest/trunk/src/core/targets/site.xml	Sat Sep 18 09:43:12 2004
@@ -42,7 +42,6 @@
         maxmemory="${forrest.maxmemory}"
         failonerror="true">
         <jvmarg line="${forrest.jvmargs}"/>
-        <jvmarg line="${forrest.basic.jvmargs}"/>
         <jvmarg value="-Djava.endorsed.dirs=${forrest.endorsed.lib-dir}${path.separator}${java.endorsed.dirs}"/>
         <jvmarg value="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.LogKitLogger"/>
         <arg value="--logLevel=${project.debuglevel}"/>

Modified: forrest/trunk/status.xml
==============================================================================
--- forrest/trunk/status.xml	(original)
+++ forrest/trunk/status.xml	Sat Sep 18 09:43:12 2004
@@ -49,6 +49,9 @@
         Added new document to facilitate
         <link href="site:upgrading_06">upgrading to v0.6</link>
       </action>
+      <action dev="DB" type="fix" context="core" fixes-bug="FOR-267">
+        Allow forrest to run in a project directory with a space in the name.
+      </action>
       <action dev="JJP" type="fix" context="core" fixes-bug="FOR-262">
         Openoffice2forrest: add support for merged cells in tables.
       </action>

Mime
View raw message