[Bedework-commit] r628 - in trunk/calendar3: config/configs deployment/webpublic/uportal2 deployment/webuser/uportal2

[svnadmin at bedework.org]

Author: douglm
Date: 2006-06-22 12:23:21 -0400 (Thu, 22 Jun 2006)
New Revision: 628

Modified:
   trunk/calendar3/config/configs/democal.properties
   trunk/calendar3/deployment/webpublic/uportal2/build.xml
   trunk/calendar3/deployment/webuser/uportal2/build.xml
Log:
Fix build so that portal skins get deployed correctly.

Remove unused property from config.

Modified: trunk/calendar3/config/configs/democal.properties
===================================================================
--- trunk/calendar3/config/configs/democal.properties	2006-06-22 13:37:00 UTC (rev 627)
+++ trunk/calendar3/config/configs/democal.properties	2006-06-22 16:23:21 UTC (rev 628)
@@ -114,7 +114,6 @@
 org.bedework.app.Events.name=DemoCal
 org.bedework.app.Events.run.as.user=public-user
 
-org.bedework.app.Events.skinset.name=demoskins
 org.bedework.app.Events.guestmode=true
 org.bedework.app.Events.publicadmin=false
 
@@ -140,7 +139,6 @@
 org.bedework.app.SoEDept.name=SoEDept
 org.bedework.app.SoEDept.run.as.user=public-user
 
-org.bedework.app.SoEDept.skinset.name=demoskins
 org.bedework.app.SoEDept.guestmode=true
 org.bedework.app.SoEDept.publicadmin=false
 
@@ -168,7 +166,6 @@
 org.bedework.app.UserCal.display.name=Bedework
 org.bedework.app.UserCal.name=DemoUserCal
 
-org.bedework.app.UserCal.skinset.name=demoskins
 org.bedework.app.UserCal.guestmode=false
 org.bedework.app.UserCal.publicadmin=false
 

Modified: trunk/calendar3/deployment/webpublic/uportal2/build.xml
===================================================================
--- trunk/calendar3/deployment/webpublic/uportal2/build.xml	2006-06-22 13:37:00 UTC (rev 627)
+++ trunk/calendar3/deployment/webpublic/uportal2/build.xml	2006-06-22 16:23:21 UTC (rev 628)
@@ -6,17 +6,6 @@
 
 <project name="bwpublic.uportal2.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" />
-
-    <dirname property="this.dir" file="${ant.file}"/>
-
-    <property name="app.sou.dir" location="${org.bedework.webclient.base}" />
-
-    <!-- Flag as struts -->
-    <property name="org.bedework.strutsapp" value="true" />
-
     <!-- Properties that differ from the personal client -->
     <property name="app.web.xml"
               value="${app.sou.dir}/war/WEB-INF/publicweb.xml" />
@@ -27,8 +16,13 @@
 
     <property name="propval.app.guestmode" value="true" />
 
-    <property name="app.resources.dir"
-              location="${this.dir}/resources" />
+    <dirname property="portlet.build.dir" file="${ant.file}"/>
+
+    <property name="portlet.resources.dir"
+              location="${portlet.build.dir}/resources" />
+
+    <property name="portlet.skins.dir"
+              location="${portlet.resources.dir}/demoskins/${propval.app.cal.suite}" />
   </target>
 
   <!-- =================================================================
@@ -42,10 +36,13 @@
 
   <target name="deploy" depends="init,build.configured" >
     <!-- Copy the resources into the server -->
-    <echo message="###################${app.resources.dir}/${propval.app.skinset.name}" />
-    <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}.${propval.app.portal.platform}.${propval.app.cal.suite}" />
-    <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}.${propval.app.portal.platform}.${propval.app.cal.suite}">
-      <fileset dir="${app.resources.dir}/demoskins/${propval.app.cal.suite}" />
+
+    <echo message="Copy from ${portlet.skins.dir}" />
+    <property name="dest.skins.dir"
+              location="${org.bedework.appserver.dir}/${propval.app.resources.dir}.${propval.app.portal.platform}.${propval.app.cal.suite}" />
+    <delete dir="${dest.skins.dir}" />
+    <copy todir="${dest.skins.dir}">
+      <fileset dir="${portlet.skins.dir}" />
     </copy>
   </target>
 

Modified: trunk/calendar3/deployment/webuser/uportal2/build.xml
===================================================================
--- trunk/calendar3/deployment/webuser/uportal2/build.xml	2006-06-22 13:37:00 UTC (rev 627)
+++ trunk/calendar3/deployment/webuser/uportal2/build.xml	2006-06-22 16:23:21 UTC (rev 628)
@@ -10,21 +10,19 @@
     <property name="app.war.file"
               location="${dist.home}/${propval.app.war.name}.war" />
 
-    <dirname property="this.dir" file="${ant.file}"/>
-
-    <property name="app.sou.dir" location="${org.bedework.webclient.base}" />
-
-    <!-- Flag as struts -->
-    <property name="org.bedework.strutsapp" value="true" />
-
     <!-- Properties that differ from the personal client -->
     <property name="app.web.xml"
               value="${app.sou.dir}/war/WEB-INF/userweb.xml" />
 
     <property name="propval.app.guestmode" value="false" />
 
-    <property name="app.resources.dir"
-              location="${this.dir}/resources" />
+    <dirname property="portlet.build.dir" file="${ant.file}"/>
+
+    <property name="portlet.resources.dir"
+              location="${portlet.build.dir}/resources" />
+
+    <property name="portlet.skins.dir"
+              location="${portlet.resources.dir}/demoskins" />
   </target>
 
   <!-- =================================================================
@@ -38,10 +36,13 @@
 
   <target name="deploy" depends="init,build.configured" >
     <!-- Copy the resources into the server -->
-    <echo message="###################${app.resources.dir}/${propval.app.skinset.name}" />
-    <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}.${propval.app.portal.platform}" />
-    <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}.${propval.app.portal.platform}">
-      <fileset dir="${app.resources.dir}/demoskins" />
+
+    <echo message="Copy from ${portlet.skins.dir}" />
+    <property name="dest.skins.dir"
+              location="${org.bedework.appserver.dir}/${propval.app.resources.dir}.${propval.app.portal.platform}" />
+    <delete dir="${dest.skins.dir}" />
+    <copy todir="${dest.skins.dir}">
+      <fileset dir="${portlet.skins.dir}" />
     </copy>
   </target>