jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r791438 - in /jackrabbit/trunk: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/ jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/iterator/ jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2sp...
Date Mon, 06 Jul 2009 11:04:05 GMT
Author: jukka
Date: Mon Jul  6 11:04:04 2009
New Revision: 791438

URL: http://svn.apache.org/viewvc?rev=791438&view=rev
Log:
JCR-1104: JSR 283 support

Upgrade to pre-release version b18 of the JCR 2.0 API.

Removed implementations of the EventIterator.getDate() method that is no longer included.

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventJournalImpl.java
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/FilteredEventIterator.java
    jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/iterator/EventIteratorAdapter.java
    jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/EventJournalImpl.java
    jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/FilteredEventIterator.java
    jackrabbit/trunk/jackrabbit-parent/pom.xml

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventJournalImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventJournalImpl.java?rev=791438&r1=791437&r2=791438&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventJournalImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventJournalImpl.java
Mon Jul  6 11:04:04 2009
@@ -176,11 +176,6 @@
         return next;
     }
 
-    public long getDate() {
-        // TODO
-        throw new RuntimeException("Not implemented yet, see JCR-2086");
-    }
-
     //------------------------< RangeIterator >---------------------------------
 
     /**

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/FilteredEventIterator.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/FilteredEventIterator.java?rev=791438&r1=791437&r2=791438&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/FilteredEventIterator.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/FilteredEventIterator.java
Mon Jul  6 11:04:04 2009
@@ -125,11 +125,6 @@
         }
     }
 
-    public long getDate() {
-        // TODO
-        throw new RuntimeException("Not implemented yet, see JCR-2086");
-    }
-
     /**
      * Always returns <code>-1</code>.
      *

Modified: jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/iterator/EventIteratorAdapter.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/iterator/EventIteratorAdapter.java?rev=791438&r1=791437&r2=791438&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/iterator/EventIteratorAdapter.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/iterator/EventIteratorAdapter.java
Mon Jul  6 11:04:04 2009
@@ -16,7 +16,6 @@
  */
 package org.apache.jackrabbit.commons.iterator;
 
-import java.util.Calendar;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
@@ -33,18 +32,12 @@
         implements EventIterator {
 
     /**
-     * Date associated with this iterator.
-     */
-    private final long date;
-
-    /**
      * Creates an adapter for the given {@link RangeIterator}.
      *
      * @param iterator iterator of {@link Event}s
      */
     public EventIteratorAdapter(EventIterator iterator) {
         super(iterator);
-        this.date = iterator.getDate();
     }
 
     /**
@@ -52,9 +45,8 @@
      *
      * @param iterator iterator of {@link Event}s
      */
-    public EventIteratorAdapter(RangeIterator iterator, long date) {
+    public EventIteratorAdapter(RangeIterator iterator) {
         super(iterator);
-        this.date = date;
     }
 
     /**
@@ -62,9 +54,8 @@
      *
      * @param iterator iterator of {@link Event}s.
      */
-    public EventIteratorAdapter(Iterator iterator, long date) {
+    public EventIteratorAdapter(Iterator iterator) {
         super(new RangeIteratorAdapter(iterator));
-        this.date = date;
     }
 
     /**
@@ -72,9 +63,8 @@
      *
      * @param collection collection of {@link Event}s
      */
-    public EventIteratorAdapter(Collection collection, long date) {
+    public EventIteratorAdapter(Collection collection) {
         super(new RangeIteratorAdapter(collection));
-        this.date = date;
     }
 
     //-------------------------------------------------------< EventIterator >
@@ -89,13 +79,4 @@
         return (Event) next();
     }
 
-    /**
-     * Returns the date associated with this iterator.
-     *
-     * @return date associated with this iterator, or <code>null</code> 
-     */
-    public long getDate() {
-        return date;
-    }
-
 }

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/EventJournalImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/EventJournalImpl.java?rev=791438&r1=791437&r2=791438&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/EventJournalImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/EventJournalImpl.java
Mon Jul  6 11:04:04 2009
@@ -95,11 +95,6 @@
         return (javax.jcr.observation.Event) next();
     }
 
-    public long getDate() {
-        // TODO
-        throw new RuntimeException("Not implemented, see JCR-2086");
-    }
-
     /**
      * {@inheritDoc}
      */

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/FilteredEventIterator.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/FilteredEventIterator.java?rev=791438&r1=791437&r2=791438&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/FilteredEventIterator.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/FilteredEventIterator.java
Mon Jul  6 11:04:04 2009
@@ -113,14 +113,6 @@
     }
 
     /**
-     * @see javax.jcr.observation.EventIterator#getDate()
-     */
-    public long getDate() {
-        // TODO
-        throw new UnsupportedOperationException("JCR-2108. Implementation Missing");
-    }
-
-    /**
      * {@inheritDoc}
      */
     public void skip(long skipNum) {

Modified: jackrabbit/trunk/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-parent/pom.xml?rev=791438&r1=791437&r2=791438&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-parent/pom.xml Mon Jul  6 11:04:04 2009
@@ -147,7 +147,7 @@
       <dependency>
         <groupId>javax.jcr</groupId>
         <artifactId>jcr</artifactId>
-        <version>2.0-b17</version>
+        <version>2.0-b18</version>
         <scope>provided</scope>
       </dependency>
       <dependency>



Mime
View raw message