Changeset 997

Timestamp:

09/12/06 14:38:50

Author:

douglm

Message:

---

This set of updates switches the expected tomcat server to tomcat 5.5.17

---

For reference the changes needed are noted below. Later today we will have a binary quickstart which can be downloaded from bedework.org whilch will provide what we believe to be a correctly configured tomcat 5.5.17

Changes required to the tomcat instance were...

Copy log4j and the hsqldb drivers from tomcat 5.0.28

cp path-to/jakarta-tomcat-5.0.28/common/classes/log4j.xml path-to/apache-tomcat-5.5.17/common/classes/log4j.xml

cp path-to/jakarta-tomcat-5.0.28/common/lib/hsqldb-1.7.3.3.jar path-to/apache-tomcat-5.5.17/common/lib/hsqldb-1.7.3.3.jar

In conf/web.xml change

<param-name>listings</param-name>
<param-value>false</param-value>

to

<param-name>listings</param-name>
<param-value>true</param-value>

to enable directory browsing.

---

Other changes...

More schedule changes

Fixed initbedework.xml so it works again.

Move freebusyAggregator config class into calfacade.configs

Suppress inclusion of web.xml from source to remove warning messages
Change democal.properties value from
org.bedework.app.Events.web.xml=guest/web.xml
to
org.bedework.app.Events.web.xml=war/WEB-INF/publicweb.xml

Similarly for SoEDept which now has
org.bedework.app.SoEDept.web.xml=war/WEB-INF/publicweb.xml

and added to public and user caldav which have
org.bedework.app.Pubcaldav.web.xml=war/WEB-INF/publicweb.xml
org.bedework.app.Usercaldav.web.xml=war/WEB-INF/userweb.xml

New global property

org.bedework.global.deploy.on.tomcat=true

This enables copying of context.xml files from the web application source.

Added properties

org.bedework.app.Events.tomcat.context.xml=war/META-INF/publiccontext.xml
org.bedework.app.SoEDept.tomcat.context.xml=war/META-INF/publiccontext.xml
org.bedework.app.UserCal?.tomcat.context.xml=war/META-INF/usercontext.xml
org.bedework.app.Pubcaldav.tomcat.context.xml=war/META-INF/publiccontext.xml
org.bedework.app.Usercaldav.tomcat.context.xml=war/META-INF/usercontext.xml

In addition the values of the context.root properties were changed to include a leading "/". This allows specifying a root context simply by omitting the value.

Files:

• trunk/build/buildwar.xml (modified) (6 diffs)
• trunk/build/quickstart-build.xml (modified) (1 diff)
• trunk/config/configs/democal.properties (modified) (9 diffs)
• trunk/deployment/build.xml (modified) (2 diffs)
• trunk/deployment/deploy.properties (modified) (1 diff)
• trunk/deployment/freebusyAggregator/jetspeed/resources/web.xml (modified) (1 diff)
• trunk/deployment/freebusyAggregator/uportal2/build.xml (modified) (1 diff)
• trunk/deployment/freebusyAggregator/webapp/build.xml (modified) (2 diffs)
• trunk/deployment/publiccaldav/webapp/build.xml (modified) (2 diffs)
• trunk/deployment/usercaldav/webapp/build.xml (modified) (2 diffs)
• trunk/deployment/webadmin/webapp/build.xml (modified) (1 diff)
• trunk/deployment/webconfig/webapp/build.xml (modified) (2 diffs)
• trunk/deployment/webpublic/jetspeed/resources/web.xml (modified) (1 diff)
• trunk/deployment/webpublic/uportal2/build.xml (modified) (1 diff)
• trunk/deployment/webpublic/webapp/build.xml (modified) (2 diffs)
• trunk/deployment/webuser/jetspeed/resources/web.xml (modified) (1 diff)
• trunk/deployment/webuser/uportal2/build.xml (modified) (1 diff)
• trunk/deployment/webuser/webapp/build.xml (modified) (2 diffs)
• trunk/deployutil/src/org/bedework/deployment/ResolveFile.java (added)

trunk/build/buildwar.xml

@@ -72 +72 @@
-    <property name="app.dest.webinf"
-              location="${app.dest.war}/WEB-INF" />
+    <property name="app.dest.metainf"
+              location="${app.dest.war}/META-INF" />
-    <property name="app.dest.classes"
-              location="${app.dest.webinf}/classes" />
@@ -84 +86 @@
-              location="${dist.home}/${propval.app.war.name}.war" />
-
-
+
+
+
+
+
+
+
+
-    <property name="app.web.xml"
-
+
+
+
+
+
+
-    <property name="app.sou.properties"
-              location="${app.sou.dir}/war/WEB-INF/classes/servlet.properties" />
@@ -202 +216 @@
-      <filter token="APP-VERSION"
-              value="${propval.app.version}"/>
+      <filter token="WAR-NAME"
+              value="${propval.app.war.name}"/>
+      <filter token="TOMCAT-DOC-BASE"
+              value="${org.bedework.appserver.dir}${propval.app.deploy.dir}/${propval.app.war.name}"/>
-
-      <filter token="DEFAULT-CONTENTTYPE"
@@ -339 +357 @@
-    <antcall target="add.freebusy" inheritRefs="true" />
-
+    <!-- tomcat -->
+    <antcall target="add.tomcat" inheritRefs="true" />
+
-     <!-- any extra lib files-->
-    <copy todir="${app.dest.lib}" >
@@ -352 +373 @@
-         webxml="${app.dest.web.xml}"
-         basedir="${app.dest.war}"
-${app.dest.web.xml}
+WEB-INF/web.xml
-
-    <!-- build the ear file for a j2ee app
@@ -366 +387 @@
-  <target name="add.jdbcdriver" if="app.jdbcdriver.jar">
-    <copy todir="${app.dest.lib}" file="${app.jdbcdriver.jar}"/>
+  </target>
+
+  <target name="add.tomcat" if="org.bedework.global.deploy.on.tomcat">
+    <property name="propval.app.tomcat.context.xml"
+              location="${app.sou.dir}/war/META-INF/context.xml" />
+    <resolveFile name="app.tomcat.context.xml"
+                 file="${propval.app.tomcat.context.xml}"
+                 base="${app.sou.dir}"/>
+
+    <copy tofile="${app.dest.metainf}/context.xml"
+          file="${app.tomcat.context.xml}"
+          overwrite="yes" >
+      <filterset refid="property.filters" />
+    </copy>
-  </target>
-

trunk/build/quickstart-build.xml

@@ -69 +69 @@
-    <property name="bedework.build.file"
-              location="${basedir}/bedework/build.xml" />
+    <property name="org.bedework.user.build.properties"
+              location="${user.home}/bedework.build.properties" />
+
+    <echo message="Load user properties from ${org.bedework.user.build.properties}" />
+
+    <!-- Load user property definition overrides -->
+    <property file="${org.bedework.user.build.properties}" />
-
-    <property file="${basedir}/bedework/deployment/deploy.properties" />

trunk/config/configs/democal.properties

@@ -30 +30 @@
-org.bedework.global.directory.browsing.disallowed=false
-org.bedework.global.build.standalone.app=true
+
+# Comment this out if deploying on some other app server
+org.bedework.global.deploy.on.tomcat=true
-
-# uris to cross link apps - of dubious usefulness
@@ -47 +50 @@
-org.bedework.app.bwconfig.default.contenttype=text/xml
-org.bedework.app.bwconfig.war.name=bwconfig
-
+/
-org.bedework.app.bwconfig.root=/bwconfigrsrc
-org.bedework.app.bwconfig.resources.dir=/webapps/ROOT/bwconfigrsrc
@@ -72 +75 @@
-org.bedework.app.CalAdmin.war.name=caladmin
-org.bedework.app.CalAdmin.ear.name=caladmin
-
+/
-org.bedework.app.CalAdmin.root=/caladminrsrc
-org.bedework.app.CalAdmin.resources.dir=/webapps/ROOT/caladminrsrc
@@ -100 +103 @@
-org.bedework.app.Events.version=3.2
-org.bedework.app.Events.default.contenttype=text/xml
-
+
+
-#org.bedework.app.Events.portal.platform=uportal2
-#org.bedework.app.Events.portlet.name=PublicCal
@@ -106 +110 @@
-org.bedework.app.Events.war.name=cal
-org.bedework.app.Events.ear.name=cal
-
+/
-org.bedework.app.Events.root=/calrsrc
-org.bedework.app.Events.resources.dir=/webapps/ROOT/calrsrc
@@ -130 +134 @@
-org.bedework.app.SoEDept.version=3.2
-org.bedework.app.SoEDept.default.contenttype=text/xml
-
+
+
-
-org.bedework.app.SoEDept.war.name=soedept
-org.bedework.app.SoEDept.ear.name=soedept
-
+/
-org.bedework.app.SoEDept.root=/calrsrc
-org.bedework.app.SoEDept.resources.dir=/webapps/ROOT/calrsrc
@@ -158 +163 @@
-org.bedework.app.UserCal.version=3.2
-org.bedework.app.UserCal.default.contenttype=text/xml
-
+
+
-
-org.bedework.app.UserCal.war.name=ucal
-org.bedework.app.UserCal.ear.name=ucal
-
+/
-org.bedework.app.UserCal.root=/ucalrsrc
-org.bedework.app.UserCal.resources.dir=/webapps/ROOT/ucalrsrc
@@ -187 +193 @@
-org.bedework.app.Pubcaldav.sou.dir=server
-org.bedework.app.Pubcaldav.interface.jar=bw-caldav
+
+org.bedework.app.Pubcaldav.web.xml=war/WEB-INF/publicweb.xml
+org.bedework.app.Pubcaldav.tomcat.context.xml=war/META-INF/publiccontext.xml
-org.bedework.app.Pubcaldav.war.name=pubcaldav
-org.bedework.app.Pubcaldav.ear.name=pubcaldav
-
+/
-
-org.bedework.app.Pubcaldav.description=Bedework public caldav server.
@@ -210 +219 @@
-org.bedework.app.Usercaldav.sou.dir=server
-org.bedework.app.Usercaldav.interface.jar=bw-caldav
+
+org.bedework.app.Usercaldav.web.xml=war/WEB-INF/userweb.xml
+org.bedework.app.Usercaldav.tomcat.context.xml=war/META-INF/usercontext.xml
-org.bedework.app.Usercaldav.war.name=ucaldav
-org.bedework.app.Usercaldav.ear.name=ucaldav
-
+/
-
-org.bedework.app.Usercaldav.security.domain=demo

trunk/deployment/build.xml

@@ -81 +81 @@
-    <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>
@@ -269 +274 @@
-    </propertyset>
-
-    <echo message="XXXXXXXXXXXX      type=${org.bedework.deploy.type}" />
-    <echo message="XXXXXXXXXXXX      name=${org.bedework.deploy.name}" />
-    <echo message="XXXXXXXXXXXX      path=${org.bedework.deploy.project.path}" />
-
-    <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.deploy.kind}/build.xml"
-         inheritrefs="true" target="deploy" >

trunk/deployment/deploy.properties

@@ -35 +35 @@
-
-#  where the application server lives
-
+
+
-
-#  where we deploy

trunk/deployment/freebusyAggregator/jetspeed/resources/web.xml

@@ -1 +1 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-guest/web.xml and user/web.xml in uwcalxml
+publicweb.xml and userweb.xml in source WEB-INF
-     identical except for the security piece.
-  -->

trunk/deployment/freebusyAggregator/uportal2/build.xml

@@ -7 +7 @@
-<project name="bwpublic.uportal2.deploy" default="deploy" >
-  <target name="init">
- -->
+
-    <property name="app.web.xml"
-              value="${app.sou.dir}/war/WEB-INF/publicweb.xml" />
-
+
-    <!-- This should be in the config stuff -->
-    <property name="propval.directory.browsing.disallowed"

trunk/deployment/freebusyAggregator/webapp/build.xml

@@ -20 +20 @@
-    <property name="org.bedework.strutsapp" value="true" />
-
+    <!--
-    <property name="app.web.xml"
-              value="${app.sou.dir}/war/WEB-INF/web.xml" />
+              -->
-
-    <!-- This should be in the config stuff -->
@@ -60 +62 @@
-
-    <!-- Delete expanded version -->
-
+
+
+
+
-
-    <antcall target="deploy.uportal2" inheritRefs="true" />

trunk/deployment/publiccaldav/webapp/build.xml

@@ -19 +19 @@
-
-    <!-- Properties that differ from the personal client -->
+    <!--
-    <property name="app.web.xml"
-
+
+
-  </target>
-
@@ -42 +44 @@
-
-    <!-- Delete expanded version -->
-
+
+
+
+
-  </target>
-

trunk/deployment/usercaldav/webapp/build.xml

@@ -18 +18 @@
-
-    <!-- Properties that differ from the personal client -->
+    <!--
-    <property name="app.web.xml"
-
+
+
-  </target>
-
@@ -41 +43 @@
-
-    <!-- Delete expanded version -->
-
+
+
+
+
-  </target>
-

trunk/deployment/webadmin/webapp/build.xml

@@ -52 +52 @@
-
-    <!-- Delete expanded version -->
-
+
+
+
+
-  </target>
-

trunk/deployment/webconfig/webapp/build.xml

@@ -20 +20 @@
-    <property name="org.bedework.strutsapp" value="true" />
-
+    <!--
-    <property name="app.web.xml"
-              value="${app.sou.dir}/war/WEB-INF/web.xml" />
+              -->
-
-    <!-- This should be in the config stuff -->
@@ -57 +59 @@
-
-    <!-- Delete expanded version -->
-
+
+
+
+
-  </target>
-

trunk/deployment/webpublic/jetspeed/resources/web.xml

@@ -1 +1 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-guest/web.xml and user/web.xml in uwcalxml
+publicweb.xml and userweb.xml in source WEB-INF
-     identical except for the security piece.
-  -->

trunk/deployment/webpublic/uportal2/build.xml

@@ -8 +8 @@
-  <target name="init">
-    <!-- Properties that differ from the personal client -->
+    <!--
-    <property name="app.web.xml"
-
+
+
-
-    <!-- This should be in the config stuff -->

trunk/deployment/webpublic/webapp/build.xml

@@ -21 +21 @@
-
-    <!-- Properties that differ from the personal client -->
+    <!--
-    <property name="app.web.xml"
-
+
+
-
-    <!-- This should be in the config stuff -->
@@ -55 +57 @@
-    <echo message="***************************************************************" />
-
+    <!-- Delete expanded version -->
+    <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" />
+
-    <!-- copy the war file. -->
-
+
+
-          overwrite="yes" />
-
-expanded version
-dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.context.root}
+the quickstart context def
+file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml
-
-    <antcall target="deploy.uportal2" inheritRefs="true" />

trunk/deployment/webuser/jetspeed/resources/web.xml

@@ -1 +1 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-guest/web.xml and user/web.xml in uwcalxml
+publicweb.xml and userweb.xml in source WEB-INF
-     identical except for the security piece.
-  -->

trunk/deployment/webuser/uportal2/build.xml

@@ -12 +12 @@
-
-    <!-- Properties that differ from the personal client -->
+    <!--
-    <property name="app.web.xml"
-
+
+
-
-    <property name="propval.app.guestmode" value="false" />

trunk/deployment/webuser/webapp/build.xml

@@ -21 +21 @@
-
-    <!-- Properties that differ from the public client -->
+    <!--
-    <property name="app.web.xml"
-
+
+
-
-    <property name="propval.app.guestmode" value="false" />
@@ -56 +58 @@
-
-    <!-- Delete expanded version -->
-
+
+
+
+
-
-    <antcall target="deploy.uportal2" inheritRefs="true" />