Merge fix https://www.argeo.org/bugzilla/show_bug.cgi?id=162

[lgpl/argeo-commons.git] / server / runtime / org.argeo.server.jcr / src / main / java / org / argeo / jcr / proxy / ResourceProxy.java

diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/proxy/ResourceProxy.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/proxy/ResourceProxy.java
index 265ee935282fd7ae3efc15d2261263481c866f05..b4fb33286c555514072fec44caa2b57df0c05189 100644 (file)
--- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/proxy/ResourceProxy.java
+++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/proxy/ResourceProxy.java
@@ -1,19 +1,31 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * 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.jcr.proxy;
 
 import javax.jcr.Node;
-import javax.jcr.Session;
 
 /** A proxy which nows how to resolve and synchronize relative URLs */
 public interface ResourceProxy {
-       /** Path to the proxied node (which may not already exist) */
-       public String getNodePath(String relativePath);
-
        /**
         * Proxy the file referenced by this relative path in the underlying
-        * repository
+        * repository. A new session is created by each call, so the underlying
+        * session of the returned node must be closed by the caller.
         * 
-        * @return the unique identifier of the proxied Node, <code>null</code> if
-        *         the resource was not found (e.g. HTPP 404)
+        * @return the proxied Node, <code>null</code> if the resource was not found
+        *         (e.g. HTTP 404)
         */
-       public Node proxy(Session session,String relativePath);
+       public Node proxy(String relativePath);
 }