You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2002/04/25 18:04:44 UTC
cvs commit: jakarta-turbine-fulcrum build.xml project.properties NOTES build-maven.xml build-om.xml build-test.xml default.properties deps.list tdk.jar
jvanzyl 02/04/25 09:04:43
Modified: . build.xml project.properties
Removed: . NOTES build-maven.xml build-om.xml build-test.xml
default.properties deps.list tdk.jar
Log:
Maven build now works correctly. Going to verify with two others. The Torque
maven build works as well. So as agreed yesterday in IRC all the old build
systems will be removed.
Revision Changes Path
1.51 +178 -722 jakarta-turbine-fulcrum/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/build.xml,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- build.xml 24 Apr 2002 19:27:28 -0000 1.50
+++ build.xml 25 Apr 2002 16:04:43 -0000 1.51
@@ -1,762 +1,218 @@
<?xml version="1.0"?>
-<project name="Fulcrum" default="jar" basedir=".">
+<project name="maven" default="maven:jar" basedir=".">
+
+ <!-- Give user a chance to override without editing this file
+ (and without typing -D each time they invoke a target) -->
<!-- Allow any user specific values to override the defaults -->
<property file="${user.home}/build.properties" />
<!-- Allow user defaults for this project -->
<property file="build.properties" />
<!-- Set default values for the build -->
- <property file="default.properties" />
-
- <!-- Construct compile classpath -->
- <path id="classpath">
- <pathelement location="${bsf.jar}"/>
- <pathelement location="${commons-configuration.jar}"/>
- <pathelement location="${commons-collections.jar}"/>
- <pathelement location="${commons-email.jar}"/>
- <pathelement location="${commons-fileupload.jar}"/>
- <pathelement location="${commons-lang.jar}"/>
- <pathelement location="${commons-codec.jar}"/>
- <pathelement location="${commons-pool.jar}"/>
- <pathelement location="${commons-fileupload.jar}"/>
- <pathelement location="${jaf.jar}"/>
- <pathelement location="${javamail.jar}"/>
- <pathelement location="${jdbc.jar}"/>
- <pathelement location="${jndi.jar}"/>
- <pathelement location="${log4j.jar}"/>
- <pathelement location="${regexp.jar}"/>
- <pathelement location="${servlet.jar}"/>
- <pathelement location="${stratum.jar}"/>
- <pathelement location="${torque.jar}"/>
- <pathelement location="${velocity.jar}"/>
- <pathelement location="${village.jar}"/>
- <pathelement location="${xalan.jar}"/>
- <pathelement location="${xerces.jar}"/>
- <pathelement location="${xmlParserAPIs.jar}"/>
- <pathelement location="${xmlrpc.jar}"/>
- <pathelement location="${dvsl.jar}"/>
- <pathelement location="${junit.jar}"/>
- <pathelement location="${dom4j.jar}" />
- <pathelement location="tdk.jar" />
- </path>
+ <property file="project.properties" />
+ <!-- maven:start -->
+
<!-- ================================================================== -->
- <!-- U P D A T E J A R S -->
+ <!-- D E L E G A T O R S -->
<!-- ================================================================== -->
-
- <target
- name="update-jars">
-
- <taskdef
- name="httpget"
- className="org.apache.tdk.task.Get">
- <classpath refid="classpath"/>
- </taskdef>
-
- <!-- If you need proxy support you'll have to manually add:
-
- proxyHost="x"
- proxyPort="y"
-
- We'll clean this up but it worked for a user behind a proxy.
- -->
-
- <httpget
- baseUrl="http://jakarta.apache.org/turbine/jars/"
- dest="${lib.repo}"
- dependencyFile="deps.list"
- />
-
+
+ <target
+ name="maven:site">
+ <ant antfile="${maven.home}/build-docs.xml" target="site"/>
+ </target>
+
+ <target
+ name="maven:jar">
+ <ant antfile="${maven.home}/build-maven.xml" target="jar"/>
+ </target>
+
+ <target
+ name="maven:install-jar">
+ <ant antfile="${maven.home}/build-maven.xml" target="install-jar"/>
+ </target>
+
+ <target
+ name="maven:env">
+ <ant antfile="${maven.home}/build-maven.xml" target="env"/>
+ </target>
+
+ <target
+ name="maven:docs">
+ <ant antfile="${maven.home}/build-docs.xml" target="docs"/>
+ </target>
+
+ <target
+ name="maven:test">
+ <ant antfile="${maven.home}/build-test.xml" target="test"/>
+ </target>
+
+ <target
+ name="maven:clean">
+ <ant antfile="${maven.home}/build-maven.xml" target="clean"/>
+ </target>
+
+ <target
+ name="maven:metrics">
+ <ant antfile="${maven.home}/build-metrics.xml" target="metrics"/>
+ </target>
+
+ <target
+ name="maven:dist"
+ depends="maven:compile">
+ <ant antfile="${maven.home}/build-maven.xml" target="dist"/>
+ </target>
+
+ <target
+ name="maven:deploy-site">
+ <ant antfile="${maven.home}/build-docs.xml" target="deploy-site"/>
+ </target>
+
+ <target
+ name="maven:gump-descriptor">
+ <ant antfile="${maven.home}/build-maven.xml" target="gump-descriptor"/>
+ </target>
+
+ <target
+ name="maven:javadocs">
+ <ant antfile="${maven.home}/build-docs.xml" target="javadocs"/>
+ </target>
+
+ <target
+ name="maven:compile">
+ <ant antfile="${maven.home}/build-maven.xml" target="compile"/>
+ </target>
+
+ <target
+ name="maven:init">
+ <ant antfile="${maven.home}/build-maven.xml" target="init"/>
</target>
- <!-- ================================================================== -->
- <!-- E N V I R O N M E N T -->
- <!-- ================================================================== -->
-
- <target name="env">
- <echo message="java.home = ${java.home}"/>
- <echo message="user.home = ${user.home}"/>
- <echo message="lib.repo = ${lib.repo}"/>
-
- <echo message="bsf.jar = ${bsf.jar}"/>
- <echo message="commons-collections.jar = ${commons-collections.jar}"/>
- <echo message="commons-lang.jar = ${commons-lang.jar}"/>
- <echo message="commons-codec.jar = ${commons-codec.jar}"/>
- <echo message="commons-pool.jar = ${commons-pool.jar}"/>
- <echo message="commons-fileupload.jar = ${commons-fileupload.jar}"/>
- <echo message="dom4j.jar = ${dom4j.jar}"/>
- <echo message="dvsl.jar = ${dvsl.jar}"/>
- <echo message="jaf.jar = ${jaf.jar}"/>
- <echo message="javamail.jar = ${javamail.jar}"/>
- <echo message="jdbc.jar = ${jdbc.jar}"/>
- <echo message="jndi.jar = ${jndi.jar}"/>
- <echo message="log4j.jar = ${log4j.jar}"/>
- <echo message="regexp.jar = ${regexp.jar}"/>
- <echo message="servlet.jar = ${servlet.jar}"/>
- <echo message="torque.jar = ${torque.jar}"/>
- <echo message="velocity.jar = ${velocity.jar}"/>
- <echo message="village.jar = ${village.jar}"/>
- <echo message="xalan.jar = ${xalan.jar}"/>
- <echo message="xerces.jar = ${xerces.jar}"/>
- <echo message="xmlrpc.jar = ${xmlrpc.jar}"/>
- <echo message="[optional] commons-email.jar = ${commons-email.jar}"/>
- </target>
+ <!-- maven:end -->
<!-- ================================================================== -->
- <!-- U S A G E -->
- <!-- ================================================================== -->
-
- <target name="usage">
- <echo message="use -projecthelp to see the available targets"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- I N I T -->
+ <!-- C H E C K O M -->
<!-- ================================================================== -->
- <target name="init">
- <available
- classname="org.apache.velocity.anakia.AnakiaTask"
- property="AnakiaTask.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.velocity.runtime.Runtime"
- property="velocity.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.xerces.parsers.SAXParser"
- property="xerces.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.xalan.processor.XSLTSchema"
- property="xalan.present"
- classpathref="classpath"
- />
-
- <available
- classname="com.workingdogs.village.Column"
- property="village.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.log4j.Category"
- property="log4j.present"
- classpathref="classpath"
- />
-
- <available
- classname="javax.sql.ConnectionPoolDataSource"
- property="jdbc.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.torque.Torque"
- property="torque.present"
- classpathref="classpath"
- />
-
- <available
- classname="com.ibm.bsf.BSFManager"
- property="bsf.present"
- classpathref="classpath"
- />
-
- <available
- classname="javax.servlet.http.HttpServletRequest"
- property="servlet.present"
- classpathref="classpath"
- />
-
- <available
- classname="javax.mail.internet.MimeUtility"
- property="javamail.present"
- classpathref="classpath"
- />
-
- <available
- classname="javax.activation.DataSource"
- property="jaf.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.xmlrpc.XmlRpcException"
- property="xmlrpc.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.commons.collections.ExtendedProperties"
- property="commons-collections.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.commons.lang.exception.NestableException"
- property="commons-lang.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.commons.codec.base64.Base64"
- property="commons-codec.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.commons.pool.KeyedObjectPool"
- property="commons-pool.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.commons.fileupload.FileUpload"
- property="commons-fileupload.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.commons.mail.SimpleEmail"
- property="commons-email.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.regexp.RE"
- property="regexp.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.tools.dvsl.DVSL"
- property="dvsl.present"
- classpathref="classpath"
- />
+ <!-- this will soon be moved into the security services build. -->
- <available
- classname="org.dom4j.Document"
- property="dom4j.present"
- classpathref="classpath"
+ <target name="check-om">
+
+ <property
+ name="omStatusFile"
+ value="${maven.prepareSourceDirectory}/report.turbine.om.generation"
/>
+
+ <uptodate
+ property="omGenerated"
+ targetfile="${omStatusFile}">
+ <srcfiles
+ dir="."
+ includes="turbine-schema.xml"
+ />
+ </uptodate>
</target>
- <!-- ================================================================== -->
- <!-- P R O P E R T Y C H E C K S A N D W A R N I N G S -->
- <!-- ================================================================== -->
-
- <target name="check.velocity" unless="velocity.present">
- <antcall target="property-warning">
- <param name="name" value="velocity.jar"/>
- <param name="value" value="${velocity.jar}"/>
- </antcall>
- </target>
-
- <target name="check.log4j" unless="log4j.present">
- <antcall target="property-warning">
- <param name="name" value="log4j.jar"/>
- <param name="value" value="${log4j.jar}"/>
- </antcall>
- </target>
-
- <target name="check.torque" unless="torque.present">
- <antcall target="property-warning">
- <param name="name" value="torque.jar"/>
- <param name="value" value="${torque.jar}"/>
- </antcall>
- </target>
-
- <target name="check.bsf" unless="bsf.present">
- <antcall target="property-warning">
- <param name="name" value="bsf.jar"/>
- <param name="value" value="${bsf.jar}"/>
- </antcall>
- </target>
-
- <target name="check.servlet" unless="servlet.present">
- <antcall target="property-warning">
- <param name="name" value="servlet.jar"/>
- <param name="value" value="${servlet.jar}"/>
- </antcall>
- </target>
-
- <target name="check.javamail" unless="javamail.present">
- <antcall target="property-warning">
- <param name="name" value="javamail.jar"/>
- <param name="value" value="${javamail.jar}"/>
- </antcall>
- </target>
-
- <target name="check.jaf" unless="jaf.present">
- <antcall target="property-warning">
- <param name="name" value="jaf.jar"/>
- <param name="value" value="${jaf.jar}"/>
- </antcall>
- </target>
-
- <target name="check.xalan" unless="xalan.present">
- <antcall target="property-warning">
- <param name="name" value="xalan.jar"/>
- <param name="value" value="${xalan.jar}"/>
- </antcall>
- </target>
-
- <target name="check.xerces" unless="xerces.present">
- <antcall target="property-warning">
- <param name="name" value="xerces.jar"/>
- <param name="value" value="${xerces.jar}"/>
- </antcall>
- </target>
-
- <target name="check.xmlrpc" unless="xmlrpc.present">
- <antcall target="property-warning">
- <param name="name" value="xmlrpc.jar"/>
- <param name="value" value="${xmlrpc.jar}"/>
- </antcall>
- </target>
-
- <target name="check.commons-collections"
- unless="commons-collections.present">
- <antcall target="property-warning">
- <param name="name" value="commons-collections.jar"/>
- <param name="value" value="${commons-collections.jar}"/>
- </antcall>
- </target>
-
- <target name="check.commons-lang" unless="commons-lang.present">
- <antcall target="property-warning">
- <param name="name" value="commons-lang.jar"/>
- <param name="value" value="${commons-lang.jar}"/>
- </antcall>
- </target>
-
- <target name="check.commons-codec" unless="commons-codec.present">
- <antcall target="property-warning">
- <param name="name" value="commons-codec.jar"/>
- <param name="value" value="${commons-codec.jar}"/>
- </antcall>
- </target>
-
- <target name="check.commons-pool" unless="commons-pool.present">
- <antcall target="property-warning">
- <param name="name" value="commons-pool.jar"/>
- <param name="value" value="${commons-pool.jar}"/>
- </antcall>
- </target>
-
- <target name="check.commons-fileupload" unless="commons-fileupload.present">
- <antcall target="property-warning">
- <param name="name" value="commons-fileupload.jar"/>
- <param name="value" value="${commons-fileupload.jar}"/>
- </antcall>
- </target>
-
- <target name="check.regexp" unless="regexp.present">
- <antcall target="property-warning">
- <param name="name" value="regexp.jar"/>
- <param name="value" value="${regexp.jar}"/>
- </antcall>
- </target>
-
- <target name="check.dvsl" unless="dvsl.present">
- <antcall target="property-warning">
- <param name="name" value="dvsl.jar"/>
- <param name="value" value="${dvsl.jar}"/>
- </antcall>
- </target>
-
- <target name="check.dom4j" unless="dom4j.present">
- <antcall target="property-warning">
- <param name="name" value="dom4j.jar"/>
- <param name="value" value="${dom4j.jar}"/>
- </antcall>
- </target>
-
-<!--
- This is commented out because the inclusion of the .jar file is
- conditional depending on whether or not it is in your path. This
- is kept here in the event that this conditional requirement is
- removed in the future.
-
- <target name="check.commons-email" unless="commons-email.present">
- <antcall target="property-warning">
- <param name="name" value="commons-email.jar"/>
- <param name="value" value="${commons-email.jar}"/>
- </antcall>
- </target>
--->
-
- <target name="property-warning">
- <echo>
- +----------------------------------------------------------------+
- + F A I L E D R E Q U I R E M E N T |
- +----------------------------------------------------------------+
- | You must define the following property in order |
- | to build Fulcrum: |
- | |
- | ${name} = ${value}
- | |
- | You can set this property in the provided build.properties |
- | file, or you may set this property in your |
- | ${user.home}/build.properties file.
- +----------------------------------------------------------------+
- </echo>
- <fail message="Failed Requirement"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- P R E P A R E -->
- <!-- ================================================================== -->
-
- <target name="create-dirs">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${build.dir}/classes"/>
- <mkdir dir="${build.dir}/src"/>
- </target>
-
- <target name="include-email" if="commons-email.present">
- <copy todir="${build.dir}/src/org" overwrite="no">
- <fileset dir="${src.dir}/util/org"/>
- </copy>
-
- <copy todir="${build.dir}/src/org" overwrite="yes">
- <fileset dir="${src.dir}/util/org"/>
- </copy>
- </target>
-
- <target name="prepare"
- depends="init,env,create-dirs,
- check.velocity,check.log4j,check.torque,check.bsf,
- check.servlet,check.javamail,check.jaf,check.xerces,check.xalan,
- check.xmlrpc,check.commons-collections,check.commons-lang,
- check.commons-codec,check.regexp,check.dvsl,check.dom4j,
- check.commons-fileupload,check.commons-pool,include-email,om">
-
- <!-- We have some static files that should overwrite
- The torque generated files so overwrite must be
- set to 'yes'. -->
- <copy todir="${build.dir}/src/org" overwrite="yes">
- <fileset dir="${src.dir}/core/org"/>
- <fileset dir="${src.dir}/services/org"/>
- </copy>
- </target>
-
- <!-- ================================================================== -->
- <!-- C O M P I L E -->
- <!-- ================================================================== -->
-
- <target
- name="compile"
- depends="prepare"
- description="--> compiles the source code">
-
- <javac srcdir="${build.dir}/src"
- destdir="${build.dir}/classes"
- excludes="**/package.html"
- debug="${debug}"
- deprecation="${deprecation}"
- optimize="${optimize}">
- <classpath refid="classpath"/>
- </javac>
- </target>
-
- <target name="compile-test" depends="compile"
- description="--> compiles the test source code">
- <mkdir dir="${build.dir}/test"/>
-
- <javac srcdir="${src.dir}/test"
- destdir="${build.dir}/test"
- excludes="**/package.html"
- debug="${debug}"
- deprecation="${deprecation}"
- optimize="${optimize}">
- <classpath refid="classpath"/>
+ <!-- ================================================================ -->
+ <!-- M A I N T A R G E T -->
+ <!-- ================================================================ -->
+ <!-- Generate Turbine SQL schema for supported DBs -->
+ <!-- ================================================================ -->
+
+ <target
+ name="init">
+
+ <taskdef
+ name="create-classpath"
+ classname="org.apache.maven.ant.CreateClasspath">
<classpath>
- <pathelement location="${build.dir}/classes"/>
+ <pathelement location="${lib.repo}/maven.jar"/>
</classpath>
- </javac>
- </target>
-
- <!-- ================================================================== -->
- <!-- J A R -->
- <!-- ================================================================== -->
-
- <target name="jar" depends="compile" description="--> generates the fulcrum.jar">
-
- <!-- copy intake.dtd to the right place -->
- <copy
- file="intake.dtd"
- todir="${build.dir}/classes/org/apache/fulcrum/intake/transform"
+ </taskdef>
+
+ <create-classpath
+ listFile="jars.list"
+ reference="classpath"
+ baseDir="${lib.repo}"
/>
- <jar jarfile="${build.dir}/${final.name}.jar"
- basedir="${build.dir}/classes"
- excludes="**/package.html"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- J A V A D O C S -->
- <!-- ================================================================== -->
-
- <target name="javadocs"
- depends="prepare"
- description="--> generates the API documentation">
- <mkdir dir="${docs.dest}/api"/>
-
- <javadoc
- sourcepath="${build.src}"
- packagenames="${package}.*"
- destdir="${javadoc.destdir}"
- author="true"
- private="true"
- version="true"
- use="true"
- windowtitle="${name} ${version} API"
- doctitle="${name} ${version} API"
- bottom="Copyright &copy; ${year} Apache Software Foundation. All Rights Reserved."
- >
+ <taskdef name="torque-om"
+ classname="org.apache.torque.task.TorqueDataModelTask">
<classpath refid="classpath"/>
- </javadoc>
- </target>
-
- <!-- ================================================================== -->
- <!-- C L E A N -->
- <!-- ================================================================== -->
-
- <target name="clean" description="--> cleans up the build directory">
- <delete dir="${build.dir}"/>
- <delete file="velocity.log"/>
- <delete dir="${docs.dest}"/>
- <delete>
- <fileset dir="${src.dir}/services">
- <include name="report.turbine.*.generation"/>
- </fileset>
- </delete>
- <delete>
- <fileset dir="${src.dir}/services/org/apache/fulcrum">
- <include name="**/BaseTurbine*.java"/>
- <include name="**/BaseJob*.java"/>
- <include name="**/JobEntryPeer.java"/>
- <include name="**/TurbineRolePermission.java"/>
- <include name="**/TurbineRolePermissionPeer.java"/>
- <include name="**/TurbineUserGroupRole.java"/>
- <include name="**/TurbineUserGroupRolePeer.java"/>
- </fileset>
- </delete>
- <delete dir="${src.dir}/services/org/apache/fulcrum/schedule/map"
- quiet="true"/>
- <delete dir="${src.dir}/services/org/apache/fulcrum/security/impl/db/entity/map"
- quiet="true"/>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- A N A K I A D O C U M E N T A T I O N -->
- <!-- ================================================================== -->
-
- <target name="check_for_jdom">
- <available
- property="jdom.present"
- classname="org.jdom.JDOMException">
- <classpath>
- <fileset dir="${jakarta.site2}/lib">
- <include name="*.jar"/>
- </fileset>
- </classpath>
- </available>
- </target>
+ </taskdef>
- <target depends="check_for_jdom" name="docs-prepare-error"
- unless="jdom.present">
- <echo>
- The Jakarta-Site2 module is not present! Please check
- to make sure that you have checked it out from CVS.
-
- <http://jakarta.apache.org/site/jakarta-site2.html>
- </echo>
- </target>
-
- <target name="docs"
- depends="docs-prepare-error"
- description="--> generates the HTML documentation"
- if="jdom.present">
-
- <taskdef name="anakia"
- classname="org.apache.velocity.anakia.AnakiaTask">
- <classpath>
- <fileset dir="${jakarta.site2}/lib">
- <include name="*.jar"/>
- </fileset>
- </classpath>
- </taskdef>
-
- <anakia
- basedir="${docs.src}"
- destdir="${docs.dest}/"
- extension=".html" style="./site.vsl"
- projectFile="stylesheets/project.xml"
- excludes="**/stylesheets/** empty.xml"
- includes="**/*.xml"
- lastModifiedCheck="true"
- templatePath="${jakarta.site2}/xdocs/stylesheets">
- </anakia>
-
- <copy todir="${docs.dest}/images" filtering="no">
- <fileset dir="${docs.src}/images">
- <include name="**/*.gif"/>
- <include name="**/*.jpeg"/>
- <include name="**/*.jpg"/>
- </fileset>
- </copy>
-
- <!-- In case we have CSS someday
- <copy todir="${docs.dest}" filtering="no">
- <fileset dir="${docs.src}">
- <include name="**/*.css"/>
- </fileset>
- </copy>
- -->
</target>
- <!-- ================================================================== -->
- <!-- D I S T R I B U T I O N S -->
- <!-- ================================================================== -->
-
- <target
- name="dist"
- depends="jar,javadocs,docs">
-
- <property name="distDir" value="${build.dir}/${final.name}"/>
-
- <!-- B I N A R Y D I S T R I B U T I O N -->
-
- <echo>
- +-------------------------------------------------------+
- | C R E A T I N G B I N A R Y D I S T R I B U T I O N |
- +-------------------------------------------------------+
- </echo>
-
- <mkdir dir="${distDir}"/>
-
- <!-- Copy README and LICENSE -->
- <copy todir="${distDir}" file="README.txt"/>
- <copy todir="${distDir}" file="LICENSE"/>
-
- <!-- Copy Jars -->
- <copy todir="${distDir}">
- <fileset dir="${build.dir}">
- <include name="**/*.jar"/>
- </fileset>
- </copy>
-
- <!-- Copy documentation -->
- <copy todir="${distDir}/docs">
- <fileset dir="${docs.dest}">
- <include name="**"/>
- </fileset>
- </copy>
-
- <!-- Create a tar.gz file -->
- <tar longfile="gnu" tarfile="${final.name}.tar">
- <tarfileset dir="${build.dir}">
- <include name="${final.name}/**"/>
- </tarfileset>
- </tar>
-
- <gzip zipfile="${final.name}.tar.gz" src="${final.name}.tar"/>
- <delete file="${final.name}.tar"/>
-
- <!-- Create a zip file -->
- <zip zipfile="${final.name}.zip">
- <zipfileset dir="${build.dir}">
- <include name="${final.name}/**"/>
- </zipfileset>
- </zip>
-
- <!-- S O U R C E D I S T R I B U T I O N -->
-
- <echo>
- +-------------------------------------------------------+
- | C R E A T I N G S O U R C E D I S T R I B U T I O N |
- +-------------------------------------------------------+
- </echo>
-
- <delete>
- <fileset dir="${distDir}">
- <include name="**/*.jar"/>
- </fileset>
- </delete>
-
- <copy todir="${distDir}" file="default.properties"/>
- <copy todir="${distDir}" file="build.xml"/>
-
- <!-- Copy Source -->
- <copy todir="${distDir}/src">
- <fileset dir="${src.dir}">
- <include name="**/*.java"/>
- </fileset>
+ <target
+ name="om"
+ depends="check-om"
+ unless="omGenerated"
+ description="--> generates the Turbine OM/Peer classes">
+
+ <!--
+ We could create a fileset in the project to manage this
+ but we should really only have one source directory.
+ -->
+
+ <copy todir="${maven.prepareSourceDirectory}" overwrite="yes">
+ <fileset dir="src/core"/>
+ <fileset dir="src/services"/>
+ <fileset dir="src/util"/>
</copy>
- <!-- Create a tar.gz file -->
- <tar longfile="gnu" tarfile="${final.name}-src.tar">
- <tarfileset dir="${build.dir}">
- <include name="${final.name}/**"/>
- </tarfileset>
- </tar>
-
- <gzip zipfile="${final.name}-src.tar.gz" src="${final.name}-src.tar"/>
- <delete file="${final.name}-src.tar"/>
-
- <!-- Create a zip file -->
- <zip zipfile="${final.name}-src.zip">
- <zipfileset dir="${build.dir}">
- <include name="${final.name}/**"/>
- </zipfileset>
- </zip>
-
+ <antcall target="security-om"/>
+ <antcall target="scheduler-om"/>
</target>
- <!-- ================================================================== -->
- <!-- I N S T A L L J A R -->
- <!-- ================================================================== -->
-
- <target name="install-jar" depends="jar"
- description="--> Installs .jar file in ${lib.repo}">
- <copy todir="${lib.repo}" filtering="no">
- <fileset dir="${build.dir}">
- <include name="${final.name}.jar"/>
- </fileset>
- </copy>
- </target>
+ <target
+ name="security-om"
+ depends="init">
- <!-- ================================================================== -->
- <!-- C H E C K O M -->
- <!-- ================================================================== -->
+ <filter token="DATABASE_DEFAULT" value="${security.database.name}"/>
+ <!-- is there a way to load this from an xml file? -->
+ <filter token="EXTRA_USER_COLUMNS" value="${security.extra.user.columns}"/>
+ <copy
+ todir="${maven.prepareSourceDirectory}"
+ file="${schemaDirectory}/turbine-schema.xml"
+ filtering="yes"
+ />
+
+ <torque-om
+ contextProperties="project.properties"
+ controlTemplate="${OMControlTemplate}"
+ outputDirectory="${maven.prepareSourceDirectory}"
+ templatePath="${templatePath}"
+ outputFile="report.turbine.om.generation"
+ targetPackage="${securityPackage}"
+ xmlFile="${maven.prepareSourceDirectory}/turbine-schema.xml"
+ targetDatabase="${database}"
+ />
+
+ </target>
+
+ <target
+ name="scheduler-om"
+ depends="init">
- <!-- this will soon be moved into the security services build. -->
+ <filter token="DATABASE_DEFAULT" value="${scheduler.database.name}"/>
+ <copy
+ todir="${maven.prepareSourceDirectory}"
+ file="${schemaDirectory}/scheduler-schema.xml"
+ filtering="yes"
+ />
+
+ <torque-om
+ contextProperties="project.properties"
+ controlTemplate="${OMControlTemplate}"
+ outputDirectory="${maven.prepareSourceDirectory}"
+ templatePath="${templatePath}"
+ outputFile="report.turbine.scheduler.generation"
+ targetPackage="${schedulerPackage}"
+ xmlFile="${maven.prepareSourceDirectory}/scheduler-schema.xml"
+ />
- <target name="check-om">
- <uptodate
- property="omGenerated"
- targetfile="${omStatusFile}">
- <srcfiles dir="${schemaDirectory}" includes="turbine-schema.xml"/>
- </uptodate>
</target>
- <target name="om"
- depends="check-om"
- unless="omGenerated"
- description="--> generates the Turbine OM/Peer classes">
-
- <ant antfile="build-om.xml" dir="${basedir}"/>
- </target>
</project>
1.3 +51 -0 jakarta-turbine-fulcrum/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.properties 24 Apr 2002 20:44:54 -0000 1.2
+++ project.properties 25 Apr 2002 16:04:43 -0000 1.3
@@ -1 +1,52 @@
+# ------------------------------------------------------------------------
+# P R E P A R E S O U R C E S
+# ------------------------------------------------------------------------
+maven.delegatorBuildFile = build.xml
maven.prepareSourceDirectory = target/src
+maven.prepareSourceTarget = om
+
+src.dir = src
+build.src = src/java
+
+# -------------------------------------------------------------------
+#
+# T O R Q U E C O N F I G U R A T I O N
+#
+# used to generate the om/peer classes for the Turbine-db-security
+# system
+# -------------------------------------------------------------------
+
+# If you rename the jakarta-turbine-torque module after checkout,
+# you'll have to change this value.
+torque.dir = ${basedir}/../jakarta-turbine-torque
+
+database=mysql
+addSaveMethod=true
+addGetByNameMethod=true
+complexObjectModel=true
+addIntakeRetrievable=true
+basePrefix=Base
+
+# FIXME: Load templates from the JAR file -- if people rename their
+# jakarta-turbine-torque without changing torque.dir, templates cannot
+# be found.
+templatePath = ${torque.dir}/src/templates
+schemaDirectory=.
+
+outputDirectory=${build.src}/sql
+
+SQLControlTemplate = sql/base/Control.vm
+OMControlTemplate = om/Control.vm
+IntakeControlTemplate = intake/Control.vm
+ServiceControlTemplate = service/Control.vm
+idTableControlTemplate = sql/id-table/Control.vm
+DataDTDControlTemplate = data/Control.vm
+DataDumpControlTemplate = data/dump/Control.vm
+DataSQLControlTemplate = sql/load/Control.vm
+securityControlTemplate = sql/security/Control.vm
+
+securityPackage=org.apache.fulcrum.security.impl.db.entity
+schedulerPackage=org.apache.fulcrum.schedule
+security.database.name = default
+scheduler.database.name = default
+security.extra.user.columns=
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>