[Bedework-commit] bedework r3180 - in trunk: build build/buildTools
build/platforms build/quickstart/linux
build/quickstart/windows config/bwbuild/default
config/bwbuild/jboss-h2 config/bwbuild/jboss-mysql
config/bwbuild/jboss-postgresql deployment
deployment/caldavTest/shellscr
deployment/dumprestore/shellscr deployment/feeder/webapp
deployment/indexer/shellscr deployment/inoutsched/shellscr
deployment/publiccaldav/webapp deployment/publiccalws/webapp
deployment/termination/webapp deployment/usercaldav/webapp
deployment/usercalws/webapp deployment/webadmin/webapp
deployment/webpublic/webapp deployment/websubmit/webapp
deployment/webuser/webapp
svnadmin at bedework.org
svnadmin at bedework.org
Wed Feb 16 15:13:38 EST 2011
Author: douglm
Date: 2011-02-16 15:13:33 -0500 (Wed, 16 Feb 2011)
New Revision: 3180
Added:
trunk/deployment/bw-core-appjars.xml
Removed:
trunk/build/platforms/geronimo.xml
trunk/build/platforms/geronimoService.xml
trunk/build/platforms/geronimoWar.xml
trunk/deployment/appjars.xml
trunk/deployment/dumprestore/shellscr/appjars.xml
trunk/deployment/feeder/webapp/appjars.xml
trunk/deployment/indexer/shellscr/appjars.xml
trunk/deployment/inoutsched/shellscr/appjars.xml
trunk/deployment/publiccaldav/webapp/appjars.xml
trunk/deployment/publiccalws/webapp/appjars.xml
trunk/deployment/usercaldav/webapp/appjars.xml
trunk/deployment/usercalws/webapp/appjars.xml
trunk/deployment/webadmin/webapp/appjars.xml
trunk/deployment/webpublic/webapp/appjars.xml
trunk/deployment/websubmit/webapp/appjars.xml
trunk/deployment/webuser/webapp/appjars.xml
Modified:
trunk/build/buildTools/deftasks.xml
trunk/build/bw-deployutil-3.7.jar
trunk/build/platforms/jbossService.xml
trunk/build/platforms/jbossWar.xml
trunk/build/platforms/runnableService.xml
trunk/build/platforms/tomcat5War.xml
trunk/build/quickstart/linux/bw
trunk/build/quickstart/windows/bw.bat
trunk/config/bwbuild/default/cal.options.xml
trunk/config/bwbuild/default/cal.properties
trunk/config/bwbuild/jboss-h2/cal.options.xml
trunk/config/bwbuild/jboss-h2/cal.properties
trunk/config/bwbuild/jboss-mysql/cal.options.xml
trunk/config/bwbuild/jboss-mysql/cal.properties
trunk/config/bwbuild/jboss-postgresql/cal.options.xml
trunk/config/bwbuild/jboss-postgresql/cal.properties
trunk/deployment/build.xml
trunk/deployment/caldavTest/shellscr/appjars.xml
trunk/deployment/dumprestore/shellscr/build.xml
trunk/deployment/feeder/webapp/build.xml
trunk/deployment/indexer/shellscr/build.xml
trunk/deployment/inoutsched/shellscr/build.xml
trunk/deployment/publiccaldav/webapp/build.xml
trunk/deployment/publiccalws/webapp/build.xml
trunk/deployment/termination/webapp/build.xml
trunk/deployment/usercaldav/webapp/build.xml
trunk/deployment/usercalws/webapp/build.xml
trunk/deployment/webadmin/webapp/build.xml
trunk/deployment/webpublic/webapp/build.xml
trunk/deployment/websubmit/webapp/build.xml
trunk/deployment/webuser/webapp/build.xml
Log:
Fixed a build bug that caused a build failure after a clean.
Removed a lot of copying of files. There's now a definition of exactly which libraries are needed for the ears. This allows us to be more specific about which jars get loaded
Removed some geronimo stuff added a while back. It was all out of date.
Modified: trunk/build/buildTools/deftasks.xml
===================================================================
--- trunk/build/buildTools/deftasks.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/build/buildTools/deftasks.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -46,7 +46,6 @@
<attribute name="name"/>
<attribute name="version"/>
<attribute name="deployment-name" default=""/>
- <attribute name="no-default-libs" default="true"/>
<attribute name="subproject" default="false"/>
<sequential>
<property name="project.name" value="@{name}"/>
@@ -84,9 +83,6 @@
<property name="org.bedework.deployment.name"
value="@{deployment-name}" />
- <property name="propval.app.no.defaultlibs"
- value="@{no-default-libs}" />
-
<deftasks/>
</else>
</if>
@@ -130,7 +126,76 @@
</path>
</sequential>
</macrodef>
+
+ <!-- =====================================================================
+ Assumes projectDefs was called previously.
+ Set things up ready for deployment
+ ===================================================================== -->
+ <macrodef name="deployInit">
+ <attribute name="ear-name"/>
+ <sequential>
+ <!-- Where we put ear stuff -->
+ <if>
+ <isset property="org.bedework.global.build.ear" />
+ <then>
+ <property name="app.ear.file.name"
+ value="@{ear-name}.ear" />
+
+ <property name="org.bedework.ear.name"
+ value="@{ear-name}" />
+
+ <property name="org.bedework.ear.templib"
+ location="${org.bedework.temp.dir}/earlib" />
+
+ <property name="org.bedework.ear.properties.dir"
+ location="${org.bedework.temp.dir}/ear-properties" />
+
+ <delete dir="${org.bedework.ear.templib}" />
+ <mkdir dir="${org.bedework.ear.templib}" />
+
+ <delete dir="${org.bedework.ear.properties.dir}" />
+ <mkdir dir="${org.bedework.ear.properties.dir}" />
+ </then>
+ </if>
+
+ <property name="org.bedework.temp.shellscr.home"
+ location="${org.bedework.temp.dir}/shellscr" />
+
+ <property name="org.bedework.temp.extrajars.dir"
+ location="${org.bedework.temp.dir}/extrajars" />
+
+ <!-- Preserve extra jars for ear builds -->
+ <property name="org.bedework.temp.ear.extrajars.dir"
+ location="${org.bedework.temp.dir}/earextrajars" />
+
+ <property name="org.bedework.global.context.roots"
+ location="${org.bedework.temp.dir}/context-roots.properties" />
+
+ <!-- ===== End of stuff in main bedework deployment build file ====== -->
+
+ <!-- Clean up before we start -->
+ <delete dir="${org.bedework.temp.wars.home}" />
+ <mkdir dir="${org.bedework.temp.wars.home}" />
+
+ <delete dir="${org.bedework.temp.ear.extrajars.dir}" />
+ <mkdir dir="${org.bedework.temp.ear.extrajars.dir}" />
+
+ <delete dir="${org.bedework.temp.extrajars.dir}" />
+ <mkdir dir="${org.bedework.temp.extrajars.dir}" />
+ </sequential>
+ </macrodef>
+ <macrodef name="deployTerm">
+ <sequential>
+ <ant antfile="${build.dir}/../deployment/termination/webapp/build.xml"
+ target="deploy" inheritRefs="true" />
+
+ <!-- Platform specific -->
+ <ant antfile="${build.dir}/../deployment/termination/build.xml"
+ target="deploy" inheritRefs="true" />
+ </sequential>
+ </macrodef>
+
<!-- Standard targets for build files. Two targets need to be overridden by
the importing task
Modified: trunk/build/bw-deployutil-3.7.jar
===================================================================
(Binary files differ)
Deleted: trunk/build/platforms/geronimo.xml
===================================================================
--- trunk/build/platforms/geronimo.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/build/platforms/geronimo.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ===================================================================
- This file is imported by termination/build.xml and adds the targets
- which will be invoked by that file.
- doPlatform - misc stuff
- =================================================================== -->
-
-<project name="bedework.platformTermination" default="doPlatform" >
- <target name="doPlatform" >
- </target>
-</project>
\ No newline at end of file
Deleted: trunk/build/platforms/geronimoService.xml
===================================================================
--- trunk/build/platforms/geronimoService.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/build/platforms/geronimoService.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -1,175 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ===================================================================
- This file is imported by buildsh.xml and others and adds the targets:
- doHibProps: builds a set of properties for the service
- addLibs: add libraries for this platform
- addResources: add anything we want in the resources directory
- addExtras: add scripts for runnable versions and META-INF for
- jboss services etc.
- =================================================================== -->
-
-<project name="bedework.platformService" default="doHibProps" >
- <target name="doHibProps" >
- <echo file="${app.dest.classes}/hibernate.properties">
-hibernate.query.substitutions true 'T', false 'F', yes 'Y', no 'N'
-hibernate.dialect=${org.bedework.global.hibernate.dialect}
-hibernate.connection.driver_class=${org.bedework.global.jdbcdriver}
-hibernate.connection.username=${org.bedework.global.jdbcid}
-hibernate.connection.password=${org.bedework.global.jdbcpw}
-hibernate.connection.url=${org.bedework.global.jdbcurl}
-hibernate.bytecode.use_reflection_optimizer=false
-hibernate.cache.use_second_level_cache=false
-#
-# Here for better debugging
-#
-hibernate.jdbc.batch_size=0
- </echo>
- </target>
-
- <!-- ================================================================
- Add libraries
- ================================================================ -->
-
- <target name="addLibs">
- <!-- hibernate jars -->
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.antlr}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm-attrs}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.cglib}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.dom4j}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ehcache}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.hibernate}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.javassist}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jgroups}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jta}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-collections}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-api}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-log4j12}" />
-
- <!-- jms support -->
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.activemq-core}" />
- <copy todir="${app.dest.lib}"
- file="${org.bedework.appjar.geronimo-j2ee-management_1.0_spec}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jms}" />
-
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-logging}"/>
-
- <!-- core files -->
-
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiaccess}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiutil}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-davio}" />
-
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-annotations}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-apiutil}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcore}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcorei}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calfacade}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvc}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvci}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-icalendar}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-logging}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-mail}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-sysevents}" />
-
- <!-- any extra files-->
- <copy todir="${app.dest.lib}" >
- <fileset dir="${org.bedework.temp.extrajars.dir}" />
- </copy>
-
- <!-- Some more standard libs -->
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.log4j}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-core}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-misc}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ical4j}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-codec}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-digester}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-httpclient}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-lang}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-ssl}"/>
-
- <!-- jdbc stuff -->
-
- <if>
- <available file="${org.bedework.global.ext.lib}/jdbc" type="dir" />
- <then>
- <!-- jdbc drivers -->
- <copy todir="${app.dest.lib}" flatten="yes" >
- <!-- local jdbc drivers -->
- <fileset dir="${org.bedework.global.ext.lib}/jdbc">
- <include name="*.jar"/>
- </fileset>
- </copy>
- </then>
- <else>
- <!-- Include the quickstart jdbc driver -->
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.hsqldb}"/>
- </else>
- </if>
- </target>
-
- <!-- ================================================================
- Add resources
- ================================================================ -->
-
- <target name="addResources">
- <property name="app.dest.resources"
- location="${app.dest.home}/resources" />
-
- <mkdir dir="${app.dest.resources}"/>
-
- <copy tofile="${app.dest.resources}/log4j.xml"
- file="${org.bedework.runsh.log4j.xml}"
- failonerror="false" />
- </target>
-
- <!-- ================================================================
- Add extras
- ================================================================ -->
-
- <target name="addExtras">
- <!-- ===============================================================
- Build the classpath
- =============================================================== -->
-
- <path id="app.run.path">
- <fileset dir="${app.dest.lib}">
- <include name="*.jar"/>
- </fileset>
- <pathelement location="${app.dest.resources}" />
- </path>
- <pathconvert property="app.run.cp" refid="app.run.path"
- targetos="unix" >
- <map from="${app.dest.lib}" to="./lib"/>
- <map from="${app.dest.resources}" to="./resources"/>
- </pathconvert>
- <pathconvert property="app.run.wincp" refid="app.run.path"
- targetos="windows" >
- <map from="${app.dest.lib}" to="./lib"/>
- <map from="${app.dest.resources}" to="./resources"/>
- </pathconvert>
-
- <!-- ===============================================================
- Copy and modify the shell script
- =============================================================== -->
-
- <copy tofile="${app.dest.home}/${propval.app.shellscr.name}"
- file="${app.run.shellscr}" >
- <filterset>
- <filter token="CP"
- value=".:./classes:${app.run.cp}"/>
- </filterset>
- <filterset refid="property.filters" />
- </copy>
-
- <copy tofile="${app.dest.home}/${propval.app.batscr.name}"
- file="${app.run.batscr}" >
- <filterset>
- <filter token="CP"
- value=".;./classes;${app.run.wincp}"/>
- </filterset>
- <filterset refid="property.filters" />
- </copy>
- </target>
-</project>
\ No newline at end of file
Deleted: trunk/build/platforms/geronimoWar.xml
===================================================================
--- trunk/build/platforms/geronimoWar.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/build/platforms/geronimoWar.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -1,161 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ===================================================================
- This file is imported by buildwar.xml and adds the targets
- which will be invoked by the buildwar targets.
- addLibs: add libraries for this platform
- doPlatform - misc stuff
- deployWar: deploy the war to the server
- deployEar: deploy the ear to the server
- =================================================================== -->
-
-<project name="bedework.platformWar" default="doPlatform" >
- <target name="doPlatform" >
- <!-- ===============================================================
- We create an updated geronimo-web.xml file (for geronimo) and a ear
- =============================================================== -->
-
- <copy todir="${app.dest.webinf}"
- file="${app.sou.dir}/war/WEB-INF/geronimo-web.xml">
- <filterset refid="property.filters" />
- </copy>
-
- <if>
- <isset property="propval.app.virtual.host" />
- <then>
- <replace file="${app.dest.webinf}/geronimo-web.xml">
- <replacetoken><![CDATA[<!-- Virtual host -->]]></replacetoken>
- <replacevalue><![CDATA[<host>@VIRTUAL-HOST@</host>
- ]]>
- </replacevalue>
- </replace>
- <replace file="${app.dest.webinf}/geronimo-web.xml">
- <replacefilter token="@VIRTUAL-HOST@" value="${propval.app.virtual.host}"/>
- </replace>
- </then>
- </if>
- </target>
-
- <!-- ================================================================
- Add libraries
- ================================================================ -->
-
- <target name="addLibs">
- <!-- hibernate jars -->
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.antlr}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm-attrs}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.cglib}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.dom4j}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ehcache}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.hibernate}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.javassist}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jgroups}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jta}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-api}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-log4j12}" />
-
- <if>
- <isset property="org.bedework.build.caldav.google" />
- <then>
- <copy todir="${app.dest.lib}">
- <fileset dir="${google.dir}">
- <include name="*.jar"/>
- </fileset>
- </copy>
- </then>
- </if>
-
- <!-- ===============================================================
- Any jar files required
- =============================================================== -->
-
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-annotations}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiaccess}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiutil}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-davio}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-apiutil}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcore}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcorei}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calfacade}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvc}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvci}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-client}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-icalendar}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-logging}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-mail}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-sysevents}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-appcommon}" />
-
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-core}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-misc}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ical4j}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-codec}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-collections}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-httpclient}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-lang}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-ssl}"/>
-
- <!-- Mail related stuff -->
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.activation}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.dsn}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.imap}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.mailapi}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.pop3}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.smtp}" />
-
- <!-- any extra files-->
- <copy todir="${app.dest.lib}" >
- <fileset dir="${org.bedework.temp.extrajars.dir}" />
- </copy>
-
- <if>
- <isset property="org.bedework.strutsapp" />
- <then>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.serializer}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.xalan}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.struts}"/>
-
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-beanutils}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-digester}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-fileupload}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-logging}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-validator}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jakarta-oro}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jstl}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jstl-standard}"/>
- </then>
- </if>
- </target>
-
- <!-- ================================================================
- Deploy war
- ================================================================ -->
-
- <target name="deployWar">
- <if>
- <not>
- <isset property="org.bedework.global.build.ear" />
- </not>
- <then>
- <echo message="***************************************************************" />
- <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" />
- <echo message="***************************************************************" />
-
- <!-- copy the war file. -->
- <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}"
- overwrite="yes" />
-
- <!-- Delete expanded version -->
- <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" />
- </then>
- </if>
- </target>
-
- <!-- ================================================================
- Deploy ear
- ================================================================ -->
-
- <target name="deployEar">
- </target>
-</project>
\ No newline at end of file
Modified: trunk/build/platforms/jbossService.xml
===================================================================
--- trunk/build/platforms/jbossService.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/build/platforms/jbossService.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -69,15 +69,6 @@
</copy>
</then>
</if>
-
- <if>
- <not>
- <isset property="propval.app.no.defaultlibs" />
- </not>
- <then>
- <antcall target="copyLibs" inheritRefs="true" />
- </then>
- </if>
</else>
</if>
</target>
@@ -162,64 +153,4 @@
</else>
</if>
</target>
-
- <!-- ================================================================
- Private target to copy libraries
- ================================================================ -->
-
- <target name="copyLibs">
- <!-- hibernate jars -->
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.antlr}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm-attrs}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.cglib}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.dom4j}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ehcache}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.hibernate}" />
- <!--
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.javassist}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jgroups}" />
- -->
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jta}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-collections}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-api}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-log4j12}" />
-
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-logging}"/>
-
- <!-- core files -->
-
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiaccess}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiutil}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-davio}" />
-
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-annotations}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-apiutil}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcore}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcorei}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calfacade}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvc}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvci}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-icalendar}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-logging}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-mail}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-sysevents}" />
-
- <!-- any extra files-->
- <copy todir="${app.dest.lib}" >
- <fileset dir="${org.bedework.temp.extrajars.dir}" />
- </copy>
-
- <!-- Some more standard libs -->
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-core}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-misc}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.backport-util-concurrent}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ical4j}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ical4j-vcard}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-codec}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-digester}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-httpclient}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-lang}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-ssl}"/>
- </target>
</project>
\ No newline at end of file
Modified: trunk/build/platforms/jbossWar.xml
===================================================================
--- trunk/build/platforms/jbossWar.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/build/platforms/jbossWar.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -59,14 +59,6 @@
<!-- Library in war file -->
<property name="app.dest.lib"
location="${app.dest.webinf}/lib" />
- <if>
- <not>
- <isset property="propval.app.no.defaultlibs" />
- </not>
- <then>
- <antcall target="copyLibs" inheritRefs="true" />
- </then>
- </if>
</then>
<else>
<!-- Preserve extra jars for later -->
@@ -128,14 +120,6 @@
<!-- Common library in ear file -->
<property name="app.dest.lib"
location="${org.bedework.ear.dir}" />
- <if>
- <not>
- <isset property="propval.app.no.defaultlibs" />
- </not>
- <then>
- <antcall target="copyLibs" inheritRefs="true" />
- </then>
- </if>
<!-- Add any extra jars -->
<copy todir="${org.bedework.temp.ear.extrajars.dir}" >
@@ -234,92 +218,4 @@
</then>
</if>
</target>
-
- <!-- ================================================================
- Private target to copy libraries
- ================================================================ -->
-
- <target name="copyLibs">
- <!-- hibernate jars -->
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.antlr}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm-attrs}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.cglib}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.dom4j}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ehcache}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.hibernate}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.javassist}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jta}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-api}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-log4j12}" />
-
- <if>
- <isset property="org.bedework.build.caldav.google" />
- <then>
- <copy todir="${app.dest.lib}">
- <fileset dir="${google.dir}">
- <include name="*.jar"/>
- </fileset>
- </copy>
- </then>
- </if>
-
- <!-- ===============================================================
- Any jar files required
- =============================================================== -->
-
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-annotations}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiaccess}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiutil}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-davio}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-apiutil}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcore}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcorei}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calfacade}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvc}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvci}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-client}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-icalendar}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-logging}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-mail}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-sysevents}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-appcommon}" />
-
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-core}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-misc}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.backport-util-concurrent}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ical4j}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ical4j-vcard}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-codec}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-collections}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-httpclient}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-lang}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-ssl}"/>
-
- <!-- Mail related stuff -->
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.activation}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.dsn}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.imap}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.mailapi}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.pop3}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.smtp}" />
-
- <!-- any extra files-->
- <copy todir="${app.dest.lib}" >
- <fileset dir="${org.bedework.temp.extrajars.dir}" />
- </copy>
-
- <!-- Add the struts stuff -->
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.serializer}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.xalan}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.struts}"/>
-
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-beanutils}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-digester}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-fileupload}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-validator}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jakarta-oro}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jstl}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jstl-standard}"/>
- </target>
</project>
\ No newline at end of file
Modified: trunk/build/platforms/runnableService.xml
===================================================================
--- trunk/build/platforms/runnableService.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/build/platforms/runnableService.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -33,65 +33,11 @@
================================================================ -->
<target name="runnableAddLibs">
- <!-- hibernate jars -->
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.antlr}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm-attrs}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.cglib}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.dom4j}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ehcache}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.hibernate}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.javassist}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jgroups}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jta}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-collections}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-api}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-log4j12}" />
-
- <!-- jms support -->
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.activemq-core}" />
- <copy todir="${app.dest.lib}"
- file="${org.bedework.appjar.geronimo-j2ee-management_1.0_spec}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jms}" />
-
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-logging}"/>
-
- <!-- core files -->
-
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiaccess}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiutil}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-davio}" />
-
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-annotations}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-apiutil}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcore}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcorei}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calfacade}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvc}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvci}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-icalendar}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-logging}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-mail}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-sysevents}" />
-
- <!-- any extra files-->
+ <!-- any extra files -->
<copy todir="${app.dest.lib}" >
<fileset dir="${org.bedework.temp.extrajars.dir}" />
</copy>
- <!-- Some more standard libs -->
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.log4j}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-core}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-misc}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.backport-util-concurrent}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ical4j}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ical4j-vcard}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-codec}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-digester}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-httpclient}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-lang}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-ssl}"/>
-
<!-- jdbc stuff -->
<if>
@@ -105,10 +51,6 @@
</fileset>
</copy>
</then>
- <else>
- <!-- Include the quickstart jdbc driver -->
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.hsqldb}"/>
- </else>
</if>
</target>
Modified: trunk/build/platforms/tomcat5War.xml
===================================================================
--- trunk/build/platforms/tomcat5War.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/build/platforms/tomcat5War.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -32,101 +32,6 @@
<!-- Library in war file -->
<property name="app.dest.lib"
location="${app.dest.webinf}/lib" />
-
- <!-- hibernate jars -->
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.antlr}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm-attrs}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.cglib}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.dom4j}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ehcache}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.hibernate}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.javassist}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jgroups}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jta}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-api}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-log4j12}" />
-
- <!-- jms support -->
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.activemq-core}" />
- <copy todir="${app.dest.lib}"
- file="${org.bedework.appjar.geronimo-j2ee-management_1.0_spec}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jms}" />
-
- <if>
- <isset property="org.bedework.build.caldav.google" />
- <then>
- <copy todir="${app.dest.lib}">
- <fileset dir="${google.dir}">
- <include name="*.jar"/>
- </fileset>
- </copy>
- </then>
- </if>
-
- <!-- ===============================================================
- Any jar files required
- =============================================================== -->
-
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-annotations}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiaccess}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiutil}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-davio}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-apiutil}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcore}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcorei}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calfacade}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvc}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvci}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-client}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-icalendar}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-logging}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-mail}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-sysevents}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-appcommon}" />
-
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-core}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-misc}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.backport-util-concurrent}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ical4j}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-codec}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-collections}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-httpclient}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-lang}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-ssl}"/>
-
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.log4j}"/>
-
- <!-- Mail related stuff -->
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.activation}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.dsn}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.imap}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.mailapi}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.pop3}" />
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.smtp}" />
-
- <!-- any extra files-->
- <copy todir="${app.dest.lib}" >
- <fileset dir="${org.bedework.temp.extrajars.dir}" />
- </copy>
-
- <if>
- <isset property="org.bedework.strutsapp" />
- <then>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.serializer}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.xalan}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.struts}"/>
-
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-beanutils}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-digester}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-fileupload}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-logging}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-validator}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jakarta-oro}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jstl}"/>
- <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jstl-standard}"/>
- </then>
- </if>
</target>
<!-- ================================================================
Modified: trunk/build/quickstart/linux/bw
===================================================================
--- trunk/build/quickstart/linux/bw 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/build/quickstart/linux/bw 2011-02-16 20:13:33 UTC (rev 3180)
@@ -230,7 +230,6 @@
CLASSPATH=$ANT_HOME/lib/ant-launcher.jar
CLASSPATH=$CLASSPATH:$QUICKSTART_HOME/bedework/build/quickstart/antlib
-#CLASSPATH=$CLASSPATH:$QUICKSTART_HOME/bedework/applib/log4j-1.2.8.jar
# Default some parameters
Modified: trunk/build/quickstart/windows/bw.bat
===================================================================
--- trunk/build/quickstart/windows/bw.bat 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/build/quickstart/windows/bw.bat 2011-02-16 20:13:33 UTC (rev 3180)
@@ -19,7 +19,6 @@
SET CLASSPATH="%ANT_HOME%\lib\ant-launcher.jar"
SET CLASSPATH=%CLASSPATH%;"%QUICKSTART_HOME%\bedework\build\quickstart\antlib"
-:: SET CLASSPATH=%CLASSPATH%;"%QUICKSTART_HOME%\bedework\applib\log4j-1.2.8.jar"
:: Default some parameters
SET BWCONFIGS=
Modified: trunk/config/bwbuild/default/cal.options.xml
===================================================================
--- trunk/config/bwbuild/default/cal.options.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/config/bwbuild/default/cal.options.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -499,7 +499,7 @@
<!-- ===============================================================
Admin web client CalAdmin
- ================================================================== -->
+ =============================================================== -->
<CalAdmin classname="org.bedework.calfacade.configs.AdminConfig">
<autoCreateContacts>false</autoCreateContacts>
<autoDeleteContacts>false</autoDeleteContacts>
@@ -961,6 +961,16 @@
<ticketPrincipalRoot>/principals/tickets</ticketPrincipalRoot>
<hostPrincipalRoot>/principals/hosts</hostPrincipalRoot>
</pubcarddav>
+
+ <!-- ==================================================================
+ CardDAV importer
+ ================================================================== -->
+ <carddavImp classname="org.bedework.carddav.util.CardDAVConfig">
+ <appType>carddavimp</appType>
+ <!--
+ <publicAdmin>false</publicAdmin> -->
+ <guestMode>false</guestMode>
+ </carddavImp>
</app>
</bedework>
</org>
Modified: trunk/config/bwbuild/default/cal.properties
===================================================================
--- trunk/config/bwbuild/default/cal.properties 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/config/bwbuild/default/cal.properties 2011-02-16 20:13:33 UTC (rev 3180)
@@ -552,7 +552,6 @@
org.bedework.app.sysevlog.batscr.name=bwrun.bat
org.bedework.app.sysevlog.zip.name=bwsysevlog
org.bedework.app.sysevlog.description=Bedework system events logger application
-org.bedework.app.sysevlog.no.defaultlibs=true
#
# --------------------------------------------------------------------
@@ -566,7 +565,6 @@
org.bedework.app.monitor.batscr.name=bwrun.bat
org.bedework.app.monitor.zip.name=monitor
org.bedework.app.monitor.description=Bedework system events monitor application
-org.bedework.app.monitor.no.defaultlibs=true
#
# --------------------------------------------------------------------
@@ -580,7 +578,6 @@
org.bedework.app.genkeys.batscr.name=bwrun.bat
org.bedework.app.genkeys.zip.name=genkeys
org.bedework.app.genkeys.description=Bedework system Key generator
-org.bedework.app.genkeys.no.defaultlibs=true
#
# --------------------------------------------------------------------
@@ -640,3 +637,38 @@
org.bedework.app.usercarddav.deploy.dir=${org.bedework.appserver.deploy.dir}
org.bedework.app.usercarddav.logprefix=usercarddav
+#
+# --------------------------------------------------------------------
+#
+# CardDAV importer
+#
+
+org.bedework.app.carddavimp.runnable=yes
+org.bedework.app.carddavimp.project=carddav
+org.bedework.app.carddavimp.sou.dir=tools
+org.bedework.app.carddavimp.shellscr.name=bwrun
+org.bedework.app.carddavimp.batscr.name=bwrun.bat
+org.bedework.app.carddavimp.zip.name=carddavimp
+org.bedework.app.carddavimp.description=Bedework CardDAV importer
+
+#
+# --------------------------------------------------------------------
+#
+# Exchange synchronization Service - callback web server
+#
+org.bedework.app.exsynchwcb.project=exsynch
+org.bedework.app.exsynchwcb.sou.dir=server
+
+org.bedework.app.exsynchwcb.web.xml=war/WEB-INF/web.xml
+org.bedework.app.exsynchwcb.war.name=exsynch
+org.bedework.app.exsynchwcb.context.root=/exsynch
+# Set for jboss
+#org.bedework.app.usercarddav.virtual.host=events.rpi.edu
+
+org.bedework.app.exsynchwcb.description=Bedework exsynch callback server.
+org.bedework.app.exsynchwcb.display.name=Bedework exsynch callback server
+org.bedework.app.exsynchwcb.name=Demoexsynchw
+org.bedework.app.exsynchwcb.deploy.dir=${org.bedework.appserver.deploy.dir}
+org.bedework.app.exsynchwcb.logprefix=exsynch
+
+
Modified: trunk/config/bwbuild/jboss-h2/cal.options.xml
===================================================================
--- trunk/config/bwbuild/jboss-h2/cal.options.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/config/bwbuild/jboss-h2/cal.options.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -31,13 +31,22 @@
<personalCalendarUri>/ucal</personalCalendarUri>
<!-- CardDAV server locations -->
- <publicCardDAVUri>http://localhost:8080/carddav</publicCardDAVUri>
- <personalCardDAVUri>http://localhost:8080/ucarddav</personalCardDAVUri>
+ <publicCardDAVHost>localhost</publicCardDAVHost>
+ <publicCardDAVPort>8080</publicCardDAVPort>
+ <publicCardDAVContext>/pubcarddav</publicCardDAVContext>
+
+ <personalCardDAVHost>localhost</personalCardDAVHost>
+ <personalCardDAVPort>8080</personalCardDAVPort>
+ <personalCardDAVContext>/ucarddav</personalCardDAVContext>
<!-- Timezone server locations -->
<timezonesUri>http://localhost:8080/tzsvr</timezonesUri>
- <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" >
+ <!-- Public/private key locations -->
+ <privKeys>@DATA_DIR@/data/bedework/privkeys</privKeys>
+ <pubKeys>@DATA_DIR@/data/bedework/pubkeys</pubKeys>
+
+ <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" >
<principalRoot>/principals</principalRoot>
<userPrincipalRoot>/principals/users</userPrincipalRoot>
<groupPrincipalRoot>/principals/groups</groupPrincipalRoot>
@@ -48,6 +57,313 @@
<hostPrincipalRoot>/principals/hosts</hostPrincipalRoot>
</systemRoots>
+ <!-- To enable mapping of calendar addresses e.g. mailto:fred at example.org
+ on to principals we need to either do a directory lookup or have
+ some sort of pattern map.
+
+ Setting a caladdr prefix enables pattern mapping. By default
+ calendar addresses are users -->
+
+ <!--
+ <caladdrPrefixes classname="org.bedework.calfacade.configs.CalAddrPrefixes">
+ <location>loc_</location>
+ </caladdrPrefixes>
+ -->
+
+ <!-- ===============================================================
+ CardDAV directory handlers
+ =============================================================== -->
+
+ <dirhandlers>
+ <!-- handle the principal hierarchy.
+ This could be a read-only interface if we don't intend to allow
+ modification of the enterprise directory.
+
+ However, we may need to merge in subsidiary information to handle
+ principal properties. That may mean maintaining a shadow
+ principal hierarchy in the local server.
+
+ Each element name below must be unique.
+ -->
+ <principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+ <pathPrefix>/principals</pathPrefix>
+ <className>org.bedework.carddav.server.dirHandlers.ldap.LdapPrincipalDirHandler</className>
+
+ <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+ <providerUrl>ldap://localhost:10389/</providerUrl>
+ <baseDn>dc=bedework, dc=org</baseDn>
+
+ <queryLimit>1000</queryLimit>
+
+ <!-- We need to get operational attributes from the directory.
+ This requires us to explicitly name all attributes on fetch.
+ This element allows us to name EXTRA attributes from the default
+ list provided by the implementation.
+ -->
+ <attrIds></attrIds>
+
+ <addressbookObjectClass>organizationalUnit</addressbookObjectClass>
+ <addressbookIdAttr>ou</addressbookIdAttr>
+
+ <authDn>uid=admin,ou=system</authDn>
+ <authPw>secret</authPw>
+
+ <debug>true</debug>
+ </principal-dirHandler>
+
+ <user-principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+ <pathPrefix>/principals/users</pathPrefix>
+ <addressBook>true</addressBook>
+
+ <!-- The cardPathPrefix is used to manufacture a path to a card for
+ the principal. If it is set we take the path
+
+ <principal-root>/<account>
+
+ and transform it to
+
+ <cardPathPrefix>/<account>.vcf
+
+ If it is not set we try the cardPathPrefixes supplied globally.
+ If they are not supplied we don't give any path. The client will
+ have to fall back to a query.
+ -->
+ <cardPathPrefix>/public/people</cardPathPrefix>
+
+ <cardPathPrefixes>/public/people,loc_:/public/locations</cardPathPrefixes>
+
+ <className>org.bedework.carddav.server.dirHandlers.ldap.LdapPrincipalDirHandler</className>
+
+ <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+ <providerUrl>ldap://localhost:10389/</providerUrl>
+ <baseDn>ou=accounts,dc=bedework,dc=org</baseDn>
+
+ <queryLimit>1000</queryLimit>
+
+ <attrIds></attrIds>
+
+ <cardKind>individual</cardKind>
+
+ <addressbookObjectClass>organizationalUnit</addressbookObjectClass>
+ <addressbookIdAttr>ou</addressbookIdAttr>
+
+ <addressbookEntryObjectClass>inetOrgPerson</addressbookEntryObjectClass>
+ <addressbookEntryIdAttr>uid</addressbookEntryIdAttr>
+
+ <principalIdAttr>uid</principalIdAttr>
+
+ <authDn>uid=admin,ou=system</authDn>
+ <authPw>secret</authPw>
+
+ <debug>true</debug>
+ </user-principal-dirHandler>
+
+ <group-principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+ <pathPrefix>/principals/groups</pathPrefix>
+ <addressBook>true</addressBook>
+
+ <className>org.bedework.carddav.server.dirHandlers.ldap.LdapPrincipalDirHandler</className>
+
+ <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+ <providerUrl>ldap://localhost:10389/</providerUrl>
+
+ <baseDn>ou=groups,dc=bedework,dc=org</baseDn>
+
+ <queryLimit>1000</queryLimit>
+
+ <attrIds></attrIds>
+
+ <cardKind>group</cardKind>
+
+ <addressbookObjectClass>organizationalUnit</addressbookObjectClass>
+ <addressbookIdAttr>ou</addressbookIdAttr>
+
+ <addressbookEntryObjectClass>groupOfUniqueNames</addressbookEntryObjectClass>
+ <addressbookEntryIdAttr>cn</addressbookEntryIdAttr>
+
+ <principalIdAttr>cn</principalIdAttr>
+
+ <authDn>uid=admin,ou=system</authDn>
+ <authPw>secret</authPw>
+
+ <debug>true</debug>
+ </group-principal-dirHandler>
+
+ <location-principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+ <pathPrefix>/principals/locations</pathPrefix>
+ <addressBook>true</addressBook>
+ <cardPathPrefix>/public/locations</cardPathPrefix>
+
+ <className>org.bedework.carddav.server.dirHandlers.ldap.LdapPrincipalDirHandler</className>
+
+ <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+ <providerUrl>ldap://localhost:10389/</providerUrl>
+
+ <baseDn>ou=locations,dc=bedework,dc=org</baseDn>
+
+ <queryLimit>1000</queryLimit>
+
+ <attrIds></attrIds>
+
+ <cardKind>location</cardKind>
+
+ <addressbookObjectClass>organizationalUnit</addressbookObjectClass>
+ <addressbookIdAttr>ou</addressbookIdAttr>
+
+ <addressbookEntryObjectClass>groupOfUniqueNames</addressbookEntryObjectClass>
+ <addressbookEntryIdAttr>cn</addressbookEntryIdAttr>
+
+ <principalIdAttr>cn</principalIdAttr>
+
+ <authDn>uid=admin,ou=system</authDn>
+ <authPw>secret</authPw>
+
+ <debug>true</debug>
+ </location-principal-dirHandler>
+
+ <!-- handle the public (enterprise) people address book hierarchy -->
+ <public-people-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+ <pathPrefix>/public/people</pathPrefix>
+
+ <className>org.bedework.carddav.server.dirHandlers.ldap.LdapAddrBookDirHandler</className>
+
+ <!-- manufacture an owner for public entities -->
+ <ownerHref>/principals/users/admin</ownerHref>
+ <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+ <providerUrl>ldap://localhost:10389/</providerUrl>
+ <baseDn>ou=people,ou=public,dc=bedework,dc=org</baseDn>
+ <queryLimit>1000</queryLimit>
+
+ <attrIds></attrIds>
+
+ <folderObjectClass>organizationalUnit</folderObjectClass>
+ <addressbookObjectClass>organizationalUnit</addressbookObjectClass>
+ <addressbookEntryObjectClass>inetOrgPerson</addressbookEntryObjectClass>
+ <folderIdAttr>ou</folderIdAttr>
+ <addressbookIdAttr>ou</addressbookIdAttr>
+ <addressbookEntryIdAttr>cn</addressbookEntryIdAttr>
+
+ <authDn>uid=admin,ou=system</authDn>
+ <authPw>secret</authPw>
+ <debug>true</debug>
+ </public-people-dirHandler>
+
+
+ <!-- handle the user address book hierarchy -->
+
+ <user-dirHandler classname="org.bedework.carddav.util.DbDirHandlerConfig" >
+ <pathPrefix>/user</pathPrefix>
+
+ <className>org.bedework.carddav.server.dirHandlers.db.DbAddrBookDirHandler</className>
+
+ <queryLimit>1000</queryLimit> <!-- unimplemented -->
+
+ <!-- This is the access set at the root. I'll do this as XML soon -->
+ <rootAccess>WONyA WANyFyS </rootAccess>
+
+ <!-- This is the owner of the user root and user home -->
+ <rootOwner>/principals/users/root</rootOwner>
+
+ <debug>true</debug>
+ </user-dirHandler>
+
+ <!-- handle the user address book hierarchy
+ How it might be done with ldap
+ <user-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+ <pathPrefix>/user</pathPrefix>
+ <className>org.bedework.carddav.server.dirHandlers.ldap.LdapAddrBookDirHandler</className>
+
+ <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+ <providerUrl>ldap://localhost:10389/</providerUrl>
+
+ <baseDn>ou=users,ou=addrbooks,dc=bedework,dc=org</baseDn>
+
+ <queryLimit>1000</queryLimit>
+
+ <attrIds></attrIds>
+
+ <folderObjectClass>organizationalUnit</folderObjectClass>
+ <folderIdAttr>ou</folderIdAttr>
+
+ <addressbookObjectClass>addressBook</addressbookObjectClass>
+ <addressbookIdAttr>ou</addressbookIdAttr>
+
+ <addressbookEntryObjectClass>inetOrgPerson</addressbookEntryObjectClass>
+ <addressbookEntryIdAttr>cn</addressbookEntryIdAttr>
+
+ <authDn>uid=admin,ou=system</authDn>
+ <authPw>secret</authPw>
+ <debug>true</debug>
+ </user-dirHandler>
+ -->
+
+ <public-locations-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+ <pathPrefix>/public/locations</pathPrefix>
+
+ <className>org.bedework.carddav.server.dirHandlers.ldap.LdapAddrBookDirHandler</className>
+
+ <!-- manufacture an owner for public entities -->
+ <ownerHref>/principals/users/admin</ownerHref>
+
+ <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+ <providerUrl>ldap://localhost:10389/</providerUrl>
+ <baseDn>ou=locations,ou=public,dc=bedework,dc=org</baseDn>
+
+ <queryLimit>1000</queryLimit>
+
+ <attrIds></attrIds>
+
+ <cardKind>location</cardKind>
+
+ <addressbookObjectClass>organizationalUnit</addressbookObjectClass>
+ <addressbookIdAttr>ou</addressbookIdAttr>
+
+ <addressbookEntryObjectClass>CalendarResource</addressbookEntryObjectClass>
+ <addressbookEntryIdAttr>cn</addressbookEntryIdAttr>
+
+ <principalIdAttr>calcaladruri</principalIdAttr>
+
+ <authDn>uid=admin,ou=system</authDn>
+ <authPw>secret</authPw>
+
+ <debug>true</debug>
+ </public-locations-dirHandler>
+
+ <!-- handle the public (enterprise) address book hierarchy -->
+ <public-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+ <pathPrefix>/public</pathPrefix>
+ <className>org.bedework.carddav.server.dirHandlers.ldap.LdapAddrBookDirHandler</className>
+
+ <!-- manufacture an owner for public entities -->
+ <ownerHref>/principals/users/admin</ownerHref>
+
+ <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+ <providerUrl>ldap://localhost:10389/</providerUrl>
+
+ <baseDn>ou=public,dc=bedework,dc=org</baseDn>
+
+ <queryLimit>1000</queryLimit>
+
+ <attrIds></attrIds>
+
+ <folderObjectClass>organizationalUnit</folderObjectClass>
+ <addressbookObjectClass>addressBook</addressbookObjectClass>
+ <addressbookEntryObjectClass>inetOrgPerson</addressbookEntryObjectClass>
+
+ <folderIdAttr>ou</folderIdAttr>
+ <addressbookIdAttr>ou</addressbookIdAttr>
+ <addressbookEntryIdAttr>cn</addressbookEntryIdAttr>
+
+ <authDn>uid=admin,ou=system</authDn>
+ <authPw>secret</authPw>
+ <debug>true</debug>
+ </public-dirHandler>
+ </dirhandlers>
+
+ <!-- ===============================================================
+ Calendar system modules
+ =============================================================== -->
+
<module>
<!-- A dummy module with no directory. -->
<dir-config classname="org.bedework.calfacade.configs.DirConfigProperties">
@@ -100,14 +416,6 @@
<dummymail classname="org.bedework.mail.MailConfigProperties">
<disabled>false</disabled>
</dummymail>
-
- <default-pwencrypt classname="org.bedework.calfacade.security.DefaultPwEncryptionConfig">
- <privKeys>@DATA_DIR@/data/bedework/privkeys</privKeys>
- <pubKeys>@DATA_DIR@/data/bedework/pubkeys</pubKeys>
-
- <debug>true</debug>
- <verbose>true</verbose>
- </default-pwencrypt>
</module>
</global>
@@ -163,27 +471,35 @@
</syspars>
<app>
- <!-- ==================================================================
+ <!-- ===============================================================
Timezones server
- ================================================================== -->
- <tzsvr classname="org.bedework.calfacade.configs.ConfigCommon">
+ =============================================================== -->
+ <tzsvr classname="org.bedework.timezones.common.TzsvrConfig">
<appType>tzsvr</appType>
- <publicAdmin>false</publicAdmin>
- <guestMode>true</guestMode>
+
+ <!-- Property defining location of the registry -->
+ <tzdataUrl>http://localhost:8080/tzdata.zip</tzdataUrl>
+
+ <!-- Property defining long seconds refetch interval for data -->
+ <refetchInterval>6000</refetchInterval>
+
+ <cacheName>vtz</cacheName>
+
+ <postId>12345abcde</postId>
</tzsvr>
- <!-- ==================================================================
+ <!-- ===============================================================
Config web client
- ================================================================== -->
+ =============================================================== -->
<bwconfig classname="org.bedework.calfacade.configs.ConfigCommon">
<appType>webconfig</appType>
<publicAdmin>false</publicAdmin>
<guestMode>false</guestMode>
</bwconfig>
- <!-- ==================================================================
+ <!-- ===============================================================
Admin web client CalAdmin
- ================================================================== -->
+ =============================================================== -->
<CalAdmin classname="org.bedework.calfacade.configs.AdminConfig">
<autoCreateContacts>false</autoCreateContacts>
<autoDeleteContacts>false</autoDeleteContacts>
@@ -296,8 +612,6 @@
<calSuite>MainCampus</calSuite>
</Events>
-
-
<!-- ==================================================================
Feed Service
================================================================== -->
@@ -407,9 +721,9 @@
<refreshInterval>300</refreshInterval>
</UserCal>
- <!-- ==================================================================
+ <!-- ===============================================================
User CalDAV server UserCalDAV
- ================================================================== -->
+ =============================================================== -->
<Usercaldav classname="org.bedework.caldav.util.CalDAVConfig">
<appType>usercaldav</appType>
<!--
@@ -462,6 +776,32 @@
</Pubcaldav>
<!-- ==================================================================
+ User CalWS server Usercalws
+ ================================================================== -->
+ <Usercalws classname="org.bedework.caldav.util.CalDAVConfig">
+ <appType>usercalws</appType>
+ <!--
+ <publicAdmin>false</publicAdmin>
+ -->
+ <guestMode>false</guestMode>
+
+ <sysintfImpl>org.bedework.caldav.bwserver.BwSysIntfImpl</sysintfImpl>
+ </Usercalws>
+
+ <!-- ==================================================================
+ Public (unauthenticated) CalWS server Pubcalws
+ ================================================================== -->
+ <Pubcalws classname="org.bedework.caldav.util.CalDAVConfig">
+ <appType>publiccalws</appType>
+ <!--
+ <publicAdmin>false</publicAdmin>
+ -->
+ <guestMode>true</guestMode>
+
+ <sysintfImpl>org.bedework.caldav.bwserver.BwSysIntfImpl</sysintfImpl>
+ </Pubcalws>
+
+ <!-- ==================================================================
CalDAV test suite
================================================================== -->
<caldavTest classname="org.bedework.calfacade.configs.ConfigCommon">
@@ -540,6 +880,97 @@
<guestMode>true</guestMode>
<debugEntity>false</debugEntity>
</iosched>
+
+ <!-- ==================================================================
+ Exchange synch
+ ================================================================== -->
+ <Exsynch classname="org.bedework.exchgsynch.ExsynchConfig">
+ <appType>exsynch</appType>
+
+ <!-- location of the WSDL - modified to include server element -->
+ <exchangeWSDLURI>http://localhost:8080/exchange/Services.wsdl</exchangeWSDLURI>
+
+ <!-- Exchange sync callback. Comment out for no service -->
+ <exchangeWsPushURI>http://128.113.124.221/exsynch/</exchangeWsPushURI>
+
+ <!-- Path to keystore - comment out to use default -->
+ <keystore>@APPSERVER-DATA-DIR@/exsynchcerts</keystore>
+
+ <!-- location of the WSDL for the remote web service -->
+ <remoteWSDLURI>http://localhost:8080/exchange/wssvc.wsdl</remoteWSDLURI>
+
+ <remoteWsURL>http://localhost:8080/pubcaldav/exsynchws/</remoteWsURL>
+
+ <!-- seconds -->
+ <remoteKeepAliveInterval>60</remoteKeepAliveInterval>
+ </Exsynch>
+
+ <!-- ===============================================================
+ User CardDAV server usercarddav
+ =============================================================== -->
+ <usercarddav classname="org.bedework.carddav.util.CardDAVConfig" >
+ <sysintfImpl>org.bedework.carddav.bwserver.BwSysIntfImpl</sysintfImpl>
+
+ <webaddrServiceURI>/find</webaddrServiceURI>
+ <webaddrServicePropertiesList>fn,email,note,org</webaddrServicePropertiesList>
+ <webaddrPublicAddrbook>/principals/users</webaddrPublicAddrbook>
+
+ <directoryBrowsingDisallowed>false</directoryBrowsingDisallowed>
+
+ <defaultAddressbook>addressbook</defaultAddressbook>
+
+ <!-- This will act as the root for the file system -->
+ <addressBookHandlerPrefix>/user</addressBookHandlerPrefix>
+
+ <!-- Needed for access calculations -->
+ <userHomeRoot>/user</userHomeRoot>
+
+ <principalRoot>/principals</principalRoot>
+ <userPrincipalRoot>/principals/users</userPrincipalRoot>
+ <groupPrincipalRoot>/principals/groups</groupPrincipalRoot>
+ <resourcePrincipalRoot>/principals/resources</resourcePrincipalRoot>
+ <venuePrincipalRoot>/principals/locations</venuePrincipalRoot>
+ <ticketPrincipalRoot>/principals/tickets</ticketPrincipalRoot>
+ <hostPrincipalRoot>/principals/hosts</hostPrincipalRoot>
+ </usercarddav>
+
+ <!-- ===============================================================
+ Public CardDAV server pubcarddav
+ =============================================================== -->
+ <pubcarddav classname="org.bedework.carddav.util.CardDAVConfig" >
+ <sysintfImpl>org.bedework.carddav.bwserver.BwSysIntfImpl</sysintfImpl>
+
+ <webaddrServiceURI>/find</webaddrServiceURI>
+ <webaddrServicePropertiesList>fn,note,org</webaddrServicePropertiesList>
+ <webaddrPublicAddrbook>/principals/users</webaddrPublicAddrbook>
+
+ <directoryBrowsingDisallowed>false</directoryBrowsingDisallowed>
+
+ <defaultAddressbook>addressbook</defaultAddressbook>
+
+ <addressBookHandlerPrefix>/public</addressBookHandlerPrefix>
+
+ <!-- Needed for access calculations -->
+ <userHomeRoot>/user</userHomeRoot>
+
+ <principalRoot>/principals</principalRoot>
+ <userPrincipalRoot>/principals/users</userPrincipalRoot>
+ <groupPrincipalRoot>/principals/groups</groupPrincipalRoot>
+ <resourcePrincipalRoot>/principals/resources</resourcePrincipalRoot>
+ <venuePrincipalRoot>/principals/locations</venuePrincipalRoot>
+ <ticketPrincipalRoot>/principals/tickets</ticketPrincipalRoot>
+ <hostPrincipalRoot>/principals/hosts</hostPrincipalRoot>
+ </pubcarddav>
+
+ <!-- ==================================================================
+ CardDAV importer
+ ================================================================== -->
+ <carddavImp classname="org.bedework.carddav.util.CardDAVConfig">
+ <appType>carddavimp</appType>
+ <!--
+ <publicAdmin>false</publicAdmin> -->
+ <guestMode>false</guestMode>
+ </carddavImp>
</app>
</bedework>
</org>
Modified: trunk/config/bwbuild/jboss-h2/cal.properties
===================================================================
--- trunk/config/bwbuild/jboss-h2/cal.properties 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/config/bwbuild/jboss-h2/cal.properties 2011-02-16 20:13:33 UTC (rev 3180)
@@ -545,7 +545,6 @@
org.bedework.app.sysevlog.batscr.name=bwrun.bat
org.bedework.app.sysevlog.zip.name=bwsysevlog
org.bedework.app.sysevlog.description=Bedework system events logger application
-org.bedework.app.sysevlog.no.defaultlibs=true
#
# --------------------------------------------------------------------
@@ -559,7 +558,6 @@
org.bedework.app.monitor.batscr.name=bwrun.bat
org.bedework.app.monitor.zip.name=monitor
org.bedework.app.monitor.description=Bedework system events monitor application
-org.bedework.app.monitor.no.defaultlibs=true
#
# --------------------------------------------------------------------
@@ -573,7 +571,6 @@
org.bedework.app.genkeys.batscr.name=bwrun.bat
org.bedework.app.genkeys.zip.name=genkeys
org.bedework.app.genkeys.description=Bedework system Key generator
-org.bedework.app.genkeys.no.defaultlibs=true
#
# --------------------------------------------------------------------
@@ -633,3 +630,38 @@
org.bedework.app.usercarddav.deploy.dir=${org.bedework.appserver.deploy.dir}
org.bedework.app.usercarddav.logprefix=usercarddav
+#
+# --------------------------------------------------------------------
+#
+# CardDAV importer
+#
+
+org.bedework.app.carddavimp.runnable=yes
+org.bedework.app.carddavimp.project=carddav
+org.bedework.app.carddavimp.sou.dir=tools
+org.bedework.app.carddavimp.shellscr.name=bwrun
+org.bedework.app.carddavimp.batscr.name=bwrun.bat
+org.bedework.app.carddavimp.zip.name=carddavimp
+org.bedework.app.carddavimp.description=Bedework CardDAV importer
+
+#
+# --------------------------------------------------------------------
+#
+# Exchange synchronization Service - callback web server
+#
+org.bedework.app.exsynchwcb.project=exsynch
+org.bedework.app.exsynchwcb.sou.dir=server
+
+org.bedework.app.exsynchwcb.web.xml=war/WEB-INF/web.xml
+org.bedework.app.exsynchwcb.war.name=exsynch
+org.bedework.app.exsynchwcb.context.root=/exsynch
+# Set for jboss
+#org.bedework.app.usercarddav.virtual.host=events.rpi.edu
+
+org.bedework.app.exsynchwcb.description=Bedework exsynch callback server.
+org.bedework.app.exsynchwcb.display.name=Bedework exsynch callback server
+org.bedework.app.exsynchwcb.name=Demoexsynchw
+org.bedework.app.exsynchwcb.deploy.dir=${org.bedework.appserver.deploy.dir}
+org.bedework.app.exsynchwcb.logprefix=exsynch
+
+
Modified: trunk/config/bwbuild/jboss-mysql/cal.options.xml
===================================================================
--- trunk/config/bwbuild/jboss-mysql/cal.options.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/config/bwbuild/jboss-mysql/cal.options.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -499,7 +499,7 @@
<!-- ===============================================================
Admin web client CalAdmin
- ================================================================== -->
+ =============================================================== -->
<CalAdmin classname="org.bedework.calfacade.configs.AdminConfig">
<autoCreateContacts>false</autoCreateContacts>
<autoDeleteContacts>false</autoDeleteContacts>
@@ -961,6 +961,16 @@
<ticketPrincipalRoot>/principals/tickets</ticketPrincipalRoot>
<hostPrincipalRoot>/principals/hosts</hostPrincipalRoot>
</pubcarddav>
+
+ <!-- ==================================================================
+ CardDAV importer
+ ================================================================== -->
+ <carddavImp classname="org.bedework.carddav.util.CardDAVConfig">
+ <appType>carddavimp</appType>
+ <!--
+ <publicAdmin>false</publicAdmin> -->
+ <guestMode>false</guestMode>
+ </carddavImp>
</app>
</bedework>
</org>
Modified: trunk/config/bwbuild/jboss-mysql/cal.properties
===================================================================
--- trunk/config/bwbuild/jboss-mysql/cal.properties 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/config/bwbuild/jboss-mysql/cal.properties 2011-02-16 20:13:33 UTC (rev 3180)
@@ -550,7 +550,6 @@
org.bedework.app.sysevlog.batscr.name=bwrun.bat
org.bedework.app.sysevlog.zip.name=bwsysevlog
org.bedework.app.sysevlog.description=Bedework system events logger application
-org.bedework.app.sysevlog.no.defaultlibs=true
#
# --------------------------------------------------------------------
@@ -564,7 +563,6 @@
org.bedework.app.monitor.batscr.name=bwrun.bat
org.bedework.app.monitor.zip.name=monitor
org.bedework.app.monitor.description=Bedework system events monitor application
-org.bedework.app.monitor.no.defaultlibs=true
#
# --------------------------------------------------------------------
@@ -578,7 +576,6 @@
org.bedework.app.genkeys.batscr.name=bwrun.bat
org.bedework.app.genkeys.zip.name=genkeys
org.bedework.app.genkeys.description=Bedework system Key generator
-org.bedework.app.genkeys.no.defaultlibs=true
#
# --------------------------------------------------------------------
@@ -638,3 +635,38 @@
org.bedework.app.usercarddav.deploy.dir=${org.bedework.appserver.deploy.dir}
org.bedework.app.usercarddav.logprefix=usercarddav
+#
+# --------------------------------------------------------------------
+#
+# CardDAV importer
+#
+
+org.bedework.app.carddavimp.runnable=yes
+org.bedework.app.carddavimp.project=carddav
+org.bedework.app.carddavimp.sou.dir=tools
+org.bedework.app.carddavimp.shellscr.name=bwrun
+org.bedework.app.carddavimp.batscr.name=bwrun.bat
+org.bedework.app.carddavimp.zip.name=carddavimp
+org.bedework.app.carddavimp.description=Bedework CardDAV importer
+
+#
+# --------------------------------------------------------------------
+#
+# Exchange synchronization Service - callback web server
+#
+org.bedework.app.exsynchwcb.project=exsynch
+org.bedework.app.exsynchwcb.sou.dir=server
+
+org.bedework.app.exsynchwcb.web.xml=war/WEB-INF/web.xml
+org.bedework.app.exsynchwcb.war.name=exsynch
+org.bedework.app.exsynchwcb.context.root=/exsynch
+# Set for jboss
+#org.bedework.app.usercarddav.virtual.host=events.rpi.edu
+
+org.bedework.app.exsynchwcb.description=Bedework exsynch callback server.
+org.bedework.app.exsynchwcb.display.name=Bedework exsynch callback server
+org.bedework.app.exsynchwcb.name=Demoexsynchw
+org.bedework.app.exsynchwcb.deploy.dir=${org.bedework.appserver.deploy.dir}
+org.bedework.app.exsynchwcb.logprefix=exsynch
+
+
Modified: trunk/config/bwbuild/jboss-postgresql/cal.options.xml
===================================================================
--- trunk/config/bwbuild/jboss-postgresql/cal.options.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/config/bwbuild/jboss-postgresql/cal.options.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -971,6 +971,16 @@
<ticketPrincipalRoot>/principals/tickets</ticketPrincipalRoot>
<hostPrincipalRoot>/principals/hosts</hostPrincipalRoot>
</pubcarddav>
+
+ <!-- ==================================================================
+ CardDAV importer
+ ================================================================== -->
+ <carddavImp classname="org.bedework.carddav.util.CardDAVConfig">
+ <appType>carddavimp</appType>
+ <!--
+ <publicAdmin>false</publicAdmin> -->
+ <guestMode>false</guestMode>
+ </carddavImp>
</app>
</bedework>
</org>
Modified: trunk/config/bwbuild/jboss-postgresql/cal.properties
===================================================================
--- trunk/config/bwbuild/jboss-postgresql/cal.properties 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/config/bwbuild/jboss-postgresql/cal.properties 2011-02-16 20:13:33 UTC (rev 3180)
@@ -196,7 +196,7 @@
org.bedework.app.tzsvr.war.name=tzsvr
org.bedework.app.tzsvr.context.root=/tzsvr
# Set for jboss
-#org.bedework.app.tzsvr.virtual.host=my.host1,my.host.2
+#org.bedework.app.tzsvr.virtual.host=my.host1
org.bedework.app.tzsvr.description=Bedework timezones server.
org.bedework.app.tzsvr.display.name=Bedework timezones server.
@@ -551,7 +551,6 @@
org.bedework.app.sysevlog.batscr.name=bwrun.bat
org.bedework.app.sysevlog.zip.name=bwsysevlog
org.bedework.app.sysevlog.description=Bedework system events logger application
-org.bedework.app.sysevlog.no.defaultlibs=true
#
# --------------------------------------------------------------------
@@ -565,7 +564,6 @@
org.bedework.app.monitor.batscr.name=bwrun.bat
org.bedework.app.monitor.zip.name=monitor
org.bedework.app.monitor.description=Bedework system events monitor application
-org.bedework.app.monitor.no.defaultlibs=true
#
# --------------------------------------------------------------------
@@ -579,7 +577,6 @@
org.bedework.app.genkeys.batscr.name=bwrun.bat
org.bedework.app.genkeys.zip.name=genkeys
org.bedework.app.genkeys.description=Bedework system Key generator
-org.bedework.app.genkeys.no.defaultlibs=true
#
# --------------------------------------------------------------------
@@ -639,3 +636,38 @@
org.bedework.app.usercarddav.deploy.dir=${org.bedework.appserver.deploy.dir}
org.bedework.app.usercarddav.logprefix=usercarddav
+#
+# --------------------------------------------------------------------
+#
+# CardDAV importer
+#
+
+org.bedework.app.carddavimp.runnable=yes
+org.bedework.app.carddavimp.project=carddav
+org.bedework.app.carddavimp.sou.dir=tools
+org.bedework.app.carddavimp.shellscr.name=bwrun
+org.bedework.app.carddavimp.batscr.name=bwrun.bat
+org.bedework.app.carddavimp.zip.name=carddavimp
+org.bedework.app.carddavimp.description=Bedework CardDAV importer
+
+#
+# --------------------------------------------------------------------
+#
+# Exchange synchronization Service - callback web server
+#
+org.bedework.app.exsynchwcb.project=exsynch
+org.bedework.app.exsynchwcb.sou.dir=server
+
+org.bedework.app.exsynchwcb.web.xml=war/WEB-INF/web.xml
+org.bedework.app.exsynchwcb.war.name=exsynch
+org.bedework.app.exsynchwcb.context.root=/exsynch
+# Set for jboss
+#org.bedework.app.usercarddav.virtual.host=events.rpi.edu
+
+org.bedework.app.exsynchwcb.description=Bedework exsynch callback server.
+org.bedework.app.exsynchwcb.display.name=Bedework exsynch callback server
+org.bedework.app.exsynchwcb.name=Demoexsynchw
+org.bedework.app.exsynchwcb.deploy.dir=${org.bedework.appserver.deploy.dir}
+org.bedework.app.exsynchwcb.logprefix=exsynch
+
+
Deleted: trunk/deployment/appjars.xml
===================================================================
--- trunk/deployment/appjars.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/deployment/appjars.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -1,345 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ===================================================================
- Fetch and define properties for the jars we will roll into the web
- applications
- =================================================================== -->
-<project name="appJars" basedir="." default="">
- <property name="org.bedework.app.lib" location="${bw.project.home}/applib" />
- <macrodef name="getAppJars">
- <sequential>
- <delete dir="${org.bedework.app.lib}" />
- <mkdir dir="${org.bedework.app.lib}" />
-
- <property name="org.bedework.getjar.property.prefix"
- value="org.bedework.appjar" />
-
- <!-- Hibernate and associated jars -->
-
- <getJar lib="${org.bedework.app.lib}"
- name="antlr" version="2.7.6" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="asm-attrs" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="asm" version="3.2" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="cglib" version="2.1.3" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="dom4j" version="1.6.1" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="ehcache" version="1.2.3" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="hibernate" version="3.3.1.ga" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="javassist" version="3.4.GA" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="jgroups" version="2.2.8" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="jta" version="1.1" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="slf4j-api" version="1.5.6" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="slf4j-log4j12" version="1.5.6" />
-
- <!-- Struts and JSTL -->
-
- <property name="org.bedework.struts.tlds"
- location="${resources.dir}/struts-1.2.9/tlds"/>
-
- <getJar lib="${org.bedework.app.lib}"
- name="struts" version="1.2.9" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="commons-beanutils" version="1.7.0" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="commons-digester" version="1.7" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="commons-fileupload" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="commons-logging" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="commons-validator" version="1.3.0" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="jakarta-oro" version="2.0.8" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="jstl-standard" version="1.1.2" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="jstl" version="1.1.2" />
-
- <!-- Java mail -->
-
- <getJar lib="${org.bedework.app.lib}"
- name="activation" version="1.4" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="dsn" version="1.4" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="imap" version="1.4" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="mailapi" version="1.4" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="pop3" version="1.4" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="smtp" version="1.4" />
-
- <!-- Liferay -->
-
- <if>
- <equals arg1="${org.bedework.global.portal.platform}"
- arg2="liferay4" />
- <then>
- <getJar lib="${org.bedework.app.lib}"
- name="liferay.util-bridges" version="4.2" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="liferay.util-java" version="4.2" />
- </then>
- </if>
-
- <if>
- <equals arg1="${org.bedework.global.portal.platform}"
- arg2="liferay5" />
- <then>
- <getJar lib="${org.bedework.app.lib}"
- name="liferay.util-bridges" version="5.1" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="liferay.util-java" version="5.1" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="liferay.util-taglib" version="5.1" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="liferay.portal-impl" version="5.1" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="liferay.portal-kernel" version="5.1" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="liferay.spring" version="5.1" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="liferay.easyconf" version="5.1" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="liferay.portal-service" version="5.1" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="liferay.xstream" version="5.1" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="liferay.commons-lang" version="5.1" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="liferay.commons-collections" version="5.1" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="liferay.aspectj-weaver" version="5.1" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="liferay.portlet" version="5.1" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="commons-configuration" />
- </then>
- </if>
-
- <!-- Other commons apis -->
-
- <getJar lib="${org.bedework.app.lib}"
- name="commons-codec" version="1.3" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="commons-collections" version="3.1" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="commons-httpclient" version="3.0" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="commons-lang" version="2.1" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="commons-ssl" />
-
- <!-- Jms support -->
-
- <getJar lib="${org.bedework.app.lib}"
- name="activemq-core" version="5.3.0" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="geronimo-j2ee-management_1.0_spec" version="1.0" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="jms" version="1.1" />
-
- <!-- Various apis -->
-
- <getJar lib="${org.bedework.app.lib}"
- name="gdata-calendar" version="1.0" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="gdata-client" version="1.0" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="log4j" version="1.2.8" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="lucene-core" version="2.0.0" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="lucene-misc" version="2.0.0" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="backport-util-concurrent" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="ical4j" version="head-20100601" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="ical4j-vcard" version="0.9.3-SNAPSHOT" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="portals-bridges-common" version="1.0" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="portals-bridges-struts-1.2.7" version="1.0" />
-
- <!-- Generated bedework jars -->
-
- <getJar lib="${org.bedework.app.lib}"
- name="rpiaccess" version="${org.bedework.access.version}"
- projecthome="${bw.project.home}/projects/access" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="bw-tools" version="${org.bedework.bwtools.version}"
- projecthome="${bw.project.home}/projects/bwtools" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="rpiutil" version="${org.bedework.rpiutil.version}"
- projecthome="${bw.project.home}/projects/rpiutil" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="bw-davio" version="${org.bedework.davutil.version}"
- projecthome="${bw.project.home}/projects/davutil" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="bw-annotations" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="bw-apiutil" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="bw-calcore" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="bw-calcorei" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="bw-calfacade" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="bw-calsvc" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="bw-calsvci" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="bw-client" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="bw-icalendar" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="bw-logging" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="bw-mail" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="bw-sysevents" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="bw-appcommon" version="${org.bedework.webapps.version}"
- projecthome="${bw.project.home}/projects/webapps" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="bw-liferay" version="${org.bedework.webapps.version}"
- projecthome="${bw.project.home}/projects/webapps" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="bw-uportal" version="${org.bedework.webapps.version}"
- projecthome="${bw.project.home}/projects/webapps" />
-
- <!-- Included jars for eclipse -->
-
- <getJar lib="${org.bedework.app.lib}"
- name="ant" version="1.7.0" />
-
- <!--
- <getJar lib="${org.bedework.app.lib}"
- name="geronimo-stax-api_1.0_spec" version="1.0" />
- -->
-
- <getJar lib="${org.bedework.app.lib}"
- name="jtidy" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="junit" version="4.4" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="pluto" version="1.0.1-rc2" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="portlet-api" version="1.0" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="servlet.jsp" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="servletapi" version="2.4" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="serializer" version="2.7.1" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="xalan" version="2.7.1" />
-
- <getJar lib="${org.bedework.app.lib}"
- name="hsqldb" version="1.7.3.3" />
- </sequential>
- </macrodef>
-</project>
Modified: trunk/deployment/build.xml
===================================================================
--- trunk/deployment/build.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/deployment/build.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -74,14 +74,13 @@
<import file="${build.dir}/buildTools/getJar.xml"/>
- <import file="${this.build.dir}/appjars.xml" />
-
<import file="${build.dir}/loadDeployConfig.xml"/>
<property name="ear.meta.dir" location="${this.build.dir}/ear.meta"/>
<target name="init" >
- <getAppJars />
+ <property name="org.bedework.struts.tlds"
+ location="${resources.dir}/struts-1.2.9/tlds"/>
<loadDeployConfig />
@@ -100,11 +99,6 @@
<property name="org.bedework.jboss.datasource.jndiname"
value="${org.bedework.global.jboss.db.datasource.jndiname}" />
- <!--
- <property name="org.bedework.options.file"
- value="${org.bedework.config.options}" />
- -->
-
<!-- Common resources directory -->
<property name="org.bedework.common.resources"
location="${app.root.dir}/resources" />
@@ -148,29 +142,6 @@
</if>
</target>
- <!--
- <target name="deftasks" depends="init">
- <path id="app.xml.cp">
- <pathelement location="${org.bedework.deployutil.jar}"/>
- </path>
-
- <taskdef name="forEachApp"
- classname="org.bedework.deployment.ForEachAppTask">
- <classpath refid="app.xml.cp"/>
- </taskdef>
-
- <taskdef name="resolveFile"
- classname="org.bedework.deployment.ResolveFile">
- <classpath refid="app.xml.cp"/>
- </taskdef>
-
- <taskdef name="makeLangXsl"
- classname="org.bedework.deployment.MakeLangXsl">
- <classpath refid="app.xml.cp"/>
- </taskdef>
- </target>
- -->
-
<target name="build.configured" depends="init" >
<!-- Clean up before we start -->
<delete dir="${org.bedework.temp.wars.home}" />
Added: trunk/deployment/bw-core-appjars.xml
===================================================================
--- trunk/deployment/bw-core-appjars.xml (rev 0)
+++ trunk/deployment/bw-core-appjars.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -0,0 +1,361 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+ Fetch jars for the core calendar application
+ =================================================================== -->
+<project name="extraJars" basedir="." default="">
+ <macrodef name="getExtraJars">
+ <sequential>
+ <delete dir="${org.bedework.temp.extrajars.dir}" />
+ <mkdir dir="${org.bedework.temp.extrajars.dir}" />
+
+ <!-- =================== Bedework caldav jars ======================== -->
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-caldav" version="${org.bedework.caldav.version}"
+ projecthome="${bw.project.home}/projects/caldavimpl" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-cdvutil" version="${org.bedework.caldav.version}"
+ projecthome="${bw.project.home}/projects/caldav" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-cdvserver" version="${org.bedework.caldav.version}"
+ projecthome="${bw.project.home}/projects/caldav" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-exsynch-genwssrc" version="${org.bedework.caldav.version}"
+ projecthome="${bw.project.home}/projects/caldav" />
+
+ <!-- ================= Bedework dump/restore jars ==================== -->
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-dumpres" version="${org.bedework.dumprestore.version}"
+ projecthome="${bw.project.home}/projects/dumprestore" />
+
+ <!-- ================ Bedework event scheduler jars ================== -->
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-inoutsched" version="${org.bedework.calendarapi.version}"
+ projecthome="${bw.project.home}/projects/calendarapi" />
+
+ <!-- ================ Bedework calendar api jars ===================== -->
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-annotations" version="${org.bedework.calendarapi.version}"
+ projecthome="${bw.project.home}/projects/calendarapi" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-apiutil" version="${org.bedework.calendarapi.version}"
+ projecthome="${bw.project.home}/projects/calendarapi" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-calfacade" version="${org.bedework.calendarapi.version}"
+ projecthome="${bw.project.home}/projects/calendarapi" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-calcorei" version="${org.bedework.calendarapi.version}"
+ projecthome="${bw.project.home}/projects/calendarapi" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-calcore" version="${org.bedework.calendarapi.version}"
+ projecthome="${bw.project.home}/projects/calendarapi" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-calsvci" version="${org.bedework.calendarapi.version}"
+ projecthome="${bw.project.home}/projects/calendarapi" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-calsvc" version="${org.bedework.calendarapi.version}"
+ projecthome="${bw.project.home}/projects/calendarapi" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-client" version="${org.bedework.calendarapi.version}"
+ projecthome="${bw.project.home}/projects/calendarapi" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-icalendar" version="${org.bedework.calendarapi.version}"
+ projecthome="${bw.project.home}/projects/calendarapi" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-logging" version="${org.bedework.calendarapi.version}"
+ projecthome="${bw.project.home}/projects/calendarapi" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-mail" version="${org.bedework.calendarapi.version}"
+ projecthome="${bw.project.home}/projects/calendarapi" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-sysevents" version="${org.bedework.calendarapi.version}"
+ projecthome="${bw.project.home}/projects/calendarapi" />
+
+ <!-- ===================== Bedework dav jars ========================= -->
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-davio" version="${org.bedework.davutil.version}"
+ projecthome="${bw.project.home}/projects/davutil" />
+
+ <!-- =================== Bedework indexer jars ======================= -->
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-indexer" version="${org.bedework.indexer.version}"
+ projecthome="${bw.project.home}/projects/indexer" />
+
+ <!-- ================== Bedework webapps jars ======================== -->
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-appcommon" version="${org.bedework.webapps.version}"
+ projecthome="${bw.project.home}/projects/webapps" />
+
+ <!-- Only for portlet - maybe
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-liferay" version="${org.bedework.webapps.version}"
+ projecthome="${bw.project.home}/projects/webapps" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-uportal" version="${org.bedework.webapps.version}"
+ projecthome="${bw.project.home}/projects/webapps" />
+ -->
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-webcommon" version="${org.bedework.webapps.version}"
+ projecthome="${bw.project.home}/projects/webapps" />
+
+ <!-- =================== Bedework webdav jars ======================== -->
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-webdavserver" version="${org.bedework.webdav.version}"
+ projecthome="${bw.project.home}/projects/webdav" />
+
+ <!-- ==================== Bedework other jars ======================== -->
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="rpiaccess" version="${org.bedework.access.version}"
+ projecthome="${bw.project.home}/projects/access" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="rpiutil" version="${org.bedework.rpiutil.version}"
+ projecthome="${bw.project.home}/projects/rpiutil" />
+
+ <!-- ======================= Ical4j jars ============================ -->
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="backport-util-concurrent" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="ical4j" version="head-20100601"/>
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="ical4j-vcard" version="0.9.3-SNAPSHOT"/>
+
+ <!-- ======================= Commons jars ============================ -->
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="commons-beanutils" version="1.7.0"/>
+
+ <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-digester" version="1.7"/>
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="commons-fileupload" />
+
+ <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-lang" version="2.1"/>
+
+ <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-validator" version="1.3.0"/>
+
+ <!--
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="commons-logging" />
+ -->
+
+ <!-- ======================= Hibernate jars ========================== -->
+
+ <!--
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="antlr" version="2.7.6" />
+ -->
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="asm" version="3.2" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="asm-attrs" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="cglib" version="2.1.3" />
+
+ <!--
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="dom4j" version="1.6.1" />
+ -->
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="ehcache" version="1.2.3" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="hibernate" version="3.3.1.ga" />
+
+ <!--
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="hibernate-annotations" version="3.4.0.GA" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="hibernate-validator" version="3.1.0.GA" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="javassist" version="3.4.GA" />
+
+ <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="slf4j-api" version="1.5.6" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="slf4j-log4j12" version="1.5.6" />
+ -->
+
+ <!-- ========================== Mail jars ============================ -->
+
+ <!--
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="activation" version="1.4" />
+ -->
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="dsn" version="1.4" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="imap" version="1.4" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="mailapi" version="1.4" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="pop3" version="1.4" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="smtp" version="1.4" />
+
+ <!-- ========================== Misc jars ============================ -->
+
+ <!--
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="jakarta-oro" version="2.0.8"/>
+ -->
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="jstl" version="1.1.2"/>
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="jstl-standard" version="1.1.2"/>
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="lucene-core" version="2.0.0"/>
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="lucene-misc" version="2.0.0"/>
+
+ <!-- Might be able to get rid of this if we use system xalan -->
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="serializer" version="2.7.1"/>
+
+ <!-- ========================== Web jars ============================= -->
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="gson" version="1.5"/>
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="struts" version="1.2.9"/>
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="xalan" version="2.7.1"/>
+ </sequential>
+ </macrodef>
+</project>
Modified: trunk/deployment/caldavTest/shellscr/appjars.xml
===================================================================
--- trunk/deployment/caldavTest/shellscr/appjars.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/deployment/caldavTest/shellscr/appjars.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -13,6 +13,37 @@
libcache="${org.bedework.libcache.dir}"
name="caldavtest" version="${org.bedework.caldavtest.version}"
projecthome="${bw.project.home}/projects/caldavTest" />
+
+ <!-- ===================== Bedework dav jars ========================= -->
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-davio" version="${org.bedework.davutil.version}"
+ projecthome="${bw.project.home}/projects/davutil" />
+
+ <!-- ======================= Commons jars ============================ -->
+
+ <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-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" />
+
+ <!-- ========================== Misc jars ============================ -->
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="log4j" version="1.2.8"/>
</sequential>
</macrodef>
</project>
Deleted: trunk/deployment/dumprestore/shellscr/appjars.xml
===================================================================
--- trunk/deployment/dumprestore/shellscr/appjars.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/deployment/dumprestore/shellscr/appjars.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ===================================================================
- Fetch 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}" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-cdvutil" version="${org.bedework.caldav.version}"
- projecthome="${bw.project.home}/projects/caldav" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-indexer" version="${org.bedework.indexer.version}"
- projecthome="${bw.project.home}/projects/indexer" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-dumpres" version="${org.bedework.dumprestore.version}"
- projecthome="${bw.project.home}/projects/dumprestore" />
- </sequential>
- </macrodef>
-</project>
Modified: trunk/deployment/dumprestore/shellscr/build.xml
===================================================================
--- trunk/deployment/dumprestore/shellscr/build.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/deployment/dumprestore/shellscr/build.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -11,7 +11,8 @@
<dirname property="this.dir" file="${ant.file}"/>
- <import file="${this.dir}/appjars.xml" />
+ <!--<import file="${this.dir}/appjars.xml" />-->
+ <import file="${org.bedework.deployment.base}/bw-core-appjars.xml" />
<target name="init" >
<getExtraJars />
Deleted: trunk/deployment/feeder/webapp/appjars.xml
===================================================================
--- trunk/deployment/feeder/webapp/appjars.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/deployment/feeder/webapp/appjars.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ===================================================================
- Fetch 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}" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-cdvutil" version="${org.bedework.caldav.version}"
- projecthome="${bw.project.home}/projects/caldav" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-webcommon" version="${org.bedework.webapps.version}"
- projecthome="${bw.project.home}/projects/webapps" />
- </sequential>
- </macrodef>
-</project>
Modified: trunk/deployment/feeder/webapp/build.xml
===================================================================
--- trunk/deployment/feeder/webapp/build.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/deployment/feeder/webapp/build.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -11,7 +11,8 @@
<dirname property="this.dir" file="${ant.file}"/>
- <import file="${this.dir}/appjars.xml" />
+ <!--<import file="${this.dir}/appjars.xml" />-->
+ <import file="${org.bedework.deployment.base}/bw-core-appjars.xml" />
<target name="init" >
<getExtraJars />
Deleted: trunk/deployment/indexer/shellscr/appjars.xml
===================================================================
--- trunk/deployment/indexer/shellscr/appjars.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/deployment/indexer/shellscr/appjars.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ===================================================================
- Fetch 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}" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-cdvutil" version="${org.bedework.caldav.version}"
- projecthome="${bw.project.home}/projects/caldav" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-indexer" version="${org.bedework.indexer.version}"
- projecthome="${bw.project.home}/projects/indexer" />
- </sequential>
- </macrodef>
-</project>
Modified: trunk/deployment/indexer/shellscr/build.xml
===================================================================
--- trunk/deployment/indexer/shellscr/build.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/deployment/indexer/shellscr/build.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -11,7 +11,7 @@
<dirname property="this.dir" file="${ant.file}"/>
- <import file="${this.dir}/appjars.xml" />
+ <import file="${org.bedework.deployment.base}/bw-core-appjars.xml" />
<target name="init" >
<getExtraJars />
Deleted: trunk/deployment/inoutsched/shellscr/appjars.xml
===================================================================
--- trunk/deployment/inoutsched/shellscr/appjars.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/deployment/inoutsched/shellscr/appjars.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ===================================================================
- Fetch 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}" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-cdvutil" version="${org.bedework.caldav.version}"
- projecthome="${bw.project.home}/projects/caldav" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-inoutsched" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-webdavserver" version="${org.bedework.webdav.version}"
- projecthome="${bw.project.home}/projects/webdav" />
- </sequential>
- </macrodef>
-</project>
Modified: trunk/deployment/inoutsched/shellscr/build.xml
===================================================================
--- trunk/deployment/inoutsched/shellscr/build.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/deployment/inoutsched/shellscr/build.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -11,7 +11,7 @@
<dirname property="this.dir" file="${ant.file}"/>
- <import file="${this.dir}/appjars.xml" />
+ <import file="${org.bedework.deployment.base}/bw-core-appjars.xml" />
<target name="init" >
<getExtraJars />
Deleted: trunk/deployment/publiccaldav/webapp/appjars.xml
===================================================================
--- trunk/deployment/publiccaldav/webapp/appjars.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/deployment/publiccaldav/webapp/appjars.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ===================================================================
- Fetch 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}" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-caldav" version="${org.bedework.caldav.version}"
- projecthome="${bw.project.home}/projects/caldavimpl" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-cdvutil" version="${org.bedework.caldav.version}"
- projecthome="${bw.project.home}/projects/caldav" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-cdvserver" version="${org.bedework.caldav.version}"
- projecthome="${bw.project.home}/projects/caldav" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-exsynch-genwssrc" version="${org.bedework.caldav.version}"
- projecthome="${bw.project.home}/projects/caldav" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-webdavserver" version="${org.bedework.webdav.version}"
- projecthome="${bw.project.home}/projects/webdav" />
- </sequential>
- </macrodef>
-</project>
Modified: trunk/deployment/publiccaldav/webapp/build.xml
===================================================================
--- trunk/deployment/publiccaldav/webapp/build.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/deployment/publiccaldav/webapp/build.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -11,7 +11,8 @@
<dirname property="this.dir" file="${ant.file}"/>
- <import file="${this.dir}/appjars.xml" />
+ <!--<import file="${this.dir}/appjars.xml" />-->
+ <import file="${org.bedework.deployment.base}/bw-core-appjars.xml" />
<target name="init" >
<getExtraJars />
Deleted: trunk/deployment/publiccalws/webapp/appjars.xml
===================================================================
--- trunk/deployment/publiccalws/webapp/appjars.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/deployment/publiccalws/webapp/appjars.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ===================================================================
- Fetch 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}" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-caldav" version="${org.bedework.caldav.version}"
- projecthome="${bw.project.home}/projects/caldavimpl" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-cdvutil" version="${org.bedework.caldav.version}"
- projecthome="${bw.project.home}/projects/caldav" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-cdvserver" version="${org.bedework.caldav.version}"
- projecthome="${bw.project.home}/projects/caldav" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-webdavserver" version="${org.bedework.webdav.version}"
- projecthome="${bw.project.home}/projects/webdav" />
- </sequential>
- </macrodef>
-</project>
Modified: trunk/deployment/publiccalws/webapp/build.xml
===================================================================
--- trunk/deployment/publiccalws/webapp/build.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/deployment/publiccalws/webapp/build.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -11,7 +11,8 @@
<dirname property="this.dir" file="${ant.file}"/>
- <import file="${this.dir}/appjars.xml" />
+ <!--<import file="${this.dir}/appjars.xml" />-->
+ <import file="${org.bedework.deployment.base}/bw-core-appjars.xml" />
<target name="init" >
<getExtraJars />
Modified: trunk/deployment/termination/webapp/build.xml
===================================================================
--- trunk/deployment/termination/webapp/build.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/deployment/termination/webapp/build.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -11,20 +11,10 @@
<dirname property="this.dir" file="${ant.file}"/>
- <import file="${this.dir}/appjars.xml" />
-
<!-- ensure has value -->
<property name="propval.app.cal.suite" value="" />
<target name="init">
- <if>
- <not>
- <isset property="org.bedework.no.extra.ear.jars" />
- </not>
- <then>
- <getExtraEarJars />
- </then>
- </if>
</target>
<target name="deploy" depends="init,build.configured" >
Deleted: trunk/deployment/usercaldav/webapp/appjars.xml
===================================================================
--- trunk/deployment/usercaldav/webapp/appjars.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/deployment/usercaldav/webapp/appjars.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ===================================================================
- Fetch 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}" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-caldav" version="${org.bedework.caldav.version}"
- projecthome="${bw.project.home}/projects/caldavimpl" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-cdvutil" version="${org.bedework.caldav.version}"
- projecthome="${bw.project.home}/projects/caldav" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-cdvserver" version="${org.bedework.caldav.version}"
- projecthome="${bw.project.home}/projects/caldav" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-exsynch-genwssrc" version="${org.bedework.caldav.version}"
- projecthome="${bw.project.home}/projects/caldav" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-webdavserver" version="${org.bedework.webdav.version}"
- projecthome="${bw.project.home}/projects/webdav" />
- </sequential>
- </macrodef>
-</project>
Modified: trunk/deployment/usercaldav/webapp/build.xml
===================================================================
--- trunk/deployment/usercaldav/webapp/build.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/deployment/usercaldav/webapp/build.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -11,7 +11,8 @@
<dirname property="this.dir" file="${ant.file}"/>
- <import file="${this.dir}/appjars.xml" />
+ <!--<import file="${this.dir}/appjars.xml" />-->
+ <import file="${org.bedework.deployment.base}/bw-core-appjars.xml" />
<target name="init" >
<getExtraJars />
Deleted: trunk/deployment/usercalws/webapp/appjars.xml
===================================================================
--- trunk/deployment/usercalws/webapp/appjars.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/deployment/usercalws/webapp/appjars.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ===================================================================
- Fetch 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}" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-caldav" version="${org.bedework.caldav.version}"
- projecthome="${bw.project.home}/projects/caldavimpl" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-cdvutil" version="${org.bedework.caldav.version}"
- projecthome="${bw.project.home}/projects/caldav" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-cdvserver" version="${org.bedework.caldav.version}"
- projecthome="${bw.project.home}/projects/caldav" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-webdavserver" version="${org.bedework.webdav.version}"
- projecthome="${bw.project.home}/projects/webdav" />
- </sequential>
- </macrodef>
-</project>
Modified: trunk/deployment/usercalws/webapp/build.xml
===================================================================
--- trunk/deployment/usercalws/webapp/build.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/deployment/usercalws/webapp/build.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -11,7 +11,8 @@
<dirname property="this.dir" file="${ant.file}"/>
- <import file="${this.dir}/appjars.xml" />
+ <!--<import file="${this.dir}/appjars.xml" />-->
+ <import file="${org.bedework.deployment.base}/bw-core-appjars.xml" />
<target name="init" >
<getExtraJars />
Deleted: trunk/deployment/webadmin/webapp/appjars.xml
===================================================================
--- trunk/deployment/webadmin/webapp/appjars.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/deployment/webadmin/webapp/appjars.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -1,82 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ===================================================================
- Fetch 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}" />
-
- <!-- ======================== This project =========================== -->
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-webcommon" version="${org.bedework.webapps.version}"
- projecthome="${bw.project.home}/projects/webapps" />
-
- <!-- ======================= Other projects ========================== -->
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="rpiaccess" version="${org.bedework.access.version}"
- projecthome="${bw.project.home}/projects/access" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-cdvutil" version="${org.bedework.caldav.version}"
- projecthome="${bw.project.home}/projects/caldav" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-annotations" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-apiutil" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-calfacade" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-calsvci" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-client" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-icalendar" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-sysevents" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-davio" version="${org.bedework.davutil.version}"
- projecthome="${bw.project.home}/projects/davutil" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="rpiutil" version="${org.bedework.rpiutil.version}"
- projecthome="${bw.project.home}/projects/rpiutil" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-webdavserver" version="${org.bedework.webdav.version}"
- projecthome="${bw.project.home}/projects/webdav" />
-
- <!-- ========================== Libraries ============================ -->
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="gson" version="1.5" />
- </sequential>
- </macrodef>
-</project>
Modified: trunk/deployment/webadmin/webapp/build.xml
===================================================================
--- trunk/deployment/webadmin/webapp/build.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/deployment/webadmin/webapp/build.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -11,7 +11,8 @@
<dirname property="this.dir" file="${ant.file}"/>
- <import file="${this.dir}/appjars.xml" />
+ <!--<import file="${this.dir}/appjars.xml" />-->
+ <import file="${org.bedework.deployment.base}/bw-core-appjars.xml" />
<target name="init" >
<getExtraJars />
Deleted: trunk/deployment/webpublic/webapp/appjars.xml
===================================================================
--- trunk/deployment/webpublic/webapp/appjars.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/deployment/webpublic/webapp/appjars.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -1,82 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ===================================================================
- Fetch 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}" />
-
- <!-- ======================== This project =========================== -->
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-webcommon" version="${org.bedework.webapps.version}"
- projecthome="${bw.project.home}/projects/webapps" />
-
- <!-- ======================= Other projects ========================== -->
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="rpiaccess" version="${org.bedework.access.version}"
- projecthome="${bw.project.home}/projects/access" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-cdvutil" version="${org.bedework.caldav.version}"
- projecthome="${bw.project.home}/projects/caldav" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-annotations" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-apiutil" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-calfacade" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-calsvci" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-client" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-icalendar" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-sysevents" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-davio" version="${org.bedework.davutil.version}"
- projecthome="${bw.project.home}/projects/davutil" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="rpiutil" version="${org.bedework.rpiutil.version}"
- projecthome="${bw.project.home}/projects/rpiutil" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-webdavserver" version="${org.bedework.webdav.version}"
- projecthome="${bw.project.home}/projects/webdav" />
-
- <!-- ========================== Libraries ============================ -->
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="gson" version="1.5" />
- </sequential>
- </macrodef>
-</project>
Modified: trunk/deployment/webpublic/webapp/build.xml
===================================================================
--- trunk/deployment/webpublic/webapp/build.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/deployment/webpublic/webapp/build.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -11,7 +11,8 @@
<dirname property="this.dir" file="${ant.file}"/>
- <import file="${this.dir}/appjars.xml" />
+ <!--<import file="${this.dir}/appjars.xml" />-->
+ <import file="${org.bedework.deployment.base}/bw-core-appjars.xml" />
<target name="init" >
<getExtraJars />
Deleted: trunk/deployment/websubmit/webapp/appjars.xml
===================================================================
--- trunk/deployment/websubmit/webapp/appjars.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/deployment/websubmit/webapp/appjars.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -1,82 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ===================================================================
- Fetch 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}" />
-
- <!-- ======================== This project =========================== -->
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-webcommon" version="${org.bedework.webapps.version}"
- projecthome="${bw.project.home}/projects/webapps" />
-
- <!-- ======================= Other projects ========================== -->
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="rpiaccess" version="${org.bedework.access.version}"
- projecthome="${bw.project.home}/projects/access" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-cdvutil" version="${org.bedework.caldav.version}"
- projecthome="${bw.project.home}/projects/caldav" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-annotations" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-apiutil" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-calfacade" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-calsvci" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-client" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-icalendar" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-sysevents" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-davio" version="${org.bedework.davutil.version}"
- projecthome="${bw.project.home}/projects/davutil" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="rpiutil" version="${org.bedework.rpiutil.version}"
- projecthome="${bw.project.home}/projects/rpiutil" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-webdavserver" version="${org.bedework.webdav.version}"
- projecthome="${bw.project.home}/projects/webdav" />
-
- <!-- ========================== Libraries ============================ -->
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="gson" version="1.5" />
- </sequential>
- </macrodef>
-</project>
Modified: trunk/deployment/websubmit/webapp/build.xml
===================================================================
--- trunk/deployment/websubmit/webapp/build.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/deployment/websubmit/webapp/build.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -11,7 +11,8 @@
<dirname property="this.dir" file="${ant.file}"/>
- <import file="${this.dir}/appjars.xml" />
+ <!--<import file="${this.dir}/appjars.xml" />-->
+ <import file="${org.bedework.deployment.base}/bw-core-appjars.xml" />
<target name="init" >
<getExtraJars />
Deleted: trunk/deployment/webuser/webapp/appjars.xml
===================================================================
--- trunk/deployment/webuser/webapp/appjars.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/deployment/webuser/webapp/appjars.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -1,82 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ===================================================================
- Fetch 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}" />
-
- <!-- ======================== This project =========================== -->
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-webcommon" version="${org.bedework.webapps.version}"
- projecthome="${bw.project.home}/projects/webapps" />
-
- <!-- ======================= Other projects ========================== -->
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="rpiaccess" version="${org.bedework.access.version}"
- projecthome="${bw.project.home}/projects/access" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-cdvutil" version="${org.bedework.caldav.version}"
- projecthome="${bw.project.home}/projects/caldav" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-annotations" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-apiutil" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-calfacade" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-calsvci" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-client" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-icalendar" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-sysevents" version="${org.bedework.calendarapi.version}"
- projecthome="${bw.project.home}/projects/calendarapi" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-davio" version="${org.bedework.davutil.version}"
- projecthome="${bw.project.home}/projects/davutil" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="rpiutil" version="${org.bedework.rpiutil.version}"
- projecthome="${bw.project.home}/projects/rpiutil" />
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="bw-webdavserver" version="${org.bedework.webdav.version}"
- projecthome="${bw.project.home}/projects/webdav" />
-
- <!-- ========================== Libraries ============================ -->
-
- <getJar lib="${org.bedework.temp.extrajars.dir}"
- libcache="${org.bedework.libcache.dir}"
- name="gson" version="1.5" />
- </sequential>
- </macrodef>
-</project>
Modified: trunk/deployment/webuser/webapp/build.xml
===================================================================
--- trunk/deployment/webuser/webapp/build.xml 2011-02-16 20:13:24 UTC (rev 3179)
+++ trunk/deployment/webuser/webapp/build.xml 2011-02-16 20:13:33 UTC (rev 3180)
@@ -11,7 +11,8 @@
<dirname property="this.dir" file="${ant.file}"/>
- <import file="${this.dir}/appjars.xml" />
+ <!--<import file="${this.dir}/appjars.xml" />-->
+ <import file="${org.bedework.deployment.base}/bw-core-appjars.xml" />
<target name="init" >
<getExtraJars />
More information about the Bedework-commit
mailing list