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/12 22:23:07 UTC
cvs commit: db-ojb/samples/tutorial1-struts/src/webapp/META-INF context.xml
tomdz 2005/01/12 13:23:07
Modified: . Tag: OJB_1_0_RELEASE build.properties build.xml
.classpath
Added: samples/tutorial1-struts/src/resources Tag: OJB_1_0_RELEASE
repository.xml log4j.properties
application.properties
samples/tutorial1-struts/src/java/org/apache/ojb/tutorial1struts
Tag: OJB_1_0_RELEASE StartupAction.java
EditProductAction.java DeleteProductAction.java
SaveProductAction.java ListAllProductsAction.java
ProductDAO.java Product.java WebappConstants.java
ProductForm.java
samples/tutorial1-struts/src/webapp/WEB-INF/taglibs Tag:
OJB_1_0_RELEASE struts-logic.tld
struts-tiles-el.tld struts-tiles.tld
struts-logic-el.tld fmt.tld struts-nested.tld
struts-html-el.tld c-1_0.tld struts-bean.tld
struts-template.tld struts-html.tld
struts-bean-el.tld c.tld
samples/tutorial1-struts Tag: OJB_1_0_RELEASE .classpath
tomcat-task.properties build.xml .project README
build.properties
samples/tutorial1-struts/src/webapp Tag: OJB_1_0_RELEASE
styles.css editProduct.jsp index.jsp
listAllProducts.jsp
samples/tutorial1-struts/lib Tag: OJB_1_0_RELEASE jstl.jar
standard.jar struts.jar commons-digester.jar
struts-el.jar
samples/tutorial1-struts/src/webapp/WEB-INF Tag:
OJB_1_0_RELEASE validator-rules.xml tiles-defs.xml
struts-config.xml web.xml validation.xml
samples/tutorial1-struts/src/webapp/META-INF Tag:
OJB_1_0_RELEASE context.xml
Log:
Added a webapp sample based on the tutorial 1
Revision Changes Path
No revision
No revision
1.1.2.1 +54 -0 db-ojb/samples/tutorial1-struts/src/resources/Attic/repository.xml
1.1.2.1 +67 -0 db-ojb/samples/tutorial1-struts/src/resources/Attic/log4j.properties
1.1.2.1 +25 -0 db-ojb/samples/tutorial1-struts/src/resources/Attic/application.properties
No revision
No revision
1.1.2.1 +49 -0 db-ojb/samples/tutorial1-struts/src/java/org/apache/ojb/tutorial1struts/Attic/StartupAction.java
1.1.2.1 +58 -0 db-ojb/samples/tutorial1-struts/src/java/org/apache/ojb/tutorial1struts/Attic/EditProductAction.java
1.1.2.1 +49 -0 db-ojb/samples/tutorial1-struts/src/java/org/apache/ojb/tutorial1struts/Attic/DeleteProductAction.java
1.1.2.1 +62 -0 db-ojb/samples/tutorial1-struts/src/java/org/apache/ojb/tutorial1struts/Attic/SaveProductAction.java
1.1.2.1 +47 -0 db-ojb/samples/tutorial1-struts/src/java/org/apache/ojb/tutorial1struts/Attic/ListAllProductsAction.java
1.1.2.1 +255 -0 db-ojb/samples/tutorial1-struts/src/java/org/apache/ojb/tutorial1struts/Attic/ProductDAO.java
1.1.2.1 +143 -0 db-ojb/samples/tutorial1-struts/src/java/org/apache/ojb/tutorial1struts/Attic/Product.java
1.1.2.1 +34 -0 db-ojb/samples/tutorial1-struts/src/java/org/apache/ojb/tutorial1struts/Attic/WebappConstants.java
1.1.2.1 +173 -0 db-ojb/samples/tutorial1-struts/src/java/org/apache/ojb/tutorial1struts/Attic/ProductForm.java
No revision
No revision
1.1.2.1 +652 -0 db-ojb/samples/tutorial1-struts/src/webapp/WEB-INF/taglibs/Attic/struts-logic.tld
1.1.2.1 +343 -0 db-ojb/samples/tutorial1-struts/src/webapp/WEB-INF/taglibs/Attic/struts-tiles-el.tld
1.1.2.1 +344 -0 db-ojb/samples/tutorial1-struts/src/webapp/WEB-INF/taglibs/Attic/struts-tiles.tld
1.1.2.1 +382 -0 db-ojb/samples/tutorial1-struts/src/webapp/WEB-INF/taglibs/Attic/struts-logic-el.tld
1.1.2.1 +671 -0 db-ojb/samples/tutorial1-struts/src/webapp/WEB-INF/taglibs/Attic/fmt.tld
1.1.2.1 +2886 -0 db-ojb/samples/tutorial1-struts/src/webapp/WEB-INF/taglibs/Attic/struts-nested.tld
1.1.2.1 +3032 -0 db-ojb/samples/tutorial1-struts/src/webapp/WEB-INF/taglibs/Attic/struts-html-el.tld
1.1.2.1 +416 -0 db-ojb/samples/tutorial1-struts/src/webapp/WEB-INF/taglibs/Attic/c-1_0.tld
1.1.2.1 +382 -0 db-ojb/samples/tutorial1-struts/src/webapp/WEB-INF/taglibs/Attic/struts-bean.tld
1.1.2.1 +73 -0 db-ojb/samples/tutorial1-struts/src/webapp/WEB-INF/taglibs/Attic/struts-template.tld
1.1.2.1 +3032 -0 db-ojb/samples/tutorial1-struts/src/webapp/WEB-INF/taglibs/Attic/struts-html.tld
1.1.2.1 +212 -0 db-ojb/samples/tutorial1-struts/src/webapp/WEB-INF/taglibs/Attic/struts-bean-el.tld
1.1.2.1 +563 -0 db-ojb/samples/tutorial1-struts/src/webapp/WEB-INF/taglibs/Attic/c.tld
No revision
No revision
1.1.2.1 +16 -0 db-ojb/samples/tutorial1-struts/Attic/.classpath
1.1.2.1 +11 -0 db-ojb/samples/tutorial1-struts/Attic/tomcat-task.properties
1.1.2.1 +280 -0 db-ojb/samples/tutorial1-struts/Attic/build.xml
1.1.2.1 +17 -0 db-ojb/samples/tutorial1-struts/Attic/.project
1.1.2.1 +40 -0 db-ojb/samples/tutorial1-struts/Attic/README
1.1.2.1 +95 -0 db-ojb/samples/tutorial1-struts/Attic/build.properties
No revision
No revision
1.64.2.4 +5 -1 db-ojb/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/db-ojb/build.properties,v
retrieving revision 1.64.2.3
retrieving revision 1.64.2.4
diff -u -r1.64.2.3 -r1.64.2.4
--- build.properties 11 Jan 2005 22:15:01 -0000 1.64.2.3
+++ build.properties 12 Jan 2005 21:23:04 -0000 1.64.2.4
@@ -153,6 +153,10 @@
miscsamples.src.includes=**
miscsamples.src-jar.name=misc-samples-src.jar
+webapp-sample.src.dir=${src.samples}/tutorial1-struts
+webapp-sample.resource.includes=OJB*.properties,repository.dtd,repository_internal.xml
+webapp-sample.lib.includes=antlr*.jar,commons*.jar,hsqldb*.jar,log4j*.jar,torque*.jar,velocity*.jar,xdoclet*.jar,xjavadoc*.jar
+
#
# Documentation properties
#
1.144.2.11 +60 -6 db-ojb/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/db-ojb/build.xml,v
retrieving revision 1.144.2.10
retrieving revision 1.144.2.11
diff -u -r1.144.2.10 -r1.144.2.11
--- build.xml 11 Jan 2005 22:15:01 -0000 1.144.2.10
+++ build.xml 12 Jan 2005 21:23:04 -0000 1.144.2.11
@@ -277,7 +277,7 @@
<!-- cleanup, preprocessing, compile and building -->
<!-- of oql parser and documentation -->
<!-- ================================================================== -->
- <target name="all" depends="clean,preprocess,oql,main,ojb-blank,tutorial-jars,doc"
+ <target name="all" depends="clean,preprocess,oql,main,ojb-blank,sample-jars,webapp-sample,doc"
description="rebuild all sources (incl. preprocessing)"/>
<!-- ================================================================== -->
@@ -541,28 +541,32 @@
</target>
<!-- ================================================================== -->
- <!-- Build tutorial src jar-files -->
+ <!-- Build the sample jar-files -->
<!-- ================================================================== -->
- <target name="tutorial-jars"
+ <target name="sample-jars"
description="Build jars containing the sources of the tutorials and sample classes">
+ <!-- Tutorial 1 src -->
<delete file="${dist}/${tutorial1.src-jar.name}"
failonerror="false"/>
<jar jarfile="${dist}/${tutorial1.src-jar.name}"
basedir="${tutorial1.src.dir}"
includes="${tutorial1.src.includes}"/>
+ <!-- Tutorial 1 src -->
<delete file="${dist}/${tutorial2.src-jar.name}"
failonerror="false"/>
<jar jarfile="${dist}/${tutorial2.src-jar.name}"
basedir="${tutorial2.src.dir}"
includes="${tutorial2.src.includes}"/>
+ <!-- Tutorial 1 src -->
<delete file="${dist}/${tutorial5.src-jar.name}"
failonerror="false"/>
<jar jarfile="${dist}/${tutorial5.src-jar.name}"
basedir="${tutorial5.src.dir}"
includes="${tutorial5.src.includes}"/>
+ <!-- Misc src -->
<delete file="${dist}/${miscsamples.src-jar.name}"
failonerror="false"/>
<jar jarfile="${dist}/${miscsamples.src-jar.name}"
@@ -693,9 +697,59 @@
</ant>
<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>
+ <!-- ================================================================== -->
+ <!-- Build the webapp sample -->
+ <!-- ================================================================== -->
+ <target name="webapp-sample"
+ depends="init,jar-debug"
+ description="Build the webapp sample">
+ <mkdir dir="${build.dir}/webapp-sample"/>
+ <copy todir="${build.dir}/webapp-sample">
+ <fileset dir="${webapp-sample.src.dir}"
+ excludes="**/*.jar"/>
+ <filterset>
+ <filter token="OJB_JAR" value="${archive}.jar"/>
+ </filterset>
+ </copy>
+ <copy todir="${build.dir}/webapp-sample">
+ <fileset dir="${webapp-sample.src.dir}"
+ includes="**/*.jar"/>
+ </copy>
+ <!-- The sample comes only with libraries that OJB itself does not need
+ i.e. Struts (1.2.4) and JSTL (jakarta implementation). All other
+ libs will be copied from OJB's lib folder -->
+ <copy todir="${build.dir}/webapp-sample/lib">
+ <fileset dir="${lib}"
+ includes="${webapp-sample.lib.includes}"/>
+ </copy>
+ <copy file="${dist}/${archive}.jar"
+ todir="${build.dir}/webapp-sample/lib"/>
+ <!-- Likewise we copy common resource files -->
+ <mkdir dir="${build.dir}/webapp-sample/src/schema"/>
+ <copy todir="${build.dir}/webapp-sample/src/schema">
+ <fileset dir="${source}/schema">
+ <include name="ojbcore-schema.xml"/>
+ </fileset>
+ </copy>
+ <copy file="build-torque.xml" todir="${build.dir}/webapp-sample/src/schema"/>
+
+ <copy todir="${build.dir}/webapp-sample/src/resources">
+ <fileset dir="${src.test}/org/apache/ojb"
+ includes="${webapp-sample.resource.includes}"/>
+ <filterset>
+ <filter token="VALIDATION_QUERY" value="${validationQuery}"/>
+ <filter token="TEST_ON_BORROW" value="${testOnBorrow}"/>
+ <filter token="TEST_ON_RETURN" value="${testOnReturn}"/>
+ </filterset>
+ </copy>
+
+ <!-- Note that we don't pre-build the webapp simply because it will get too big -->
+ <jar jarfile="${dist}/webapp-sample.jar"
+ basedir="${build.dir}"
+ includes="webapp-sample/**"/>
+ </target>
<!-- ================================================================== -->
<!-- Build the documentation -->
@@ -934,7 +988,7 @@
<!-- and documentation -->
<!-- ================================================================== -->
<target name="release"
- depends="clean,with-jdori,jar,source,docs,tarball,website,contrib,ojb-blank,tutorial-jars"
+ depends="clean,with-jdori,jar,source,docs,tarball,website,contrib,ojb-blank,sample-jars,webapp-sample"
description="Cleans and builds all release archives." />
<!-- ================================================================== -->
1.35.2.2 +2 -0 db-ojb/.classpath
Index: .classpath
===================================================================
RCS file: /home/cvs/db-ojb/.classpath,v
retrieving revision 1.35.2.1
retrieving revision 1.35.2.2
diff -u -r1.35.2.1 -r1.35.2.2
--- .classpath 11 Jan 2005 22:15:01 -0000 1.35.2.1
+++ .classpath 12 Jan 2005 21:23:05 -0000 1.35.2.2
@@ -2,6 +2,7 @@
<classpath>
<classpathentry sourcepath="JRE_SRC" kind="var" path="JRE_LIB"/>
<classpathentry kind="src" path="src/java"/>
+ <classpathentry kind="src" path="samples/tutorial1-struts/src/java"/>
<classpathentry kind="src" path="samples/misc/src/java"/>
<classpathentry kind="src" path="samples/tutorial1/src/java"/>
<classpathentry kind="src" path="samples/tutorial2/src/java"/>
@@ -38,5 +39,6 @@
<classpathentry kind="lib" path="lib/ant-1.6.0.jar"/>
<classpathentry kind="lib" path="lib/ant-junit.jar"/>
<classpathentry kind="lib" path="lib/ant-launcher.jar"/>
+ <classpathentry kind="lib" path="samples/tutorial1-struts/lib/struts.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
No revision
No revision
1.1.2.1 +177 -0 db-ojb/samples/tutorial1-struts/src/webapp/Attic/styles.css
1.1.2.1 +57 -0 db-ojb/samples/tutorial1-struts/src/webapp/Attic/editProduct.jsp
1.1.2.1 +4 -0 db-ojb/samples/tutorial1-struts/src/webapp/Attic/index.jsp
1.1.2.1 +52 -0 db-ojb/samples/tutorial1-struts/src/webapp/Attic/listAllProducts.jsp
No revision
No revision
1.1.2.1 +131 -0 db-ojb/samples/tutorial1-struts/lib/Attic/jstl.jar
<<Binary file>>
1.1.2.1 +2034 -0 db-ojb/samples/tutorial1-struts/lib/Attic/standard.jar
<<Binary file>>
1.1.2.1 +2586 -0 db-ojb/samples/tutorial1-struts/lib/Attic/struts.jar
<<Binary file>>
1.1.2.1 +375 -0 db-ojb/samples/tutorial1-struts/lib/Attic/commons-digester.jar
<<Binary file>>
1.1.2.1 +876 -0 db-ojb/samples/tutorial1-struts/lib/Attic/struts-el.jar
<<Binary file>>
No revision
No revision
1.1.2.1 +287 -0 db-ojb/samples/tutorial1-struts/src/webapp/WEB-INF/Attic/validator-rules.xml
1.1.2.1 +42 -0 db-ojb/samples/tutorial1-struts/src/webapp/WEB-INF/Attic/tiles-defs.xml
1.1.2.1 +139 -0 db-ojb/samples/tutorial1-struts/src/webapp/WEB-INF/Attic/struts-config.xml
1.1.2.1 +106 -0 db-ojb/samples/tutorial1-struts/src/webapp/WEB-INF/Attic/web.xml
1.1.2.1 +58 -0 db-ojb/samples/tutorial1-struts/src/webapp/WEB-INF/Attic/validation.xml
No revision
No revision
1.1.2.1 +13 -0 db-ojb/samples/tutorial1-struts/src/webapp/META-INF/Attic/context.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org