X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=server%2Fruntime%2Forg.argeo.server.jackrabbit%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fserver%2Fjackrabbit%2Fwebdav%2FWebDavServlet.java;h=2ca729d5fc2d4c7d1d5c40d140d6b250021be598;hb=a5edbf6176d62305155b4be10601aa4156d72709;hp=965a5fd4706225d9249c11d3fcf41797bebde362;hpb=9b0c0818123d0265be3a3d35e4511077109e827a;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/webdav/WebDavServlet.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/webdav/WebDavServlet.java
index 965a5fd47..2ca729d5f 100644
--- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/webdav/WebDavServlet.java
+++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/webdav/WebDavServlet.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.server.jackrabbit.webdav;
 
 import java.io.IOException;
@@ -26,14 +42,12 @@ public class WebDavServlet extends SimpleWebdavServlet {
 
 	}
 
-	// private Session session;
-
 	@Override
 	public void init() throws ServletException {
 		super.init();
 
 		if (resourceConfiguration != null) {
-			ResourceConfig resourceConfig = new ResourceConfig();
+			ResourceConfig resourceConfig = new ResourceConfig(null);
 			try {
 				resourceConfig.parse(resourceConfiguration.getURL());
 			} catch (IOException e) {
@@ -42,50 +56,21 @@ public class WebDavServlet extends SimpleWebdavServlet {
 			}
 			setResourceConfig(resourceConfig);
 		}
-
-		// try {
-		// session().getWorkspace().getObservationManager().addEventListener(
-		// this, Event.NODE_ADDED, "/", true, null, null, false);
-		// if (log.isDebugEnabled())
-		// log.debug("Registered listener");
-		// } catch (Exception e) {
-		// throw new ArgeoException("Cannot register event listener", e);
-		// }
 	}
 
 	@Override
 	protected void service(HttpServletRequest request,
 			HttpServletResponse response) throws ServletException, IOException {
 		if (log.isTraceEnabled())
-			log.debug("Received request with method '" + request.getMethod()
-					+ "'");
+			log.trace("Received request " + request);
 		super.service(request, response);
 
 		if (log.isTraceEnabled()) {
-			log.debug("Webdav response: " + response);
+			log.trace("Webdav response: " + response);
 			// response.
 		}
 	}
 
-	// public void onEvent(EventIterator events) {
-	// while (events.hasNext()) {
-	// Event event = events.nextEvent();
-	// log.debug(event);
-	// }
-	//
-	// }
-
-	// protected Session session() {
-	// if (session == null)
-	// try {
-	// session = getRepository().login(
-	// new SimpleCredentials("demo", "demo".toCharArray()));
-	// } catch (Exception e) {
-	// throw new ArgeoException("Cannot open session", e);
-	// }
-	// return session;
-	// }
-
 	public Repository getRepository() {
 		return repository;
 	}