From: Mathieu Baudier Date: Fri, 25 Feb 2011 10:30:48 +0000 (+0000) Subject: Improve JCR remote X-Git-Tag: argeo-commons-2.1.30~1428 X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;ds=sidebyside;h=4fe54cd305d0693bb9cea15e1460ccc03f487fda;p=lgpl%2Fargeo-commons.git Improve JCR remote git-svn-id: https://svn.argeo.org/commons/trunk@4201 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/eclipse/plugins/org.argeo.jcr.ui.explorer/log4j.properties b/eclipse/plugins/org.argeo.jcr.ui.explorer/log4j.properties index 8a89a4aa3..577571c82 100644 --- a/eclipse/plugins/org.argeo.jcr.ui.explorer/log4j.properties +++ b/eclipse/plugins/org.argeo.jcr.ui.explorer/log4j.properties @@ -2,7 +2,7 @@ log4j.rootLogger=WARN, console ## Levels log4j.logger.org.argeo=DEBUG -log4j.logger.org.springframework.security=DEBUG +log4j.logger.org.springframework.security=INFO log4j.logger.org.apache.catalina=INFO log4j.logger.org.apache.coyote=INFO diff --git a/eclipse/plugins/org.argeo.jcr.ui.explorer/org.argeo.jcr.ui.explorer.product b/eclipse/plugins/org.argeo.jcr.ui.explorer/org.argeo.jcr.ui.explorer.product index 35b11a864..0980e1d7e 100644 --- a/eclipse/plugins/org.argeo.jcr.ui.explorer/org.argeo.jcr.ui.explorer.product +++ b/eclipse/plugins/org.argeo.jcr.ui.explorer/org.argeo.jcr.ui.explorer.product @@ -7,7 +7,8 @@ - -Dlog4j.configuration=file:${system_property:user.home}/dev/src/commons/eclipse/plugins/org.argeo.jcr.ui.explorer/log4j.properties + -console + -Dlog4j.configuration=file:${system_property:user.home}/dev/src/commons/eclipse/plugins/org.argeo.jcr.ui.explorer/log4j.properties -Dorg.argeo.security.ui.initialPerspective=org.argeo.jcr.ui.explorer.perspective -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts @@ -132,6 +133,7 @@ + diff --git a/eclipse/plugins/org.argeo.jcr.ui.explorer/pom.xml b/eclipse/plugins/org.argeo.jcr.ui.explorer/pom.xml index 5f08cd511..89c51dd8e 100644 --- a/eclipse/plugins/org.argeo.jcr.ui.explorer/pom.xml +++ b/eclipse/plugins/org.argeo.jcr.ui.explorer/pom.xml @@ -112,6 +112,12 @@ ${version.argeo-commons} test + + org.argeo.commons.server + org.argeo.server.jcr.mvc + ${version.argeo-commons} + test + org.argeo.commons.server org.argeo.server.dep.jackrabbit.server diff --git a/server/modules/org.argeo.jackrabbit.webapp/META-INF/MANIFEST.MF b/server/modules/org.argeo.jackrabbit.webapp/META-INF/MANIFEST.MF index 2122086ea..f0bbbee0a 100644 --- a/server/modules/org.argeo.jackrabbit.webapp/META-INF/MANIFEST.MF +++ b/server/modules/org.argeo.jackrabbit.webapp/META-INF/MANIFEST.MF @@ -11,9 +11,14 @@ Import-Package: javax.jcr, javax.servlet.resources, org.argeo.jackrabbit.remote, org.argeo.jcr, + org.argeo.jcr.mvc, + org.argeo.server.json, + org.argeo.server.mvc, org.springframework.osgi.web.context.support;version="1.2.1", org.springframework.security;version="2.0.6.RELEASE", org.springframework.security.ui.webapp;version="2.0.6.RELEASE", org.springframework.web.context;version="2.5.6.SEC01", org.springframework.web.filter;version="2.5.6.SEC01", - org.springframework.web.servlet.handler;version="2.5.6.SEC01" + org.springframework.web.servlet;version="2.5.6.SEC01", + org.springframework.web.servlet.handler;version="2.5.6.SEC01", + org.springframework.web.servlet.view;version="2.5.6.SEC01" diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml index 1aec32ee6..a30ecbf06 100644 --- a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml +++ b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml @@ -12,4 +12,9 @@ + + + + \ No newline at end of file diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/jcr-manager-servlet.xml b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/jcr-manager-servlet.xml new file mode 100644 index 000000000..78670a61a --- /dev/null +++ b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/jcr-manager-servlet.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/remoting-servlet.xml b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/remoting-servlet.xml index c77def251..35376c184 100644 --- a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/remoting-servlet.xml +++ b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/remoting-servlet.xml @@ -14,7 +14,7 @@ class="org.springframework.web.servlet.handler.SimpleServletHandlerAdapter" /> + class="org.argeo.jackrabbit.remote.JcrRemotingHandlerMapping"> diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/web.xml b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/web.xml index 68ba7592b..f3901fe4c 100644 --- a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/web.xml +++ b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/web.xml @@ -40,14 +40,66 @@ /remoting/* + + + xmlremoting + org.springframework.web.servlet.DispatcherServlet + + contextClass + org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext + + 1 + + + xmlremoting + *.jcr + + + + + webdav + org.argeo.jackrabbit.remote.ExtendedDispatcherServlet + + contextClass + org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext + + + dispatchOptionsRequest + true + + 1 + + + + webdav + /default/* + + + + + jcr-manager + org.springframework.web.servlet.DispatcherServlet + + contextClass + org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext + + 1 + + + + jcr-manager + /jcr-manager/* + + + - - - - - - - - - + + springSecurityFilterChain + org.springframework.web.filter.DelegatingFilterProxy + + + + springSecurityFilterChain + /* + diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/webdav-config.xml b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/webdav-config.xml new file mode 100644 index 000000000..f562d766e --- /dev/null +++ b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/webdav-config.xml @@ -0,0 +1,197 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + nt:file + nt:resource + + + + + + + + + + + + + rep + jcr + + + + + + + diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/webdav-servlet.xml b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/webdav-servlet.xml new file mode 100644 index 000000000..c3ede3fd4 --- /dev/null +++ b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/webdav-servlet.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + webdavServlet + + + + + \ No newline at end of file diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/xmlremoting-servlet.xml b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/xmlremoting-servlet.xml new file mode 100644 index 000000000..61c886765 --- /dev/null +++ b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/xmlremoting-servlet.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file