[Commits] (bcm) moved remaining org.osaf.chandler.server packages to org.osaf.cosmo. moved jsp

commits at osafoundation.org commits at osafoundation.org
Fri Apr 8 16:53:34 PDT 2005


Commit by: bcm
Modified files:
server/build.xml 1.28 1.29
server/shared.properties 1.16 1.17
server/bin/cosmoctl None 1.1
server/bin/chandlerctl 1.3 None
server/core/build.xml 1.13 1.14
server/core/etc/applicationContext-base.xml 1.2 1.3
server/core/etc/applicationContext-hibernate.xml 1.1 1.2
server/core/etc/applicationContext-jcr-client.xml 1.5 1.6
server/core/etc/applicationContext-manager.xml 1.1 1.2
server/core/etc/ehcache.xml 1.1 1.2
server/core/etc/applicationContext-slide-client.xml 1.1 None
server/core/etc/applicationContext-webdav-client.xml 1.2 None
server/core/etc/chandler.properties 1.4 None
server/core/src/chsrv-core.tld 1.5 None
server/core/src/org/osaf/chandler/server/dao/DAO.java 1.1.1.1 None
server/core/src/org/osaf/chandler/server/dao/RoleDAO.java 1.2 None
server/core/src/org/osaf/chandler/server/dao/ShareDAO.java 1.2 None
server/core/src/org/osaf/chandler/server/dao/UserDAO.java 1.2 None
server/core/src/org/osaf/chandler/server/dao/hibernate/RoleDAOHibernate.java 1.3 None
server/core/src/org/osaf/chandler/server/dao/hibernate/UserDAOHibernate.java 1.3 None
server/core/src/org/osaf/chandler/server/dao/jcr/ContentStoreDAOJCR.java 1.3 None
server/core/src/org/osaf/chandler/server/dao/slide/ShareDAOSlide.java 1.2 None
server/core/src/org/osaf/chandler/server/dao/slide/SlideConstants.java 1.2 None
server/core/src/org/osaf/chandler/server/dao/slide/SlideDaoSupport.java 1.2 None
server/core/src/org/osaf/chandler/server/jsp/tag/UserTag.java 1.3 None
server/core/src/org/osaf/chandler/server/manager/Manager.java 1.1.1.1 None
server/core/src/org/osaf/chandler/server/manager/ProvisioningManager.java 1.4 None
server/core/src/org/osaf/chandler/server/manager/impl/ProvisioningManagerImpl.java 1.8 None
server/core/src/org/osaf/chandler/server/model/BaseModelObject.java 1.1.1.1 None
server/core/src/org/osaf/chandler/server/model/Role.java 1.4 None
server/core/src/org/osaf/chandler/server/model/User.java 1.5 None
server/core/src/org/osaf/cosmo/dao/DAO.java None 1.1
server/core/src/org/osaf/cosmo/dao/RoleDAO.java None 1.1
server/core/src/org/osaf/cosmo/dao/ShareDAO.java None 1.1
server/core/src/org/osaf/cosmo/dao/UserDAO.java None 1.1
server/core/src/org/osaf/cosmo/dao/hibernate/RoleDAOHibernate.java None 1.1
server/core/src/org/osaf/cosmo/dao/hibernate/UserDAOHibernate.java None 1.1
server/core/src/org/osaf/cosmo/dao/jcr/ContentStoreDAOJCR.java None 1.1
server/core/src/org/osaf/cosmo/jackrabbit/CosmoAccessManager.java 1.5 1.6
server/core/src/org/osaf/cosmo/manager/Manager.java None 1.1
server/core/src/org/osaf/cosmo/manager/ProvisioningManager.java None 1.1
server/core/src/org/osaf/cosmo/manager/impl/ProvisioningManagerImpl.java None 1.1
server/core/src/org/osaf/cosmo/model/BaseModelObject.java None 1.1
server/core/src/org/osaf/cosmo/model/Role.java None 1.1
server/core/src/org/osaf/cosmo/model/User.java None 1.1
server/core/src/org/osaf/cosmo/security/CosmoSecurityContext.java 1.2 1.3
server/core/src/org/osaf/cosmo/security/CosmoUserDetails.java 1.2 1.3
server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityContextImpl.java 1.3 1.4
server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityManagerImpl.java 1.3 1.4
server/core/src/org/osaf/cosmo/security/impl/CosmoUserDetailsImpl.java 1.1 1.2
server/core/src/org/osaf/spring/webdav/HttpURLFactoryBean.java 1.1.1.1 None
server/core/src/org/osaf/spring/webdav/WebdavResourceNotFoundException.java 1.1.1.1 None
server/core/src/org/osaf/spring/webdav/WebdavSystemException.java 1.1.1.1 None
server/core/src/org/osaf/spring/webdav/WebdavTemplate.java 1.3 None
server/core/src/org/osaf/spring/webdav/support/WebdavDaoSupport.java 1.1.1.1 None
server/docs/TODO.txt 1.46 1.47
server/etc/cosmo.xml 1.1 1.2
server/etc/server.xml 1.16 1.17
server/etc/console.xml 1.8 None
server/etc/share.xml 1.3 None
server/etc/webdav.xml 1.4 None
server/web/build.xml 1.2 1.3
server/web/etc/applicationContext-adapter-dav.xml 1.1 1.2
server/web/src/cosmo.tld None 1.1
server/web/src/org/osaf/cosmo/ui/CosmoErrorAction.java 1.1 1.2
server/web/src/org/osaf/cosmo/ui/UserAction.java 1.1 1.2
server/web/src/org/osaf/cosmo/ui/jsp/tag/UserTag.java None 1.1
server/web/web/cosmo.css None 1.1
server/web/web/chandler.css 1.2 None
server/web/web/WEB-INF/struts-config.xml 1.3 1.4
server/web/web/WEB-INF/web.xml 1.2 1.3
server/web/web/WEB-INF/jsp/layout.jsp 1.3 1.4
server/web/web/WEB-INF/tags/homedir.tag 1.1 1.2

Log message:
moved remaining org.osaf.chandler.server packages to org.osaf.cosmo. moved jsp
taglib from core into ui. renamed chandlerctl to cosmoctl. generally
removed all vestiges of the chandler name from the product.

removed properties file and hardcoded jndi names into various config files.
this is a fine way to declare deployment dependencies, and i was on crack for
trying to manage it with properties. the server will be clearly documented to
require a db pool at jdbc/cosmo and a repository factory at
jcr/repositoryFactory. cosmoVersion is an environment entry found at
cosmo/version.

removed webdav and slide stuff from core. the transition to jcr is complete.

moved all cosmo-specific server config into cosmo.xml context config file. now
server.xml just has general server info in it. this readies us for deploying
the caldav web ui into the cosmo app server.


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/server/build.xml.diff?r1=text&tr1=1.28&r2=text&tr2=1.29
http://cvs.osafoundation.org/index.cgi/server/shared.properties.diff?r1=text&tr1=1.16&r2=text&tr2=1.17
http://cvs.osafoundation.org/index.cgi/server/bin/cosmoctl?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/bin/chandlerctl.diff?r1=text&tr1=1.3&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/build.xml.diff?r1=text&tr1=1.13&r2=text&tr2=1.14
http://cvs.osafoundation.org/index.cgi/server/core/etc/applicationContext-base.xml.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
http://cvs.osafoundation.org/index.cgi/server/core/etc/applicationContext-hibernate.xml.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/core/etc/applicationContext-jcr-client.xml.diff?r1=text&tr1=1.5&r2=text&tr2=1.6
http://cvs.osafoundation.org/index.cgi/server/core/etc/applicationContext-manager.xml.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/core/etc/ehcache.xml.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/core/etc/applicationContext-slide-client.xml.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/etc/applicationContext-webdav-client.xml.diff?r1=text&tr1=1.2&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/etc/chandler.properties.diff?r1=text&tr1=1.4&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/src/chsrv-core.tld.diff?r1=text&tr1=1.5&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/chandler/server/dao/DAO.java.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/chandler/server/dao/RoleDAO.java.diff?r1=text&tr1=1.2&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/chandler/server/dao/ShareDAO.java.diff?r1=text&tr1=1.2&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/chandler/server/dao/UserDAO.java.diff?r1=text&tr1=1.2&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/chandler/server/dao/hibernate/RoleDAOHibernate.java.diff?r1=text&tr1=1.3&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/chandler/server/dao/hibernate/UserDAOHibernate.java.diff?r1=text&tr1=1.3&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/chandler/server/dao/jcr/ContentStoreDAOJCR.java.diff?r1=text&tr1=1.3&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/chandler/server/dao/slide/ShareDAOSlide.java.diff?r1=text&tr1=1.2&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/chandler/server/dao/slide/SlideConstants.java.diff?r1=text&tr1=1.2&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/chandler/server/dao/slide/SlideDaoSupport.java.diff?r1=text&tr1=1.2&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/chandler/server/jsp/tag/UserTag.java.diff?r1=text&tr1=1.3&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/chandler/server/manager/Manager.java.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/chandler/server/manager/ProvisioningManager.java.diff?r1=text&tr1=1.4&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/chandler/server/manager/impl/ProvisioningManagerImpl.java.diff?r1=text&tr1=1.8&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/chandler/server/model/BaseModelObject.java.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/chandler/server/model/Role.java.diff?r1=text&tr1=1.4&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/chandler/server/model/User.java.diff?r1=text&tr1=1.5&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/cosmo/dao/DAO.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/cosmo/dao/RoleDAO.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/cosmo/dao/ShareDAO.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/cosmo/dao/UserDAO.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/cosmo/dao/hibernate/RoleDAOHibernate.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/cosmo/dao/hibernate/UserDAOHibernate.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/cosmo/dao/jcr/ContentStoreDAOJCR.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/cosmo/jackrabbit/CosmoAccessManager.java.diff?r1=text&tr1=1.5&r2=text&tr2=1.6
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/cosmo/manager/Manager.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/cosmo/manager/ProvisioningManager.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/cosmo/manager/impl/ProvisioningManagerImpl.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/cosmo/model/BaseModelObject.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/cosmo/model/Role.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/cosmo/model/User.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/cosmo/security/CosmoSecurityContext.java.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/cosmo/security/CosmoUserDetails.java.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityContextImpl.java.diff?r1=text&tr1=1.3&r2=text&tr2=1.4
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityManagerImpl.java.diff?r1=text&tr1=1.3&r2=text&tr2=1.4
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/cosmo/security/impl/CosmoUserDetailsImpl.java.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/spring/webdav/HttpURLFactoryBean.java.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/spring/webdav/WebdavResourceNotFoundException.java.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/spring/webdav/WebdavSystemException.java.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/spring/webdav/WebdavTemplate.java.diff?r1=text&tr1=1.3&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/spring/webdav/support/WebdavDaoSupport.java.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/docs/TODO.txt.diff?r1=text&tr1=1.46&r2=text&tr2=1.47
http://cvs.osafoundation.org/index.cgi/server/etc/cosmo.xml.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/etc/server.xml.diff?r1=text&tr1=1.16&r2=text&tr2=1.17
http://cvs.osafoundation.org/index.cgi/server/etc/console.xml.diff?r1=text&tr1=1.8&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/etc/share.xml.diff?r1=text&tr1=1.3&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/etc/webdav.xml.diff?r1=text&tr1=1.4&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/web/build.xml.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
http://cvs.osafoundation.org/index.cgi/server/web/etc/applicationContext-adapter-dav.xml.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/web/src/cosmo.tld?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/web/src/org/osaf/cosmo/ui/CosmoErrorAction.java.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/web/src/org/osaf/cosmo/ui/UserAction.java.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/web/src/org/osaf/cosmo/ui/jsp/tag/UserTag.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/web/web/cosmo.css?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/web/web/chandler.css.diff?r1=text&tr1=1.2&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/web/web/WEB-INF/struts-config.xml.diff?r1=text&tr1=1.3&r2=text&tr2=1.4
http://cvs.osafoundation.org/index.cgi/server/web/web/WEB-INF/web.xml.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
http://cvs.osafoundation.org/index.cgi/server/web/web/WEB-INF/jsp/layout.jsp.diff?r1=text&tr1=1.3&r2=text&tr2=1.4
http://cvs.osafoundation.org/index.cgi/server/web/web/WEB-INF/tags/homedir.tag.diff?r1=text&tr1=1.1&r2=text&tr2=1.2

Index: server/core/etc/applicationContext-manager.xml
diff -u server/core/etc/applicationContext-manager.xml:1.1 server/core/etc/applicationContext-manager.xml:1.2
--- server/core/etc/applicationContext-manager.xml:1.1	Thu Mar 17 19:26:16 2005
+++ server/core/etc/applicationContext-manager.xml	Fri Apr  8 16:53:16 2005
@@ -8,7 +8,7 @@
   <!-- Managers -->
 
   <bean id="provisioningManagerTarget"
-        class="org.osaf.chandler.server.manager.impl.ProvisioningManagerImpl">
+        class="org.osaf.cosmo.manager.impl.ProvisioningManagerImpl">
     <property name="roleDAO">
       <ref bean="roleDAO"/>
     </property>

Index: server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityContextImpl.java
diff -u server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityContextImpl.java:1.3 server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityContextImpl.java:1.4
--- server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityContextImpl.java:1.3	Thu Mar 31 14:50:54 2005
+++ server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityContextImpl.java	Fri Apr  8 16:53:25 2005
@@ -1,8 +1,7 @@
 package org.osaf.cosmo.security.impl;
 
-import org.osaf.chandler.server.model.Role;
-import org.osaf.chandler.server.model.User;
-
+import org.osaf.cosmo.model.Role;
+import org.osaf.cosmo.model.User;
 import org.osaf.cosmo.security.CosmoSecurityContext;
 import org.osaf.cosmo.security.CosmoSecurityManager;
 import org.osaf.cosmo.security.CosmoUserDetails;

Index: server/core/build.xml
diff -u server/core/build.xml:1.13 server/core/build.xml:1.14
--- server/core/build.xml:1.13	Wed Mar 30 10:44:18 2005
+++ server/core/build.xml	Fri Apr  8 16:53:16 2005
@@ -1,11 +1,11 @@
 
-<project name="Chandler Server Core" default="all" basedir=".">
+<project name="Cosmo Core" default="all" basedir=".">
 
-  <property name="chsrv.home"           value="${basedir}/.."/>
+  <property name="cosmo.home"           value="${basedir}/.."/>
 
   <property environment="env"/>
-  <property file="${chsrv.home}/build.properties"/>
-  <property file="${chsrv.home}/shared.properties"/>
+  <property file="${cosmo.home}/build.properties"/>
+  <property file="${cosmo.home}/shared.properties"/>
 
   <taskdef name="hibernatedoclet"
            classname="xdoclet.modules.hibernate.HibernateDocletTask">
@@ -31,7 +31,6 @@
     <pathelement location="${joda-time.jar}"/>
     <pathelement location="${jspapi.jar}"/>
     <pathelement location="${servletapi.jar}"/>
-    <pathelement location="${slide-webdavlib.jar}"/>
     <pathelement location="${spring.jar}"/>
     <pathelement location="${struts.jar}"/>
   </path>
@@ -51,8 +50,8 @@
         <include name="**/*.java"/>
       </fileset>
       <hibernate version="2.0"/>
-      <hibernatecfg dataSource="${chsrv.dist.userdb.dataSource}"
-                    dialect="${chsrv.dist.userdb.dialect}"/>
+      <hibernatecfg dataSource="${cosmo.dist.userdb.dataSource}"
+                    dialect="${cosmo.dist.userdb.dialect}"/>
     </hibernatedoclet>
   </target>
 
@@ -67,12 +66,11 @@
   </target>
 
   <target name="pack-jar" description="pack the jar">
-    <jar destfile="${core.build}/chandler-server-core.jar"
+    <jar destfile="${core.build}/cosmo-core.jar"
          basedir="${core.build}/classes">
-      <exclude name="hibernate.cfg.xml"/>
-      <metainf dir="${core.src}">
-        <include name="*chsrv-core.tld"/>
-      </metainf>
+      <fileset dir="${core.etc}">
+        <include name="*.xml"/>
+      </fileset>
     </jar>
   </target>
 
@@ -86,12 +84,12 @@
 
   <target name="userdb-setup"
           description="set up the user database">
-    <echo>Setting up db ${chsrv.dist.userdb.database}</echo>
-    <sql driver="${chsrv.dist.userdb.driver}"
-         url="${chsrv.dist.userdb.url}"
-         userid="${chsrv.dist.userdb.username}"
-         password="${chsrv.dist.userdb.password}">
-      <fileset dir="${chsrv.db}">
+    <echo>Setting up db ${cosmo.dist.userdb.database}</echo>
+    <sql driver="${cosmo.dist.userdb.driver}"
+         url="${cosmo.dist.userdb.url}"
+         userid="${cosmo.dist.userdb.username}"
+         password="${cosmo.dist.userdb.password}">
+      <fileset dir="${cosmo.db}">
         <include name="schema.sql"/>
       </fileset>
       <classpath>
@@ -109,7 +107,7 @@
 
   <target name="test-gen" depends="test-prepare"
           description="generate test Hibernate config file">
-    <ant dir="${chsrv.home}" target="test-gen" inheritAll="false"/>
+    <ant dir="${cosmo.home}" target="test-gen" inheritAll="false"/>
   </target>
 
   <target name="test-compile" depends="test-prepare,test-gen"
@@ -135,7 +133,7 @@
       </fileset>
       <filterset>
         <filter token="CONFIGFILEPATH"
-                value="${chsrv.etc}/repository.xml"/>
+                value="${cosmo.etc}/repository.xml"/>
         <filter token="REPOSITORYHOMEDIRPATH"
                 value="${core.test}/repository"/>
       </filterset>
@@ -148,12 +146,9 @@
         <include name="applicationContext-base.xml"/>
         <include name="applicationContext-hibernate.xml"/>
         <include name="applicationContext-manager.xml"/>
-        <include name="applicationContext-slide-client.xml"/>
-        <include name="applicationContext-webdav-client.xml"/>
-        <include name="chandler.properties"/>
         <include name="ehcache.xml"/>
       </fileset>
-      <fileset dir="${chsrv.test}">
+      <fileset dir="${cosmo.test}">
         <include name="hibernate.cfg.xml"/>
       </fileset>
     </copy>

Index: server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityManagerImpl.java
diff -u server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityManagerImpl.java:1.3 server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityManagerImpl.java:1.4
--- server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityManagerImpl.java:1.3	Wed Mar 30 10:40:33 2005
+++ server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityManagerImpl.java	Fri Apr  8 16:53:25 2005
@@ -1,8 +1,7 @@
 package org.osaf.cosmo.security.impl;
 
-import org.osaf.chandler.server.dao.UserDAO;
-import org.osaf.chandler.server.model.User;
-
+import org.osaf.cosmo.dao.UserDAO;
+import org.osaf.cosmo.model.User;
 import org.osaf.cosmo.security.CosmoSecurityContext;
 import org.osaf.cosmo.security.CosmoSecurityException;
 import org.osaf.cosmo.security.CosmoSecurityManager;

Index: server/core/src/org/osaf/cosmo/security/impl/CosmoUserDetailsImpl.java
diff -u server/core/src/org/osaf/cosmo/security/impl/CosmoUserDetailsImpl.java:1.1 server/core/src/org/osaf/cosmo/security/impl/CosmoUserDetailsImpl.java:1.2
--- server/core/src/org/osaf/cosmo/security/impl/CosmoUserDetailsImpl.java:1.1	Tue Mar 29 10:00:00 2005
+++ server/core/src/org/osaf/cosmo/security/impl/CosmoUserDetailsImpl.java	Fri Apr  8 16:53:25 2005
@@ -1,8 +1,7 @@
 package org.osaf.cosmo.security.impl;
 
-import org.osaf.chandler.server.model.Role;
-import org.osaf.chandler.server.model.User;
-
+import org.osaf.cosmo.model.Role;
+import org.osaf.cosmo.model.User;
 import org.osaf.cosmo.security.CosmoUserDetails;
 
 import java.util.ArrayList;

Index: server/core/etc/ehcache.xml
diff -u server/core/etc/ehcache.xml:1.1 server/core/etc/ehcache.xml:1.2
--- server/core/etc/ehcache.xml:1.1	Tue Feb 22 21:17:30 2005
+++ server/core/etc/ehcache.xml	Fri Apr  8 16:53:16 2005
@@ -7,12 +7,12 @@
          overflowToDisk="true" timeToIdleSeconds="300"
          timeToLiveSeconds="300" diskPersistent="false"
          diskExpiryThreadIntervalSeconds="120"/>
-  <cache name="org.osaf.chandler.server.model.Role"
+  <cache name="org.osaf.cosmo.model.Role"
          eternal="false" maxElementsInMemory="100000"
          overflowToDisk="true" timeToIdleSeconds="300"
          timeToLiveSeconds="300" diskPersistent="false"
          diskExpiryThreadIntervalSeconds="120"/>
-  <cache name="org.osaf.chandler.server.model.User"
+  <cache name="org.osaf.cosmo.model.User"
          eternal="false" maxElementsInMemory="100000"
          overflowToDisk="true" timeToIdleSeconds="300"
          timeToLiveSeconds="300" diskPersistent="false"

Index: server/docs/TODO.txt
diff -u server/docs/TODO.txt:1.46 server/docs/TODO.txt:1.47
--- server/docs/TODO.txt:1.46	Fri Apr  8 14:43:29 2005
+++ server/docs/TODO.txt	Fri Apr  8 16:53:27 2005
@@ -2,10 +2,12 @@
 0.1 RELEASE
 ===========
 
- * pack core/etc files into core jar rather than putting them in
-   WEB-INF/classes
- * set cosmo version as env entry rather than property
- * get rid of properties file
+docs:
+
+ * rewrite all existing docs
+ * FAQ.txt
+ * LICENSE.txt
+ * BUILDING.txt
 
 0.2 RELEASE
 ===========
@@ -14,8 +16,6 @@
 
  * make new module 'cosmo'
  * use maven
- * rename "web" subproject to something better
- * change all packages from org.osaf.chandler.server to org.osaf.cosmo
  * precompile jsps for distribution
 
 core:
@@ -58,10 +58,6 @@
  * Windows startup script
  * validation of install procedure by other people
 
-docs:
+dist:
 
- * rewrite all existing docs
- * FAQ.txt
- * LICENSE.txt
- * BUILDING.txt
- * have somebody edit all docs
+ * Windows startup script

Index: server/web/web/WEB-INF/web.xml
diff -u server/web/web/WEB-INF/web.xml:1.2 server/web/web/WEB-INF/web.xml:1.3
--- server/web/web/WEB-INF/web.xml:1.2	Fri Apr  8 14:43:31 2005
+++ server/web/web/WEB-INF/web.xml	Fri Apr  8 16:53:30 2005
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
          version="2.4">
-  <display-name>Chandler Server</display-name>
+  <display-name>Cosmo</display-name>
   <context-param>
     <param-name>contextConfigLocation</param-name>
     <param-value>
@@ -108,7 +108,7 @@
     </resource-env-ref-type>
   </resource-env-ref>
   <resource-env-ref>
-    <resource-env-ref-name>jdbc/ChandlerUserDB</resource-env-ref-name>
+    <resource-env-ref-name>jdbc/cosmo</resource-env-ref-name>
     <resource-env-ref-type>javax.sql.DataSource</resource-env-ref-type>
   </resource-env-ref>
 </web-app>

Index: server/etc/server.xml
diff -u server/etc/server.xml:1.16 server/etc/server.xml:1.17
--- server/etc/server.xml:1.16	Fri Apr  8 14:43:29 2005
+++ server/etc/server.xml	Fri Apr  8 16:53:27 2005
@@ -1,80 +1,10 @@
 <Server port="8005" shutdown="SHUTDOWN">
-  <GlobalNamingResources>
-  <Resource name="jcr/repositoryFactory"
-            type="org.apache.jackrabbit.core.jndi.BindableRepository"/>
-  <ResourceParams name="jcr/repositoryFactory">
-    <parameter>
-      <name>factory</name>
-      <value>
-        org.apache.jackrabbit.core.jndi.BindableRepositoryFactory
-      </value>
-    </parameter>
-    <parameter>
-      <name>configFilePath</name>
-      <value>etc/repository.xml</value>
-    </parameter>
-    <parameter>
-      <name>repHomeDir</name>
-      <value>data/repository</value>
-    </parameter>
-  </ResourceParams>
-    <Resource name="ChandlerUserDB"
-              type="javax.sql.DataSource"
-              description="Chandler Server User DB"/>
-    <ResourceParams name="ChandlerUserDB">
-      <parameter>
-        <name>factory</name>
-        <value>org.apache.commons.dbcp.BasicDataSourceFactory</value>
-      </parameter>
-      <parameter>
-        <name>maxActive</name>
-        <value>5</value>
-      </parameter>
-      <parameter>
-        <name>maxIdle</name>
-        <value>3</value>
-      </parameter>
-      <parameter>
-        <name>maxWait</name>
-        <value>10000</value>
-      </parameter>
-      <parameter>
-        <name>username</name>
-        <value>sa</value>
-      </parameter>
-      <parameter>
-        <name>password</name>
-        <value></value>
-      </parameter>
-      <parameter>
-        <name>driverClassName</name>
-        <value>org.hsqldb.jdbcDriver</value>
-      </parameter>
-      <parameter>
-        <name>url</name>
-        <value>jdbc:hsqldb:file:data/userdb</value>
-      </parameter>
-    </ResourceParams>
-  </GlobalNamingResources>
   <Service name="Catalina">
     <Connector port="8080" enableLookups="false"/>
     <Connector port="8443" enableLookups="false" secure="true"
                scheme="https" clientAuth="want"
-               keystorePass="chandler"/>
+               keystorePass="osafcosmo"/>
     <Engine name="Catalina" defaultHost="localhost">
-      <Logger className="org.apache.catalina.logger.SystemOutLogger"/>
-      <Valve className="org.apache.catalina.valves.AccessLogValve"
-             directory="../logs" pattern="combined"
-             resolveHosts="false"/>
-      <Realm className="org.apache.catalina.realm.DataSourceRealm"
-             dataSourceName="ChandlerUserDB"
-             roleNameCol="rolename"
-             userCredCol="password"
-             userNameCol="username"
-             userRoleTable="userrole"
-             userTable="user"
-             digest="MD5"
-             debug="0"/>
       <Host name="localhost" appBase="webapps" autoDeploy="false"
             deployOnStartup="false" debug="0"/>
     </Engine>

Index: server/core/etc/applicationContext-base.xml
diff -u server/core/etc/applicationContext-base.xml:1.2 server/core/etc/applicationContext-base.xml:1.3
--- server/core/etc/applicationContext-base.xml:1.2	Fri Apr  8 13:04:49 2005
+++ server/core/etc/applicationContext-base.xml	Fri Apr  8 16:53:16 2005
@@ -7,10 +7,13 @@
 
   <!-- Properties -->
 
-  <bean id="propertyConfigurer"
-        class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-    <property name="location">
-      <value>classpath:chandler.properties</value>
+  <bean id="cosmoVersion"
+        class="org.springframework.jndi.JndiObjectFactoryBean">
+    <property name="jndiName">
+      <value>cosmo/version</value>
+    </property>
+    <property name="resourceRef">
+      <value>true</value>
     </property>
   </bean>
 
@@ -19,7 +22,7 @@
     <property name="attributes">
       <map>
         <entry key="cosmoVersion">
-          <value>${cosmo.version}</value>
+          <ref local="cosmoVersion"/>
         </entry>
       </map>
     </property>

Index: server/core/src/org/osaf/cosmo/security/CosmoSecurityContext.java
diff -u server/core/src/org/osaf/cosmo/security/CosmoSecurityContext.java:1.2 server/core/src/org/osaf/cosmo/security/CosmoSecurityContext.java:1.3
--- server/core/src/org/osaf/cosmo/security/CosmoSecurityContext.java:1.2	Wed Mar 30 10:40:33 2005
+++ server/core/src/org/osaf/cosmo/security/CosmoSecurityContext.java	Fri Apr  8 16:53:24 2005
@@ -1,6 +1,6 @@
 package org.osaf.cosmo.security;
 
-import org.osaf.chandler.server.model.User;
+import org.osaf.cosmo.model.User;
 
 import javax.security.auth.Subject;
 

Index: server/web/build.xml
diff -u server/web/build.xml:1.2 server/web/build.xml:1.3
--- server/web/build.xml:1.2	Fri Apr  8 14:43:29 2005
+++ server/web/build.xml	Fri Apr  8 16:53:27 2005
@@ -1,12 +1,12 @@
 
 <project name="Cosmo Web Application" default="pack" basedir=".">
 
-  <property name="chsrv.home"        value="${basedir}/.."/>
+  <property name="cosmo.home"        value="${basedir}/.."/>
   <property name="web.home"          value="${basedir}"/>
 
   <property environment="env"/>
-  <property file="${chsrv.home}/build.properties"/>
-  <property file="${chsrv.home}/shared.properties"/>
+  <property file="${cosmo.home}/build.properties"/>
+  <property file="${cosmo.home}/shared.properties"/>
 
   <!-- CLASSPATHS -->
 
@@ -18,6 +18,7 @@
     <pathelement location="${jcr.jar}"/>
     <pathelement location="${jcr-server.jar}"/>
     <pathelement location="${jcr-webdav.jar}"/>
+    <pathelement location="${jspapi.jar}"/>
     <pathelement location="${log4j.jar}"/>
     <pathelement location="${servletapi.jar}"/>
     <pathelement location="${spring.jar}"/>
@@ -51,7 +52,11 @@
       </fileset>
     </copy>
     <jar destfile="${web.build}/cosmo-web.jar"
-         basedir="${web.build}/classes"/>
+         basedir="${web.build}/classes">
+      <metainf dir="${web.src}">
+        <include name="*cosmo.tld"/>
+      </metainf>
+    </jar>
     <copy todir="${web.build}/webapp">
       <fileset dir="${web.web}"/>
     </copy>
@@ -61,28 +66,12 @@
       </fileset>
     </copy>
     <copy todir="${web.build}/webapp/WEB-INF/classes">
-      <fileset dir="${chsrv.etc}">
+      <fileset dir="${cosmo.etc}">
         <include name="log4j.xml"/>
       </fileset>
-      <fileset dir="${core.etc}">
-        <exclude name="applicationContext-slide-client.xml"/>
-        <exclude name="applicationContext-webdav-client.xml"/>
-        <include name="*.xml"/>
-      </fileset>
-      <fileset dir="${core.build}/classes">
-        <include name="hibernate.cfg.xml"/>
-      </fileset>
-    </copy>
-    <copy todir="${web.build}/webapp/WEB-INF/classes">
-      <fileset dir="${core.etc}">
-        <include name="chandler.properties"/>
-      </fileset>
-      <filterset>
-        <filter token="VERSION" value="${chsrv.version}"/>
-      </filterset>
     </copy>
     <copy todir="${web.build}/webapp/WEB-INF/lib"
-          file="${core.build}/chandler-server-core.jar"/>
+          file="${core.build}/cosmo-core.jar"/>
     <copy todir="${web.build}/webapp/WEB-INF/lib"
           file="${web.build}/cosmo-web.jar"/>
     <copy todir="${web.build}/webapp/WEB-INF/lib" file="${acegi-security.jar}"/>
@@ -167,10 +156,9 @@
         <include name="applicationContext-jcr-client.xml"/>
         <include name="applicationContext-manager.xml"/>
         <include name="applicationContext-security.xml"/>
-        <include name="chandler.properties"/>
         <include name="ehcache.xml"/>
       </fileset>
-      <fileset dir="${chsrv.test}">
+      <fileset dir="${cosmo.test}">
         <include name="hibernate.cfg.xml"/>
       </fileset>
     </copy>

Index: server/web/etc/applicationContext-adapter-dav.xml
diff -u server/web/etc/applicationContext-adapter-dav.xml:1.1 server/web/etc/applicationContext-adapter-dav.xml:1.2
--- server/web/etc/applicationContext-adapter-dav.xml:1.1	Fri Apr  8 14:43:30 2005
+++ server/web/etc/applicationContext-adapter-dav.xml	Fri Apr  8 16:53:28 2005
@@ -11,10 +11,10 @@
   <bean id="jcrRepository"
         class="org.springframework.jndi.JndiObjectFactoryBean">
     <property name="jndiName">
-      <value>${cosmo.jcr.jndi.name}</value>
+      <value>jcr/repositoryFactory</value>
     </property>
     <property name="resourceRef">
-      <value>${cosmo.jcr.jndi.resourceRef}</value>
+      <value>true</value>
     </property>
   </bean>
 

Index: server/web/src/org/osaf/cosmo/ui/CosmoErrorAction.java
diff -u server/web/src/org/osaf/cosmo/ui/CosmoErrorAction.java:1.1 server/web/src/org/osaf/cosmo/ui/CosmoErrorAction.java:1.2
--- server/web/src/org/osaf/cosmo/ui/CosmoErrorAction.java:1.1	Fri Apr  8 14:43:31 2005
+++ server/web/src/org/osaf/cosmo/ui/CosmoErrorAction.java	Fri Apr  8 16:53:28 2005
@@ -1,6 +1,5 @@
 package org.osaf.cosmo.ui;
 
-import org.osaf.spring.webdav.WebdavResourceNotFoundException;
 import org.osaf.struts.OSAFErrorAction;
 import org.osaf.struts.OSAFStrutsConstants;
 
@@ -18,6 +17,7 @@
 import org.apache.struts.action.ActionMapping;
 
 import org.springframework.dao.DataAccessResourceFailureException;
+import org.springframework.orm.ObjectRetrievalFailureException;
 
 /**
  * An OSAFErrorAction that chooses the appropriate error view based on
@@ -86,6 +86,6 @@
     }
 
     private boolean isNotFoundError(Throwable t) {
-        return t instanceof WebdavResourceNotFoundException;
+        return t instanceof ObjectRetrievalFailureException;
     }
 }

Index: server/core/etc/applicationContext-hibernate.xml
diff -u server/core/etc/applicationContext-hibernate.xml:1.1 server/core/etc/applicationContext-hibernate.xml:1.2
--- server/core/etc/applicationContext-hibernate.xml:1.1	Thu Mar 17 19:26:16 2005
+++ server/core/etc/applicationContext-hibernate.xml	Fri Apr  8 16:53:16 2005
@@ -24,14 +24,14 @@
   <!-- Hibernate DAOs -->
 
   <bean id="roleDAO"
-        class="org.osaf.chandler.server.dao.hibernate.RoleDAOHibernate">
+        class="org.osaf.cosmo.dao.hibernate.RoleDAOHibernate">
     <property name="sessionFactory">
       <ref local="sessionFactory"/>
     </property>
   </bean>
 
   <bean id="userDAO"
-        class="org.osaf.chandler.server.dao.hibernate.UserDAOHibernate">
+        class="org.osaf.cosmo.dao.hibernate.UserDAOHibernate">
     <property name="sessionFactory">
       <ref local="sessionFactory"/>
     </property>

Index: server/web/src/org/osaf/cosmo/ui/UserAction.java
diff -u server/web/src/org/osaf/cosmo/ui/UserAction.java:1.1 server/web/src/org/osaf/cosmo/ui/UserAction.java:1.2
--- server/web/src/org/osaf/cosmo/ui/UserAction.java:1.1	Fri Apr  8 14:43:31 2005
+++ server/web/src/org/osaf/cosmo/ui/UserAction.java	Fri Apr  8 16:53:28 2005
@@ -1,8 +1,8 @@
 package org.osaf.cosmo.ui;
 
-import org.osaf.chandler.server.manager.ProvisioningManager;
-import org.osaf.chandler.server.model.Role;
-import org.osaf.chandler.server.model.User;
+import org.osaf.cosmo.manager.ProvisioningManager;
+import org.osaf.cosmo.model.Role;
+import org.osaf.cosmo.model.User;
 import org.osaf.cosmo.security.CosmoSecurityManager;
 import org.osaf.struts.OSAFMappingDispatchAction;
 import org.osaf.struts.OSAFStrutsConstants;

Index: server/core/etc/applicationContext-jcr-client.xml
diff -u server/core/etc/applicationContext-jcr-client.xml:1.5 server/core/etc/applicationContext-jcr-client.xml:1.6
--- server/core/etc/applicationContext-jcr-client.xml:1.5	Wed Mar 30 11:35:29 2005
+++ server/core/etc/applicationContext-jcr-client.xml	Fri Apr  8 16:53:16 2005
@@ -10,10 +10,10 @@
   <bean id="jcrRepository"
         class="org.springframework.jndi.JndiObjectFactoryBean">
     <property name="jndiName">
-      <value>${cosmo.jcr.jndi.name}</value>
+      <value>jcr/repositoryFactory</value>
     </property>
     <property name="resourceRef">
-      <value>${cosmo.jcr.jndi.resourceRef}</value>
+      <value>true</value>
     </property>
   </bean>
 
@@ -38,7 +38,7 @@
   </bean>
 
   <bean id="shareDAO"
-        class="org.osaf.chandler.server.dao.jcr.ContentStoreDAOJCR">
+        class="org.osaf.cosmo.dao.jcr.ContentStoreDAOJCR">
     <property name="template">
       <ref local="homedirTemplate"/>
     </property>

Index: server/shared.properties
diff -u server/shared.properties:1.16 server/shared.properties:1.17
--- server/shared.properties:1.16	Fri Apr  8 14:43:28 2005
+++ server/shared.properties	Fri Apr  8 16:53:15 2005
@@ -3,8 +3,8 @@
 # version info
 #
 
-chsrv.version=0.1
-chsrv.tag=0_1
+cosmo.version=0.1
+cosmo.tag=0_1
 
 #
 # compile options
@@ -27,22 +27,22 @@
 
 xdoclet.home=${env.XDOCLET_HOME}
 
-chsrv.ext=${chsrv.home}/ext
-chsrv.tmp=${java.io.tmpdir}
-chsrv.bin=${chsrv.home}/bin
-chsrv.etc=${chsrv.home}/etc
-chsrv.docs=${chsrv.home}/docs
-chsrv.docs.api=${chsrv.docs}/api
-chsrv.db=${chsrv.home}/db
-chsrv.test=${chsrv.home}/test
+cosmo.ext=${cosmo.home}/ext
+cosmo.tmp=${java.io.tmpdir}
+cosmo.bin=${cosmo.home}/bin
+cosmo.etc=${cosmo.home}/etc
+cosmo.docs=${cosmo.home}/docs
+cosmo.docs.api=${cosmo.docs}/api
+cosmo.db=${cosmo.home}/db
+cosmo.test=${cosmo.home}/test
 
-core.home=${chsrv.home}/core
+core.home=${cosmo.home}/core
 core.build=${core.home}/build
 core.src=${core.home}/src
 core.etc=${core.home}/etc
 core.test=${core.home}/test
 
-web.home=${chsrv.home}/web
+web.home=${cosmo.home}/web
 web.build=${web.home}/build
 web.src=${web.home}/src
 web.etc=${web.home}/etc
@@ -54,51 +54,50 @@
 #
 
 ext.tomcat.package=jakarta-tomcat-5.0.28
-ext.tomcat.tarball=${chsrv.ext}/${ext.tomcat.package}.tar.gz
+ext.tomcat.tarball=${cosmo.ext}/${ext.tomcat.package}.tar.gz
 
 maven.repository=${user.home}/.maven/repository
 
-acegi-security.jar=${chsrv.ext}/acegi-security-0.8.1.jar
-antlr.jar=${chsrv.ext}/antlr.jar
-aopalliance.jar=${chsrv.ext}/aopalliance.jar
-cglib.jar=${chsrv.ext}/cglib-full-2.0.2.jar
-commons-beanutils.jar=${chsrv.ext}/commons-beanutils.jar
-commons-codec.jar=${chsrv.ext}/commons-codec-1.3.jar
+acegi-security.jar=${cosmo.ext}/acegi-security-0.8.1.jar
+antlr.jar=${cosmo.ext}/antlr.jar
+aopalliance.jar=${cosmo.ext}/aopalliance.jar
+cglib.jar=${cosmo.ext}/cglib-full-2.0.2.jar
+commons-beanutils.jar=${cosmo.ext}/commons-beanutils.jar
+commons-codec.jar=${cosmo.ext}/commons-codec-1.3.jar
 commons-collections.jar=${maven.repository}/commons-collections/jars/commons-collections-2.1.jar
-commons-digester.jar=${chsrv.ext}/commons-digester.jar
-commons-httpclient.jar=${chsrv.ext}/commons-httpclient-2.0.2.jar
-commons-lang.jar=${chsrv.ext}/commons-lang-2.0.jar
-commons-logging.jar=${chsrv.ext}/commons-logging.jar
-commons-validator.jar=${chsrv.ext}/commons-validator-1.1.4.jar
+commons-digester.jar=${cosmo.ext}/commons-digester.jar
+commons-httpclient.jar=${cosmo.ext}/commons-httpclient-2.0.2.jar
+commons-lang.jar=${cosmo.ext}/commons-lang-2.0.jar
+commons-logging.jar=${cosmo.ext}/commons-logging.jar
+commons-validator.jar=${cosmo.ext}/commons-validator-1.1.4.jar
 concurrent.jar=${maven.repository}/concurrent/jars/concurrent-1.3.4.jar
 cqfs.jar=${maven.repository}/cqfs/jars/cqfs-3.5.6.jar
 cqfs-jackrabbit.jar=${maven.repository}/cqfs/jars/cqfs-jackrabbit-3.5.6.jar
-dom4j.jar=${chsrv.ext}/dom4j-1.5.2.jar
-ehcache.jar=${chsrv.ext}/ehcache-1.1.jar
-hibernate.jar=${chsrv.ext}/hibernate2.jar
-hsqldb.jar=${chsrv.ext}/hsqldb.jar
+dom4j.jar=${cosmo.ext}/dom4j-1.5.2.jar
+ehcache.jar=${cosmo.ext}/ehcache-1.1.jar
+hibernate.jar=${cosmo.ext}/hibernate2.jar
+hsqldb.jar=${cosmo.ext}/hsqldb.jar
 jackrabbit.jar=${maven.repository}/jackrabbit/jars/jackrabbit-0.16.2-dev.jar
 jcr.jar=${maven.repository}/jsr170/jars/jcr-0.16.2.jar
 jcr-client.jar=${maven.repository}/jcr-server/jars/jcr-client-0.16.2.jar
 jcr-server.jar=${maven.repository}/jcr-server/jars/jcr-server-0.16.2.jar
 jcr-webdav.jar=${maven.repository}/jcr-server/jars/jcr-webdav-0.16.2.jar
-jdom.jar=${chsrv.ext}/jdom.jar
-joda-time.jar=${chsrv.ext}/joda-time-0.98.jar
-jspapi.jar=${chsrv.ext}/jsp-api.jar
-jstl.jar=${chsrv.ext}/jstl.jar
-jta.jar=${chsrv.ext}/jta.jar
-log4j.jar=${chsrv.ext}/log4j-1.2.8.jar
+jdom.jar=${cosmo.ext}/jdom.jar
+joda-time.jar=${cosmo.ext}/joda-time-0.98.jar
+jspapi.jar=${cosmo.ext}/jsp-api.jar
+jstl.jar=${cosmo.ext}/jstl.jar
+jta.jar=${cosmo.ext}/jta.jar
+log4j.jar=${cosmo.ext}/log4j-1.2.8.jar
 lucene.jar=${maven.repository}/lucene/jars/lucene-1.4.3.jar
-odmg.jar=${chsrv.ext}/odmg-3.0.jar
-oro.jar=${chsrv.ext}/jakarta-oro-2.0.8.jar
+odmg.jar=${cosmo.ext}/odmg-3.0.jar
+oro.jar=${cosmo.ext}/jakarta-oro-2.0.8.jar
 servletapi.jar=${maven.repository}/servletapi/jars/servletapi-2.3.jar
-slide-webdavlib.jar=${chsrv.ext}/jakarta-slide-webdavlib-2.1.jar
-spring.jar=${chsrv.ext}/spring.jar
-standard.jar=${chsrv.ext}/standard.jar
-struts.jar=${chsrv.ext}/struts.jar
-struts-el.jar=${chsrv.ext}/struts-el.jar
-strutstest.jar=${chsrv.ext}/strutstest-2.1.3.jar
-urlrewrite.jar=${chsrv.ext}/urlrewrite-2.0.1.jar
+spring.jar=${cosmo.ext}/spring.jar
+standard.jar=${cosmo.ext}/standard.jar
+struts.jar=${cosmo.ext}/struts.jar
+struts-el.jar=${cosmo.ext}/struts-el.jar
+strutstest.jar=${cosmo.ext}/strutstest-2.1.3.jar
+urlrewrite.jar=${cosmo.ext}/urlrewrite-2.0.1.jar
 xerces.jar=${maven.repository}/xerces/jars/xercesImpl-2.6.2.jar
 xml-apis.jar=${maven.repository}/xml-apis/jars/xml-apis-1.0.b2.jar
 
@@ -106,21 +105,21 @@
 # distribution properties
 #
 
-chsrv.dist.userdb.dialect=net.sf.hibernate.dialect.HSQLDialect
-chsrv.dist.userdb.dataSource=java:comp/env/jdbc/ChandlerUserDB
-chsrv.dist.userdb.driver=org.hsqldb.jdbcDriver
-chsrv.dist.userdb.database=userdb
-chsrv.dist.userdb.url=jdbc:hsqldb:file:data/${chsrv.dist.userdb.database}
-chsrv.dist.userdb.username=sa
-chsrv.dist.userdb.password=
+cosmo.dist.userdb.dialect=net.sf.hibernate.dialect.HSQLDialect
+cosmo.dist.userdb.dataSource=java:comp/env/jdbc/cosmo
+cosmo.dist.userdb.driver=org.hsqldb.jdbcDriver
+cosmo.dist.userdb.database=userdb
+cosmo.dist.userdb.url=jdbc:hsqldb:file:data/${cosmo.dist.userdb.database}
+cosmo.dist.userdb.username=sa
+cosmo.dist.userdb.password=
 
 #
 # test properties
 #
 
-chsrv.test.userdb.dialect=net.sf.hibernate.dialect.HSQLDialect
-chsrv.test.userdb.driver=org.hsqldb.jdbcDriver
-chsrv.test.userdb.database=userdb
-chsrv.test.userdb.url=jdbc:hsqldb:file:${chsrv.test}/db/${chsrv.test.userdb.database}
-chsrv.test.userdb.username=sa
-chsrv.test.userdb.password=
+cosmo.test.userdb.dialect=net.sf.hibernate.dialect.HSQLDialect
+cosmo.test.userdb.driver=org.hsqldb.jdbcDriver
+cosmo.test.userdb.database=userdb
+cosmo.test.userdb.url=jdbc:hsqldb:file:${cosmo.test}/db/${cosmo.test.userdb.database}
+cosmo.test.userdb.username=sa
+cosmo.test.userdb.password=

Index: server/core/src/org/osaf/cosmo/jackrabbit/CosmoAccessManager.java
diff -u server/core/src/org/osaf/cosmo/jackrabbit/CosmoAccessManager.java:1.5 server/core/src/org/osaf/cosmo/jackrabbit/CosmoAccessManager.java:1.6
--- server/core/src/org/osaf/cosmo/jackrabbit/CosmoAccessManager.java:1.5	Tue Apr  5 17:48:46 2005
+++ server/core/src/org/osaf/cosmo/jackrabbit/CosmoAccessManager.java	Fri Apr  8 16:53:23 2005
@@ -100,11 +100,10 @@
      * according to the following rules:
      *
      * <ol>
-     * <li>Subjects with the {@link ChandlerServerConstants#ROLE_ROOT}
-     * role have all permissions on all items.
-     * <li>Subjects which represent the owner of a home directory have
-     * all permissions on the item representing the user's home
-     * directory and all descendents.
+     * <li>Users in the root role have all permissions on all items.
+     * <li>Users who own a home directory have all permissions on the
+     * item representing the user's home directory and all
+     * descendents.
      * </ol>
      */
     public void checkPermission(ItemId id, int permissions)

Index: server/etc/cosmo.xml
diff -u server/etc/cosmo.xml:1.1 server/etc/cosmo.xml:1.2
--- server/etc/cosmo.xml:1.1	Wed Apr  6 20:15:01 2005
+++ server/etc/cosmo.xml	Fri Apr  8 16:53:27 2005
@@ -2,10 +2,72 @@
 
 <Context path="" debug="0" docBase="cosmo"
          reloadable="@RELOADABLE@">
-  <ResourceLink name="jcr/repositoryFactory"
-                global="jcr/repositoryFactory"
-                type="org.apache.jackrabbit.core.jndi.BindableRepository"/>
-  <ResourceLink name="jdbc/ChandlerUserDB"
-                global="ChandlerUserDB"
-                type="javax.sql.DataSource"/>
+  <Environment name="cosmo/version" value="@VERSION@"
+               type="java.lang.String" override="false"/>
+  <Resource name="jcr/repositoryFactory"
+            type="org.apache.jackrabbit.core.jndi.BindableRepository"/>
+  <ResourceParams name="jcr/repositoryFactory">
+    <parameter>
+      <name>factory</name>
+      <value>
+        org.apache.jackrabbit.core.jndi.BindableRepositoryFactory
+      </value>
+    </parameter>
+    <parameter>
+      <name>configFilePath</name>
+      <value>etc/repository.xml</value>
+    </parameter>
+    <parameter>
+      <name>repHomeDir</name>
+      <value>data/repository</value>
+    </parameter>
+  </ResourceParams>
+  <Resource name="jdbc/cosmo"
+            type="javax.sql.DataSource"/>
+  <ResourceParams name="jdbc/cosmo">
+    <parameter>
+      <name>factory</name>
+      <value>org.apache.commons.dbcp.BasicDataSourceFactory</value>
+    </parameter>
+    <parameter>
+      <name>maxActive</name>
+      <value>5</value>
+    </parameter>
+    <parameter>
+      <name>maxIdle</name>
+      <value>3</value>
+    </parameter>
+    <parameter>
+      <name>maxWait</name>
+      <value>10000</value>
+    </parameter>
+    <parameter>
+      <name>username</name>
+      <value>sa</value>
+    </parameter>
+    <parameter>
+      <name>password</name>
+      <value></value>
+    </parameter>
+    <parameter>
+      <name>driverClassName</name>
+      <value>org.hsqldb.jdbcDriver</value>
+    </parameter>
+    <parameter>
+      <name>url</name>
+      <value>jdbc:hsqldb:file:data/userdb</value>
+    </parameter>
+  </ResourceParams>
+  <Realm className="org.apache.catalina.realm.DataSourceRealm"
+         dataSourceName="jdbc/cosmo"
+         roleNameCol="rolename"
+         userCredCol="password"
+         userNameCol="username"
+         userRoleTable="userrole"
+         userTable="user"
+         digest="MD5"
+         debug="0"/>
+  <Valve className="org.apache.catalina.valves.AccessLogValve"
+         directory="../logs" pattern="combined"
+         resolveHosts="false"/>
 </Context>

Index: server/core/src/org/osaf/cosmo/security/CosmoUserDetails.java
diff -u server/core/src/org/osaf/cosmo/security/CosmoUserDetails.java:1.2 server/core/src/org/osaf/cosmo/security/CosmoUserDetails.java:1.3
--- server/core/src/org/osaf/cosmo/security/CosmoUserDetails.java:1.2	Tue Mar 29 09:59:58 2005
+++ server/core/src/org/osaf/cosmo/security/CosmoUserDetails.java	Fri Apr  8 16:53:24 2005
@@ -1,6 +1,6 @@
 package org.osaf.cosmo.security;
 
-import org.osaf.chandler.server.model.User;
+import org.osaf.cosmo.model.User;
 
 import net.sf.acegisecurity.UserDetails;
 

Index: server/web/web/WEB-INF/struts-config.xml
diff -u server/web/web/WEB-INF/struts-config.xml:1.3 server/web/web/WEB-INF/struts-config.xml:1.4
--- server/web/web/WEB-INF/struts-config.xml:1.3	Fri Apr  8 14:43:31 2005
+++ server/web/web/WEB-INF/struts-config.xml	Fri Apr  8 16:53:30 2005
@@ -9,7 +9,7 @@
   <form-beans>
     <form-bean name="userForm"
                type="org.apache.struts.validator.DynaValidatorForm">
-      <form-property name="user" type="org.osaf.chandler.server.model.User"/>
+      <form-property name="user" type="org.osaf.cosmo.model.User"/>
       <form-property name="password" type="java.lang.String"/>
       <form-property name="confirm" type="java.lang.String"/>
       <form-property name="username" type="java.lang.String"/>
@@ -28,7 +28,7 @@
 
   <action-mappings>
     <action path="/error"
-            type="org.osaf.cosmo.ui.ConsoleErrorAction">
+            type="org.osaf.cosmo.ui.CosmoErrorAction">
       <forward name="error.general" path="error.general"
                redirect="false"/>
       <forward name="error.connect" path="error.connect"

Index: server/build.xml
diff -u server/build.xml:1.28 server/build.xml:1.29
--- server/build.xml:1.28	Fri Apr  8 14:43:28 2005
+++ server/build.xml	Fri Apr  8 16:53:15 2005
@@ -1,18 +1,18 @@
 
-<project name="Chandler Server" default="all" basedir=".">
+<project name="Cosmo" default="all" basedir=".">
 
-  <property name="chsrv.home"           value="${basedir}"/>
+  <property name="cosmo.home"           value="${basedir}"/>
 
   <property environment="env"/>
   <property file="build.properties"/>
   <property file="shared.properties"/>
 
-  <property name="chsrv.dist"           value="${chsrv.home}/dist"/>
-  <property name="chsrv.dist.version"
-            value="${chsrv.dist}/chandler-server-${chsrv.version}"/>
-  <property name="chsrv.dist.tomcat"    value="${chsrv.dist.version}/tomcat"/>
-  <property name="chsrv.dist.webapps"   value="${chsrv.dist.tomcat}/webapps"/>
-  <property name="chsrv.dist.web"       value="${chsrv.dist.webapps}/cosmo"/>
+  <property name="cosmo.dist"           value="${cosmo.home}/dist"/>
+  <property name="cosmo.dist.version"
+            value="${cosmo.dist}/cosmo-${cosmo.version}"/>
+  <property name="cosmo.dist.tomcat"    value="${cosmo.dist.version}/tomcat"/>
+  <property name="cosmo.dist.webapps"   value="${cosmo.dist.tomcat}/webapps"/>
+  <property name="cosmo.dist.web"       value="${cosmo.dist.webapps}/cosmo"/>
 
   <taskdef name="hibernatedoclet"
            classname="xdoclet.modules.hibernate.HibernateDocletTask">
@@ -58,28 +58,28 @@
 
   <target name="test-gen"
           description="generate test Hibernate config file">
-    <hibernatedoclet destDir="${chsrv.test}"
+    <hibernatedoclet destDir="${cosmo.test}"
                      excludedtags="@version, at author, at todo"
                      verbose="${hibernate.verbose}">
       <fileset dir="${core.home}/src">
         <include name="**/*.java"/>
       </fileset>
-      <hibernatecfg dialect="${chsrv.test.userdb.dialect}"
-                    driver="${chsrv.test.userdb.driver}"
-                    jdbcUrl="${chsrv.test.userdb.url}"
-                    username="${chsrv.test.userdb.username}"
-                    password="${chsrv.test.userdb.password}"/>
+      <hibernatecfg dialect="${cosmo.test.userdb.dialect}"
+                    driver="${cosmo.test.userdb.driver}"
+                    jdbcUrl="${cosmo.test.userdb.url}"
+                    username="${cosmo.test.userdb.username}"
+                    password="${cosmo.test.userdb.password}"/>
     </hibernatedoclet>
   </target>
 
   <target name="test-dbsetup"
           description="set up the test user database">
-    <echo>Setting up test db ${chsrv.test.userdb.url}</echo>
-    <sql driver="${chsrv.test.userdb.driver}"
-         url="${chsrv.test.userdb.url}"
-         userid="${chsrv.test.userdb.username}"
-         password="${chsrv.test.userdb.password}">
-      <fileset dir="${chsrv.db}">
+    <echo>Setting up test db ${cosmo.test.userdb.url}</echo>
+    <sql driver="${cosmo.test.userdb.driver}"
+         url="${cosmo.test.userdb.url}"
+         userid="${cosmo.test.userdb.username}"
+         password="${cosmo.test.userdb.password}">
+      <fileset dir="${cosmo.db}">
         <include name="schema.sql"/>
       </fileset>
     <classpath>
@@ -106,7 +106,7 @@
 
   <target name="test-clean-db"
           description="clean out the test database">
-    <delete dir="${chsrv.test}/db"/>
+    <delete dir="${cosmo.test}/db"/>
   </target>
 
   <target name="test-clean-core" description="clean core subsystem tests">
@@ -121,35 +121,35 @@
 
   <target name="test-clean" depends="test-clean-core,test-clean-web"
           description="clean out test files">
-    <delete dir="${chsrv.test}"/>
+    <delete dir="${cosmo.test}"/>
   </target>
 
   <!-- RELEASE TARGETS -->
 
   <target name="unpack-tomcat" unless="tomcat.unpacked"
           description="unpack the Tomcat tarball">
-    <untar src="${ext.tomcat.tarball}" dest="${chsrv.tmp}"
+    <untar src="${ext.tomcat.tarball}" dest="${cosmo.tmp}"
            compression="gzip"/>
   </target>
 
   <target name="dist-tomcat"
           description="install and configure Tomcat">
     <available property="tomcat.unpacked"
-               file="${chsrv.tmp}/${ext.tomcat.package}"/>
+               file="${cosmo.tmp}/${ext.tomcat.package}"/>
     <antcall target="unpack-tomcat"/>
-    <copy todir="${chsrv.dist.tomcat}">
-      <fileset dir="${chsrv.tmp}/${ext.tomcat.package}">
+    <copy todir="${cosmo.dist.tomcat}">
+      <fileset dir="${cosmo.tmp}/${ext.tomcat.package}">
         <exclude name="**/conf/Catalina/localhost/*.xml"/>
         <exclude name="**/conf/server.xml"/>
       </fileset>
     </copy>
     <!-- XXX can't figure out the right pattern to use to not copy
          this dir in the first place -->
-    <delete dir="${chsrv.dist.tomcat}/webapps"/>
-    <mkdir dir="${chsrv.dist.tomcat}/webapps"/>
-    <mkdir dir="${chsrv.dist.tomcat}/logs"/>
+    <delete dir="${cosmo.dist.tomcat}/webapps"/>
+    <mkdir dir="${cosmo.dist.tomcat}/webapps"/>
+    <mkdir dir="${cosmo.dist.tomcat}/logs"/>
     <chmod perm="755">
-      <fileset dir="${chsrv.dist.tomcat}/bin">
+      <fileset dir="${cosmo.dist.tomcat}/bin">
         <include name="*.sh"/>
       </fileset>
     </chmod>
@@ -157,96 +157,108 @@
 
   <target name="dist-web"
           description="install web webapp into Tomcat">
-    <copy todir="${chsrv.dist.web}">
+    <copy todir="${cosmo.dist.web}">
       <fileset dir="${web.build}/webapp"/>
     </copy>
-    <copy todir="${chsrv.dist.tomcat}/conf/Catalina/localhost"
-          file="${chsrv.etc}/cosmo.xml">
+    <copy todir="${cosmo.dist.tomcat}/conf/Catalina/localhost"
+          file="${cosmo.etc}/cosmo.xml">
       <filterset>
         <filter token="RELOADABLE" value="${compile.debug}"/>
+        <filter token="VERSION" value="${cosmo.version}"/>
       </filterset>
     </copy>
   </target>
 
   <target name="dist-server"
           description="install server scripts and config into Tomcat">
-    <mkdir dir="${chsrv.dist.version}/logs"/>
-    <copy todir="${chsrv.dist.version}/bin"
-          file="${chsrv.bin}/chandlerctl"/>
-    <chmod file="${chsrv.dist.version}/bin/chandlerctl" perm="755"/>
-    <copy todir="${chsrv.dist.version}">
-      <fileset dir="${chsrv.docs}"/>
+    <mkdir dir="${cosmo.dist.version}/logs"/>
+    <copy todir="${cosmo.dist.version}/bin"
+          file="${cosmo.bin}/cosmoctl"/>
+    <chmod file="${cosmo.dist.version}/bin/cosmoctl" perm="755"/>
+    <copy todir="${cosmo.dist.version}">
+      <fileset dir="${cosmo.docs}"/>
     </copy>
-    <copy todir="${chsrv.dist.tomcat}/conf"
-          file="${chsrv.etc}/server.xml"/>
-    <copy todir="${chsrv.dist.version}/etc">
-      <fileset dir="${chsrv.etc}">
+    <copy todir="${cosmo.dist.tomcat}/conf"
+          file="${cosmo.etc}/server.xml"/>
+    <copy todir="${cosmo.dist.version}/etc">
+      <fileset dir="${cosmo.etc}">
         <include name="repository.xml"/>
       </fileset>
     </copy>
+    <!-- needed for tomcat's own logging -->
+    <copy todir="${cosmo.dist.tomcat}/common/classes"
+          file="${cosmo.etc}/log4j.xml"/>
+    <copy todir="${cosmo.dist.tomcat}/common/lib"
+          file="${commons-logging.jar}"/>
+    <copy todir="${cosmo.dist.tomcat}/common/lib"
+          file="${log4j.jar}"/>
     <!-- XXX: remove and document dropping in your db driver as part of
          installation -->
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${hsqldb.jar}"/>
+    <copy todir="${cosmo.dist.tomcat}/common/lib"
+          file="${hsqldb.jar}"/>
+    <!-- need to make tomcat aware of the jcr classes for webapp
+         reloads -->
+    <copy todir="${cosmo.dist.tomcat}/common/lib" file="${jcr.jar}"/>
   </target>
 
   <target name="dist-data"
           description="install user database database">
     <ant dir="${core.home}" target="userdb-setup"
          inheritAll="false"/>
-    <move todir="${chsrv.dist.version}/data">
-      <fileset dir="${chsrv.home}/data">
+    <move todir="${cosmo.dist.version}/data">
+      <fileset dir="${cosmo.home}/data">
         <exclude name="*.lck"/>
       </fileset>
     </move>
-    <delete dir="${chsrv.home}/data"/>
+    <delete dir="${cosmo.home}/data"/>
   </target>
 
   <target name="dist"
           depends="dist-tomcat,dist-web,dist-server,dist-data"
-          description="install and configure Chandler server"/>
+          description="install and configure Cosmo server"/>
 
   <target name="dist-release" description="generate a release distribution"
           depends="dist-clean-full,dist">
-    <tar destfile="${chsrv.dist.version}.tar.gz"
+    <tar destfile="${cosmo.dist.version}.tar.gz"
          compression="gzip" longfile="gnu">
-      <tarfileset dir="${chsrv.dist.version}"
-                  prefix="chandler-server-${chsrv.version}"/>
+      <tarfileset dir="${cosmo.dist.version}"
+                  prefix="cosmo-${cosmo.version}"/>
     </tar>
   </target>
 
   <target name="dist-clean"
           description="removed the release distribution">
-    <delete file="${chsrv.dist.version}.tar.gz"/>
-    <delete dir="${chsrv.dist.version}"/>
+    <delete file="${cosmo.dist.version}.tar.gz"/>
+    <delete dir="${cosmo.dist.version}"/>
   </target>
 
   <target name="dist-clean-data"
           description="clean out the distribution runtime data">
-    <delete dir="${chsrv.dist.version}/data"/>
+    <delete dir="${cosmo.dist.version}/data"/>
   </target>
 
   <target name="dist-clean-full"
           description="remove the dist directory and unpacked dependencies">
-    <delete dir="${chsrv.dist}"/>
-    <delete dir="${chsrv.tmp}/${ext.tomcat.package}"/>
+    <delete dir="${cosmo.dist}"/>
+    <delete dir="${cosmo.tmp}/${ext.tomcat.package}"/>
   </target>
 
   <target name="dist-tag"
           description="tag the distribution in CVS">
-    <cvs command="tag -F rel-${chsrv.tag}"/>
+    <cvs command="tag -F rel-${cosmo.tag}"/>
   </target>
 
   <!-- JAVADOC TARGETS -->
 
   <target name="javadoc" description="generate api docs">
-    <mkdir dir="${chsrv.docs.api}"/>
-    <javadoc packagenames="*" destdir="${chsrv.docs.api}">
-      <sourcepath path="${chsrv.home}/src"/>
+    <mkdir dir="${cosmo.docs.api}"/>
+    <javadoc packagenames="*" destdir="${cosmo.docs.api}">
+      <sourcepath path="${cosmo.home}/src"/>
     </javadoc>
   </target>
 
   <target name="javadoc-clean" description="clean out generated api docs">
-    <delete dir="${chsrv.docs.api}"/>
+    <delete dir="${cosmo.docs.api}"/>
   </target>
 
 </project>

Index: server/web/web/WEB-INF/tags/homedir.tag
diff -u server/web/web/WEB-INF/tags/homedir.tag:1.1 server/web/web/WEB-INF/tags/homedir.tag:1.2
--- server/web/web/WEB-INF/tags/homedir.tag:1.1	Fri Apr  8 13:02:19 2005
+++ server/web/web/WEB-INF/tags/homedir.tag	Fri Apr  8 16:53:31 2005
@@ -1,6 +1,6 @@
 <%@ include   file="/WEB-INF/jsp/taglibs.jsp"            %>
 <%@ attribute name="user"               required="false"
-              type="org.osaf.chandler.server.model.User" %>
+              type="org.osaf.cosmo.model.User"           %>
 <%@ attribute name="var"                required="true"
               rtexprvalue="false"                        %>
 <%@ variable  name-from-attribute="var" alias="result"

Index: server/web/web/WEB-INF/jsp/layout.jsp
diff -u server/web/web/WEB-INF/jsp/layout.jsp:1.3 server/web/web/WEB-INF/jsp/layout.jsp:1.4
--- server/web/web/WEB-INF/jsp/layout.jsp:1.3	Fri Apr  8 13:04:50 2005
+++ server/web/web/WEB-INF/jsp/layout.jsp	Fri Apr  8 16:53:31 2005
@@ -20,7 +20,7 @@
       </fmt:message>
     </title>
     <link rel="stylesheet" type="text/css"
-          href="<html:rewrite page="/chandler.css"/>"/>
+          href="<html:rewrite page="/cosmo.css"/>"/>
     <script type="text/javascript"
             src="<html:rewrite page="/cosmo.js"/>"></script>
   </head>



More information about the Commits mailing list