|
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/sme="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.X006194@tutu.osafoundation.org> |
|
| r.@gosympatico.ca> |
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/sme="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.X006194@tutu.osafoundation.org> |
Tue, 22 Feb, 04:55 |
| r.@gosympatico.ca> |
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/sme="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.X006194@tutu.osafoundation.org> |
Tue, 22 Feb, 04:55 |
| y |
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/sme="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.X006194@tutu.osafoundation.org> |
Mon, 21 Aug, 11:42 |
| je...@chat.net |
cosmo.jcr.jndi.resourceRef}&lt;/value&gt;
+ &lt;value&gt;true&lt;/value&gt;
&lt;/property&gt;
&lt;/bean&gt;
@@ -38,7 +38,7 @@
&lt;/bean&gt;
&lt;bean id="shareDAO"
- class="org.osaf.chandler.server.dao.jcr.ContentStoreDAOJCR"&gt;
+ class="org.osaf.cosmo.dao.jcr.ContentStoreDAOJCR"&gt;
&lt;property name="template"&gt;
&lt;ref local="homedirTemplate"/&gt;
&lt;/property&gt;
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/sme="dist-clean"
description="removed the release distribution"&gt;
- &lt;delete file="${chsrv.dist.version}.tar.gz"/&gt;
- &lt;delete dir="${chsrv.dist.version}"/&gt;
+ &lt;delete file="${cosmo.dist.version}.tar.gz"/&gt;
+ &lt;delete dir="${cosmo.dist.version}"/&gt;
&lt;/target&gt;
&lt;target name="dist-clean-data"
description="clean out the distribution runtime data"&gt;
- &lt;delete dir="${chsrv.dist.version}/data"/&gt;
+ &lt;delete dir="${cosmo.X006194@tutu.osafoundation.org> |
Sat, 14 Jun, 16:51 |
| Parlante |
.resourceRef}&lt;/value&gt;
+ &lt;value&gt;true&lt;/value&gt;
&lt;/property&gt;
&lt;/bean&gt;
@@ -38,7 +38,7 @@
&lt;/bean&gt;
&lt;bean id="shareDAO"
- class="org.osaf.chandler.server.dao.jcr.ContentStoreDAOJCR"&gt;
+ class="org.osaf.cosmo.dao.jcr.ContentStoreDAOJCR"&gt;
&lt;property name="template"&gt;
&lt;ref local="homedirTemplate"/&gt;
&lt;/property&gt;
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/sme="dist-clean"
description="removed the release distribution"&gt;
- &lt;delete file="${chsrv.dist.version}.tar.gz"/&gt;
- &lt;delete dir="${chsrv.dist.version}"/&gt;
+ &lt;delete file="${cosmo.dist.version}.tar.gz"/&gt;
+ &lt;delete dir="${cosmo.dist.version}"/&gt;
&lt;/target&gt;
&lt;target name="dist-clean-data"
description="clean out the distribution runtime data"&gt;
- &lt;delete dir="${chsrv.dist.version}/data"/&gt;
+ &lt;delete dir="${cosmo.X006194@tutu.osafoundation.org> |
Sat, 09 Apr, 03:30 |
|
<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.hot+*BUILDING.txt0.2RELEASE===========@@-14,8+16,6@@*makiskPersistent="false"diskExpiryThreadIntervalSeconds="120"/>-<cachename="org.osaf.chandler.server.model.Role"+<cachename="org.osaf.cosmo.model.Role"eternal="false"maxElementsInMemory="100000"overflowToDisk="true"timeToIdleSeconds="300"timeToLiveSeconds="300"diskPersistent="false"diskExpiryThreadIntervalSeconds="120"/>-<cachename="org.osaf.chandler.server.model.User"+<cachename="org.osaf.cosmo.model.User"eternal="false"maxElementsInMemory="100000"overflowToDisk="true"timeToIdleSeconds="300"timeToLiveSeconds="300"diskPersistent="false"Index:server/docs/TODO.txtdiff-userver/docs/TODO.txt:1.46server/docs/TODO.txt:1.47---server/docs/TODO.txt:1.46FriApr814:43:292005+++server/docs/TODO.txtFriApr816:53:272005@@-2,10+2,12@@0.1RELEASE===========-*packcore/etcfilesintocorejarratherthanputtingthemin-WEB-INF/classes-*setcosmoversionasenventryratherthanproperty-*getridofpropertiesfile+docs:++*rewriteallexistingdocs+*FAQ.txt+*LICENSE.txt+*BUILDING.txt0.2RELEASE===========@@-14,8+16,6@@*makenewmodule'cosmo'*usemaven-*rename"web"subprojecttosomethingbetter-*changeallpackagesfromorg.osaf.chandler.servertoorg.osaf.cosmo*precompilejspsfordistributioncore:@@-58,10+58,6@@*Windowsstartupscript*validationofinstallprocedurebyotherpeople-docs:+dist:-*rewriteallexistingdocs-*FAQ.txt-*LICENSE.txt-*BUILDING.txt-*havesomebodyeditalldocs+*WindowsstartupscriptIndex:server/web/web/WEB-INF/web.xmldiff-userver/web/web/WEB-INF/web.xml:1.2server/web/web/WEB-INF/web.xml:1.3---server/web/web/WEB-INF/web.xml:1.2FriApr814:43:312005+++server/web/web/WEB-INF/web.xmlFriApr816:53:302005@@-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>ChandlerServer</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.xmldiff-userver/etc/server.xml:1.16server/etc/server.xml:1.17---server/etc/server.xml:1.16FriApr814:43:292005+++server/etc/server.xmlFriApr816:53:272005@@-1,80+1,10@@<Serverport="8005"shutdown="SHUTDOWN">-<GlobalNamingResources>-<Resourcename="jcr/repositoryFactory"-type="org.apache.jackrabbit.core.jndi.BindableRepository"/>-<ResourceParamsname="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>-<Resourcename="ChandlerUserDB"-type="javax.sql.DataSource"-description="ChandlerServerUserDB"/>-<ResourceParamsname="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&lorg |
|
| b...@fluxent.com> |
<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.hot+*BUILDING.txt0.2RELEASE===========@@-14,8+16,6@@*makiskPersistent="false"diskExpiryThreadIntervalSeconds="120"/>-<cachename="org.osaf.chandler.server.model.Role"+<cachename="org.osaf.cosmo.model.Role"eternal="false"maxElementsInMemory="100000"overflowToDisk="true"timeToIdleSeconds="300"timeToLiveSeconds="300"diskPersistent="false"diskExpiryThreadIntervalSeconds="120"/>-<cachename="org.osaf.chandler.server.model.User"+<cachename="org.osaf.cosmo.model.User"eternal="false"maxElementsInMemory="100000"overflowToDisk="true"timeToIdleSeconds="300"timeToLiveSeconds="300"diskPersistent="false"Index:server/docs/TODO.txtdiff-userver/docs/TODO.txt:1.46server/docs/TODO.txt:1.47---server/docs/TODO.txt:1.46FriApr814:43:292005+++server/docs/TODO.txtFriApr816:53:272005@@-2,10+2,12@@0.1RELEASE===========-*packcore/etcfilesintocorejarratherthanputtingthemin-WEB-INF/classes-*setcosmoversionasenventryratherthanproperty-*getridofpropertiesfile+docs:++*rewriteallexistingdocs+*FAQ.txt+*LICENSE.txt+*BUILDING.txt0.2RELEASE===========@@-14,8+16,6@@*makenewmodule'cosmo'*usemaven-*rename"web"subprojecttosomethingbetter-*changeallpackagesfromorg.osaf.chandler.servertoorg.osaf.cosmo*precompilejspsfordistributioncore:@@-58,10+58,6@@*Windowsstartupscript*validationofinstallprocedurebyotherpeople-docs:+dist:-*rewriteallexistingdocs-*FAQ.txt-*LICENSE.txt-*BUILDING.txt-*havesomebodyeditalldocs+*WindowsstartupscriptIndex:server/web/web/WEB-INF/web.xmldiff-userver/web/web/WEB-INF/web.xml:1.2server/web/web/WEB-INF/web.xml:1.3---server/web/web/WEB-INF/web.xml:1.2FriApr814:43:312005+++server/web/web/WEB-INF/web.xmlFriApr816:53:302005@@-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>ChandlerServer</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.xmldiff-userver/etc/server.xml:1.16server/etc/server.xml:1.17---server/etc/server.xml:1.16FriApr814:43:292005+++server/etc/server.xmlFriApr816:53:272005@@-1,80+1,10@@<Serverport="8005"shutdown="SHUTDOWN">-<GlobalNamingResources>-<Resourcename="jcr/repositoryFactory"-type="org.apache.jackrabbit.core.jndi.BindableRepository"/>-<ResourceParamsname="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>-<Resourcename="ChandlerUserDB"-type="javax.sql.DataSource"-description="ChandlerServerUserDB"/>-<ResourceParamsname="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&lorg |
Mon, 01 Mar, 21:49 |
|
cho>+<sqldriver="${cosmo.dist.userdb.driver}"+url="${cosmo.dist.userdb.url}"+userid="${cosmo.dist.userdb.username}"+password="${cosmo.dist.userdb.password}">+<filesetdir="${cosmo.db}"><includename="schema.sql"/></fileset><classpath>@@-109,7+107,7@@<targetname="test-gen"depends="test-prepare"description="generatetestHibernateconfigfile">-<antdir="${chsrv.home}"target="test-gen"inheritAll="false"/>+<antdir="${cosmo.home}"target="test-gen"inheritAll="false"/></target><targetname="test-compile"depends="test-prepare,test-gen"@@-135,7+133,7@@</fileset><filterset><filtertoken="CONFIGFILEPATH"-value="${chsrv.etc}/repository.xml"/>+value="${cosmo.etc}/repository.xml"/><filtertoken="REPOSITORYHOMEDIRPATH"value="${core.test}/repository"/></filterset>@@-148,12+146,9@@<includename="applicationContext-base.xml"/><includename="applicationContext-hibernate.xml"/><includename="applicationContext-manager.xml"/>-<includename="applicationContext-slide-client.xml"/>-<includename="applicationContext-webdav-client.xml"/>-<includename="chandler.properties"/><includename="ehcache.xml"/></fileset>-<filesetdir="${chsrv.test}">+<filesetdir="${cosmo.test}"><includename="hibernate.cfg.xml"/></fileset></copy>Index:server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityManagerImpl.javadiff-userver/core/src/org/osaf/cosmo/security/impl/CosmoSecurityManagerImpl.java:1.3server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityManagerImpl.java:1.4---server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityManagerImpl.java:1.3WedMar3010:40:332005+++server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityManagerImpl.javaFriApr816:53:252005@@-1,8+1,7@@packageorg.osaf.cosmo.security.impl;-importorg.osaf.chandler.server.dao.UserDAO;-importorg.osaf.chandler.server.model.User;-+importorg.osaf.cosmo.dao.UserDAO;+importorg.osaf.cosmo.model.User;importorg.osaf.cosmo.security.CosmoSecurityContext;importorg.osaf.cosmo.security.CosmoSecurityException;importorg.osaf.cosmo.security.CosmoSecurityManager;Index:server/core/src/org/osaf/cosmo/security/impl/CosmoUserDetailsImpl.javadiff-userver/core/src/org/osaf/cosmo/security/impl/CosmoUserDetailsImpl.java:1.1server/core/src/org/osaf/cosmo/security/impl/CosmoUserDetailsImpl.java:1.2---server/core/src/org/osaf/cosmo/security/impl/CosmoUserDetailsImpl.java:1.1TueMar2910:00:002005+++server/core/src/org/osaf/cosmo/security/impl/CosmoUserDetailsImpl.javaFriApr816:53:252005@@-1,8+1,7@@packageorg.osaf.cosmo.security.impl;-importorg.osaf.chandler.server.model.Role;-importorg.osaf.chandler.server.model.User;-+importorg.osaf.cosmo.model.Role;+importorg.osaf.cosmo.model.User;importorg.osaf.cosmo.security.CosmoUserDetails;importjava.util.ArrayList;Index:server/core/etc/ehcache.xmldiff-userver/core/etc/ehcache.xml:1.1server/core/etc/ehcache.xml:1.2---server/core/etc/ehcache.xml:1.1TueFeb2221:17:302005+++server/core/etc/ehcache.xmlFriApr816:53:162005@@-7,12+7,12@@overflowToDisk="true"timeToIdleSeconds="300"timeToLiveSeconds="300"diskPersistent="false"diskExpiryThreadIntervalSeconds="120"/>-<cachename="org.osaf.chandler.server.model.Role"+<cachename="org.osaf.cosmo.model.Role"eternal="false"maxElementsInMemory="100000"overflowToDisk="true"timeToIdleSeconds="300"timeToLiveSeconds="300"diskPersistent="false"diskExpiryThreadIntervalSeconds="120"/>-<cachename="org.osaf.chandler.server.model.User"+<cachename="org.osaf.cosmo.model.User"eternal="false"maxElementsInMemory="100000"overflowToDisk="true"timeToIdleSeconds="300"timeToLiveSeconds="300"diskPersistent="false"Index:server/docs/TODO.txtdiff-userver/docs/TODO.txt:1.46server/docs/TODO.txt:1.47---server/docs/TODO.txt:1.46FriApr814:43:292005+++server/docs/TODO.txtFriApr816:53:272005@@-2,10+2,12@@0.1RELEASE===========-*packcore/etcfilesintocorejarratherthanputtingthemin-WEB-INF/classes-*setcosmoversionasenventryratherthanproperty-*getridofpropertiesfile+docs:++*rewriteallexistingdocs+*FAQ.txt+*LICENSE.txt+*BUILDING.txt0.2RELEASE===========@@-14,8+16,6@@*makenewmodule'cosmo'*usemaven-*rename"web"subprojecttosomethingbetter-*changeallpackagesfromorg.osaf.chandler.servertoorg.osaf.cosmo*precompilejspsfordistributioncore:@@-58,10+58,6@@*Windowsstartupscript*validationofinstallprocedurebyotherpeople-docs:+dist:-*rewriteallexistingdocs-*FAQ.txt-*LICENSE.txt-*BUILDING.txt-*havesomebodyeditalldocs+*WindowsstartupscriptIndex:server/web/web/WEB-INF/web.xmldiff-userver/web/web/WEB-INF/web.xml:1.2server/web/web/WEB-INF/web.xml:1.3---server/web/web/WEB-INF/web.xml:1.2FriApr814:43:312005+++server/web/web/WEB-INF/web.xmlFriApr816:53:302005@@-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>ChandlerServer</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.xmldiff-userver/etc/server.xml:1.16server/etc/server.xml:1.17---server/etc/server.xml:1.16FriApr814:43:292005+++server/etc/server.xmlFriApr816:53:272005@@-1,80+1,10@@<Serverport="8005"shutdown="SHUTDOWN">-<GlobalNamingResources>-<Resourcename="jcr/repositoryFactory"-type="org.apache.jackrabbit.core.jndi.BindableRepository"/>-<ResourceParamsname="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>-<Resourcename="ChandlerUserDB"-type="javax.sql.DataSource"-description="ChandlerServerUserDB"/>-<ResourceParamsname="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><Servicename="Catalina"><Connectorport="8080"enableLookups="false"/><Connectorport="8443"enableLookups="false"secure="true"scheme="https"clientAuth="want"-keystorePass="chandler"/>+keystorePass="osafcosmo"/><Enginename="Catalina"defaultHost="localhost">-<LoggerclassName="org.apache.catalina.logger.SystemOutLogger"/>-<ValveclassName="org.apache.catalina.valves.AccessLogValve"-directory="../logs"pattern="combined"-resolveHosts="false"/>-<RealmclassName="org.apache.catalina.realm.DataSourceRealm"-dataSourceName="ChandlerUserDB"-roleNameCol="rolename"-userCredCol="password"-userNameCol="username"-userRoleTable="userrole"-userTable="user"-digest="MD5"-debug="0"/><Hostname="localhost"appBase="webapps"autoDeploy="false"deployOnStartup="false"debug="0"/></Engine>Index:server/core/etc/applicationContext-base.xmldiff-userver/core/etc/applicationContext-base.xml:1.2server/core/etc/applicationContext-base.xml:1.3---server/core/etc/applicationContext-base.xml:1.2FriApr813:04:492005+++server/core/etc/applicationContext-base.xmlFriApr816:53:162005@@-7,10+7,13@@<!--Properties-->-<beanid="propertyConfigurer"-class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">-<propertyname="location">-<value>classpath:chandler.properties</value>+<beanid="cosmoVersion"+class="org.springframework.jndi.JndiObjectFactoryBean">+<propertyname="jndiName">+<value>cosmo/version</value>+</property>+<propertyname="resourceRef">+<value>true</value></property></bean>@@-19,7+22,7@@<propertyname="attributes"><map><entrykey="cosmoVersion">-<value>${cosmo.version}</value>+<reflocal="cosmoVersion"/></entry></map></property>Index:server/core/src/org/osaf/cosmo/security/CosmoSecurityContext.javadiff-userver/core/src/org/osaf/cosmo/security/CosmoSecurityContext.java:1.2server/core/src/org/osaf/cosmo/security/CosmoSecurityContext.java:1.3---server/core/src/org/osaf/cosmo/security/CosmoSecurityContext.java:1.2WedMar3010:40:332005+++server/core/src/org/osaf/cosmo/security/CosmoSecurityContext.javaFriApr816:53:242005@@-1,6+1,6@@packageorg.osaf.cosmo.security;-importorg.osaf.chandler.server.model.User;+importorg.osaf.cosmo.model.User;importjavax.security.auth.Subject;Index:server/web/build.xmldiff-userver/web/build.xml:1.2server/web/build.xml:1.3---server/web/build.xml:1.2FriApr814:43:292005+++server/web/build.xmlFriApr816:53:272005@@-1,12+1,12@@<projectname="CosmoWebApplication"default="pack"basedir=".">-<propertyname="chsrv.home"value="${basedir}/.."/>+<propertyname="cosmo.home"value="${basedir}/.."/><propertyname="web.home"value="${basedir}"/><propertyenvironment="env"/>-<propertyfile="${chsrv.home}/build.properties"/>-<propertyfile="${chsrv.home}/shared.properties"/>+<propertyfile="${cosmo.home}/build.properties"/>+<propertyfile="${cosmo.home}/shared.properties"/><!--CLASSPATHS-->@@-18,6+18,7@@<pathelementlocation="${jcr.jar}"/><pathelementlocation="${jcr-server.jar}"/><pathelementlocation="${jcr-webdav.jar}"/>+<pathelementlocation="${jspapi.jar}"/><pathelementlocation="${log4j.jar}"/><pathelementlocation="${servletapi.jar}"/><pathelementlocation="${spring.jar}"/>@@-51,7+52,11@@</fileset></copy><jardestfile="${web.build}/cosmo-web.jar"-basedir="${web.build}/classes"/>+basedir="${web.build}/classes">+<metainfdir="${web.src}">+<includename="*cosmo.tld"/>+</metainf>+</jar><copytodir="${web.build}/webapp"><filesetdir="${web.web}"/></copy>@@-61,28+66,12@@</fileset></copy><copytodir="${web.build}/webapp/WEB-INF/classes">-<filesetdir="${chsrv.etc}">+<filesetdir="${cosmo.etc}"><includename="log4j.xml"/></fileset>-<filesetdir="${core.etc}">-<excludename="applicationContext-slide-client.xml"/>-<excludename="applicationContext-webdav-client.xml"/>-<includename="*.xml"/>-</fileset>-<filesetdir="${core.build}/classes">-<includename="hibernate.cfg.xml"/>-</fileset>-</copy>-<copytodir="${web.build}/webapp/WEB-INF/classes">-<filesetdir="${core.etc}">-<includename="chandler.properties"/>-</fileset>-<filterset>-<filtertoken="VERSION"value="${chsrv.version}"/>-</filterset></copy><copytodir="${web.build}/webapp/WEB-INF/lib"-file="${core.build}/chandler-server-core.jar"/>+file="${core.build}/cosmo-core.jar"/><copytodir="${web.build}/webapp/WEB-INF/lib"file="${web.build}/cosmo-web.jar"/><copytodir="${web.build}/webapp/WEB-INF/lib"file="${acegi-security.jar}"/>@@-167,10+156,9@@<includename="applicationContext-jcr-client.xml"/><includename="applicationContext-manager.xml"/><includename="applicationContext-security.xml"/>-<includename="chandler.properties"/><includename="ehcache.xml"/></fileset>-<filesetdir="${chsrv.test}">+<filesetdir="${cosmo.test}"><includename="hibernate.cfg.xml"/></fileset></copy>Index:server/web/etc/applicationContext-adapter-dav.xmldiff-userver/web/etc/applicationContext-adapter-dav.xml:1.1server/web/etc/applicationContext-adapter-dav.xml:1.2---server/web/etc/applicationContext-adapter-dav.xml:1.1FriApr814:43:302005+++server/web/etc/applicationContext-adapter-dav.xmlFriApr816:53:282005@@-11,10+11,10@@<beanid="jcrRepository"class="org.springframework.jndi.JndiObjectFactoryBean"><propertyname="jndiName">-<value>${cosmo.jcr.jndi.name}</value>+<value>jcr/repositoryFactory</value></property><propertyname="resourceRef">-<value>${cosmo.jcr.jndi.resourceRef}</value>+<value>true</value></property></bean>Index:server/web/src/org/osaf/cosmo/ui/CosmoErrorAction.javadiff-userver/web/src/org/osaf/cosmo/ui/CosmoErrorAction.java:1.1server/web/src/org/osaf/cosmo/ui/CosmoErrorAction.java:1.2---server/web/src/org/osaf/cosmo/ui/CosmoErrorAction.java:1.1FriApr814:43:312005+++server/web/src/org/osaf/cosmo/ui/CosmoErrorAction.javaFriApr816:53:282005@@-1,6+1,5@@packageorg.osaf.cosmo.ui;-importorg.osaf.spring.webdav.WebdavResourceNotFoundException;importorg.osaf.struts.OSAFErrorAction;importorg.osaf.struts.OSAFStrutsConstants;@@-18,6+17,7@@importorg.apache.struts.action.ActionMapping;importorg.springframework.dao.DataAccessResourceFailureException;+importorg.springframework.orm.ObjectRetrievalFailureException;/***AnOSAFErrorActionthatchoosestheappropriateerrorviewbasedon@@-86,6+86,6@@}privatebooleanisNotFoundError(Throwablet){-returntinstanceofWebdavResourceNotFoundException;+returntinstanceofObjectRetrievalFailureException;}}Index:server/core/etc/applicationContext-hibernate.xmldiff-userver/core/etc/applicationContext-hibernate.xml:1.1server/core/etc/applicationContext-hibernate.xml:1.2---server/core/etc/applicationContext-hibernate.xml:1.1ThuMar1719:26:162005+++server/core/etc/applicationContext-hibernate.xmlFriApr816:53:162005@@-24,14+24,14@@<!--HibernateDAOs--><beanid="roleDAO"-class="org.osaf.chandler.server.dao.hibernate.RoleDAOHibernate">+class="org.osaf.cosmo.dao.hibernate.RoleDAOHibernate"><propertyname="sessionFactory"><reflocal="sessionFactory"/></property></bean><beanid="userDAO"-class="org.osaf.chandler.server.dao.hibernate.UserDAOHibernate">+class="org.osaf.cosmo.dao.hibernate.UserDAOHibernate"><propertyname="sessionFactory"><reflocal="sessionFactory"/></property>Index:server/web/src/org/osaf/cosmo/ui/UserAction.javadiff-userver/web/src/org/osaf/cosmo/ui/UserAction.java:1.1server/web/src/org/osaf/cosmo/ui/UserAction.java:1.2---server/web/src/org/osaf/cosmo/ui/UserAction.java:1.1FriApr814:43:312005+++server/web/src/org/osaf/cosmo/ui/UserAction.javaFriApr816:53:282005@@-1,8+1,8@@packageorg.osaf.cosmo.ui;-importorg.osaf.chandler.server.manager.ProvisioningManager;-importorg.osaf.chandler.server.model.Role;-importorg.osaf.chandler.server.model.User;+importorg.osaf.cosmo.manager.ProvisioningManager;+importorg.osaf.cosmo.model.Role;+importorg.osaf.cosmo.model.User;importorg.osaf.cosmo.security.CosmoSecurityManager;importorg.osaf.struts.OSAFMappingDispatchAction;importorg.osaf.struts.OSAFStrutsConstants;Index:server/core/etc/applicationContext-jcr-client.xmldiff-userver/core/etc/applicationContext-jcr-client.xml:1.5server/core/etc/applicationContext-jcr-client.xml:1.6---server/core/etc/applicationContext-jcr-client.xml:1.5WedMar3011:35:292005+++server/core/etc/applicationContext-jcr-client.xmlFriApr816:53:162005@@-10,10+10,10@@<beanid="jcrRepository"class="org.springframework.jndi.JndiObjectFactoryBean"><propertyname="jndiName">-<value>${cosmo.jcr.jndi.name}</value>+<value>jcr/repositoryFactory</value></property><propertyname="resourceRef">-<value>${cosmo.jcr.jndi.resourceRef}</value>+<value>true</value></property></bean>@@-38,7+38,7@@</bean><beanid="shareDAO"-class="org.osaf.chandler.server.dao.jcr.ContentStoreDAOJCR">+class="org.osaf.cosmo.dao.jcr.ContentStoreDAOJCR"><propertyname="template"><reflocal="homedirTemplate"/></property>Index:server/shared.propertiesdiff-userver/shared.properties:1.16server/shared.properties:1.17---server/shared.properties:1.16FriApr814:43:282005+++server/shared.propertiesFriApr816:53:152005@@-3,8+3,8@@#versioninfo#-chsrv.version=0.1-chsrv.tag=0_1+cosmo.version=0.1+cosmo.tag=0_1##compileoptions@@-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}/corecore.build=${core.home}/buildcore.src=${core.home}/srccore.etc=${core.home}/etccore.test=${core.home}/test-web.home=${chsrv.home}/web+web.home=${cosmo.home}/webweb.build=${web.home}/buildweb.src=${web.home}/srcweb.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.gzmaven.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.jarcommons-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-lbernate">+class="org.osaf.cosmo.dao.hibernate.RoleDAOHibernate"><propertyname="sessionFactory"><reflocal="sessionFactory"/></property></bean><beanid="userDAO"-class="org.osaf.chandler.server.dao.hibernate.UserDAOHibernate">+class="org.osaf.cosmo.dao.hibernate.UserDAOHibernate"><propertyname="sessionFactory"><reflocal="sessionFactory"/></property>Index:server/web/src/org/osaf/cosmo/ui/UserAction.javadiff-userver/web/src/org/osaf/cosmo/ui/UserAction.java:1.1server/web/src/org/osaf/cosmo/ui/UserAction.java:1.2---server/web/src/org/osaf/cosmo/ui/UserAction.java:1.1FriApr814:43:312005+++server/web/src/org/osaf/cosmo/ui/UserAction.javaFriApr816:53:282005@@-1,8+1,8@@packageorg.osaf.cosmo.ui;-importorg.osaf.chandler.server.manager.ProvisioningManager;-importorg.osaf.chandler.server.model.Role;-importorg.osaf.chandler.server.model.User;+importorg.osaf.cosmo.manager.ProvisioningManager;+importorg.osaf.cosmo.model.Role;+importorg.osaf.cosmo.model.User;importorg.osaf.cosmo.security.CosmoSecurityManager;importorg.osaf.struts.OSAFMappingDispatchAction;importorg.osaf.struts.OSAFStrutsConstants;Index:server/core/etc/applicationContext-jcr-client.xmldiff-userver/core/etc/applicationContext-jcr-client.xml:1.5server/core/etc/applicationContext-jcr-client.xml:1.6---server/core/etc/applicationContext-jcr-client.xml:1.5WedMar3011:35:292005+++server/core/etc/applicationContext-jcr-client.xmlFriApr816:53:162005@@-10,10+10,10@@<beanid="jcrRepository"class="org.springframework.jndi.JndiObjectFactoryBean"><propertyname="jndiName">-<value>${cosmo.jcr.jndi.name}</value>+<value>jcr/repositoryFactory</value></property><propertyname="resourceRef">-<value>${cosmo.jcr.jndi.resourceRef}</value>+<value>true</value></property></bean>@@-38,7+38,7@@</bean><beanid="shareDAO"-class="org.osaf.chandler.server.dao.jcr.ContentStoreDAOJCR">+class="org.osaf.cosmo.dao.jcr.ContentStoreDAOJCR"><propertyname="template"><reflocal="homedirTemplate"/></property>Index:server/shared.propertiesdiff-userver/shared.properties:1.16server/shared.properties:1.17---server/shared.properties:1.16FriApr814:43:282005+++server/sme="dist-clean"description="removedthereleasedistribution">-<deletefile="${chsrv.dist.version}.tar.gz"/>-<deletedir="${chsrv.dist.version}"/>+<deletefile="${cosmo.dist.version}.tar.gz"/>+<deletedir="${cosmo.dist.version}"/></target><targetname="dist-clean-data"description="cleanoutthedistributionruntimedata">-<deletedir="${chsrv.dist.version}/data"/>+<deletedir="${cosmo.X006194@tutu.osafoundation.org> |
|
|
cho>+<sqldriver="${cosmo.dist.userdb.driver}"+url="${cosmo.dist.userdb.url}"+userid="${cosmo.dist.userdb.username}"+password="${cosmo.dist.userdb.password}">+<filesetdir="${cosmo.db}"><includename="schema.sql"/></fileset><classpath>@@-109,7+107,7@@<targetname="test-gen"depends="test-prepare"description="generatetestHibernateconfigfile">-<antdir="${chsrv.home}"target="test-gen"inheritAll="false"/>+<antdir="${cosmo.home}"target="test-gen"inheritAll="false"/></target><targetname="test-compile"depends="test-prepare,test-gen"@@-135,7+133,7@@</fileset><filterset><filtertoken="CONFIGFILEPATH"-value="${chsrv.etc}/repository.xml"/>+value="${cosmo.etc}/repository.xml"/><filtertoken="REPOSITORYHOMEDIRPATH"value="${core.test}/repository"/></filterset>@@-148,12+146,9@@<includename="applicationContext-base.xml"/><includename="applicationContext-hibernate.xml"/><includename="applicationContext-manager.xml"/>-<includename="applicationContext-slide-client.xml"/>-<includename="applicationContext-webdav-client.xml"/>-<includename="chandler.properties"/><includename="ehcache.xml"/></fileset>-<filesetdir="${chsrv.test}">+<filesetdir="${cosmo.test}"><includename="hibernate.cfg.xml"/></fileset></copy>Index:server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityManagerImpl.javadiff-userver/core/src/org/osaf/cosmo/security/impl/CosmoSecurityManagerImpl.java:1.3server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityManagerImpl.java:1.4---server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityManagerImpl.java:1.3WedMar3010:40:332005+++server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityManagerImpl.javaFriApr816:53:252005@@-1,8+1,7@@packageorg.osaf.cosmo.security.impl;-importorg.osaf.chandler.server.dao.UserDAO;-importorg.osaf.chandler.server.model.User;-+importorg.osaf.cosmo.dao.UserDAO;+importorg.osaf.cosmo.model.User;importorg.osaf.cosmo.security.CosmoSecurityContext;importorg.osaf.cosmo.security.CosmoSecurityException;importorg.osaf.cosmo.security.CosmoSecurityManager;Index:server/core/src/org/osaf/cosmo/security/impl/CosmoUserDetailsImpl.javadiff-userver/core/src/org/osaf/cosmo/security/impl/CosmoUserDetailsImpl.java:1.1server/core/src/org/osaf/cosmo/security/impl/CosmoUserDetailsImpl.java:1.2---server/core/src/org/osaf/cosmo/security/impl/CosmoUserDetailsImpl.java:1.1TueMar2910:00:002005+++server/core/src/org/osaf/cosmo/security/impl/CosmoUserDetailsImpl.javaFriApr816:53:252005@@-1,8+1,7@@packageorg.osaf.cosmo.security.impl;-importorg.osaf.chandler.server.model.Role;-importorg.osaf.chandler.server.model.User;-+importorg.osaf.cosmo.model.Role;+importorg.osaf.cosmo.model.User;importorg.osaf.cosmo.security.CosmoUserDetails;importjava.util.ArrayList;Index:server/core/etc/ehcache.xmldiff-userver/core/etc/ehcache.xml:1.1server/core/etc/ehcache.xml:1.2---server/core/etc/ehcache.xml:1.1TueFeb2221:17:302005+++server/core/etc/ehcache.xmlFriApr816:53:162005@@-7,12+7,12@@overflowToDisk="true"timeToIdleSeconds="300"timeToLiveSeconds="300"diskPersistent="false"diskExpiryThreadIntervalSeconds="120"/>-<cachename="org.osaf.chandler.server.model.Role"+<cachename="org.osaf.cosmo.model.Role"eternal="false"maxElementsInMemory="100000"overflowToDisk="true"timeToIdleSeconds="300"timeToLiveSeconds="300"diskPersistent="false"diskExpiryThreadIntervalSeconds="120"/>-<cachename="org.osaf.chandler.server.model.User"+<cachename="org.osaf.cosmo.model.User"eternal="false"maxElementsInMemory="100000"overflowToDisk="true"timeToIdleSeconds="300"timeToLiveSeconds="300"diskPersistent="false"Index:server/docs/TODO.txtdiff-userver/docs/TODO.txt:1.46server/docs/TODO.txt:1.47---server/docs/TODO.txt:1.46FriApr814:43:292005+++server/docs/TODO.txtFriApr816:53:272005@@-2,10+2,12@@0.1RELEASE===========-*packcore/etcfilesintocorejarratherthanputtingthemin-WEB-INF/classes-*setcosmoversionasenventryratherthanproperty-*getridofpropertiesfile+docs:++*rewriteallexistingdocs+*FAQ.txt+*LICENSE.txt+*BUILDING.txt0.2RELEASE===========@@-14,8+16,6@@*makenewmodule'cosmo'*usemaven-*rename"web"subprojecttosomethingbetter-*changeallpackagesfromorg.osaf.chandler.servertoorg.osaf.cosmo*precompilejspsfordistributioncore:@@-58,10+58,6@@*Windowsstartupscript*validationofinstallprocedurebyotherpeople-docs:+dist:-*rewriteallexistingdocs-*FAQ.txt-*LICENSE.txt-*BUILDING.txt-*havesomebodyeditalldocs+*WindowsstartupscriptIndex:server/web/web/WEB-INF/web.xmldiff-userver/web/web/WEB-INF/web.xml:1.2server/web/web/WEB-INF/web.xml:1.3---server/web/web/WEB-INF/web.xml:1.2FriApr814:43:312005+++server/web/web/WEB-INF/web.xmlFriApr816:53:302005@@-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>ChandlerServer</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.xmldiff-userver/etc/server.xml:1.16server/etc/server.xml:1.17---server/etc/server.xml:1.16FriApr814:43:292005+++server/etc/server.xmlFriApr816:53:272005@@-1,80+1,10@@<Serverport="8005"shutdown="SHUTDOWN">-<GlobalNamingResources>-<Resourcename="jcr/repositoryFactory"-type="org.apache.jackrabbit.core.jndi.BindableRepository"/>-<ResourceParamsname="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>-<Resourcename="ChandlerUserDB"-type="javax.sql.DataSource"-description="ChandlerServerUserDB"/>-<ResourceParamsname="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><Servicename="Catalina"><Connectorport="8080"enableLookups="false"/><Connectorport="8443"enableLookups="false"secure="true"scheme="https"clientAuth="want"-keystorePass="chandler"/>+keystorePass="osafcosmo"/><Enginename="Catalina"defaultHost="localhost">-<LoggerclassName="org.apache.catalina.logger.SystemOutLogger"/>-<ValveclassName="org.apache.catalina.valves.AccessLogValve"-directory="../logs"pattern="combined"-resolveHosts="false"/>-<RealmclassName="org.apache.catalina.realm.DataSourceRealm"-dataSourceName="ChandlerUserDB"-roleNameCol="rolename"-userCredCol="password"-userNameCol="username"-userRoleTable="userrole"-userTable="user"-digest="MD5"-debug="0"/><Hostname="localhost"appBase="webapps"autoDeploy="false"deployOnStartup="false"debug="0"/></Engine>Index:server/core/etc/applicationContext-base.xmldiff-userver/core/etc/applicationContext-base.xml:1.2server/core/etc/applicationContext-base.xml:1.3---server/core/etc/applicationContext-base.xml:1.2FriApr813:04:492005+++server/core/etc/applicationContext-base.xmlFriApr816:53:162005@@-7,10+7,13@@<!--Properties-->-<beanid="propertyConfigurer"-class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">-<propertyname="location">-<value>classpath:chandler.properties</value>+<beanid="cosmoVersion"+class="org.springframework.jndi.JndiObjectFactoryBean">+<propertyname="jndiName">+<value>cosmo/version</value>+</property>+<propertyname="resourceRef">+<value>true</value></property></bean>@@-19,7+22,7@@<propertyname="attributes"><map><entrykey="cosmoVersion">-<value>${cosmo.version}</value>+<reflocal="cosmoVersion"/></entry></map></property>Index:server/core/src/org/osaf/cosmo/security/CosmoSecurityContext.javadiff-userver/core/src/org/osaf/cosmo/security/CosmoSecurityContext.java:1.2server/core/src/org/osaf/cosmo/security/CosmoSecurityContext.java:1.3---server/core/src/org/osaf/cosmo/security/CosmoSecurityContext.java:1.2WedMar3010:40:332005+++server/core/src/org/osaf/cosmo/security/CosmoSecurityContext.javaFriApr816:53:242005@@-1,6+1,6@@packageorg.osaf.cosmo.security;-importorg.osaf.chandler.server.model.User;+importorg.osaf.cosmo.model.User;importjavax.security.auth.Subject;Index:server/web/build.xmldiff-userver/web/build.xml:1.2server/web/build.xml:1.3---server/web/build.xml:1.2FriApr814:43:292005+++server/web/build.xmlFriApr816:53:272005@@-1,12+1,12@@<projectname="CosmoWebApplication"default="pack"basedir=".">-<propertyname="chsrv.home"value="${basedir}/.."/>+<propertyname="cosmo.home"value="${basedir}/.."/><propertyname="web.home"value="${basedir}"/><propertyenvironment="env"/>-<propertyfile="${chsrv.home}/build.properties"/>-<propertyfile="${chsrv.home}/shared.properties"/>+<propertyfile="${cosmo.home}/build.properties"/>+<propertyfile="${cosmo.home}/shared.properties"/><!--CLASSPATHS-->@@-18,6+18,7@@<pathelementlocation="${jcr.jar}"/><pathelementlocation="${jcr-server.jar}"/><pathelementlocation="${jcr-webdav.jar}"/>+<pathelementlocation="${jspapi.jar}"/><pathelementlocation="${log4j.jar}"/><pathelementlocation="${servletapi.jar}"/><pathelementlocation="${spring.jar}"/>@@-51,7+52,11@@</fileset></copy><jardestfile="${web.build}/cosmo-web.jar"-basedir="${web.build}/classes"/>+basedir="${web.build}/classes">+<metainfdir="${web.src}">+<includename="*cosmo.tld"/>+</metainf>+</jar><copytodir="${web.build}/webapp"><filesetdir="${web.web}"/></copy>@@-61,28+66,12@@</fileset></copy><copytodir="${web.build}/webapp/WEB-INF/classes">-<filesetdir="${chsrv.etc}">+<filesetdir="${cosmo.etc}"><includename="log4j.xml"/></fileset>-<filesetdir="${core.etc}">-<excludename="applicationContext-slide-client.xml"/>-<excludename="applicationContext-webdav-client.xml"/>-<includename="*.xml"/>-</fileset>-<filesetdir="${core.build}/classes">-<includename="hibernate.cfg.xml"/>-</fileset>-</copy>-<copytodir="${web.build}/webapp/WEB-INF/classes">-<filesetdir="${core.etc}">-<includename="chandler.properties"/>-</fileset>-<filterset>-<filtertoken="VERSION"value="${chsrv.version}"/>-</filterset></copy><copytodir="${web.build}/webapp/WEB-INF/lib"-file="${core.build}/chandler-server-core.jar"/>+file="${core.build}/cosmo-core.jar"/><copytodir="${web.build}/webapp/WEB-INF/lib"file="${web.build}/cosmo-web.jar"/><copytodir="${web.build}/webapp/WEB-INF/lib"file="${acegi-security.jar}"/>@@-167,10+156,9@@<includename="applicationContext-jcr-client.xml"/><includename="applicationContext-manager.xml"/><includename="applicationContext-security.xml"/>-<includename="chandler.properties"/><includename="ehcache.xml"/></fileset>-<filesetdir="${chsrv.test}">+<filesetdir="${cosmo.test}"><includename="hibernate.cfg.xml"/></fileset></copy>Index:server/web/etc/applicationContext-adapter-dav.xmldiff-userver/web/etc/applicationContext-adapter-dav.xml:1.1server/web/etc/applicationContext-adapter-dav.xml:1.2---server/web/etc/applicationContext-adapter-dav.xml:1.1FriApr814:43:302005+++server/web/etc/applicationContext-adapter-dav.xmlFriApr816:53:282005@@-11,10+11,10@@<beanid="jcrRepository"class="org.springframework.jndi.JndiObjectFactoryBean"><propertyname="jndiName">-<value>${cosmo.jcr.jndi.name}</value>+<value>jcr/repositoryFactory</value></property><propertyname="resourceRef">-<value>${cosmo.jcr.jndi.resourceRef}</value>+<value>true</value></property></bean>Index:server/web/src/org/osaf/cosmo/ui/CosmoErrorAction.javadiff-userver/web/src/org/osaf/cosmo/ui/CosmoErrorAction.java:1.1server/web/src/org/osaf/cosmo/ui/CosmoErrorAction.java:1.2---server/web/src/org/osaf/cosmo/ui/CosmoErrorAction.java:1.1FriApr814:43:312005+++server/web/src/org/osaf/cosmo/ui/CosmoErrorAction.javaFriApr816:53:282005@@-1,6+1,5@@packageorg.osaf.cosmo.ui;-importorg.osaf.spring.webdav.WebdavResourceNotFoundException;importorg.osaf.struts.OSAFErrorAction;importorg.osaf.struts.OSAFStrutsConstants;@@-18,6+17,7@@importorg.apache.struts.action.ActionMapping;importorg.springframework.dao.DataAccessResourceFailureException;+importorg.springframework.orm.ObjectRetrievalFailureException;/***AnOSAFErrorActionthatchoosestheappropriateerrorviewbasedon@@-86,6+86,6@@}privatebooleanisNotFoundError(Throwablet){-returntinstanceofWebdavResourceNotFoundException;+returntinstanceofObjectRetrievalFailureException;}}Index:server/core/etc/applicationContext-hibernate.xmldiff-userver/core/etc/applicationContext-hibernate.xml:1.1server/core/etc/applicationContext-hibernate.xml:1.2---server/core/etc/applicationContext-hibernate.xml:1.1ThuMar1719:26:162005+++server/core/etc/applicationContext-hibernate.xmlFriApr816:53:162005@@-24,14+24,14@@<!--HibernateDAOs--><beanid="roleDAO"-class="org.osaf.chandler.server.dao.hibernate.RoleDAOHibernate">+class="org.osaf.cosmo.dao.hibernate.RoleDAOHibernate"><propertyname="sessionFactory"><reflocal="sessionFactory"/></property></bean><beanid="userDAO"-class="org.osaf.chandler.server.dao.hibernate.UserDAOHibernate">+class="org.osaf.cosmo.dao.hibernate.UserDAOHibernate"><propertyname="sessionFactory"><reflocal="sessionFactory"/></property>Index:server/web/src/org/osaf/cosmo/ui/UserAction.javadiff-userver/web/src/org/osaf/cosmo/ui/UserAction.java:1.1server/web/src/org/osaf/cosmo/ui/UserAction.java:1.2---server/web/src/org/osaf/cosmo/ui/UserAction.java:1.1FriApr814:43:312005+++server/web/src/org/osaf/cosmo/ui/UserAction.javaFriApr816:53:282005@@-1,8+1,8@@packageorg.osaf.cosmo.ui;-importorg.osaf.chandler.server.manager.ProvisioningManager;-importorg.osaf.chandler.server.model.Role;-importorg.osaf.chandler.server.model.User;+importorg.osaf.cosmo.manager.ProvisioningManager;+importorg.osaf.cosmo.model.Role;+importorg.osaf.cosmo.model.User;importorg.osaf.cosmo.security.CosmoSecurityManager;importorg.osaf.struts.OSAFMappingDispatchAction;importorg.osaf.struts.OSAFStrutsConstants;Index:server/core/etc/applicationContext-jcr-client.xmldiff-userver/core/etc/applicationContext-jcr-client.xml:1.5server/core/etc/applicationContext-jcr-client.xml:1.6---server/core/etc/applicationContext-jcr-client.xml:1.5WedMar3011:35:292005+++server/core/etc/applicationContext-jcr-client.xmlFriApr816:53:162005@@-10,10+10,10@@<beanid="jcrRepository"class="org.springframework.jndi.JndiObjectFactoryBean"><propertyname="jndiName">-<value>${cosmo.jcr.jndi.name}</value>+<value>jcr/repositoryFactory</value></property><propertyname="resourceRef">-<value>${cosmo.jcr.jndi.resourceRef}</value>+<value>true</value></property></bean>@@-38,7+38,7@@</bean><beanid="shareDAO"-class="org.osaf.chandler.server.dao.jcr.ContentStoreDAOJCR">+class="org.osaf.cosmo.dao.jcr.ContentStoreDAOJCR"><propertyname="template"><reflocal="homedirTemplate"/></property>Index:server/shared.propertiesdiff-userver/shared.properties:1.16server/shared.properties:1.17---server/shared.properties:1.16FriApr814:43:282005+++server/shared.propertiesFriApr816:53:152005@@-3,8+3,8@@#versioninfo#-chsrv.version=0.1-chsrv.tag=0_1+cosmo.version=0.1+cosmo.tag=0_1##compileoptions@@-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}/corecore.build=${core.home}/buildcore.src=${core.home}/srccore.etc=${core.home}/etccore.test=${core.home}/test-web.home=${chsrv.home}/web+web.home=${cosmo.home}/webweb.build=${web.home}/buildweb.src=${web.home}/srcweb.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.gzmaven.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.jarcommons-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-lbernate">+class="org.osaf.cosmo.dao.hibernate.RoleDAOHibernate"><propertyname="sessionFactory"><reflocal="sessionFactory"/></property></bean><beanid="userDAO"-class="org.osaf.chandler.server.dao.hibernate.UserDAOHibernate">+class="org.osaf.cosmo.dao.hibernate.UserDAOHibernate"><propertyname="sessionFactory"><reflocal="sessionFactory"/></property>Index:server/web/src/org/osaf/cosmo/ui/UserAction.javadiff-userver/web/src/org/osaf/cosmo/ui/UserAction.java:1.1server/web/src/org/osaf/cosmo/ui/UserAction.java:1.2---server/web/src/org/osaf/cosmo/ui/UserAction.java:1.1FriApr814:43:312005+++server/web/src/org/osaf/cosmo/ui/UserAction.javaFriApr816:53:282005@@-1,8+1,8@@packageorg.osaf.cosmo.ui;-importorg.osaf.chandler.server.manager.ProvisioningManager;-importorg.osaf.chandler.server.model.Role;-importorg.osaf.chandler.server.model.User;+importorg.osaf.cosmo.manager.ProvisioningManager;+importorg.osaf.cosmo.model.Role;+importorg.osaf.cosmo.model.User;importorg.osaf.cosmo.security.CosmoSecurityManager;importorg.osaf.struts.OSAFMappingDispatchAction;importorg.osaf.struts.OSAFStrutsConstants;Index:server/core/etc/applicationContext-jcr-client.xmldiff-userver/core/etc/applicationContext-jcr-client.xml:1.5server/core/etc/applicationContext-jcr-client.xml:1.6---server/core/etc/applicationContext-jcr-client.xml:1.5WedMar3011:35:292005+++server/core/etc/applicationContext-jcr-client.xmlFriApr816:53:162005@@-10,10+10,10@@<beanid="jcrRepository"class="org.springframework.jndi.JndiObjectFactoryBean"><propertyname="jndiName">-<value>${cosmo.jcr.jndi.name}</value>+<value>jcr/repositoryFactory</value></property><propertyname="resourceRef">-<value>${cosmo.jcr.jndi.resourceRef}</value>+<value>true</value></property></bean>@@-38,7+38,7@@</bean><beanid="shareDAO"-class="org.osaf.chandler.server.dao.jcr.ContentStoreDAOJCR">+class="org.osaf.cosmo.dao.jcr.ContentStoreDAOJCR"><propertyname="template"><reflocal="homedirTemplate"/></property>Index:server/shared.propertiesdiff-userver/shared.properties:1.16server/shared.properties:1.17---server/shared.properties:1.16FriApr814:43:282005+++server/sme="dist-clean"description="removedthereleasedistribution">-<deletefile="${chsrv.dist.version}.tar.gz"/>-<deletedir="${chsrv.dist.version}"/>+<deletefile="${cosmo.dist.version}.tar.gz"/>+<deletedir="${cosmo.dist.version}"/></target><targetname="dist-clean-data"description="cleanoutthedistributionruntimedata">-<deletedir="${chsrv.dist.version}/data"/>+<deletedir="${cosmo.X006194@tutu.osafoundation.org> |
Sat, 27 Mar, 00:21 |
|
ibernateDocletTask">@@-31,7+31,6@@<pathelementlocation="${joda-time.jar}"/><pathelementlocation="${jspapi.jar}"/><pathelementlocation="${servletapi.jar}"/>-<pathelementlocation="${slide-webdavlib.jar}"/><pathelementlocation="${spring.jar}"/><pathelementlocation="${struts.jar}"/></path>@@-51,8+50,8@@<includename="**/*.java"/></fileset><hibernateversion="2.0"/>-<hibernatecfgdataSource="${chsrv.dist.userdb.dataSource}"-dialect="${chsrv.dist.userdb.dialect}"/>+<hibernatecfgdataSource="${cosmo.dist.userdb.dataSource}"+dialect="${cosmo.dist.userdb.dialect}"/></hibernatedoclet></target>@@-67,12+66,11@@</target><targetname="pack-jar"description="packthejar">-<jardestfile="${core.build}/chandler-server-core.jar"+<jardestfile="${core.build}/cosmo-core.jar"basedir="${core.build}/classes">-<excludename="hibernate.cfg.xml"/>-<metainfdir="${core.src}">-<includename="*chsrv-core.tld"/>-</metainf>+<filesetdir="${core.etc}">+<includename="*.xml"/>+</fileset></jar></target>@@-86,12+84,12@@<targetname="userdb-setup"description="setuptheuserdatabase">-<echo>Settingupdb${chsrv.dist.userdb.database}</echo>-<sqldriver="${chsrv.dist.userdb.driver}"-url="${chsrv.dist.userdb.url}"-userid="${chsrv.dist.userdb.username}"-password="${chsrv.dist.userdb.password}">-<filesetdir="${chsrv.db}">+<echo>Settingupdb${cosmo.dist.userdb.database}</echo>+<sqldriver="${cosmo.dist.userdb.driver}"+url="${cosmo.dist.userdb.url}"+userid="${cosmo.dist.userdb.username}"+password="${cosmo.dist.userdb.password}">+<filesetdir="${cosmo.db}"><includename="schema.sql"/></fileset><classpath>@@-109,7+107,7@@<targetname="test-gen"depends="test-prepare"description="generatetestHibernateconfigfile">-<antdir="${chsrv.home}"target="test-gen"inheritAll="false"/>+<antdir="${cosmo.home}"target="test-gen"inheritAll="false"/></target><targetname="test-compile"depends="test-prepare,test-gen"@@-135,7+133,7@@</fileset><filterset><filtertoken="CONFIGFILEPATH"-value="${chsrv.etc}/repository.xml"/>+value="${cosmo.etc}/repository.xml"/><filtertoken="REPOSITORYHOMEDIRPATH"value="${core.test}/repository"/></filterset>@@-148,12+146,9@@<includename="applicationContext-base.xml"/><includename="applicationContext-hibernate.xml"/><includename="applicationContext-manager.xml"/>-<includename="applicationContext-slide-client.xml"/>-<includename="applicationContext-webdav-client.xml"/>-<includename="chandler.properties"/><includename="ehcache.xml"/></fileset>-<filesetdir="${chsrv.test}">+<filesetdir="${cosmo.test}"><includename="hibernate.cfg.xml"/></fileset></copy>Index:server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityManagerImpl.javadiff-userver/core/src/org/osaf/cosmo/security/impl/CosmoSecurityManagerImpl.java:1.3server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityManagerImpl.java:1.4---server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityManagerImpl.java:1.3WedMar3010:40:332005+++server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityManagerImpl.javaFriApr816:53:252005@@-1,8+1,7@@packageorg.osaf.cosmo.security.impl;-importorg.osaf.chandler.server.dao.UserDAO;-importorg.osaf.chandler.server.model.User;-+importorg.osaf.cosmo.dao.UserDAO;+importorg.osaf.cosmo.model.User;importorg.osaf.cosmo.security.CosmoSecurityContext;importorg.osaf.cosmo.security.CosmoSecurityException;importorg.osaf.cosmo.security.CosmoSecurityManager;Index:server/core/src/org/osaf/cosmo/security/impl/CosmoUserDetailsImpl.javadiff-userver/core/src/org/osaf/cosmo/security/impl/CosmoUserDetailsImpl.java:1.1server/core/src/org/osaf/cosmo/security/impl/CosmoUserDetailsImpl.java:1.2---server/core/src/org/osaf/cosmo/security/impl/CosmoUserDetailsImpl.java:1.1TueMar2910:00:002005+++server/core/src/org/osaf/cosmo/security/impl/CosmoUserDetailsImpl.javaFriApr816:53:252005@@-1,8+1,7@@packageorg.osaf.cosmo.security.impl;-importorg.osaf.chandler.server.model.Role;-importorg.osaf.chandler.server.model.User;-+importorg.osaf.cosmo.model.Role;+importorg.osaf.cosmo.model.User;importorg.osaf.cosmo.security.CosmoUserDetails;importjava.util.ArrayList;Index:server/core/etc/ehcache.xmldiff-userver/core/etc/ehcache.xml:1.1server/core/etc/ehcache.xml:1.2---server/core/etc/ehcache.xml:1.1TueFeb2221:17:302005+++server/core/etc/ehcache.xmlFriApr816:53:162005@@-7,12+7,12@@overflowToDisk="true"timeToIdleSeconds="300"timeToLiveSeconds="300"diskPersistent="false"diskExpiryThreadIntervalSeconds="120"/>-<cachename="org.osaf.chandler.server.model.Role"+<cachename="org.osaf.cosmo.model.Role"eternal="false"maxElementsInMemory="100000"overflowToDisk="true"timeToIdleSeconds="300"timeToLiveSeconds="300"diskPersistent="false"diskExpiryThreadIntervalSeconds="120"/>-<cachename="org.osaf.chandler.server.model.User"+<cachename="org.osaf.cosmo.model.User"eternal="false"maxElementsInMemory="100000"overflowToDisk="true"timeToIdleSeconds="300"timeToLiveSeconds="300"diskPersistent="false"Index:server/docs/TODO.txtdiff-userver/docs/TODO.txt:1.46server/docs/TODO.txt:1.47---server/docs/TODO.txt:1.46FriApr814:43:292005+++server/docs/TODO.txtFriApr816:53:272005@@-2,10+2,12@@0.1RELEASE===========-*packcore/etcfilesintocorejarratherthanputtingthemin-WEB-INF/classes-*setcosmoversionasenventryratherthanproperty-*getridofpropertiesfile+docs:++*rewriteallexistingdocs+*FAQ.txt+*LICENSE.txt+*BUILDING.txt0.2RELEASE===========@@-14,8+16,6@@*makenewmodule'cosmo'*usemaven-*rename"web"subprojecttosomethingbetter-*changeallpackagesfromorg.osaf.chandler.servertoorg.osaf.cosmo*precompilejspsfordistributioncore:@@-58,10+58,6@@*Windowsstartupscript*validationofinstallprocedurebyotherpeople-docs:+dist:-*rewriteallexistingdocs-*FAQ.txt-*LICENSE.txt-*BUILDING.txt-*havesomebodyeditalldocs+*WindowsstartupscriptIndex:server/web/web/WEB-INF/web.xmldiff-userver/web/web/WEB-INF/web.xml:1.2server/web/web/WEB-INF/web.xml:1.3---server/web/web/WEB-INF/web.xml:1.2FriApr814:43:312005+++server/web/web/WEB-INF/web.xmlFriApr816:53:302005@@-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>ChandlerServer</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.xmldiff-userver/etc/server.xml:1.16server/etc/server.xml:1.17---server/etc/server.xml:1.16FriApr814:43:292005+++server/etc/server.xmlFriApr816:53:272005@@-1,80+1,10@@<Serverport="8005"shutdown="SHUTDOWN">-<GlobalNamingResources>-<Resourcename="jcr/repositoryFactory"-type="org.apache.jackrabbit.core.jndi.BindableRepository"/>-<ResourceParamsname="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>-<Resourcename="ChandlerUserDB"-type="javax.sql.DataSource"-description="ChandlerServerUserDB"/>-<ResourceParamsname="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><Servicename="Catalina"><Connectorport="8080"enableLookups="false"/><Connectorport="8443"enableLookups="false"secure="true"scheme="https"clientAuth="want"-keystorePass="chandler"/>+keystorePass="osafcosmo"/><Enginename="Catalina"defaultHost="localhost">-<LoggerclassName="org.apache.catalina.logger.SystemOutLogger"/>-<ValveclassName="org.apache.catalina.valves.AccessLogValve"-directory="../logs"pattern="combined"-resolveHosts="false"/>-<RealmclassName="org.apache.catalina.realm.DataSourceRealm"-dataSourceName="ChandlerUserDB"-roleNameCol="rolename"-userCredCol="password"-userNameCol="username"-userRoleTable="userrole"-userTable="user"-digest="MD5"-debug="0"/><Hostname="localhost"appBase="webapps"autoDeploy="false"deployOnStartup="false"debug="0"/></Engine>Index:server/core/etc/applicationContext-base.xmldiff-userver/core/etc/applicationContext-base.xml:1.2server/core/etc/applicationContext-base.xml:1.3---server/core/etc/applicationContext-base.xml:1.2FriApr813:04:492005+++server/core/etc/applicationContext-base.xmlFriApr816:53:162005@@-7,10+7,13@@<!--Properties-->-<beanid="propertyConfigurer"-class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">-<propertyname="location">-<value>classpath:chandler.properties</value>+<beanid="cosmoVersion"+class="org.springframework.jndi.JndiObjectFactoryBean">+<propertyname="jndiName">+<value>cosmo/version</value>+</property>+<propertyname="resourceRef">+<value>true</value></property></bean>@@-19,7+22,7@@<propertyname="attributes"><map><entrykey="cosmoVersion">-<value>${cosmo.version}</value>+<reflocal="cosmoVersion"/></entry></map></property>Index:server/core/src/org/osaf/cosmo/security/CosmoSecurityContext.javadiff-userver/core/src/org/osaf/cosmo/security/CosmoSecurityContext.java:1.2server/core/src/org/osaf/cosmo/security/CosmoSecurityContext.java:1.3---server/core/src/org/osaf/cosmo/security/CosmoSecurityContext.java:1.2WedMar3010:40:332005+++server/core/src/org/osaf/cosmo/security/CosmoSecurityContext.javaFriApr816:53:242005@@-1,6+1,6@@packageorg.osaf.cosmo.security;-importorg.osaf.chandler.server.model.User;+importorg.osaf.cosmo.model.User;importjavax.security.auth.Subject;Index:server/web/build.xmldiff-userver/web/build.xml:1.2server/web/build.xml:1.3---server/web/build.xml:1.2FriApr814:43:292005+++server/web/build.xmlFriApr816:53:272005@@-1,12+1,12@@<projectname="CosmoWebApplication"default="pack"basedir=".">-<propertyname="chsrv.home"value="${basedir}/.."/>+<propertyname="cosmo.home"value="${basedir}/.."/><propertyname="web.home"value="${basedir}"/><propertyenvironment="env"/>-<propertyfile="${chsrv.home}/build.properties"/>-<propertyfile="${chsrv.home}/shared.properties"/>+<propertyfile="${cosmo.home}/build.properties"/>+<propertyfile="${cosmo.home}/shared.properties"/><!--CLASSPATHS-->@@-18,6+18,7@@<pathelementlocation="${jcr.jar}"/><pathelementlocation="${jcr-server.jar}"/><pathelementlocation="${jcr-webdav.jar}"/>+<pathelementlocation="${jspapi.jar}"/><pathelementlocation="${log4j.jar}"/><pathelementlocation="${servletapi.jar}"/><pathelementlocation="${spring.jar}"/>@@-51,7+52,11@@</fileset></copy><jardestfile="${web.build}/cosmo-web.jar"-basedir="${web.build}/classes"/>+basedir="${web.build}/classes">+<metainfdir="${web.src}">+<includename="*cosmo.tld"/>+</metainf>+</jar><copytodir="${web.build}/webapp"><filesetdir="${web.web}"/></copy>@@-61,28+66,12@@</fileset></copy><copytodir="${web.build}/webapp/WEB-INF/classes">-<filesetdir="${chsrv.etc}">+<filesetdir="${cosmo.etc}"><includename="log4j.xml"/></fileset>-<filesetdir="${core.etc}">-<excludename="applicationContext-slide-client.xml"/>-<excludename="applicationContext-webdav-client.xml"/>-<includename="*.xml"/>-</fileset>-<filesetdir="${core.build}/classes">-<includename="hibernate.cfg.xml"/>-</fileset>-</copy>-<copytodir="${web.build}/webapp/WEB-INF/classes">-<filesetdir="${core.etc}">-<includename="chandler.properties"/>-</fileset>-<filterset>-<filtertoken="VERSION"value="${chsrv.version}"/>-</filterset></copy><copytodir="${web.build}/webapp/WEB-INF/lib"-file="${core.build}/chandler-server-core.jar"/>+file="${core.build}/cosmo-core.jar"/><copytodir="${web.build}/webapp/WEB-INF/lib"file="${web.build}/cosmo-web.jar"/><copytodir="${web.build}/webapp/WEB-INF/lib"file="${acegi-security.jar}"/>@@-167,10+156,9@@<includename="applicationContext-jcr-client.xml"/><includename="applicationContext-manager.xml"/><includename="applicationContext-security.xml"/>-<includename="chandler.properties"/><includename="ehcache.xml"/></fileset>-<filesetdir="${chsrv.test}">+<filesetdir="${cosmo.test}"><includename="hibernate.cfg.xml"/></fileset></copy>Index:server/web/etc/applicationContext-adapter-dav.xmldiff-userver/web/etc/applicationContext-adapter-dav.xml:1.1server/web/etc/applicationContext-adapter-dav.xml:1.2---server/web/etc/applicationContext-adapter-dav.xml:1.1FriApr814:43:302005+++server/web/etc/applicationContext-adapter-dav.xmlFriApr816:53:282005@@-11,10+11,10@@<beanid="jcrRepository"class="org.springframework.jndi.JndiObjectFactoryBean"><propertyname="jndiName">-<value>${cosmo.jcr.jndi.name}</value>+<value>jcr/repositoryFactory</value></property><propertyname="resourceRef">-<value>${cosmo.jcr.jndi.resourceRef}</value>+<value>true</value></property></bean>Index:server/web/src/org/osaf/cosmo/ui/CosmoErrorAction.javadiff-userver/web/src/org/osaf/cosmo/ui/CosmoErrorAction.java:1.1server/web/src/org/osaf/cosmo/ui/CosmoErrorAction.java:1.2---server/web/src/org/osaf/cosmo/ui/CosmoErrorAction.java:1.1FriApr814:43:312005+++server/web/src/org/osaf/cosmo/ui/CosmoErrorAction.javaFriApr816:53:282005@@-1,6+1,5@@packageorg.osaf.cosmo.ui;-importorg.osaf.spring.webdav.WebdavResourceNotFoundException;importorg.osaf.struts.OSAFErrorAction;importorg.osaf.struts.OSAFStrutsConstants;@@-18,6+17,7@@importorg.apache.struts.action.ActionMapping;importorg.springframework.dao.DataAccessResourceFailureException;+importorg.springframework.orm.ObjectRetrievalFailureException;/***AnOSAFErrorActionthatchoosestheappropriateerrorviewbasedon@@-86,6+86,6@@}privatebooleanisNotFoundError(Throwablet){-returntinstanceofWebdavResourceNotFoundException;+returntinstanceofObjectRetrievalFailureException;}}Index:server/core/etc/applicationContext-hibernate.xmldiff-userver/core/etc/applicationContext-hibernate.xml:1.1server/core/etc/applicationContext-hibernate.xml:1.2---server/core/etc/applicationContext-hibernate.xml:1.1ThuMar1719:26:162005+++server/core/etc/applicationContext-hibernate.xmlFriApr816:53:162005@@-24,14+24,14@@<!--HibernateDAOs--><beanid="roleDAO"-class="org.osaf.chandler.server.dao.hibernate.RoleDAOHibernate">+class="org.osaf.cosmo.dao.hibernate.RoleDAOHibernate"><propertyname="sessionFactory"><reflocal="sessionFactory"/></property></bean><beanid="userDAO"-class="org.osaf.chandler.server.dao.hibernate.UserDAOHibernate">+class="org.osaf.cosmo.dao.hibernate.UserDAOHibernate"><propertyname="sessionFactory"><reflocal="sessionFactory"/></property>Index:server/web/src/org/osaf/cosmo/ui/UserAction.javadiff-userver/web/src/org/osaf/cosmo/ui/UserAction.java:1.1server/web/src/org/osaf/cosmo/ui/UserAction.java:1.2---server/web/src/org/osaf/cosmo/ui/UserAction.java:1.1FriApr814:43:312005+++server/web/src/org/osaf/cosmo/ui/UserAction.javaFriApr816:53:282005@@-1,8+1,8@@packageorg.osaf.cosmo.ui;-importorg.osaf.chandler.server.manager.ProvisioningManager;-importorg.osaf.chandler.server.model.Role;-importorg.osaf.chandler.server.model.User;+importorg.osaf.cosmo.manager.ProvisioningManager;+importorg.osaf.cosmo.model.Role;+importorg.osaf.cosmo.model.User;importorg.osaf.cosmo.security.CosmoSecurityManager;importorg.osaf.struts.OSAFMappingDispatchAction;importorg.osaf.struts.OSAFStrutsConstants;Index:server/core/etc/applicationContext-jcr-client.xmldiff-userver/core/etc/applicationContext-jcr-client.xml:1.5server/core/etc/applicationContext-jcr-client.xml:1.6---server/core/etc/applicationContext-jcr-client.xml:1.5WedMar3011:35:292005+++server/core/etc/applicationContext-jcr-client.xmlFriApr816:53:162005@@-10,10+10,10@@<beanid="jcrRepository"class="org.springframework.jndi.JndiObjectFactoryBean"><propertyname="jndiName">-<value>${cosmo.jcr.jndi.name}</value>+<value>jcr/repositoryFactory</value></property><propertyname="resourceRef">-<value>${cosmo.jcr.jndi.resourceRef}</value>+<value>true</value></property></bean>@@-38,7+38,7@@</bean><beanid="shareDAO"-class="org.osaf.chandler.server.dao.jcr.ContentStoreDAOJCR">+class="org.osaf.cosmo.dao.jcr.ContentStoreDAOJCR"><propertyname="template"><reflocal="homedirTemplate"/></property>Index:server/shared.propertiesdiff-userver/shared.properties:1.16server/shared.properties:1.17---server/shared.properties:1.16FriApr814:43:282005+++ser- 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=${ct;template"&gt;
&lt;ref local="homedirTemplate"/&gt;
&lt;/property&gt;
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/sme="dist-clean"
description="removed the release distribution"&gt;
- &lt;delete file="${chsrv.dist.version}.tar.gz"/&gt;
- &lt;delete dir="${chsrv.dist.version}"/&gt;
+ &lt;delete file="${cosmo.dist.version}.tar.gz"/&gt;
+ &lt;delete dir="${cosmo.dist.version}"/&gt;
&lt;/target&gt;
&lt;target name="dist-clean-data"
description="clean out the distribution runtime data"&gt;
- &lt;delete dir="${chsrv.dist.version}/data"/&gt;
+ &lt;delete dir="${cosmo.X006194@tutu.osafoundae dir="${chsrv.dist.version}/data"/>
+ <delete dir="${cosmo.X006194@tutu.osafoundation.org> |
|
| eine.nu |
ibernateDocletTask">@@-31,7+31,6@@<pathelementlocation="${joda-time.jar}"/><pathelementlocation="${jspapi.jar}"/><pathelementlocation="${servletapi.jar}"/>-<pathelementlocation="${slide-webdavlib.jar}"/><pathelementlocation="${spring.jar}"/><pathelementlocation="${struts.jar}"/></path>@@-51,8+50,8@@<includename="**/*.java"/></fileset><hibernateversion="2.0"/>-<hibernatecfgdataSource="${chsrv.dist.userdb.dataSource}"-dialect="${chsrv.dist.userdb.dialect}"/>+<hibernatecfgdataSource="${cosmo.dist.userdb.dataSource}"+dialect="${cosmo.dist.userdb.dialect}"/></hibernatedoclet></target>@@-67,12+66,11@@</target><targetname="pack-jar"description="packthejar">-<jardestfile="${core.build}/chandler-server-core.jar"+<jardestfile="${core.build}/cosmo-core.jar"basedir="${core.build}/classes">-<excludename="hibernate.cfg.xml"/>-<metainfdir="${core.src}">-<includename="*chsrv-core.tld"/>-</metainf>+<filesetdir="${core.etc}">+<includename="*.xml"/>+</fileset></jar></target>@@-86,12+84,12@@<targetname="userdb-setup"description="setuptheuserdatabase">-<echo>Settingupdb${chsrv.dist.userdb.database}</echo>-<sqldriver="${chsrv.dist.userdb.driver}"-url="${chsrv.dist.userdb.url}"-userid="${chsrv.dist.userdb.username}"-password="${chsrv.dist.userdb.password}">-<filesetdir="${chsrv.db}">+<echo>Settingupdb${cosmo.dist.userdb.database}</echo>+<sqldriver="${cosmo.dist.userdb.driver}"+url="${cosmo.dist.userdb.url}"+userid="${cosmo.dist.userdb.username}"+password="${cosmo.dist.userdb.password}">+<filesetdir="${cosmo.db}"><includename="schema.sql"/></fileset><classpath>@@-109,7+107,7@@<targetname="test-gen"depends="test-prepare"description="generatetestHibernateconfigfile">-<antdir="${chsrv.home}"target="test-gen"inheritAll="false"/>+<antdir="${cosmo.home}"target="test-gen"inheritAll="false"/></target><targetname="test-compile"depends="test-prepare,test-gen"@@-135,7+133,7@@</fileset><filterset><filtertoken="CONFIGFILEPATH"-value="${chsrv.etc}/repository.xml"/>+value="${cosmo.etc}/repository.xml"/><filtertoken="REPOSITORYHOMEDIRPATH"value="${core.test}/repository"/></filterset>@@-148,12+146,9@@<includename="applicationContext-base.xml"/><includename="applicationContext-hibernate.xml"/><includename="applicationContext-manager.xml"/>-<includename="applicationContext-slide-client.xml"/>-<includename="applicationContext-webdav-client.xml"/>-<includename="chandler.properties"/><includename="ehcache.xml"/></fileset>-<filesetdir="${chsrv.test}">+<filesetdir="${cosmo.test}"><includename="hibernate.cfg.xml"/></fileset></copy>Index:server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityManagerImpl.javadiff-userver/core/src/org/osaf/cosmo/security/impl/CosmoSecurityManagerImpl.java:1.3server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityManagerImpl.java:1.4---server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityManagerImpl.java:1.3WedMar3010:40:332005+++server/core/src/org/osaf/cosmo/security/impl/CosmoSecurityManagerImpl.javaFriApr816:53:252005@@-1,8+1,7@@packageorg.osaf.cosmo.security.impl;-importorg.osaf.chandler.server.dao.UserDAO;-importorg.osaf.chandler.server.model.User;-+importorg.osaf.cosmo.dao.UserDAO;+importorg.osaf.cosmo.model.User;importorg.osaf.cosmo.security.CosmoSecurityContext;importorg.osaf.cosmo.security.CosmoSecurityException;importorg.osaf.cosmo.security.CosmoSecurityManager;Index:server/core/src/org/osaf/cosmo/security/impl/CosmoUserDetailsImpl.javadiff-userver/core/src/org/osaf/cosmo/security/impl/CosmoUserDetailsImpl.java:1.1server/core/src/org/osaf/cosmo/security/impl/CosmoUserDetailsImpl.java:1.2---server/core/src/org/osaf/cosmo/security/impl/CosmoUserDetailsImpl.java:1.1TueMar2910:00:002005+++server/core/src/org/osaf/cosmo/security/impl/CosmoUserDetailsImpl.javaFriApr816:53:252005@@-1,8+1,7@@packageorg.osaf.cosmo.security.impl;-importorg.osaf.chandler.server.model.Role;-importorg.osaf.chandler.server.model.User;-+importorg.osaf.cosmo.model.Role;+importorg.osaf.cosmo.model.User;importorg.osaf.cosmo.security.CosmoUserDetails;im |