jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r904028 - in /jackrabbit/sandbox/jackrabbit2-bundle: jackrabbit-api/src/main/java/org/apache/jackrabbit/api/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/jndi/
Date Thu, 28 Jan 2010 10:28:55 GMT
Author: fmeschbe
Date: Thu Jan 28 10:28:54 2010
New Revision: 904028

URL: http://svn.apache.org/viewvc?rev=904028&view=rev
Log:
Remove disputed loginAdministrative method again (for Sling use cases we will
implement a proxy)

Modified:
    jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/JackrabbitRepository.java
    jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
    jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TransientRepository.java
    jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/jndi/BindableRepository.java

Modified: jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/JackrabbitRepository.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/JackrabbitRepository.java?rev=904028&r1=904027&r2=904028&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/JackrabbitRepository.java
(original)
+++ jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/JackrabbitRepository.java
Thu Jan 28 10:28:54 2010
@@ -16,11 +16,7 @@
  */
 package org.apache.jackrabbit.api;
 
-import javax.jcr.LoginException;
-import javax.jcr.NoSuchWorkspaceException;
 import javax.jcr.Repository;
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
 
 /**
  * The Jackrabbit repository interface. This interface contains the
@@ -40,35 +36,4 @@
      */
     void shutdown();
 
-    /**
-     * Returns the default workspace used for login.
-     *
-     * @return null if the configured default workspace name is empty
-     */
-    String getDefaultWorkspace();
-
-    /**
-     * Returns a session to the default workspace which has administrative
-     * powers.
-     * <p>
-     * <b><i>NOTE: This method is intended for use by infrastructure bundles
to
-     * access the repository and provide general services. This method MUST not
-     * be used to handle client requests of whatever kinds. To handle client
-     * requests a regular authenticated session retrieved through
-     * {@link #login(javax.jcr.Credentials, String)} or
-     * {@link Session#impersonate(javax.jcr.Credentials)} must be used.</i></b>
-     *
-     * @param workspace The name of the workspace to which to get an
-     *            administrative session. If <code>null</code> the
-     *            {@link #getDefaultWorkspace()} default workspace is assumed.
-     * @return a valid session for the user to access the repository.
-     * @throws LoginException if authentication or authorization for the
-     *             specified workspace fails.
-     * @throws NoSuchWorkspaceException if the specified
-     *             <code>workspaceName</code> is not recognized.
-     * @throws RepositoryException if another error occurs.
-     */
-    Session loginAdministrative(String workspace) throws LoginException,
-            NoSuchWorkspaceException, RepositoryException;
-
 }

Modified: jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java?rev=904028&r1=904027&r2=904028&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
(original)
+++ jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
Thu Jan 28 10:28:54 2010
@@ -1130,15 +1130,6 @@
         }
     }
 
-    public String getDefaultWorkspace() {
-        return repConfig.getDefaultWorkspaceName();
-    }
-
-    public Session loginAdministrative(String workspace) throws LoginException,
-            NoSuchWorkspaceException, RepositoryException {
-        throw new LoginException("Not Yet Implemented");
-    }
-
     /**
      * Protected method that performs the actual shutdown after the shutdown
      * lock has been acquired by the {@link #shutdown()} method.

Modified: jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TransientRepository.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TransientRepository.java?rev=904028&r1=904027&r2=904028&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TransientRepository.java
(original)
+++ jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TransientRepository.java
Thu Jan 28 10:28:54 2010
@@ -25,8 +25,6 @@
 import java.util.Properties;
 
 import javax.jcr.Credentials;
-import javax.jcr.LoginException;
-import javax.jcr.NoSuchWorkspaceException;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.Value;
@@ -390,22 +388,6 @@
         }
     }
 
-    /**
-     * Delegated to the underlying repository instance.
-     */
-    public String getDefaultWorkspace() {
-        return repository.getDefaultWorkspace();
-    }
-
-    /**
-     * Delegated to the underlying repository instance.
-     */
-    public Session loginAdministrative(String workspace) throws LoginException,
-            NoSuchWorkspaceException, RepositoryException {
-        // FIXME: We should, but how -- in a very transparent way ??
-        throw new LoginException("Not Supported for transient repositories");
-    }
-
     //-------------------------------------------------------<SessionListener>
 
     /**

Modified: jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/jndi/BindableRepository.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/jndi/BindableRepository.java?rev=904028&r1=904027&r2=904028&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/jndi/BindableRepository.java
(original)
+++ jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/jndi/BindableRepository.java
Thu Jan 28 10:28:54 2010
@@ -262,19 +262,4 @@
             // ignore. exception is thrown when hook itself calls shutdown
         }
     }
-
-    /**
-     * Delegated to the underlying repository instance.
-     */
-    public String getDefaultWorkspace() {
-        return repository.getDefaultWorkspace();
-    }
-
-    /**
-     * Delegated to the underlying repository instance.
-     */
-    public Session loginAdministrative(String workspace) throws LoginException,
-            NoSuchWorkspaceException, RepositoryException {
-        return repository.loginAdministrative(workspace);
-    }
 }



Mime
View raw message