You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by to...@apache.org on 2005/01/11 23:15:02 UTC
cvs commit: db-ojb/samples/misc/src/java/org/apache/ojb/servlet TestServlet.java
tomdz 2005/01/11 14:15:02
Modified: . Tag: OJB_1_0_RELEASE build.properties build.xml
.classpath
Added: samples/misc/src/java/org/apache/ojb/tutorials Tag:
OJB_1_0_RELEASE ODMGExample.java Product.java
PBExample.java OTMExample.java
samples/tutorial2/src/java/org/apache/ojb/tutorial2 Tag:
OJB_1_0_RELEASE UCListAllProducts.java
UCQuitApplication.java UCEditProduct.java
AbstractUseCase.java Product.java UseCase.java
UCDeleteProduct.java Application.java
UCEnterNewProduct.java
samples/tutorial5/src/java/org/apache/ojb/tutorial5 Tag:
OJB_1_0_RELEASE UCListAllProducts.java
UCDeleteProduct.java Product.java UseCase.java
Product.jdo UCQuitApplication.java
AbstractUseCase.java UCEnterNewProduct.java
Application.java UCEditProduct.java
samples/tutorial1/src/java/org/apache/ojb/tutorial1 Tag:
OJB_1_0_RELEASE UseCase.java Application.java
UCEnterNewProduct.java UCListAllProducts.java
UCQuitApplication.java UCDeleteProduct.java
Product.java UCEditProduct.java
AbstractUseCase.java
samples/misc/src/java/org/apache/ojb/servlet Tag:
OJB_1_0_RELEASE TestServlet.java
Removed: src/samples/org/apache/ojb/tutorial5 Tag: OJB_1_0_RELEASE
Product.jdo Application.java UCEnterNewProduct.java
AbstractUseCase.java UseCase.java
UCQuitApplication.java UCListAllProducts.java
UCEditProduct.java Product.java
UCDeleteProduct.java
src/samples/org/apache/ojb/tutorial2 Tag: OJB_1_0_RELEASE
UCQuitApplication.java AbstractUseCase.java
UCEnterNewProduct.java UCEditProduct.java
UCDeleteProduct.java Application.java
UCListAllProducts.java Product.java UseCase.java
src/samples/org/apache/ojb/tutorials Tag: OJB_1_0_RELEASE
ODMGExample.java OTMExample.java Product.java
PBExample.java
src/samples/org/apache/ojb/tutorial1 Tag: OJB_1_0_RELEASE
UCEnterNewProduct.java UCEditProduct.java
AbstractUseCase.java UCListAllProducts.java
UCDeleteProduct.java Application.java
UCQuitApplication.java Product.java UseCase.java
src/samples/org/apache/ojb/servlet Tag: OJB_1_0_RELEASE
TestServlet.java
Log:
Restructured samples a bit:
* moved to their own top-level folder, with each tutorial and the misc samples in their own directories
* adjusted build script accordingly
* removed samples and enhance-jdo compilation step from the main build script (is included in the quickstart target)
Revision Changes Path
No revision
No revision
1.1.2.1 +153 -0 db-ojb/samples/misc/src/java/org/apache/ojb/tutorials/Attic/ODMGExample.java
1.1.2.1 +143 -0 db-ojb/samples/misc/src/java/org/apache/ojb/tutorials/Attic/Product.java
1.1.2.1 +350 -0 db-ojb/samples/misc/src/java/org/apache/ojb/tutorials/Attic/PBExample.java
1.1.2.1 +317 -0 db-ojb/samples/misc/src/java/org/apache/ojb/tutorials/Attic/OTMExample.java
No revision
No revision
1.1.2.1 +86 -0 db-ojb/samples/tutorial2/src/java/org/apache/ojb/tutorial2/Attic/UCListAllProducts.java
1.1.2.1 +54 -0 db-ojb/samples/tutorial2/src/java/org/apache/ojb/tutorial2/Attic/UCQuitApplication.java
1.1.2.1 +96 -0 db-ojb/samples/tutorial2/src/java/org/apache/ojb/tutorial2/Attic/UCEditProduct.java
1.1.2.1 +63 -0 db-ojb/samples/tutorial2/src/java/org/apache/ojb/tutorial2/Attic/AbstractUseCase.java
1.1.2.1 +143 -0 db-ojb/samples/tutorial2/src/java/org/apache/ojb/tutorial2/Attic/Product.java
1.1.2.1 +34 -0 db-ojb/samples/tutorial2/src/java/org/apache/ojb/tutorial2/Attic/UseCase.java
1.1.2.1 +88 -0 db-ojb/samples/tutorial2/src/java/org/apache/ojb/tutorial2/Attic/UCDeleteProduct.java
1.1.2.1 +148 -0 db-ojb/samples/tutorial2/src/java/org/apache/ojb/tutorial2/Attic/Application.java
1.1.2.1 +78 -0 db-ojb/samples/tutorial2/src/java/org/apache/ojb/tutorial2/Attic/UCEnterNewProduct.java
No revision
No revision
1.64.2.3 +30 -2 db-ojb/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/db-ojb/build.properties,v
retrieving revision 1.64.2.2
retrieving revision 1.64.2.3
diff -u -r1.64.2.2 -r1.64.2.3
--- build.properties 8 Sep 2004 20:06:38 -0000 1.64.2.2
+++ build.properties 11 Jan 2005 22:15:01 -0000 1.64.2.3
@@ -80,7 +80,7 @@
src.java=${src.dir}/java
src.test=${src.dir}/test
src.tools=${src.dir}/tools
-src.samples=${src.dir}/samples
+src.samples=samples
src.jca=${src.dir}/jca
src.doc=${src.dir}/doc
src.forrest=${src.doc}/forrest
@@ -124,6 +124,34 @@
# Default compilation properties.
# build.compiler=modern
deprecation=true
+
+# ojb-blank and tutorial properties
+ojb-blank.resource.includes=OJB*.properties,repository.dtd,repository_database.xml,repository_internal.xml
+ojb-blank.lib.includes=antlr*.jar,commons*.jar,hsqldb*.jar,log4j*.jar,torque*.jar,velocity*.jar,xdoclet*.jar,xjavadoc*.jar
+
+tutorial1.src.dir=${src.samples}/tutorial1/src/java
+tutorial1.src.includes=org/apache/ojb/tutorial1/**
+tutorial1.database.name=tutorial1
+tutorial1.src-jar.name=tutorial1-src.jar
+tutorial1.quickstart-jar.name=tutorial1-quickstart.jar
+tutorial1.main.class=org.apache.ojb.tutorial1.Application
+
+tutorial2.src.dir=${src.samples}/tutorial2/src/java
+tutorial2.src.includes=org/apache/ojb/tutorial2/**
+tutorial2.database.name=tutorial2
+tutorial2.src-jar.name=tutorial2-src.jar
+tutorial2.quickstart-jar.name=tutorial2-quickstart.jar
+tutorial2.main.class=org.apache.ojb.tutorial2.Application
+
+tutorial5.src.dir=${src.samples}/tutorial5/src/java
+tutorial5.src.includes=org/apache/ojb/tutorial5/**
+tutorial5.database.name=tutorial5
+tutorial5.src-jar.name=tutorial5-src.jar
+tutorial5.main.class=org.apache.ojb.tutorial5.Application
+
+miscsamples.src.dir=${src.samples}/misc/src/java
+miscsamples.src.includes=**
+miscsamples.src-jar.name=misc-samples-src.jar
#
# Documentation properties
1.144.2.10 +58 -78 db-ojb/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/db-ojb/build.xml,v
retrieving revision 1.144.2.9
retrieving revision 1.144.2.10
diff -u -r1.144.2.9 -r1.144.2.10
--- build.xml 5 Jan 2005 19:59:15 -0000 1.144.2.9
+++ build.xml 11 Jan 2005 22:15:01 -0000 1.144.2.10
@@ -277,7 +277,7 @@
<!-- cleanup, preprocessing, compile and building -->
<!-- of oql parser and documentation -->
<!-- ================================================================== -->
- <target name="all" depends="clean,preprocess,oql,main,ojb-blank,tutorials-jar,doc"
+ <target name="all" depends="clean,preprocess,oql,main,ojb-blank,tutorial-jars,doc"
description="rebuild all sources (incl. preprocessing)"/>
<!-- ================================================================== -->
@@ -541,15 +541,34 @@
</target>
<!-- ================================================================== -->
- <!-- Build sample jar-file for a new project -->
+ <!-- Build tutorial src jar-files -->
<!-- ================================================================== -->
- <target name="tutorials-jar"
- description="Build a jar containing the sources of the tutorial and sample classes">
- <delete file="${dist}/tutorials-src.jar"/>
- <jar jarfile="${dist}/tutorials-src.jar"
- basedir="${src.samples}"
- includes="**"/>
- </target>
+ <target name="tutorial-jars"
+ description="Build jars containing the sources of the tutorials and sample classes">
+ <delete file="${dist}/${tutorial1.src-jar.name}"
+ failonerror="false"/>
+ <jar jarfile="${dist}/${tutorial1.src-jar.name}"
+ basedir="${tutorial1.src.dir}"
+ includes="${tutorial1.src.includes}"/>
+
+ <delete file="${dist}/${tutorial2.src-jar.name}"
+ failonerror="false"/>
+ <jar jarfile="${dist}/${tutorial2.src-jar.name}"
+ basedir="${tutorial2.src.dir}"
+ includes="${tutorial2.src.includes}"/>
+
+ <delete file="${dist}/${tutorial5.src-jar.name}"
+ failonerror="false"/>
+ <jar jarfile="${dist}/${tutorial5.src-jar.name}"
+ basedir="${tutorial5.src.dir}"
+ includes="${tutorial5.src.includes}"/>
+
+ <delete file="${dist}/${miscsamples.src-jar.name}"
+ failonerror="false"/>
+ <jar jarfile="${dist}/${miscsamples.src-jar.name}"
+ basedir="${miscsamples.src.dir}"
+ includes="${miscsamples.src.includes}"/>
+ </target>
<!-- ================================================================== -->
<!-- Build sample jar-file for a new project -->
@@ -570,12 +589,8 @@
<copy file="${dist}/${archive}.jar" todir="${build.ojb-blank}/lib"/>
<copy todir="${build.ojb-blank}/src/resources">
- <fileset dir="${src.test}/org/apache/ojb">
- <include name="OJB*.properties" />
- <include name="repository.dtd" />
- <include name="repository_database.xml" />
- <include name="repository_internal.xml" />
- </fileset>
+ <fileset dir="${src.test}/org/apache/ojb"
+ includes="${ojb-blank.resource.includes}"/>
<filterset>
<filter token="VALIDATION_QUERY" value="${validationQuery}"/>
<filter token="TEST_ON_BORROW" value="${testOnBorrow}"/>
@@ -598,16 +613,8 @@
<copy file="build-torque.xml" todir="${build.ojb-blank}/src/schema"/>
<copy todir="${build.ojb-blank}/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>
+ <fileset dir="${lib}"
+ includes="${ojb-blank.lib.includes}"/>
</copy>
<jar jarfile="${dist}/ojb-blank.jar"
@@ -630,64 +637,63 @@
<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>
+ <fileset dir="${tutorial1.src.dir}"
+ includes="${tutorial1.src.includes}"/>
</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="databaseName" value="${tutorial1.database.name}"/>
+ <property name="jar.name" value="${tutorial1.quickstart-jar.name}"/>
+ <property name="source.main.class" value="${tutorial1.main.class}"/>
<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"/>
+ <property name="torque.database.createUrl" value="jdbc:hsqldb:${build.ojb-quickstart}/build/database/${tutorial1.database.name}"/>
</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="databaseName" value="${tutorial1.database.name}"/>
+ <property name="jar.name" value="${tutorial1.quickstart-jar.name}"/>
+ <property name="source.main.class" value="${tutorial1.main.class}"/>
<property name="target.dir" value="target"/>
- <property name="torque.database.createUrl" value="jdbc:hsqldb:${build.ojb-quickstart}/build/database/tutorial1"/>
+ <property name="torque.database.createUrl" value="jdbc:hsqldb:${build.ojb-quickstart}/build/database/${tutorial1.database.name}"/>
</ant>
- <move file="${build.ojb-quickstart}/target/tutorial1-quickstart.jar" todir="${dist}"/>
+ <move file="${build.ojb-quickstart}/target/${tutorial1.quickstart-jar.name}" 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>
+ <fileset dir="${tutorial2.src.dir}"
+ includes="${tutorial2.src.includes}"/>
</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="databaseName" value="${tutorial2.database.name}"/>
+ <property name="jar.name" value="${tutorial2.quickstart-jar.name}"/>
+ <property name="source.main.class" value="${tutorial2.main.class}"/>
<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"/>
+ <property name="torque.database.createUrl" value="jdbc:hsqldb:${build.ojb-quickstart}/build/database/${tutorial2.database.name}"/>
</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="databaseName" value="${tutorial2.database.name}"/>
+ <property name="jar.name" value="${tutorial2.quickstart-jar.name}"/>
+ <property name="source.main.class" value="${tutorial2.main.class}"/>
<property name="target.dir" value="target"/>
- <property name="torque.database.createUrl" value="jdbc:hsqldb:${build.ojb-quickstart}/build/database/tutorial2"/>
+ <property name="torque.database.createUrl" value="jdbc:hsqldb:${build.ojb-quickstart}/build/database/${tutorial2.database.name}"/>
</ant>
- <move file="${build.ojb-quickstart}/target/tutorial2-quickstart.jar" todir="${dist}"/>
+ <move file="${build.ojb-quickstart}/target/${tutorial2.quickstart-jar.name}" todir="${dist}"/>
+ <!-- The webapp sample does not rely ojb-blank so we simply put it together and jar it -->
</target>
@@ -724,7 +730,7 @@
tofile="${forrest.staticfiles.destdir}/repository_junit.xml.txt" />
<copy file="${forrest.staticfiles.srcdir}/repository_user.xml"
tofile="${forrest.staticfiles.destdir}/repository_user.xml.txt" />
- <copy file="${src.samples}/org/apache/ojb/tutorials/PBExample.java"
+ <copy file="${miscsamples.src.dir}/org/apache/ojb/tutorials/PBExample.java"
tofile="${forrest.staticfiles.destdir}/PBExamples.txt" />
<copy file="${forrest.staticfiles.srcdir}/OJB.properties"
tofile="${forrest.staticfiles.destdir}/OJB.properties.txt" />
@@ -928,7 +934,7 @@
<!-- and documentation -->
<!-- ================================================================== -->
<target name="release"
- depends="clean,with-jdori,jar,source,docs,tarball,website,contrib,ojb-blank,tutorials-jar"
+ depends="clean,with-jdori,jar,source,docs,tarball,website,contrib,ojb-blank,tutorial-jars"
description="Cleans and builds all release archives." />
<!-- ================================================================== -->
@@ -1342,32 +1348,6 @@
<java fork="yes" classname="org.apache.ojb.tools.mapping.reversedb2.Main"
dir="${build.test}" taskname="reversedb2" failonerror="false" >
<classpath refid="runtime-classpath"/>
- </java>
- </target>
-
- <!-- ================================================================== -->
- <!-- Compiles the sample & tutorial classes -->
- <!-- ================================================================== -->
- <target name="compile-samples">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${build.srcsamples}"/>
- <mkdir dir="${build.destsamples}"/>
- <copy todir="${build.srcsamples}">
- <fileset dir="${src.samples}"/>
- </copy>
- <javac srcdir="${build.srcsamples}" destdir="${build.destsamples}"
- debug="on" deprecation="${deprecation}">
- <classpath refid="compilation-classpath" />
- </javac>
- </target>
-
- <!-- ================================================================== -->
- <!-- jdo enhancer - enhancing Product class -->
- <!-- ================================================================== -->
- <target name="enhance-jdori" depends="compile-samples">
- <java fork="yes" failonerror="yes"
- classname="com.sun.jdori.enhancer.Main" classpathref="compilation-classpath">
- <arg line="-v -f -d ${build.destsamples} ${build.srcsamples}/org/apache/ojb/tutorial5/Product.jdo ${build.destsamples}/org/apache/ojb/tutorial5/Product.class"/>
</java>
</target>
1.35.2.1 +4 -1 db-ojb/.classpath
Index: .classpath
===================================================================
RCS file: /home/cvs/db-ojb/.classpath,v
retrieving revision 1.35
retrieving revision 1.35.2.1
diff -u -r1.35 -r1.35.2.1
--- .classpath 22 Jun 2004 20:46:48 -0000 1.35
+++ .classpath 11 Jan 2005 22:15:01 -0000 1.35.2.1
@@ -2,7 +2,10 @@
<classpath>
<classpathentry sourcepath="JRE_SRC" kind="var" path="JRE_LIB"/>
<classpathentry kind="src" path="src/java"/>
- <classpathentry kind="src" path="src/samples"/>
+ <classpathentry kind="src" path="samples/misc/src/java"/>
+ <classpathentry kind="src" path="samples/tutorial1/src/java"/>
+ <classpathentry kind="src" path="samples/tutorial2/src/java"/>
+ <classpathentry kind="src" path="samples/tutorial5/src/java"/>
<classpathentry kind="src" path="src/test"/>
<classpathentry kind="src" path="src/jdori"/>
<classpathentry kind="src" path="src/prevayler"/>
No revision
No revision
1.1.2.1 +87 -0 db-ojb/samples/tutorial5/src/java/org/apache/ojb/tutorial5/Attic/UCListAllProducts.java
1.1.2.1 +98 -0 db-ojb/samples/tutorial5/src/java/org/apache/ojb/tutorial5/Attic/UCDeleteProduct.java
1.1.2.1 +143 -0 db-ojb/samples/tutorial5/src/java/org/apache/ojb/tutorial5/Attic/Product.java
1.1.2.1 +34 -0 db-ojb/samples/tutorial5/src/java/org/apache/ojb/tutorial5/Attic/UseCase.java
1.1.2.1 +50 -0 db-ojb/samples/tutorial5/src/java/org/apache/ojb/tutorial5/Attic/Product.jdo
1.1.2.1 +54 -0 db-ojb/samples/tutorial5/src/java/org/apache/ojb/tutorial5/Attic/UCQuitApplication.java
1.1.2.1 +64 -0 db-ojb/samples/tutorial5/src/java/org/apache/ojb/tutorial5/Attic/AbstractUseCase.java
1.1.2.1 +78 -0 db-ojb/samples/tutorial5/src/java/org/apache/ojb/tutorial5/Attic/UCEnterNewProduct.java
1.1.2.1 +151 -0 db-ojb/samples/tutorial5/src/java/org/apache/ojb/tutorial5/Attic/Application.java
1.1.2.1 +105 -0 db-ojb/samples/tutorial5/src/java/org/apache/ojb/tutorial5/Attic/UCEditProduct.java
No revision
No revision
1.1.2.1 +34 -0 db-ojb/samples/tutorial1/src/java/org/apache/ojb/tutorial1/Attic/UseCase.java
1.1.2.1 +144 -0 db-ojb/samples/tutorial1/src/java/org/apache/ojb/tutorial1/Attic/Application.java
1.1.2.1 +83 -0 db-ojb/samples/tutorial1/src/java/org/apache/ojb/tutorial1/Attic/UCEnterNewProduct.java
1.1.2.1 +77 -0 db-ojb/samples/tutorial1/src/java/org/apache/ojb/tutorial1/Attic/UCListAllProducts.java
1.1.2.1 +55 -0 db-ojb/samples/tutorial1/src/java/org/apache/ojb/tutorial1/Attic/UCQuitApplication.java
1.1.2.1 +85 -0 db-ojb/samples/tutorial1/src/java/org/apache/ojb/tutorial1/Attic/UCDeleteProduct.java
1.1.2.1 +143 -0 db-ojb/samples/tutorial1/src/java/org/apache/ojb/tutorial1/Attic/Product.java
1.1.2.1 +96 -0 db-ojb/samples/tutorial1/src/java/org/apache/ojb/tutorial1/Attic/UCEditProduct.java
1.1.2.1 +63 -0 db-ojb/samples/tutorial1/src/java/org/apache/ojb/tutorial1/Attic/AbstractUseCase.java
No revision
No revision
1.1.2.1 +150 -0 db-ojb/samples/misc/src/java/org/apache/ojb/servlet/Attic/TestServlet.java
---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org