From e1465ec8281ad7eb0c04175f839cc06dc00703a4 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 26 Nov 2009 10:33:52 +0000 Subject: [PATCH] Improve Jackrabbit git-svn-id: https://svn.argeo.org/commons/trunk@3170 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 4 ++-- .../WEB-INF/applicationContext.xml | 0 .../WEB-INF/config.xml | 0 .../WEB-INF/osgi.xml | 0 .../WEB-INF/web-orig.xml | 0 .../WEB-INF/web.xml | 2 +- .../WEB-INF/webdav-servlet.xml | 0 .../server/jackrabbit/webdav/WebDavController.java | 10 ---------- 9 files changed, 4 insertions(+), 13 deletions(-) rename server/modules/{org.argeo.server.jackrabbit.webapp => org.argeo.server.jackrabbit.webdav}/META-INF/MANIFEST.MF (74%) rename server/modules/{org.argeo.server.jackrabbit.webapp => org.argeo.server.jackrabbit.webdav}/WEB-INF/applicationContext.xml (100%) rename server/modules/{org.argeo.server.jackrabbit.webapp => org.argeo.server.jackrabbit.webdav}/WEB-INF/config.xml (100%) rename server/modules/{org.argeo.server.jackrabbit.webapp => org.argeo.server.jackrabbit.webdav}/WEB-INF/osgi.xml (100%) rename server/modules/{org.argeo.server.jackrabbit.webapp => org.argeo.server.jackrabbit.webdav}/WEB-INF/web-orig.xml (100%) rename server/modules/{org.argeo.server.jackrabbit.webapp => org.argeo.server.jackrabbit.webdav}/WEB-INF/web.xml (96%) rename server/modules/{org.argeo.server.jackrabbit.webapp => org.argeo.server.jackrabbit.webdav}/WEB-INF/webdav-servlet.xml (100%) delete mode 100644 server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/webdav/WebDavController.java diff --git a/server/modules/org.argeo.server.jackrabbit.repo/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.jackrabbit.repo/META-INF/MANIFEST.MF index b989f208d..2da11017f 100644 --- a/server/modules/org.argeo.server.jackrabbit.repo/META-INF/MANIFEST.MF +++ b/server/modules/org.argeo.server.jackrabbit.repo/META-INF/MANIFEST.MF @@ -3,5 +3,6 @@ Bundle-Version: 0.1.2.SNAPSHOT Import-Package: javax.jcr, org.apache.jackrabbit.core, org.apache.jackrabbit.core.config, + org.apache.xalan.processor, org.argeo.server.jackrabbit, org.springframework.beans.factory.config diff --git a/server/modules/org.argeo.server.jackrabbit.webapp/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.jackrabbit.webdav/META-INF/MANIFEST.MF similarity index 74% rename from server/modules/org.argeo.server.jackrabbit.webapp/META-INF/MANIFEST.MF rename to server/modules/org.argeo.server.jackrabbit.webdav/META-INF/MANIFEST.MF index ca8576ddf..4232d6203 100644 --- a/server/modules/org.argeo.server.jackrabbit.webapp/META-INF/MANIFEST.MF +++ b/server/modules/org.argeo.server.jackrabbit.webdav/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ -Bundle-SymbolicName: org.argeo.server.jackrabbit.webapp +Bundle-SymbolicName: org.argeo.server.jackrabbit.webdav Bundle-Version: 0.1.2.SNAPSHOT -Web-ContextPath: org.argeo.server.jackrabbit.webapp +Web-ContextPath: webdav Import-Package: javax.jcr, javax.servlet, javax.servlet.http, diff --git a/server/modules/org.argeo.server.jackrabbit.webapp/WEB-INF/applicationContext.xml b/server/modules/org.argeo.server.jackrabbit.webdav/WEB-INF/applicationContext.xml similarity index 100% rename from server/modules/org.argeo.server.jackrabbit.webapp/WEB-INF/applicationContext.xml rename to server/modules/org.argeo.server.jackrabbit.webdav/WEB-INF/applicationContext.xml diff --git a/server/modules/org.argeo.server.jackrabbit.webapp/WEB-INF/config.xml b/server/modules/org.argeo.server.jackrabbit.webdav/WEB-INF/config.xml similarity index 100% rename from server/modules/org.argeo.server.jackrabbit.webapp/WEB-INF/config.xml rename to server/modules/org.argeo.server.jackrabbit.webdav/WEB-INF/config.xml diff --git a/server/modules/org.argeo.server.jackrabbit.webapp/WEB-INF/osgi.xml b/server/modules/org.argeo.server.jackrabbit.webdav/WEB-INF/osgi.xml similarity index 100% rename from server/modules/org.argeo.server.jackrabbit.webapp/WEB-INF/osgi.xml rename to server/modules/org.argeo.server.jackrabbit.webdav/WEB-INF/osgi.xml diff --git a/server/modules/org.argeo.server.jackrabbit.webapp/WEB-INF/web-orig.xml b/server/modules/org.argeo.server.jackrabbit.webdav/WEB-INF/web-orig.xml similarity index 100% rename from server/modules/org.argeo.server.jackrabbit.webapp/WEB-INF/web-orig.xml rename to server/modules/org.argeo.server.jackrabbit.webdav/WEB-INF/web-orig.xml diff --git a/server/modules/org.argeo.server.jackrabbit.webapp/WEB-INF/web.xml b/server/modules/org.argeo.server.jackrabbit.webdav/WEB-INF/web.xml similarity index 96% rename from server/modules/org.argeo.server.jackrabbit.webapp/WEB-INF/web.xml rename to server/modules/org.argeo.server.jackrabbit.webdav/WEB-INF/web.xml index bcc8a1ecd..1a7a9232d 100644 --- a/server/modules/org.argeo.server.jackrabbit.webapp/WEB-INF/web.xml +++ b/server/modules/org.argeo.server.jackrabbit.webdav/WEB-INF/web.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5"> - Jackrabbit Webapp + Jackrabbit Webdav Standard diff --git a/server/modules/org.argeo.server.jackrabbit.webapp/WEB-INF/webdav-servlet.xml b/server/modules/org.argeo.server.jackrabbit.webdav/WEB-INF/webdav-servlet.xml similarity index 100% rename from server/modules/org.argeo.server.jackrabbit.webapp/WEB-INF/webdav-servlet.xml rename to server/modules/org.argeo.server.jackrabbit.webdav/WEB-INF/webdav-servlet.xml diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/webdav/WebDavController.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/webdav/WebDavController.java deleted file mode 100644 index ec611c54d..000000000 --- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/webdav/WebDavController.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.argeo.server.jackrabbit.webdav; - -import org.springframework.core.io.Resource; -import org.springframework.web.servlet.mvc.ServletWrappingController; - -public class WebDavController extends ServletWrappingController { - private Resource resourceConfiguration; - - -} -- 2.30.2