Thu Oct 30 15:35:54 EDT 2008

Author: douglm
Date: 2008-10-30 15:35:48 -0400 (Thu, 30 Oct 2008)
New Revision: 1938

Added:
   trunk/build/platforms/
   trunk/build/platforms/jbossWar.xml
   trunk/build/platforms/tomcat5War.xml
   trunk/config/bwbuild/.platform/
   trunk/config/bwbuild/.platform/ear.properties
   trunk/config/bwbuild/.portal/common-resources/jetspeed2-portlet.psml
Removed:
   trunk/config/bwbuild/.standalone/
   trunk/deployment/freebusyAggregator/jboss/
   trunk/deployment/publiccaldav/jboss/
   trunk/deployment/termination/jboss/
   trunk/deployment/usercaldav/jboss/
   trunk/deployment/webadmin/jboss/
   trunk/deployment/webadmin/portlet/jetspeed2-portlet.psml
   trunk/deployment/webconfig/jboss/
   trunk/deployment/webpublic/portlet/jetspeed2-portlet.psml
   trunk/deployment/websubmit/jboss/
   trunk/deployment/websubmit/portlet/jetspeed2-portlet.psml
   trunk/deployment/webuser/jboss/
   trunk/deployment/webuser/portlet/jetspeed2-portlet.psml
Modified:
   trunk/build/buildwar.xml
   trunk/build/loadDeployConfig.xml
   trunk/build/portals/jetspeed2War.xml
   trunk/config/bwbuild/.platform/standalone.properties
   trunk/config/bwbuild/default/build.properties
   trunk/config/bwbuild/default/cal.properties
   trunk/config/bwbuild/jboss/democal.properties
   trunk/config/bwbuild/liferay5/cal.properties
   trunk/config/configs/democal.properties
   trunk/config/configs/metadata.xml
   trunk/deployment/build.xml
   trunk/deployment/deployprops.xml
   trunk/deployment/freebusyAggregator/webapp/build.xml
   trunk/deployment/publiccaldav/webapp/build.xml
   trunk/deployment/resources/build.xml
   trunk/deployment/resources/common-context/WEB-INF/web.xml
   trunk/deployment/termination/webapp/build.xml
   trunk/deployment/usercaldav/webapp/build.xml
   trunk/deployment/webadmin/webapp/build.xml
   trunk/deployment/webconfig/webapp/build.xml
   trunk/deployment/webpublic/webapp/build.xml
   trunk/deployment/websubmit/webapp/build.xml
   trunk/deployment/webuser/portlet/portlet.xml
   trunk/deployment/webuser/webapp/build.xml
Log:
Try to do the same for platforms (jboss, tomcat etc) as I just did for portals. 

The deployment directories are much simplified and the build process seems a bit clearer.

Modified: trunk/build/buildwar.xml
===================================================================

--- trunk/build/buildwar.xml	2008-10-29 21:29:30 UTC (rev 1937)
+++ trunk/build/buildwar.xml	2008-10-30 19:35:48 UTC (rev 1938)
@@ -18,9 +18,6 @@
                        the name of the file containing the rest of the
                        application properties, the directory we build in
                        and the name of war and ear files.
-    cal.j2ee           Defined if this is a j2ee application
-    cal.j2ee.jboss     Defined if this is a jboss application
-    cal.strutsapp      Defined if this is a struts application
      These should be defined in the build properties for the application.
 
      It is possible to define any of the app.dest properties below to override
@@ -49,8 +46,34 @@
     </then>
   </if>
 
-  <target name="init" depends="init.common,init.j2ee,init.standalone" />
+  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" />
 
+  <target name="init" depends="init.common">
+    <if>
+      <isset property="org.bedework.global.build.ear" />
+      <then>
+        <!-- Common library in ear file -->
+        <property name="app.dest.lib"
+                  location="${org.bedework.ear.templib}" />
+
+        <!-- Properties all go into a single jar file at termination -->
+        <property name="app.dest.classes"
+                  location="${org.bedework.ear.properties.dir}" />
+      </then>
+      <else>
+        <!-- Library in war file -->
+        <property name="app.dest.lib"
+                  location="${app.dest.webinf}/lib" />
+
+        <!-- Properties in the war file -->
+        <property name="app.dest.classes"
+                  location="${app.dest.webinf}/classes" />
+      </else>
+    </if>
+    <property name="app.dest.properties"
+              location="${app.dest.classes}/properties/calendar" />
+  </target>
+
   <target name="init.common">
     <!-- Destinations - where we build an unwrapped war -->
     <property name="app.dest.war"
@@ -61,10 +84,6 @@
               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" />
-    <property name="app.dest.properties"
-              location="${app.dest.classes}/properties/calendar" />
 
     <!--temp web.xml location  -->
     <property name="app.temp.web.xml"
@@ -93,17 +112,6 @@
               location="${app.sou.dir}/war/WEB-INF/classes/servlet.properties" />
   </target>
 
-  <target name="init.standalone" if="org.bedework.global.build.standalone.app">
-
-    <property name="app.dest.lib"
-              location="${app.dest.webinf}/lib" />
-  </target>
-
-  <target name="init.j2ee" if="org.bedework.global.j2ee.platform">
-    <property name="app.dest.lib"
-              location="${org.bedework.temp.dir}/earlib" />
-  </target>
-
   <target name="build" depends="init">
     <echo message="**************************************************" />
     <echo message=" * Building war ${propval.app.war.name}"/>
@@ -130,19 +138,38 @@
          All are updated with new values.
          =============================================================== -->
 
-    <available file="${app.sou.dir}/properties" type="dir"
-               property="org.bedework.properties.dir.exists" />
+    <if>
+      <available file="${app.sou.dir}/war/docs" type="dir" />
+      <then>
+        <copy todir="${app.dest.docs}">
+          <fileset dir="${app.sou.dir}/war/docs" />
+        </copy>
+      </then>
+    </if>
 
-    <available file="${app.sou.properties}" type="file"
-               property="org.bedework.servlet.properties.exists" />
+    <!-- ===============================================================
+         Any property files we need for configuration, other than the
+         standard struts file, should be in the "${app.sou.dir}/properties
+         directory. They will be copied into the appropriate place for the
+         war and transformed by the above filter.
+         =============================================================== -->
+    <if>
+      <available file="${app.sou.dir}/properties" type="dir" />
+      <then>
+        <copy todir="${app.dest.properties}" overwrite="yes" >
+          <fileset dir="${app.sou.dir}/properties"
+                   includes="*.properties"/>
+          <filterset refid="property.filters" />
+        </copy>
+      </then>
+    </if>
 
-    <available file="${app.sou.dir}/war/docs" type="dir"
-               property="org.bedework.war.docs.exists" />
+    <copy todir="${app.dest.classes}">
+      <fileset dir="${app.sou.dir}/war/WEB-INF/classes"
+               includes="*"/>
+      <filterset refid="property.filters" />
+    </copy>
 
-    <antcall target="copy.properties" inheritRefs="true" />
-    <antcall target="copy.servlet.properties" inheritRefs="true" />
-    <antcall target="copy.war.docs" inheritRefs="true" />
-
     <!-- Create the runtime options file -->
     <mkdir dir="${app.dest.properties}" />
 
@@ -154,6 +181,24 @@
       <filterset refid="property.filters" />
     </copy>
 
+    <copy tofile="${app.dest.classes}/servlet.properties" file="${app.sou.properties}">
+      <filterset refid="property.filters" />
+    </copy>
+
+    <!-- ===============================================================
+         Add hibernate jars and property files from calendar api.
+         =============================================================== -->
+
+    <copy todir="${app.dest.classes}">
+      <fileset dir="${org.bedework.project.calendarapi}/calCore/resources/properties" />
+      <filterset refid="property.filters" />
+    </copy>
+
+    <copy todir="${app.dest.classes}">
+      <fileset dir="${org.bedework.project.calendarapi}/calCore/resources/hbms" />
+      <filterset refid="property.filters" />
+    </copy>
+
     <!-- Make a temp copy of the web.xml file -->
     <copy tofile="${app.temp.web.xml}" file="${app.web.xml}"
           overwrite="yes" />
@@ -177,20 +222,6 @@
 ${propval.app.war.name}.context=${propval.app.context.root}
     </echo>
 
-    <!-- ===============================================================
-         Add hibernate jars and property files from calendar api.
-         =============================================================== -->
-
-    <copy todir="${app.dest.classes}">
-      <fileset dir="${org.bedework.project.calendarapi}/calCore/resources/properties" />
-      <filterset refid="property.filters" />
-    </copy>
-
-    <copy todir="${app.dest.classes}">
-      <fileset dir="${org.bedework.project.calendarapi}/calCore/resources/hbms" />
-      <filterset refid="property.filters" />
-    </copy>
-
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.antlr}" />
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm-attrs}" />
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm}" />
@@ -201,7 +232,6 @@
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jgroups}" />
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jta}" />
 
-    <antcall target="jboss-stuff" inheritRefs="true" />
     <antcall target="bexchange-stuff" inheritRefs="true" />
     <antcall target="domino-stuff" inheritRefs="true" />
     <antcall target="google-stuff" inheritRefs="true" />
@@ -228,20 +258,6 @@
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-mail}" />
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-appcommon}" />
 
-     <!-- any extra files-->
-    <copy todir="${app.dest.lib}" >
-      <fileset dir="${org.bedework.temp.extrajars.dir}" />
-    </copy>
-
-    <!-- Some more standard libs -->
-    <if>
-      <not>
-        <isset property="org.bedework.build.for.jboss"/>
-      </not>
-      <then>
-        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.log4j}"/>
-      </then>
-    </if>
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-core}"/>
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-misc}"/>
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ical4j}"/>
@@ -259,18 +275,13 @@
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.pop3}" />
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.smtp}" />
 
-    <!-- add the jdbcdriver if defined
-         Disable this - shouldn't be adding jdbc drivers to the war file
-    <if>
-      <isset property="app.jdbcdriver.jar"/>
-      <then>
-        <copy todir="${app.dest.lib}" file="${app.jdbcdriver.jar}"/>
-      </then>
-    </if>
-     -->
+    <!-- any extra files-->
+    <copy todir="${app.dest.lib}" >
+      <fileset dir="${org.bedework.temp.extrajars.dir}" />
+    </copy>
 
-    <!-- tomcat -->
-    <antcall target="add.tomcat" inheritRefs="true" />
+    <!-- Platform specific -->
+    <antcall target="doPlatform" inheritRefs="true" />
 
     <!-- build the war file -->
     <mkdir dir="${dist.home}" />
@@ -282,48 +293,6 @@
          excludes="WEB-INF/web.xml" />
   </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>
-
-  <target name="copy.properties" if="org.bedework.properties.dir.exists">
-    <!-- ===============================================================
-         Any property files we need for configuration, other than the
-         standard struts file, should be in the "${app.sou.dir}/properties
-         directory. They will be copied into the appropriate place for the
-         war and transformed by the above filter.
-         =============================================================== -->
-    <copy todir="${app.dest.properties}" overwrite="yes" >
-      <fileset dir="${app.sou.dir}/properties"
-               includes="*.properties"/>
-      <filterset refid="property.filters" />
-    </copy>
-  </target>
-
-  <target name="copy.servlet.properties">
-    <copy todir="${app.dest.classes}">
-      <fileset dir="${app.sou.dir}/war/WEB-INF/classes"
-               includes="*"/>
-      <filterset refid="property.filters" />
-    </copy>
-  </target>
-
-  <target name="copy.war.docs" if="org.bedework.war.docs.exists">
-    <copy todir="${app.dest.docs}">
-      <fileset dir="${app.sou.dir}/war/docs" />
-    </copy>
-  </target>
-
   <target name="bexchange-stuff" if="org.bedework.build.caldav.bexchange">
     <copy tofile="${app.dest.properties}/timezones.xml"
           file="${org.bedework.project.bedework}/docs/bwtimezones.xml" />
@@ -367,21 +336,13 @@
     </copy>
 
     <if>
-      <not>
-        <isset property="xalan.in.tomcat.common.endorsed" />
-      </not>
-      <then>
-        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.xalan}"/>
-      </then>
-    </if>
-
-    <if>
       <isset property="org.bedework.global.portal.platform" />
       <then>
         <antcall target="doPortal" inheritRefs="true" />
       </then>
     </if>
 
+    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.xalan}"/>
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.struts}"/>
 
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.antlr}"/>
@@ -394,36 +355,4 @@
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jstl}"/>
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jstl-standard}"/>
   </target>
-
-  <!-- =================================================================
-       If this is a j2ee app the following gets executed.
-       We create an uodated jboss-web.xml file (for jboss) and a ear
-       ================================================================= -->
-
-  <target name="jboss-stuff" if="org.bedework.build.for.jboss">
-    <copy todir="${app.dest.webinf}"
-          file="${app.sou.dir}/war/WEB-INF/jboss-web.xml">
-      <filterset refid="property.filters" />
-    </copy>
-
-    <if>
-      <isset property="propval.app.virtual.host" />
-      <then>
-        <replace file="${app.dest.webinf}/jboss-web.xml">
-          <replacetoken><![CDATA[<!-- Virtual host -->]]></replacetoken>
-          <replacevalue><![CDATA[<virtual-host>@VIRTUAL-HOST@</virtual-host>
-          ]]>
-          </replacevalue>
-        </replace>
-        <replace file="${app.dest.webinf}/jboss-web.xml">
-          <replacefilter token="@VIRTUAL-HOST@" value="${propval.app.virtual.host}"/>
-        </replace>
-      </then>
-    </if>
-  </target>
-
-  <target name="build.ear" if="cal.j2ee">
-    <ant antfile="${buildear}"
-         inheritRefs="true" target="build" />
-  </target>
 </project>

Modified: trunk/build/loadDeployConfig.xml
===================================================================
--- trunk/build/loadDeployConfig.xml	2008-10-29 21:29:30 UTC (rev 1937)
+++ trunk/build/loadDeployConfig.xml	2008-10-30 19:35:48 UTC (rev 1938)
@@ -38,20 +38,27 @@
                     value="${bedework-options.org.bedework.global.portal.platform}" />
 
           <property name="org.bedework.config.portal.home"
-                    value="${org.bedework.config.home}/.portal/${org.bedework.global.portal.platform}" />
+                    value="${org.bedework.configurations.home}/.portal/${org.bedework.global.portal.platform}" />
 
           <property name="org.bedework.config.portal.common.home"
-                    value="${org.bedework.config.home}/.portal/common-resources" />
+                    value="${org.bedework.configurations.home}/.portal/common-resources" />
 
           <echo message="******************* load from ${org.bedework.config.portal.home}/portal.properties" />
           <property file="${org.bedework.config.portal.home}/portal.properties" />
         </then>
         <else>
-          <echo message="******************* load from ${org.bedework.config.home}/.standalone/standalone.properties" />
-          <property file="${org.bedework.config.home}/.standalone/standalone.properties" />
+          <echo message="******************* load from ${org.bedework.configurations.home}/.standalone/standalone.properties" />
+          <property file="${org.bedework.configurations.home}/.platform/standalone.properties" />
         </else>
       </if>
 
+      <if>
+        <isset property="org.bedework.global.build.ear"/>
+        <then>
+          <property file="${org.bedework.configurations.home}/.platform/ear.properties" />
+        </then>
+      </if>
+
       <property name="org.bedework.global.version"
                 value="${bedework-options.org.bedework.global.version}" />
 

Added: trunk/build/platforms/jbossWar.xml
===================================================================
--- trunk/build/platforms/jbossWar.xml	                        (rev 0)
+++ trunk/build/platforms/jbossWar.xml	2008-10-30 19:35:48 UTC (rev 1938)
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+     This file is imported by buildwar.xml and adds a target
+        doPortal
+     which will be invoked by the buildwar targets.
+     =================================================================== -->
+
+<project name="bedework.platformWar" default="doPlatform" >
+  <target name="doPlatform" >
+    <!-- ===============================================================
+         We create an updated jboss-web.xml file (for jboss) and a ear
+         =============================================================== -->
+
+    <copy todir="${app.dest.webinf}"
+          file="${app.sou.dir}/war/WEB-INF/jboss-web.xml">
+      <filterset refid="property.filters" />
+    </copy>
+
+    <if>
+      <isset property="propval.app.virtual.host" />
+      <then>
+        <replace file="${app.dest.webinf}/jboss-web.xml">
+          <replacetoken><![CDATA[<!-- Virtual host -->]]></replacetoken>
+          <replacevalue><![CDATA[<virtual-host>@VIRTUAL-HOST@</virtual-host>
+          ]]>
+          </replacevalue>
+        </replace>
+        <replace file="${app.dest.webinf}/jboss-web.xml">
+          <replacefilter token="@VIRTUAL-HOST@" value="${propval.app.virtual.host}"/>
+        </replace>
+      </then>
+    </if>
+  </target>
+</project>
\ No newline at end of file

Added: trunk/build/platforms/tomcat5War.xml
===================================================================
--- trunk/build/platforms/tomcat5War.xml	                        (rev 0)
+++ trunk/build/platforms/tomcat5War.xml	2008-10-30 19:35:48 UTC (rev 1938)
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+     This file is imported by buildwar.xml and adds a target
+        doPortal
+     which will be invoked by the buildwar targets.
+     =================================================================== -->
+
+<project name="bedework.platformWar" default="doPlatform" >
+  <target name="doPlatform" >
+    <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>
+</project>
\ No newline at end of file

Modified: trunk/build/portals/jetspeed2War.xml
===================================================================
--- trunk/build/portals/jetspeed2War.xml	2008-10-29 21:29:30 UTC (rev 1937)
+++ trunk/build/portals/jetspeed2War.xml	2008-10-30 19:35:48 UTC (rev 1938)
@@ -53,7 +53,7 @@
     </copy>
 
     <copy tofile="${app.dest.webinf}/portlet.psml"
-          file="${org.bedework.deploy.type.dir}/portlet/jetspeed2-portlet.psml"
+          file="${org.bedework.config.portal.common.home}/jetspeed2-portlet.psml"
           overwrite="yes"
           failonerror="no" >
       <filterset refid="property.filters" />
@@ -64,7 +64,7 @@
         <equals arg1="${propval.app.unauthenticated}" arg2="true" />
       </not>
       <then>
-        <replace file="${app.dest.webinf}/struts-config.xml">
+        <replace file="${app.dest.webinf}/portlet.psml">
           <replacetoken><![CDATA[<!-- Security constraints go here -->]]></replacetoken>
           <replacevalue><![CDATA[<security-constraints>
     <security-constraints-ref>users</security-constraints-ref>

Copied: trunk/config/bwbuild/.platform (from rev 1937, trunk/config/bwbuild/.standalone)


Property changes on: trunk/config/bwbuild/.platform
___________________________________________________________________
Name: svn:mergeinfo
   + 

Added: trunk/config/bwbuild/.platform/ear.properties
===================================================================
--- trunk/config/bwbuild/.platform/ear.properties	                        (rev 0)
+++ trunk/config/bwbuild/.platform/ear.properties	2008-10-30 19:35:48 UTC (rev 1938)
@@ -0,0 +1,18 @@
+#
+# --------------------------------------------------------------------
+#
+# Properties for building ear files.
+#
+# Generally this file will not need to be changed.
+#
+# --------------------------------------------------------------------
+#
+
+org.bedework.ear.templib=${org.bedework.temp.dir}/earlib
+
+org.bedework.ear.dir=${org.bedework.temp.dir}/${org.bedework.global.ear.name}
+
+org.bedework.ear-properties.dir=${org.bedework.temp.dir}/ear-properties
+
+org.bedework.ear.properties.jar=${org.bedework.ear.dir}/bw-ear-properties.jar
+

Modified: trunk/config/bwbuild/.platform/standalone.properties
===================================================================
--- trunk/config/bwbuild/.standalone/standalone.properties	2008-10-29 21:29:30 UTC (rev 1937)
+++ trunk/config/bwbuild/.platform/standalone.properties	2008-10-30 19:35:48 UTC (rev 1938)
@@ -4,6 +4,8 @@
 # Properties for a standalone (and j2ee) build. These will be used for additional
 # configuration of the war files
 #
+# Generally this file will not need to be changed.
+#
 # --------------------------------------------------------------------
 #
 

Added: trunk/config/bwbuild/.portal/common-resources/jetspeed2-portlet.psml
===================================================================
--- trunk/config/bwbuild/.portal/common-resources/jetspeed2-portlet.psml	                        (rev 0)
+++ trunk/config/bwbuild/.portal/common-resources/jetspeed2-portlet.psml	2008-10-30 19:35:48 UTC (rev 1938)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is a Jetspeed2 psml file for the calendar public events portlet.
+
+  The fragment id's must be unique among all .psml files, and the name of the
+  portlet is read from the portlet.xml file.
+-->
+<page id="/@CONTEXT-ROOT at .psml">
+  <defaults
+     skin="orange"
+     layout-decorator="tigris"
+     portlet-decorator="tigris"
+  />
+  <title>@APP-DESCRIPTION@</title>
+  <fragment id="@CONTEXT-ROOT at -1" type="layout" name="jetspeed-layouts::VelocityOneColumn">
+    <fragment id="@CONTEXT-ROOT at -2" type="portlet" name="@CONTEXT-ROOT@::@PORTLET-NAME@"/>
+  </fragment>
+</page>

Modified: trunk/config/bwbuild/default/build.properties
===================================================================
--- trunk/config/bwbuild/default/build.properties	2008-10-29 21:29:30 UTC (rev 1937)
+++ trunk/config/bwbuild/default/build.properties	2008-10-30 19:35:48 UTC (rev 1938)
@@ -10,13 +10,13 @@
 #   <various other distributed properties>
 #
 # On entry
-#       env.BEDEWORK_CONFIGS is set to the directory containing all the confurations
+#       env.BEDEWORK_CONFIGS is set to the directory containing all the configurations
 #       env.BEDEWORK_CONFIG is set to the directory containing the config files
 #
 
 compile.debug=yes
 
-org.bedework.config.home=${env.BEDEWORK_CONFIGS_HOME}
+org.bedework.configurations.home=${env.BEDEWORK_CONFIGS_HOME}
 org.bedework.config.properties=${env.BEDEWORK_CONFIG}/cal.properties
 org.bedework.config.options=${env.BEDEWORK_CONFIG}/cal.options.xml
 

Modified: trunk/config/bwbuild/default/cal.properties
===================================================================
--- trunk/config/bwbuild/default/cal.properties	2008-10-29 21:29:30 UTC (rev 1937)
+++ trunk/config/bwbuild/default/cal.properties	2008-10-30 19:35:48 UTC (rev 1938)
@@ -26,7 +26,7 @@
 #
 org.bedework.global.hibernate.dialect=org.hibernate.dialect.HSQLDialect
 
-# Parameters for standalone
+# Parameters for shell apps
 org.bedework.global.jdbcdriver=org.hsqldb.jdbcDriver
 org.bedework.global.jdbcurl=jdbc:hsqldb:hsql://localhost:8887
 org.bedework.global.jdbcid=sa
@@ -36,24 +36,14 @@
 org.bedework.global.hibernate.cache.use_second_level_cache=false
 org.bedework.global.hibernate.cache.provider_class org.hibernate.cache.EhCacheProvider
 
-# Comment this out for j2ee deploy
-org.bedework.global.build.standalone.app=true
+# Specify the platform we are building for. buildwar.xml will import the file
+# build/platforms/<platform>War.xml
+org.bedework.global.deploy.platform=tomcat5
 
-# 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
 org.bedework.global.public.admin.uri=/caladmin
 org.bedework.global.public.calendar.uri=/cal
 org.bedework.global.personal.calendar.uri=/ucal
-
-# This is where we copy common xsl and javascript for inclusion by xsl and generated
-# content.
-org.bedework.global.common.deploydir=/webapps/ROOT/bedework-common
-
-# enable this and standalone for jboss
-#org.bedework.build.for.jboss=yes
-
 #
 # ------------------------------------------------------------------------
 # ------------------------------------------------------------------------
@@ -111,7 +101,27 @@
 # ------------------------------------------------------------------------
 # ------------------------------------------------------------------------
 #
+# ------------------------------------------------------------------------
+#   Common context for javasscript, resources etc.
+# ------------------------------------------------------------------------
+# Enable building of a common context for common javascript.
+# This context will be deployed along with the applications and makes common
+# javascript available under, two paths at the contex defined here.
 #
+# 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
+
+# This is where we copy common xsl and javascript for inclusion by xsl and generated
+# content.
+#org.bedework.global.common.deploydir=/webapps/ROOT/bedework-common
+
+#
 # -------------------------------------------------------------------
 #
 # Bedework config web client
@@ -141,7 +151,6 @@
 org.bedework.app.CalAdmin.tomcat.context.xml=war/META-INF/context.xml
 
 org.bedework.app.CalAdmin.war.name=caladmin
-org.bedework.app.CalAdmin.ear.name=caladmin
 org.bedework.app.CalAdmin.context.root=/caladmin
 # Set for jboss
 #org.bedework.app.CalAdmin.virtual.host=
@@ -169,7 +178,6 @@
 #org.bedework.app.EventSubmit.portlet.name=EventSubmit
 
 org.bedework.app.EventSubmit.war.name=eventsubmit
-org.bedework.app.EventSubmit.ear.name=eventsubmit
 org.bedework.app.EventSubmit.context.root=/eventsubmit
 # Set for jboss
 #org.bedework.app.EventSubmit.virtual.host=
@@ -197,7 +205,6 @@
 #org.bedework.app.Events.portlet.name=PublicCal
 
 org.bedework.app.Events.war.name=cal
-org.bedework.app.Events.ear.name=cal
 org.bedework.app.Events.context.root=/cal
 # Set for jboss
 #org.bedework.app.Events.virtual.host=
@@ -222,7 +229,6 @@
 #org.bedework.app.SoEDept.portlet.name=SoEDept
 
 org.bedework.app.SoEDept.war.name=soedept
-org.bedework.app.SoEDept.ear.name=soedept
 org.bedework.app.SoEDept.context.root=/soedept
 # Set for jboss
 #org.bedework.app.SoEDept.virtual.host=
@@ -247,7 +253,6 @@
 #org.bedework.app.UserCal.portlet.name=UserCal
 
 org.bedework.app.UserCal.war.name=ucal
-org.bedework.app.UserCal.ear.name=ucal
 org.bedework.app.UserCal.context.root=/ucal
 # Set for jboss
 #org.bedework.app.UserCal.virtual.host=
@@ -274,7 +279,6 @@
 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.context.root=/pubcaldav
 # Set for jboss
 #org.bedework.app.Pubcaldav.virtual.host=
@@ -297,7 +301,6 @@
 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.context.root=/ucaldav
 # Set for jboss
 #org.bedework.app.Usercaldav.virtual.host=

Modified: trunk/config/bwbuild/jboss/democal.properties
===================================================================
--- trunk/config/bwbuild/jboss/democal.properties	2008-10-29 21:29:30 UTC (rev 1937)
+++ trunk/config/bwbuild/jboss/democal.properties	2008-10-30 19:35:48 UTC (rev 1938)
@@ -26,7 +26,7 @@
 #
 org.bedework.global.hibernate.dialect=org.hibernate.dialect.HSQLDialect
 
-# Parameters for standalone
+# Parameters for shell apps
 org.bedework.global.jdbcdriver=org.hsqldb.jdbcDriver
 org.bedework.global.jdbcurl=jdbc:hsqldb:hsql://localhost:1701
 org.bedework.global.jdbcid=sa
@@ -36,23 +36,23 @@
 org.bedework.global.hibernate.cache.use_second_level_cache=false
 org.bedework.global.hibernate.cache.provider_class org.hibernate.cache.EhCacheProvider
 
-# Comment this out for j2ee deploy
-#org.bedework.global.build.standalone.app=true
+# Specify the platform we are building for. buildwar.xml will import the file
+# build/platforms/<platform>War.xml
+org.bedework.global.deploy.platform=tomcat5
 
-# Comment this out if deploying on some other app server
-#org.bedework.global.deploy.on.tomcat=true
-
-org.bedework.global.j2ee.platform=jboss
+org.bedework.global.build.ear=yes
 org.bedework.global.ear.name=rpical
 
+# This allows us to exclude some libraries when copying files into the ear file.
+# Version we use in bedework may conflict with versions installed in the application
+# server.
+org.bedework.global.ear.lib.excludes=commons-logging*,log4j*,jgroup*,servlet.jsp*
+
 # 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
 
-# enable this and standalone for jboss
-org.bedework.build.for.jboss=yes
-
 #
 # ------------------------------------------------------------------------
 # ------------------------------------------------------------------------
@@ -153,7 +153,6 @@
 org.bedework.app.CalAdmin.tomcat.context.xml=war/META-INF/context.xml
 
 org.bedework.app.CalAdmin.war.name=caladmin
-org.bedework.app.CalAdmin.ear.name=caladmin
 org.bedework.app.CalAdmin.context.root=/caladmin
 # Set for jboss
 #org.bedework.app.CalAdmin.virtual.host=
@@ -182,7 +181,6 @@
 #org.bedework.app.EventSubmit.portlet.name=EventSubmit
 
 org.bedework.app.EventSubmit.war.name=eventsubmit
-org.bedework.app.EventSubmit.ear.name=eventsubmit
 org.bedework.app.EventSubmit.context.root=/eventsubmit
 # Set for jboss
 #org.bedework.app.EventSubmit.virtual.host=
@@ -211,7 +209,6 @@
 #org.bedework.app.Events.portlet.name=PublicCal
 
 org.bedework.app.Events.war.name=cal
-org.bedework.app.Events.ear.name=cal
 org.bedework.app.Events.context.root=/cal
 # Set for jboss
 #org.bedework.app.Events.virtual.host=
@@ -237,7 +234,6 @@
 #org.bedework.app.SoEDept.portlet.name=SoEDept
 
 org.bedework.app.SoEDept.war.name=soedept
-org.bedework.app.SoEDept.ear.name=soedept
 org.bedework.app.SoEDept.context.root=/soedept
 # Set for jboss
 #org.bedework.app.SoEDept.virtual.host=
@@ -263,7 +259,6 @@
 #org.bedework.app.UserCal.portlet.name=UserCal
 
 org.bedework.app.UserCal.war.name=ucal
-org.bedework.app.UserCal.ear.name=ucal
 org.bedework.app.UserCal.context.root=/ucal
 # Set for jboss
 #org.bedework.app.UserCal.virtual.host=
@@ -291,7 +286,6 @@
 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.context.root=/pubcaldav
 # Set for jboss
 #org.bedework.app.Pubcaldav.virtual.host=
@@ -315,7 +309,6 @@
 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.context.root=/ucaldav
 # Set for jboss
 #org.bedework.app.Usercaldav.virtual.host=

Modified: trunk/config/bwbuild/liferay5/cal.properties
===================================================================
--- trunk/config/bwbuild/liferay5/cal.properties	2008-10-29 21:29:30 UTC (rev 1937)
+++ trunk/config/bwbuild/liferay5/cal.properties	2008-10-30 19:35:48 UTC (rev 1938)
@@ -26,7 +26,7 @@
 #
 org.bedework.global.hibernate.dialect=org.hibernate.dialect.HSQLDialect
 
-# Parameters for standalone
+# Parameters for shell apps
 org.bedework.global.jdbcdriver=org.hsqldb.jdbcDriver
 org.bedework.global.jdbcurl=jdbc:hsqldb:hsql://localhost:8887
 org.bedework.global.jdbcid=sa
@@ -36,24 +36,15 @@
 org.bedework.global.hibernate.cache.use_second_level_cache=false
 org.bedework.global.hibernate.cache.provider_class org.hibernate.cache.EhCacheProvider
 
-# Comment this out for j2ee deploy
-org.bedework.global.build.standalone.app=true
+# Specify the platform we are building for. buildwar.xml will import the file
+# build/platforms/<platform>War.xml
+org.bedework.global.deploy.platform=tomcat5
 
-# 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
 org.bedework.global.public.admin.uri=/caladmin
 org.bedework.global.public.calendar.uri=/cal
 org.bedework.global.personal.calendar.uri=/ucal
 
-# This is where we copy common xsl and javascript for inclusion by xsl and generated
-# content.
-org.bedework.global.common.deploydir=/webapps/ROOT/bedework-common
-
-# enable this and standalone for jboss
-#org.bedework.build.for.jboss=yes
-
 #
 # ------------------------------------------------------------------------
 # ------------------------------------------------------------------------
@@ -143,7 +134,6 @@
 org.bedework.app.CalAdmin.tomcat.context.xml=war/META-INF/context.xml
 
 org.bedework.app.CalAdmin.war.name=caladmin
-org.bedework.app.CalAdmin.ear.name=caladmin
 org.bedework.app.CalAdmin.context.root=/caladmin
 # Set for jboss
 #org.bedework.app.CalAdmin.virtual.host=
@@ -172,7 +162,6 @@
 org.bedework.app.EventSubmit.portlet.name=EventSubmit
 
 org.bedework.app.EventSubmit.war.name=eventsubmit
-org.bedework.app.EventSubmit.ear.name=eventsubmit
 org.bedework.app.EventSubmit.context.root=/eventsubmit
 # Set for jboss
 #org.bedework.app.EventSubmit.virtual.host=
@@ -201,7 +190,6 @@
 org.bedework.app.Events.portlet.name=PublicCal
 
 org.bedework.app.Events.war.name=cal
-org.bedework.app.Events.ear.name=cal
 org.bedework.app.Events.context.root=/cal
 # Set for jboss
 #org.bedework.app.Events.virtual.host=
@@ -227,7 +215,6 @@
 org.bedework.app.SoEDept.portlet.name=SoEDept
 
 org.bedework.app.SoEDept.war.name=soedept
-org.bedework.app.SoEDept.ear.name=soedept
 org.bedework.app.SoEDept.context.root=/soedept
 # Set for jboss
 #org.bedework.app.SoEDept.virtual.host=
@@ -253,7 +240,6 @@
 org.bedework.app.UserCal.portlet.name=UserCal
 
 org.bedework.app.UserCal.war.name=ucal
-org.bedework.app.UserCal.ear.name=ucal
 org.bedework.app.UserCal.context.root=/ucal
 # Set for jboss
 #org.bedework.app.UserCal.virtual.host=
@@ -281,7 +267,6 @@
 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.context.root=/pubcaldav
 # Set for jboss
 #org.bedework.app.Pubcaldav.virtual.host=
@@ -305,7 +290,6 @@
 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.context.root=/ucaldav
 # Set for jboss
 #org.bedework.app.Usercaldav.virtual.host=

Modified: trunk/config/configs/democal.properties
===================================================================
--- trunk/config/configs/democal.properties	2008-10-29 21:29:30 UTC (rev 1937)
+++ trunk/config/configs/democal.properties	2008-10-30 19:35:48 UTC (rev 1938)
@@ -26,7 +26,7 @@
 #
 org.bedework.global.hibernate.dialect=org.hibernate.dialect.HSQLDialect
 
-# Parameters for standalone
+# Parameters for shell apps
 org.bedework.global.jdbcdriver=org.hsqldb.jdbcDriver
 org.bedework.global.jdbcurl=jdbc:hsqldb:hsql://localhost:8887
 org.bedework.global.jdbcid=sa
@@ -36,23 +36,15 @@
 org.bedework.global.hibernate.cache.use_second_level_cache=false
 org.bedework.global.hibernate.cache.provider_class org.hibernate.cache.EhCacheProvider
 
-# Comment this out for j2ee deploy
-org.bedework.global.build.standalone.app=true
+# Specify the platform we are building for. buildwar.xml will import the file
+# build/platforms/<platform>War.xml
+org.bedework.global.deploy.platform=tomcat5
 
-# 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
 org.bedework.global.public.admin.uri=/caladmin
 org.bedework.global.public.calendar.uri=/cal
 org.bedework.global.personal.calendar.uri=/ucal
 
-# This is where we copy common xsl and javascript for inclusion by xsl and generated
-# content.
-org.bedework.global.common.deploydir=/webapps/ROOT/bedework-common
-
-# enable this and standalone for jboss
-#org.bedework.build.for.jboss=yes
 #
 # ------------------------------------------------------------------------
 # ------------------------------------------------------------------------
@@ -141,7 +133,6 @@
 org.bedework.app.CalAdmin.tomcat.context.xml=war/META-INF/context.xml
 
 org.bedework.app.CalAdmin.war.name=caladmin
-org.bedework.app.CalAdmin.ear.name=caladmin
 org.bedework.app.CalAdmin.context.root=/caladmin
 # Set for jboss
 #org.bedework.app.CalAdmin.virtual.host=
@@ -170,7 +161,6 @@
 #org.bedework.app.EventSubmit.portlet.name=EventSubmit
 
 org.bedework.app.EventSubmit.war.name=eventsubmit
-org.bedework.app.EventSubmit.ear.name=eventsubmit
 org.bedework.app.EventSubmit.context.root=/eventsubmit
 # Set for jboss
 #org.bedework.app.EventSubmit.virtual.host=
@@ -199,7 +189,6 @@
 #org.bedework.app.Events.portlet.name=PublicCal
 
 org.bedework.app.Events.war.name=cal
-org.bedework.app.Events.ear.name=cal
 org.bedework.app.Events.context.root=/cal
 # Set for jboss
 #org.bedework.app.Events.virtual.host=
@@ -225,7 +214,6 @@
 #org.bedework.app.SoEDept.portlet.name=SoEDept
 
 org.bedework.app.SoEDept.war.name=soedept
-org.bedework.app.SoEDept.ear.name=soedept
 org.bedework.app.SoEDept.context.root=/soedept
 # Set for jboss
 #org.bedework.app.SoEDept.virtual.host=
@@ -251,7 +239,6 @@
 #org.bedework.app.UserCal.portlet.name=UserCal
 
 org.bedework.app.UserCal.war.name=ucal
-org.bedework.app.UserCal.ear.name=ucal
 org.bedework.app.UserCal.context.root=/ucal
 # Set for jboss
 #org.bedework.app.UserCal.virtual.host=
@@ -279,7 +266,6 @@
 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.context.root=/pubcaldav
 # Set for jboss
 #org.bedework.app.Pubcaldav.virtual.host=
@@ -303,7 +289,6 @@
 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.context.root=/ucaldav
 # Set for jboss
 #org.bedework.app.Usercaldav.virtual.host=

Modified: trunk/config/configs/metadata.xml
===================================================================
--- trunk/config/configs/metadata.xml	2008-10-29 21:29:30 UTC (rev 1937)
+++ trunk/config/configs/metadata.xml	2008-10-30 19:35:48 UTC (rev 1938)
@@ -67,10 +67,6 @@
       <default>true</default>
     </boolean>
 
-    <boolean name="buildStandaloneApp" suffix="build.standalone.app">
-      <default>true</default>
-    </boolean>
-
   <!--  XXX
     //# Comment this out if deploying on some other app server
     //org.bedework.global.deploy.on.tomcat=true

Modified: trunk/deployment/build.xml
===================================================================
--- trunk/deployment/build.xml	2008-10-29 21:29:30 UTC (rev 1937)
+++ trunk/deployment/build.xml	2008-10-30 19:35:48 UTC (rev 1938)
@@ -101,9 +101,7 @@
     <!-- Clean up before we start -->
     <delete dir="${org.bedework.temp.wars.home}" />
 
-    <antcall target="build.standalone.apps" inheritrefs="true" />
-
-    <antcall target="build.j2ee.apps" inheritrefs="true" />
+    <antcall target="build.apps" inheritrefs="true" />
   </target>
 
   <!-- =================================================================
@@ -112,17 +110,11 @@
        this component.
        ================================================================= -->
 
-  <target name="build.standalone.apps" if="org.bedework.global.build.standalone.app" >
+  <target name="build.apps" >
     <property name="org.bedework.deploy.kind" value="webapp" />
     <antcall target="build.configured.apps" inheritrefs="true" />
   </target>
 
-  <target name="build.j2ee.apps" if="org.bedework.global.j2ee.platform" >
-    <property name="org.bedework.deploy.kind"
-              value="${org.bedework.global.j2ee.platform}" />
-    <antcall target="build.configured.apps" inheritrefs="true" />
-  </target>
-
   <!-- =================================================================
                          The deploy target.
        ================================================================= -->
@@ -147,30 +139,16 @@
                  name="org.bedework.locales"
                  check="true" />
 
-    <if>
-      <isset property="org.bedework.global.build.standalone.app" />
-      <then>
-        <antcall target="deploy.apps" inheritrefs="true" >
-          <param name="org.bedework.deploy.kind" value="webapp" />
-        </antcall>
-      </then>
-    </if>
+    <!-- Build the webapps stuff.-->
+    <antcall target="deploy.apps" inheritrefs="true" >
+      <param name="org.bedework.deploy.kind" value="webapp" />
+    </antcall>
 
-    <!-- Always build the shellscr stuff.-->
+    <!-- Build the shellscr stuff.-->
     <antcall target="deploy.apps" inheritrefs="true" >
       <param name="org.bedework.deploy.kind" value="shellscr" />
     </antcall>
 
-    <if>
-      <isset property="org.bedework.global.j2ee.platform" />
-      <then>
-        <antcall target="deploy.apps" inheritrefs="true" >
-          <param name="org.bedework.deploy.kind"
-                 value="${org.bedework.global.j2ee.platform}" />
-        </antcall>
-      </then>
-    </if>
-
     <!-- copy startup website that sends you to the applications -->
     <delete dir="${webapp.root.dir}/bedework"/>
     <mkdir dir="${webapp.root.dir}/bedework"/>

Modified: trunk/deployment/deployprops.xml
===================================================================
--- trunk/deployment/deployprops.xml	2008-10-29 21:29:30 UTC (rev 1937)
+++ trunk/deployment/deployprops.xml	2008-10-30 19:35:48 UTC (rev 1938)
@@ -6,10 +6,6 @@
   <!-- ensure has value -->
   <property name="propval.app.cal.suite" value="" />
 
-  <condition property="org.bedework.build.for.jboss">
-    <equals arg1="jboss" arg2="${org.bedework.global.j2ee.platform}"/>
-  </condition>
-
   <target name="deployprops.init" >
   </target>
 </project>

Modified: trunk/deployment/freebusyAggregator/webapp/build.xml
===================================================================
--- trunk/deployment/freebusyAggregator/webapp/build.xml	2008-10-29 21:29:30 UTC (rev 1937)
+++ trunk/deployment/freebusyAggregator/webapp/build.xml	2008-10-30 19:35:48 UTC (rev 1938)
@@ -49,28 +49,28 @@
       <fileset dir="${app.resources.dir}/demoskins/${propval.app.cal.suite}" />
     </copy>
 
-    <echo message="***************************************************************" />
-    <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" />
-    <echo message="***************************************************************" />
+    <if>
+      <not>
+        <isset property="org.bedework.global.build.ear" />
+      </not>
+      <then>
+        <echo message="***************************************************************" />
+        <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" />
+        <echo message="***************************************************************" />
 
-    <!-- copy the war file. -->
-    <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}"
-          overwrite="yes" />
+        <!-- copy the war file. -->
+        <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}"
+              overwrite="yes" />
 
-    <!-- Delete expanded version -->
-    <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" />
+        <!-- Delete expanded version -->
+        <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" />
 
-    <!-- Delete the quickstart context def -->
-    <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" />
-
-    <antcall target="deploy.for.portal" inheritRefs="true" />
+        <!-- Delete the quickstart context def -->
+        <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" />
+      </then>
+    </if>
   </target>
 
-  <target name="deploy.for.portal" if="org.bedework.global.portal.platform" >
-    <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.global.portal.platform}/build.xml"
-         inheritrefs="true" target="deploy" />
-  </target>
-
   <target name="build.configured" depends="init" >
     <!-- ===============================================================
          Build the war

Modified: trunk/deployment/publiccaldav/webapp/build.xml
===================================================================
--- trunk/deployment/publiccaldav/webapp/build.xml	2008-10-29 21:29:30 UTC (rev 1937)
+++ trunk/deployment/publiccaldav/webapp/build.xml	2008-10-30 19:35:48 UTC (rev 1938)
@@ -37,19 +37,26 @@
        ================================================================= -->
 
   <target name="deploy" depends="init,build.configured" >
-    <echo message="***************************************************************" />
-    <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" />
-    <echo message="***************************************************************" />
+    <if>
+      <not>
+        <isset property="org.bedework.global.build.ear" />
+      </not>
+      <then>
+        <echo message="***************************************************************" />
+        <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" />
+        <echo message="***************************************************************" />
 
-    <!-- copy the war file. -->
-    <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}"
-          overwrite="yes" />
+        <!-- copy the war file. -->
+        <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}"
+              overwrite="yes" />
 
-    <!-- Delete expanded version -->
-    <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" />
+        <!-- Delete expanded version -->
+        <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" />
 
-    <!-- Delete the quickstart context def -->
-    <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" />
+        <!-- Delete the quickstart context def -->
+        <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" />
+      </then>
+    </if>
   </target>
 
   <target name="build.configured" depends="init" >

Modified: trunk/deployment/resources/build.xml
===================================================================
--- trunk/deployment/resources/build.xml	2008-10-29 21:29:30 UTC (rev 1937)
+++ trunk/deployment/resources/build.xml	2008-10-30 19:35:48 UTC (rev 1938)
@@ -39,9 +39,11 @@
        ================================================================= -->
 
   <target name="deploy" depends="init" >
+    <!--
     <if>
       <isset property="org.bedework.global.build.common.context" />
       <then>
+       -->
         <!-- Build a deployable war file with common files -->
 
         <delete dir="${common.dest.war}" />
@@ -56,7 +58,7 @@
           <then>
             <!-- Add dojo -->
             <copy todir="${common.dest.war}/javascript/dojo">
-              <fileset dir="${common.resources.dir}/javascript/${dojo.dir}" />
+              <fileset dir="${common.resources.dir}/javascript/${org.bedework.dojo.dir}" />
             </copy>
           </then>
         </if>
@@ -78,30 +80,28 @@
              basedir="${common.dest.war}"
              excludes="WEB-INF/web.xml" />
 
-        <echo message="***************************************************************" />
-        <echo message="Deploying common context ${common.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" />
-        <echo message="***************************************************************" />
+        <if>
+          <not>
+            <isset property="org.bedework.global.build.ear" />
+          </not>
+          <then>
+            <echo message="***************************************************************" />
+            <echo message="Deploying common context ${common.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" />
+            <echo message="***************************************************************" />
 
-        <!-- Delete expanded version -->
-        <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" />
+            <!-- Delete expanded version -->
+            <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" />
 
-        <!-- copy the war file. -->
-        <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}"
-              file="${common.war.file}"
-              overwrite="yes" />
+            <!-- copy the war file. -->
+            <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}"
+                  file="${common.war.file}"
+                  overwrite="yes" />
 
-        <!-- Delete the quickstart context def -->
-        <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" />
-
-        <!--
-        <if>
-          <isset property="org.bedework.global.portal.platform" />
-          <then>
-            <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.global.portal.platform}/build.xml"
-                 inheritrefs="true" target="deploy" />
+            <!-- Delete the quickstart context def -->
+            <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" />
           </then>
         </if>
-        -->
+<!--
       </then>
       <else>
         <if>
@@ -109,13 +109,13 @@
             <isset property="org.bedework.global.noskins" />
           </not>
           <then>
-            <!-- Just copy into a common location -->
+            < ! - - Just copy into a common location  - - >
             <property name="cmn.destdir"
                       location="${org.bedework.appserver.dir}/${org.bedework.global.common.deploydir}"/>
             <if>
               <isset property="org.bedework.use.dojo" />
               <then>
-                <!-- Add dojo -->
+                < ! - - Add dojo - - >
                 <copy todir="${cmn.destdir}/javascript/dojo">
                   <fileset dir="${common.resources.dir}/javascript/${org.bedework.dojo.dir}" />
                 </copy>
@@ -134,6 +134,7 @@
         </if>
       </else>
     </if>
+       -->
   </target>
 </project>
 

Modified: trunk/deployment/resources/common-context/WEB-INF/web.xml
===================================================================
--- trunk/deployment/resources/common-context/WEB-INF/web.xml	2008-10-29 21:29:30 UTC (rev 1937)
+++ trunk/deployment/resources/common-context/WEB-INF/web.xml	2008-10-30 19:35:48 UTC (rev 1938)
@@ -13,13 +13,6 @@
       <description>Deliver common files from their own context</description>
       <url-pattern>/*</url-pattern>
     </web-resource-collection>
-    <auth-constraint>
-      <role-name>*</role-name>
-    </auth-constraint>
-    <user-data-constraint>
-      <description>open - http</description>
-      <transport-guarantee>NONE</transport-guarantee>
-    </user-data-constraint>
   </security-constraint>
 </web-app>
 

Modified: trunk/deployment/termination/webapp/build.xml
===================================================================
--- trunk/deployment/termination/webapp/build.xml	2008-10-29 21:29:30 UTC (rev 1937)
+++ trunk/deployment/termination/webapp/build.xml	2008-10-30 19:35:48 UTC (rev 1938)
@@ -8,12 +8,77 @@
   <import file="${org.bedework.deployment.base}/deployprops.xml" />
 
   <target name="init">
+    <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>
 
   <target name="deploy" depends="init,build.configured" >
     <!-- Deploy common resources -->
     <ant antfile="${org.bedework.common.resources}/build.xml"
          inheritrefs="true" target="deploy" />
+
+    <if>
+      <isset property="org.bedework.global.build.ear" />
+      <then>
+        <echo message="***************************************************************" />
+        <echo message="Building ear file for jboss deployment" />
+        <echo message="***************************************************************" />
+
+        <jar jarfile="${org.bedework.ear.properties.jar}">
+          <fileset dir="${org.bedework.ear.properties.dir}"/>
+        </jar>
+
+        <path id="app.xml.cp">
+          <pathelement location="${org.bedework.deployutil.jar}"/>
+        </path>
+
+        <taskdef name="applicationXml"
+                 classname="org.bedework.deployment.ApplicationXmlTask">
+          <classpath refid="app.xml.cp"/>
+        </taskdef>
+
+        <!-- We have to drop some of the libraries so they don't conflict -->
+        <copy toDir="${ear.dir}">
+          <fileset dir="${org.bedework.temp.dir}/earlib"
+                   excludes="${org.bedework.global.ear.lib.excludes}" />
+        </copy>
+
+        <applicationXml displayName="Bedework calendar suite"
+                        outFile="${ear.dir}/META-INF/application.xml"
+                        warDir="${org.bedework.temp.dir}/wars"
+                        contexts="${org.bedework.global.context.roots}">
+          <fileset dir="${ear.dir}">
+            <include name="*.jar"/>
+          </fileset>
+        </applicationXml>
+
+        <manifest file="${ear.dir}/META-INF/MANIFEST.MF" />
+
+        <copy toDir="${ear.dir}">
+          <fileset dir="${org.bedework.temp.wars.home}"/>
+        </copy>
+
+        <zip destfile="${app.ear.file}"
+             basedir="${ear.dir}"/>
+
+        <!-- copy the ear - at the moment copy the uncompressed. -->
+
+        <if>
+          <isset property="org.bedework.appserver.deploy.dir" />
+          <then>
+            <delete dir="${org.bedework.appserver.deploy.dir}/${app.ear.file.name}" />
+            <mkdir dir="${org.bedework.appserver.deploy.dir}/${app.ear.file.name}" />
+            <copy todir="${org.bedework.appserver.deploy.dir}/${app.ear.file.name}">
+              <fileset dir="${ear.dir}"/>
+            </copy>
+          </then>
+        </if>
+      </then>
+    </if>
   </target>
 
   <target name="build.configured" depends="init" >

Modified: trunk/deployment/usercaldav/webapp/build.xml
===================================================================
--- trunk/deployment/usercaldav/webapp/build.xml	2008-10-29 21:29:30 UTC (rev 1937)
+++ trunk/deployment/usercaldav/webapp/build.xml	2008-10-30 19:35:48 UTC (rev 1938)
@@ -36,19 +36,26 @@
        ================================================================= -->
 
   <target name="deploy" depends="init,build.configured" >
-    <echo message="***************************************************************" />
-    <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" />
-    <echo message="***************************************************************" />
+    <if>
+      <not>
+        <isset property="org.bedework.global.build.ear" />
+      </not>
+      <then>
+        <echo message="***************************************************************" />
+        <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" />
+        <echo message="***************************************************************" />
 
-    <!-- copy the war file. -->
-    <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}"
-          overwrite="yes" />
+        <!-- copy the war file. -->
+        <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}"
+              overwrite="yes" />
 
-    <!-- Delete expanded version -->
-    <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" />
+        <!-- Delete expanded version -->
+        <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" />
 
-    <!-- Delete the quickstart context def -->
-    <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" />
+        <!-- Delete the quickstart context def -->
+        <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" />
+      </then>
+    </if>
   </target>
 
   <target name="build.configured" depends="init" >

Deleted: trunk/deployment/webadmin/portlet/jetspeed2-portlet.psml
===================================================================
--- trunk/deployment/webadmin/portlet/jetspeed2-portlet.psml	2008-10-29 21:29:30 UTC (rev 1937)
+++ trunk/deployment/webadmin/portlet/jetspeed2-portlet.psml	2008-10-30 19:35:48 UTC (rev 1938)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  This is a Jetspeed2 psml file for the calendar public events portlet.
-
-  The fragment id's must be unique among all .psml files, and the name of the
-  portlet is read from the portlet.xml file.
--->
-<page id="/@CONTEXT-ROOT at .psml">
-  <defaults
-     skin="orange"
-     layout-decorator="tigris"
-     portlet-decorator="tigris"
-  />
-  <title>@APP-DESCRIPTION@</title>
-  <fragment id="@CONTEXT-ROOT at -1" type="layout" name="jetspeed-layouts::VelocityOneColumn">
-    <fragment id="@CONTEXT-ROOT at -2" type="portlet" name="@CONTEXT-ROOT@::@PORTLET-NAME@"/>
-  </fragment>
-</page>

Modified: trunk/deployment/webadmin/webapp/build.xml
===================================================================
--- trunk/deployment/webadmin/webapp/build.xml	2008-10-29 21:29:30 UTC (rev 1937)
+++ trunk/deployment/webadmin/webapp/build.xml	2008-10-30 19:35:48 UTC (rev 1938)
@@ -65,34 +65,24 @@
       </then>
     </if>
 
-    <!-- Deploy common resources -->
-    <!--
-    <ant antfile="${org.bedework.common.resources}/build.xml"
-         inheritrefs="true" target="deploy" >
-      <property name="app.common.resources.dest.dir"
-                location="${org.bedework.appserver.dir}/${propval.app.resources.dir}/resources" />
-    </ant>
-    -->
+    <if>
+      <not>
+        <isset property="org.bedework.global.build.ear" />
+      </not>
+      <then>
+        <echo message="***************************************************************" />
+        <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" />
+        <echo message="***************************************************************" />
 
-    <echo message="***************************************************************" />
-    <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" />
-    <echo message="***************************************************************" />
+        <!-- copy the war file. -->
+        <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}"
+              overwrite="yes" />
 
-    <!-- copy the war file. -->
-    <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}"
-          overwrite="yes" />
+        <!-- Delete expanded version -->
+        <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" />
 
-    <!-- Delete expanded version -->
-    <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" />
-
-    <!-- Delete the quickstart context def -->
-    <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" />
-
-    <if>
-      <isset property="org.bedework.global.portal.platform" />
-      <then>
-        <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.global.portal.platform}/build.xml"
-             inheritrefs="true" target="deploy" />
+        <!-- Delete the quickstart context def -->
+        <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" />
       </then>
     </if>
   </target>

Modified: trunk/deployment/webconfig/webapp/build.xml
===================================================================
--- trunk/deployment/webconfig/webapp/build.xml	2008-10-29 21:29:30 UTC (rev 1937)
+++ trunk/deployment/webconfig/webapp/build.xml	2008-10-30 19:35:48 UTC (rev 1938)
@@ -55,19 +55,26 @@
       </then>
     </if>
 
-    <echo message="***************************************************************" />
-    <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" />
-    <echo message="***************************************************************" />
+    <if>
+      <not>
+        <isset property="org.bedework.global.build.ear" />
+      </not>
+      <then>
+        <echo message="***************************************************************" />
+        <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" />
+        <echo message="***************************************************************" />
 
-    <!-- copy the war file. -->
-    <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}"
-          overwrite="yes" />
+        <!-- copy the war file. -->
+        <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}"
+              overwrite="yes" />
 
-    <!-- Delete expanded version -->
-    <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" />
+        <!-- Delete expanded version -->
+        <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" />
 
-    <!-- Delete the quickstart context def -->
-    <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" />
+        <!-- Delete the quickstart context def -->
+        <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" />
+      </then>
+    </if>
   </target>
 
   <target name="build.configured" depends="init" >

Deleted: trunk/deployment/webpublic/portlet/jetspeed2-portlet.psml
===================================================================
--- trunk/deployment/webpublic/portlet/jetspeed2-portlet.psml	2008-10-29 21:29:30 UTC (rev 1937)
+++ trunk/deployment/webpublic/portlet/jetspeed2-portlet.psml	2008-10-30 19:35:48 UTC (rev 1938)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  This is a Jetspeed2 psml file for the calendar public events portlet.
-
-  The fragment id's must be unique among all .psml files, and the name of the
-  portlet is read from the portlet.xml file.
--->
-<page id="/@CONTEXT-ROOT at .psml">
-  <defaults
-     skin="orange"
-     layout-decorator="tigris"
-     portlet-decorator="tigris"
-  />
-  <title>@APP-DESCRIPTION@</title>
-  <fragment id="@CONTEXT-ROOT at -1" type="layout" name="jetspeed-layouts::VelocityOneColumn">
-    <fragment id="@CONTEXT-ROOT at -2" type="portlet" name="@CONTEXT-ROOT@::@PORTLET-NAME@"/>
-  </fragment>
-
-  <!-- Security constraints go here -->
-</page>

Modified: trunk/deployment/webpublic/webapp/build.xml
===================================================================
--- trunk/deployment/webpublic/webapp/build.xml	2008-10-29 21:29:30 UTC (rev 1937)
+++ trunk/deployment/webpublic/webapp/build.xml	2008-10-30 19:35:48 UTC (rev 1938)
@@ -73,35 +73,25 @@
       </then>
     </if>
 
-    <!-- Deploy common resources -->
-    <!--
-    <ant antfile="${org.bedework.common.resources}/build.xml"
-         inheritrefs="true" target="deploy" >
-      <property name="app.common.resources.dest.dir"
-                location="${org.bedework.appserver.dir}/${propval.app.resources.dir}.${propval.app.cal.suite}/resources" />
-    </ant>
-    -->
+    <if>
+      <not>
+        <isset property="org.bedework.global.build.ear" />
+      </not>
+      <then>
+        <echo message="***************************************************************" />
+        <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" />
+        <echo message="***************************************************************" />
 
-    <echo message="***************************************************************" />
-    <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" />
-    <echo message="***************************************************************" />
+        <!-- Delete expanded version -->
+        <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" />
 
-    <!-- Delete expanded version -->
-    <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" />
+        <!-- copy the war file. -->
+        <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}"
+              file="${app.war.file}"
+              overwrite="yes" />
 
-    <!-- copy the war file. -->
-    <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}"
-          file="${app.war.file}"
-          overwrite="yes" />
-
-    <!-- Delete the quickstart context def -->
-    <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" />
-
-    <if>
-      <isset property="org.bedework.global.portal.platform" />
-      <then>
-        <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.global.portal.platform}/build.xml"
-             inheritrefs="true" target="deploy" />
+        <!-- Delete the quickstart context def -->
+        <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" />
       </then>
     </if>
   </target>

Deleted: trunk/deployment/websubmit/portlet/jetspeed2-portlet.psml
===================================================================
--- trunk/deployment/websubmit/portlet/jetspeed2-portlet.psml	2008-10-29 21:29:30 UTC (rev 1937)
+++ trunk/deployment/websubmit/portlet/jetspeed2-portlet.psml	2008-10-30 19:35:48 UTC (rev 1938)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  This is a Jetspeed2 psml file for the calendar public events portlet.
-
-  The fragment id's must be unique among all .psml files, and the name of the
-  portlet is read from the portlet.xml file.
--->
-<page id="/@CONTEXT-ROOT at .psml">
-  <defaults
-     skin="orange"
-     layout-decorator="tigris"
-     portlet-decorator="tigris"
-  />
-  <title>@APP-DESCRIPTION@</title>
-  <fragment id="@CONTEXT-ROOT at -1" type="layout" name="jetspeed-layouts::VelocityOneColumn">
-    <fragment id="@CONTEXT-ROOT at -2" type="portlet" name="@CONTEXT-ROOT@::@PORTLET-NAME@"/>
-  </fragment>
-</page>

Modified: trunk/deployment/websubmit/webapp/build.xml
===================================================================
--- trunk/deployment/websubmit/webapp/build.xml	2008-10-29 21:29:30 UTC (rev 1937)
+++ trunk/deployment/websubmit/webapp/build.xml	2008-10-30 19:35:48 UTC (rev 1938)
@@ -73,34 +73,24 @@
       </then>
     </if>
 
-    <!-- Deploy common resources -->
-    <!--
-    <ant antfile="${org.bedework.common.resources}/build.xml"
-         inheritrefs="true" target="deploy" >
-      <property name="app.common.resources.dest.dir"
-                location="${org.bedework.appserver.dir}/${propval.app.resources.dir}/resources" />
-    </ant>
-    -->
+    <if>
+      <not>
+        <isset property="org.bedework.global.build.ear" />
+      </not>
+      <then>
+        <echo message="***************************************************************" />
+        <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" />
+        <echo message="***************************************************************" />
 
-    <echo message="***************************************************************" />
-    <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" />
-    <echo message="***************************************************************" />
+        <!-- copy the war file. -->
+        <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}"
+              overwrite="yes" />
 
-    <!-- copy the war file. -->
-    <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}"
-          overwrite="yes" />
+        <!-- Delete expanded version -->
+        <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" />
 
-    <!-- Delete expanded version -->
-    <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" />
-
-    <!-- Delete the quickstart context def -->
-    <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" />
-
-    <if>
-      <isset property="org.bedework.global.portal.platform" />
-      <then>
-        <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.global.portal.platform}/build.xml"
-             inheritrefs="true" target="deploy" />
+        <!-- Delete the quickstart context def -->
+        <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" />
       </then>
     </if>
   </target>

Deleted: trunk/deployment/webuser/portlet/jetspeed2-portlet.psml
===================================================================
--- trunk/deployment/webuser/portlet/jetspeed2-portlet.psml	2008-10-29 21:29:30 UTC (rev 1937)
+++ trunk/deployment/webuser/portlet/jetspeed2-portlet.psml	2008-10-30 19:35:48 UTC (rev 1938)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  This is a Jetspeed2 psml file for the calendar public events portlet.
-
-  The fragment id's must be unique among all .psml files, and the name of the
-  portlet is read from the portlet.xml file.
--->
-<page id="/@CONTEXT-ROOT at .psml">
-  <defaults
-     skin="orange"
-     layout-decorator="tigris"
-     portlet-decorator="tigris"
-  />
-  <title>@APP-DESCRIPTION@</title>
-  <fragment id="@CONTEXT-ROOT at -1" type="layout" name="jetspeed-layouts::VelocityOneColumn">
-    <fragment id="@CONTEXT-ROOT at -2" type="portlet" name="@CONTEXT-ROOT@::@PORTLET-NAME@"/>
-  </fragment>
-</page>

Modified: trunk/deployment/webuser/portlet/portlet.xml
===================================================================
--- trunk/deployment/webuser/portlet/portlet.xml	2008-10-29 21:29:30 UTC (rev 1937)
+++ trunk/deployment/webuser/portlet/portlet.xml	2008-10-30 19:35:48 UTC (rev 1938)
@@ -3,7 +3,7 @@
   Based on jpetstore example application with contributions from:
 
   Author: Xavier Lawrence @ jahia . com
-  Author: Mike Douglass    douglm at rpi.edu
+  Author: Mike Douglass    douglm @ rpi . edu
 -->
 <portlet-app id="calApp" version="1.0">
   <portlet id="@CONTEXT-ROOT at .@PORTLET-NAME@">

Modified: trunk/deployment/webuser/webapp/build.xml
===================================================================
--- trunk/deployment/webuser/webapp/build.xml	2008-10-29 21:29:30 UTC (rev 1937)
+++ trunk/deployment/webuser/webapp/build.xml	2008-10-30 19:35:48 UTC (rev 1938)
@@ -56,7 +56,6 @@
           <fileset dir="${app.resources.dir}/demoskins" />
         </copy>
 
-
         <if>
           <isset property="org.bedework.global.portal.platform" />
           <then>
@@ -74,34 +73,24 @@
       </then>
     </if>
 
-    <!-- Deploy common resources -->
-    <!--
-    <ant antfile="${org.bedework.common.resources}/build.xml"
-         inheritrefs="true" target="deploy" >
-      <property name="app.common.resources.dest.dir"
-                location="${org.bedework.appserver.dir}/${propval.app.resources.dir}/resources" />
-    </ant>
-    -->
+    <if>
+      <not>
+        <isset property="org.bedework.global.build.ear" />
+      </not>
+      <then>
+        <echo message="***************************************************************" />
+        <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" />
+        <echo message="***************************************************************" />
 
-    <echo message="***************************************************************" />
-    <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" />
-    <echo message="***************************************************************" />
+        <!-- copy the war file. -->
+        <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}"
+              overwrite="yes" />
 
-    <!-- copy the war file. -->
-    <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}"
-          overwrite="yes" />
+        <!-- Delete expanded version -->
+        <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" />
 
-    <!-- Delete expanded version -->
-    <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" />
-
-    <!-- Delete the quickstart context def -->
-    <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" />
-
-    <if>
-      <isset property="org.bedework.global.portal.platform" />
-      <then>
-        <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.global.portal.platform}/build.xml"
-             inheritrefs="true" target="deploy" />
+        <!-- Delete the quickstart context def -->
+        <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" />
       </then>
     </if>
   </target>

