forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nicola...@apache.org
Subject cvs commit: xml-forrest/src/core forrest.build.xml
Date Tue, 27 Jan 2004 11:57:41 GMT
nicolaken    2004/01/27 03:57:41

  Modified:    src/core forrest.build.xml
  Log:
  Provide Cocoon and Jetty with the project.home and forrest.home properties
  as system properties.
  
  Revision  Changes    Path
  1.23      +11 -3     xml-forrest/src/core/forrest.build.xml
  
  Index: forrest.build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/forrest.build.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- forrest.build.xml	25 Jan 2004 23:07:26 -0000	1.22
  +++ forrest.build.xml	27 Jan 2004 11:57:41 -0000	1.23
  @@ -49,7 +49,7 @@
     
       <!-- setting defaults for parameters -->
       <!-- people should use -D switch, or <ant><property>s to override these
  -->
  -
  + 
       <property name="project.home" location="." />
       <property name="/" value="${file.separator}"/>
       <echo message="Loading project specific properties from ${project.home}${/}forrest.properties"
/>
  @@ -102,6 +102,11 @@
       <filter filtersfile="${projfilters}"/>
       <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>
  +        
       <!-- echo settings in -Dforrest.echo=true mode -->
       <antcall target="echo-settings" />
     </target>
  @@ -476,6 +481,7 @@
           failonerror="true"
           classpathref="forrest.cp">
           <jvmarg line="${forrest.jvmargs}"/>
  +        <jvmarg line="${forrest.basic.jvmargs}"/>
           <jvmarg
             value="-Djava.endorsed.dirs=${forrest.home}/lib/endorsed${path.separator}${java.endorsed.dirs}"/>
           <arg value="-c${project.webapp}"/>   <!- input to the process ->
  @@ -496,6 +502,7 @@
           failonerror="true"
           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}"/>
           <arg value="--logLevel=${project.debuglevel}"/>
           <arg value="--Logger=${project.logger}"/>
  @@ -604,6 +611,7 @@
         failonerror="true"
         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}"/>
         <arg line="-index ${project.index-dir}"/>
         <arg value="${xdocs-dir}"/>
  @@ -1059,7 +1067,6 @@
     <target name="run" 
      description="Run Jetty with configuration set by the jetty.run property"
      depends="webapp-local">
  -
       <java classname="org.mortbay.jetty.Server"
             dir="${project.webapp}"
             fork="yes"
  @@ -1069,6 +1076,7 @@
            <path refid="forrest.cp"/>
          </classpath>
          <jvmarg line="${forrest.jvmargs}"/>
  +       <jvmarg line="${forrest.basic.jvmargs}"/>
          <jvmarg
            value="-Djava.endorsed.dirs=${java.endorsed.dirs}${path.separator}${forrest.home}/lib/endorsed"/>
          <arg line="jettyconf.xml" />
  
  
  

Mime
View raw message