Changeset 3055

Timestamp:

11/19/10 11:58:24

Author:

douglm

Message:

Move (most) references to versions into the build.properties files.

Files:

• trunk/config/bwbuild/jboss-postgresql/build.properties (modified) (1 diff)
• trunk/deployment/caldavTest/shellscr/appjars.xml (modified) (1 diff)
• trunk/deployment/dumprestore/shellscr/appjars.xml (modified) (1 diff)
• trunk/deployment/feeder/webapp/appjars.xml (modified) (1 diff)
• trunk/deployment/genkeys/shellscr/appjars.xml (modified) (1 diff)
• trunk/deployment/indexer/shellscr/appjars.xml (modified) (1 diff)
• trunk/deployment/inoutsched/shellscr/appjars.xml (modified) (1 diff)
• trunk/deployment/monitor/shellscr/appjars.xml (modified) (1 diff)
• trunk/deployment/publiccaldav/webapp/appjars.xml (modified) (1 diff)
• trunk/deployment/publiccalws/webapp/appjars.xml (modified) (1 diff)
• trunk/deployment/sysevlog/shellscr/appjars.xml (modified) (1 diff)
• trunk/deployment/testsuite/shellscr/appjars.xml (modified) (1 diff)
• trunk/deployment/usercaldav/webapp/appjars.xml (modified) (1 diff)
• trunk/deployment/usercalws/webapp/appjars.xml (modified) (1 diff)
• trunk/deployment/webconfig/webapp/appjars.xml (modified) (1 diff)
• trunk/resources/exsynchwsdefs/iCalendar-bw-extensions.xsd (added)
• trunk/resources/exsynchwsdefs/iCalendar-ms-extensions.xsd (added)
• trunk/resources/exsynchwsdefs/iCalendar-props.xsd (modified) (5 diffs)

trunk/config/bwbuild/jboss-postgresql/build.properties

@@ -19 +19 @@
-org.bedework.version=3.6
-org.bedework.access.version=3.6
+org.bedework.bwtools.version=3.6
-org.bedework.caldav.version=3.6
+org.bedework.caldavtest.version=3.6
-org.bedework.calendarapi.version=3.6
-org.bedework.davutil.version=3.6
+org.bedework.dumprestore.version=3.6
+org.bedework.indexer.version=3.6
-org.bedework.rpiutil.version=3.6
+org.bedework.testsuite.version=3.6
+org.bedework.webapps.version=3.6
-org.bedework.webdav.version=3.6
-

trunk/deployment/caldavTest/shellscr/appjars.xml

@@ -12 +12 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.caldavtest.version}
-              projecthome="${bw.project.home}/projects/caldavTest" />
-    </sequential>

trunk/deployment/dumprestore/shellscr/appjars.xml

@@ -12 +12 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.caldav.version}
-              projecthome="${bw.project.home}/projects/caldav" />
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.indexer.version}
-              projecthome="${bw.project.home}/projects/indexer" />
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.dumprestore.version}
-              projecthome="${bw.project.home}/projects/dumprestore" />
-    </sequential>

trunk/deployment/feeder/webapp/appjars.xml

@@ -12 +12 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.caldav.version}
-              projecthome="${bw.project.home}/projects/caldav" />
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.webapps.version}
-              projecthome="${bw.project.home}/projects/webapps" />
-    </sequential>

trunk/deployment/genkeys/shellscr/appjars.xml

@@ -10 +10 @@
-      <mkdir dir="${org.bedework.temp.extrajars.dir}" />
-
-        <!--
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-              name="bw-cdvutil" version="3.6"
-              projecthome="${bw.project.home}/projects/caldav" />
-
--->
-    </sequential>
- </macrodef>

trunk/deployment/indexer/shellscr/appjars.xml

@@ -12 +12 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.caldav.version}
-              projecthome="${bw.project.home}/projects/caldav" />
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.indexer.version}
-              projecthome="${bw.project.home}/projects/indexer" />
-    </sequential>

trunk/deployment/inoutsched/shellscr/appjars.xml

@@ -12 +12 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.caldav.version}
-              projecthome="${bw.project.home}/projects/caldav" />
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.calendarapi.version}
-              projecthome="${bw.project.home}/projects/calendarapi" />
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.webdav.version}
-              projecthome="${bw.project.home}/projects/webdav" />
-    </sequential>

trunk/deployment/monitor/shellscr/appjars.xml

@@ -10 +10 @@
-      <mkdir dir="${org.bedework.temp.extrajars.dir}" />
-
-        <!--
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-              name="bw-cdvutil" version="3.6"
-              projecthome="${bw.project.home}/projects/caldav" />
-
--->
-    </sequential>
- </macrodef>

trunk/deployment/publiccaldav/webapp/appjars.xml

@@ -12 +12 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.caldav.version}
-              projecthome="${bw.project.home}/projects/caldavimpl" />
-

trunk/deployment/publiccalws/webapp/appjars.xml

@@ -12 +12 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.caldav.version}
-              projecthome="${bw.project.home}/projects/caldavimpl" />
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.caldav.version}
-              projecthome="${bw.project.home}/projects/caldav" />
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.caldav.version}
-              projecthome="${bw.project.home}/projects/caldav" />
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.webdav.version}
-              projecthome="${bw.project.home}/projects/webdav" />
-    </sequential>

trunk/deployment/sysevlog/shellscr/appjars.xml

@@ -12 +12 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.caldav.version}
-              projecthome="${bw.project.home}/projects/caldav" />
-
+        <!--
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-              name="bw-crawler" version="3.6"
-              projecthome="${bw.project.home}/projects/bwcrawler" />
+        -->
-    </sequential>
- </macrodef>

trunk/deployment/testsuite/shellscr/appjars.xml

@@ -16 +16 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.caldav.version}
-              projecthome="${bw.project.home}/projects/caldav" />
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.webapps.version}
-              projecthome="${bw.project.home}/projects/webapps" />
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.testsuite.version}
-              projecthome="${bw.project.home}/projects/testsuite" />
-    </sequential>

trunk/deployment/usercaldav/webapp/appjars.xml

@@ -12 +12 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.caldav.version}
-              projecthome="${bw.project.home}/projects/caldavimpl" />
-

trunk/deployment/usercalws/webapp/appjars.xml

@@ -12 +12 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.caldav.version}
-              projecthome="${bw.project.home}/projects/caldavimpl" />
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.caldav.version}
-              projecthome="${bw.project.home}/projects/caldav" />
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.caldav.version}
-              projecthome="${bw.project.home}/projects/caldav" />
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.webdav.version}
-              projecthome="${bw.project.home}/projects/webdav" />
-    </sequential>

trunk/deployment/webconfig/webapp/appjars.xml

@@ -12 +12 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.webapps.version}
-              projecthome="${bw.project.home}/projects/webapps" />
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.webapps.version}
-              projecthome="${bw.project.home}/projects/webapps" />
-    </sequential>

trunk/resources/exsynchwsdefs/iCalendar-props.xsd

@@ -13 +13 @@
-  <!-- ===================== Parameters =================================  -->
-  <xs:include schemaLocation="iCalendar-params.xsd" />
+            
+  <!-- ===================== Extensions =================================  -->
+  <xs:include schemaLocation="iCalendar-bw-extensions.xsd" />
+  <xs:include schemaLocation="iCalendar-ms-extensions.xsd" />
-
-  <xs:complexType name="ArrayOfProperties">
@@ -31 +35 @@
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="attach" type="xcal:attachPropType"
+              substitutionGroup="xcal:base-property" />
+  <xs:element name="categories" type="xcal:categoriesPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="class" type="xcal:classPropType"
@@ -282 +288 @@
-
-  <!-- 3.8.1.3 Classification -->
+  <!-- Would like something lie this but not extensible
-  <xs:simpleType name="classValueType">
-    <xs:restriction base="xs:string">
@@ -289 +296 @@
-    </xs:restriction>
-  </xs:simpleType>
-
+ 
-  <xs:complexType name="classPropType">
-    <xs:complexContent mixed="false">
@@ -299 +306 @@
-    </xs:complexContent>
-  </xs:complexType>
-
+
+
+
+
+
+
+
+
-  <!-- 3.8.1.4 Comment -->
-  <xs:complexType name="commentPropType">