cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nicola...@apache.org
Subject cvs commit: xml-cocoon2/tools/jetty/conf jettyconf.xml
Date Tue, 03 Dec 2002 15:44:44 GMT
nicolaken    2002/12/03 07:44:44

  Modified:    .        build.xml
               tools/jetty/conf jettyconf.xml
  Log:
  Added a jetty.home env variable to pass webapp location from the buildfile, and
  set it as an absolute path with a trailing slash as suggested by
  leo leonid tek@leonid.de .
  Still doesn't fix the redirect bug :-(
  
  Revision  Changes    Path
  1.289     +7 -3      xml-cocoon2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.xml,v
  retrieving revision 1.288
  retrieving revision 1.289
  diff -u -r1.288 -r1.289
  --- build.xml	3 Dec 2002 00:05:43 -0000	1.288
  +++ build.xml	3 Dec 2002 15:44:44 -0000	1.289
  @@ -208,6 +208,8 @@
       <!-- Properties                                                          -->
       <!-- =================================================================== -->
   
  +    <dirname property="antfile.dir" file="${ant.file}"/>
  +  
       <!-- Get the properties from the properties.xml file -->
       <xmlproperty file="properties.xml"
                    keeproot="false" 
  @@ -2363,6 +2365,7 @@
   <!-- ***************************************************************** -->
   <!-- ***************************************************************** -->
   
  +
     <target name="run" 
      description="Run Jetty with configuration set by the jetty.run property"
      depends="webapp-local">
  @@ -2373,7 +2376,7 @@
   
       <copy file="${tools.dir}/jetty/conf/jettyconf.xml"
             todir="${build.war}" filtering="on"/>
  -    
  +   
       <java classname="org.mortbay.jetty.Server"
             dir="${build.war}"
             fork="yes"
  @@ -2387,8 +2390,9 @@
              <include name="*.ZIP"/>
            </fileset>         
          </classpath>
  -      <jvmarg
  -        value="-Djava.endorsed.dirs=${java.endorsed.dirs}${path.separator}${endorsed.dir}"/>
  +      
  +       <jvmarg value="-Djava.endorsed.dirs=${java.endorsed.dirs}${path.separator}${endorsed.dir}"/>
  +       <sysproperty key="jetty.home" value="${antfile.dir}/build/cocoon/webapp/"/>

          <arg line="jettyconf.xml" />
       </java>
     </target>  
  
  
  
  1.2       +1 -1      xml-cocoon2/tools/jetty/conf/jettyconf.xml
  
  Index: jettyconf.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/tools/jetty/conf/jettyconf.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jettyconf.xml	3 Dec 2002 00:11:24 -0000	1.1
  +++ jettyconf.xml	3 Dec 2002 15:44:44 -0000	1.2
  @@ -49,7 +49,7 @@
   
     <Call name="addWebApplication">
       <Arg>/</Arg>
  -    <Arg>.</Arg>
  +    <Arg><SystemProperty name="jetty.home" default="."/></Arg>
     </Call>
   
   </Configure>
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message