You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2006/10/17 08:48:28 UTC

svn commit: r464830 - in /jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi: WorkspaceImpl.java operation/Copy.java

Author: angela
Date: Mon Oct 16 23:48:27 2006
New Revision: 464830

URL: http://svn.apache.org/viewvc?view=rev&rev=464830
Log:
work in progress

- simplify copy and make sure, src-workspace name is always present

Modified:
    jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java
    jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Copy.java

Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java?view=diff&rev=464830&r1=464829&r2=464830
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java (original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java Mon Oct 16 23:48:27 2006
@@ -136,7 +136,7 @@
         Path srcPath = session.getQPath(srcAbsPath);
         Path destPath = session.getQPath(destAbsPath);
 
-        Operation op = Copy.create(srcPath, destPath, this, this);
+        Operation op = Copy.create(srcPath, destPath, getName(), this, this);
         getUpdatableItemStateManager().execute(op);
     }
 

Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Copy.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Copy.java?view=diff&rev=464830&r1=464829&r2=464830
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Copy.java (original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Copy.java Mon Oct 16 23:48:27 2006
@@ -49,14 +49,6 @@
 
     //------------------------------------------------------------< Factory >---
     public static Operation create(Path srcPath, Path destPath,
-                                   ManagerProvider mgrProvider,
-                                   ManagerProvider destMgrProvider)
-        throws RepositoryException, ConstraintViolationException, AccessDeniedException,
-        ItemExistsException, VersionException {
-        return create(srcPath, destPath, null, mgrProvider, destMgrProvider);
-    }
-
-    public static Operation create(Path srcPath, Path destPath,
                                    String srcWorkspaceName,
                                    ManagerProvider srcMgrProvider,
                                    ManagerProvider destMgrProvider)