jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From resc...@apache.org
Subject svn commit: r581837 - in /jackrabbit/trunk: contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/server/ contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/ contri...
Date Thu, 04 Oct 2007 10:33:10 GMT
Author: reschke
Date: Thu Oct  4 03:33:09 2007
New Revision: 581837

URL: http://svn.apache.org/viewvc?rev=581837&view=rev
Log:
JCR-1153: remove EventBundle.getId() and adjust EventBundleImpl accordingly.

Modified:
    jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java
    jackrabbit/trunk/contrib/spi/spi-rmi/src/main/java/org/apache/jackrabbit/spi/rmi/server/ServerRepositoryService.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/EventSubscription.java
    jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/EventBundleImpl.java
    jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/EventBundle.java

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?rev=581837&r1=581836&r2=581837&view=diff
==============================================================================
--- 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 Oct  4 03:33:09 2007
@@ -615,7 +615,6 @@
         if (log.isDebugEnabled()) {
             log.debug("received {} event bundles.", new Integer(eventBundles.length));
             for (int i = 0; i < eventBundles.length; i++) {
-                log.debug("BundleId: {}", eventBundles[i].getBundleId());
                 log.debug("IsLocal:  {}", Boolean.valueOf(eventBundles[i].isLocal()));
                 for (Iterator it = eventBundles[i].getEvents(); it.hasNext(); ) {
                     Event e = (Event) it.next();

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?rev=581837&r1=581836&r2=581837&view=diff
==============================================================================
--- 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 Oct  4 03:33:09 2007
@@ -742,8 +742,7 @@
                             e.getMixinTypeNames(), e.getUserID());
                     events.add(serEvent);
                 }
-                serBundles[i] = new EventBundleImpl(events,
-                        bundles[i].isLocal(), bundles[i].getBundleId());
+                serBundles[i] = new EventBundleImpl(events, bundles[i].isLocal());
             }
             return serBundles;
         } catch (RepositoryException e) {

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?rev=581837&r1=581836&r2=581837&view=diff
==============================================================================
--- 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 Oct  4 03:33:09 2007
@@ -1594,8 +1594,7 @@
                     }
                     bundles.add(new EventBundleImpl(
                             buildEventList(bundleElement, sessionInfo),
-                            isLocal,
-                            null)); // TODO: bundle id is missing
+                            isLocal));
                 }
                 events = (EventBundle[]) bundles.toArray(new EventBundle[bundles.size()]);
             }

Modified: jackrabbit/trunk/contrib/spi/spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/EventSubscription.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/EventSubscription.java?rev=581837&r1=581836&r2=581837&view=diff
==============================================================================
--- jackrabbit/trunk/contrib/spi/spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/EventSubscription.java
(original)
+++ jackrabbit/trunk/contrib/spi/spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/EventSubscription.java
Thu Oct  4 03:33:09 2007
@@ -24,7 +24,6 @@
 import org.apache.jackrabbit.spi.IdFactory;
 import org.apache.jackrabbit.spi.commons.EventImpl;
 import org.apache.jackrabbit.spi.commons.EventBundleImpl;
-import org.apache.jackrabbit.uuid.UUID;
 import org.apache.jackrabbit.name.NamespaceResolver;
 import org.apache.jackrabbit.name.Path;
 import org.apache.jackrabbit.name.PathFormat;
@@ -132,8 +131,7 @@
                     }
                 }
             }
-            bundles[i] = new EventBundleImpl(filteredEvents,
-                    bundles[i].isLocal(), bundles[i].getBundleId());
+            bundles[i] = new EventBundleImpl(filteredEvents, bundles[i].isLocal());
         }
         return bundles;
     }
@@ -186,8 +184,7 @@
                 log.warn("Unable to create SPI Event: " + ex);
             }
         }
-        String bundleId = UUID.randomUUID().toString();
-        EventBundle bundle = new EventBundleImpl(spiEvents, isLocal, bundleId);
+        EventBundle bundle = new EventBundleImpl(spiEvents, isLocal);
         synchronized (eventBundles) {
             eventBundles.add(bundle);
             eventBundles.notify();

Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/EventBundleImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/EventBundleImpl.java?rev=581837&r1=581836&r2=581837&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/EventBundleImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/EventBundleImpl.java
Thu Oct  4 03:33:09 2007
@@ -33,11 +33,6 @@
     private final boolean isLocal;
 
     /**
-     * The bundle id.
-     */
-    private final String bundleId;
-
-    /**
      * The events in this bundle.
      */
     private final Collection events;
@@ -47,12 +42,10 @@
      *
      * @param events   the events for this bundle.
      * @param isLocal  if this events were created due to a local change.
-     * @param bundleId the bundle id.
      */
-    public EventBundleImpl(Collection events, boolean isLocal, String bundleId) {
+    public EventBundleImpl(Collection events, boolean isLocal) {
         this.events = events;
         this.isLocal = isLocal;
-        this.bundleId = bundleId;
     }
 
     /**
@@ -60,13 +53,6 @@
      */
     public Iterator getEvents() {
         return events.iterator();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBundleId() {
-        return bundleId;
     }
 
     /**

Modified: jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/EventBundle.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/EventBundle.java?rev=581837&r1=581836&r2=581837&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/EventBundle.java
(original)
+++ jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/EventBundle.java
Thu Oct  4 03:33:09 2007
@@ -34,13 +34,6 @@
     public Iterator getEvents();
 
     /**
-     * Returns the identifier for this <code>EventBundle</code>.
-     *
-     * @return the identifier for this <code>EventBundle</code>.
-     */
-    public String getBundleId();
-
-    /**
      * Returns <code>true</code> if this event bundle is associated with a
      * change that was initiated by a local session info. Event bundles for
      * external changes will aways return <code>false</code>.



Mime
View raw message