db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@apache.org
Subject cvs commit: db-ojb build.xml
Date Mon, 15 Nov 2004 18:06:10 GMT
brj         2004/11/15 10:06:10

  Modified:    .        Tag: OJB_1_0_RELEASE build.xml
  Added:       src/samples Tag: OJB_1_0_RELEASE tutorial1.sh tutorial2.sh
                        tutorial2.bat
  Removed:     src/samples Tag: OJB_1_0_RELEASE repository_database.xml
                        OJB.properties repository_internal.xml
                        repository.xml repository.dtd
  Log:
  improved ant-target ojb-quickstart
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.2.1   +6 -0      db-ojb/src/samples/Attic/tutorial1.sh
  
  
  
  
  1.1.2.1   +6 -0      db-ojb/src/samples/Attic/tutorial2.sh
  
  
  
  
  1.1.2.1   +8 -0      db-ojb/src/samples/Attic/tutorial2.bat
  
  
  
  
  No                   revision
  No                   revision
  1.144.2.3 +88 -52    db-ojb/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/build.xml,v
  retrieving revision 1.144.2.2
  retrieving revision 1.144.2.3
  diff -u -r1.144.2.2 -r1.144.2.3
  --- build.xml	14 Nov 2004 21:39:51 -0000	1.144.2.2
  +++ build.xml	15 Nov 2004 18:06:10 -0000	1.144.2.3
  @@ -589,7 +589,7 @@
           <copy todir="${build.ojb-blank}/lib">
               <fileset dir="${lib}">
                   <include name="antlr*.jar"/>
  -				<include name="commons*.jar"/>
  +		<include name="commons*.jar"/>
                   <include name="hsqldb*.jar"/>
                   <include name="log4j*.jar"/>
                   <include name="torque*.jar"/>
  @@ -605,58 +605,97 @@
       </target>
   
       <!-- ================================================================== -->
  -    <!-- Build quickstart-sample                                            -->
  +    <!-- Build quickstart sample using hsqldb                               -->
       <!-- ================================================================== -->
  -    <target name="ojb-quickstart" depends="jar-debug,compile-samples-without-jdo,prepare-testdb"
  -            description="Build the quickstart project">
  +    <target name="ojb-quickstart" depends="jar-debug, compile-samples-without-jdo, prepare-testdb"
  +            description="Build a sample project">
           <property name="build.ojb-quickstart" value="${build.dir}/ojb-quickstart"/>
   
           <delete dir="${build.ojb-quickstart}" verbose="false"/>
  -        <mkdir dir="${build.ojb-quickstart}"/>
           <mkdir dir="${build.ojb-quickstart}/lib"/>
  -        <mkdir dir="${build.ojb-quickstart}/classes"/>
  +        <mkdir dir="${build.ojb-quickstart}/database"/>
   
  -        <copy file="${dist}/${archive}.jar" todir="${build.ojb-quickstart}/lib"/>
  -        <copy todir="${build.ojb-quickstart}">
  -            <fileset dir="${src.samples}">
  -                <include name="OJB.properties" />
  +	<!-- copy ojb-jars from dist -->
  +        <copy todir="${build.ojb-quickstart}/lib">
  +            <fileset dir="${dist}">
  +                <include name="${archive}.jar"/>
  +                <include name="${archive}-junit.jar"/>
  +            </fileset>
  +        </copy>
  +
  +	<!-- copy jars from lib -->
  +        <copy todir="${build.ojb-quickstart}/lib">
  +            <fileset dir="${lib}">
  +				<include name="antlr*.jar"/>
  +				<include name="commons*.jar"/>
  +                <include name="hsqldb*.jar"/>
  +                <include name="log4j*.jar"/>
  +            </fileset>
  +        </copy>
  +
  +	<!-- copy repository files, modifiy repository_database -->
  +	<copy todir="${build.ojb-quickstart}">
  +            <fileset dir="${src.test}/org/apache/ojb">
  +                <include name="OJB*.properties" />
                   <include name="repository.dtd" />
  -                <include name="repository.xml" />
                   <include name="repository_database.xml" />
                   <include name="repository_internal.xml" />
  -                <include name="repository_user.xml" />
  -                <include name="*.bat" />
               </fileset>
  +            <filterset>
  +                <filter token="JCD_ALIAS" value="${jcdAlias}" />
  +                <filter token="DBMS_NAME" value="${dbmsName}" />
  +                <filter token="JDBC_LEVEL" value="${jdbcLevel}" />
  +                <filter token="DRIVER_NAME" value="${jdbcRuntimeDriver}" />
  +                <filter token="URL_PROTOCOL" value="${urlProtocol}" />
  +                <filter token="URL_SUBPROTOCOL" value="${urlSubprotocol}" />
  +                <filter token="URL_DBALIAS" value="database/OJB" />
  +                <filter token="USER_NAME" value="${databaseUser}" />
  +                <filter token="USER_PASSWD" value="${databasePassword}" />
  +                <filter token="VALIDATION_QUERY" value="${validationQuery}" />
  +                <filter token="TEST_ON_BORROW" value="${testOnBorrow}" />
  +                <filter token="TEST_ON_RETURN" value="${testOnReturn}" />
  +            </filterset>
           </copy>
   
  -        <!-- copy the sample database -->
  +  		<!-- copy simple repository.xml from ojb-blank -->
           <copy todir="${build.ojb-quickstart}">
  -            <fileset dir="${build.test}">
  -                <include name="OJB.*" />
  -            </fileset>
  +             <fileset dir="${src.ojb-blank}/src/resources">
  +                 <include name="repository.xml" />
  +             </fileset>
  +        </copy>
  +
  +        <!-- copy the sample repository_user and skripts -->
  +        <copy todir="${build.ojb-quickstart}">
  +             <fileset dir="${src.samples}">
  +                 <include name="repository_user.xml" />
  +                 <include name="tutorial*.*" />
  +             </fileset>
  +        </copy>
  +
  +		<!-- copy cp.bat from bin -->
  +        <copy todir="${build.ojb-quickstart}">
  +             <fileset dir="${basedir}/bin">
  +                 <include name="cp.bat" />
  +             </fileset>
  +        </copy>
  +
  +        <!-- copy the sample database -->
  +        <copy todir="${build.ojb-quickstart}/database">
  +             <fileset dir="${build.test}">
  +                 <include name="OJB.*" />
  +             </fileset>
           </copy>
   
           <!-- copy the sample classes -->
           <copy todir="${build.ojb-quickstart}/classes">
  -            <fileset dir="${build.destsamples}">
  -                <include name="**/*.class" />
  -            </fileset>
  +             <fileset dir="${build.destsamples}">
  +                 <include name="**/*.class" />
  +             </fileset>
           </copy>
   
  -        <copy todir="${build.ojb-quickstart}/lib">
  -            <fileset dir="${lib}">
  -                <include name="antlr*.jar"/>
  -				<include name="commons*.jar"/>
  -                <include name="hsqldb*.jar"/>
  -                <include name="log4j*.jar"/>
  -                <include name="torque*.jar"/>
  -                <include name="velocity*.jar"/>
  -                <include name="xdoclet*.jar"/>
  -                <include name="xjavadoc*.jar"/>
  -            </fileset>
  -        </copy>
       </target>
   
  +
       <!-- ================================================================== -->
       <!-- Build the documentation                                            -->
       <!-- ================================================================== -->
  @@ -1216,10 +1255,7 @@
               <classpath refid="runtime-classpath"/>
               <!-- comma separated list of the PerfTest implementations -->
               <arg value=
  -            "org.apache.ojb.broker.OJBPerfTest$JdbcPerfTest,
  -            org.apache.ojb.broker.OJBPerfTest$PBPerfTest,
  -            org.apache.ojb.broker.OJBPerfTest$ODMGPerfTest,
  -            org.apache.ojb.broker.OJBPerfTest$OTMPerfTest"
  +            "org.apache.ojb.broker.OJBPerfTest$JdbcPerfTest,org.apache.ojb.broker.OJBPerfTest$PBPerfTest,org.apache.ojb.broker.OJBPerfTest$ODMGPerfTest,org.apache.ojb.broker.OJBPerfTest$OTMPerfTest"
               />
               <arg value="3"/> <!-- test loops, default was 3 -->
               <arg value="10"/> <!-- performed threads, default was 10 -->
  @@ -1331,22 +1367,22 @@
       </target>
   
       <!-- ================================================================== -->
  -    <!-- Compiles the sample & tutorial classes                             -->
  +    <!-- Compiles the sample & tutorial classes without jdo                 -->
       <!-- ================================================================== -->
       <target name="compile-samples-without-jdo">
  -        <mkdir dir="${build.dir}"/>
  -        <mkdir dir="${build.srcsamples}"/>
  -        <mkdir dir="${build.destsamples}"/>
  -        <copy todir="${build.srcsamples}">
  -			<fileset dir="${src.samples}">
  -			  <exclude name="org/apache/ojb/tutorial5/**"/>
  -			</fileset>
  -        </copy>
  -        <javac srcdir="${build.srcsamples}" destdir="${build.destsamples}"
  -               debug="on" deprecation="${deprecation}">
  -            <classpath refid="compilation-classpath" />
  -        </javac>
  -    </target>
  +         <mkdir dir="${build.dir}"/>
  +         <mkdir dir="${build.srcsamples}"/>
  +         <mkdir dir="${build.destsamples}"/>
  +         <copy todir="${build.srcsamples}">
  +         	<fileset dir="${src.samples}">
  +                	<exclude name="org/apache/ojb/tutorial5/**"/>
  +                </fileset>
  +         </copy>
  +         <javac srcdir="${build.srcsamples}" destdir="${build.destsamples}"
  +                debug="on" deprecation="${deprecation}">
  +             <classpath refid="compilation-classpath" />
  +         </javac>
  +     </target>
   
       <!-- ================================================================== -->
       <!-- jdo enhancer - enhancing Product class   			 				-->
  @@ -1542,4 +1578,4 @@
       <!-- End of targets                                                     -->
       <!-- ================================================================== -->
   
  -</project>
  \ No newline at end of file
  +</project>
  
  
  

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