You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by ch...@apache.org on 2004/04/27 23:22:36 UTC
svn commit: rev 10327 - in xml/forrest/branches/copyless/src/core: . targets
Author: cheche
Date: Tue Apr 27 14:22:34 2004
New Revision: 10327
Modified:
xml/forrest/branches/copyless/src/core/forrest.build.xml
xml/forrest/branches/copyless/src/core/targets/context.xml
xml/forrest/branches/copyless/src/core/targets/site.xml
xml/forrest/branches/copyless/src/core/targets/webapp.xml
Log:
replace hard values with forrest variables
Modified: xml/forrest/branches/copyless/src/core/forrest.build.xml
==============================================================================
--- xml/forrest/branches/copyless/src/core/forrest.build.xml (original)
+++ xml/forrest/branches/copyless/src/core/forrest.build.xml Tue Apr 27 14:22:34 2004
@@ -95,7 +95,7 @@
<property file="${project.home}/forrest.properties" />
<echo message="Loading user specific properties from ${user.home}${/}forrest.properties" />
<property file="${user.home}/forrest.properties" />
- <echo message="Loading default properties from ${forrest.home}${/}context{/}default-forrest.properties" />
+ <echo message="Loading default properties from ${forrest.home}${/}context${/}default-forrest.properties" />
<property file="${forrest.home}/context/default-forrest.properties" />
<!-- people should use forrest.properties to override following defaults -->
Modified: xml/forrest/branches/copyless/src/core/targets/context.xml
==============================================================================
--- xml/forrest/branches/copyless/src/core/targets/context.xml (original)
+++ xml/forrest/branches/copyless/src/core/targets/context.xml Tue Apr 27 14:22:34 2004
@@ -155,7 +155,7 @@
maxmemory="${forrest.maxmemory}">
<jvmarg line="${forrest.jvmargs}"/>
<jvmarg line="${forrest.basic.jvmargs}"/>
- <jvmarg value="-Djava.endorsed.dirs=${forrest.home}/lib/endorsed${path.separator}${java.endorsed.dirs}"/>
+ <jvmarg value="-Djava.endorsed.dirs=${forrest.endorsed.lib-dir}${path.separator}${java.endorsed.dirs}"/>
<arg line="-index ${project.index-dir}"/>
<arg value="${xdocs-dir}"/>
<classpath>
Modified: xml/forrest/branches/copyless/src/core/targets/site.xml
==============================================================================
--- xml/forrest/branches/copyless/src/core/targets/site.xml (original)
+++ xml/forrest/branches/copyless/src/core/targets/site.xml Tue Apr 27 14:22:34 2004
@@ -46,7 +46,7 @@
<jvmarg line="${forrest.jvmargs}"/>
<jvmarg line="${forrest.basic.jvmargs}"/>
<jvmarg
- value="-Djava.endorsed.dirs=${forrest.home}/lib/endorsed${path.separator}${java.endorsed.dirs}"/>
+ value="-Djava.endorsed.dirs=${forrest.endorsed.lib-dir}${path.separator}${java.endorsed.dirs}"/>
<arg value="-c${project.webapp}"/> <!- input to the process ->
<arg value="-d${project.site-dir}"/> <!- output to be put ->
<arg value="-w${project.cocoon-work-dir}"/> <!- temp dir to use for e.g. cache ->
@@ -66,7 +66,7 @@
maxmemory="${forrest.maxmemory}">
<jvmarg line="${forrest.jvmargs}"/>
<jvmarg line="${forrest.basic.jvmargs}"/>
- <jvmarg value="-Djava.endorsed.dirs=${forrest.home}/lib/endorsed${path.separator}${java.endorsed.dirs}"/>
+ <jvmarg value="-Djava.endorsed.dirs=${forrest.endorsed.lib-dir}${path.separator}${java.endorsed.dirs}"/>
<arg value="--logLevel=${project.debuglevel}"/>
<arg value="--Logger=${project.logger}"/>
<arg value="--logKitconfig=${project.logkitfile}"/>
@@ -165,4 +165,4 @@
</target>
-</project>
\ No newline at end of file
+</project>
Modified: xml/forrest/branches/copyless/src/core/targets/webapp.xml
==============================================================================
--- xml/forrest/branches/copyless/src/core/targets/webapp.xml (original)
+++ xml/forrest/branches/copyless/src/core/targets/webapp.xml Tue Apr 27 14:22:34 2004
@@ -96,13 +96,13 @@
<copy todir="${project.webapp}/WEB-INF/lib">
<!-- Note: no overwriting, so user's libs and classes get preference -->
- <fileset dir="${forrest.root-dir}/lib/core">
+ <fileset dir="${forrest.core.lib-dir}">
<include name="**.jar"/>
</fileset>
- <fileset dir="${forrest.root-dir}/lib/optional">
+ <fileset dir="${forrest.optional.lib-dir}">
<include name="**.jar"/>
</fileset>
- <fileset dir="${forrest.root-dir}/lib/endorsed">
+ <fileset dir="${forrest.endorsed.lib-dir}">
<include name="**.jar"/>
</fileset>
</copy>
@@ -120,7 +120,7 @@
<!-- Copy XML jars if not running JDK 1.4 (where they're built-in) -->
<available property="jdk1.4+" classname="java.lang.CharSequence"/>
<copy todir="${project.webapp}/WEB-INF/lib">
- <fileset dir="${forrest.root-dir}/lib/endorsed">
+ <fileset dir="${forrest.endorsed.lib-dir}">
<include name="*jar" unless="jdk1.4+"/>
</fileset>
</copy>