You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by tr...@apache.org on 2017/09/27 05:36:22 UTC
svn commit: r1809805 - in
/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test:
java/org/apache/jackrabbit/filevault/maven/packaging/
resources/test-projects/manifest-generation-with-bundles/
resources/test-projects/manifest-generation-...
Author: tripod
Date: Wed Sep 27 05:36:21 2017
New Revision: 1809805
URL: http://svn.apache.org/viewvc?rev=1809805&view=rev
Log:
trivial: moving test resources in place
Added:
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/simple/
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/simple/expected-manifest.txt
- copied, changed from r1809591, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/expected-manifest.txt
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/simple/pom.xml
- copied, changed from r1809591, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/pom.xml
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/with-bundles/
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/with-bundles/expected-manifest.txt
- copied, changed from r1809591, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation-with-bundles/expected-manifest.txt
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/with-bundles/pom.xml
- copied, changed from r1809591, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation-with-bundles/pom.xml
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/with-code/
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/with-code/expected-manifest.txt
- copied, changed from r1809591, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation-with-code/expected-manifest.txt
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/with-code/jcr_root/
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/with-code/jcr_root/libs/
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/with-code/jcr_root/libs/apache/
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/with-code/jcr_root/libs/apache/IncludeUseObject.java
- copied, changed from r1809591, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation-with-code/jcr_root/libs/apache/IncludeUseObject.java
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/with-code/pom.xml
- copied, changed from r1809591, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation-with-code/pom.xml
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/application/
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/application-cleanup/
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/application-cleanup/pom.xml
- copied, changed from r1809591, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto-application-cleanup/pom.xml
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/application-sourced/
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml
- copied, changed from r1809591, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto-application-sourced/filter.xml
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/application-sourced/pom.xml
- copied, changed from r1809591, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto-application-sourced/pom.xml
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/application/pom.xml
- copied, changed from r1809591, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto-application/pom.xml
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/container/
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/container/pom.xml
- copied, changed from r1809591, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto-container/pom.xml
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/content/
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/content/pom.xml
- copied, changed from r1809591, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto-content/pom.xml
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/mixed/
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/mixed/pom.xml
- copied, changed from r1809591, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto-mixed/pom.xml
Removed:
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation-with-bundles/expected-manifest.txt
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation-with-bundles/pom.xml
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation-with-code/expected-manifest.txt
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation-with-code/jcr_root/libs/apache/IncludeUseObject.java
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation-with-code/pom.xml
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/expected-manifest.txt
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/pom.xml
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto-application-cleanup/pom.xml
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto-application-sourced/filter.xml
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto-application-sourced/pom.xml
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto-application/pom.xml
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto-container/pom.xml
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto-content/pom.xml
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto-mixed/pom.xml
Modified:
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/ManifestGenerationTest.java
jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/PackageTypesTest.java
Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/ManifestGenerationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/ManifestGenerationTest.java?rev=1809805&r1=1809804&r2=1809805&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/ManifestGenerationTest.java (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/ManifestGenerationTest.java Wed Sep 27 05:36:21 2017
@@ -35,9 +35,9 @@ public class ManifestGenerationTest exte
@Parameterized.Parameters
public static Collection<Object[]> data() {
return Arrays.asList(new Object[][]{
- {"/manifest-generation", true},
- {"/manifest-generation-with-bundles", true},
- {"/manifest-generation-with-code", true}
+ {"/manifest-generation/simple", true},
+ {"/manifest-generation/with-bundles", true},
+ {"/manifest-generation/with-code", true}
});
}
Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/PackageTypesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/PackageTypesTest.java?rev=1809805&r1=1809804&r2=1809805&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/PackageTypesTest.java (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/PackageTypesTest.java Wed Sep 27 05:36:21 2017
@@ -107,7 +107,7 @@ public class PackageTypesTest {
// ignore invalid test
Assume.assumeTrue(!expectToFail);
- final File projectDir = new File("target/test-classes/test-projects/package-type-auto-" + projectName);
+ final File projectDir = new File("target/test-classes/test-projects/package-type-auto/" + projectName);
verify(projectDir);
}
}
Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/simple/expected-manifest.txt (from r1809591, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/expected-manifest.txt)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/simple/expected-manifest.txt?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/simple/expected-manifest.txt&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/expected-manifest.txt&r1=1809591&r2=1809805&rev=1809805&view=diff
==============================================================================
(empty)
Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/simple/pom.xml (from r1809591, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/pom.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/simple/pom.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/simple/pom.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/pom.xml&r1=1809591&r2=1809805&rev=1809805&view=diff
==============================================================================
(empty)
Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/with-bundles/expected-manifest.txt (from r1809591, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation-with-bundles/expected-manifest.txt)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/with-bundles/expected-manifest.txt?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/with-bundles/expected-manifest.txt&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation-with-bundles/expected-manifest.txt&r1=1809591&r2=1809805&rev=1809805&view=diff
==============================================================================
(empty)
Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/with-bundles/pom.xml (from r1809591, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation-with-bundles/pom.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/with-bundles/pom.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/with-bundles/pom.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation-with-bundles/pom.xml&r1=1809591&r2=1809805&rev=1809805&view=diff
==============================================================================
(empty)
Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/with-code/expected-manifest.txt (from r1809591, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation-with-code/expected-manifest.txt)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/with-code/expected-manifest.txt?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/with-code/expected-manifest.txt&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation-with-code/expected-manifest.txt&r1=1809591&r2=1809805&rev=1809805&view=diff
==============================================================================
(empty)
Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/with-code/jcr_root/libs/apache/IncludeUseObject.java (from r1809591, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation-with-code/jcr_root/libs/apache/IncludeUseObject.java)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/with-code/jcr_root/libs/apache/IncludeUseObject.java?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/with-code/jcr_root/libs/apache/IncludeUseObject.java&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation-with-code/jcr_root/libs/apache/IncludeUseObject.java&r1=1809591&r2=1809805&rev=1809805&view=diff
==============================================================================
(empty)
Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/with-code/pom.xml (from r1809591, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation-with-code/pom.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/with-code/pom.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation/with-code/pom.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/manifest-generation-with-code/pom.xml&r1=1809591&r2=1809805&rev=1809805&view=diff
==============================================================================
(empty)
Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/application-cleanup/pom.xml (from r1809591, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto-application-cleanup/pom.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/application-cleanup/pom.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/application-cleanup/pom.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto-application-cleanup/pom.xml&r1=1809591&r2=1809805&rev=1809805&view=diff
==============================================================================
(empty)
Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml (from r1809591, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto-application-sourced/filter.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto-application-sourced/filter.xml&r1=1809591&r2=1809805&rev=1809805&view=diff
==============================================================================
(empty)
Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/application-sourced/pom.xml (from r1809591, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto-application-sourced/pom.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/application-sourced/pom.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/application-sourced/pom.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto-application-sourced/pom.xml&r1=1809591&r2=1809805&rev=1809805&view=diff
==============================================================================
(empty)
Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/application/pom.xml (from r1809591, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto-application/pom.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/application/pom.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/application/pom.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto-application/pom.xml&r1=1809591&r2=1809805&rev=1809805&view=diff
==============================================================================
(empty)
Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/container/pom.xml (from r1809591, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto-container/pom.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/container/pom.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/container/pom.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto-container/pom.xml&r1=1809591&r2=1809805&rev=1809805&view=diff
==============================================================================
(empty)
Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/content/pom.xml (from r1809591, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto-content/pom.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/content/pom.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/content/pom.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto-content/pom.xml&r1=1809591&r2=1809805&rev=1809805&view=diff
==============================================================================
(empty)
Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/mixed/pom.xml (from r1809591, jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto-mixed/pom.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/mixed/pom.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto/mixed/pom.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/it/src/test/resources/test-projects/package-type-auto-mixed/pom.xml&r1=1809591&r2=1809805&rev=1809805&view=diff
==============================================================================
(empty)