jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1176427 - in /jackrabbit/sandbox/jackrabbit-mk: ./ jackrabbit-jcr-commons/ jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/ jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/ jackrabbit-jcr-commons/src/main/java...
Date Tue, 27 Sep 2011 15:10:35 GMT
Author: mduerig
Date: Tue Sep 27 15:10:34 2011
New Revision: 1176427

URL: http://svn.apache.org/viewvc?rev=1176427&view=rev
Log:
Microkernel based Jackrabbit prototype (WIP)
merge changes from trunk

Added:
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/cnd/package-info.java
      - copied unchanged from r1176401, jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/cnd/package-info.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/package-info.java
      - copied unchanged from r1176401, jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/package-info.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/iterator/package-info.java
      - copied unchanged from r1176401, jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/iterator/package-info.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/jackrabbit/user/package-info.java
      - copied unchanged from r1176401, jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/jackrabbit/user/package-info.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/json/package-info.java
      - copied unchanged from r1176401, jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/json/package-info.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/package-info.java
      - copied unchanged from r1176401, jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/package-info.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/packaging/package-info.java
      - copied unchanged from r1176401, jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/packaging/package-info.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/predicate/package-info.java
      - copied unchanged from r1176401, jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/predicate/package-info.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/query/package-info.java
      - copied unchanged from r1176401, jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/query/package-info.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/query/qom/package-info.java
      - copied unchanged from r1176401, jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/query/qom/package-info.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/query/sql2/package-info.java
      - copied unchanged from r1176401, jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/query/sql2/package-info.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/repository/package-info.java
      - copied unchanged from r1176401, jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/repository/package-info.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/visitor/package-info.java
      - copied unchanged from r1176401, jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/visitor/package-info.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/webdav/package-info.java
      - copied unchanged from r1176401, jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/webdav/package-info.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/xml/package-info.java
      - copied unchanged from r1176401, jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/xml/package-info.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/package-info.java
      - copied unchanged from r1176401, jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/package-info.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/package-info.java
      - copied unchanged from r1176401, jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/package-info.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/value/package-info.java
      - copied unchanged from r1176401, jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/value/package-info.java
Modified:
    jackrabbit/sandbox/jackrabbit-mk/   (props changed)
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/pom.xml
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/BTreeManager.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/packaging/FilterContentPackage.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-parent/pom.xml

Propchange: jackrabbit/sandbox/jackrabbit-mk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 27 15:10:34 2011
@@ -1,2 +1,2 @@
 /jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1158344-1166581
+/jackrabbit/trunk:1158344-1176401

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/pom.xml?rev=1176427&r1=1176426&r2=1176427&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/pom.xml (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/pom.xml Tue Sep 27 15:10:34 2011
@@ -45,10 +45,6 @@
             <Main-Class>
               org.apache.jackrabbit.util.Base64
             </Main-Class>
-            <Export-Package>
-              !org.apache.jackrabbit.api.*,
-              org.apache.jackrabbit.*;version=${project.version}
-            </Export-Package>
             <Import-Package>
               *,
               org.apache.jackrabbit.api.security.user;version="[2.2,3)";resolution:=optional
@@ -77,6 +73,11 @@
       <optional>true</optional>
     </dependency>
     <dependency>
+      <groupId>biz.aQute</groupId>
+      <artifactId>bndlib</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/BTreeManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/BTreeManager.java?rev=1176427&r1=1176426&r2=1176427&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/BTreeManager.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/BTreeManager.java
Tue Sep 27 15:10:34 2011
@@ -27,7 +27,6 @@ import javax.jcr.NodeIterator;
 import javax.jcr.Property;
 import javax.jcr.PropertyIterator;
 import javax.jcr.RepositoryException;
-
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.HashSet;
@@ -166,6 +165,7 @@ public class BTreeManager implements Tre
      * @see org.apache.jackrabbit.commons.flat.TreeManager#split(org.apache.jackrabbit.commons.flat.ItemSequence,
      *      javax.jcr.Node, javax.jcr.Node)
      */
+    @SuppressWarnings("deprecation")
     public void split(ItemSequence itemSequence, Node node, Node cause) throws RepositoryException
{
         SizedIterator<Node> childNodes = getNodes(node);
         int count = (int) childNodes.getSize();
@@ -185,6 +185,7 @@ public class BTreeManager implements Tre
      * @see org.apache.jackrabbit.commons.flat.TreeManager#split(org.apache.jackrabbit.commons.flat.ItemSequence,
      *      javax.jcr.Node, javax.jcr.Property)
      */
+    @SuppressWarnings("deprecation")
     public void split(ItemSequence itemSequence, Node node, Property cause) throws RepositoryException
{
         SizedIterator<Property> properties = getProperties(node);
         int count = (int) properties.getSize();
@@ -204,6 +205,7 @@ public class BTreeManager implements Tre
      * @see org.apache.jackrabbit.commons.flat.TreeManager#join(org.apache.jackrabbit.commons.flat.ItemSequence,
      *      javax.jcr.Node, javax.jcr.Node)
      */
+    @SuppressWarnings("deprecation")
     public void join(ItemSequence itemSequence, Node node, Node cause) throws RepositoryException
{
         SizedIterator<Node> nodes = getNodes(node);
         long count = nodes.getSize();
@@ -225,6 +227,7 @@ public class BTreeManager implements Tre
      * @see org.apache.jackrabbit.commons.flat.TreeManager#join(org.apache.jackrabbit.commons.flat.ItemSequence,
      *      javax.jcr.Node, javax.jcr.Property)
      */
+    @SuppressWarnings("deprecation")
     public void join(ItemSequence itemSequence, Node node, Property cause) throws RepositoryException
{
         SizedIterator<Property> properties = getProperties(node);
         long count = properties.getSize();
@@ -266,7 +269,7 @@ public class BTreeManager implements Tre
     /**
      * Returns a {@link SizedIterator} of the child nodes of <code>node</code>.
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "deprecation", "unchecked" })
     protected SizedIterator<Node> getNodes(Node node) throws RepositoryException {
         NodeIterator nodes = node.getNodes();
         return getSizedIterator(nodes, nodes.getSize());
@@ -276,6 +279,7 @@ public class BTreeManager implements Tre
      * Returns a {@link SizedIterator} of the properties of <code>node</code>
      * which excludes the <code>jcr.primaryType</code> property.
      */
+    @SuppressWarnings({ "deprecation", "unchecked" })
     protected SizedIterator<Property> getProperties(Node node) throws RepositoryException
{
         final PropertyIterator properties = node.getProperties();
 
@@ -319,6 +323,7 @@ public class BTreeManager implements Tre
      * <code>size</code>. The value of the <code>size</code> parameter
must
      * correctly reflect the number of items in <code>iterator</code>.
      */
+    @SuppressWarnings("deprecation")
     protected final <T> SizedIterator<T> getSizedIterator(final Iterator<T>
iterator, final long size) {
         return new SizedIterator<T>() {
             public boolean hasNext() {

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/packaging/FilterContentPackage.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/packaging/FilterContentPackage.java?rev=1176427&r1=1176426&r2=1176427&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/packaging/FilterContentPackage.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/packaging/FilterContentPackage.java
Tue Sep 27 15:10:34 2011
@@ -16,10 +16,7 @@
  */
 package org.apache.jackrabbit.commons.packaging;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
+import org.apache.jackrabbit.commons.predicate.Predicate;
 
 import javax.jcr.Item;
 import javax.jcr.Node;
@@ -27,12 +24,14 @@ import javax.jcr.NodeIterator;
 import javax.jcr.PropertyIterator;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
-
-import org.apache.jackrabbit.commons.predicate.Predicate;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
 
 public class FilterContentPackage implements ContentPackage {
 
-    protected final List content = new ArrayList();
+    protected final List<Content> content = new ArrayList<Content>();
 
     protected boolean includeProperties = false;
 
@@ -47,9 +46,9 @@ public class FilterContentPackage implem
     /**
      * @see org.apache.jackrabbit.commons.packaging.ContentPackage#getItems(javax.jcr.Session)
      */
-    public Iterator getItems(Session session)
+    public Iterator<Item> getItems(Session session)
     throws RepositoryException {
-        return new FilteringIterator(session, new ArrayList(this.content), this.includeProperties);
+        return new FilteringIterator(session, new ArrayList<Content>(this.content),
this.includeProperties);
     }
 
     protected static class Content {
@@ -65,7 +64,7 @@ public class FilterContentPackage implem
     public static class FilteringIterator implements Iterator {
 
         /** The content we will iterate over. */
-        protected final List content;
+        protected final List<Content> content;
 
         /**
          * Filter that defines which items are included
@@ -80,7 +79,7 @@ public class FilterContentPackage implem
 
         protected final Session session;
 
-        protected final List nodeIteratorStack = new ArrayList();
+        protected final List<NodeIterator> nodeIteratorStack = new ArrayList<NodeIterator>();
 
         protected final boolean includeProperties;
 
@@ -95,7 +94,7 @@ public class FilterContentPackage implem
          * @param includeProperties Should properties be included.
          */
         public FilteringIterator(final Session session,
-                                 final List contentList,
+                                 final List<Content> contentList,
                                  final boolean includeProperties) {
             this.content = contentList;
             this.session = session;

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=1176427&r1=1176426&r2=1176427&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
Tue Sep 27 15:10:34 2011
@@ -437,6 +437,8 @@ public class SessionImpl extends Abstrac
 
     @Override
     public AccessControlManager getAccessControlManager() throws RepositoryException {
+        checkSupportedOption(Repository.OPTION_ACCESS_CONTROL_SUPPORTED);
+
         // TODO: implementation missing
         throw new UnsupportedRepositoryOperationException("JCR-1104");
     }
@@ -470,6 +472,8 @@ public class SessionImpl extends Abstrac
 
     @Override
     public RetentionManager getRetentionManager() throws RepositoryException {
+        checkSupportedOption(Repository.OPTION_RETENTION_SUPPORTED);
+        
         // TODO: implementation missing
         throw new UnsupportedRepositoryOperationException("JCR-1104");
     }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-parent/pom.xml?rev=1176427&r1=1176426&r2=1176427&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-parent/pom.xml Tue Sep 27 15:10:34 2011
@@ -192,6 +192,11 @@
         <version>3.1</version>
       </dependency>
       <dependency>
+        <groupId>biz.aQute</groupId>
+        <artifactId>bndlib</artifactId>
+        <version>1.43.0</version>
+      </dependency>
+      <dependency>
         <groupId>cglib</groupId>
         <artifactId>cglib</artifactId>
         <version>2.2</version>



Mime
View raw message