[Bedework-commit] carddav r261 - in releases/bedework-3.7: .
server/src/org/bedework/carddav/util tools/resources
svnadmin at bedework.org
svnadmin at bedework.org
Tue Feb 22 13:27:50 EST 2011
Author: douglm
Date: 2011-02-22 13:27:49 -0500 (Tue, 22 Feb 2011)
New Revision: 261
Added:
releases/bedework-3.7/tools/resources/bwrun.bat
Modified:
releases/bedework-3.7/appjars.xml
releases/bedework-3.7/build.xml
releases/bedework-3.7/server/src/org/bedework/carddav/util/CardDAVConfig.java
releases/bedework-3.7/tools/resources/bwrun.sh
Log:
Changes to introduce bwxml project - all xml schemas now located in this project built separately.
Other projects with a dependency now build this project.
Also fixed a few java warnings that surfaced from the noise.
Added an updateall action to bw
Modified: releases/bedework-3.7/appjars.xml
===================================================================
--- releases/bedework-3.7/appjars.xml 2011-02-22 18:23:15 UTC (rev 260)
+++ releases/bedework-3.7/appjars.xml 2011-02-22 18:27:49 UTC (rev 261)
@@ -50,9 +50,11 @@
<!-- 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}"
@@ -66,9 +68,11 @@
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}"
@@ -102,7 +106,7 @@
<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" />
@@ -110,6 +114,7 @@
<getJar lib="${org.bedework.temp.extrajars.dir}"
libcache="${org.bedework.libcache.dir}"
name="slf4j-log4j12" version="1.5.6" />
+ -->
<!-- Other jars -->
@@ -129,11 +134,11 @@
libcache="${org.bedework.libcache.dir}"
name="commons-ssl" />
+ <!--
<getJar lib="${org.bedework.temp.extrajars.dir}"
libcache="${org.bedework.libcache.dir}"
name="commons-logging" />
- <!--
gdata-calendar-1.0.jar
gdata-client-1.0.jar
-->
Modified: releases/bedework-3.7/build.xml
===================================================================
--- releases/bedework-3.7/build.xml 2011-02-22 18:23:15 UTC (rev 260)
+++ releases/bedework-3.7/build.xml 2011-02-22 18:27:49 UTC (rev 261)
@@ -70,11 +70,6 @@
</then>
</if>
- <!--
- <property name="org.bedework.options.file"
- value="${org.bedework.carddav.options}" />
- -->
-
<property name="org.bedework.carddav.server.base"
location="${project.home}/server" />
@@ -124,58 +119,11 @@
</target>
<target name="deploy-init" depends="init">
- <!-- ========= Stuff in main bedework deployment build file ========= -->
- <!-- Where we put ear stuff -->
- <if>
- <isset property="org.bedework.global.build.ear" />
- <then>
- <property name="app.ear.file.name"
- value="${org.bedework.global.ear.name}-card.ear" />
+ <deployInit ear-name="bw-${ant.project.name}" />
+
+ <property name="tools.app.zip.name"
+ value="bw-cardtools" />
- <property name="tools.app.zip.name"
- value="${org.bedework.global.ear.name}-cardtools" />
-
- <property name="org.bedework.ear.name"
- value="${org.bedework.global.ear.name}-${ant.project.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}" />
</target>
<!-- ===================== build-source Target ===============================
@@ -224,7 +172,8 @@
<propertyset id="deploy-user-app-properties">
<propertyref prefix="org.bedework.app.${org.bedework.deploy.name}"/>
- <globmapper from="org.bedework.app.${org.bedework.deploy.name}.*" to="propval.app.*"/>
+ <globmapper from="org.bedework.app.${org.bedework.deploy.name}.*"
+ to="propval.app.*"/>
</propertyset>
<ant antfile="${buildwar}" inheritRefs="true" target="build" >
@@ -247,7 +196,8 @@
<propertyset id="deploy-pub-app-properties">
<propertyref prefix="org.bedework.app.${org.bedework.deploy.name}"/>
- <globmapper from="org.bedework.app.${org.bedework.deploy.name}.*" to="propval.app.*"/>
+ <globmapper from="org.bedework.app.${org.bedework.deploy.name}.*"
+ to="propval.app.*"/>
</propertyset>
<ant antfile="${buildwar}" inheritRefs="true" target="build" >
@@ -257,9 +207,7 @@
</forApp>
<ant antfile="${build.dir}/../deployment/termination/webapp/build.xml"
- target="deploy" inheritRefs="true" >
- <property name="org.bedework.no.extra.ear.jars" value="yes" />
- </ant>
+ target="deploy" inheritRefs="true" />
<!-- Platform specific -->
<ant antfile="${build.dir}/../deployment/termination/build.xml"
@@ -288,16 +236,36 @@
libcache="${org.bedework.libcache.dir}"
name="log4j" version="1.2.8" />
- <ant antfile="${buildsh}" target="build" inheritRefs="true" >
- <property name="propval.app.zip.name"
- value="${tools.app.zip.name}" />
- <property name="app.service.base"
- location="${org.bedework.carddav.tools.base}" />
- <property name="app.global.properties.dir"
- location="${org.bedework.carddav.tools.base}/resources" />
- <property name="org.bedework.deploy.name"
- value="tools" />
- </ant>
+ <forApp name="carddavimp"
+ prefix="org.bedework.deploy"
+ appPrefix="org.bedework.app"
+ projectPrefix="org.bedework.project">
+ <sequential>
+ <property name="app.sou.dir"
+ location="${org.bedework.deploy.app.sou}" />
+
+ <propertyset id="deploy-pub-app-properties">
+ <propertyref prefix="org.bedework.app.${org.bedework.deploy.name}"/>
+ <globmapper from="org.bedework.app.${org.bedework.deploy.name}.*"
+ to="propval.app.*"/>
+ </propertyset>
+
+ <ant antfile="${buildsh}" target="build" inheritRefs="true" >
+ <property name="app.run.shellscr"
+ location="${app.resources.dir}/bwrun.sh" />
+
+ <property name="app.run.batscr"
+ location="${app.resources.dir}/bwrun.bat" />
+
+ <property name="org.bedework.runsh.log4j.xml"
+ location="${app.resources.dir}/log4j.xml" />
+
+ <property name="app.global.properties.dir"
+ location="${org.bedework.carddav.tools.base}/resources" />
+ <propertyset refid="deploy-pub-app-properties" />
+ </ant>
+ </sequential>
+ </forApp>
</target>
<!-- ==================== Javadoc Target ===============================
Modified: releases/bedework-3.7/server/src/org/bedework/carddav/util/CardDAVConfig.java
===================================================================
--- releases/bedework-3.7/server/src/org/bedework/carddav/util/CardDAVConfig.java 2011-02-22 18:23:15 UTC (rev 260)
+++ releases/bedework-3.7/server/src/org/bedework/carddav/util/CardDAVConfig.java 2011-02-22 18:27:49 UTC (rev 261)
@@ -36,6 +36,11 @@
* @author Mike Douglass
*/
public class CardDAVConfig /*extends ConfigCommon */{
+ /* For bedework build */
+ private String appType;
+
+ private boolean guestMode;
+
/* System interface implementation */
private String sysintfImpl;
@@ -68,6 +73,35 @@
private Collection<DirHandlerConfig> handlerConfigs;
+ /**
+ * @param val
+ */
+ public void setAppType(final String val) {
+ appType = val;
+ }
+
+ /**
+ * @return String
+ */
+ public String getAppType() {
+ return appType;
+ }
+
+ /** True for a guest mode (non-auth) client.
+ *
+ * @param val
+ */
+ public void setGuestMode(final boolean val) {
+ guestMode = val;
+ }
+
+ /**
+ * @return boolean
+ */
+ public boolean getGuestMode() {
+ return guestMode;
+ }
+
/** Set the System interface implementation
*
* @param val String
Added: releases/bedework-3.7/tools/resources/bwrun.bat
===================================================================
--- releases/bedework-3.7/tools/resources/bwrun.bat (rev 0)
+++ releases/bedework-3.7/tools/resources/bwrun.bat 2011-02-22 18:27:49 UTC (rev 261)
@@ -0,0 +1,27 @@
+:: Run the bedework carddav tools programs
+
+:: JAVA_HOME needs to be defined
+
+ at echo off
+SETLOCAL ENABLEDELAYEDEXPANSION
+
+if not "%JAVA_HOME%"=="" goto noJavaWarn
+ECHO
+ECHO
+ECHO ***************************************************************************
+ECHO Warning: JAVA_HOME is not set - results unpredictable
+ECHO ***************************************************************************
+ECHO
+ECHO
+:noJavaWarn
+
+SET cp=.;./classes;./resources
+FOR /f %%i IN ('dir /b lib\*.jar') DO SET cp=!cp!;./lib/%%i
+
+SET RUNCMD="%JAVA_HOME%\bin\java" -cp %cp% org.bedework.carddav.tools.Importer
+
+SET APPNAME=carddavImp
+
+ECHO %RUNCMD% -appname %APPNAME% %2 %3 %4 %5 %6 %7 %8 %9
+%RUNCMD% -appname %APPNAME% %2 %3 %4 %5 %6 %7 %8 %9
+
Modified: releases/bedework-3.7/tools/resources/bwrun.sh
===================================================================
--- releases/bedework-3.7/tools/resources/bwrun.sh 2011-02-22 18:23:15 UTC (rev 260)
+++ releases/bedework-3.7/tools/resources/bwrun.sh 2011-02-22 18:27:49 UTC (rev 261)
@@ -11,7 +11,7 @@
cp=$cp:$i
done
-RUNCMD="$JAVA_HOME/bin/java -cp $cp org.bedework.carddav.tools.Importer"
+RUNCMD="$JAVA_HOME/bin/java -cp $cp org.bedework.c"
APPNAME=@BW-APP-NAME@
More information about the Bedework-commit
mailing list