Change JCR url

git-svn-id: https://svn.argeo.org/commons/trunk@5711 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/security-filters.xml b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/security-filters.xml
index 47ed794f7a0c5936d6de1078f10a7105a5712cc6..e68a60c5659a1ad9285b351d46d4aba228e1460f 100644 (file)
--- a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/security-filters.xml
+++ b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/security-filters.xml
@@ -8,12 +8,12 @@
 
        <bean id="springSecurityFilterChain" class="org.springframework.security.util.FilterChainProxy">
                <sec:filter-chain-map path-type="ant">
-                       <sec:filter-chain pattern="/webdav/**"
+                       <sec:filter-chain pattern="/files/**"
                                filters="session,x509,basic,exception,interceptor" />
                        <!-- For some reason the first level listing workspaces must be public -->
-                       <sec:filter-chain pattern="/remoting/*/"
+                       <sec:filter-chain pattern="/jcr/*/"
                                filters="anonymous,exception,interceptorPublic" />
-                       <sec:filter-chain pattern="/remoting/*/**"
+                       <sec:filter-chain pattern="/jcr/*/**"
                                filters="session,x509,basic,exception,interceptor" />
                        <sec:filter-chain pattern="/public/**"
                                filters="anonymous,exception,interceptorPublic" />

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 3f6db648ac8ba5640ac1ea99644d0ecaf24165d2..04cf5eb2df924c4f5342a22a3c2181ffa420346d 100644 (file)
--- a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/web.xml
+++ b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/web.xml
@@ -43,7 +43,7 @@
 
        <servlet-mapping>
                <servlet-name>remoting</servlet-name>
-               <url-pattern>/remoting/*</url-pattern>
+               <url-pattern>/jcr/*</url-pattern>
        </servlet-mapping>
 
        <servlet-mapping>
@@ -68,7 +68,7 @@
 
        <servlet-mapping>
                <servlet-name>webdav</servlet-name>
-               <url-pattern>/webdav/*</url-pattern>
+               <url-pattern>/files/*</url-pattern>
        </servlet-mapping>
 
        <servlet-mapping>

diff --git a/server/modules/org.argeo.jackrabbit.webapp/pom.xml b/server/modules/org.argeo.jackrabbit.webapp/pom.xml
index 25733511d1922d039efb4dc98b5326a89c9a8a4f..c3dddd941c9539eebca6a321ed274292c7f74fdc 100644 (file)
--- a/server/modules/org.argeo.jackrabbit.webapp/pom.xml
+++ b/server/modules/org.argeo.jackrabbit.webapp/pom.xml
@@ -17,7 +17,7 @@
                                <artifactId>maven-bundle-plugin</artifactId>
                                <configuration>
                                        <instructions>
-                                               <Web-ContextPath>org.argeo.jcr.webapp</Web-ContextPath>
+                                               <Web-ContextPath>data</Web-ContextPath>
                                                <!-- Import-Package needs to be specified explicitly since BND doesn't 
                                                        scane WEB-INF -->
                                                <Import-Package>

diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/AddRemoteRepository.java b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/AddRemoteRepository.java
index 6187f40ee3ffdaa66ab35b7e143573db2697c5fb..1bce39e51516a95ed30f5e31933bb223152f6c89 100644 (file)
--- a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/AddRemoteRepository.java
+++ b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/AddRemoteRepository.java
@@ -111,7 +111,7 @@ public class AddRemoteRepository extends AbstractHandler implements
                        setMessage("Login to remote repository", IMessageProvider.NONE);
                        name = createLT(composite, "Name", "remoteRepository");
                        uri = createLT(composite, "URI",
-                                       "http://localhost:7070/org.argeo.jcr.webapp/remoting/node");
+                                       "http://localhost:7070/data/jcr/node");
                        username = createLT(composite, "User", "");
                        password = createLP(composite, "Password");
 
@@ -162,8 +162,9 @@ public class AddRemoteRepository extends AbstractHandler implements
 
                @Override
                protected void okPressed() {
+                       Session nodeSession = null;
                        try {
-                               Session nodeSession = nodeRepository.login();
+                               nodeSession = nodeRepository.login();
                                Node home = UserJcrUtils.getUserHome(nodeSession);
 
                                Node remote = home.hasNode(ARGEO_REMOTE) ? home
@@ -192,6 +193,8 @@ public class AddRemoteRepository extends AbstractHandler implements
                                super.okPressed();
                        } catch (Exception e) {
                                ErrorFeedback.show("Cannot add remote repository", e);
+                       } finally {
+                               JcrUtils.logoutQuietly(nodeSession);
                        }
                }