Index: trunk/build/buildfilters.xml
===================================================================
--- trunk/build/buildfilters.xml (revision 1906)
+++ trunk/build/buildfilters.xml (revision 1933)
@@ -92,7 +92,4 @@
             value="${propval.app.root}" />
 
-    <filter token="APP-GUESTMODE"
-            value="${propval.app.guestmode}" />
-
     <!-- Change this to be an app par -->
     <filter token="RUN-AS-USER"
Index: trunk/build/buildwar.xml
===================================================================
--- trunk/build/buildwar.xml (revision 1920)
+++ trunk/build/buildwar.xml (revision 1933)
@@ -140,9 +140,6 @@
     <antcall target="copy.war.docs" inheritRefs="true" />
 
-    <!-- Create the env.properties file -->
+    <!-- Create the runtime options file -->
     <mkdir dir="${app.dest.properties}" />
-
-    <copy tofile="${app.dest.properties}/env.properties"
-          file="${org.bedework.config.properties}" />
 
     <copy tofile="${app.dest.properties}/options.xml"
@@ -417,4 +414,5 @@
         <antcall target="add.uportal2" inheritRefs="true" />
         <antcall target="add.liferay4" inheritRefs="true" />
+        <antcall target="add.liferay5" inheritRefs="true" />
       </then>
     </if>
@@ -542,4 +540,81 @@
 
   <!-- =================================================================
+       Liferay 5 modifications
+       ================================================================= -->
+
+  <target name="add.liferay5" if="org.bedework.build.for.liferay5" >
+   <!-- Add liferay config files -->
+    <copy todir="${app.dest.webinf}" >
+      <fileset dir="${app.sou.dir}/war/WEB-INF" >
+        <include name="liferay*"/>
+      </fileset>
+      <filterset refid="property.filters" />
+    </copy>
+
+    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.liferay.util-taglib}"/>
+    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.liferay.util-bridges}"/>
+    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.liferay.util-java}"/>
+
+    <!-- Add the context params -->
+    <replace file="${app.temp.web.xml}">
+      <replacetoken><![CDATA[<!-- add context params here -->]]></replacetoken>
+      <replacevalue><![CDATA[<!-- add context params here -->
+
+  <context-param>
+    <param-name>company_id</param-name>
+    <param-value>@LIFERAY-COMPANY-ID@</param-value>
+  </context-param>]]>
+      </replacevalue>
+    </replace>
+
+    <!-- Add the portal listener -->
+    <replace file="${app.temp.web.xml}">
+      <replacetoken><![CDATA[<!-- add listeners here -->]]></replacetoken>
+      <replacevalue><![CDATA[<!-- add listeners here -->
+
+  <listener>
+    <listener-class>
+      @PORTAL-SERVLET-CONTEXT-LISTENER@
+    </listener-class>
+  </listener>]]>
+      </replacevalue>
+    </replace>
+
+    <!-- Add the portlet servlet definition -->
+    <replace file="${app.temp.web.xml}">
+      <replacetoken><![CDATA[<!-- add servlet definitions here -->]]></replacetoken>
+      <replacevalue><![CDATA[<!-- add servlet definitions here -->
+
+  <!-- Servlet definition for portlet use. -->
+  <servlet>
+    <servlet-name>@PORTLET-NAME@</servlet-name>
+    <display-name>@PORTLET-NAME@ Wrapper</display-name>
+    <servlet-class>@PORTLET-SERVLET-CLASS@</servlet-class>
+    <init-param>
+      <param-name>portlet-class</param-name>
+      <param-value>@PORTLET-CLASS@</param-value>
+    </init-param>
+    <init-param>
+      <param-name>portlet-guid</param-name>
+      <param-value>@CONTEXT-ROOT@.@PORTLET-NAME@</param-value>
+    </init-param>
+  </servlet>]]>
+      </replacevalue>
+    </replace>
+
+    <!-- Add the portlet servlet mapping -->
+    <replace file="${app.temp.web.xml}">
+      <replacetoken><![CDATA[<!-- add servlet mappings here -->]]></replacetoken>
+      <replacevalue><![CDATA[<!-- add servlet mappings here -->
+
+  <servlet-mapping>
+    <servlet-name>@PORTLET-NAME@</servlet-name>
+    <url-pattern>/@PORTLET-NAME@/*</url-pattern>
+  </servlet-mapping>]]>
+      </replacevalue>
+    </replace>
+  </target>
+
+  <!-- =================================================================
        If this is a j2ee app the following gets executed.
        We create an uodated jboss-web.xml file (for jboss) and a ear
Index: trunk/build/getJar.xml
===================================================================
--- trunk/build/getJar.xml (revision 1894)
+++ trunk/build/getJar.xml (revision 1933)
@@ -19,5 +19,5 @@
      @param lib      optional destination for the get task
      @param libcache optional location of the cache
-     @param property optional name of property to hold localtion of resulting jar
+     @param property optional name of property to hold location of resulting jar
      @param project optional project name for local fetch from generated quickstart.
      =================================================================== -->
Index: trunk/build/quickstart/run-hsqldb.xml
===================================================================
--- trunk/build/quickstart/run-hsqldb.xml (revision 1914)
+++ trunk/build/quickstart/run-hsqldb.xml (revision 1933)
@@ -87,4 +87,18 @@
   </target>
 
+  <target name="liferaydb" depends="run.init"
+          description="starts the hsqldb server for likferay">
+    <echo message="Starting hsqldb"/>
+    <java fork="true" dir="${basedir}" classname="org.hsqldb.Server">
+      <classpath>
+        <pathelement path="${org.bedework.hsqldb.dir}/lib/hsqldb.jar"/>
+      </classpath>
+      <arg value="-database"/>
+      <arg value="${org.bedework.hsqldb.dir}/lportal"/>
+      <arg value="-port"/>
+      <arg value="9887"/>
+    </java>
+  </target>
+
   <!-- =================================================================
        The "hsqldb-test" target starts the hsqldb server for testing
Index: trunk/config/bwbuild/default/cal.options.xml
===================================================================
--- trunk/config/bwbuild/default/cal.options.xml (revision 1906)
+++ trunk/config/bwbuild/default/cal.options.xml (revision 1933)
@@ -5,4 +5,13 @@
     <bedework>
       <global>
+        <!-- This property is how the running system finds the system settings.
+             In theory we could have multiple settings with different names
+         -->
+        <systemName>bedework</systemName>
+
+        <!-- This is used to prefix administrative group names to distinguish
+             them from user group names. -->
+        <adminGroupsIdPrefix>agrp_</adminGroupsIdPrefix>
+
         <module>
           <!-- A dummy module with no directory. -->
@@ -142,5 +151,9 @@
           <categoryOptional>true</categoryOptional>
 
+          <noGroupAllowed>false</noGroupAllowed>
+
           <appType>webadmin</appType>
+          <publicAdmin>true</publicAdmin>
+          <guestMode>false</guestMode>
 
           <!-- This will become a system configuration in time -->
@@ -169,4 +182,6 @@
 
           <appType>websubmit</appType>
+          <publicAdmin>false</publicAdmin>
+          <guestMode>false</guestMode>
 
           <!-- This will become a system configuration in time -->
@@ -203,4 +218,7 @@
 
           <appType>webpublic</appType>
+          <publicAdmin>false</publicAdmin>
+          <guestMode>true</guestMode>
+          <runAsUser>public-user</runAsUser>
 
           <!-- Default value for 24 hour mode -->
@@ -236,4 +254,7 @@
 
           <appType>webpublic</appType>
+          <publicAdmin>false</publicAdmin>
+          <guestMode>true</guestMode>
+          <runAsUser>public-user</runAsUser>
 
           <!-- Default value for 24 hour mode -->
@@ -266,4 +287,6 @@
 
           <appType>webuser</appType>
+          <publicAdmin>false</publicAdmin>
+          <guestMode>false</guestMode>
 
           <!-- Default value for 24 hour mode -->
@@ -288,4 +311,9 @@
              ================================================================== -->
         <Usercaldav classname="org.bedework.calfacade.configs.CalDAVConfig">
+          <publicAdmin>false</publicAdmin>
+          <guestMode>false</guestMode>
+
+          <sysintfImpl>org.bedework.caldav.bwserver.BwSysIntfImpl</sysintfImpl>
+
           <!-- Comment out or delete for no real time server to server service
                Currently under development and may present a security risk in
@@ -304,4 +332,10 @@
              ================================================================== -->
         <Pubcaldav classname="org.bedework.calfacade.configs.CalDAVConfig">
+          <publicAdmin>false</publicAdmin>
+          <guestMode>true</guestMode>
+          <runAsUser>public-user</runAsUser>
+
+          <sysintfImpl>org.bedework.caldav.bwserver.BwSysIntfImpl</sysintfImpl>
+
           <!-- Comment out or delete for no real time server to server service
                Currently under development and may present a security risk in
Index: trunk/config/bwbuild/default/cal.properties
===================================================================
--- trunk/config/bwbuild/default/cal.properties (revision 1914)
+++ trunk/config/bwbuild/default/cal.properties (revision 1933)
@@ -38,9 +38,4 @@
 org.bedework.global.hibernate.cache.use_second_level_cache=false
 org.bedework.global.hibernate.cache.provider_class org.hibernate.cache.EhCacheProvider
-
-# This property is how the running system finds the system settings.
-# In theory we could have multiple settings with different names
-# The value here must match that in the options xml file.
-org.bedework.global.system.name=bedework
 
 # Uncomment this to enable building of a common context for common javascript.
@@ -209,6 +204,4 @@
 org.bedework.app.bwconfig.display.name=Bedework Config
 org.bedework.app.bwconfig.name=bwconfig
-org.bedework.app.bwconfig.guestmode=true
-org.bedework.app.bwconfig.publicadmin=false
 org.bedework.app.bwconfig.logprefix=BwConfig
 
@@ -222,5 +215,4 @@
 org.bedework.app.CalAdmin.sou.dir=webadmin
 org.bedework.app.CalAdmin.default.contenttype=text/xml
-org.bedework.app.CalAdmin.nogroupallowed=false
 #org.bedework.app.CalAdmin.portlet.name=CalAdmin
 
@@ -243,9 +235,4 @@
 org.bedework.app.CalAdmin.display.name=Public Events Administration
 org.bedework.app.CalAdmin.name=DemoCalAdmin
-
-org.bedework.app.CalAdmin.admingroupsidprefix=agrp_
-org.bedework.app.CalAdmin.guestmode=false
-org.bedework.app.CalAdmin.publicadmin=true
-org.bedework.app.CalAdmin.run.as.user=public-user
 
 #
@@ -279,7 +266,4 @@
 org.bedework.app.EventSubmit.name=DemoEventSubmit
 
-org.bedework.app.EventSubmit.guestmode=false
-org.bedework.app.EventSubmit.publicadmin=false
-
 #
 # --------------------------------------------------------------------
@@ -308,8 +292,4 @@
 org.bedework.app.Events.display.name=Demo calendar
 org.bedework.app.Events.name=DemoCal
-org.bedework.app.Events.run.as.user=public-user
-
-org.bedework.app.Events.guestmode=true
-org.bedework.app.Events.publicadmin=false
 
 #
@@ -339,8 +319,4 @@
 org.bedework.app.SoEDept.display.name=Demo departmental calendar
 org.bedework.app.SoEDept.name=SoEDept
-org.bedework.app.SoEDept.run.as.user=public-user
-
-org.bedework.app.SoEDept.guestmode=true
-org.bedework.app.SoEDept.publicadmin=false
 
 #
@@ -374,7 +350,4 @@
 org.bedework.app.UserCal.name=DemoUserCal
 
-org.bedework.app.UserCal.guestmode=false
-org.bedework.app.UserCal.publicadmin=false
-
 #
 # --------------------------------------------------------------------
@@ -399,9 +372,5 @@
 org.bedework.app.Pubcaldav.name=DemoPubcaldav
 org.bedework.app.Pubcaldav.deploy.dir=/webapps
-org.bedework.app.Pubcaldav.guestmode=true
-org.bedework.app.Pubcaldav.publicadmin=false
-org.bedework.app.Pubcaldav.run.as.user=public-user
 org.bedework.app.Pubcaldav.logprefix=PubCalDav
-org.bedework.app.Pubcaldav.sysintfimpl=org.bedework.caldav.bwserver.BwSysIntfImpl
 
 #
@@ -431,8 +400,5 @@
 org.bedework.app.Usercaldav.name=DemoUsrcaldav
 org.bedework.app.Usercaldav.deploy.dir=/webapps
-org.bedework.app.Usercaldav.guestmode=false
-org.bedework.app.Usercaldav.publicadmin=false
 org.bedework.app.Usercaldav.logprefix=UserCalDav
-org.bedework.app.Usercaldav.sysintfimpl=org.bedework.caldav.bwserver.BwSysIntfImpl
 
 #
Index: trunk/config/bwbuild/jboss/democal.options.xml
===================================================================
--- trunk/config/bwbuild/jboss/democal.options.xml (revision 1807)
+++ trunk/config/bwbuild/jboss/democal.options.xml (revision 1933)
@@ -5,4 +5,13 @@
     <bedework>
       <global>
+        <!-- This property is how the running system finds the system settings.
+             In theory we could have multiple settings with different names
+         -->
+        <systemName>bedework</systemName>
+
+        <!-- This is used to prefix administrative group names to distinguish
+             them from user group names. -->
+        <adminGroupsIdPrefix>agrp_</adminGroupsIdPrefix>
+
         <module>
           <!-- A dummy module with no directory. -->
@@ -134,5 +143,9 @@
           <categoryOptional>true</categoryOptional>
 
+          <noGroupAllowed>false</noGroupAllowed>
+
           <appType>webadmin</appType>
+          <publicAdmin>true</publicAdmin>
+          <guestMode>false</guestMode>
 
           <!-- This will become a system configuration in time -->
@@ -161,4 +174,6 @@
 
           <appType>websubmit</appType>
+          <publicAdmin>false</publicAdmin>
+          <guestMode>false</guestMode>
 
           <!-- This will become a system configuration in time -->
@@ -195,4 +210,7 @@
 
           <appType>webpublic</appType>
+          <publicAdmin>false</publicAdmin>
+          <guestMode>true</guestMode>
+          <runAsUser>public-user</runAsUser>
 
           <!-- Default value for 24 hour mode -->
@@ -228,4 +246,7 @@
 
           <appType>webpublic</appType>
+          <publicAdmin>false</publicAdmin>
+          <guestMode>true</guestMode>
+          <runAsUser>public-user</runAsUser>
 
           <!-- Default value for 24 hour mode -->
@@ -258,4 +279,6 @@
 
           <appType>webuser</appType>
+          <publicAdmin>false</publicAdmin>
+          <guestMode>false</guestMode>
 
           <!-- Default value for 24 hour mode -->
@@ -280,4 +303,9 @@
              ================================================================== -->
         <Usercaldav classname="org.bedework.calfacade.configs.CalDAVConfig">
+          <publicAdmin>false</publicAdmin>
+          <guestMode>false</guestMode>
+
+          <sysintfImpl>org.bedework.caldav.bwserver.BwSysIntfImpl</sysintfImpl>
+
           <!-- Comment out or delete for no real time server to server service
                Currently under development and may present a security risk in
@@ -296,4 +324,10 @@
              ================================================================== -->
         <Pubcaldav classname="org.bedework.calfacade.configs.CalDAVConfig">
+          <publicAdmin>false</publicAdmin>
+          <guestMode>true</guestMode>
+          <runAsUser>public-user</runAsUser>
+
+          <sysintfImpl>org.bedework.caldav.bwserver.BwSysIntfImpl</sysintfImpl>
+
           <!-- Comment out or delete for no real time server to server service
                Currently under development and may present a security risk in
Index: trunk/config/bwbuild/jboss/democal.properties
===================================================================
--- trunk/config/bwbuild/jboss/democal.properties (revision 1807)
+++ trunk/config/bwbuild/jboss/democal.properties (revision 1933)
@@ -38,9 +38,4 @@
 org.bedework.global.hibernate.cache.use_second_level_cache=false
 org.bedework.global.hibernate.cache.provider_class org.hibernate.cache.EhCacheProvider
-
-# This property is how the running system finds the system settings.
-# In theory we could have multiple settings with different names
-# The value here must match that in the options xml file.
-org.bedework.global.system.name=bedework
 
 # Uncomment this to enable building of a common context for common javascript.
@@ -212,6 +207,4 @@
 org.bedework.app.bwconfig.display.name=Bedework Config
 org.bedework.app.bwconfig.name=bwconfig
-org.bedework.app.bwconfig.guestmode=true
-org.bedework.app.bwconfig.publicadmin=false
 org.bedework.app.bwconfig.logprefix=BwConfig
 
@@ -225,5 +218,4 @@
 org.bedework.app.CalAdmin.sou.dir=webadmin
 org.bedework.app.CalAdmin.default.contenttype=text/xml
-org.bedework.app.CalAdmin.nogroupallowed=false
 #org.bedework.app.CalAdmin.portlet.name=CalAdmin
 
@@ -246,9 +238,4 @@
 org.bedework.app.CalAdmin.display.name=Public Events Administration
 org.bedework.app.CalAdmin.name=DemoCalAdmin
-
-org.bedework.app.CalAdmin.admingroupsidprefix=agrp_
-org.bedework.app.CalAdmin.guestmode=false
-org.bedework.app.CalAdmin.publicadmin=true
-org.bedework.app.CalAdmin.run.as.user=public-user
 
 #
@@ -282,7 +269,4 @@
 org.bedework.app.EventSubmit.name=DemoEventSubmit
 
-org.bedework.app.EventSubmit.guestmode=false
-org.bedework.app.EventSubmit.publicadmin=false
-
 #
 # --------------------------------------------------------------------
@@ -311,8 +295,4 @@
 org.bedework.app.Events.display.name=Demo calendar
 org.bedework.app.Events.name=DemoCal
-org.bedework.app.Events.run.as.user=public-user
-
-org.bedework.app.Events.guestmode=true
-org.bedework.app.Events.publicadmin=false
 
 #
@@ -342,8 +322,4 @@
 org.bedework.app.SoEDept.display.name=Demo departmental calendar
 org.bedework.app.SoEDept.name=SoEDept
-org.bedework.app.SoEDept.run.as.user=public-user
-
-org.bedework.app.SoEDept.guestmode=true
-org.bedework.app.SoEDept.publicadmin=false
 
 #
@@ -377,7 +353,4 @@
 org.bedework.app.UserCal.name=DemoUserCal
 
-org.bedework.app.UserCal.guestmode=false
-org.bedework.app.UserCal.publicadmin=false
-
 #
 # --------------------------------------------------------------------
@@ -402,9 +375,5 @@
 org.bedework.app.Pubcaldav.name=DemoPubcaldav
 org.bedework.app.Pubcaldav.deploy.dir=/webapps
-org.bedework.app.Pubcaldav.guestmode=true
-org.bedework.app.Pubcaldav.publicadmin=false
-org.bedework.app.Pubcaldav.run.as.user=public-user
 org.bedework.app.Pubcaldav.logprefix=PubCalDav
-org.bedework.app.Pubcaldav.sysintfimpl=org.bedework.caldav.bwserver.BwSysIntfImpl
 
 #
@@ -434,8 +403,5 @@
 org.bedework.app.Usercaldav.name=DemoUsrcaldav
 org.bedework.app.Usercaldav.deploy.dir=/webapps
-org.bedework.app.Usercaldav.guestmode=false
-org.bedework.app.Usercaldav.publicadmin=false
 org.bedework.app.Usercaldav.logprefix=UserCalDav
-org.bedework.app.Usercaldav.sysintfimpl=org.bedework.caldav.bwserver.BwSysIntfImpl
 
 #
Index: trunk/config/configs/democal.options.xml
===================================================================
--- trunk/config/configs/democal.options.xml (revision 1906)
+++ trunk/config/configs/democal.options.xml (revision 1933)
@@ -5,4 +5,13 @@
     <bedework>
       <global>
+        <!-- This property is how the running system finds the system settings.
+             In theory we could have multiple settings with different names
+         -->
+        <systemName>bedework</systemName>
+
+        <!-- This is used to prefix administrative group names to distinguish
+             them from user group names. -->
+        <adminGroupsIdPrefix>agrp_</adminGroupsIdPrefix>
+
         <module>
           <!-- A dummy module with no directory. -->
@@ -142,5 +151,9 @@
           <categoryOptional>true</categoryOptional>
 
+          <noGroupAllowed>false</noGroupAllowed>
+
           <appType>webadmin</appType>
+          <publicAdmin>true</publicAdmin>
+          <guestMode>false</guestMode>
 
           <!-- This will become a system configuration in time -->
@@ -169,4 +182,6 @@
 
           <appType>websubmit</appType>
+          <publicAdmin>false</publicAdmin>
+          <guestMode>false</guestMode>
 
           <!-- This will become a system configuration in time -->
@@ -203,4 +218,7 @@
 
           <appType>webpublic</appType>
+          <publicAdmin>false</publicAdmin>
+          <guestMode>true</guestMode>
+          <runAsUser>public-user</runAsUser>
 
           <!-- Default value for 24 hour mode -->
@@ -236,4 +254,7 @@
 
           <appType>webpublic</appType>
+          <publicAdmin>false</publicAdmin>
+          <guestMode>true</guestMode>
+          <runAsUser>public-user</runAsUser>
 
           <!-- Default value for 24 hour mode -->
@@ -266,4 +287,6 @@
 
           <appType>webuser</appType>
+          <publicAdmin>false</publicAdmin>
+          <guestMode>false</guestMode>
 
           <!-- Default value for 24 hour mode -->
@@ -288,4 +311,9 @@
              ================================================================== -->
         <Usercaldav classname="org.bedework.calfacade.configs.CalDAVConfig">
+          <publicAdmin>false</publicAdmin>
+          <guestMode>false</guestMode>
+
+          <sysintfImpl>org.bedework.caldav.bwserver.BwSysIntfImpl</sysintfImpl>
+
           <!-- Comment out or delete for no real time server to server service
                Currently under development and may present a security risk in
@@ -304,4 +332,10 @@
              ================================================================== -->
         <Pubcaldav classname="org.bedework.calfacade.configs.CalDAVConfig">
+          <publicAdmin>false</publicAdmin>
+          <guestMode>true</guestMode>
+          <runAsUser>public-user</runAsUser>
+
+          <sysintfImpl>org.bedework.caldav.bwserver.BwSysIntfImpl</sysintfImpl>
+
           <!-- Comment out or delete for no real time server to server service
                Currently under development and may present a security risk in
Index: trunk/config/configs/democal.properties
===================================================================
--- trunk/config/configs/democal.properties (revision 1914)
+++ trunk/config/configs/democal.properties (revision 1933)
@@ -4,12 +4,11 @@
 # Introduction
 #
+# All properties defined in this file are used at deploy time only. The options
+# xml file contains all run time propreties adn will be built in to the resulting
+# war files and runable components.
 #
 # Properties for all modules are saved below - even if they are not
 # being deployed. The globals section defines which modules will be
 # deployed as well as some other global properties.
-#
-# Note that the options and properties are undergoing yet another upheaval.
-# They will be divided into two parts, build-time ant properties in this file
-# and run-time application properties in a corresponding xxx.options.xml file.
 #
 # --------------------------------------------------------------------
@@ -38,9 +37,4 @@
 org.bedework.global.hibernate.cache.use_second_level_cache=false
 org.bedework.global.hibernate.cache.provider_class org.hibernate.cache.EhCacheProvider
-
-# This property is how the running system finds the system settings.
-# In theory we could have multiple settings with different names
-# The value here must match that in the options xml file.
-org.bedework.global.system.name=bedework
 
 # Uncomment this to enable building of a common context for common javascript.
@@ -208,6 +202,4 @@
 org.bedework.app.bwconfig.display.name=Bedework Config
 org.bedework.app.bwconfig.name=bwconfig
-org.bedework.app.bwconfig.guestmode=true
-org.bedework.app.bwconfig.publicadmin=false
 org.bedework.app.bwconfig.logprefix=BwConfig
 
@@ -221,5 +213,4 @@
 org.bedework.app.CalAdmin.sou.dir=webadmin
 org.bedework.app.CalAdmin.default.contenttype=text/xml
-org.bedework.app.CalAdmin.nogroupallowed=false
 #org.bedework.app.CalAdmin.portlet.name=CalAdmin
 
@@ -242,9 +233,4 @@
 org.bedework.app.CalAdmin.display.name=Public Events Administration
 org.bedework.app.CalAdmin.name=DemoCalAdmin
-
-org.bedework.app.CalAdmin.admingroupsidprefix=agrp_
-org.bedework.app.CalAdmin.guestmode=false
-org.bedework.app.CalAdmin.publicadmin=true
-org.bedework.app.CalAdmin.run.as.user=public-user
 
 #
@@ -278,7 +264,4 @@
 org.bedework.app.EventSubmit.name=DemoEventSubmit
 
-org.bedework.app.EventSubmit.guestmode=false
-org.bedework.app.EventSubmit.publicadmin=false
-
 #
 # --------------------------------------------------------------------
@@ -307,8 +290,4 @@
 org.bedework.app.Events.display.name=Demo calendar
 org.bedework.app.Events.name=DemoCal
-org.bedework.app.Events.run.as.user=public-user
-
-org.bedework.app.Events.guestmode=true
-org.bedework.app.Events.publicadmin=false
 
 #
@@ -338,8 +317,4 @@
 org.bedework.app.SoEDept.display.name=Demo departmental calendar
 org.bedework.app.SoEDept.name=SoEDept
-org.bedework.app.SoEDept.run.as.user=public-user
-
-org.bedework.app.SoEDept.guestmode=true
-org.bedework.app.SoEDept.publicadmin=false
 
 #
@@ -373,7 +348,4 @@
 org.bedework.app.UserCal.name=DemoUserCal
 
-org.bedework.app.UserCal.guestmode=false
-org.bedework.app.UserCal.publicadmin=false
-
 #
 # --------------------------------------------------------------------
@@ -398,9 +370,5 @@
 org.bedework.app.Pubcaldav.name=DemoPubcaldav
 org.bedework.app.Pubcaldav.deploy.dir=/webapps
-org.bedework.app.Pubcaldav.guestmode=true
-org.bedework.app.Pubcaldav.publicadmin=false
-org.bedework.app.Pubcaldav.run.as.user=public-user
 org.bedework.app.Pubcaldav.logprefix=PubCalDav
-org.bedework.app.Pubcaldav.sysintfimpl=org.bedework.caldav.bwserver.BwSysIntfImpl
 
 #
@@ -430,8 +398,5 @@
 org.bedework.app.Usercaldav.name=DemoUsrcaldav
 org.bedework.app.Usercaldav.deploy.dir=/webapps
-org.bedework.app.Usercaldav.guestmode=false
-org.bedework.app.Usercaldav.publicadmin=false
 org.bedework.app.Usercaldav.logprefix=UserCalDav
-org.bedework.app.Usercaldav.sysintfimpl=org.bedework.caldav.bwserver.BwSysIntfImpl
 
 #
Index: trunk/deployment/appjars.xml
===================================================================
--- trunk/deployment/appjars.xml (revision 1919)
+++ trunk/deployment/appjars.xml (revision 1933)
@@ -101,9 +101,61 @@
       <!-- Liferay -->
 
-      <getJar lib="${org.bedework.app.lib}"
-              name="liferay.util-bridges" version="4.2" />
-
-      <getJar lib="${org.bedework.app.lib}"
-              name="liferay.util-java" version="4.2" />
+      <if>
+        <isset property="org.bedework.build.for.liferay4" />
+        <then>
+          <getJar lib="${org.bedework.app.lib}"
+                  name="liferay.util-bridges" version="4.2" />
+
+          <getJar lib="${org.bedework.app.lib}"
+                  name="liferay.util-java" version="4.2" />
+        </then>
+      </if>
+
+      <if>
+        <isset property="org.bedework.build.for.liferay5" />
+        <then>
+          <getJar lib="${org.bedework.app.lib}"
+                  name="liferay.util-bridges" version="5.1" />
+
+          <getJar lib="${org.bedework.app.lib}"
+                  name="liferay.util-java" version="5.1" />
+
+          <getJar lib="${org.bedework.app.lib}"
+                  name="liferay.util-taglib" version="5.1" />
+
+          <getJar lib="${org.bedework.app.lib}"
+                  name="liferay.portal-impl" version="5.1" />
+
+          <getJar lib="${org.bedework.app.lib}"
+                  name="liferay.portal-kernel" version="5.1" />
+
+          <getJar lib="${org.bedework.app.lib}"
+                  name="liferay.spring" version="5.1" />
+
+          <getJar lib="${org.bedework.app.lib}"
+                  name="liferay.easyconf" version="5.1" />
+
+          <getJar lib="${org.bedework.app.lib}"
+                  name="liferay.portal-service" version="5.1" />
+
+          <getJar lib="${org.bedework.app.lib}"
+                  name="liferay.xstream" version="5.1" />
+
+          <getJar lib="${org.bedework.app.lib}"
+                  name="liferay.commons-lang" version="5.1" />
+
+          <getJar lib="${org.bedework.app.lib}"
+                  name="liferay.commons-collections" version="5.1" />
+
+          <getJar lib="${org.bedework.app.lib}"
+                  name="liferay.aspectj-weaver" version="5.1" />
+
+          <getJar lib="${org.bedework.app.lib}"
+                  name="liferay.portlet" version="5.1" />
+
+          <getJar lib="${org.bedework.app.lib}"
+                  name="commons-configuration" />
+        </then>
+      </if>
 
       <!-- Other commons apis -->
Index: trunk/deployment/freebusyAggregator/uportal2/build.xml
===================================================================
--- trunk/deployment/freebusyAggregator/uportal2/build.xml (revision 1105)
+++ trunk/deployment/freebusyAggregator/uportal2/build.xml (revision 1933)
@@ -14,6 +14,4 @@
     <property name="propval.directory.browsing.disallowed"
               value="${app.directory.browsing.disallowed}" />
-
-    <property name="propval.app.guestmode" value="true" />
 
     <dirname property="portlet.build.dir" file="${ant.file}"/>
Index: trunk/deployment/freebusyAggregator/webapp/build.xml
===================================================================
--- trunk/deployment/freebusyAggregator/webapp/build.xml (revision 1895)
+++ trunk/deployment/freebusyAggregator/webapp/build.xml (revision 1933)
@@ -31,6 +31,4 @@
     <property name="propval.directory.browsing.disallowed"
               value="${app.directory.browsing.disallowed}" />
-
-    <property name="propval.app.guestmode" value="true" />
 
     <property name="app.resources.dir"
Index: trunk/deployment/termination/liferay5/build.xml
===================================================================
---  (revision )
+++ trunk/deployment/termination/liferay5/build.xml (revision 1933)
@@ -1,0 +1,71 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+     Liferay 5 terminations tasks.
+     =================================================================== -->
+
+<project name="bwdeploy.termination" default="deploy" >
+  <import file="${org.bedework.deployment.base}/deployprops.xml" />
+
+  <dirname property="liferay5.term.dir" file="${ant.file}"/>
+
+  <target name="init">
+  </target>
+
+  <target name="deploy" depends="init,build.configured" >
+    <!--
+    <java classname="com.liferay.portal.tools.PortletDeployer"
+          fork="true"
+          newenvironment="true">
+      <classpath>
+        <pathelement path="${org.bedework.appjar.liferay.portal-impl}"/>
+        <pathelement path="${org.bedework.appjar.liferay.portal-kernel}"/>
+        <pathelement path="${org.bedework.appjar.liferay.util-java}"/>
+        <pathelement path="${org.bedework.appjar.commons-beanutils}"/>
+        <pathelement path="${org.bedework.appjar.liferay.commons-collections}"/>
+        <pathelement path="${org.bedework.appjar.commons-configuration}"/>
+        <pathelement path="${org.bedework.appjar.commons-digester}"/>
+        <pathelement path="${org.bedework.appjar.liferay.commons-lang}"/>
+        <pathelement path="${org.bedework.appjar.commons-logging}"/>
+        <pathelement path="${org.bedework.appjar.log4j}"/>
+        <pathelement path="${org.bedework.appjar.servletapi}"/>
+        <pathelement path="${org.bedework.appjar.servlet.jsp}"/>
+        <pathelement path="${org.bedework.appjar.liferay.spring}"/>
+        <pathelement path="${org.bedework.appjar.liferay.easyconf}"/>
+        <pathelement path="${org.bedework.appjar.liferay.portal-service}"/>
+        <pathelement path="${org.bedework.appjar.liferay.xstream}"/>
+        <pathelement path="${org.bedework.appjar.liferay.aspectj-weaver}"/>
+        <pathelement path="${org.bedework.appjar.liferay.portlet}"/>
+        <pathelement path="${org.bedework.appjar.hibernate}"/>
+      </classpath>
+
+      < ! - - Required Arguments - - >
+
+      <jvmarg value="-Ddeployer.base.dir=${dist.home}" />
+      <jvmarg value="-Ddeployer.dest.dir=${org.bedework.appserver.deploy.dir}" />
+      <jvmarg value="-Ddeployer.app.server.type=${org.bedework.global.liferay.server.type}" />
+      <jvmarg value="-Ddeployer.portlet.taglib.dtd=${liferay5.term.dir}/liferay-portlet.tld" />
+      <jvmarg value="-Ddeployer.unpack.war=true" />
+
+      < !  - - Optional Arguments
+
+      <jvmarg value="-Ddeployer.tomcat.lib.dir=${app.server.tomcat.lib.global.dir}" />
+      - - >
+
+      < ! - -  Dependent Libraries - - >
+
+      <arg value="${org.bedework.appjar.liferay.util-bridges}" />
+      <arg value="${org.bedework.appjar.liferay.util-java}" />
+      <arg value="${org.bedework.appjar.liferay.util-taglib}" />
+
+      < ! - - Specific WARs
+
+      <arg line="${deploy.specific.wars}" />
+       - - >
+    </java>
+ -->
+   </target>
+
+  <target name="build.configured" depends="init" >
+  </target>
+</project>
Index: trunk/deployment/termination/liferay5/liferay-portlet.tld
===================================================================
---  (revision )
+++ trunk/deployment/termination/liferay5/liferay-portlet.tld (revision 1933)
@@ -1,0 +1,158 @@
+<?xml version="1.0"?>
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+
+<taglib>
+	<tlib-version>1.0</tlib-version>
+	<jsp-version>1.1</jsp-version>
+	<short-name>portlet</short-name>
+	<uri>http://java.sun.com/portlet</uri>
+	<tag>
+		<name>actionURL</name>
+		<tag-class>com.liferay.taglib.portlet.ActionURLTag</tag-class>
+		<tei-class>com.liferay.taglib.portlet.ActionURLTei</tei-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>windowState</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>portletMode</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>var</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>secure</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>copyCurrentRenderParameters</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>escapeXml</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>name</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>defineObjects</name>
+		<tag-class>com.liferay.taglib.portlet.DefineObjectsTag</tag-class>
+		<tei-class>com.liferay.taglib.portlet.DefineObjectsTei</tei-class>
+		<body-content>empty</body-content>
+	</tag>
+	<tag>
+		<name>namespace</name>
+		<tag-class>com.liferay.taglib.portlet.NamespaceTag</tag-class>
+		<body-content>JSP</body-content>
+	</tag>
+	<tag>
+		<name>param</name>
+		<tag-class>com.liferay.taglib.util.ParamTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>name</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>value</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>property</name>
+		<tag-class>com.liferay.taglib.util.PropertyTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>name</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>value</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>renderURL</name>
+		<tag-class>com.liferay.taglib.portlet.RenderURLTag</tag-class>
+		<tei-class>com.liferay.taglib.portlet.RenderURLTei</tei-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>windowState</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>portletMode</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>var</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>secure</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>copyCurrentRenderParameters</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>escapeXml</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>resourceURL</name>
+		<tag-class>com.liferay.taglib.portlet.ResourceURLTag</tag-class>
+		<tei-class>com.liferay.taglib.portlet.ResourceURLTei</tei-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>var</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>secure</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>escapeXml</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>cacheability</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+</taglib>
Index: trunk/deployment/webadmin/jetspeed/build.xml
===================================================================
--- trunk/deployment/webadmin/jetspeed/build.xml (revision 1205)
+++ trunk/deployment/webadmin/jetspeed/build.xml (revision 1933)
@@ -16,6 +16,4 @@
     <property name="propval.directory.browsing.disallowed"
               value="${app.directory.browsing.disallowed}" />
-
-    <property name="propval.app.guestmode" value="false" />
 
     <dirname property="portlet.build.dir" file="${ant.file}"/>
Index: trunk/deployment/webadmin/liferay4/build.xml
===================================================================
--- trunk/deployment/webadmin/liferay4/build.xml (revision 1621)
+++ trunk/deployment/webadmin/liferay4/build.xml (revision 1933)
@@ -16,6 +16,4 @@
     <property name="propval.directory.browsing.disallowed"
               value="${app.directory.browsing.disallowed}" />
-
-    <property name="propval.app.guestmode" value="false" />
 
     <dirname property="portlet.build.dir" file="${ant.file}"/>
Index: trunk/deployment/webadmin/liferay5/build.xml
===================================================================
---  (revision )
+++ trunk/deployment/webadmin/liferay5/build.xml (revision 1933)
@@ -1,0 +1,58 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+     liferay5 portlet deployer
+     =================================================================== -->
+
+<project name="bwadmin.liferay5.deploy" default="deploy" >
+  <target name="init">
+    <!-- Properties that differ from the personal client -->
+    <!--
+    <property name="app.web.xml"
+              value="${app.sou.dir}/war/WEB-INF/web.xml" />
+              -->
+
+    <!-- This should be in the config stuff -->
+    <property name="propval.directory.browsing.disallowed"
+              value="${app.directory.browsing.disallowed}" />
+
+    <dirname property="portlet.build.dir" file="${ant.file}"/>
+
+    <property name="portlet.resources.dir"
+              location="${portlet.build.dir}/../portlet/resources" />
+
+    <!-- The intent is to have a set of quickstart skins configured for
+         portal use. So far we've not managed that so for th etime being we
+         will just use the standalone skin set.
+    <property name="portlet.skins.dir"
+              location="${portlet.resources.dir}/demoskins" />
+              -->
+    <property name="portlet.skins.dir"
+              location="${portlet.build.dir}/../webapp/resources/" />
+  </target>
+
+  <!-- =================================================================
+       The "deploy" target first builds a configured component then copies
+       all required files to the appropriate servlet container directories.
+
+       Currently this only works for the quickstart distribution.
+       For example, it does not handle deploying into jboss and copying
+       resource files (images, stylesheets) to external locations.
+       ================================================================= -->
+
+  <target name="deploy" depends="init,build.configured" >
+    <!-- Copy the resources into the server -->
+
+    <echo message="Copy from ${portlet.skins.dir}" />
+    <property name="dest.skins.dir"
+              location="${org.bedework.appserver.dir}/${propval.app.resources.dir}.${org.bedework.global.portal.platform}.${propval.app.cal.suite}" />
+    <delete dir="${dest.skins.dir}" />
+    <copy todir="${dest.skins.dir}">
+      <fileset dir="${portlet.skins.dir}" />
+    </copy>
+  </target>
+
+  <target name="build.configured" depends="init" >
+  </target>
+</project>
+
Index: trunk/deployment/webadmin/uportal2/build.xml
===================================================================
--- trunk/deployment/webadmin/uportal2/build.xml (revision 1621)
+++ trunk/deployment/webadmin/uportal2/build.xml (revision 1933)
@@ -16,6 +16,4 @@
     <property name="propval.directory.browsing.disallowed"
               value="${app.directory.browsing.disallowed}" />
-
-    <property name="propval.app.guestmode" value="false" />
 
     <dirname property="portlet.build.dir" file="${ant.file}"/>
Index: trunk/deployment/webconfig/webapp/build.xml
===================================================================
--- trunk/deployment/webconfig/webapp/build.xml (revision 1895)
+++ trunk/deployment/webconfig/webapp/build.xml (revision 1933)
@@ -33,6 +33,4 @@
     <property name="propval.directory.browsing.disallowed"
               value="${app.directory.browsing.disallowed}" />
-
-    <property name="propval.app.guestmode" value="true" />
 
     <property name="app.resources.dir"
Index: trunk/deployment/webpublic/jetspeed/build.xml
===================================================================
--- trunk/deployment/webpublic/jetspeed/build.xml (revision 1205)
+++ trunk/deployment/webpublic/jetspeed/build.xml (revision 1933)
@@ -16,6 +16,4 @@
     <property name="propval.directory.browsing.disallowed"
               value="${app.directory.browsing.disallowed}" />
-
-    <property name="propval.app.guestmode" value="true" />
 
     <dirname property="portlet.build.dir" file="${ant.file}"/>
Index: trunk/deployment/webpublic/liferay4/build.xml
===================================================================
--- trunk/deployment/webpublic/liferay4/build.xml (revision 1621)
+++ trunk/deployment/webpublic/liferay4/build.xml (revision 1933)
@@ -16,6 +16,4 @@
     <property name="propval.directory.browsing.disallowed"
               value="${app.directory.browsing.disallowed}" />
-
-    <property name="propval.app.guestmode" value="true" />
 
     <dirname property="portlet.build.dir" file="${ant.file}"/>
Index: trunk/deployment/webpublic/liferay5/build.xml
===================================================================
---  (revision )
+++ trunk/deployment/webpublic/liferay5/build.xml (revision 1933)
@@ -1,0 +1,58 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+     liferay5 portlet deployer
+     =================================================================== -->
+
+<project name="bwpublic.liferay5.deploy" default="deploy" >
+  <target name="init">
+    <!-- Properties that differ from the personal client -->
+    <!--
+    <property name="app.web.xml"
+              value="${app.sou.dir}/war/WEB-INF/web.xml" />
+              -->
+
+    <!-- This should be in the config stuff -->
+    <property name="propval.directory.browsing.disallowed"
+              value="${app.directory.browsing.disallowed}" />
+
+    <dirname property="portlet.build.dir" file="${ant.file}"/>
+
+    <property name="portlet.resources.dir"
+              location="${portlet.build.dir}/../portlet/resources" />
+
+    <!-- The intent is to have a set of quickstart skins configured for
+         portal use. So far we've not managed that so for th etime being we
+         will just use the standalone skin set.
+    <property name="portlet.skins.dir"
+              location="${portlet.resources.dir}/demoskins" />
+              -->
+    <property name="portlet.skins.dir"
+              location="${portlet.build.dir}/../webapp/resources/demoskins" />
+  </target>
+
+  <!-- =================================================================
+       The "deploy" target first builds a configured component then copies
+       all required files to the appropriate servlet container directories.
+
+       Currently this only works for the quickstart distribution.
+       For example, it does not handle deploying into jboss and copying
+       resource files (images, stylesheets) to external locations.
+       ================================================================= -->
+
+  <target name="deploy" depends="init,build.configured" >
+    <!-- Copy the resources into the server -->
+
+    <echo message="Copy from ${portlet.skins.dir}" />
+    <property name="dest.skins.dir"
+              location="${org.bedework.appserver.dir}/${propval.app.resources.dir}.${org.bedework.global.portal.platform}.${propval.app.cal.suite}" />
+    <delete dir="${dest.skins.dir}" />
+    <copy todir="${dest.skins.dir}">
+      <fileset dir="${portlet.skins.dir}" />
+    </copy>
+  </target>
+
+  <target name="build.configured" depends="init" >
+  </target>
+</project>
+
Index: trunk/deployment/webpublic/uportal2/build.xml
===================================================================
--- trunk/deployment/webpublic/uportal2/build.xml (revision 1621)
+++ trunk/deployment/webpublic/uportal2/build.xml (revision 1933)
@@ -16,6 +16,4 @@
     <property name="propval.directory.browsing.disallowed"
               value="${app.directory.browsing.disallowed}" />
-
-    <property name="propval.app.guestmode" value="true" />
 
     <dirname property="portlet.build.dir" file="${ant.file}"/>
Index: trunk/deployment/webpublic/webapp/build.xml
===================================================================
--- trunk/deployment/webpublic/webapp/build.xml (revision 1895)
+++ trunk/deployment/webpublic/webapp/build.xml (revision 1933)
@@ -34,6 +34,4 @@
     <property name="propval.directory.browsing.disallowed"
               value="${app.directory.browsing.disallowed}" />
-
-    <property name="propval.app.guestmode" value="true" />
 
     <property name="app.resources.dir"
Index: trunk/deployment/websubmit/jetspeed/build.xml
===================================================================
--- trunk/deployment/websubmit/jetspeed/build.xml (revision 1580)
+++ trunk/deployment/websubmit/jetspeed/build.xml (revision 1933)
@@ -16,6 +16,4 @@
               value="${app.sou.dir}/war/WEB-INF/web.xml" />
               -->
-
-    <property name="propval.app.guestmode" value="false" />
 
     <dirname property="portlet.build.dir" file="${ant.file}"/>
Index: trunk/deployment/websubmit/liferay4/build.xml
===================================================================
--- trunk/deployment/websubmit/liferay4/build.xml (revision 1580)
+++ trunk/deployment/websubmit/liferay4/build.xml (revision 1933)
@@ -16,6 +16,4 @@
               value="${app.sou.dir}/war/WEB-INF/web.xml" />
               -->
-
-    <property name="propval.app.guestmode" value="false" />
 
     <dirname property="portlet.build.dir" file="${ant.file}"/>
Index: trunk/deployment/websubmit/liferay5/build.xml
===================================================================
---  (revision )
+++ trunk/deployment/websubmit/liferay5/build.xml (revision 1933)
@@ -1,0 +1,60 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+     liferay5 portlet deployer
+     =================================================================== -->
+
+<project name="bwsubmit.liferay5.deploy" default="deploy" >
+  <target name="init">
+    <!-- and define some properties based on those -->
+    <property name="app.war.file"
+              location="${dist.home}/${propval.app.war.name}.war" />
+
+    <!-- Properties that differ from the personal client -->
+    <!--
+    <property name="app.web.xml"
+              value="${app.sou.dir}/war/WEB-INF/web.xml" />
+              -->
+
+    <dirname property="portlet.build.dir" file="${ant.file}"/>
+
+    <!-- Use generic portlet resources -->
+    <property name="portlet.resources.dir"
+              location="${portlet.build.dir}/../portlet/resources" />
+
+    <!-- The intent is to have a set of quickstart skins configured for
+         portal use. So far we've not managed that so for th etime being we
+         will just use the standalone skin set.
+    <property name="portlet.skins.dir"
+              location="${portlet.resources.dir}/demoskins" />
+              -->
+    <property name="portlet.skins.dir"
+              location="${portlet.build.dir}/../webapp/resources/demoskins" />
+  </target>
+
+  <!-- =================================================================
+       The "deploy" target first builds a configured component then copies
+       all required files to the appropriate servlet container directories.
+
+       Currently this only works for the quickstart distribution.
+       For example, it does not handle deploying into jboss and copying
+       resource files (images, stylesheets) to external locations.
+       ================================================================= -->
+
+  <target name="deploy" depends="init,build.configured" >
+    <!-- Copy the resources into the server -->
+
+    <echo message="Copy from ${portlet.skins.dir}" />
+    <property name="dest.skins.dir"
+              location="${org.bedework.appserver.dir}/${propval.app.resources.dir}.${org.bedework.global.portal.platform}" />
+    <echo message="       to ${dest.skins.dir}" />
+    <delete dir="${dest.skins.dir}" />
+    <copy todir="${dest.skins.dir}">
+      <fileset dir="${portlet.skins.dir}" />
+    </copy>
+  </target>
+
+  <target name="build.configured" depends="init" >
+  </target>
+</project>
+
Index: trunk/deployment/websubmit/uportal2/build.xml
===================================================================
--- trunk/deployment/websubmit/uportal2/build.xml (revision 1580)
+++ trunk/deployment/websubmit/uportal2/build.xml (revision 1933)
@@ -16,6 +16,4 @@
               value="${app.sou.dir}/war/WEB-INF/web.xml" />
               -->
-
-    <property name="propval.app.guestmode" value="false" />
 
     <dirname property="portlet.build.dir" file="${ant.file}"/>
Index: trunk/deployment/websubmit/webapp/build.xml
===================================================================
--- trunk/deployment/websubmit/webapp/build.xml (revision 1895)
+++ trunk/deployment/websubmit/webapp/build.xml (revision 1933)
@@ -30,6 +30,4 @@
               value="${app.sou.dir}/war/WEB-INF/web.xml" />
               -->
-
-    <property name="propval.app.guestmode" value="false" />
 
     <property name="app.resources.dir"
Index: trunk/deployment/webuser/jetspeed/build.xml
===================================================================
--- trunk/deployment/webuser/jetspeed/build.xml (revision 1205)
+++ trunk/deployment/webuser/jetspeed/build.xml (revision 1933)
@@ -16,6 +16,4 @@
               value="${app.sou.dir}/war/WEB-INF/web.xml" />
               -->
-
-    <property name="propval.app.guestmode" value="false" />
 
     <dirname property="portlet.build.dir" file="${ant.file}"/>
Index: trunk/deployment/webuser/liferay4/build.xml
===================================================================
--- trunk/deployment/webuser/liferay4/build.xml (revision 1213)
+++ trunk/deployment/webuser/liferay4/build.xml (revision 1933)
@@ -17,6 +17,4 @@
               -->
 
-    <property name="propval.app.guestmode" value="false" />
-
     <dirname property="portlet.build.dir" file="${ant.file}"/>
 
@@ -26,5 +24,5 @@
 
     <!-- The intent is to have a set of quickstart skins configured for
-         portal use. So far we've not managed that so for th etime being we
+         portal use. So far we've not managed that so for the time being we
          will just use the standalone skin set.
     <property name="portlet.skins.dir"
Index: trunk/deployment/webuser/liferay5/build.xml
===================================================================
---  (revision )
+++ trunk/deployment/webuser/liferay5/build.xml (revision 1933)
@@ -1,0 +1,60 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+     liferay5 portlet deployer
+     =================================================================== -->
+
+<project name="bwpersonal.liferay5.deploy" default="deploy" >
+  <target name="init">
+    <!-- and define some properties based on those -->
+    <property name="app.war.file"
+              location="${dist.home}/${propval.app.war.name}.war" />
+
+    <!-- Properties that differ from the personal client -->
+    <!--
+    <property name="app.web.xml"
+              value="${app.sou.dir}/war/WEB-INF/web.xml" />
+              -->
+
+    <dirname property="portlet.build.dir" file="${ant.file}"/>
+
+    <!-- Use generic portlet resources -->
+    <property name="portlet.resources.dir"
+              location="${portlet.build.dir}/../portlet/resources" />
+
+    <!-- The intent is to have a set of quickstart skins configured for
+         portal use. So far we've not managed that so for the time being we
+         will just use the standalone skin set.
+    <property name="portlet.skins.dir"
+              location="${portlet.resources.dir}/demoskins" />
+              -->
+    <property name="portlet.skins.dir"
+              location="${portlet.build.dir}/../webapp/resources/demoskins" />
+  </target>
+
+  <!-- =================================================================
+       The "deploy" target first builds a configured component then copies
+       all required files to the appropriate servlet container directories.
+
+       Currently this only works for the quickstart distribution.
+       For example, it does not handle deploying into jboss and copying
+       resource files (images, stylesheets) to external locations.
+       ================================================================= -->
+
+  <target name="deploy" depends="init,build.configured" >
+    <!-- Copy the resources into the server -->
+
+    <echo message="Copy from ${portlet.skins.dir}" />
+    <property name="dest.skins.dir"
+              location="${org.bedework.appserver.dir}/${propval.app.resources.dir}.${org.bedework.global.portal.platform}" />
+    <echo message="       to ${dest.skins.dir}" />
+    <delete dir="${dest.skins.dir}" />
+    <copy todir="${dest.skins.dir}">
+      <fileset dir="${portlet.skins.dir}" />
+    </copy>
+  </target>
+
+  <target name="build.configured" depends="init" >
+  </target>
+</project>
+
Index: trunk/deployment/webuser/uportal2/build.xml
===================================================================
--- trunk/deployment/webuser/uportal2/build.xml (revision 1621)
+++ trunk/deployment/webuser/uportal2/build.xml (revision 1933)
@@ -17,6 +17,4 @@
               -->
 
-    <property name="propval.app.guestmode" value="false" />
-
     <dirname property="portlet.build.dir" file="${ant.file}"/>
 
@@ -26,5 +24,5 @@
 
     <!-- The intent is to have a set of quickstart skins configured for
-         portal use. So far we've not managed that so for th etime being we
+         portal use. So far we've not managed that so for the time being we
          will just use the standalone skin set.
     <property name="portlet.skins.dir"
Index: trunk/deployment/webuser/webapp/build.xml
===================================================================
--- trunk/deployment/webuser/webapp/build.xml (revision 1895)
+++ trunk/deployment/webuser/webapp/build.xml (revision 1933)
@@ -30,6 +30,4 @@
               value="${app.sou.dir}/war/WEB-INF/web.xml" />
               -->
-
-    <property name="propval.app.guestmode" value="false" />
 
     <property name="app.resources.dir"