Changeset 1182

Timestamp:

12/28/06 00:03:27

Author:

douglm

Message:

Remove extraneous files from ical4j jar causing jboss problems.

Fix jboss build somewhat. Moved all properties into a single jar file.

Change way we instantiate CalSvc? - possibly wasn't broken as it turns out.

Changed some return types to Long in Events.java

Files:

• trunk/config/configs/democal.properties (modified) (7 diffs)
• trunk/deployment/termination/jboss/build.xml (modified) (3 diffs)
• trunk/lib/ical4j-1.0-beta1.jar (modified) (previous)

trunk/config/configs/democal.properties

@@ -100 +100 @@
-org.bedework.app.bwconfig.type=webconfig
-org.bedework.app.bwconfig.sou.dir=webconfig
-2
+3
-org.bedework.app.bwconfig.default.contenttype=text/xml
-org.bedework.app.bwconfig.war.name=bwconfig
@@ -122 +122 @@
-org.bedework.app.CalAdmin.type=webadmin
-org.bedework.app.CalAdmin.sou.dir=webadmin
-2
+3
-org.bedework.app.CalAdmin.default.contenttype=text/xml
-org.bedework.app.CalAdmin.nogroupallowed=false
@@ -155 +155 @@
-org.bedework.app.Events.type=webpublic
-org.bedework.app.Events.sou.dir=webclient
-2
+3
-org.bedework.app.Events.default.contenttype=text/xml
-org.bedework.app.Events.web.xml=war/WEB-INF/publicweb.xml
@@ -185 +185 @@
-org.bedework.app.SoEDept.type=webpublic
-org.bedework.app.SoEDept.sou.dir=webclient
-2
+3
-org.bedework.app.SoEDept.default.contenttype=text/xml
-org.bedework.app.SoEDept.web.xml=war/WEB-INF/publicweb.xml
@@ -215 +215 @@
-org.bedework.app.UserCal.type=webuser
-org.bedework.app.UserCal.sou.dir=webclient
-2
+3
-org.bedework.app.UserCal.default.contenttype=text/xml
-org.bedework.app.UserCal.web.xml=war/WEB-INF/userweb.xml
@@ -307 +307 @@
-org.bedework.app.caldavTest.zip.name=caldavTest
-org.bedework.app.caldavTest.description=Bedework CalDAV test utility
-2
+3
-
-#
@@ -324 +324 @@
-org.bedework.app.dumpres.zip.name=dumpres
-org.bedework.app.dumpres.description=Bedework dump/restore utility
-1
+3
-org.bedework.app.dumpres.hibernate.dialect=org.hibernate.dialect.HSQLDialect
-org.bedework.app.dumpres.jdbcdriver=org.hsqldb.jdbcDriver

trunk/deployment/termination/jboss/build.xml

@@ -27 +27 @@
-              location="${org.bedework.temp.dir}/ear" />
-
+    <property name="properties.dir"
+              location="${org.bedework.temp.dir}/ear-properties" />
+
+    <property name="ear-properties.jar"
+              location="${ear.dir}/bw-ear-properties.jar"/>
+
-    <path id="app.xml.cp">
-      <pathelement location="${org.bedework.deployutil.jar}"/>
@@ -45 +51 @@
-    </copy>
-
+    <copy toDir="${properties.dir}" flatten="yes" overwrite="yes" >
+      <fileset dir="${org.bedework.temp.wars.home}">
+        <include name="**/classes/*xml"/>
+        <include name="**/classes/*properties"/>
+      </fileset>
+    </copy>
+
+    <copy toDir="${properties.dir}/properties/calendar" flatten="yes" overwrite="yes" >
+      <fileset dir="${org.bedework.temp.wars.home}">
+        <include name="**/classes/properties/calendar/*"/>
+      </fileset>
+    </copy>
+
+    <jar jarfile="${ear-properties.jar}">
+      <fileset dir="${properties.dir}"/>
+    </jar>
+
-    <applicationXml displayName="Bedework calendar suite"
-                    outFile="${ear.dir}/META-INF/application.xml"
@@ -56 +79 @@
-
-    <copy toDir="${ear.dir}">
-
+
+
+
-    </copy>
-