You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by md...@apache.org on 2011/10/13 18:58:23 UTC
svn commit: r1182981 - in /jackrabbit/sandbox/jackrabbit-mk:
jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/
jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/
jackrabbit-spi-commons/src/main/java/org/apache/jackrab...
Author: mduerig
Date: Thu Oct 13 16:58:22 2011
New Revision: 1182981
URL: http://svn.apache.org/viewvc?rev=1182981&view=rev
Log:
Microkernel based Jackrabbit prototype (WIP)
more consistent method naming
Modified:
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AbstractRepositoryService.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/SessionInfoImpl.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/logging/SessionInfoLogger.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Event.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/SessionInfo.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/Values.java
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java?rev=1182981&r1=1182980&r2=1182981&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java Thu Oct 13 16:58:22 2011
@@ -166,7 +166,7 @@ public class SessionImpl extends Abstrac
@Override
public String getUserID() {
- return sessionInfo.getUserID();
+ return sessionInfo.getUserId();
}
/**
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java?rev=1182981&r1=1182980&r2=1182981&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java Thu Oct 13 16:58:22 2011
@@ -453,7 +453,7 @@ public final class WorkspaceManager impl
service.unregisterNodeTypes(sessionInfo, nodeTypeNames);
}
};
- NodeTypeCache ntCache = NodeTypeCache.getInstance(service, sessionInfo.getUserID());
+ NodeTypeCache ntCache = NodeTypeCache.getInstance(service, sessionInfo.getUserId());
ntStorage = ntCache.wrap(ntStorage);
return NodeTypeRegistryImpl.create(ntStorage, nsRegistry);
}
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AbstractRepositoryService.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AbstractRepositoryService.java?rev=1182981&r1=1182980&r2=1182981&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AbstractRepositoryService.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AbstractRepositoryService.java Thu Oct 13 16:58:22 2011
@@ -326,7 +326,7 @@ public abstract class AbstractRepository
*/
@Override
public SessionInfo obtain(SessionInfo sessionInfo, String workspaceName) throws RepositoryException {
- return createSessionInfo(sessionInfo.getUserID(), workspaceName);
+ return createSessionInfo(sessionInfo.getUserId(), workspaceName);
}
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/SessionInfoImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/SessionInfoImpl.java?rev=1182981&r1=1182980&r2=1182981&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/SessionInfoImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/SessionInfoImpl.java Thu Oct 13 16:58:22 2011
@@ -75,7 +75,7 @@ public class SessionInfoImpl implements
//-------------------------< SessionInfo >----------------------------------
@Override
- public String getUserID() {
+ public String getUserId() {
return userId;
}
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/logging/SessionInfoLogger.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/logging/SessionInfoLogger.java?rev=1182981&r1=1182980&r2=1182981&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/logging/SessionInfoLogger.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/logging/SessionInfoLogger.java Thu Oct 13 16:58:22 2011
@@ -48,13 +48,13 @@ public class SessionInfoLogger extends A
// -----------------------------------------------------< SessionInfo >---
@Override
- public String getUserID() {
+ public String getUserId() {
return execute(new SafeCallable<String>() {
@Override
public String call() {
- return sessionInfo.getUserID();
+ return sessionInfo.getUserId();
}
- }, "getUserID()", new Object[]{});
+ }, "getUserId()", new Object[]{});
}
@Override
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Event.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Event.java?rev=1182981&r1=1182980&r2=1182981&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Event.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Event.java Thu Oct 13 16:58:22 2011
@@ -121,7 +121,7 @@ public interface Event {
/**
* Returns the user ID connected with this event. This is the string
- * returned by getUserID of the session that caused the event.
+ * returned by getUserId of the session that caused the event.
*
* @return a {@code String}.
*/
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/SessionInfo.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/SessionInfo.java?rev=1182981&r1=1182980&r2=1182981&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/SessionInfo.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/SessionInfo.java Thu Oct 13 16:58:22 2011
@@ -39,7 +39,7 @@ public interface SessionInfo {
* @return The user identification.
* @see RepositoryService#obtain(javax.jcr.Credentials, String)
*/
- String getUserID();
+ String getUserId();
/**
* Returns the workspace name.
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java?rev=1182981&r1=1182980&r2=1182981&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java Thu Oct 13 16:58:22 2011
@@ -1079,7 +1079,7 @@ public class RepositoryServiceImpl exten
private CommitInfo commitInfo(SessionInfoImpl sessionInfo) {
CommitInfo commitInfo = new CommitInfo();
- commitInfo.setUserId(sessionInfo.getUserID());
+ commitInfo.setUserId(sessionInfo.getUserId());
commitInfo.setSessionId(sessionInfo.getId());
if (sessionInfo.getUserData() != null) {
commitInfo.setUserData(sessionInfo.getUserData());
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/Values.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/Values.java?rev=1182981&r1=1182980&r2=1182981&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/Values.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/Values.java Thu Oct 13 16:58:22 2011
@@ -454,7 +454,7 @@ public final class Values {
return FACTORY.create(Calendar.getInstance());
}
else if (JCR_CREATEDBY.equals(propertyName)) {
- return FACTORY.create(sessionInfo.getUserID(), PropertyType.STRING);
+ return FACTORY.create(sessionInfo.getUserId(), PropertyType.STRING);
}
else {
IllegalStateException e = new IllegalStateException("No default value for property " + propertyName);