[Bedework-commit] bwtzsvr r46 - in trunk: . common server service
svnadmin at bedework.org
svnadmin at bedework.org
Tue Feb 1 21:12:44 EST 2011
Author: douglm
Date: 2011-02-01 21:12:39 -0500 (Tue, 01 Feb 2011)
New Revision: 46
Removed:
trunk/common/build.xml
trunk/server/build.xml
trunk/service/build.xml
Modified:
trunk/build.xml
Log:
Fix build in line with other build changes
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2011-02-02 02:12:32 UTC (rev 45)
+++ trunk/build.xml 2011-02-02 02:12:39 UTC (rev 46)
@@ -11,8 +11,6 @@
<property environment="env"/>
<dirname property="project.home" file="${ant.file}"/>
- <!-- These may already be set from calling dir -->
- <dirname property="org.bedework.project.tzsvr" file="${ant.file}"/>
<property file="${project.home}/build.properties" />
<property name="bedework.home"
@@ -22,12 +20,13 @@
<import file="${build.dir}/buildTools/deftasks.xml"/>
+ <deftasks/>
+
<projectDefs name="${org.bedework.package.name}"
version="${org.bedework.bwtzsvr.version}"
deployment-name="tzsvr"
/>
- <import file="${build.dir}/buildTools/getJar.xml"/>
<import file="${build.dir}/loadDeployConfig.xml"/>
<import file="${project.home}/appjars.xml" />
@@ -42,6 +41,8 @@
================================================================= -->
<target name="init">
+ <projectInit/>
+
<property name="org.bedework.project.bedework"
location="${project.home}/../bedework" />
@@ -64,9 +65,6 @@
<property name="org.bedework.options.file"
value="${org.bedework.config.options}" />
- <delete dir="${lib.dir}" />
- <mkdir dir="${lib.dir}" />
-
<property name="org.bedework.getjar.property.prefix"
value="org.bedework.appjar" />
@@ -90,22 +88,6 @@
<property name="org.bedework.module.service.base"
location="${project.home}/service" />
- <mkdir dir="${dist.home}" />
-
- <property name="test.data.dir"
- location="${dist.home}/test-data" />
-
- <property name="edu.rpi.cmt.empty.dir"
- location="${dist.home}/empty-dir" />
- <mkdir dir="${edu.rpi.cmt.empty.dir}" />
-
- <fileset id="empty.fileset" dir="${edu.rpi.cmt.empty.dir}"
- excludes="*" />
-
- <!-- default to empty -->
- <fileset id="buildjar.resource.files" refid="empty.fileset" />
- <fileset id="buildjar.generated.java.sources" refid="empty.fileset" />
-
<property name="common.jar"
location="${dist.home}/${org.bedework.module.common.jar}-${project.version}.jar" />
@@ -114,17 +96,6 @@
<property name="service.jar"
location="${dist.home}/${org.bedework.module.service.jar}-${project.version}.jar" />
-
- <!-- ==================== Compilation Classpath ==================== -->
-
- <path id="compile.classpath">
- <fileset dir="${lib.dir}">
- <include name="**/*.jar"/>
- </fileset>
- <fileset dir="${dist.home}">
- <include name="*.jar"/>
- </fileset>
- </path>
</target>
<target name="deploy-init" depends="init">
@@ -175,53 +146,49 @@
<!-- Clean up before we start -->
<delete dir="${org.bedework.temp.wars.home}" />
<mkdir dir="${org.bedework.temp.wars.home}" />
- </target>
- <!-- =================================================================
- Clean out all library files from other projects and all generated
- files in preparation for a complete rebuild.
+ <delete dir="${org.bedework.temp.ear.extrajars.dir}" />
+ <mkdir dir="${org.bedework.temp.ear.extrajars.dir}" />
- Needed because switching versions leaves a load of old bedework
- generated stuff in the libraries.
- ================================================================= -->
- <target name="deep-clean" depends="clean">
- <delete dir="${lib.dir}" />
+ <delete dir="${org.bedework.temp.extrajars.dir}" />
+ <mkdir dir="${org.bedework.temp.extrajars.dir}" />
</target>
- <!-- =================================================================
- Clean all generated files
- ================================================================= -->
- <target name="clean">
- <delete dir="${dist.home}" />
- </target>
+ <!-- ===================== build-source Target ===============================
+ This target builds jar files ready for the deploy target.
+ =================================================================== -->
- <!-- =================================================================
- Clean up after a build.
- ================================================================= -->
- <target name="cleanup">
- <delete dir="${edu.rpi.cmt.empty.dir}" />
- </target>
+ <target name="build-source" depends="init" >
+ <build-jar module-base="${org.bedework.module.common.base}"
+ jar-file="${common.jar}" />
+
+ <build-jar module-base="${org.bedework.module.server.base}"
+ jar-file="${server.jar}" />
+
+ <build-jar module-base="${org.bedework.module.service.base}"
+ jar-file="${service.jar}" />
+
+ <getExtraJars/>
- <!-- ========================== Base build Targets ===================
- Here we have one target building the classes and interfaces that make
- up the access control suite.
- ================================================================= -->
+ <!-- ===============================================================
+ Build the war
+ =============================================================== -->
+
+ <property name="app.sou.dir"
+ location="${org.bedework.module.server.base}" />
- <target name="clean-build" depends="clean,build"
- description="Clean and compile classes"/>
+ <ant antfile="${buildwar}" inheritRefs="true" target="build" >
+ <property name="propval.app.context.root"
+ value="${org.bedework.module.context.root}" />
+ <property name="propval.app.war.name"
+ value="${org.bedework.module.war.name}" />
+ <property name="propval.app.web.xml"
+ location="${app.sou.dir}/war/WEB-INF/web.xml" />
- <target name="clean-build-all" depends="clean,build"
- description="Clean and compile classes"/>
-
- <target name="build" depends="init,build-source,cleanup"
- description="Compile classes"/>
-
- <!-- ===================== build.all Target ===============================
- This target builds jar files ready for the deploy target.
- =================================================================== -->
-
- <target name="build-source"
- depends="init,bld.common,bld.service,bld.server" />
+ <property name="org.bedework.deploy.name"
+ value="${ant.project.name}" />
+ </ant>
+ </target>
<!-- ===================== deploy Target ===============================
Deploy if an application server is defined.
@@ -260,7 +227,9 @@
name="log4j" version="1.2.8"/>
<ant antfile="${build.dir}/../deployment/termination/webapp/build.xml"
- target="deploy" inheritRefs="true" />
+ target="deploy" inheritRefs="true" >
+ <property name="org.bedework.no.extra.ear.jars" value="yes" />
+ </ant>
<!-- Platform specific -->
<ant antfile="${build.dir}/../deployment/termination/build.xml"
@@ -295,49 +264,4 @@
<link href="${env.JAVA_HOME}/docs/api" />
</javadoc>
</target>
-
- <!-- ===================== internal build targets ====================
- ================================================================= -->
-
- <target name="bld.common">
- <ant antfile="${org.bedework.module.common.base}/build.xml" inheritrefs="true"
- target="build" >
- <property name="build.jar.file" location="${common.jar}" />
- </ant>
- </target>
-
- <target name="bld.server">
- <getExtraJars/>
-
- <ant antfile="${org.bedework.module.server.base}/build.xml" inheritrefs="true"
- target="build" >
- <property name="build.jar.file" location="${server.jar}" />
- </ant>
-
- <!-- ===============================================================
- Build the war
- =============================================================== -->
-
- <property name="app.sou.dir"
- location="${org.bedework.module.server.base}" />
-
- <ant antfile="${buildwar}" inheritRefs="true" target="build" >
- <property name="propval.app.context.root"
- value="${org.bedework.module.context.root}" />
- <property name="propval.app.war.name"
- value="${org.bedework.module.war.name}" />
- <property name="propval.app.web.xml"
- location="${app.sou.dir}/war/WEB-INF/web.xml" />
-
- <property name="org.bedework.deploy.name"
- value="${ant.project.name}" />
- </ant>
- </target>
-
- <target name="bld.service">
- <ant antfile="${org.bedework.module.service.base}/build.xml" inheritrefs="true"
- target="build" >
- <property name="build.jar.file" location="${service.jar}" />
- </ant>
- </target>
</project>
Deleted: trunk/common/build.xml
===================================================================
--- trunk/common/build.xml 2011-02-02 02:12:32 UTC (rev 45)
+++ trunk/common/build.xml 2011-02-02 02:12:39 UTC (rev 46)
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- This is the ant build file for the Exchange synch service classes.
-
- This file will probably need no modification as it is assumed that the
- core of the calendar will be largely site and application independent.
-
- The target of interest is build which should leave some jar files
- in the temp jar directory..
-
- These files will be needed for subsequent application or module builds.
-
- This build file depends upon properties set by the master build file one
- level up in the directory tree.
-
- Authors: Mike Douglass douglm at rpi.edu
--->
-
-<project name="compile" default="build">
- <dirname property="module.home" file="${ant.file}"/>
-
- <property name="source.home" location="${module.home}/src"/>
- <property name="base.name" value="common"/>
-
- <target name="init">
- <dirname property="this.dir" file="${ant.file}"/>
- </target>
-
- <!-- ========================== Base build Targets ===================
- Here we have one target building the classes and interfaces
- ================================================================= -->
-
- <target name="build" depends="init"
- description="Compile classes">
- <!-- ==================== Sources and classes ====================== -->
-
- <fileset id="buildjar.java.sources" dir="${source.home}" >
- <include name="org/bedework/**/*.java"/>
- </fileset>
-
- <patternset id="base.class.patternset">
- <include name="org/bedework/**/*.class"/>
- </patternset>
-
- <!-- ==================== Build Target ============================= -->
-
- <ant antfile="${buildjar}" inheritRefs="true" target="build" />
- </target>
-</project>
Deleted: trunk/server/build.xml
===================================================================
--- trunk/server/build.xml 2011-02-02 02:12:32 UTC (rev 45)
+++ trunk/server/build.xml 2011-02-02 02:12:39 UTC (rev 46)
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- This is a fairly generic ant build file for java classes.
-
- This file will probably need no modification as it is assumed that the
- core of the calendar will be largely site and application independent.
-
- The target of interest is build which should leave some jar files
- in the temp jar directory..
-
- These files will be needed for subsequent application or module builds.
-
- This build file depends upon properties set by the master build file one
- level up in the directory tree.
-
- Authors: Mike Douglass douglm rpi.edu
--->
-
-<project name="compile" default="build" >
- <dirname property="module.home" file="${ant.file}"/>
-
- <property name="source.home" location="${module.home}/src"/>
- <property name="base.name" value="tzsvr"/>
-
- <target name="init">
- <dirname property="this.dir" file="${ant.file}"/>
- </target>
-
- <!-- ========================== Base build Targets ===================
- Here we have one target building the classes and interfaces
- ================================================================= -->
-
- <target name="build" depends="init"
- description="Compile classes">
- <!-- ==================== Sources and classes ====================== -->
-
- <fileset id="buildjar.java.sources" dir="${source.home}" >
- <include name="org/bedework/**/*.java"/>
- </fileset>
-
- <patternset id="base.class.patternset">
- <include name="org/bedework/**/*.class"/>
- </patternset>
-
- <ant antfile="${buildjar}" inheritRefs="true" target="build" />
- </target>
-</project>
Deleted: trunk/service/build.xml
===================================================================
--- trunk/service/build.xml 2011-02-02 02:12:32 UTC (rev 45)
+++ trunk/service/build.xml 2011-02-02 02:12:39 UTC (rev 46)
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- This is the ant build file for the Exchange synch service classes.
-
- This file will probably need no modification as it is assumed that the
- core of the calendar will be largely site and application independent.
-
- The target of interest is build which should leave some jar files
- in the temp jar directory..
-
- These files will be needed for subsequent application or module builds.
-
- This build file depends upon properties set by the master build file one
- level up in the directory tree.
-
- Authors: Mike Douglass douglm at rpi.edu
--->
-
-<project name="compile" default="build">
- <dirname property="module.home" file="${ant.file}"/>
-
- <property name="source.home" location="${module.home}/src"/>
- <property name="base.name" value="exsynchsvc"/>
-
- <target name="init">
- <dirname property="this.dir" file="${ant.file}"/>
- </target>
-
- <!-- ========================== Base build Targets ===================
- Here we have one target building the classes and interfaces.
- ================================================================= -->
-
- <target name="build" depends="init"
- description="Compile classes">
- <!-- ==================== Sources and classes ====================== -->
-
- <fileset id="buildjar.java.sources" dir="${source.home}" >
- <include name="org/bedework/**/*.java"/>
- </fileset>
-
- <patternset id="base.class.patternset">
- <include name="org/bedework/**/*.class"/>
- </patternset>
-
- <!-- ==================== Build Target ============================= -->
-
- <ant antfile="${buildjar}" inheritRefs="true" target="build" />
- </target>
-</project>
More information about the Bedework-commit
mailing list