jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1204944 - in /jackrabbit/sandbox/jackrabbit-mk: ./ jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/webdav/ jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ jackrabbit-jcr2spi/src/test/java/org/apache/jackr...
Date Tue, 22 Nov 2011 12:08:35 GMT
Author: mduerig
Date: Tue Nov 22 12:08:33 2011
New Revision: 1204944

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

Added:
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/WorkspaceTest.java
      - copied unchanged from r1204936, jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/WorkspaceTest.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AdditionalEventInfo.java
      - copied, changed from r1204936, jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AdditionalEventInfo.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/SessionExtensions.java
      - copied, changed from r1204936, jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/SessionExtensions.java
Modified:
    jackrabbit/sandbox/jackrabbit-mk/   (props changed)
    jackrabbit/sandbox/jackrabbit-mk/RELEASE-NOTES.txt
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/webdav/JcrRemotingConstants.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/BinaryTest.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/TestAll.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/WorkspaceMoveTest.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/pom.xml

Propchange: jackrabbit/sandbox/jackrabbit-mk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:08:33 2011
@@ -1,3 +1,3 @@
 /jackrabbit/branches/JCR-2272:1173165-1176545
 /jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1158344-1197487
+/jackrabbit/trunk:1158344-1204936

Modified: jackrabbit/sandbox/jackrabbit-mk/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/RELEASE-NOTES.txt?rev=1204944&r1=1204943&r2=1204944&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/RELEASE-NOTES.txt (original)
+++ jackrabbit/sandbox/jackrabbit-mk/RELEASE-NOTES.txt Tue Nov 22 12:08:33 2011
@@ -1,4 +1,4 @@
-Release Notes -- Apache Jackrabbit -- Version 2.3.2
+Release Notes -- Apache Jackrabbit -- Version 2.3.3
 
 Introduction
 ------------
@@ -11,6 +11,32 @@ Apache Jackrabbit 2.3 is an unstable ser
 Jackrabbit trunk, with a focus on new features and other improvements.
 For production use we recommend the latest stable 2.2 release.
 
+Changes in Jackrabbit 2.3.3
+---------------------------
+
+New features
+
+  [JCR-3118] Configurable actions upon authorizable creation and removal
+
+Improvements
+
+  [JCR-1443] ake JCAManagedConnectionFactory non final, so it can be extended
+  [JCR-2798] JCAManagedConnectionFactory should chain cause exception
+  [JCR-3120] Change log level in UserManagerImpl#getAuthorizable(NodeImpl) ...
+  [JCR-3127] Upgrade to Tika 0.10
+  [JCR-3132] Test tooling updates
+  [JCR-3135] Upgrade to Logback 1.0
+  [JCR-3136] Add m2e lifecycle mappings for Eclipse Indigo
+  [JCR-3141] Upgrade to Tika 1.0
+
+Bug fixes
+
+  [JCR-3093] Inconsistency between Session.getProperty and Node....
+  [JCR-3110] QNodeTypeDefinitionImpl.getSerializablePropertyDefs() ...
+  [JCR-3116] Cluster Node ID should be trimmed
+  [JCR-3131] NPE in ItemManager when calling Session.save() with nothing ...
+  [JCR-3139] missing sync in InternalVersionManagerImpl.externalUpdate ...
+
 Changes in Jackrabbit 2.3.2
 ---------------------------
 

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/webdav/JcrRemotingConstants.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/webdav/JcrRemotingConstants.java?rev=1204944&r1=1204943&r2=1204944&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/webdav/JcrRemotingConstants.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/webdav/JcrRemotingConstants.java
Tue Nov 22 12:08:33 2011
@@ -150,4 +150,30 @@ public interface JcrRemotingConstants {
     public static final String REPORT_NODETYPES = "nodetypes";
     public static final String REPORT_REGISTERED_NAMESPACES = "registerednamespaces";
     public static final String REPORT_REPOSITORY_DESCRIPTORS = "repositorydescriptors";
+
+    /**
+     * RFC 5988 relation type for user data
+     * <p>
+     * Used to transport JCR User Data inside an HTTP request.
+     * <p>
+     * Example:
+     * 
+     * <pre>
+     * Link: <data:,my%20user%data>, rel="<i>RELATION_USER_DATA</i>"
+     * </pre>
+     */
+    public static final String RELATION_USER_DATA = NS_URI + "/user-data";
+
+    /**
+     * RFC 5988 relation type for remote session identification
+     * <p>
+     * Used to transport an identifier for the remote session.
+     * <p>
+     * Example:
+     * 
+     * <pre>
+     * Link: <urn:uuid:96d3c6fe-1073-11e1-a3c0-00059a3c7a00>, rel="<i>RELATION_REMOTE_SESSION_ID</i>"
+     * </pre>
+     */
+    public static final String RELATION_REMOTE_SESSION_ID = NS_URI + "/session-id";
 }
\ No newline at end of file

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=1204944&r1=1204943&r2=1204944&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 Nov 22 12:08:33 2011
@@ -791,17 +791,37 @@ public class SessionImpl extends Abstrac
      * <ul>
      * <li>{@link Repository#LEVEL_1_SUPPORTED}</li>
      * <li>{@link Repository#LEVEL_2_SUPPORTED}</li>
-     * <li>{@link Repository#OPTION_TRANSACTIONS_SUPPORTED}</li>
-     * <li>{@link Repository#OPTION_VERSIONING_SUPPORTED}</li>
-     * <li>{@link Repository#OPTION_OBSERVATION_SUPPORTED}</li>
+     * <li>{@link Repository#OPTION_ACCESS_CONTROL_SUPPORTED}</li>
+     * <li>{@link Repository#OPTION_ACTIVITIES_SUPPORTED}</li>
+     * <li>{@link Repository#OPTION_BASELINES_SUPPORTED}</li>
+     * <li>{@link Repository#OPTION_JOURNALED_OBSERVATION_SUPPORTED}</li>
+     * <li>{@link Repository#OPTION_LIFECYCLE_SUPPORTED}</li>
      * <li>{@link Repository#OPTION_LOCKING_SUPPORTED}</li>
+     * <li>{@link Repository#OPTION_NODE_AND_PROPERTY_WITH_SAME_NAME_SUPPORTED}</li>
+     * <li>{@link Repository#OPTION_NODE_TYPE_MANAGEMENT_SUPPORTED}</li>
+     * <li>{@link Repository#OPTION_OBSERVATION_SUPPORTED}</li>
      * <li>{@link Repository#OPTION_QUERY_SQL_SUPPORTED}</li>
+     * <li>{@link Repository#OPTION_RETENTION_SUPPORTED}</li>
+     * <li>{@link Repository#OPTION_SHAREABLE_NODES_SUPPORTED}</li>
+     * <li>{@link Repository#OPTION_SIMPLE_VERSIONING_SUPPORTED}</li>
+     * <li>{@link Repository#OPTION_TRANSACTIONS_SUPPORTED}</li>
+     * <li>{@link Repository#OPTION_UNFILED_CONTENT_SUPPORTED}</li>
+     * <li>{@link Repository#OPTION_UPDATE_MIXIN_NODE_TYPES_SUPPORTED}</li>
+     * <li>{@link Repository#OPTION_UPDATE_PRIMARY_NODE_TYPE_SUPPORTED}</li>
+     * <li>{@link Repository#OPTION_VERSIONING_SUPPORTED}</li>
+     * <li>{@link Repository#OPTION_WORKSPACE_MANAGEMENT_SUPPORTED}</li>
+     * <li>{@link Repository#OPTION_XML_EXPORT_SUPPORTED}</li>
+     * <li>{@link Repository#OPTION_XML_IMPORT_SUPPORTED}</li>
+     * <li>{@link Repository#WRITE_SUPPORTED}</li>
      * </ul>
      * @return true if the repository supports the given option. False otherwise.
      */
     boolean isSupportedOption(String option) {
         String desc = repository.getDescriptor(option);
-        return Boolean.valueOf(desc);
+        // if the descriptors are not available return true. the missing
+        // functionality of the given SPI impl will in this case be detected
+        // upon the corresponding SPI call (see JCR-3143).
+        return desc == null ? true : Boolean.valueOf(desc);
     }
 
     /**

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/BinaryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/BinaryTest.java?rev=1204944&r1=1204943&r2=1204944&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/BinaryTest.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/BinaryTest.java
Tue Nov 22 12:08:33 2011
@@ -16,18 +16,17 @@
  */
 package org.apache.jackrabbit.jcr2spi;
 
-import java.util.Random;
-import java.io.ByteArrayInputStream;
+import org.apache.jackrabbit.jcr2spi.state.PropertyState;
+import org.apache.jackrabbit.spi.QValue;
+import org.apache.jackrabbit.test.AbstractJCRTest;
 
+import javax.jcr.Binary;
 import javax.jcr.Node;
-import javax.jcr.Session;
 import javax.jcr.Property;
-import javax.jcr.Binary;
+import javax.jcr.Session;
 import javax.jcr.ValueFormatException;
-
-import org.apache.jackrabbit.jcr2spi.state.PropertyState;
-import org.apache.jackrabbit.spi.QValue;
-import org.apache.jackrabbit.test.AbstractJCRTest;
+import java.io.ByteArrayInputStream;
+import java.util.Random;
 
 /**
  * <code>BinaryTest</code>...
@@ -73,6 +72,25 @@ public class BinaryTest extends Abstract
         }
     }
 
+    public void testStreamBinary2() throws Exception {
+        Node test = testRootNode.addNode("test");
+        Property p = test.setProperty("prop", generateValue());
+        // check before save
+        checkBinary(p);
+        superuser.save();
+        // check after save
+        checkBinary(p);
+
+        // check from other session
+        Session s = getHelper().getReadOnlySession();
+        try {
+            p = s.getProperty(testRoot + "/test/prop");
+            checkBinary(p);
+        } finally {
+            s.logout();
+        }
+    }
+
     public void testBinaryTwiceNewProperty() throws Exception {
         Node test = testRootNode.addNode("test");
         Property p = test.setProperty("prop", generateValue());

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/TestAll.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/TestAll.java?rev=1204944&r1=1204943&r2=1204944&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/TestAll.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/TestAll.java
Tue Nov 22 12:08:33 2011
@@ -104,6 +104,9 @@ public class TestAll extends TestCase {
         // observation
         suite.addTestSuite(ObservationTest.class);
 
+        // workspace mgt
+        suite.addTestSuite(WorkspaceTest.class);
+
         return suite;
     }
 }
\ No newline at end of file

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/WorkspaceMoveTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/WorkspaceMoveTest.java?rev=1204944&r1=1204943&r2=1204944&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/WorkspaceMoveTest.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/WorkspaceMoveTest.java
Tue Nov 22 12:08:33 2011
@@ -16,13 +16,13 @@
  */
 package org.apache.jackrabbit.jcr2spi;
 
+import org.apache.jackrabbit.test.NotExecutableException;
+
 import javax.jcr.ItemExistsException;
 import javax.jcr.Property;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 
-import org.apache.jackrabbit.test.NotExecutableException;
-
 /**
  * <code>WorkspaceMoveTest</code>...
  */
@@ -38,7 +38,6 @@ public class WorkspaceMoveTest extends M
         return false;
     }
 
-
     /**
      * Tries to move a node using to a location where a property already exists
      * with same name.

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/pom.xml?rev=1204944&r1=1204943&r2=1204944&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/pom.xml (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/pom.xml Tue Nov 22 12:08:33 2011
@@ -153,7 +153,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <execute/>
+                    <execute />
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -166,7 +166,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <execute/>
+                    <execute />
                   </action>
                 </pluginExecution>
               </pluginExecutions>

Copied: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AdditionalEventInfo.java
(from r1204936, jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AdditionalEventInfo.java)
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AdditionalEventInfo.java?p2=jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AdditionalEventInfo.java&p1=jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AdditionalEventInfo.java&r1=1204936&r2=1204944&rev=1204944&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AdditionalEventInfo.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AdditionalEventInfo.java
Tue Nov 22 12:08:33 2011
@@ -16,13 +16,12 @@
  */
 package org.apache.jackrabbit.spi.commons;
 
-import java.util.Set;
-
-import javax.jcr.UnsupportedRepositoryOperationException;
-
 import org.apache.jackrabbit.spi.Event;
 import org.apache.jackrabbit.spi.Name;
 
+import javax.jcr.UnsupportedRepositoryOperationException;
+import java.util.Set;
+
 /**
  * Provides additional information for an {@link Event}.
  */
@@ -31,15 +30,15 @@ public interface AdditionalEventInfo {
 	/**
 	 * @return the name of the primary node type of the node associated with the event
 	 */
-    public Name getPrimaryNodeTypeName() throws UnsupportedRepositoryOperationException;
+    Name getPrimaryNodeTypeName() throws UnsupportedRepositoryOperationException;
 
 	/**
 	 * @return the names of the mixin node types of the node associated with the event
 	 */
-    public Set<Name> getMixinTypeNames() throws UnsupportedRepositoryOperationException;
+    Set<Name> getMixinTypeNames() throws UnsupportedRepositoryOperationException;
 
     /**
      * @return the specified Session attribute
      */
-    public Object getSessionAttribute(String name) throws UnsupportedRepositoryOperationException;
+    Object getSessionAttribute(String name) throws UnsupportedRepositoryOperationException;
 }

Copied: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/SessionExtensions.java
(from r1204936, jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/SessionExtensions.java)
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/SessionExtensions.java?p2=jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/SessionExtensions.java&p1=jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/SessionExtensions.java&r1=1204936&r2=1204944&rev=1204944&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/SessionExtensions.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/SessionExtensions.java
Tue Nov 22 12:08:33 2011
@@ -28,5 +28,5 @@ public interface SessionExtensions {
 	 * @param name attribute name
 	 * @param value attribute value
 	 */
-	public void setAttribute(String name, Object value);
+    void setAttribute(String name, Object value);
 }



Mime
View raw message