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 build.xml
Date Tue, 03 Dec 2002 00:05:43 GMT
nicolaken    2002/12/02 16:05:43

  Modified:    .        build.xml
  Log:
    <action dev="NKB" type="update">
      Moved endorsed libs in ./lib/endorsed, so that they can be added in the build file
      easily as java jvm args, or in the future copied to the webserver or Java endorsed dir.
      Currently it enables Jetty to run easily in 1.4 JVMs without need to copy libs to
      the endorsed dir.
    </action>
    <action dev="NKB" type="add">
      Added jetty webserver for fast and easy Cocoon test and evaluation.
      To run launch "build run" and point the browser to http://localhost:8888/
      Since it seems there is a bug somewhere, ATM point to
      http://localhost:8888/documentation/index.html to see the page.
    </action>
  
  Revision  Changes    Path
  1.288     +64 -0     xml-cocoon2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.xml,v
  retrieving revision 1.287
  retrieving revision 1.288
  diff -u -r1.287 -r1.288
  --- build.xml	28 Nov 2002 23:34:32 -0000	1.287
  +++ build.xml	3 Dec 2002 00:05:43 -0000	1.288
  @@ -145,6 +145,9 @@
         <fileset dir="./lib/local">
           <include name="*.jar"/>
         </fileset>
  +      <fileset dir="./lib/endorsed">
  +        <include name="*.jar"/>
  +      </fileset>      
         <fileset dir="./lib/core">
           <include name="*.jar"/>
         </fileset>
  @@ -160,6 +163,9 @@
         <fileset dir="./lib/local">
           <include name="*.jar"/>
         </fileset>
  +      <fileset dir="./lib/endorsed">
  +        <include name="*.jar"/>
  +      </fileset>      
         <fileset dir="./lib/core">
           <include name="*.jar"/>
         </fileset>
  @@ -178,6 +184,9 @@
         <fileset dir="./lib/local">
           <include name="*.jar"/>
         </fileset>
  +      <fileset dir="./lib/endorsed">
  +        <include name="*.jar"/>
  +      </fileset>      
         <fileset dir="./lib/core">
           <include name="*.jar"/>
         </fileset>
  @@ -1355,6 +1364,9 @@
       <java classname="org.apache.cocoon.Main" fork="yes" failonerror="true">
         <arg line="-P -C ${build.war}/WEB-INF/cocoon.xconf -w ${build.war}/WEB-INF/classes
-c ${build.war}" />
         <classpath>
  +        <fileset dir="${lib.dir}/endorsed">
  +          <include name="**/*.jar"/>
  +        </fileset>    
           <fileset dir="${lib.dir}/core">
             <include name="**/*.jar"/>
           </fileset>
  @@ -1379,6 +1391,10 @@
     <!-- =================================================================== -->
     <target name="copy-webapp-libs" depends="copy-tools-lib, check-jars" if="include.webapp.libs">
       <copy todir="${build.war}/WEB-INF/lib">
  +      <fileset dir="${lib.dir}/endorsed">
  +        <include name="*.jar"/>
  +        <exclude name="servlet*.jar"/>
  +      </fileset>
         <fileset dir="${lib.dir}/core">
           <include name="*.jar"/>
           <exclude name="servlet*.jar"/>
  @@ -1898,6 +1914,12 @@
   
       <!-- And now the jars -->
       <copy todir="${dist.bin}/webapp/WEB-INF/lib">
  +      <fileset dir="${lib.dir}/endorsed">
  +        <include name="*.jar"/>
  +        <exclude name="servlet*.jar"/>
  +      </fileset>
  +    </copy>    
  +    <copy todir="${dist.bin}/webapp/WEB-INF/lib">
         <fileset dir="${lib.dir}/core">
           <include name="*.jar"/>
           <exclude name="servlet*.jar"/>
  @@ -2329,6 +2351,48 @@
       <fileset dir="${build.dir}" includes="**/sitemap.report" />
      </apply>
     </target>
  +  
  +    
  +<!-- ***************************************************************** -->
  +<!-- ***************************************************************** -->
  +<!-- **                                                             ** -->
  +<!-- **                                                             ** -->
  +<!-- **              LOCAL SERVER RUN ACTION                        ** -->
  +<!-- **                                                             ** -->
  +<!-- **                                                             ** -->
  +<!-- ***************************************************************** -->
  +<!-- ***************************************************************** -->
  +
  +  <target name="run" 
  +   description="Run Jetty with configuration set by the jetty.run property"
  +   depends="webapp-local">
  +    
  +    <antcall target="copy-webapp-libs">
  +      <param  name="include.webapp.libs" value="true"/>
  +    </antcall>
  +
  +    <copy file="${tools.dir}/jetty/conf/jettyconf.xml"
  +          todir="${build.war}" filtering="on"/>
  +    
  +    <java classname="org.mortbay.jetty.Server"
  +          dir="${build.war}"
  +          fork="yes"
  +          failonerror="yes">
  +       <classpath>
  +         <path refid="classpath" />
  +         <fileset dir="${tools.dir}/jetty/lib">
  +           <include name="*.jar"/>
  +           <include name="*.JAR"/>
  +           <include name="*.zip"/>
  +           <include name="*.ZIP"/>
  +         </fileset>         
  +       </classpath>
  +      <jvmarg
  +        value="-Djava.endorsed.dirs=${java.endorsed.dirs}${path.separator}${endorsed.dir}"/>
  +       <arg line="jettyconf.xml" />
  +    </java>
  +  </target>  
  +  
     
   </project>
   
  
  
  

----------------------------------------------------------------------
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