jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r555526 - in /jackrabbit/trunk/contrib/spi: commons/src/main/java/org/apache/jackrabbit/spi/commons/ jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ spi-logger/src/main/java/org/apache/jackrabbit/spi/logger/ spi-rmi/src/main/java/org/a...
Date Thu, 12 Jul 2007 08:16:16 GMT
Author: angela
Date: Thu Jul 12 01:16:14 2007
New Revision: 555526

URL: http://svn.apache.org/viewvc?view=rev&rev=555526
Log:
JCR-1027 : SPI: change param order with RepositoryService.createBatch

Modified:
    jackrabbit/trunk/contrib/spi/commons/src/main/java/org/apache/jackrabbit/spi/commons/SerializableBatch.java
    jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java
    jackrabbit/trunk/contrib/spi/spi-logger/src/main/java/org/apache/jackrabbit/spi/logger/RepositoryServiceLogger.java
    jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/client/ClientBatch.java
    jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/client/ClientRepositoryService.java
    jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/server/ServerRepositoryService.java
    jackrabbit/trunk/contrib/spi/spi/src/main/java/org/apache/jackrabbit/spi/Batch.java
    jackrabbit/trunk/contrib/spi/spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java
    jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
    jackrabbit/trunk/contrib/spi/spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/RepositoryServiceImpl.java

Modified: jackrabbit/trunk/contrib/spi/commons/src/main/java/org/apache/jackrabbit/spi/commons/SerializableBatch.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/commons/src/main/java/org/apache/jackrabbit/spi/commons/SerializableBatch.java?view=diff&rev=555526&r1=555525&r2=555526
==============================================================================
--- jackrabbit/trunk/contrib/spi/commons/src/main/java/org/apache/jackrabbit/spi/commons/SerializableBatch.java
(original)
+++ jackrabbit/trunk/contrib/spi/commons/src/main/java/org/apache/jackrabbit/spi/commons/SerializableBatch.java
Thu Jul 12 01:16:14 2007
@@ -21,7 +21,6 @@
 import org.apache.jackrabbit.spi.QValue;
 import org.apache.jackrabbit.spi.PropertyId;
 import org.apache.jackrabbit.spi.ItemId;
-import org.apache.jackrabbit.spi.SessionInfo;
 import org.apache.jackrabbit.name.QName;
 
 import javax.jcr.RepositoryException;

Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java?view=diff&rev=555526&r1=555525&r2=555526
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java
(original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java
Thu Jul 12 01:16:14 2007
@@ -677,7 +677,7 @@
         private void execute(ChangeLog changeLog) throws RepositoryException, ConstraintViolationException,
AccessDeniedException, ItemExistsException, NoSuchNodeTypeException, UnsupportedRepositoryOperationException,
VersionException {
             try {
                 ItemState target = changeLog.getTarget();
-                batch = service.createBatch(target.getId(), sessionInfo);
+                batch = service.createBatch(sessionInfo, target.getId());
                 Iterator it = changeLog.getOperations();
                 while (it.hasNext()) {
                     Operation op = (Operation) it.next();

Modified: jackrabbit/trunk/contrib/spi/spi-logger/src/main/java/org/apache/jackrabbit/spi/logger/RepositoryServiceLogger.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/spi-logger/src/main/java/org/apache/jackrabbit/spi/logger/RepositoryServiceLogger.java?view=diff&rev=555526&r1=555525&r2=555526
==============================================================================
--- jackrabbit/trunk/contrib/spi/spi-logger/src/main/java/org/apache/jackrabbit/spi/logger/RepositoryServiceLogger.java
(original)
+++ jackrabbit/trunk/contrib/spi/spi-logger/src/main/java/org/apache/jackrabbit/spi/logger/RepositoryServiceLogger.java
Thu Jul 12 01:16:14 2007
@@ -241,11 +241,11 @@
         }, "getPropertyInfo(SessionInfo,PropertyId)", new Object[]{propertyId});
     }
 
-    public Batch createBatch(final ItemId itemId, final SessionInfo sessionInfo)
+    public Batch createBatch(final SessionInfo sessionInfo, final ItemId itemId)
             throws RepositoryException {
         return (Batch) execute(new Callable() {
             public Object call() throws RepositoryException {
-                return service.createBatch(itemId, sessionInfo);
+                return service.createBatch(sessionInfo, itemId);
             }
         }, "createBatch(ItemId,SessionInfo)", new Object[]{itemId});
     }

Modified: jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/client/ClientBatch.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/client/ClientBatch.java?view=diff&rev=555526&r1=555525&r2=555526
==============================================================================
--- jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/client/ClientBatch.java
(original)
+++ jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/client/ClientBatch.java
Thu Jul 12 01:16:14 2007
@@ -41,7 +41,7 @@
      */
     private final SerializableBatch batch;
 
-    ClientBatch(ItemId itemId, RemoteSessionInfo remoteSession) {
+    ClientBatch(RemoteSessionInfo remoteSession, ItemId itemId) {
         this.remoteSession = remoteSession;
         this.batch = new SerializableBatch(itemId);
     }

Modified: jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/client/ClientRepositoryService.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/client/ClientRepositoryService.java?view=diff&rev=555526&r1=555525&r2=555526
==============================================================================
--- jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/client/ClientRepositoryService.java
(original)
+++ jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/client/ClientRepositoryService.java
Thu Jul 12 01:16:14 2007
@@ -31,7 +31,6 @@
 import org.apache.jackrabbit.spi.QueryInfo;
 import org.apache.jackrabbit.spi.EventFilter;
 import org.apache.jackrabbit.spi.EventBundle;
-import org.apache.jackrabbit.spi.QNodeTypeDefinition;
 import org.apache.jackrabbit.spi.NodeInfo;
 import org.apache.jackrabbit.spi.rmi.remote.RemoteRepositoryService;
 import org.apache.jackrabbit.spi.rmi.remote.RemoteSessionInfo;
@@ -65,7 +64,6 @@
 import java.util.Map;
 import java.util.Iterator;
 import java.util.HashMap;
-import java.util.Arrays;
 import java.io.InputStream;
 import java.io.Serializable;
 import java.rmi.RemoteException;
@@ -304,9 +302,9 @@
     /**
      * {@inheritDoc}
      */
-    public Batch createBatch(ItemId itemId, SessionInfo sessionInfo)
+    public Batch createBatch(SessionInfo sessionInfo, ItemId itemId)
             throws RepositoryException {
-        return new ClientBatch(itemId, getRemoteSessionInfo(sessionInfo));
+        return new ClientBatch(getRemoteSessionInfo(sessionInfo), itemId);
     }
 
     /**

Modified: jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/server/ServerRepositoryService.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/server/ServerRepositoryService.java?view=diff&rev=555526&r1=555525&r2=555526
==============================================================================
--- jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/server/ServerRepositoryService.java
(original)
+++ jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/server/ServerRepositoryService.java
Thu Jul 12 01:16:14 2007
@@ -354,7 +354,7 @@
             throws RepositoryException, RemoteException {
         try {
             Batch local = service.createBatch(
-                    batch.getSaveTarget(), getSessionInfo(sessionInfo));
+                    getSessionInfo(sessionInfo), batch.getSaveTarget());
             batch.replay(local);
             service.submit(local);
         } catch (RepositoryException e) {

Modified: jackrabbit/trunk/contrib/spi/spi/src/main/java/org/apache/jackrabbit/spi/Batch.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/spi/src/main/java/org/apache/jackrabbit/spi/Batch.java?view=diff&rev=555526&r1=555525&r2=555526
==============================================================================
--- jackrabbit/trunk/contrib/spi/spi/src/main/java/org/apache/jackrabbit/spi/Batch.java (original)
+++ jackrabbit/trunk/contrib/spi/spi/src/main/java/org/apache/jackrabbit/spi/Batch.java Thu
Jul 12 01:16:14 2007
@@ -35,7 +35,7 @@
  * the persistent layer unaffected.<p/>
  *
  * The <code>Batch</code> object is obtained by calling
- * {@link RepositoryService#createBatch(ItemId, SessionInfo)}. The following
+ * {@link RepositoryService#createBatch(SessionInfo,ItemId)}. The following
  * methods can then be called on the returned <code>Batch</code> object to queue
  * the corresponding operations:
  * <ul>

Modified: jackrabbit/trunk/contrib/spi/spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java?view=diff&rev=555526&r1=555525&r2=555526
==============================================================================
--- jackrabbit/trunk/contrib/spi/spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java
(original)
+++ jackrabbit/trunk/contrib/spi/spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java
Thu Jul 12 01:16:14 2007
@@ -335,10 +335,10 @@
      * {@link Batch} must be executed at once or non must be executed upon
      * calling {@link #submit(Batch)}.
      *
+     * @param sessionInfo
      * @param itemId Id of the Item that is a common ancestor of all
      * <code>Item</code>s affected upon batch execution. This <code>Item</code>
      * might itself be modified within the scope of the <code>Batch</code>.
-     * @param sessionInfo
      * @return A Batch indicating the start of a set of transient modifications
      * that will be execute at once upon {@link #submit(Batch)}.
      * @throws RepositoryException
@@ -346,11 +346,11 @@
      * @see Session#save()
      * @see Batch
      */
-    public Batch createBatch(ItemId itemId, SessionInfo sessionInfo) throws RepositoryException;
+    public Batch createBatch(SessionInfo sessionInfo, ItemId itemId) throws RepositoryException;
 
     /**
      * Completes the given {@link Batch} or discard all the previous modifications.
-     * See {@link #createBatch(ItemId, SessionInfo)} for additional information
+     * See {@link #createBatch(SessionInfo,ItemId)} for additional information
      * regarding batch creation.
      *
      * @param batch

Modified: jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java?view=diff&rev=555526&r1=555525&r2=555526
==============================================================================
--- jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
(original)
+++ jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
Thu Jul 12 01:16:14 2007
@@ -1017,9 +1017,9 @@
     }
 
     /**
-     * @see RepositoryService#createBatch(ItemId, SessionInfo)
+     * @see RepositoryService#createBatch(SessionInfo,ItemId)
      */
-    public Batch createBatch(ItemId itemId, SessionInfo sessionInfo) throws RepositoryException
{
+    public Batch createBatch(SessionInfo sessionInfo, ItemId itemId) throws RepositoryException
{
         checkSessionInfo(sessionInfo);
         return new BatchImpl(itemId, sessionInfo);
     }

Modified: jackrabbit/trunk/contrib/spi/spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/RepositoryServiceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/RepositoryServiceImpl.java?view=diff&rev=555526&r1=555525&r2=555526
==============================================================================
--- jackrabbit/trunk/contrib/spi/spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/RepositoryServiceImpl.java
(original)
+++ jackrabbit/trunk/contrib/spi/spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/RepositoryServiceImpl.java
Thu Jul 12 01:16:14 2007
@@ -415,7 +415,7 @@
     /**
      * {@inheritDoc}
      */
-    public Batch createBatch(ItemId itemId, SessionInfo sessionInfo)
+    public Batch createBatch(SessionInfo sessionInfo, ItemId itemId)
             throws RepositoryException {
         return new BatchImpl(getSessionInfoImpl(sessionInfo));
     }



Mime
View raw message