Index: freebusy/trunk/webclient/build.xml
===================================================================
--- freebusy/trunk/webclient/build.xml (revision 671)
+++ freebusy/trunk/webclient/build.xml (revision 674)
@@ -50,5 +50,5 @@
     </path>
 
-    <property name="build.jar.file" location="${org.bedework.fbwebclient.jar}" />
+    <property name="build.jar.file" location="${org.bedework.fbaggregator.jar}" />
 
     <ant antfile="${buildjar}" inheritRefs="true" target="build" />
Index: freebusy/trunk/webclient/src/org/bedework/fbaggregator/FBAggAction.java
===================================================================
--- freebusy/trunk/webclient/src/org/bedework/fbaggregator/FBAggAction.java (revision 671)
+++ freebusy/trunk/webclient/src/org/bedework/fbaggregator/FBAggAction.java (revision 674)
@@ -83,4 +83,6 @@
     FbAggForm form = (FbAggForm)frm;
 
+    setConfig(request, form);
+
     FbAggSession s = getState(request);
     if (s != null) {
@@ -112,6 +114,4 @@
     }
 
-    setConfig(request, form);
-
     forward = doAction(request, response, s, form);
 
Index: freebusy/trunk/webclient/src/org/bedework/fbaggregator/FBInfoSet.java
===================================================================
--- freebusy/trunk/webclient/src/org/bedework/fbaggregator/FBInfoSet.java (revision 666)
+++ freebusy/trunk/webclient/src/org/bedework/fbaggregator/FBInfoSet.java (revision 674)
@@ -59,15 +59,18 @@
                          "/ucaldav/user/testuser02"));
                          */
-    addInfo(new FBUserInfo("douglm", "douglm", "bedework",
-                         "localhost", 8080, false,
-                         "/ucaldav/user/douglm"));
-/*
-    addInfo(new UserInfo("testuser02", "testuser02", "bedework",
-                         "www.bedework.org", 80, false,
-                         "/ucaldav/user/testuser02"));
-    addInfo(new UserInfo("testuser08", "testuser08", "bedework",
-                         "www.bedework.org", 80, false,
-                         "/ucaldav/user/testuser08"));
-*/
+    addInfo(new FBUserInfo("douglm@rpi.edu", "douglm", "bedework",
+                           "localhost", 8080, false,
+                           "/ucaldav/user/douglm"));
+    addInfo(new FBUserInfo("johnsa@rpi.edu", "johnsa", "bedework",
+                           "localhost", 8080, false,
+                           "/ucaldav/user/johnsa"));
+    /*
+    addInfo(new FBUserInfo("testuser02", "testuser02", "bedework",
+                           "www.bedework.org", 80, false,
+                           "/ucaldav/user/testuser02"));
+    addInfo(new FBUserInfo("testuser08", "testuser08", "bedework",
+                           "www.bedework.org", 80, false,
+                           "/ucaldav/user/testuser08"));
+                           */
   }
 
Index: freebusy/trunk/webclient/war/WEB-INF/struts-config.xml
===================================================================
--- freebusy/trunk/webclient/war/WEB-INF/struts-config.xml (revision 672)
+++ freebusy/trunk/webclient/war/WEB-INF/struts-config.xml (revision 674)
@@ -34,5 +34,5 @@
     <action    path="/showMain"
                type="org.bedework.fbaggregator.RenderAction"
-               name="configForm"
+               name="bwForm"
                scope="session"
                validate="false">
@@ -43,5 +43,5 @@
                type="org.bedework.fbaggregator.RenderAction"
                unknown="true"
-               name="configForm"
+               name="bwForm"
                scope="session"
                validate="false">
@@ -50,5 +50,5 @@
     <action    path="/showFreeBusy"
                type="org.bedework.fbaggregator.RenderAction"
-               name="configForm"
+               name="bwForm"
                scope="session"
                validate="false">
@@ -62,5 +62,5 @@
     <action    path="/getFreeBusy"
                type="org.bedework.fbaggregator.GetFreeBusy"
-               name="configForm"
+               name="bwForm"
                scope="session"
                validate="false">
@@ -70,5 +70,5 @@
     <action    path="/addUser"
                type="org.bedework.fbaggregator.AddUser"
-               name="configForm"
+               name="bwForm"
                scope="session"
                validate="false">
Index: freebusy/trunk/webclient/war/WEB-INF/web.xml
===================================================================
--- freebusy/trunk/webclient/war/WEB-INF/web.xml (revision 669)
+++ freebusy/trunk/webclient/war/WEB-INF/web.xml (revision 674)
@@ -34,4 +34,8 @@
       <param-value>@DIRECTORY-BROWSING-DISALLOWED@</param-value>
     </init-param>
+    <init-param>
+      <param-name>ignoreContentType</param-name>
+      <param-value>@IGNORE-CONTENT-TYPE@</param-value>
+    </init-param>
   </filter>
 
@@ -51,9 +55,29 @@
     <servlet-name>action</servlet-name>
     <servlet-class>
-      org.apache.struts.action.ActionServlet
+      @SERVLET-CLASS@
     </servlet-class>
 
     <load-on-startup>1</load-on-startup>
   </servlet>
+
+  <!-- Servlet definition for portlet use. uportal only at the moment -->
+  <servlet>
+    <servlet-name>@PORTLET-NAME@</servlet-name>
+    <display-name>@PORTLET-NAME@ Wrapper</display-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-class</param-name>
+      <param-value>org.apache.portals.bridges.struts.StrutsPortlet</param-value>
+    </init-param>
+    <init-param>
+      <param-name>portlet-guid</param-name>
+      <param-value>@CONTEXT-ROOT@.@PORTLET-NAME@</param-value>
+    </init-param>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>action</servlet-name>
+    <url-pattern>*.gdo</url-pattern>
+  </servlet-mapping>
 
   <servlet-mapping>
@@ -66,4 +90,6 @@
     <url-pattern>*.do</url-pattern>
   </servlet-mapping>
+
+  <!-- uPortal2 portlet servlet mapping here -->
 
   <session-config>
@@ -79,5 +105,5 @@
 
   <jsp-config>
-    <!-- Reference a taglib in the jsp like this:
+    <!--  Reference a taglib in the jsp like this:
       <%@ taglib uri="struts-bean" prefix="bean" %>
      -->
@@ -91,9 +117,10 @@
       <taglib-location>/WEB-INF/tlds/struts-html.tld</taglib-location>
     </taglib>
-    <!-- use html struts tag library for genurl -->
+
     <taglib>
       <taglib-uri>struts-genurl</taglib-uri>
-      <taglib-location>/WEB-INF/tlds/struts-html.tld</taglib-location>
+      <taglib-location>/WEB-INF/tlds/@GENURL-TAGLIB-TLD@</taglib-location>
     </taglib>
+
     <taglib>
       <taglib-uri>struts-logic</taglib-uri>
@@ -104,5 +131,24 @@
       <taglib-location>/WEB-INF/tlds/struts-template.tld</taglib-location>
     </taglib>
+
+    <taglib>
+      <taglib-uri>bedework</taglib-uri>
+      <taglib-location>/WEB-INF/tlds/bedework.tld</taglib-location>
+    </taglib>
+
+    <!-- Only used for portlet -->
+    <taglib>
+        <taglib-uri>http://java.sun.com/portlet</taglib-uri>
+        <taglib-location>/WEB-INF/tlds/pluto-portlet.tld</taglib-location>
+    </taglib>
   </jsp-config>
+
+  <!-- JDBC DataSources (java:comp/env/jdbc) -->
+  <resource-ref>
+    <description>The calendar DS</description>
+    <res-ref-name>jdbc/calDB</res-ref-name>
+    <res-type>javax.sql.DataSource</res-type>
+    <res-auth>Container</res-auth>
+  </resource-ref>
 
   <!-- Insert ejb-ref here -->
Index: freebusy/trunk/webclient/war/docs/error.jsp
===================================================================
--- freebusy/trunk/webclient/war/docs/error.jsp (revision 671)
+++ freebusy/trunk/webclient/war/docs/error.jsp (revision 674)
@@ -10,8 +10,8 @@
   </head>
   <body>
-    <logic:notEmpty name="configForm" property="err.msgList">
+    <logic:notEmpty name="bwForm" property="err.msgList">
       <p>The following errors occurred:</p>
       <ul>
-      <logic:iterate id="errBean" name="configForm" property="err.msgList">
+      <logic:iterate id="errBean" name="bwForm" property="err.msgList">
         <li><bean:write name="errBean" property="msg" filter="no" /></li>
       </logic:iterate>
@@ -19,7 +19,7 @@
     </logic:notEmpty>
 
-    <logic:notEmpty name="configForm" property="msg.msgList">
+    <logic:notEmpty name="bwForm" property="msg.msgList">
       <bean:message key="messages.header" />
-      <logic:iterate id="msgBean" name="configForm" property="msg.msgList">
+      <logic:iterate id="msgBean" name="bwForm" property="msg.msgList">
         <li><bean:write name="msgBean" property="msg" filter="no" /></li>
       </logic:iterate>