db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From to...@apache.org
Subject cvs commit: db-ojb release-notes.txt build.xml
Date Wed, 24 Nov 2004 22:33:27 GMT
tomdz       2004/11/24 14:33:27

  Modified:    .        release-notes.txt build.xml
  Log:
  Ported changes to ojb-blank in 1.0 STABLE to 1.1 HEAD
  
  Revision  Changes    Path
  1.68      +5 -2      db-ojb/release-notes.txt
  
  Index: release-notes.txt
  ===================================================================
  RCS file: /home/cvs/db-ojb/release-notes.txt,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- release-notes.txt	22 Nov 2004 21:01:52 -0000	1.67
  +++ release-notes.txt	24 Nov 2004 22:33:27 -0000	1.68
  @@ -11,7 +11,10 @@
   Release 1.1_alpha
   ---------------------------------------------------------------------
   NEW FEATURES:
  ---
  +- Forward-port from 1.0 stable:
  +  New ant-target ojb-quickstart creates archives of ready-to-run apps for tutorials 1 and
2
  +  complete with pre-created Hsqldb databases (based on ojb-blank).
  +  These archives are also available in the binary download area.
   
   NOTES:
   --
  
  
  
  1.156     +80 -3     db-ojb/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/build.xml,v
  retrieving revision 1.155
  retrieving revision 1.156
  diff -u -r1.155 -r1.156
  --- build.xml	14 Nov 2004 09:43:34 -0000	1.155
  +++ build.xml	24 Nov 2004 22:33:27 -0000	1.156
  @@ -607,8 +607,8 @@
               description="Build a sample project">
           <property name="build.ojb-blank" value="${build.dir}/ojb-blank"/>
   
  -        <delete file="${dist}/ojb-blank.jar"/>
  -        <delete dir="${build.ojb-blank}" verbose="false"/>
  +        <delete file="${dist}/ojb-blank.jar" failonerror="false"/>
  +        <delete dir="${build.ojb-blank}" verbose="false" failonerror="false"/>
           <mkdir dir="${build.ojb-blank}"/>
           <mkdir dir="${build.ojb-blank}/src"/>
           <mkdir dir="${build.ojb-blank}/src/java"/>
  @@ -644,6 +644,7 @@
   				<include name="commons*.jar"/>
                   <include name="hsqldb*.jar"/>
                   <include name="log4j*.jar"/>
  +                <include name="pico*.jar"/>
                   <include name="torque*.jar"/>
                   <include name="velocity*.jar"/>
                   <include name="xdoclet*.jar"/>
  @@ -655,6 +656,82 @@
                basedir="${build.dir}"
                includes="ojb-blank/**"/>
       </target>
  +
  +    <!-- ================================================================== -->
  +    <!-- Build quickstart samples using hsqldb                              -->
  +    <!-- ================================================================== -->
  +    <target name="ojb-quickstart"
  +            depends="ojb-blank"
  +            description="Build the sample projects for the tutorials">
  +        <mkdir dir="${build.dir}/ojb-quickstart"/>
  +        <property name="build.ojb-quickstart" value="${build.dir}/ojb-quickstart/ojb-blank"/>
  +
  +        <!-- We're using fresh ojb-blank's and copy the tutorial source into it
  +             to generate the quickstart apps -->
  +        <!-- Tutorial 1 -->
  +        <delete dir="${build.ojb-quickstart}" verbose="false" failonerror="false"/>
  +        <unjar src="${dist}/ojb-blank.jar" dest="${build.dir}/ojb-quickstart"/>
  +        <copy todir="${build.ojb-quickstart}/src/java">
  +            <fileset dir="${src.samples}">
  +                <include name="org/apache/ojb/tutorial1/**"/>
  +            </fileset>
  +        </copy>
  +        <ant antfile="${build.ojb-quickstart}/build.xml"
  +             inheritall="false"
  +             dir="${build.ojb-quickstart}"
  +             target="setup-db">
  +            <property name="databaseName" value="tutorial1"/>
  +            <property name="jar.name" value="tutorial1-quickstart.jar"/>
  +            <property name="source.main.class" value="org.apache.ojb.tutorial1.Application"/>
  +            <property name="target.dir" value="target"/>
  +            <!-- For some reason we have to override the createUrl -->
  +            <property name="torque.database.createUrl" value="jdbc:hsqldb:${build.ojb-quickstart}/build/database/tutorial1"/>
  +        </ant>
  +        <ant antfile="${build.ojb-quickstart}/build.xml"
  +             inheritall="false"
  +             dir="${build.ojb-quickstart}"
  +             target="dist">
  +            <property name="databaseName" value="tutorial1"/>
  +            <property name="jar.name" value="tutorial1-quickstart.jar"/>
  +            <property name="source.main.class" value="org.apache.ojb.tutorial1.Application"/>
  +            <property name="target.dir" value="target"/>
  +            <property name="torque.database.createUrl" value="jdbc:hsqldb:${build.ojb-quickstart}/build/database/tutorial1"/>
  +        </ant>
  +        <move file="${build.ojb-quickstart}/target/tutorial1-quickstart.jar" todir="${dist}"/>
  +
  +        <!-- Tutorial 2 -->
  +        <delete dir="${build.ojb-quickstart}" verbose="false" failonerror="false"/>
  +        <unjar src="${dist}/ojb-blank.jar" dest="${build.dir}/ojb-quickstart"/>
  +        <copy todir="${build.ojb-quickstart}/src/java">
  +            <fileset dir="${src.samples}">
  +                <include name="org/apache/ojb/tutorial2/**"/>
  +            </fileset>
  +        </copy>
  +        <ant antfile="${build.ojb-quickstart}/build.xml"
  +             inheritall="false"
  +             dir="${build.ojb-quickstart}"
  +             target="setup-db">
  +            <property name="databaseName" value="tutorial2"/>
  +            <property name="jar.name" value="tutorial2-quickstart.jar"/>
  +            <property name="source.main.class" value="org.apache.ojb.tutorial2.Application"/>
  +            <property name="target.dir" value="target"/>
  +            <!-- For some reason we have to override the createUrl -->
  +            <property name="torque.database.createUrl" value="jdbc:hsqldb:${build.ojb-quickstart}/build/database/tutorial2"/>
  +        </ant>
  +        <ant antfile="${build.ojb-quickstart}/build.xml"
  +             inheritall="false"
  +             dir="${build.ojb-quickstart}"
  +             target="dist">
  +            <property name="databaseName" value="tutorial2"/>
  +            <property name="jar.name" value="tutorial2-quickstart.jar"/>
  +            <property name="source.main.class" value="org.apache.ojb.tutorial2.Application"/>
  +            <property name="target.dir" value="target"/>
  +            <property name="torque.database.createUrl" value="jdbc:hsqldb:${build.ojb-quickstart}/build/database/tutorial2"/>
  +        </ant>
  +        <move file="${build.ojb-quickstart}/target/tutorial2-quickstart.jar" todir="${dist}"/>
  +
  +    </target>
  +
   
       <!-- ================================================================== -->
       <!-- Build the documentation                                            -->
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org


Mime
View raw message