Changeset 1991

Timestamp:

12/20/08 00:51:29

Author:

douglm

Message:

Fix up the jboss build

Files:

• trunk/config/bwbuild/default/cal.options.xml (modified) (1 diff)
• trunk/config/bwbuild/default/cal.properties (modified) (1 diff)
• trunk/config/bwbuild/jboss/build.properties (modified) (1 diff)
• trunk/config/bwbuild/jboss/democal.options.xml (modified) (4 diffs)
• trunk/config/bwbuild/jboss/democal.properties (modified) (6 diffs)
• trunk/config/bwbuild/liferay5/cal.options.xml (modified) (1 diff)
• trunk/config/bwbuild/liferay5/cal.properties (modified) (1 diff)
• trunk/config/configs/democal.options.xml (modified) (1 diff)
• trunk/deployment/build.xml (modified) (1 diff)
• trunk/deployment/resources/build.xml (modified) (1 diff)
• trunk/deployment/termination/webapp/build.xml (modified) (3 diffs)
• trunk/deployutil/src/org/bedework/deployment/ApplicationXmlTask.java (modified) (2 diffs)

trunk/config/bwbuild/default/cal.options.xml

@@ -28 +28 @@
-        <publicCalendarUri>/cal</publicCalendarUri>
-        <personalCalendarUri>/ucal</personalCalendarUri>
+
+        <!-- CardDAV server locations -->
+        <publicCardDAVUri>http://localhost:8080/carddav</publicCardDAVUri>
+        <personalCardDAVUri>http://localhost:8080/ucarddav</personalCardDAVUri>
-
-        <module>

trunk/config/bwbuild/default/cal.properties

@@ -101 +101 @@
-#
-# ------------------------------------------------------------------------
-s
+
-# ------------------------------------------------------------------------
-# Enable building of a common context for common javascript.

trunk/config/bwbuild/jboss/build.properties

@@ -16 +16 @@
-compile.debug=yes
-
-env.BEDEWORK_HOME}
+user.home}/drop2/jboss
-
-org.bedework.config.properties=${env.BEDEWORK_CONFIG}/democal.properties

trunk/config/bwbuild/jboss/democal.options.xml

@@ -23 +23 @@
-        <portalPlatform>your-portal</portalPlatform>
-         -->
+
+        <!-- uris to cross link apps - of dubious usefulness -->
+        <publicAdminUri>/caladmin</publicAdminUri>
+        <publicCalendarUri>/cal</publicCalendarUri>
+        <personalCalendarUri>/ucal</personalCalendarUri>
+
+        <!-- CardDAV server locations -->
+        <publicCardDAVUri>http://localhost:8080/carddav</publicCardDAVUri>
+        <personalCardDAVUri>http://localhost:8080/ucarddav</personalCardDAVUri>
-
-        <module>
@@ -308 +317 @@
-             ================================================================== -->
-        <Usercaldav classname="org.bedework.calfacade.configs.CalDAVConfig">
+          <appType>usercaldav</appType>
-          <publicAdmin>false</publicAdmin>
-          <guestMode>false</guestMode>
@@ -329 +339 @@
-             ================================================================== -->
-        <Pubcaldav classname="org.bedework.calfacade.configs.CalDAVConfig">
+          <appType>publiccaldav</appType>
-          <publicAdmin>false</publicAdmin>
-          <guestMode>true</guestMode>
@@ -348 +359 @@
-
-        <!-- ==================================================================
+                          CalDAV test suite
+             ================================================================== -->
+        <caldavTest classname="org.bedework.calfacade.configs.ConfigCommon">
+          <appType>caldavTest</appType>
+          <publicAdmin>false</publicAdmin>
+          <guestMode>false</guestMode>
+        </caldavTest>
+
+        <!-- ==================================================================
+                          bedework test suite
+             ================================================================== -->
+        <test classname="org.bedework.calfacade.configs.ConfigCommon">
+          <appType>testsuite</appType>
+          <publicAdmin>false</publicAdmin>
+          <guestMode>false</guestMode>
+        </test>
+
+        <!-- ==================================================================
-                          Dump restore program dumpres
-             ================================================================== -->
-        <dumpres classname="org.bedework.calfacade.configs.DumpRestoreConfig">
-          <debug>true</debug>
+          <appType>dumprestore</appType>
+          <guestMode>true</guestMode>
-          <debugEntity>false</debugEntity>
-          <superGroupName>campusAdminGroups</superGroupName>

trunk/config/bwbuild/jboss/democal.properties

@@ -18 +18 @@
-#
-# Define the names of the applications we want to build
-bwconfig,
+
-
-#
@@ -40 +40 @@
-# build/platforms/<platform>War.xml
-org.bedework.global.deploy.platform=tomcat5
-
+
+
+
+
+
+
-org.bedework.global.build.ear=yes
-org.bedework.global.ear.name=rpical
@@ -49 +54 @@
-org.bedework.global.ear.lib.excludes=commons-logging*,log4j*,jgroup*,servlet.jsp*
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-#
-# ------------------------------------------------------------------------
@@ -91 +100 @@
-org.bedework.jboss.config.dir=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}
-
- 
+
-org.bedework.appserver.deploy.dir=${org.bedework.jboss.config.dir}/webapps
-
@@ -111 +120 @@
-org.bedework.jetspeed2.deploy.dir=${org.bedework.appserver.deploy.dir}/jetspeed/WEB-INF/deploy
-
-# This is where we copy common xsl and javascript for inclusion by xsl and generated
-# content. Relative to org.bedework.appserver.dir
-org.bedework.global.common.deploydir=/server/${org.bedework.jboss.config}/deploy/jboss-web.deployer/ROOT.war/bedework-common
-
-#  Set to yes if you want your log4j.xml overwritten
-org.bedework.deploy.log4j.config=no
@@ -124 +129 @@
-# ------------------------------------------------------------------------
-#
+# ------------------------------------------------------------------------
+#   Common context for javascript, resources etc.
+# ------------------------------------------------------------------------
+# A common context for common javascript and other resources.
+# This context will be deployed along with the applications.
+#
+# This is necessary to deal with problems delivering commmon code from the same
+# server when the root context is defined to be an application rather than the
+# normal web server default.
+#
+org.bedework.global.build.common.context.name=bedework-common
+org.bedework.global.build.common.context.root=/bedework-common
+org.bedework.global.build.common.context.war.name=bedework-common
+org.bedework.global.build.common.context.deploy.dir=/webapps
-#
-# -------------------------------------------------------------------

trunk/config/bwbuild/liferay5/cal.options.xml

@@ -23 +23 @@
-        <portalPlatform>your-portal</portalPlatform>
-         -->
+
+        <!-- uris to cross link apps - of dubious usefulness -->
+        <publicAdminUri>/caladmin</publicAdminUri>
+        <publicCalendarUri>/cal</publicCalendarUri>
+        <personalCalendarUri>/ucal</personalCalendarUri>
+
+        <!-- CardDAV server locations -->
+        <publicCardDAVUri>http://localhost:8080/carddav</publicCardDAVUri>
+        <personalCardDAVUri>http://localhost:8080/ucarddav</personalCardDAVUri>
-
-        <module>

trunk/config/bwbuild/liferay5/cal.properties

@@ -40 +40 @@
-# build/platforms/<platform>War.xml
-org.bedework.global.deploy.platform=tomcat5
-
-# uris to cross link apps - of dubious usefulness
-org.bedework.global.public.admin.uri=/caladmin
-org.bedework.global.public.calendar.uri=/cal
-org.bedework.global.personal.calendar.uri=/ucal
-
-#

trunk/config/configs/democal.options.xml

@@ -28 +28 @@
-        <publicCalendarUri>/cal</publicCalendarUri>
-        <personalCalendarUri>/ucal</personalCalendarUri>
+
+        <!-- CardDAV server locations -->
+        <publicCardDAVUri>http://localhost:8080/carddav</publicCardDAVUri>
+        <personalCardDAVUri>http://localhost:8080/ucarddav</personalCardDAVUri>
-
-        <module>

trunk/deployment/build.xml

@@ -64 +64 @@
-    <property name="org.bedework.common.resources"
-              location="${app.root.dir}/resources" />
+
+    <property name="org.bedework.global.build.common.context.war.name"
+              value="bw-common" />
+
+    <!-- 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}.ear" />
+
+        <if>
+          <equals arg1="${org.bedework.global.ear.zipped}"
+                  arg2="yes" />
+          <then>
+            <property name="org.bedework.ear.dir"
+                      location="${dist.home}/${org.bedework.global.ear.name}" />
+            <property name="org.bedework.ear.file"
+                      location="${dist.home}/${org.bedework.global.ear.name}.ear" />
+          </then>
+          <else>
+            <property name="org.bedework.ear.dir"
+                      location="${dist.home}/${org.bedework.global.ear.name}.ear" />
+          </else>
+        </if>
+
+        <property name="org.bedework.ear.templib"
+                  location="${org.bedework.ear.dir}/lib" />
+        <property name="org.bedework.ear.properties.dir"
+                  location="${org.bedework.temp.dir}/ear-properties" />
+
+        <property name="org.bedework.ear.properties.jar"
+                  location="${org.bedework.ear.dir}/bw-ear-properties.jar"/>
+
+        <delete dir="${org.bedework.ear.dir}" />
+        <mkdir dir="${org.bedework.ear.dir}" />
+
+        <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.global.context.roots"
+              location="${org.bedework.temp.dir}/context-roots.properties" />
-
-    <if>

trunk/deployment/resources/build.xml

@@ -114 +114 @@
-          </then>
-        </if>
+
+    <!-- Add the contex root to the file. Note that newline is required -->
+    <echo file="${org.bedework.global.context.roots}" append="yes">
+${propval.app.war.name}.context=${org.bedework.global.build.common.context.root}
+    </echo>
-<!--
-      </then>

trunk/deployment/termination/webapp/build.xml

@@ -11 +11 @@
-    <dirname property="this.dir" file="${ant.file}"/>
-
-    <property name="app.ear.file.name"
-              value="${org.bedework.global.ear.name}.ear" />
-    <property name="app.ear.file"
-              location="${dist.home}/${app.ear.file.name}" />
-  </target>
-
@@ -43 +39 @@
-
-        <!-- We have to drop some of the libraries so they don't conflict -->
-
-temp.dir}/earlib
+org.bedework.
+ear.templib}
-                   excludes="${org.bedework.global.ear.lib.excludes}" />
-        </copy>
-
+        <echo message="outFile=${org.bedework.ear.dir}/META-INF/application.xml
+                        warDir=${org.bedework.temp.dir}/wars
+                        contexts=${org.bedework.global.context.roots}" />
+
-        <applicationXml displayName="Bedework calendar suite"
-
+org.bedework.
-                        warDir="${org.bedework.temp.dir}/wars"
-                        contexts="${org.bedework.global.context.roots}">
-
+org.bedework.
-            <include name="*.jar"/>
-          </fileset>
-        </applicationXml>
-
-
+org.bedework.
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
-
-        <!-- copy the ear - at the moment copy the uncompressed. -->
@@ -74 +92 @@
-            <mkdir dir="${org.bedework.appserver.deploy.dir}/${app.ear.file.name}" />
-            <copy todir="${org.bedework.appserver.deploy.dir}/${app.ear.file.name}">
-
+org.bedework.
-            </copy>
-          </then>

trunk/deployutil/src/org/bedework/deployment/ApplicationXmlTask.java

@@ -175 +175 @@
-          contextRoot = contextProps.getProperty(warName + ".context");
-
+          if (contextRoot == null) {
+            throw new BuildException("No context root defined for " + warName);
+          }
+
-          if (contextRoot.length() == 0) {
-            contextRoot = "/";
@@ -200 +204 @@
-      wtr.close();
-    } catch (BuildException be) {
+      be.printStackTrace();
-      throw be;
-    } catch (Throwable t) {
+      t.printStackTrace();
-      throw new BuildException(t);
-    }