[Commits] (bcm) replace obsolete jackrabbit CredentialsProvider
interface with cosmo core
commits at osafoundation.org
commits at osafoundation.org
Fri Mar 18 15:56:25 PST 2005
Commit by: bcm
Modified files:
server/webapps/webdav/build.xml 1.4 1.5
server/webapps/webdav/etc/applicationContext-webdav.xml 1.1 1.2
server/webapps/webdav/etc/log4j.xml 1.2 1.3
server/webapps/webdav/src/org/osaf/cosmo/webdav/CosmoDavSessionProvider.java 1.4 1.5
server/webapps/webdav/src/org/osaf/cosmo/webdav/security/CosmoCredentials.java 1.1 None
server/webapps/webdav/src/org/osaf/cosmo/webdav/security/CosmoCredentialsProvider.java 1.1 None
server/webapps/webdav/src/org/osaf/cosmo/webdav/security/CosmoLoginModule.java 1.1 None
server/webapps/webdav/web/WEB-INF/.cvsignore 1.1 1.2
server/webapps/webdav/web/WEB-INF/web.xml 1.4 1.5
Log message:
replace obsolete jackrabbit CredentialsProvider interface with cosmo core
JCRServletCredentialsProvider interface. shuffle around the Spring config
files. some work on logging (can't figure out why webdav webapp doesn't
initialize log4j like console webapp does)
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/build.xml.diff?r1=text&tr1=1.4&r2=text&tr2=1.5
http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/etc/applicationContext-webdav.xml.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/etc/log4j.xml.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/src/org/osaf/cosmo/webdav/CosmoDavSessionProvider.java.diff?r1=text&tr1=1.4&r2=text&tr2=1.5
http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/src/org/osaf/cosmo/webdav/security/CosmoCredentials.java.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/src/org/osaf/cosmo/webdav/security/CosmoCredentialsProvider.java.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/src/org/osaf/cosmo/webdav/security/CosmoLoginModule.java.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/web/WEB-INF/.cvsignore.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/web/WEB-INF/web.xml.diff?r1=text&tr1=1.4&r2=text&tr2=1.5
Index: server/webapps/webdav/etc/log4j.xml
diff -u server/webapps/webdav/etc/log4j.xml:1.2 server/webapps/webdav/etc/log4j.xml:1.3
--- server/webapps/webdav/etc/log4j.xml:1.2 Thu Mar 17 19:28:18 2005
+++ server/webapps/webdav/etc/log4j.xml Fri Mar 18 15:56:22 2005
@@ -3,7 +3,7 @@
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
<appender name="FILE" class="org.apache.log4j.RollingFileAppender">
- <param name="File" value="${webapp.root}/../../logs/cosmo-webdav.log"/>
+ <param name="File" value="/tmp/cosmo-webdav.log"/>
<param name="MaxFileSize" value="1000KB"/>
<param name="MaxBackupIndex" value="1"/>
<param name="BufferedIO" value="false"/>
@@ -13,20 +13,12 @@
</layout>
</appender>
- <logger name="net.sf">
- <level value="WARN"/>
- </logger>
-
- <logger name="net.sf.acegisecurity">
- <level value="DEBUG"/>
- </logger>
-
<logger name="org.apache">
<level value="WARN"/>
</logger>
<logger name="org.springframework">
- <level value="DEBUG"/>
+ <level value="WARN"/>
</logger>
<logger name="org.osaf">
Index: server/webapps/webdav/src/org/osaf/cosmo/webdav/CosmoDavSessionProvider.java
diff -u server/webapps/webdav/src/org/osaf/cosmo/webdav/CosmoDavSessionProvider.java:1.4 server/webapps/webdav/src/org/osaf/cosmo/webdav/CosmoDavSessionProvider.java:1.5
--- server/webapps/webdav/src/org/osaf/cosmo/webdav/CosmoDavSessionProvider.java:1.4 Thu Mar 17 19:28:18 2005
+++ server/webapps/webdav/src/org/osaf/cosmo/webdav/CosmoDavSessionProvider.java Fri Mar 18 15:56:23 2005
@@ -15,13 +15,15 @@
*/
package org.osaf.cosmo.webdav;
+import org.osaf.jcr.JCRServletCredentialsProvider;
+
import javax.jcr.Credentials;
import javax.jcr.Repository;
import javax.jcr.Session;
import javax.jcr.RepositoryException;
+import javax.servlet.ServletException;
import org.apache.jackrabbit.server.simple.dav.DavSessionImpl;
-import org.apache.jackrabbit.webdav.CredentialsProvider;
import org.apache.jackrabbit.webdav.DavSessionProvider;
import org.apache.jackrabbit.webdav.DavException;
import org.apache.jackrabbit.webdav.DavServletResponse;
@@ -32,15 +34,16 @@
/**
* Implementation of the jcr-server {@link DavSessionProvider}
- * interface that uses {@link CosmoCredentialsProvider} to locate
- * credentials in the request, log into the repository, and provide
- * a {@link DavSession} to the request.
+ * interface that uses wired-in instances of
+ * {@link Repository} and {@link JCRServletCredentialsProvider} to
+ * locate extract credentials from the request, log into the
+ * repository, and provide a {@link DavSession} to the request.
*/
public class CosmoDavSessionProvider implements DavSessionProvider {
private static final Logger log =
Logger.getLogger(CosmoDavSessionProvider.class);
- private CredentialsProvider credentialsProvider;
+ private JCRServletCredentialsProvider credentialsProvider;
private Repository repository;
/**
@@ -58,7 +61,8 @@
public void acquireSession(WebdavRequest request) throws DavException {
// XXX cache dav session in web session
try {
- Credentials creds = credentialsProvider.extractCredentials(request);
+ Credentials creds =
+ credentialsProvider.extractCredentials(request);
if (creds != null) {
if (log.isDebugEnabled()) {
log.debug("Logging into repository");
@@ -74,6 +78,10 @@
log.error("error logging into repository", e);
throw new DavException(DavServletResponse.SC_INTERNAL_SERVER_ERROR,
e.getMessage());
+ } catch (ServletException e) {
+ log.error("error extracting credentials", e);
+ throw new DavException(DavServletResponse.SC_INTERNAL_SERVER_ERROR,
+ e.getMessage());
}
}
@@ -101,13 +109,14 @@
/**
*/
- public CredentialsProvider getCredentialsProvider() {
+ public JCRServletCredentialsProvider getCredentialsProvider() {
return credentialsProvider;
}
/**
*/
- public void setCredentialsProvider(CredentialsProvider provider) {
+ public void
+ setCredentialsProvider(JCRServletCredentialsProvider provider) {
credentialsProvider = provider;
}
}
Index: server/webapps/webdav/build.xml
diff -u server/webapps/webdav/build.xml:1.4 server/webapps/webdav/build.xml:1.5
--- server/webapps/webdav/build.xml:1.4 Thu Mar 17 19:28:18 2005
+++ server/webapps/webdav/build.xml Fri Mar 18 15:56:22 2005
@@ -55,6 +55,9 @@
<include name="applicationContext-hibernate.xml"/>
<include name="applicationContext-security.xml"/>
</fileset>
+ <fileset dir="${webdav.etc}">
+ <include name="applicationContext-webdav.xml"/>
+ </fileset>
</copy>
<copy todir="${webdav.web}/WEB-INF/lib"
file="${core.build}/chandler-server-core.jar"/>
Index: server/webapps/webdav/etc/applicationContext-webdav.xml
diff -u server/webapps/webdav/etc/applicationContext-webdav.xml:1.1 server/webapps/webdav/etc/applicationContext-webdav.xml:1.2
--- server/webapps/webdav/etc/applicationContext-webdav.xml:1.1 Thu Mar 17 19:28:18 2005
+++ server/webapps/webdav/etc/applicationContext-webdav.xml Fri Mar 18 15:56:22 2005
@@ -19,7 +19,7 @@
</bean>
<bean id="credentialsProvider"
- class="org.osaf.cosmo.webdav.security.CosmoCredentialsProvider"/>
+ class="org.osaf.cosmo.security.CosmoJCRCredentialsProvider"/>
<bean id="davSessionProvider"
class="org.osaf.cosmo.webdav.CosmoDavSessionProvider">
Index: server/webapps/webdav/web/WEB-INF/.cvsignore
diff -u server/webapps/webdav/web/WEB-INF/.cvsignore:1.1 server/webapps/webdav/web/WEB-INF/.cvsignore:1.2
--- server/webapps/webdav/web/WEB-INF/.cvsignore:1.1 Tue Mar 15 12:30:23 2005
+++ server/webapps/webdav/web/WEB-INF/.cvsignore Fri Mar 18 15:56:23 2005
@@ -1,2 +1,3 @@
classes
lib
+applicationContext*.xml
Index: server/webapps/webdav/web/WEB-INF/web.xml
diff -u server/webapps/webdav/web/WEB-INF/web.xml:1.4 server/webapps/webdav/web/WEB-INF/web.xml:1.5
--- server/webapps/webdav/web/WEB-INF/web.xml:1.4 Thu Mar 17 19:28:20 2005
+++ server/webapps/webdav/web/WEB-INF/web.xml Fri Mar 18 15:56:23 2005
@@ -17,11 +17,13 @@
/WEB-INF/applicationContext-webdav.xml
</param-value>
</context-param>
+<!--
<listener>
<listener-class>
org.springframework.web.util.Log4jConfigListener
</listener-class>
</listener>
+-->
<listener>
<listener-class>
org.springframework.web.context.ContextLoaderListener
More information about the Commits
mailing list