[Commits] (bcm) get core tests working again,
and augment them so we have manager and dao
commits at osafoundation.org
commits at osafoundation.org
Thu Mar 24 16:12:48 PST 2005
Commit by: bcm
Modified files:
server/build.xml 1.19 1.20
server/shared.properties 1.12 1.13
server/core/build.xml 1.11 1.12
server/core/etc/applicationContext-slide-client.xml None 1.1
server/core/etc/applicationContext-jcr-client.xml 1.1 1.2
server/core/etc/applicationContext-webdav-client.xml 1.1 1.2
server/core/etc/chandler.properties 1.1.1.1 1.2
server/core/src/org/osaf/chandler/server/dao/ShareDAO.java 1.1 1.2
server/core/src/org/osaf/chandler/server/dao/jcr/ContentStoreDAOJCR.java 1.2 1.3
server/core/src/org/osaf/chandler/server/dao/slide/ShareDAOSlide.java 1.1 1.2
server/core/src/org/osaf/jcr/jackrabbit/JackrabbitRepositoryFactoryBean.java None 1.1
server/core/src/org/osaf/spring/webdav/WebdavTemplate.java 1.1.1.1 1.2
server/core/test/.cvsignore 1.1.1.1 1.2
server/core/test/etc/applicationContext-jcr-client.xml None 1.1
server/core/test/org/osaf/chandler/server/BaseHibernateTestCase.java None 1.1
server/core/test/org/osaf/chandler/server/BaseJCRManagerTestCase.java None 1.1
server/core/test/org/osaf/chandler/server/BaseJCRTestCase.java None 1.1
server/core/test/org/osaf/chandler/server/BaseSlideManagerTestCase.java None 1.1
server/core/test/org/osaf/chandler/server/BaseSlideTestCase.java None 1.1
server/core/test/org/osaf/chandler/server/BaseServerTestCase.java 1.1.1.1 None
server/core/test/org/osaf/chandler/server/dao/RoleDAOTest.java 1.3 1.4
server/core/test/org/osaf/chandler/server/dao/UserDAOTest.java 1.3 1.4
server/core/test/org/osaf/chandler/server/dao/ShareDAOTest.java 1.1 None
server/core/test/org/osaf/chandler/server/dao/jcr/ContentStoreDAOJCRTest.java None 1.1
server/core/test/org/osaf/chandler/server/dao/jcr/TestJCRCredentialsProvider.java None 1.1
server/core/test/org/osaf/chandler/server/dao/slide/ShareDAOSlideTest.java None 1.1
server/core/test/org/osaf/chandler/server/manager/ProvisioningManagerTest.java 1.4 None
server/core/test/org/osaf/chandler/server/manager/jcr/JCRProvisioningManagerTest.java None 1.1
server/core/test/org/osaf/chandler/server/manager/slide/SlideProvisioningManagerTest.java None 1.1
server/docs/TODO.txt 1.28 1.29
server/etc/repository.xml 1.2 1.3
server/webapps/console/build.xml 1.11 1.12
server/webapps/share/build.xml 1.3 1.4
server/webapps/share/etc/log4j.xml 1.2 1.3
Log message:
get core tests working again, and augment them so we have manager and dao
tests for both jcr and slide.
add ShareDAO.existsHomedir() interface method which allows us to verify that
create and delete homedir work.
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/server/build.xml.diff?r1=text&tr1=1.19&r2=text&tr2=1.20
http://cvs.osafoundation.org/index.cgi/server/shared.properties.diff?r1=text&tr1=1.12&r2=text&tr2=1.13
http://cvs.osafoundation.org/index.cgi/server/core/build.xml.diff?r1=text&tr1=1.11&r2=text&tr2=1.12
http://cvs.osafoundation.org/index.cgi/server/core/etc/applicationContext-slide-client.xml?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/etc/applicationContext-jcr-client.xml.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/core/etc/applicationContext-webdav-client.xml.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/core/etc/chandler.properties.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/chandler/server/dao/ShareDAO.java.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/chandler/server/dao/jcr/ContentStoreDAOJCR.java.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/chandler/server/dao/slide/ShareDAOSlide.java.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/jcr/jackrabbit/JackrabbitRepositoryFactoryBean.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/spring/webdav/WebdavTemplate.java.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/core/test/.cvsignore.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/core/test/etc/applicationContext-jcr-client.xml?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/BaseHibernateTestCase.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/BaseJCRManagerTestCase.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/BaseJCRTestCase.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/BaseSlideManagerTestCase.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/BaseSlideTestCase.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/BaseServerTestCase.java.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/dao/RoleDAOTest.java.diff?r1=text&tr1=1.3&r2=text&tr2=1.4
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/dao/UserDAOTest.java.diff?r1=text&tr1=1.3&r2=text&tr2=1.4
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/dao/ShareDAOTest.java.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/dao/jcr/ContentStoreDAOJCRTest.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/dao/jcr/TestJCRCredentialsProvider.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/dao/slide/ShareDAOSlideTest.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/manager/ProvisioningManagerTest.java.diff?r1=text&tr1=1.4&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/manager/jcr/JCRProvisioningManagerTest.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/chandler/server/manager/slide/SlideProvisioningManagerTest.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/docs/TODO.txt.diff?r1=text&tr1=1.28&r2=text&tr2=1.29
http://cvs.osafoundation.org/index.cgi/server/etc/repository.xml.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
http://cvs.osafoundation.org/index.cgi/server/webapps/console/build.xml.diff?r1=text&tr1=1.11&r2=text&tr2=1.12
http://cvs.osafoundation.org/index.cgi/server/webapps/share/build.xml.diff?r1=text&tr1=1.3&r2=text&tr2=1.4
http://cvs.osafoundation.org/index.cgi/server/webapps/share/etc/log4j.xml.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
Index: server/core/build.xml
diff -u server/core/build.xml:1.11 server/core/build.xml:1.12
--- server/core/build.xml:1.11 Fri Mar 18 15:50:45 2005
+++ server/core/build.xml Thu Mar 24 16:12:37 2005
@@ -131,10 +131,25 @@
description="run JUnit tests">
<copy todir="${core.build}/testclasses">
<fileset dir="${core.test}/etc">
+ <include name="applicationContext-jcr-client.xml"/>
+ </fileset>
+ <filterset>
+ <filter token="CONFIGFILEPATH"
+ value="${chsrv.etc}/repository.xml"/>
+ <filter token="REPOSITORYHOMEDIRPATH"
+ value="${core.test}/repository"/>
+ </filterset>
+ </copy>
+ <copy todir="${core.build}/testclasses">
+ <fileset dir="${core.test}/etc">
<include name="log4j.xml"/>
</fileset>
<fileset dir="${core.etc}">
- <include name="applicationContext.xml"/>
+ <include name="applicationContext-base.xml"/>
+ <include name="applicationContext-hibernate.xml"/>
+ <include name="applicationContext-manager.xml"/>
+ <include name="applicationContext-slide-client.xml"/>
+ <include name="applicationContext-webdav-client.xml"/>
<include name="chandler.properties"/>
<include name="ehcache.xml"/>
</fileset>
@@ -144,17 +159,25 @@
</copy>
<junit printsummary="no" fork="true"
errorProperty="test.failed" failureProperty="test.failed">
+ <sysproperty key="java.security.auth.login.config"
+ value="${chsrv.etc}/jaas.config"/>
<classpath>
<path refid="ext.classpath"/>
<fileset dir="${core.build}" includes="*.jar"/>
<path location="${core.build}/testclasses"/>
<pathelement location="${aopalliance.jar}"/>
<pathelement location="${cglib.jar}"/>
+ <pathelement location="${commons-collections.jar}"/>
+ <pathelement location="${concurrent.jar}"/>
<pathelement location="${dom4j.jar}"/>
<pathelement location="${ehcache.jar}"/>
<pathelement location="${hsqldb.jar}"/>
+ <pathelement location="${lucene.jar}"/>
<pathelement location="${jta.jar}"/>
+ <pathelement location="${log4j.jar}"/>
<pathelement location="${odmg.jar}"/>
+ <pathelement location="${xerces.jar}"/>
+ <pathelement location="${xml-apis.jar}"/>
</classpath>
<formatter type="xml"/>
<formatter type="brief" usefile="false"/>
Index: server/core/etc/applicationContext-jcr-client.xml
diff -u server/core/etc/applicationContext-jcr-client.xml:1.1 server/core/etc/applicationContext-jcr-client.xml:1.2
--- server/core/etc/applicationContext-jcr-client.xml:1.1 Tue Mar 22 17:29:23 2005
+++ server/core/etc/applicationContext-jcr-client.xml Thu Mar 24 16:12:37 2005
@@ -10,10 +10,10 @@
<bean id="jcrRepository"
class="org.springframework.jndi.JndiObjectFactoryBean">
<property name="jndiName">
- <value>jcr/repository/webui</value>
+ <value>${cosmo.jcr.jndi.name}</value>
</property>
<property name="resourceRef">
- <value>true</value>
+ <value>${cosmo.jcr.jndi.resourceRef}</value>
</property>
</bean>
Index: server/core/src/org/osaf/chandler/server/dao/ShareDAO.java
diff -u server/core/src/org/osaf/chandler/server/dao/ShareDAO.java:1.1 server/core/src/org/osaf/chandler/server/dao/ShareDAO.java:1.2
--- server/core/src/org/osaf/chandler/server/dao/ShareDAO.java:1.1 Tue Feb 22 21:17:30 2005
+++ server/core/src/org/osaf/chandler/server/dao/ShareDAO.java Thu Mar 24 16:12:38 2005
@@ -15,5 +15,9 @@
/**
*/
+ public boolean existsHomedir(String username);
+
+ /**
+ */
public void deleteHomedir(String username);
}
Index: server/webapps/console/build.xml
diff -u server/webapps/console/build.xml:1.11 server/webapps/console/build.xml:1.12
--- server/webapps/console/build.xml:1.11 Wed Mar 23 14:03:34 2005
+++ server/webapps/console/build.xml Thu Mar 24 16:12:45 2005
@@ -149,7 +149,13 @@
<include name="log4j.xml"/>
</fileset>
<fileset dir="${core.etc}">
- <include name="applicationContext.xml"/>
+ <include name="applicationContext-base.xml"/>
+ <include name="applicationContext-hibernate.xml"/>
+ <include name="applicationContext-jcr-client.xml"/>
+ <include name="applicationContext-manager.xml"/>
+ <include name="applicationContext-security.xml"/>
+ <include name="applicationContext-slide-client.xml"/>
+ <include name="applicationContext-webdav-client.xml"/>
<include name="chandler.properties"/>
<include name="ehcache.xml"/>
</fileset>
Index: server/core/test/org/osaf/chandler/server/dao/UserDAOTest.java
diff -u server/core/test/org/osaf/chandler/server/dao/UserDAOTest.java:1.3 server/core/test/org/osaf/chandler/server/dao/UserDAOTest.java:1.4
--- server/core/test/org/osaf/chandler/server/dao/UserDAOTest.java:1.3 Thu Feb 24 16:48:56 2005
+++ server/core/test/org/osaf/chandler/server/dao/UserDAOTest.java Thu Mar 24 16:12:41 2005
@@ -1,12 +1,15 @@
package org.osaf.chandler.server.dao;
-import java.util.List;
-
-import org.osaf.chandler.server.BaseServerTestCase;
+import org.osaf.chandler.server.BaseHibernateTestCase;
import org.osaf.chandler.server.TestHelper;
import org.osaf.chandler.server.dao.UserDAO;
import org.osaf.chandler.server.model.User;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.springframework.dao.DataRetrievalFailureException;
/**
@@ -14,7 +17,8 @@
*
* @author Brian Moseley
*/
-public class UserDAOTest extends BaseServerTestCase {
+public class UserDAOTest extends BaseHibernateTestCase {
+ private static final Log log = LogFactory.getLog(UserDAOTest.class);
private static final String DAO_BEAN = "userDAO";
private UserDAO dao = null;
@@ -26,7 +30,7 @@
protected void setUp() throws Exception {
super.setUp();
- dao = (UserDAO) ctx.getBean(DAO_BEAN);
+ dao = (UserDAO) getHibernateContext().getBean(DAO_BEAN);
}
protected void tearDown() throws Exception {
Index: server/core/etc/chandler.properties
diff -u server/core/etc/chandler.properties:1.1.1.1 server/core/etc/chandler.properties:1.2
--- server/core/etc/chandler.properties:1.1.1.1 Wed Feb 16 11:30:52 2005
+++ server/core/etc/chandler.properties Thu Mar 24 16:12:37 2005
@@ -1,7 +1,15 @@
#
-# the base URL and user credentials for the Chandler server
+# the base URL and user credentials for the Slide server
#
-chandler.server.base.url=http://localhost:8080/share/
-chandler.server.base.username=root
-chandler.server.base.password=chsrv
+cosmo.slide.base.url=http://localhost:8080/share/
+cosmo.slide.base.username=root
+cosmo.slide.base.password=chsrv
+
+#
+# the JNDI location of an existing JCR repository, and whether or not
+# it is bound as a J2EE resource ref (in this case the JNDI name is
+# relative to java:comp/env/).
+#
+cosmo.jcr.jndi.name=jcr/repository/webui
+cosmo.jcr.jndi.resourceRef=true
Index: server/core/src/org/osaf/spring/webdav/WebdavTemplate.java
diff -u server/core/src/org/osaf/spring/webdav/WebdavTemplate.java:1.1.1.1 server/core/src/org/osaf/spring/webdav/WebdavTemplate.java:1.2
--- server/core/src/org/osaf/spring/webdav/WebdavTemplate.java:1.1.1.1 Wed Feb 16 11:30:53 2005
+++ server/core/src/org/osaf/spring/webdav/WebdavTemplate.java Thu Mar 24 16:12:39 2005
@@ -98,6 +98,25 @@
/**
*/
+ public void headMethod(String path) {
+ boolean ok = true;
+ try {
+ if (log.isDebugEnabled()) {
+ log.debug("executing HEAD method for " + path);
+ }
+ ok = wdr.headMethod(path);
+ } catch (Exception e) {
+ kill();
+ throw convertWebdavException(e, path);
+ }
+ if (! ok) {
+ kill();
+ throw convertWebdavException(wdr.getStatusCode(), path);
+ }
+ }
+
+ /**
+ */
public String[] list() {
String[] files = null;
try {
Index: server/core/test/org/osaf/chandler/server/dao/RoleDAOTest.java
diff -u server/core/test/org/osaf/chandler/server/dao/RoleDAOTest.java:1.3 server/core/test/org/osaf/chandler/server/dao/RoleDAOTest.java:1.4
--- server/core/test/org/osaf/chandler/server/dao/RoleDAOTest.java:1.3 Thu Feb 24 16:48:56 2005
+++ server/core/test/org/osaf/chandler/server/dao/RoleDAOTest.java Thu Mar 24 16:12:41 2005
@@ -2,13 +2,16 @@
import java.util.List;
-import org.osaf.chandler.server.BaseServerTestCase;
+import org.osaf.chandler.server.BaseHibernateTestCase;
import org.osaf.chandler.server.TestHelper;
import org.osaf.chandler.server.dao.RoleDAO;
import org.osaf.chandler.server.dao.UserDAO;
import org.osaf.chandler.server.model.Role;
import org.osaf.chandler.server.model.User;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.springframework.dao.DataRetrievalFailureException;
/**
@@ -16,7 +19,8 @@
*
* @author Brian Moseley
*/
-public class RoleDAOTest extends BaseServerTestCase {
+public class RoleDAOTest extends BaseHibernateTestCase {
+ private static final Log log = LogFactory.getLog(RoleDAOTest.class);
private static final String DAO_BEAN = "roleDAO";
private static final String USER_DAO_BEAN = "userDAO";
private RoleDAO dao = null;
@@ -30,8 +34,8 @@
protected void setUp() throws Exception {
super.setUp();
- dao = (RoleDAO) ctx.getBean(DAO_BEAN);
- userDao = (UserDAO) ctx.getBean(USER_DAO_BEAN);
+ dao = (RoleDAO) getHibernateContext().getBean(DAO_BEAN);
+ userDao = (UserDAO) getHibernateContext().getBean(USER_DAO_BEAN);
}
protected void tearDown() throws Exception {
Index: server/core/etc/applicationContext-webdav-client.xml
diff -u server/core/etc/applicationContext-webdav-client.xml:1.1 server/core/etc/applicationContext-webdav-client.xml:1.2
--- server/core/etc/applicationContext-webdav-client.xml:1.1 Thu Mar 17 19:26:16 2005
+++ server/core/etc/applicationContext-webdav-client.xml Thu Mar 24 16:12:37 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
- "http://www.springframework.or g/dtd/spring-beans.dtd">
+ "http://www.springframework.org/dtd/spring-beans.dtd">
<beans>
@@ -10,20 +10,13 @@
<bean id="serverBaseURL"
class="org.osaf.spring.webdav.HttpURLFactoryBean">
<property name="URL">
- <value>${chandler.server.base.url}</value>
+ <value>${cosmo.slide.base.url}</value>
</property>
<property name="username">
- <value>${chandler.server.base.username}</value>
+ <value>${cosmo.slide.base.username}</value>
</property>
<property name="password">
- <value>${chandler.server.base.password}</value>
- </property>
- </bean>
-
- <bean id="shareDAO"
- class="org.osaf.chandler.server.dao.slide.ShareDAOSlide">
- <property name="httpURL">
- <ref local="serverBaseURL"/>
+ <value>${cosmo.slide.base.password}</value>
</property>
</bean>
Index: server/core/src/org/osaf/chandler/server/dao/jcr/ContentStoreDAOJCR.java
diff -u server/core/src/org/osaf/chandler/server/dao/jcr/ContentStoreDAOJCR.java:1.2 server/core/src/org/osaf/chandler/server/dao/jcr/ContentStoreDAOJCR.java:1.3
--- server/core/src/org/osaf/chandler/server/dao/jcr/ContentStoreDAOJCR.java:1.2 Tue Mar 22 17:29:23 2005
+++ server/core/src/org/osaf/chandler/server/dao/jcr/ContentStoreDAOJCR.java Thu Mar 24 16:12:38 2005
@@ -41,6 +41,21 @@
/**
*/
+ public boolean existsHomedir(final String username) {
+ if (log.isDebugEnabled()) {
+ log.debug("checking existence of homedir for " + username);
+ }
+ Boolean rv = (Boolean) getTemplate().execute(new JCRCallback() {
+ public Object doInJCR(Session session)
+ throws RepositoryException {
+ return new Boolean(session.itemExists("/" + username));
+ }
+ });
+ return rv.booleanValue();
+ }
+
+ /**
+ */
public void deleteHomedir(final String username) {
if (log.isDebugEnabled()) {
log.debug("deleting homedir for " + username);
@@ -48,7 +63,7 @@
getTemplate().execute(new JCRCallback() {
public Object doInJCR(Session session)
throws RepositoryException {
- Item homedir = session.getItem("/" + username);
+ Item homedir = session.getItem("/" + username);
homedir.remove();
session.save();
return null;
Index: server/build.xml
diff -u server/build.xml:1.19 server/build.xml:1.20
--- server/build.xml:1.19 Wed Mar 23 14:03:29 2005
+++ server/build.xml Thu Mar 24 16:12:37 2005
@@ -37,10 +37,8 @@
<target name="build-share" depends="build-core"
description="build share webapp">
-<!--
<ant dir="${share.home}" target="all"
inheritAll="false"/>
--->
</target>
<target name="build-console" depends="build-core"
@@ -64,10 +62,8 @@
</target>
<target name="clean-share" description="clean share webapp">
-<!--
<ant dir="${share.home}" target="clean"
inheritAll="false"/>
--->
</target>
<target name="clean-console" description="clean console webapp">
@@ -189,19 +185,16 @@
<target name="dist-slide"
description="install and configure Slide within Tomcat">
-<!--
<available property="slide.unpacked"
file="${chsrv.tmp}/${ext.slide.package}"/>
<antcall target="unpack-slide"/>
<unwar src="${chsrv.tmp}/${ext.slide.package}/slide/webapp/slide.war"
dest="${chsrv.dist.share}"/>
<delete file="${chsrv.dist.share}/Domain.xml"/>
--->
</target>
<target name="dist-share"
description="install share webapp into Tomcat">
-<!--
<copy todir="${chsrv.dist.share}">
<fileset dir="${share.home}/web"/>
</copy>
@@ -211,7 +204,6 @@
<filter token="RELOADABLE" value="${compile.debug}"/>
</filterset>
</copy>
--->
</target>
<target name="dist-console"
Index: server/etc/repository.xml
diff -u server/etc/repository.xml:1.2 server/etc/repository.xml:1.3
--- server/etc/repository.xml:1.2 Tue Mar 22 17:53:01 2005
+++ server/etc/repository.xml Thu Mar 24 16:12:44 2005
@@ -209,13 +209,18 @@
Configures the filesystem to use for versioning for the respective
persistence manager
-->
+<!--
<FileSystem class="com.day.jackrabbit.fs.cq.CQFileSystem">
<param name="path" value="${rep.home}/version/version.dat"/>
<param name="autoRepair" value="false"/>
<param name="blockSize" value="128"/>
<param name="autoSync" value="false"/>
</FileSystem>
-
+-->
+ <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+ <param name="path" value="${rep.home}/version"/>
+ </FileSystem>
+
<!--
<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
<param name="path" value="${rep.home}/version"/>
Index: server/shared.properties
diff -u server/shared.properties:1.12 server/shared.properties:1.13
--- server/shared.properties:1.12 Wed Mar 23 14:03:29 2005
+++ server/shared.properties Thu Mar 24 16:12:37 2005
@@ -100,6 +100,8 @@
struts-el.jar=${chsrv.ext}/struts-el.jar
strutstest.jar=${chsrv.ext}/strutstest-2.1.3.jar
urlrewrite.jar=${chsrv.ext}/urlrewrite-2.0.1.jar
+xerces.jar=${maven.repository}/xerces/jars/xercesImpl-2.6.2.jar
+xml-apis.jar=${maven.repository}/xml-apis/jars/xml-apis-1.0.b2.jar
#
# distribution properties
Index: server/docs/TODO.txt
diff -u server/docs/TODO.txt:1.28 server/docs/TODO.txt:1.29
--- server/docs/TODO.txt:1.28 Thu Mar 24 12:47:03 2005
+++ server/docs/TODO.txt Thu Mar 24 16:12:44 2005
@@ -4,10 +4,13 @@
core:
- * write tests for JCR homedirs
+ * write a test that verifies access through two separate JCR
+ repositories
webui:
+ * bring tests up to date
+
webdav:
* figure out why on my work machine homedirs created through the
Index: server/webapps/share/build.xml
diff -u server/webapps/share/build.xml:1.3 server/webapps/share/build.xml:1.4
--- server/webapps/share/build.xml:1.3 Wed Mar 2 11:25:16 2005
+++ server/webapps/share/build.xml Thu Mar 24 16:12:45 2005
@@ -17,12 +17,12 @@
<!-- CLASSPATHS -->
<path id="ext.classpath">
- <fileset dir="${catalina.home}/common/lib" includes="*.jar"/>
<fileset dir="${core.build}" includes="*.jar"/>
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${concurrent.jar}"/>
<pathelement location="${hibernate.jar}"/>
<pathelement location="${jta.jar}"/>
+ <pathelement location="${servletapi.jar}"/>
<pathelement location="${spring.jar}"/>
<pathelement location="${slide-kernel.jar}"/>
</path>
Index: server/core/src/org/osaf/chandler/server/dao/slide/ShareDAOSlide.java
diff -u server/core/src/org/osaf/chandler/server/dao/slide/ShareDAOSlide.java:1.1 server/core/src/org/osaf/chandler/server/dao/slide/ShareDAOSlide.java:1.2
--- server/core/src/org/osaf/chandler/server/dao/slide/ShareDAOSlide.java:1.1 Tue Feb 22 21:17:32 2005
+++ server/core/src/org/osaf/chandler/server/dao/slide/ShareDAOSlide.java Thu Mar 24 16:12:38 2005
@@ -1,6 +1,7 @@
package org.osaf.chandler.server.dao.slide;
import org.osaf.chandler.server.dao.ShareDAO;
+import org.osaf.spring.webdav.WebdavResourceNotFoundException;
import org.osaf.spring.webdav.WebdavTemplate;
import org.apache.commons.logging.Log;
@@ -36,6 +37,26 @@
/**
*/
+ public boolean existsHomedir(String username) {
+ String path = calculateHomedir(username);
+ if (log.isDebugEnabled()) {
+ log.debug("checking existence of homedir " + path +
+ " for share " + username);
+ }
+
+ try {
+ WebdavTemplate template = getWebdavTemplate();
+ template.headMethod(path);
+ template.close();
+
+ return true;
+ } catch (WebdavResourceNotFoundException e) {
+ return false;
+ }
+ }
+
+ /**
+ */
public void deleteHomedir(String username) {
String path = calculateHomedir(username);
if (log.isDebugEnabled()) {
Index: server/core/test/.cvsignore
diff -u server/core/test/.cvsignore:1.1.1.1 server/core/test/.cvsignore:1.2
--- server/core/test/.cvsignore:1.1.1.1 Wed Feb 16 11:30:53 2005
+++ server/core/test/.cvsignore Thu Mar 24 16:12:40 2005
@@ -1 +1,2 @@
data
+repository
Index: server/webapps/share/etc/log4j.xml
diff -u server/webapps/share/etc/log4j.xml:1.2 server/webapps/share/etc/log4j.xml:1.3
--- server/webapps/share/etc/log4j.xml:1.2 Mon Mar 14 08:43:50 2005
+++ server/webapps/share/etc/log4j.xml Thu Mar 24 16:12:45 2005
@@ -17,10 +17,6 @@
<level value="WARN"/>
</logger>
- <logger name="org.apache.slide.security">
- <level value="DEBUG"/>
- </logger>
-
<logger name="org.springframework">
<level value="WARN"/>
</logger>
More information about the Commits
mailing list