cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject cvs commit: cocoon-2.1/src/targets standalone-demo-build.xml init-build.xml
Date Fri, 02 May 2003 06:53:08 GMT
bdelacretaz    2003/05/01 23:53:08

  Modified:    .        build.properties build.xml cocoon.bat cocoon.sh
               src/targets init-build.xml
  Added:       src/targets standalone-demo-build.xml
  Log:
  standalone-demo build target implemented
  
  Revision  Changes    Path
  1.13      +3 -0      cocoon-2.1/build.properties
  
  Index: build.properties
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/build.properties,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- build.properties	29 Apr 2003 08:20:00 -0000	1.12
  +++ build.properties	2 May 2003 06:53:07 -0000	1.13
  @@ -69,6 +69,9 @@
   build.webapp.idldocs=${build.webapp}/api/fom
   build.war=${build}/${name}.war
   
  +# ------ Standalone-demo Build Properties --------------------------------------
  +build.standalone.demo=${build.root}/standalone-demo
  +
   # ---- Compilation -------------------------------------------------------------
   
   compiler=modern
  
  
  
  1.31      +4 -2      cocoon-2.1/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/build.xml,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- build.xml	1 Apr 2003 21:50:03 -0000	1.30
  +++ build.xml	2 May 2003 06:53:07 -0000	1.31
  @@ -21,6 +21,7 @@
     <!ENTITY docs-targets     SYSTEM "./src/targets/docs-build.xml">
     <!ENTITY dist-targets     SYSTEM "./src/targets/dist-build.xml">
     <!ENTITY admin-targets    SYSTEM "./src/targets/admin-build.xml">
  +  <!ENTITY standalone-demo-targets  SYSTEM "./src/targets/standalone-demo-build.xml">
     <!-- =================================================================== -->
   
     <!-- ==================  Apache Forrest targets  ======================= -->
  @@ -54,7 +55,8 @@
     <!-- =================================================================== -->
     <!-- Administration targets  -->  &admin-targets;
     <!-- =================================================================== -->
  -
  +  <!-- Standalone-demo targets -->  &standalone-demo-targets;
  +  <!-- =================================================================== -->
   
     <!-- ==================  Apache Forrest targets  ======================= -->
   
  
  
  
  1.6       +7 -1      cocoon-2.1/cocoon.bat
  
  Index: cocoon.bat
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/cocoon.bat,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- cocoon.bat	12 Apr 2003 02:50:31 -0000	1.5
  +++ cocoon.bat	2 May 2003 06:53:08 -0000	1.6
  @@ -66,8 +66,14 @@
   :gotJettyAdminPort
   
   if not "%JETTY_WEBAPP%" == "" goto gotWebapp
  +set DEMO_WEBAPP=..\webapp
  +if not exist %DEMO_WEBAPP% goto standardWebapp
  +set JETTY_WEBAPP=%DEMO_WEBAPP%
  +goto gotWebapp
  +:standardWebapp
   set JETTY_WEBAPP=%COCOON_HOME%\build\webapp
   :gotWebapp
  +echo cocoon.bat: using %JETTY_WEBAPP% as the webapp directory
   
   if not "%JAVA_DEBUG_PORT%" == "" goto gotDebugPort
   set JAVA_DEBUG_PORT=8000
  
  
  
  1.7       +10 -2     cocoon-2.1/cocoon.sh
  
  Index: cocoon.sh
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/cocoon.sh,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- cocoon.sh	13 Apr 2003 16:26:54 -0000	1.6
  +++ cocoon.sh	2 May 2003 06:53:08 -0000	1.7
  @@ -70,8 +70,16 @@
   fi
   
   if [ "$COCOON_WEBAPP_HOME" = "" ] ; then
  -  COCOON_WEBAPP_HOME="$COCOON_HOME/build/webapp"
  +  STANDALONE_WEBAPP=../webapp
  +  if [ -d $STANDALONE_WEBAPP ] ; then
  +    # for standalone-webapp setup
  +    COCOON_WEBAPP_HOME=$STANDALONE_WEBAPP
  +  else
  +    # when in the build environment
  +    COCOON_WEBAPP_HOME="$COCOON_HOME/build/webapp"
  +  fi
   fi
  +echo "$0: using $COCOON_WEBAPP_HOME as the webapp directory"
   
   if [ "$COCOON_LIB" = "" ] ; then
     COCOON_LIB="$COCOON_WEBAPP_HOME/WEB-INF/lib"
  
  
  
  1.12      +7 -1      cocoon-2.1/src/targets/init-build.xml
  
  Index: init-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/targets/init-build.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- init-build.xml	7 Apr 2003 11:54:23 -0000	1.11
  +++ init-build.xml	2 May 2003 06:53:08 -0000	1.12
  @@ -179,7 +179,7 @@
   <!-- === Clean Targets ========================================================= -->
   
     <!-- Clean -->
  -  <target name="clean" depends="clean-cocoon,clean-webapp" description="Cleans the cocoon
build and the webapp"/>
  +  <target name="clean" depends="clean-cocoon,clean-webapp,clean-standalone-demo" description="Cleans
the cocoon build, webapp and standalone-demo"/>
   
     <!-- Clean the cocoon build directory -->
     <target name="clean-cocoon" depends="init" description="Cleans the cocoon build">
  @@ -190,5 +190,11 @@
     <target name="clean-webapp" depends="init" description="Cleans the webapp">
       <delete dir="${build.webapp}"/>
     </target>
  +
  +  <!-- Clean the standalone demo -->
  +  <target name="clean-standalone-demo" depends="init" description="Cleans the standalone-demo">
  +    <delete dir="${build.standalone.demo}"/>
  +  </target>
  +
   
   
  
  
  
  1.1                  cocoon-2.1/src/targets/standalone-demo-build.xml
  
  Index: standalone-demo-build.xml
  ===================================================================
  <!--
      ant include file for "standalone-demo" build
      @author bdelacretaz@codeconsult.ch
  
      $Id: standalone-demo-build.xml,v 1.1 2003/05/02 06:53:08 bdelacretaz Exp $
   -->
  
  <target name="standalone-demo" depends="init, webapp" description="build webapp and copy
files for standalone demo">
  
      <!-- setup -->
      <mkdir dir="${build.standalone.demo}"/>
      <property name="readme.txt" value="${build.standalone.demo}/readme-standalone.txt"/>
  
      <!-- copy files that cocoon.sh needs to run so that they can be moved out of the
build tree easily -->
      <copy todir="${build.standalone.demo}">
          <fileset dir=".">
              <include name="${lib.endorsed}/**"/>
              <include name="${tools.loader.dest}/**"/>
              <include name="${tools.jetty}/**"/>
              <include name="cocoon.sh"/>
              <include name="cocoon.bat"/>
          </fileset>
      </copy>
  
      <!-- fix permissions and line endings -->
      <chmod perm="+x" file="${build.standalone.demo}/cocoon.sh"/>
      <fixcrlf srcdir="${build.standalone.demo}" includes="**.sh" eol="lf"/>
      <fixcrlf srcdir="${build.standalone.demo}" includes="**.bat" eol="crlf"/>
  
      <!-- create readme.txt for users -->
      <echo file="${readme.txt}">
  Cocoon standalone-demo
  ----------------------
  After building this version with "build standalone-demo" from the main Cocoon distribution
  directory, copying the ${build.standalone.demo} and ${build.webapp} directories
  somewhere else provides you with a simple standalone Cocoon installation, meant for
  test and demo purposes.
  
  To start this standalone demo use either "./cocoon.sh servlet" or "cocoon.bat servlet" in
the
  standalone-demo directory.
  
  The webapp directory must be found as "../webapp" for this to work:
  
          common-parent-directory
                  |
                  +----------- standalone-demo
                  +----------- webapp
  
  Note that the version of the jetty servlet engine that is included with this demo
  is not the full version. For production uses, we recommend that you get a complete
  servlet engine and install it according to your needs.
  
  Have fun!
  Your friendly neighbourhood Cocoon team.
  </echo>
  
      <!-- all done -->
      <echo>--- standalone-demo build ready! -----------------------------------------</echo>
      <echo>See ${readme.txt} for more info.</echo>
      <echo>--------------------------------------------------------------------------</echo>
  
  </target>
  
  
  

Mime
View raw message