cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject cvs commit: xml-cocoon2 build.properties build.xml cocoon.bat cocoon.sh
Date Thu, 27 Feb 2003 22:42:29 GMT
stefano     2003/02/27 14:42:29

  Modified:    .        build.properties build.xml cocoon.bat cocoon.sh
  Log:
  the new loader has landed
  
  Revision  Changes    Path
  1.10      +4 -1      xml-cocoon2/build.properties
  
  Index: build.properties
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.properties,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- build.properties	27 Feb 2003 13:45:05 -0000	1.9
  +++ build.properties	27 Feb 2003 22:42:28 -0000	1.10
  @@ -114,7 +114,10 @@
   tools=tools
   tools.lib=${tools}/lib
   tools.src=${tools}/src
  -tools.tasks=${tools}/anttasks
  +tools.tasks.src=${tools.src}/anttasks
  +tools.tasks.dest=${tools}/anttasks
  +tools.loader.src=${tools.src}/loader
  +tools.loader.dest=${tools}/loader
   tools.jetty=${tools}/jetty
   
   # Libraries
  
  
  
  1.340     +25 -14    xml-cocoon2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.xml,v
  retrieving revision 1.339
  retrieving revision 1.340
  diff -u -r1.339 -r1.340
  --- build.xml	26 Feb 2003 19:30:18 -0000	1.339
  +++ build.xml	27 Feb 2003 22:42:28 -0000	1.340
  @@ -88,7 +88,7 @@
         <fileset dir="${tools.lib}">
           <include name="*.jar"/>
         </fileset>
  -      <path location="${tools.tasks}"/>
  +      <path location="${tools.tasks.dest}"/>
       </path>
   
       <!-- Set classpath for scratchpad -->
  @@ -99,12 +99,25 @@
         </fileset>
       </path>
   
  +    <!-- Build and prepare the loader =================== -->
  +
  +    <!-- compile the loader -->
  +    <mkdir dir="${tools.loader.dest}"/>
  +    <javac srcdir="${tools.loader.src}"
  +           destdir="${tools.loader.dest}"
  +           debug="off"
  +           optimize="on"
  +           deprecation="on"
  +           target="1.2"
  +           nowarn="on"
  +           compiler="${compiler}"/>
  +           
       <!-- Build and prepare the cocoon-specific ant tasks =================== -->
   
       <!-- compile the ant tasks -->
  -    <mkdir dir="${tools.tasks}"/>
  -    <javac srcdir="${tools.src}"
  -           destdir="${tools.tasks}"
  +    <mkdir dir="${tools.tasks.dest}"/>
  +    <javac srcdir="${tools.tasks.src}"
  +           destdir="${tools.tasks.dest}"
              debug="off"
              optimize="on"
              deprecation="on"
  @@ -114,14 +127,8 @@
              classpathref="tasks.classpath"/>
   
       <!-- A task to patch xml files -->
  -    <taskdef name="xpatch" classname="XConfToolTask">
  -      <classpath refid="tasks.classpath"/>
  -    </taskdef>
  +    <taskdef name="xpatch" classname="XConfToolTask" classpath="${tools.tasks.dest}"/>
   
  -    <!-- Use Jing for XML validation with RELAX NG -->
  -    <taskdef name="jing" classname="com.thaiopensource.relaxng.util.JingTask">
  -      <classpath refid="tasks.classpath"/>
  -    </taskdef>
     </target>
   
   <!-- Preparation Targets =================================================== -->
  @@ -596,7 +603,7 @@
   
     <target name="war" depends="webapp">
       <!-- A task to create manifest for webapp. -->
  -    <taskdef name="manifest" classname="ManifestToolTask" classpath="${tools.tasks}"/>
  +    <taskdef name="manifest" classname="ManifestToolTask" classpath="${tools.tasks.dest}"/>
       <!-- Create WAR manifest -->
       <manifest directory="${build.webapp.lib}" manifest="${build.webapp}/WEB-INF/Manifest.mf"/>
       <!-- Package WAR file -->
  @@ -650,6 +657,9 @@
       <echo message="Conducting validation of core XML documentation."/>
       <echo message="(You can turn validation off if you must, commenting out the validate.xdocs
property)"/>
   
  +    <!-- Use Jing for XML validation with RELAX NG -->
  +    <taskdef name="jing" classname="com.thaiopensource.relaxng.util.JingTask" classpath="${classpath}"/>
  +
       <echo message="Validating all **/book.xml instances using RELAX NG ..."/>
       <jing rngfile="${webapp}/WEB-INF/entities/book-v01.rng">
         <fileset dir="${build.context}" includes="**/book.xml"/>
  @@ -900,7 +910,8 @@
     <!-- Clean the distribution -->
     <target name="distclean" depends="clean" description="Cleans everything and brings
back to original 'CVS checkout' state">
       <delete dir="${build.root}"/>
  -    <delete dir="${tools.tasks}"/>
  +    <delete dir="${tools.tasks.dest}"/>
  +    <delete dir="${tools.loader.dest}"/>
       <delete file="${dist}/${Name}-${version}.tar.gz"/>
       <delete file="${dist}/${Name}-${version}.tar"/>
       <delete file="${dist}/${Name}-${version}.zip"/>
  
  
  
  1.4       +30 -6     xml-cocoon2/cocoon.bat
  
  Index: cocoon.bat
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/cocoon.bat,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- cocoon.bat	27 Feb 2003 17:08:31 -0000	1.3
  +++ cocoon.bat	27 Feb 2003 22:42:28 -0000	1.4
  @@ -5,6 +5,30 @@
   :: $Id$
   :: -----------------------------------------------------------------------------
   
  +:: Configuration variables
  +::
  +:: COCOON_LIB
  +::   Folder containing all the library files needed by the Cocoon CLI
  +::
  +:: JAVA_HOME
  +::   Home of Java installation.
  +::
  +:: JAVA_OPTIONS
  +::   Extra options to pass to the JVM
  +::
  +:: JAVA_DEBUG_PORT
  +::   The location where the JVM debug server should listen to
  +::
  +:: JETTY_PORT
  +::   Override the default port for Jetty
  +:: 
  +:: JETTY_ADMIN_PORT
  +::   The port where the jetty web administration should bind
  +::
  +:: JETTY_WEBAPP
  +::   The directory where the webapp that jetty has to execute is located
  +::
  +
   :: ----- Verify and Set Required Environment Variables -------------------------
   
   if not "%JAVA_HOME%" == "" goto gotJavaHome
  @@ -14,7 +38,7 @@
   
   :: ----- Set Up The Classpath --------------------------------------------------
   
  -set CP=.\tools\lib\forehead-1.0-beta-4-patched.jar
  +set CP=.\tools\loader
   
   :: ----- Check System Properties -----------------------------------------------
   
  @@ -60,25 +84,25 @@
   :: ----- Cli -------------------------------------------------------------------
   
   :doCli
  -%JAVA_HOME%\bin\java.exe %JAVA_OPT% -classpath %CP% -Djava.endorsed.dirs=lib\endorsed -Dcocoon.lib=%COCOON_LIB%
-Dforehead.conf.file=tools\cocoon.env com.werken.forehead.Forehead %2 %3 %4 %5 %6 %7 %8 %9
  +%JAVA_HOME%\bin\java.exe %JAVA_OPT% -classpath %CP% -Djava.endorsed.dirs=lib\endorsed -Dloader.jar.repositories=%COCOON_LIB%
-Dloader.main.class=org.mortbay.jetty.Server Loader %2 %3 %4 %5 %6 %7 %8 %9
   goto end
   
   :: ----- Servlet ---------------------------------------------------------------
   
   :doServlet
  -%EXEC% %JAVA_HOME%\bin\java.exe %JAVA_OPT% -classpath %CP% -Djava.endorsed.dirs=lib\endorsed
-Dwebapp=%JETTY_WEBAPP% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT%
-Djetty.admin.port=%JETTY_ADMIN_PORT% -Dforehead.conf.file=tools\jetty\conf\jetty.env com.werken.forehead.Forehead
tools\jetty\conf\main.xml
  +%EXEC% %JAVA_HOME%\bin\java.exe %JAVA_OPT% -classpath %CP% -Djava.endorsed.dirs=lib\endorsed
-Dwebapp=%JETTY_WEBAPP% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT%
-Djetty.admin.port=%JETTY_ADMIN_PORT% -Dloader.jar.repositories=tools\jetty\lib,lib\endorsed
-Dloader.main.class=org.mortbay.jetty.Server Loader tools\jetty\conf\main.xml
   goto end
   
   :: ----- Servlet with Admin ----------------------------------------------------
   
   :doServletAdmin
  -%EXEC% %JAVA_HOME%\bin\java.exe %JAVA_OPT% -classpath %CP% -Djava.endorsed.dirs=lib\endorsed
-Dwebapp=%JETTY_WEBAPP% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT%
-Djetty.admin.port=%JETTY_ADMIN_PORT% -Dforehead.conf.file=tools\jetty\conf\jetty.env com.werken.forehead.Forehead
tools\jetty\conf\main.xml tools\jetty\conf\admin.xml
  +%EXEC% %JAVA_HOME%\bin\java.exe %JAVA_OPT% -classpath %CP% -Djava.endorsed.dirs=lib\endorsed
-Dwebapp=%JETTY_WEBAPP% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT%
-Djetty.admin.port=%JETTY_ADMIN_PORT% -Dloader.jar.repositories=tools\jetty\lib,lib\endorsed
-Dloader.main.class=org.mortbay.jetty.Server Loader tools\jetty\conf\main.xml tools\jetty\conf\admin.xml
   goto end
   
   :: ----- Servlet Debug ---------------------------------------------------------
   
   :doDebug
  -%EXEC% %JAVA_HOME%\bin\java.exe %JAVA_OPT% -Xdebug -Xrunjdwp:transport=dt_socket,address=%JAVA_DEBUG_PORT%,server=y,suspend=n
 -classpath %CP% -Djava.endorsed.dirs=lib\endorsed -Dwebapp=%JETTY_WEBAPP% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser
-Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT% -Dforehead.conf.file=tools\jetty\conf\jetty.env
com.werken.forehead.Forehead tools\jetty\conf\main.xml
  +%EXEC% %JAVA_HOME%\bin\java.exe %JAVA_OPT% -Xdebug -Xrunjdwp:transport=dt_socket,address=%JAVA_DEBUG_PORT%,server=y,suspend=n
 -classpath %CP% -Djava.endorsed.dirs=lib\endorsed -Dwebapp=%JETTY_WEBAPP% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser
-Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT% -Dloader.jar.repositories=tools\jetty\lib,lib\endorsed
-Dloader.main.class=org.mortbay.jetty.Server Loader tools\jetty\conf\main.xml
   
   :: ----- End -------------------------------------------------------------------
   
  
  
  
  1.5       +16 -6     xml-cocoon2/cocoon.sh
  
  Index: cocoon.sh
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/cocoon.sh,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- cocoon.sh	27 Feb 2003 17:08:31 -0000	1.4
  +++ cocoon.sh	27 Feb 2003 22:42:28 -0000	1.5
  @@ -16,8 +16,18 @@
   # JAVA_OPTIONS
   #   Extra options to pass to the JVM
   #
  +# JAVA_DEBUG_PORT
  +#   The location where the JVM debug server should listen to
  +#
   # JETTY_PORT
   #   Override the default port for Jetty
  +# 
  +# JETTY_ADMIN_PORT
  +#   The port where the jetty web administration should bind
  +#
  +# JETTY_WEBAPP
  +#   The directory where the webapp that jetty has to execute is located
  +#
   
   usage()
   {
  @@ -65,25 +75,25 @@
   
   # ----- Set Classpath ----------------------------------------------------------
   
  -CP=./tools/lib/forehead-1.0-beta-4-patched.jar
  +CP=./tools/loader
   
   # ----- Do the action ----------------------------------------------------------
   
   case "$ACTION" in
     cli)
  -        $JAVA_HOME/bin/java $JAVA_OPT -classpath %CP% -Djava.endorsed.dirs=lib/endorsed
-Dcocoon.lib=$COCOON_LIB -Dforehead.conf.file=tools/cocoon.env com.werken.forehead.Forehead
$ARGS
  +        $JAVA_HOME/bin/java $JAVA_OPT -classpath %CP% -Djava.endorsed.dirs=lib/endorsed
-Dloader.jar.repositories=%COCOON_LIB% -Dloader.main.class=org.mortbay.jetty.Server Loader
$ARGS
           ;;
   
     servlet)
  -        $JAVA_HOME/bin/java $JAVA_OPT -classpath $CP -Djava.endorsed.dirs=lib/endorsed
-Dwebapp=$JETTY_WEBAPP -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=$JETTY_PORT
-Djetty.admin.port=$JETTY_ADMIN_PORT -Dforehead.conf.file=tools/jetty/conf/jetty.env com.werken.forehead.Forehead
tools/jetty/conf/main.xml
  +        $JAVA_HOME/bin/java $JAVA_OPT -classpath $CP -Djava.endorsed.dirs=lib/endorsed
-Dwebapp=$JETTY_WEBAPP -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=$JETTY_PORT
-Djetty.admin.port=$JETTY_ADMIN_PORT -Dloader.jar.repositories=tools/jetty/lib,lib/endorsed
-Dloader.main.class=org.mortbay.jetty.Server Loader tools/jetty/conf/main.xml
           ;;
   
     servlet-admin)
  -        $JAVA_HOME/bin/java $JAVA_OPT -classpath $CP -Djava.endorsed.dirs=lib/endorsed
-Dwebapp=$JETTY_WEBAPP -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=$JETTY_PORT
-Djetty.admin.port=$JETTY_ADMIN_PORT -Dforehead.conf.file=tools/jetty/conf/jetty.env com.werken.forehead.Forehead
tools/jetty/conf/main.xml tools/jetty/conf/admin.xml
  +        $JAVA_HOME/bin/java $JAVA_OPT -classpath $CP -Djava.endorsed.dirs=lib/endorsed
-Dwebapp=$JETTY_WEBAPP -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=$JETTY_PORT
-Djetty.admin.port=$JETTY_ADMIN_PORT -Dloader.jar.repositories=tools/jetty/lib,lib/endorsed
-Dloader.main.class=org.mortbay.jetty.Server Loader tools/jetty/conf/main.xml tools/jetty/conf/admin.xml
           ;;
   
     servlet-debug)
  -        $JAVA_HOME/bin/java $JAVA_OPT -Xdebug -Xrunjdwp:transport=dt_socket,address=$JAVA_DEBUG_PORT,server=y,suspend=n
-classpath $CP -Djava.endorsed.dirs=lib/endorsed -Dwebapp=$JETTY_WEBAPP -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser
-Djetty.port=$JETTY_PORT -Djetty.admin.port=$JETTY_ADMIN_PORT -Dforehead.conf.file=tools/jetty/conf/jetty.env
com.werken.forehead.Forehead tools/jetty/conf/main.xml tools/jetty/conf/admin.xml
  +        $JAVA_HOME/bin/java $JAVA_OPT -Xdebug -Xrunjdwp:transport=dt_socket,address=$JAVA_DEBUG_PORT,server=y,suspend=n
-classpath $CP -Djava.endorsed.dirs=lib/endorsed -Dwebapp=$JETTY_WEBAPP -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser
-Djetty.port=$JETTY_PORT -Djetty.admin.port=$JETTY_ADMIN_PORT -Dloader.jar.repositories=tools/jetty/lib,lib/endorsed
-Dloader.main.class=org.mortbay.jetty.Server Loader tools/jetty/conf/main.xml tools/jetty/conf/admin.xml
           ;;
   
     *)
  
  
  

Mime
View raw message