You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by md...@apache.org on 2011/06/23 12:37:54 UTC
svn commit: r1138817 - in
/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr:
JcrRepository.java JcrService.java
Author: mduerig
Date: Thu Jun 23 10:37:53 2011
New Revision: 1138817
URL: http://svn.apache.org/viewvc?rev=1138817&view=rev
Log:
CMIS-395: Misleading method signatures - parameter names : repositoryId / workspaceId
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrRepository.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrService.java
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrRepository.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrRepository.java?rev=1138817&r1=1138816&r2=1138817&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrRepository.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrRepository.java Thu Jun 23 10:37:53 2011
@@ -114,15 +114,15 @@ public final class JcrRepository {
* Log into the underlying JCR repository.
*
* @param credentials
- * @param repositoryId
+ * @param workspaceName
* @return
* @throws LoginException
* @throws NoSuchWorkspaceException
* @throws RepositoryException
*/
- public Session login(Credentials credentials, String repositoryId) {
+ public Session login(Credentials credentials, String workspaceName) {
try {
- return repository.login(credentials, repositoryId);
+ return repository.login(credentials, workspaceName);
}
catch (LoginException e) {
log.debug(e.getMessage(), e);
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrService.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrService.java?rev=1138817&r1=1138816&r2=1138817&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrService.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrService.java Thu Jun 23 10:37:53 2011
@@ -328,12 +328,12 @@ public class JcrService extends Abstract
//------------------------------------------< protected >---
- protected Session login(String repositoryId) {
+ protected Session login(String workspaceName) {
if (context == null) {
throw new CmisRuntimeException("No user context!");
}
- Session session = sessions.get(repositoryId);
+ Session session = sessions.get(workspaceName);
if (session == null) {
String userName = context.getUsername();
String password = context.getPassword();
@@ -341,8 +341,8 @@ public class JcrService extends Abstract
? null
: new SimpleCredentials(userName, password == null ? "".toCharArray() : password.toCharArray());
- session = jcrRepository.login(credentials, repositoryId);
- sessions.put(repositoryId, session);
+ session = jcrRepository.login(credentials, workspaceName);
+ sessions.put(workspaceName, session);
}
return session;
}