Update of /cvsroot/xdoclet/xdoclet/samples
In directory sc8-pr-cvs1:/tmp/cvs-serv29348/samples
Modified Files:
build.xml
Added Files:
build-dist.properties
Log Message:
Finally fixed the distribution samples. Now they build!
--- NEW FILE: build-dist.properties ---
# These properties are only used when building the samples expanded from the
distribution.
lib.dir = ${xdoclet.root.dir}/lib
dist.lib.dir = ${lib.dir}
samples.dir = ${xdoclet.root.dir}/samples
samples.dist.dir = ${samples.dir}/target
samples.lib.dir = ${samples.dir}/lib
samples.src.dir = ${samples.dir}/src
samples.java.dir = ${samples.src.dir}/java
samples.gen-src.dir = ${samples.dist.dir}/gen-src
samples.meta-inf.dir = ${samples.dist.dir}/meta-inf
samples.web-inf.dir = ${samples.dist.dir}/web-inf
samples.merge.dir = ${samples.src.dir}/merge
samples.classes.dir = ${samples.dist.dir}/classes
samples.web.dir = ${samples.src.dir}/web
samples.xdoclet.force = false
Index: build.xml
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/samples/build.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** build.xml 13 Dec 2002 16:45:34 -0000 1.30
--- build.xml 15 Dec 2002 12:44:26 -0000 1.31
***************
*** 2,9 ****
<project name="XDoclet Examples" default="jar" basedir=".">
-
<property name="xdoclet.root.dir" value="${basedir}/.."/>
<property file="${xdoclet.root.dir}/build.properties"/>
<!-- See CustomerBean. This is to demonstrate property substitution. -->
<property name="ejb.prefix" value="blah"/>
--- 2,13 ----
<project name="XDoclet Examples" default="jar" basedir=".">
<property name="xdoclet.root.dir" value="${basedir}/.."/>
<property file="${xdoclet.root.dir}/build.properties"/>
+ <!-- Include the build-dist properties. Since properties are immutable,
+ this will not override available properties. You do not have to include
+ this in your own build file. -->
+ <property file="build-dist.properties"/>
+
<!-- See CustomerBean. This is to demonstrate property substitution. -->
<property name="ejb.prefix" value="blah"/>
***************
*** 55,64 ****
classname="xdoclet.modules.jdo.JdoDocletTask"
classpathref="samples.class.path"
! />
! <taskdef
! name="hibernatedoclet"
! classname="xdoclet.modules.hibernate.HibernateDocletTask"
classpathref="samples.class.path"
! />
</target>
--- 59,68 ----
classname="xdoclet.modules.jdo.JdoDocletTask"
classpathref="samples.class.path"
! />
! <taskdef
! name="hibernatedoclet"
! classname="xdoclet.modules.hibernate.HibernateDocletTask"
classpathref="samples.class.path"
! />
</target>
***************
*** 77,85 ****
<target name="ejbdoclet" depends="prepare">
!
<echo>+--------------------------------------------------------------------+</echo>
! <echo>|
|</echo>
! <echo>| R U N N I N G E J B D O C L E T
|</echo>
! <echo>|
|</echo>
!
<echo>+--------------------------------------------------------------------+</echo>
<ejbdoclet
--- 81,89 ----
<target name="ejbdoclet" depends="prepare">
! <echo>+---------------------------------------------------+</echo>
! <echo>| |</echo>
! <echo>| R U N N I N G E J B D O C L E T |</echo>
! <echo>| |</echo>
! <echo>+---------------------------------------------------+</echo>
<ejbdoclet
***************
*** 186,194 ****
<target name="webdoclet" depends="prepare">
!
<echo>+--------------------------------------------------------------------+</echo>
! <echo>|
|</echo>
! <echo>| R U N N I N G W E B D O C L E T
|</echo>
! <echo>|
|</echo>
!
<echo>+--------------------------------------------------------------------+</echo>
<webdoclet
--- 190,198 ----
<target name="webdoclet" depends="prepare">
! <echo>+---------------------------------------------------+</echo>
! <echo>| |</echo>
! <echo>| R U N N I N G W E B D O C L E T |</echo>
! <echo>| |</echo>
! <echo>+---------------------------------------------------+</echo>
<webdoclet
***************
*** 252,260 ****
<target name="jmxdoclet" depends="prepare">
!
<echo>+--------------------------------------------------------------------+</echo>
! <echo>|
|</echo>
! <echo>| R U N N I N G J M X D O C L E T
|</echo>
! <echo>|
|</echo>
!
<echo>+--------------------------------------------------------------------+</echo>
<jmxdoclet
--- 256,264 ----
<target name="jmxdoclet" depends="prepare">
! <echo>+---------------------------------------------------+</echo>
! <echo>| |</echo>
! <echo>| R U N N I N G J M X D O C L E T |</echo>
! <echo>| |</echo>
! <echo>+---------------------------------------------------+</echo>
<jmxdoclet
***************
*** 291,299 ****
<target name="jdodoclet" depends="prepare">
!
<echo>+--------------------------------------------------------------------+</echo>
! <echo>|
|</echo>
! <echo>| R U N N I N G J D O D O C L E T
|</echo>
! <echo>|
|</echo>
!
<echo>+--------------------------------------------------------------------+</echo>
<jdodoclet
--- 295,303 ----
<target name="jdodoclet" depends="prepare">
! <echo>+---------------------------------------------------+</echo>
! <echo>| |</echo>
! <echo>| R U N N I N G J D O D O C L E T |</echo>
! <echo>| |</echo>
! <echo>+---------------------------------------------------+</echo>
<jdodoclet
***************
*** 359,390 ****
<target name="hibernate" depends="prepare" description="Generate mapping
documents (run jar first)">
!
<echo>+--------------------------------------------------------------------+</echo>
! <echo>|
|</echo>
! <echo>| R U N N I N G H I B E R N A T E D O C L E T
|</echo>
! <echo>|
|</echo>
!
<echo>+--------------------------------------------------------------------+</echo>
!
! <hibernatedoclet
! destdir="${samples.gen-src.dir}"
! mergedir="${samples.src.dir}"
! excludedtags="@version,@author,@todo,@see"
! addedtags="@xdoclet-generated at ${TODAY},@copyright The XDoclet
Team,@author XDoclet,@version ${version}"
! force="${samples.xdoclet.force}"
! verbose="false">
! <fileset dir="${samples.java.dir}">
! <include name="test/hibernate/*.java"/>
! </fileset>
! <hibernate/>
! <jbossservice
! destdir="${samples.meta-inf.dir}"
! jndiname="java:/hibernate/Samples"
! servicename="HibernateSamples"
! dialect="cirrus.hibernate.sql.HypesonicDialect"
! datasource="java:/DefaultDS"
! username="foo bar"
! password="blurge"/>
</hibernatedoclet>
--- 363,394 ----
<target name="hibernate" depends="prepare" description="Generate mapping
documents (run jar first)">
! <echo>+---------------------------------------------------+</echo>
! <echo>| |</echo>
! <echo>| R U N N I N G H I B E R N A T E D O C L E T |</echo>
! <echo>| |</echo>
! <echo>+---------------------------------------------------+</echo>
! <hibernatedoclet
! destdir="${samples.gen-src.dir}"
! mergedir="${samples.src.dir}"
! excludedtags="@version,@author,@todo,@see"
! addedtags="@xdoclet-generated at ${TODAY},@copyright The XDoclet
Team,@author XDoclet,@version ${version}"
! force="${samples.xdoclet.force}"
! verbose="false">
!
! <fileset dir="${samples.java.dir}">
! <include name="test/hibernate/*.java"/>
! </fileset>
! <hibernate/>
! <jbossservice
! destdir="${samples.meta-inf.dir}"
! jndiname="java:/hibernate/Samples"
! servicename="HibernateSamples"
! dialect="cirrus.hibernate.sql.HypesonicDialect"
! datasource="java:/DefaultDS"
! username="foo bar"
! password="blurge"/>
</hibernatedoclet>
***************
*** 397,405 ****
<target name="compile"
depends="ejbdoclet,webdoclet,jmxdoclet,jdodoclet,javabeans,hibernate">
!
<echo>+--------------------------------------------------------------------+</echo>
! <echo>|
|</echo>
! <echo>| C O M P I L I N G S O U R C E S
|</echo>
! <echo>|
|</echo>
!
<echo>+--------------------------------------------------------------------+</echo>
<javac
--- 401,409 ----
<target name="compile"
depends="ejbdoclet,webdoclet,jmxdoclet,jdodoclet,javabeans,hibernate">
! <echo>+---------------------------------------------------+</echo>
! <echo>| |</echo>
! <echo>| C O M P I L I N G S O U R C E S |</echo>
! <echo>| |</echo>
! <echo>+---------------------------------------------------+</echo>
<javac
***************
*** 422,425 ****
--- 426,432 ----
<!-- =================================================================== -->
<target name="jar" depends="compile">
+ <echo>You can find the generated sources in the
+/samples/target/gen-src</echo>
+ <echo>directory and the classes under the /samples/target/classes</echo>
+ <echo>directory. Enjoy!</echo>
</target>
-------------------------------------------------------
This sf.net email is sponsored by:
With Great Power, Comes Great Responsibility
Learn to use your power at OSDN's High Performance Computing Channel
http://hpc.devchannel.org/
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
