[Bedework-commit] exchgsynch r15 - trunk
svnadmin at bedework.org
svnadmin at bedework.org
Tue Sep 28 14:14:14 EDT 2010
Author: douglm
Date: 2010-09-28 14:14:13 -0400 (Tue, 28 Sep 2010)
New Revision: 15
Added:
trunk/appjars.xml
Modified:
trunk/.classpath
trunk/build.properties
trunk/build.xml
Log:
Much refactoring. Now have a deployable - but non-working ear file
Had to do this in bits as eclipse+svn choked
Modified: trunk/.classpath
===================================================================
--- trunk/.classpath 2010-09-28 18:13:46 UTC (rev 14)
+++ trunk/.classpath 2010-09-28 18:14:13 UTC (rev 15)
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="common/src"/>
+ <classpathentry kind="src" path="server/src"/>
+ <classpathentry kind="src" path="service/src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/servletapi-2.4.jar"/>
<classpathentry kind="lib" path="lib/rpiaccess-3.6.jar"/>
<classpathentry kind="lib" path="lib/log4j-1.2.8.jar"/>
<classpathentry kind="lib" path="lib/bw-calfacade-3.6.jar"/>
+ <classpathentry kind="lib" path="lib/rpiutil-3.6.jar"/>
<classpathentry kind="output" path="bin/exchgsynch"/>
</classpath>
Added: trunk/appjars.xml
===================================================================
--- trunk/appjars.xml (rev 0)
+++ trunk/appjars.xml 2010-09-28 18:14:13 UTC (rev 15)
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+ Fetch or define extra jars for this application
+ =================================================================== -->
+<project name="extraJars" basedir="." default="">
+ <macrodef name="getExtraJars">
+ <sequential>
+ <delete dir="${org.bedework.temp.extrajars.dir}" />
+ <mkdir dir="${org.bedework.temp.extrajars.dir}" />
+
+ <property name="bedework.home"
+ location="${project.home}/../bedework" />
+
+ <!-- Generated by this project -->
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-exsynch" version="3.6"
+ projecthome="${project.home}" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-exsynchsvc" version="3.6"
+ projecthome="${project.home}" />
+
+ <!-- Bedework jars -->
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="rpiaccess" version="3.6" project="access"
+ projecthome="${bedework.home}/projects/access" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="rpiutil" version="3.6" project="rpiutil"
+ projecthome="${bedework.home}/projects/rpiutil" />
+
+ <!-- Other jars
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="jgroups" version="2.2.8" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="jta" version="1.1" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="commons-collections"/>
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="commons-codec" version="1.3"/>
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="commons-lang" version="2.1"/>
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="commons-httpclient" version="3.0"/>
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="commons-ssl" />
+ -->
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="commons-logging" />
+ </sequential>
+ </macrodef>
+</project>
Modified: trunk/build.properties
===================================================================
--- trunk/build.properties 2010-09-28 18:13:46 UTC (rev 14)
+++ trunk/build.properties 2010-09-28 18:14:13 UTC (rev 15)
@@ -9,7 +9,9 @@
org.bedework.version=3.6
# Name of generated jar files
-edu.rpi.cmt.exsynch.server.jar=bw-exsynch
+edu.rpi.cmt.exsynch.common.jar=bw-exsynch-common
+edu.rpi.cmt.exsynch.webserver.jar=bw-exsynch
+edu.rpi.cmt.exsynch.service.jar=bw-exsynchsvc
org.bedework.app.exsynch.war.name=exsynch
org.bedework.app.exsynch.context.root=exsynch
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2010-09-28 18:13:46 UTC (rev 14)
+++ trunk/build.xml 2010-09-28 18:14:13 UTC (rev 15)
@@ -14,6 +14,9 @@
<dirname property="project.home" file="${ant.file}"/>
<property file="${project.home}/build.properties" />
+
+ <property name="bedework.home"
+ location="${project.home}/../bedework" />
<property name="project.name" value="${org.bedework.package.name}"/>
<property name="project.version" value="${org.bedework.version}"/>
@@ -28,6 +31,8 @@
<property name="resources.dir" location="${project.home}/resources"/>
+ <property name="ear.meta.dir" location="${project.home}/ear.meta"/>
+
<property name="org.bedework.temp.dir"
location="${dist.home}/temp" />
@@ -78,8 +83,6 @@
<!--
<getJar name="commons-codec" version="1.3" />
<getJar name="commons-httpclient" version="3.0" />
- <getJar name="rpiutil" version="3.6" project="rpiutil"
- projecthome="${project.home}/../bedework/projects/rpiutil" />
<getJar name="bw-davio" version="3.6" project="davutil"
projecthome="${project.home}/../bedework/projects/davutil" />
@@ -88,19 +91,27 @@
<getJar name="log4j" version="1.2.8" />
<getJar name="servletapi" version="2.4" />
+
+ <getJar name="bw-annotations" version="3.6" project="calendarapi"
+ projecthome="${project.home}/../bedework/projects/calendarapi"/>
+ <getJar name="bw-calfacade" version="3.6" project="calendarapi"
+ projecthome="${project.home}/../bedework/projects/calendarapi" />
- <getJar name="rpiaccess" version="3.6" project="access"
+ <getJar name="rpiutil" version="3.6" project="rpiutil"
+ projecthome="${project.home}/../bedework/projects/rpiutil" />
+
+ <getJar name="rpiaccess" version="3.6" project="access"
projecthome="${project.home}/../bedework/projects/access" />
+ <property name="org.bedework.exsynch.common.base"
+ location="${project.home}/common" />
+
<property name="org.bedework.exsynch.base"
location="${project.home}/server" />
- <property name="org.bedework.carddav.dumpres.base"
- location="${project.home}/dumpres" />
+ <property name="org.bedework.exsynch.service.base"
+ location="${project.home}/service" />
- <property name="org.bedework.carddav.tools.base"
- location="${project.home}/tools" />
-
<mkdir dir="${dist.home}" />
<property name="test.data.dir"
@@ -117,15 +128,15 @@
<fileset id="buildjar.resource.files" refid="empty.fileset" />
<fileset id="buildjar.generated.java.sources" refid="empty.fileset" />
+ <property name="common.jar"
+ location="${dist.home}/${edu.rpi.cmt.exsynch.common.jar}-${project.version}.jar" />
+
<property name="server.jar"
- location="${dist.home}/${edu.rpi.cmt.carddav.server.jar}-${project.version}.jar" />
+ location="${dist.home}/${edu.rpi.cmt.exsynch.webserver.jar}-${project.version}.jar" />
- <property name="dumpres.jar"
- location="${dist.home}/${edu.rpi.cmt.carddav.dumpres.jar}-${project.version}.jar" />
+ <property name="service.jar"
+ location="${dist.home}/${edu.rpi.cmt.exsynch.service.jar}-${project.version}.jar" />
- <property name="tools.jar"
- location="${dist.home}/${edu.rpi.cmt.carddav.tools.jar}-${project.version}.jar" />
-
<!-- ==================== Compilation Classpath ==================== -->
<path id="compile.classpath">
@@ -146,26 +157,23 @@
<isset property="org.bedework.global.build.ear" />
<then>
<property name="app.ear.file.name"
- value="${org.bedework.global.ear.name}-card.ear" />
+ value="${org.bedework.global.ear.name}-exsynch.ear" />
- <property name="dumpres.app.zip.name"
- value="${org.bedework.global.ear.name}-carddumpres" />
+ <property name="service.app.zip.name"
+ value="${org.bedework.global.ear.name}-exsynchsvc" />
- <property name="tools.app.zip.name"
- value="${org.bedework.global.ear.name}-cardtools" />
-
<if>
<equals arg1="${org.bedework.global.ear.zipped}"
arg2="yes" />
<then>
<property name="org.bedework.ear.dir"
- location="${dist.home}/${org.bedework.global.ear.name}-card" />
+ location="${dist.home}/${org.bedework.global.ear.name}-exsynch" />
<property name="org.bedework.ear.file"
- location="${dist.home}/${org.bedework.global.ear.name}-card.ear" />
+ location="${dist.home}/${org.bedework.global.ear.name}-exsynch.ear" />
</then>
<else>
<property name="org.bedework.ear.dir"
- location="${dist.home}/${org.bedework.global.ear.name}-card.ear" />
+ location="${dist.home}/${org.bedework.global.ear.name}-exsynch.ear" />
</else>
</if>
@@ -256,7 +264,7 @@
description="Compile exsynch classes"/>
<target name="build-source"
- depends="bld.server" />
+ depends="bld.common,bld.service,bld.server" />
<!-- ===================== deploy Target ===============================
Deploy if an application server is defined.
@@ -264,15 +272,18 @@
<target name="deploy" depends="deploy-init,build-all"
description="Deploy exsynch">
- <ant antfile="deploy.xml" target="deployFiles" inheritRefs="true" />
- <ant antfile="deployService.xml" target="deploy" inheritRefs="true" >
+ <ant antfile="${build.dir}/deploy.xml" target="deployFiles" inheritRefs="true" />
+
+ <!-- Service defined in ear file.
+ <ant antfile="${build.dir}/deployService.xml" target="deploy" inheritRefs="true" >
<property name="propval.app.zip.name"
- value="${dumpres.app.zip.name}" />
+ value="${service.app.zip.name}" />
<property name="app.service.base"
- location="${org.bedework.carddav.dumpres.base}" />
+ location="${org.bedework.exsynch.service.base}" />
<property name="app.global.properties.dir"
location="${resources.dir}" />
</ant>
+ -->
<getJar lib="${org.bedework.temp.extrajars.dir}"
libcache="${org.bedework.libcache.dir}"
@@ -282,19 +293,9 @@
<getJar lib="${org.bedework.temp.extrajars.dir}"
libcache="${org.bedework.libcache.dir}"
name="log4j" version="1.2.8"/>
-
- <ant antfile="${buildsh}" target="build" inheritRefs="true" >
- <property name="propval.app.zip.name"
- value="${tools.app.zip.name}" />
- <property name="app.service.base"
- location="${org.bedework.carddav.tools.base}" />
- <property name="app.global.properties.dir"
- location="${org.bedework.carddav.tools.base}/resources" />
- <property name="org.bedework.deploy.name"
- value="tools" />
- </ant>
- <ant antfile="deployTermination.xml" target="deployTerminate" inheritRefs="true" />
+ <ant antfile="${build.dir}/deployTermination.xml"
+ target="deployTerminate" inheritRefs="true" />
</target>
<!-- ==================== Javadoc Target ===============================
@@ -335,7 +336,9 @@
<target name="bld.server">
<ant antfile="${org.bedework.exsynch.base}/build.xml" inheritrefs="true"
- target="build" />
+ target="build" >
+ <property name="build.jar.file" location="${server.jar}" />
+ </ant>
<!-- ===============================================================
Build the war
@@ -356,4 +359,18 @@
value="usercarddav" />
</ant>
</target>
+
+ <target name="bld.service">
+ <ant antfile="${org.bedework.exsynch.service.base}/build.xml" inheritrefs="true"
+ target="build" >
+ <property name="build.jar.file" location="${service.jar}" />
+ </ant>
+ </target>
+
+ <target name="bld.common">
+ <ant antfile="${org.bedework.exsynch.common.base}/build.xml" inheritrefs="true"
+ target="build" >
+ <property name="build.jar.file" location="${common.jar}" />
+ </ant>
+ </target>
</project>
More information about the Bedework-commit
mailing list