You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2007/09/28 18:46:25 UTC
svn commit: r580410 - in /jackrabbit/trunk:
contrib/jackrabbit-spi-xml/src/main/java/org/apache/jackrabbit/spi/xml/
contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/client/
contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/...
Author: reschke
Date: Fri Sep 28 09:46:23 2007
New Revision: 580410
URL: http://svn.apache.org/viewvc?rev=580410&view=rev
Log:
JCR-1153: remove getLastEventBundleId/SetLastEventBundleId from SessionInfo; remove implementations.
Modified:
jackrabbit/trunk/contrib/jackrabbit-spi-xml/src/main/java/org/apache/jackrabbit/spi/xml/XMLSessionInfo.java
jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/client/ClientSessionInfo.java
jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/remote/RemoteSessionInfo.java
jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/server/ServerSessionInfo.java
jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/SessionInfoImpl.java
jackrabbit/trunk/contrib/spi/spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/SessionInfoImpl.java
jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/SessionInfo.java
Modified: jackrabbit/trunk/contrib/jackrabbit-spi-xml/src/main/java/org/apache/jackrabbit/spi/xml/XMLSessionInfo.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-spi-xml/src/main/java/org/apache/jackrabbit/spi/xml/XMLSessionInfo.java?rev=580410&r1=580409&r2=580410&view=diff
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-spi-xml/src/main/java/org/apache/jackrabbit/spi/xml/XMLSessionInfo.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-spi-xml/src/main/java/org/apache/jackrabbit/spi/xml/XMLSessionInfo.java Fri Sep 28 09:46:23 2007
@@ -1,79 +1,62 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.apache.jackrabbit.spi.xml;
-
-import org.apache.jackrabbit.spi.SessionInfo;
-
-public class XMLSessionInfo implements SessionInfo {
-
- private final String user;
-
- public XMLSessionInfo(String user) {
- this.user = user;
- }
-
- //----------------------------------------------------------< SessionInfo>
-
- public String getWorkspaceName() {
- return "xml";
- }
-
- public String getUserID() {
- return user;
- }
-
- /* (non-Javadoc)
- * @see org.apache.jackrabbit.spi.SessionInfo#addLockToken(java.lang.String)
- */
- public void addLockToken(String lockToken) {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see org.apache.jackrabbit.spi.SessionInfo#getLastEventBundleId()
- */
- public String getLastEventBundleId() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.apache.jackrabbit.spi.SessionInfo#getLockTokens()
- */
- public String[] getLockTokens() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.apache.jackrabbit.spi.SessionInfo#removeLockToken(java.lang.String)
- */
- public void removeLockToken(String lockToken) {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see org.apache.jackrabbit.spi.SessionInfo#setLastEventBundleId(java.lang.String)
- */
- public void setLastEventBundleId(String eventBundleId) {
- // TODO Auto-generated method stub
-
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.apache.jackrabbit.spi.xml;
+
+import org.apache.jackrabbit.spi.SessionInfo;
+
+public class XMLSessionInfo implements SessionInfo {
+
+ private final String user;
+
+ public XMLSessionInfo(String user) {
+ this.user = user;
+ }
+
+ //----------------------------------------------------------< SessionInfo>
+
+ public String getWorkspaceName() {
+ return "xml";
+ }
+
+ public String getUserID() {
+ return user;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.jackrabbit.spi.SessionInfo#addLockToken(java.lang.String)
+ */
+ public void addLockToken(String lockToken) {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.jackrabbit.spi.SessionInfo#getLockTokens()
+ */
+ public String[] getLockTokens() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.jackrabbit.spi.SessionInfo#removeLockToken(java.lang.String)
+ */
+ public void removeLockToken(String lockToken) {
+ // TODO Auto-generated method stub
+
+ }
+}
Modified: jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/client/ClientSessionInfo.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/client/ClientSessionInfo.java?rev=580410&r1=580409&r2=580410&view=diff
==============================================================================
--- jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/client/ClientSessionInfo.java (original)
+++ jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/client/ClientSessionInfo.java Fri Sep 28 09:46:23 2007
@@ -107,28 +107,4 @@
throw new RemoteRuntimeException(e);
}
}
-
- /**
- * {@inheritDoc}
- * @throws RemoteRuntimeException if an RMI error occurs.
- */
- public String getLastEventBundleId() {
- try {
- return remoteSessionInfo.getLastEventBundleId();
- } catch (RemoteException e) {
- throw new RemoteRuntimeException(e);
- }
- }
-
- /**
- * {@inheritDoc}
- * @throws RemoteRuntimeException if an RMI error occurs.
- */
- public void setLastEventBundleId(String eventBundleId) {
- try {
- remoteSessionInfo.setLastEventBundleId(eventBundleId);
- } catch (RemoteException e) {
- throw new RemoteRuntimeException(e);
- }
- }
}
Modified: jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/remote/RemoteSessionInfo.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/remote/RemoteSessionInfo.java?rev=580410&r1=580409&r2=580410&view=diff
==============================================================================
--- jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/remote/RemoteSessionInfo.java (original)
+++ jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/remote/RemoteSessionInfo.java Fri Sep 28 09:46:23 2007
@@ -48,15 +48,4 @@
* Remote version of {@link org.apache.jackrabbit.spi.SessionInfo#removeLockToken(String)}.
*/
public void removeLockToken(String lockToken) throws RemoteException;
-
- /**
- * Remote version of {@link org.apache.jackrabbit.spi.SessionInfo#getLastEventBundleId()}.
- */
- public String getLastEventBundleId() throws RemoteException;
-
- /**
- * Remote version of {@link org.apache.jackrabbit.spi.SessionInfo#setLastEventBundleId(String)}.
- */
- public void setLastEventBundleId(String eventBundleId) throws RemoteException;
-
}
Modified: jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/server/ServerSessionInfo.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/server/ServerSessionInfo.java?rev=580410&r1=580409&r2=580410&view=diff
==============================================================================
--- jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/server/ServerSessionInfo.java (original)
+++ jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/server/ServerSessionInfo.java Fri Sep 28 09:46:23 2007
@@ -69,13 +69,4 @@
public void removeLockToken(String lockToken) throws RemoteException {
sessionInfo.removeLockToken(lockToken);
}
-
- public String getLastEventBundleId() throws RemoteException {
- return sessionInfo.getLastEventBundleId();
- }
-
- public void setLastEventBundleId(String eventBundleId)
- throws RemoteException {
- sessionInfo.setLastEventBundleId(eventBundleId);
- }
}
Modified: jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/SessionInfoImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/SessionInfoImpl.java?rev=580410&r1=580409&r2=580410&view=diff
==============================================================================
--- jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/SessionInfoImpl.java (original)
+++ jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/SessionInfoImpl.java Fri Sep 28 09:46:23 2007
@@ -36,8 +36,6 @@
private final Set lockTokens = new HashSet();
- private String lastEventBundleId;
-
private String lastBatchId;
/**
@@ -85,20 +83,6 @@
*/
public void removeLockToken(String lockToken) {
lockTokens.remove(lockToken);
- }
-
- /**
- * @inheritDoc
- */
- public String getLastEventBundleId() {
- return lastEventBundleId;
- }
-
- /**
- * @inheritDoc
- */
- public void setLastEventBundleId(String eventBundleId) {
- lastEventBundleId = eventBundleId;
}
//--------------------------------------------------------------------------
Modified: jackrabbit/trunk/contrib/spi/spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/SessionInfoImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/SessionInfoImpl.java?rev=580410&r1=580409&r2=580410&view=diff
==============================================================================
--- jackrabbit/trunk/contrib/spi/spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/SessionInfoImpl.java (original)
+++ jackrabbit/trunk/contrib/spi/spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/SessionInfoImpl.java Fri Sep 28 09:46:23 2007
@@ -45,11 +45,6 @@
private final NamespaceResolver resolver;
/**
- * The bundle id of the last retrieved events.
- */
- private String lastEventBundleId;
-
- /**
* A copy of the credentials that were used to obtain the JCR session.
*/
private Credentials credentials;
@@ -152,19 +147,5 @@
*/
public void removeLockToken(String lockToken) {
session.removeLockToken(lockToken);
- }
-
- /**
- * @inheritDoc
- */
- public String getLastEventBundleId() {
- return lastEventBundleId;
- }
-
- /**
- * @inheritDoc
- */
- public void setLastEventBundleId(String eventBundleId) {
- lastEventBundleId = eventBundleId;
}
}
Modified: jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/SessionInfo.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/SessionInfo.java?rev=580410&r1=580409&r2=580410&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/SessionInfo.java (original)
+++ jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/SessionInfo.java Fri Sep 28 09:46:23 2007
@@ -26,11 +26,6 @@
* In addition the SessionInfo acts as primary container for
* lock tokens. They will assert that a given SessionInfo is able to execute
* operations on the RepositoryService that are affected by existing locks.<p/>
- *
- * Finally the SessionInfo holds an identifier of the last {@link EventBundle}
- * that has been retrieved by this <code>SessionInfo</code>. This allows the
- * <code>SessionInfo</code> to indicate the latest known modification to
- * the RepositoryService upon retrieval of subsequent {@link EventBundle}s.
*/
public interface SessionInfo {
@@ -79,32 +74,4 @@
* @param lockToken to be removed.
*/
public void removeLockToken(String lockToken);
-
- /**
- * Returns the identifier of the last {@link EventBundle} delivered using
- * this <code>SessionInfo</code>. When a <code>SessionInfo</code> is
- * initially aquired the returned event identifier is set to the last
- * <code>EventBundle</code> created by the SPI implementation previously to
- * the call to {@link RepositoryService#obtain(javax.jcr.Credentials, String)
- * RepositoryService.obtain()}. If there was no previous event <code>null</code>
- * is returned. Thus a <code>null</code> value will effectively return all
- * events that occurred since the start of the SPI server.
- * <p/>
- * For implementations, that do not support observation this method will
- * always return <code>null</code>.
- *
- * @return the identifier of the last {@link EventBundle} delivered using
- * this <code>SessionInfo</code>.
- */
- public String getLastEventBundleId();
-
- /**
- * Sets the identifier of the last {@link EventBundle} delivered using this
- * <code>SessionInfo</code>. This identifier will be used to retrieve the
- * subsequent event bundles when calling {@link RepositoryService#getEvents(SessionInfo, long, EventFilter[])}.
- *
- * @param eventBundleId the identifier of the last {@link EventBundle}
- * delivered using this <code>SessionInfo</code>.
- */
- public void setLastEventBundleId(String eventBundleId);
}