Changeset 966

Timestamp:

08/16/06 15:25:37

Author:

douglm

Message:

Moved web config classes into calfacade
Fixed up jboss build

Files:

• trunk/bedework/build.xml (modified) (4 diffs)
• trunk/bedework/build/buildsh.xml (modified) (1 diff)
• trunk/bedework/build/buildwar.xml (modified) (1 diff)
• trunk/bedework/build/libjars.properties (modified) (1 diff)
• trunk/bedework/config/configs/democal.options.xml (modified) (10 diffs)
• trunk/bedework/config/configs/democal.properties (modified) (5 diffs)
• trunk/bedework/deployment/termination/jboss/build.xml (modified) (4 diffs)

trunk/bedework/build.xml

@@ -201 +201 @@
-       ================================================================= -->
-
-
+init,
-                                build.calendarapi,build.dumprestore,build.synchml.if,
-                                build.webdav.if,build.caldav.if,build.caldavTest.if,
@@ -208 +208 @@
-          description="builds the project"/>
-
-
+init,
-                                clean.calendarapi,clean.dumprestore,clean.synchml.if,
-                                clean.webdav.if,clean.caldav.if,clean.caldavTest.if,
@@ -217 +217 @@
-  </target>
-
-
+init,
-                                           clean.calendarapi,clean.dumprestore,clean.synchml.if,
-                                           clean.webdav.if,clean.caldav.if,clean.caldavTest.if,
@@ -233 +233 @@
-  <target name="clean.build" depends="clean, build"
-          description="cleans then builds the project"/>
-
-  <!-- =================================================================
-       "build.all" and "clean.all" targets for the project - build
-       subsidiary projects as well
-       ================================================================= -->
-
-  <target name="build.all" depends="build.rpiutil,build.access,build"
-          description="builds the entire project"/>
-
-  <target name="clean.all" depends="clean.rpiutil,clean.access,clean"
-          description="Remove all generated files for entire project."/>
-
-  <target name="clean.build.all" depends="clean.all, build.all"
-          description="cleans then builds the entire project"/>
-
-  <!-- =================================================================

trunk/bedework/build/buildsh.xml

@@ -116 +116 @@
-    <copy todir="${app.dest.lib}" file="${log4j.jar}"/>
-    <copy todir="${app.dest.lib}" file="${ical4j.jar}"/>
+    <copy todir="${app.dest.lib}" file="${commons-digester.jar}"/>
-    <copy todir="${app.dest.lib}" file="${commons-httpclient.jar}"/>
-

trunk/bedework/build/buildwar.xml

@@ -119 +119 @@
-
-  <target name="init.j2ee" if="org.bedework.global.j2ee.platform">
+    <property name="propval.app.servlet.class"
+              value="org.apache.struts.action.ActionServlet" />
+
+    <property name="propval.app.ignoreContentType"
+              value="false" />
+
+    <property name="propval.app.portlet.mapping" value="" />
+
+    <property name="propval.app.genurl.taglib.tld"
+              value="struts-html.tld" />
+
-    <property name="app.dest.lib"
-home
+dir
-  </target>
-

trunk/bedework/build/libjars.properties

@@ -71 +71 @@
-commons-collections.jar=${commons.dir}/commons-collections.jar
-
+#      commons-beanutils.jar    Used for struts.
+commons-digester.jar=${commons.dir}/commons-digester-1.7.jar
+
-#      commons-fileupload.jar    Used for struts
-commons-fileupload.jar=${commons.dir}/commons-fileupload.jar

trunk/bedework/config/configs/democal.options.xml

@@ -67 +67 @@
-                          Admin web client CalAdmin
-             ================================================================== -->
-webcommon
+calfacade.configs
-          <autoCreateSponsors>false</autoCreateSponsors>
-          <autoDeleteSponsors>false</autoDeleteSponsors>
@@ -85 +85 @@
-          <logPrefix>PubEventsAdmin</logPrefix>
-
-@APPLICATION-ROOT@
+/caladminrsrc
-          <portalPlatform>@PORTAL-PLATFORM@</portalPlatform>
-        </CalAdmin>
@@ -92 +92 @@
-                          Public web client Events
-             ================================================================== -->
-webcommon
+calfacade.configs
-          <autoCreateSponsors>false</autoCreateSponsors>
-          <autoDeleteSponsors>false</autoDeleteSponsors>
@@ -108 +108 @@
-          <logPrefix>PubEvents</logPrefix>
-
-@APPLICATION-ROOT@
+/calrsrc
-          <portalPlatform>@PORTAL-PLATFORM@</portalPlatform>
-
@@ -114 +114 @@
-          <refreshInterval>300</refreshInterval>
-
-@CAL-SUITE@
+MainCampus
-        </Events>
-
@@ -120 +120 @@
-                          Demo departmental Public web client SoEDept
-             ================================================================== -->
-webcommon
+calfacade.configs
-          <autoCreateSponsors>false</autoCreateSponsors>
-          <autoDeleteSponsors>false</autoDeleteSponsors>
@@ -136 +136 @@
-          <logPrefix>SoEDept</logPrefix>
-
-@APPLICATION-ROOT@
+/calrsrc
-          <portalPlatform>@PORTAL-PLATFORM@</portalPlatform>
-
@@ -142 +142 @@
-          <refreshInterval>300</refreshInterval>
-
-@CAL-SUITE@
+SoEDepartmental
-        </SoEDept>
-
@@ -148 +148 @@
-                          User web client UserCal
-             ================================================================== -->
-webcommon
+calfacade.configs
-          <autoCreateSponsors>false</autoCreateSponsors>
-          <autoDeleteSponsors>false</autoDeleteSponsors>
@@ -164 +164 @@
-          <logPrefix>PersonalCalendar</logPrefix>
-
-@APPLICATION-ROOT@
+/ucalrsrc
-          <portalPlatform>@PORTAL-PLATFORM@</portalPlatform>
-

trunk/bedework/config/configs/democal.properties

@@ -44 +44 @@
-org.bedework.app.bwconfig.type=webconfig
-org.bedework.app.bwconfig.sou.dir=webconfig
-1
+2
-org.bedework.app.bwconfig.default.contenttype=text/xml
-org.bedework.app.bwconfig.war.name=bwconfig
@@ -66 +66 @@
-org.bedework.app.CalAdmin.type=webadmin
-org.bedework.app.CalAdmin.sou.dir=webadmin
-1
+2
-org.bedework.app.CalAdmin.default.contenttype=text/xml
-org.bedework.app.CalAdmin.nogroupallowed=false
@@ -98 +98 @@
-org.bedework.app.Events.type=webpublic
-org.bedework.app.Events.sou.dir=webclient
-1
+2
-org.bedework.app.Events.default.contenttype=text/xml
-org.bedework.app.Events.web.xml=guest/web.xml
@@ -128 +128 @@
-org.bedework.app.SoEDept.type=webpublic
-org.bedework.app.SoEDept.sou.dir=webclient
-1
+2
-org.bedework.app.SoEDept.default.contenttype=text/xml
-org.bedework.app.SoEDept.web.xml=guest/web.xml
@@ -156 +156 @@
-org.bedework.app.UserCal.type=webuser
-org.bedework.app.UserCal.sou.dir=webclient
-1
+2
-org.bedework.app.UserCal.default.contenttype=text/xml
-org.bedework.app.UserCal.web.xml=user/web.xml

trunk/bedework/deployment/termination/jboss/build.xml

@@ -25 +25 @@
-
-    <property name="ear.dir"
-home
+dir
-
-    <path id="app.xml.cp">
-ment
+util
-    </path>
-
@@ -38 +38 @@
-    <!-- We have to drop some of the libraries so they don't conflict -->
-    <copy toDir="${ear.dir}">
-home
+dir
-        <exclude name="commons-logging*" />
-        <exclude name="log4j*" />
@@ -47 +47 @@
-    <applicationXml displayName="Bedework calendar suite"
-                    outFile="${ear.dir}/META-INF/application.xml"
-home
+dir
-      <fileset dir="${ear.dir}">
-        <include name="*.jar"/>
@@ -56 +56 @@
-
-    <copy toDir="${ear.dir}">
-home}/wars
+wars.home}
-    </copy>
-