From c5e06593a279b16c7d58c7ba1a137c38f871b752 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 24 Feb 2011 11:43:05 +0000 Subject: [PATCH 1/1] Update Jackrabbit container package name git-svn-id: https://svn.argeo.org/commons/trunk@4184 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../org.argeo.server.jackrabbit.webapp.war/META-INF/MANIFEST.MF | 2 +- .../jackrabbit/{webdav => remote}/CachingSessionProvider.java | 2 +- .../{webdav => remote}/ExtendedDispatcherServlet.java | 2 +- .../argeo/jackrabbit/{webdav => remote}/JcrRemotingServlet.java | 2 +- .../{webdav => remote}/MultipleRepositoryHandlerMapping.java | 2 +- .../org/argeo/jackrabbit/{webdav => remote}/WebDavServlet.java | 2 +- .../org/argeo/{server => }/jackrabbit/repository-inMemory.xml | 0 7 files changed, 6 insertions(+), 6 deletions(-) rename server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/{webdav => remote}/CachingSessionProvider.java (98%) rename server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/{webdav => remote}/ExtendedDispatcherServlet.java (97%) rename server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/{webdav => remote}/JcrRemotingServlet.java (94%) rename server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/{webdav => remote}/MultipleRepositoryHandlerMapping.java (99%) rename server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/{webdav => remote}/WebDavServlet.java (98%) rename server/runtime/org.argeo.server.jackrabbit/src/main/resources/org/argeo/{server => }/jackrabbit/repository-inMemory.xml (100%) diff --git a/server/modules/org.argeo.server.jackrabbit.webapp.war/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.jackrabbit.webapp.war/META-INF/MANIFEST.MF index f103c00f1..76c2ee11a 100644 --- a/server/modules/org.argeo.server.jackrabbit.webapp.war/META-INF/MANIFEST.MF +++ b/server/modules/org.argeo.server.jackrabbit.webapp.war/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Import-Package: javax.jcr, javax.servlet, javax.servlet.http, javax.servlet.resources, - org.argeo.jackrabbit.webdav, + org.argeo.jackrabbit.remote, org.argeo.jcr, org.springframework.osgi.web.context.support;version="1.2.1", org.springframework.security;version="2.0.6.RELEASE", diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/CachingSessionProvider.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/CachingSessionProvider.java similarity index 98% rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/CachingSessionProvider.java rename to server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/CachingSessionProvider.java index 05b5e86ef..422623cac 100644 --- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/CachingSessionProvider.java +++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/CachingSessionProvider.java @@ -1,4 +1,4 @@ -package org.argeo.jackrabbit.webdav; +package org.argeo.jackrabbit.remote; import java.util.Collections; import java.util.HashMap; diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/ExtendedDispatcherServlet.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/ExtendedDispatcherServlet.java similarity index 97% rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/ExtendedDispatcherServlet.java rename to server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/ExtendedDispatcherServlet.java index a40919e4f..39dbf7f67 100644 --- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/ExtendedDispatcherServlet.java +++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/ExtendedDispatcherServlet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.argeo.jackrabbit.webdav; +package org.argeo.jackrabbit.remote; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/JcrRemotingServlet.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/JcrRemotingServlet.java similarity index 94% rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/JcrRemotingServlet.java rename to server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/JcrRemotingServlet.java index 0af669306..e9b00c8f7 100644 --- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/JcrRemotingServlet.java +++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/JcrRemotingServlet.java @@ -1,4 +1,4 @@ -package org.argeo.jackrabbit.webdav; +package org.argeo.jackrabbit.remote; import javax.jcr.Repository; import javax.jcr.SimpleCredentials; diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/MultipleRepositoryHandlerMapping.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/MultipleRepositoryHandlerMapping.java similarity index 99% rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/MultipleRepositoryHandlerMapping.java rename to server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/MultipleRepositoryHandlerMapping.java index 8e266a932..ae3ede742 100644 --- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/MultipleRepositoryHandlerMapping.java +++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/MultipleRepositoryHandlerMapping.java @@ -1,4 +1,4 @@ -package org.argeo.jackrabbit.webdav; +package org.argeo.jackrabbit.remote; import java.util.Enumeration; import java.util.Properties; diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/WebDavServlet.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/WebDavServlet.java similarity index 98% rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/WebDavServlet.java rename to server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/WebDavServlet.java index a9ed8ef7a..02fdcde73 100644 --- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/WebDavServlet.java +++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/WebDavServlet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.argeo.jackrabbit.webdav; +package org.argeo.jackrabbit.remote; import java.io.IOException; diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/resources/org/argeo/server/jackrabbit/repository-inMemory.xml b/server/runtime/org.argeo.server.jackrabbit/src/main/resources/org/argeo/jackrabbit/repository-inMemory.xml similarity index 100% rename from server/runtime/org.argeo.server.jackrabbit/src/main/resources/org/argeo/server/jackrabbit/repository-inMemory.xml rename to server/runtime/org.argeo.server.jackrabbit/src/main/resources/org/argeo/jackrabbit/repository-inMemory.xml -- 2.39.2