jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tri...@apache.org
Subject svn commit: r1795405 - in /jackrabbit/commons/filevault/trunk/vault-core/src: main/java/org/apache/jackrabbit/vault/fs/io/ test/java/org/apache/jackrabbit/vault/packaging/integration/ test/resources/org/apache/jackrabbit/vault/packaging/integration/tes...
Date Wed, 17 May 2017 06:55:40 GMT
Author: tripod
Date: Wed May 17 06:55:40 2017
New Revision: 1795405

URL: http://svn.apache.org/viewvc?rev=1795405&view=rev
Log:
JRVLT-176 Package with non-deep filter removes node

Modified:
    jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/Importer.java
    jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageInstall.java
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/test-package-with-etc.zip

Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/Importer.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/Importer.java?rev=1795405&r1=1795404&r2=1795405&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/Importer.java
(original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/Importer.java
Wed May 17 06:55:40 2017
@@ -899,16 +899,17 @@ public class Importer {
                 }
             }
         } else if (info.artifacts.getDirectory() != null) {
+            String prefix = info.parent == null ? info.name : info.name + "/";
             for (TxInfo child: info.children().values()) {
                 // add the directory artifacts as hint to this one.
                 if (child.artifacts == null) {
                     // in this case it's some deleted intermediate directory???
-                    String path = info.name + "/" + child.name;
+                    String path = prefix + child.name;
                     info.artifacts.add(new HintArtifact(path));
 
                 } else {
                     for (Artifact a: child.artifacts.values()) {
-                        String path = info.name + "/" + a.getRelativePath();
+                        String path = prefix + a.getRelativePath();
                         info.artifacts.add(new HintArtifact(path));
                     }
                 }

Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageInstall.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageInstall.java?rev=1795405&r1=1795404&r2=1795405&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageInstall.java
(original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageInstall.java
Wed May 17 06:55:40 2017
@@ -281,7 +281,6 @@ public class TestPackageInstall extends
      *  </workspaceFilter>
      */
     @Test
-    @Ignore("JCRVLT-176")
     public void testNoChildFilter() throws RepositoryException, IOException, PackageException
{
         File tmpFile = File.createTempFile("vlttest", "zip");
         IOUtils.copy(getStream("testpackages/test-package-with-etc.zip"), FileUtils.openOutputStream(tmpFile));

Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/test-package-with-etc.zip
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/test-package-with-etc.zip?rev=1795405&r1=1795404&r2=1795405&view=diff
==============================================================================
Binary files jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/test-package-with-etc.zip
(original) and jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/test-package-with-etc.zip
Wed May 17 06:55:40 2017 differ



Mime
View raw message