jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tri...@apache.org
Subject svn commit: r801459 - in /jackrabbit/trunk: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/ jackrabbit-jcr-client/src/te...
Date Wed, 05 Aug 2009 23:17:12 GMT
Author: tripod
Date: Wed Aug  5 23:17:11 2009
New Revision: 801459

URL: http://svn.apache.org/viewvc?rev=801459&view=rev
Log:
JCR-1974 JSR 283: Evaluate Capabilities (adapted to changed signature)
JCR-2140 JSR 283: Configurations and Baselines (adapted to changed signature)

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SessionImpl.java
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/VersionManagerImpl.java
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterSession.java
    jackrabbit/trunk/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCASessionHandle.java
    jackrabbit/trunk/jackrabbit-jcr-client/src/test/java/org/apache/jackrabbit/client/RepositoryFactoryImplTest.java
    jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/server/remoting/davex/JsonDiffHandlerTest.java
    jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SessionTest.java
    jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/ConfigurationsTest.java
    jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/JcrVersionManager.java
    jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java
    jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java
    jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateConfiguration.java
    jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionManager.java
    jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionManagerImpl.java
    jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractJCR2SPITest.java
    jackrabbit/trunk/jackrabbit-parent/pom.xml
    jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AbstractReadableRepositoryService.java
    jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/logging/RepositoryServiceLogger.java
    jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java
    jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
    jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/RepositoryServiceImpl.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SessionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SessionImpl.java?rev=801459&r1=801458&r2=801459&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SessionImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SessionImpl.java
Wed Aug  5 23:17:11 2009
@@ -1548,7 +1548,7 @@
      * @see javax.jcr.Session#hasCapability(String, Object, Map)
      * @since JCR 2.0
      */
-    public boolean hasCapability(String methodName, Object target, Map arguments)
+    public boolean hasCapability(String methodName, Object target, Object[] arguments)
             throws RepositoryException {
         // value of this method (as currently spec'ed) to jcr api clients
         // is rather limited...

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/VersionManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/VersionManagerImpl.java?rev=801459&r1=801458&r2=801459&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/VersionManagerImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/VersionManagerImpl.java
Wed Aug  5 23:17:11 2009
@@ -382,17 +382,6 @@
     /**
      * {@inheritDoc}
      */
-    public Node createConfiguration(String absPath, Version baseline)
-            throws RepositoryException {
-        if (baseline != null) {
-            throw new UnsupportedRepositoryOperationException("createConfiguration(String,
Version) with baseline is no longer supported.");
-        }
-        return createConfiguration(absPath);
-    }
-    
-    /**
-     * {@inheritDoc}
-     */
     public Node createConfiguration(String absPath) throws RepositoryException {
         if (session.nodeExists(absPath)) {
             NodeStateEx state = getNodeState(absPath,

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterSession.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterSession.java?rev=801459&r1=801458&r2=801459&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterSession.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterSession.java
Wed Aug  5 23:17:11 2009
@@ -335,7 +335,7 @@
         throw new UnsupportedRepositoryOperationException();
     }
 
-    public boolean hasCapability(String arg0, Object arg1, Map arg2)
+    public boolean hasCapability(String arg0, Object arg1, Object[] arg2)
             throws RepositoryException {
         throw new UnsupportedRepositoryOperationException();
     }

Modified: jackrabbit/trunk/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCASessionHandle.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCASessionHandle.java?rev=801459&r1=801458&r2=801459&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCASessionHandle.java
(original)
+++ jackrabbit/trunk/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCASessionHandle.java
Wed Aug  5 23:17:11 2009
@@ -356,7 +356,7 @@
         return getSession().getRetentionManager();
     }
 
-    public boolean hasCapability(String arg0, Object arg1, Map arg2)
+    public boolean hasCapability(String arg0, Object arg1, Object[] arg2)
             throws RepositoryException {
         return getSession().hasCapability(arg0, arg1, arg2);
     }

Modified: jackrabbit/trunk/jackrabbit-jcr-client/src/test/java/org/apache/jackrabbit/client/RepositoryFactoryImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-client/src/test/java/org/apache/jackrabbit/client/RepositoryFactoryImplTest.java?rev=801459&r1=801458&r2=801459&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-client/src/test/java/org/apache/jackrabbit/client/RepositoryFactoryImplTest.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr-client/src/test/java/org/apache/jackrabbit/client/RepositoryFactoryImplTest.java
Wed Aug  5 23:17:11 2009
@@ -306,7 +306,7 @@
             return null;
         }
 
-        public NodeId createConfiguration(SessionInfo sessionInfo, NodeId nodeId, NodeId
baselineId) throws UnsupportedRepositoryOperationException, RepositoryException {
+        public NodeId createConfiguration(SessionInfo sessionInfo, NodeId nodeId) throws
UnsupportedRepositoryOperationException, RepositoryException {
             return null;
         }
 

Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/server/remoting/davex/JsonDiffHandlerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/server/remoting/davex/JsonDiffHandlerTest.java?rev=801459&r1=801458&r2=801459&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/server/remoting/davex/JsonDiffHandlerTest.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/server/remoting/davex/JsonDiffHandlerTest.java
Wed Aug  5 23:17:11 2009
@@ -234,7 +234,7 @@
             return null;
         }
 
-        public boolean hasCapability(String arg0, Object arg1, Map arg2)
+        public boolean hasCapability(String arg0, Object arg1, Object[] arg2)
                 throws RepositoryException {
             // TODO Auto-generated method stub
             return false;

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SessionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SessionTest.java?rev=801459&r1=801458&r2=801459&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SessionTest.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SessionTest.java
Wed Aug  5 23:17:11 2009
@@ -29,8 +29,6 @@
 import javax.jcr.Value;
 import javax.jcr.Repository;
 import javax.jcr.lock.LockException;
-import java.util.Map;
-import java.util.HashMap;
 
 /**
  * <code>SessionTest</code> contains all test cases for the
@@ -681,8 +679,7 @@
         Session roSession = getHelper().getReadOnlySession();
         try {
             Node root = roSession.getRootNode();
-            Map args = new HashMap();
-            args.put("relPath", "foo");
+            Object[] args = new Object[] { "foo" };
             if (!roSession.hasCapability("addNode",  root, args)) {
                 // if hasCapability() returns false, the actual method call
                 // is expected to fail

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/ConfigurationsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/ConfigurationsTest.java?rev=801459&r1=801458&r2=801459&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/ConfigurationsTest.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/ConfigurationsTest.java
Wed Aug  5 23:17:11 2009
@@ -74,7 +74,7 @@
     }
 
     public void testCreateConfiguration() throws Exception {
-        Node config = vm.createConfiguration(versionableNode.getPath(), null);
+        Node config = vm.createConfiguration(versionableNode.getPath());
         assertNotNull(config);
         NodeType nt = config.getPrimaryNodeType();
         assertTrue("created node must be subtype of nt:configuration", nt.isNodeType(ntConfiguration));
@@ -91,7 +91,7 @@
 
     public void testCreateConfigurationNotVersionableFails() throws Exception {
         try {
-            vm.createConfiguration(nonVersionableNode.getPath(), null);
+            vm.createConfiguration(nonVersionableNode.getPath());
             fail("Create configuration must fail for non-versionable node");
         } catch (UnsupportedRepositoryOperationException e) {
             // ignore
@@ -99,9 +99,9 @@
     }
 
     public void testCreateConfigurationTwiceFails() throws Exception {
-        vm.createConfiguration(versionableNode.getPath(), null);
+        vm.createConfiguration(versionableNode.getPath());
         try {
-            vm.createConfiguration(versionableNode.getPath(), null);
+            vm.createConfiguration(versionableNode.getPath());
             fail("Create configuration must fail if versionable is already a configuration");
         } catch (UnsupportedRepositoryOperationException e) {
             // ignore
@@ -109,7 +109,7 @@
     }
 
     public void testConfigurationsPath() throws Exception {
-        Node config = vm.createConfiguration(versionableNode.getPath(), null);
+        Node config = vm.createConfiguration(versionableNode.getPath());
         assertNotNull(config);
         NodeType nt = config.getPrimaryNodeType();
         assertTrue("created node must be subtype of nt:configuration", nt.isNodeType(ntConfiguration));
@@ -119,7 +119,7 @@
     }
 
     public void testCheckinConfigFailsWithUnversionedChild() throws Exception {
-        Node config = vm.createConfiguration(versionableNode.getPath(), null);
+        Node config = vm.createConfiguration(versionableNode.getPath());
         try {
             vm.checkin(config.getPath());
             fail("Checkin configuration must fail one of the recorded versions is not versioned.");
@@ -130,7 +130,7 @@
 
     public void testCheckinConfig() throws Exception {
         vm.checkin(versionableNode.getPath());
-        Node config = vm.createConfiguration(versionableNode.getPath(), null);
+        Node config = vm.createConfiguration(versionableNode.getPath());
         vm.checkin(config.getPath());
     }
 
@@ -138,7 +138,7 @@
         // create configuration
         String path = versionableNode.getPath();
         Version baseVersion = vm.checkin(path);
-        Node config = vm.createConfiguration(path, null);
+        Node config = vm.createConfiguration(path);
         // record baseline
         Version baseline = vm.checkin(config.getPath());
 
@@ -167,7 +167,7 @@
         // create configuration
         String path = versionableNode.getPath();
         vm.checkin(path);
-        Node config = vm.createConfiguration(path, null);
+        Node config = vm.createConfiguration(path);
         // record baseline
         Version baseline = vm.checkin(config.getPath());
 
@@ -189,7 +189,7 @@
         // create configuration
         String path = versionableNode.getPath();
         vm.checkin(path);
-        Node config = vm.createConfiguration(path, null);
+        Node config = vm.createConfiguration(path);
         // record baseline
         Version baseline = vm.checkin(config.getPath());
 
@@ -205,7 +205,7 @@
         // create configuration
         String path = versionableNode.getPath();
         Version bv1 = vm.checkpoint(path);
-        Node config = vm.createConfiguration(path, null);
+        Node config = vm.createConfiguration(path);
         // record baseline 1 (should contain bv1)
         Version bl1 = vm.checkpoint(config.getPath());
         // create bv2
@@ -228,7 +228,7 @@
         // create configuration
         String path = versionableNode.getPath();
         Version bv1 = vm.checkpoint(path);
-        Node config = vm.createConfiguration(path, null);
+        Node config = vm.createConfiguration(path);
         String configPath = config.getPath();
 
         // record baseline 1 (should contain bv1)

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/JcrVersionManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/JcrVersionManager.java?rev=801459&r1=801458&r2=801459&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/JcrVersionManager.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/JcrVersionManager.java
Wed Aug  5 23:17:11 2009
@@ -201,12 +201,12 @@
     }
 
     /**
-     * @see javax.jcr.version.VersionManager#createConfiguration(String, Version)
+     * @see javax.jcr.version.VersionManager#createConfiguration(String)
      */
-    public Node createConfiguration(String absPath, Version baseline) throws UnsupportedRepositoryOperationException,
RepositoryException {
+    public Node createConfiguration(String absPath) throws UnsupportedRepositoryOperationException,
RepositoryException {
         // TODO: add validation
         NodeImpl n = (NodeImpl) itemManager.getNode(resolver.getQPath(absPath));
-        NodeEntry entry = vMgr.createConfiguration((NodeState) n.getItemState(), (NodeState)
((NodeImpl) baseline).getItemState());
+        NodeEntry entry = vMgr.createConfiguration((NodeState) n.getItemState());
         return (Node) itemManager.getItem(entry);
     }
 

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java?rev=801459&r1=801458&r2=801459&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java
Wed Aug  5 23:17:11 2009
@@ -537,7 +537,7 @@
     /**
      * @see Session#hasCapability(String, Object, Map)
      */
-    public boolean hasCapability(String methodName, Object target, Map arguments)
+    public boolean hasCapability(String methodName, Object target, Object[] arguments)
             throws RepositoryException {
         // most trivial implementation allowed by the specification.
         return true;

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java?rev=801459&r1=801458&r2=801459&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java
Wed Aug  5 23:17:11 2009
@@ -1106,7 +1106,7 @@
          * @see OperationVisitor#visit(CreateConfiguration)
          */
         public void visit(CreateConfiguration operation) throws RepositoryException {
-            NodeId configId = service.createConfiguration(sessionInfo, operation.getNodeId(),
operation.getBaselineId());
+            NodeId configId = service.createConfiguration(sessionInfo, operation.getNodeId());
             operation.setNewConfigurationId(configId);
         }
     }

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateConfiguration.java?rev=801459&r1=801458&r2=801459&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateConfiguration.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateConfiguration.java
Wed Aug  5 23:17:11 2009
@@ -31,21 +31,20 @@
 import javax.jcr.version.VersionException;
 
 /**
- * <code>Checkout</code>...
+ * <code>CreateConfiguration</code>...
  */
 public class CreateConfiguration extends AbstractOperation {
 
     private static Logger log = LoggerFactory.getLogger(CreateConfiguration.class);
 
     private final NodeState nodeState;
-    private final NodeState baselineState;
+
     private final VersionManager mgr;
 
     private NodeId newConfigurationId;
 
-    private CreateConfiguration(NodeState nodeState, NodeState baselineState, VersionManager
mgr) {
+    private CreateConfiguration(NodeState nodeState, VersionManager mgr) {
         this.nodeState = nodeState;
-        this.baselineState = baselineState;
         this.mgr = mgr;
         // NOTE: affected-states only needed for transient modifications
     }
@@ -80,10 +79,6 @@
         return nodeState.getNodeEntry().getWorkspaceId();
     }
 
-    public NodeId getBaselineId() throws RepositoryException {
-        return baselineState.getNodeEntry().getWorkspaceId();
-    }
-
     public void setNewConfigurationId(NodeId newConfigurationId) {
         this.newConfigurationId = newConfigurationId;
     }
@@ -93,7 +88,7 @@
     }
 
     //------------------------------------------------------------< Factory >---
-    public static CreateConfiguration create(NodeState nodeState, NodeState baselineState,
VersionManager mgr) {
-        return new CreateConfiguration(nodeState, baselineState, mgr);
+    public static CreateConfiguration create(NodeState nodeState, VersionManager mgr) {
+        return new CreateConfiguration(nodeState, mgr);
     }
 }
\ No newline at end of file

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionManager.java?rev=801459&r1=801458&r2=801459&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionManager.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionManager.java
Wed Aug  5 23:17:11 2009
@@ -200,12 +200,11 @@
     /**
      *
      * @param nodeState
-     * @param baselineState
      * @return
      * @throws UnsupportedRepositoryOperationException
      * @throws RepositoryException
      */
-    public NodeEntry createConfiguration(NodeState nodeState, NodeState baselineState) throws
UnsupportedRepositoryOperationException, RepositoryException;
+    public NodeEntry createConfiguration(NodeState nodeState) throws UnsupportedRepositoryOperationException,
RepositoryException;
 
     /**
      *

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionManagerImpl.java?rev=801459&r1=801458&r2=801459&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionManagerImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionManagerImpl.java
Wed Aug  5 23:17:11 2009
@@ -201,8 +201,8 @@
         workspaceManager.execute(op);
     }
 
-    public NodeEntry createConfiguration(NodeState nodeState, NodeState baselineState) throws
UnsupportedRepositoryOperationException, RepositoryException {
-        CreateConfiguration op = CreateConfiguration.create(nodeState, baselineState, this);
+    public NodeEntry createConfiguration(NodeState nodeState) throws UnsupportedRepositoryOperationException,
RepositoryException {
+        CreateConfiguration op = CreateConfiguration.create(nodeState, this);
         workspaceManager.execute(op);
         return workspaceManager.getHierarchyManager().getNodeEntry(op.getNewConfigurationId());
     }

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractJCR2SPITest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractJCR2SPITest.java?rev=801459&r1=801458&r2=801459&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractJCR2SPITest.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractJCR2SPITest.java
Wed Aug  5 23:17:11 2009
@@ -434,10 +434,10 @@
         return repositoryService.mergeActivity(sessionInfo, activityId);
     }
 
-    public NodeId createConfiguration(SessionInfo sessionInfo, NodeId nodeId, NodeId baselineId)
+    public NodeId createConfiguration(SessionInfo sessionInfo, NodeId nodeId)
             throws RepositoryException {
 
-        return repositoryService.createConfiguration(sessionInfo, nodeId, baselineId);
+        return repositoryService.createConfiguration(sessionInfo, nodeId);
     }
 
     //----------------------------------------------------------< Searching >---

Modified: jackrabbit/trunk/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-parent/pom.xml?rev=801459&r1=801458&r2=801459&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-parent/pom.xml Wed Aug  5 23:17:11 2009
@@ -147,7 +147,7 @@
       <dependency>
         <groupId>javax.jcr</groupId>
         <artifactId>jcr</artifactId>
-        <version>2.0-b112</version>
+        <version>2.0-b113</version>
         <scope>provided</scope>
       </dependency>
       <dependency>

Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AbstractReadableRepositoryService.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AbstractReadableRepositoryService.java?rev=801459&r1=801458&r2=801459&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AbstractReadableRepositoryService.java
(original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AbstractReadableRepositoryService.java
Wed Aug  5 23:17:11 2009
@@ -677,7 +677,7 @@
     /**
      * @throws UnsupportedRepositoryOperationException always.
      */
-    public NodeId createConfiguration(SessionInfo sessionInfo, NodeId nodeId, NodeId baselineId)
throws UnsupportedRepositoryOperationException, RepositoryException {
+    public NodeId createConfiguration(SessionInfo sessionInfo, NodeId nodeId) throws UnsupportedRepositoryOperationException,
RepositoryException {
         throw new UnsupportedRepositoryOperationException();
     }
 

Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/logging/RepositoryServiceLogger.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/logging/RepositoryServiceLogger.java?rev=801459&r1=801458&r2=801459&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/logging/RepositoryServiceLogger.java
(original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/logging/RepositoryServiceLogger.java
Wed Aug  5 23:17:11 2009
@@ -526,12 +526,12 @@
         }, "mergeActivity(SessionInfo, NodeId)", new Object[]{unwrap(sessionInfo), activityId});
     }
 
-    public NodeId createConfiguration(final SessionInfo sessionInfo, final NodeId nodeId,
final NodeId baselineId) throws UnsupportedRepositoryOperationException, RepositoryException
{
+    public NodeId createConfiguration(final SessionInfo sessionInfo, final NodeId nodeId)
throws UnsupportedRepositoryOperationException, RepositoryException {
         return (NodeId) execute(new Callable() {
             public Object call() throws RepositoryException {
-                return service.createConfiguration(unwrap(sessionInfo), nodeId, baselineId);
+                return service.createConfiguration(unwrap(sessionInfo), nodeId);
             }
-        }, "createConfiguration(SessionInfo, NodeId, NodeId)", new Object[]{unwrap(sessionInfo),
nodeId, baselineId});
+        }, "createConfiguration(SessionInfo, NodeId, NodeId)", new Object[]{unwrap(sessionInfo),
nodeId});
     }
 
     public String[] getSupportedQueryLanguages(final SessionInfo sessionInfo) throws RepositoryException
{

Modified: jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java?rev=801459&r1=801458&r2=801459&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java
(original)
+++ jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java
Wed Aug  5 23:17:11 2009
@@ -845,11 +845,12 @@
      *
      * @param sessionInfo
      * @param nodeId
-     * @param baselineId   @return  @throws UnsupportedRepositoryOperationException
+     * @return
+     * @throws UnsupportedRepositoryOperationException
      * @throws RepositoryException
-     * @see javax.jcr.version.VersionManager#createConfiguration(String, Version)
+     * @see javax.jcr.version.VersionManager#createConfiguration(String)
      */
-    public NodeId createConfiguration(SessionInfo sessionInfo, NodeId nodeId, NodeId baselineId)
throws UnsupportedRepositoryOperationException, RepositoryException;
+    public NodeId createConfiguration(SessionInfo sessionInfo, NodeId nodeId) throws UnsupportedRepositoryOperationException,
RepositoryException;
 
     //----------------------------------------------------------< Searching >---
     /**

Modified: jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java?rev=801459&r1=801458&r2=801459&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
Wed Aug  5 23:17:11 2009
@@ -1639,9 +1639,9 @@
     }
 
     /**
-     * @see RepositoryService#createConfiguration(SessionInfo, NodeId, NodeId)
+     * @see RepositoryService#createConfiguration(SessionInfo, NodeId)
      */
-    public NodeId createConfiguration(SessionInfo sessionInfo, NodeId nodeId, NodeId baselineId)
throws UnsupportedRepositoryOperationException, RepositoryException {
+    public NodeId createConfiguration(SessionInfo sessionInfo, NodeId nodeId) throws UnsupportedRepositoryOperationException,
RepositoryException {
         // TODO
         throw new UnsupportedOperationException("JCR-2104: JSR 283 Versioning. Implementation
missing");
     }

Modified: jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/RepositoryServiceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/RepositoryServiceImpl.java?rev=801459&r1=801458&r2=801459&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/RepositoryServiceImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/RepositoryServiceImpl.java
Wed Aug  5 23:17:11 2009
@@ -997,12 +997,13 @@
     /**
      * {@inheritDoc}
      */
-    public NodeId createConfiguration(SessionInfo sessionInfo, final NodeId nodeId, final
NodeId baselineId) throws UnsupportedRepositoryOperationException, RepositoryException {
+    public NodeId createConfiguration(SessionInfo sessionInfo, final NodeId nodeId)
+            throws UnsupportedRepositoryOperationException, RepositoryException {
         final SessionInfoImpl sInfo = getSessionInfoImpl(sessionInfo);
         final VersionManager vMgr = getVersionManager(sInfo);
         Node configuration = (Node) executeWithLocalEvents(new Callable() {
             public Object run() throws RepositoryException {
-                return vMgr.createConfiguration(getNodePath(nodeId, sInfo), (Version) getNode(baselineId,
sInfo));
+                return vMgr.createConfiguration(getNodePath(nodeId, sInfo));
             }
         }, getSessionInfoImpl(sessionInfo));
         return idFactory.createNodeId(configuration, sInfo.getNamePathResolver());



Mime
View raw message