jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1158788 - in /jackrabbit/sandbox/jackrabbit-mk: ./ jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/ jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/compact/
Date Wed, 17 Aug 2011 15:55:33 GMT
Author: mduerig
Date: Wed Aug 17 15:55:33 2011
New Revision: 1158788

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

Modified:
    jackrabbit/sandbox/jackrabbit-mk/   (props changed)
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/QDefinitionBuilderFactory.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefWriter.java

Propchange: jackrabbit/sandbox/jackrabbit-mk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 17 15:55:33 2011
@@ -1 +1,2 @@
 /jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
+/jackrabbit/trunk:1158344-1158782

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/QDefinitionBuilderFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/QDefinitionBuilderFactory.java?rev=1158788&r1=1158787&r2=1158788&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/QDefinitionBuilderFactory.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/QDefinitionBuilderFactory.java
Wed Aug 17 15:55:33 2011
@@ -120,8 +120,8 @@ public class QDefinitionBuilderFactory e
 
         @Override
         public QNodeTypeDefinition build() {
-            if (supertypes.size() == 0 && !NameConstants.NT_BASE.equals(name)) {
-                supertypes.add(NameConstants.NT_BASE);    
+            if (!isMixin && !NameConstants.NT_BASE.equals(name)) {
+                supertypes.add(NameConstants.NT_BASE);
             }
 
             return new QNodeTypeDefinitionImpl(

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefWriter.java?rev=1158788&r1=1158787&r2=1158788&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefWriter.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefWriter.java
Wed Aug 17 15:55:33 2011
@@ -54,10 +54,10 @@ public class CompactNodeTypeDefWriter ex
     /**
      * Creates a new nodetype writer based on a session
      *
-     * @param out the underlaying writer
+     * @param out the underlying writer
      * @param s repository session
-     * @param includeNS if <code>true</code> all used namespace decl. are also
-     *                  written to the writer
+     * @param includeNS if <code>true</code> all used namespace declarations
+     *                  are also written to the writer
      */
     public CompactNodeTypeDefWriter(Writer out, Session s, boolean includeNS) {
         this(out, new SessionNamespaceResolver(s), new DefaultNamePathResolver(s), includeNS);
@@ -66,8 +66,8 @@ public class CompactNodeTypeDefWriter ex
     /**
      * Creates a new nodetype writer based on a namespace resolver
      *
-     * @param out the underlaying writer
-     * @param r the naespace resolver
+     * @param out the underlying writer
+     * @param r the namespace resolver
      * @param includeNS if <code>true</code> all used namespace decl. are also
      *                  written to the writer
      */
@@ -76,10 +76,10 @@ public class CompactNodeTypeDefWriter ex
     }
 
     /**
-     * Creates a new nodetype writer that does not include namepsaces.
+     * Creates a new nodetype writer that does not include namespaces.
      *
-     * @param out the underlaying writer
-     * @param r the naespace resolver
+     * @param out the underlying writer
+     * @param r the namespace resolver
      * @param npResolver name-path resolver
      */
     public CompactNodeTypeDefWriter(Writer out,



Mime
View raw message