You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2019/11/19 08:52:33 UTC
svn commit: r1870009 [2/5] - in /jackrabbit/commons/filevault/trunk: ./
parent/ vault-core/
vault-core/src/test/java/org/apache/jackrabbit/vault/fs/api/
vault-core/src/test/java/org/apache/jackrabbit/vault/fs/filter/
vault-core/src/test/java/org/apache...
Added: jackrabbit/commons/filevault/trunk/.gitattributes
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/.gitattributes?rev=1870009&view=auto
==============================================================================
--- jackrabbit/commons/filevault/trunk/.gitattributes (added)
+++ jackrabbit/commons/filevault/trunk/.gitattributes Tue Nov 19 08:52:27 2019
@@ -0,0 +1,5 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# all XML files should keep lf newlines, even on Windows
+*.xml text eol=lf
\ No newline at end of file
Added: jackrabbit/commons/filevault/trunk/.travis.yml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/.travis.yml?rev=1870009&view=auto
==============================================================================
--- jackrabbit/commons/filevault/trunk/.travis.yml (added)
+++ jackrabbit/commons/filevault/trunk/.travis.yml Tue Nov 19 08:52:27 2019
@@ -0,0 +1,67 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# use https://github.com/DanySK/Gravis-CI for Maven Builds on Windows
+
+# Java is not yet supported on Windows, so the build would block.
+# You do not need any setup from Travis, use a plain bash build
+language: bash
+# Enable them all, if you need them.
+os:
+ - linux
+# - osx
+ - windows
+env:
+ global:
+ # This is a convenience variable for shortening download commands
+ - GRAVIS="https://raw.githubusercontent.com/DanySK/Gravis-CI/master/"
+ # If you use Windows, you may want to disable Windows Defender. It slows down the builds
+ # dramatically, also during cache setup. From a Tanzinul Islam's idea: http://bit.ly/348VPYS,
+ # This work around disables it before caching
+ - NO_WIN_DEFENDER=$(curl "${GRAVIS}.disable-windows-defender.sh" --output .no-defender.sh && source .no-defender.sh)
+ matrix:
+ # List any JDK you want to build your software with.
+ # You can see the list of supported environments by installing Jabba and using ls-remote:
+ # https://github.com/shyiko/jabba#usage
+ # Partial versions are allowed. They are dynamically resoved by launching jabba ls-remote,
+ # filtering for the provided JDK string, then picking the *first* match. This is useful if
+ # the intent is to target the latest release of some Java major release, or if the latest
+ # available build differs among platforms.
+ - JDK="adopt@1.8"
+ - JDK="adopt@1.11"
+ # Java13 not yet supported due to non-compliant javadooc
+ #- JDK="adopt@1.13"
+before_install:
+ # Download the script
+ - curl "${GRAVIS}.install-jdk-travis.sh" --output ~/.install-jdk-travis.sh
+ # Download, install, configue the JDK, and export the configuration to the current shell
+ - source ~/.install-jdk-travis.sh
+ - curl "${GRAVIS}.install-maven.sh" --output ~/.install-maven.sh
+ # Download, install, configue the JDK, and export the configuration to the current shell
+ - source ~/.install-maven.sh
+# This is your main script
+script:
+ # Just an example. Do what you deem useful
+ - mvn verify -B
+# If you use Gradle, cleanup the build cache from lock/temporary files
+before_cache:
+ #- curl "${GRAVIS}.clean_gradle_cache.sh" --output ~/.clean_gradle_cache.sh
+ #- bash ~/.clean_gradle_cache.sh
+cache:
+ directories:
+ # This avoids re-downloading the JDK every time, but Travis recommends not to do it
+ # - $HOME/.jabba/
+ # Cache Maven repo
+ - $HOME/.m2
\ No newline at end of file
Copied: jackrabbit/commons/filevault/trunk/README.md (from r1869339, jackrabbit/commons/filevault/trunk/README.txt)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/README.md?p2=jackrabbit/commons/filevault/trunk/README.md&p1=jackrabbit/commons/filevault/trunk/README.txt&r1=1869339&r2=1870009&rev=1870009&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/README.txt (original)
+++ jackrabbit/commons/filevault/trunk/README.md Tue Nov 19 08:52:27 2019
@@ -1,28 +1,39 @@
-=======================================================================
-Welcome to Apache Jackrabbit FileVault <http://jackrabbit.apache.org/>
-=======================================================================
-
-The FileVault introduces a JCR repository to filesystem mapping. The mapping is exposed by and API and used by the
-_CRX Content Packaging_ that allows to create portable packages of repository content.
-The Vault Command Line Interface aka _vlt_ that provides a subversion like utility to work and develop with repository content.
+[](https://travis-ci.org/apache/jackrabbit-filevault)
+
+Welcome to Apache Jackrabbit FileVault
+===========================================================
+
+The FileVault introduces a JCR repository to filesystem mapping. The mapping
+is exposed by an API and used by the "FileVault Content Packages" which allow to
+create portable packages of repository content.
+
+The Vault Command Line Interface aka "vlt" provides a subversion like
+utility to work and develop with repository content.
Apache Jackrabbit FileVault is a project of the Apache Software Foundation.
+Documentation
+=============
+Please refer to the documentation at
+<https://jackrabbit.apache.org/filevault/>
+
+
Building FileVault
-===================
+===========================================
You can build FileVault like this:
mvn clean install
-You need Maven 2.0.9 (or higher) with Java 5 (or higher) for the build.
+You need Maven 3.3.9 (or higher) with Java 8 (or higher) for the build.
For more instructions, please see the documentation at:
http://jackrabbit.apache.org/building-jackrabbit.html
-License (see also LICENSE.txt)
+License (see also LICENSE)
==============================
+```
Collective work: Copyright 2013 The Apache Software Foundation.
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -39,6 +50,7 @@ distributed under the License is distrib
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+```
Mailing Lists
=============
@@ -54,18 +66,18 @@ Latest development
The latest FileVault source code is available via Subversion at
- https://svn.apache.org/repos/asf/commons/filevault/trunk
+ <https://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/>
or with ViewVC at
- https://svn.apache.org/viewvc/commons/filevault/trunk
+ <https://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/>
-To checkout the main Jackrabbit source tree, run
+To checkout the main source tree, run
svn checkout https://svn.apache.org/repos/asf/commons/filevault/trunk filevault
Credits
=======
-See http://jackrabbit.apache.org/jackrabbit-team.html for the list of
+See <http://jackrabbit.apache.org/jackrabbit-team.html> for the list of
Jackrabbit committers and main contributors.
Modified: jackrabbit/commons/filevault/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/parent/pom.xml?rev=1870009&r1=1870008&r2=1870009&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/parent/pom.xml (original)
+++ jackrabbit/commons/filevault/trunk/parent/pom.xml Tue Nov 19 08:52:27 2019
@@ -80,9 +80,14 @@
</mailingLists>
<issueManagement>
- <url>https://issues.apache.org/jira/browse/JCR</url>
+ <url>https://issues.apache.org/jira/browse/JCRVLT</url>
</issueManagement>
+ <ciManagement>
+ <system>Travis</system>
+ <url>https://travis-ci.org/apache/jackrabbit-filevault</url>
+ </ciManagement>
+
<!-- ====================================================================== -->
<!-- B U I L D D E F I N I T I O N -->
<!-- ====================================================================== -->
@@ -199,7 +204,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.20.1</version>
+ <version>3.0.0-M4</version>
<configuration>
<systemProperties>
<property>
@@ -235,7 +240,9 @@
<exclude>derby.log</exclude>
<exclude>**/*.zip/**</exclude>
<exclude>.mvn/**</exclude>
+ <exclude>.no-defender.sh</exclude>
</excludes>
+ <consoleOutput>true</consoleOutput>
</configuration>
</plugin>
<!-- ====================================================================== -->
@@ -483,13 +490,27 @@
</build>
</profile>
<profile>
- <id>java9</id>
+ <id>java9-or-above</id>
<activation>
- <jdk>9</jdk>
+ <jdk>[9,)</jdk>
</activation>
- <properties>
- <test.vm.options>--add-modules=java.se.ee -Doak=${test.oak}</test.vm.options>
- </properties>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <!-- only html4 output is working due to non HTML5 compliant javadoc
+ This is no longer supported with Java13 as it will always emit HTML5
+ -->
+ <additionalOptions>-html4</additionalOptions>
+ <!-- workaround for https://bugs.openjdk.java.net/browse/JDK-8212233 -->
+ <source>8</source>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</profile>
</profiles>
Modified: jackrabbit/commons/filevault/trunk/vault-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/pom.xml?rev=1870009&r1=1870008&r2=1870009&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/pom.xml (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/pom.xml Tue Nov 19 08:52:27 2019
@@ -83,6 +83,7 @@
</Import-Package>
<!-- to load hook classes through this bundle's classloader -->
<DynamicImport-Package>*</DynamicImport-Package>
+
</instructions>
</configuration>
</plugin>
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/fs/api/SubPackageFilterArchiveTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/fs/api/SubPackageFilterArchiveTest.java?rev=1870009&r1=1870008&r2=1870009&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/fs/api/SubPackageFilterArchiveTest.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/fs/api/SubPackageFilterArchiveTest.java Tue Nov 19 08:52:27 2019
@@ -43,7 +43,7 @@ public class SubPackageFilterArchiveTest
@Before
public void setup() throws Exception {
memoryArchive = new MemoryArchive(false);
- InputStream in = IntegrationTestBase.class.getResourceAsStream("testpackages/subtest.zip");
+ InputStream in = IntegrationTestBase.class.getResourceAsStream("/test-packages/subtest.zip");
memoryArchive.run(in);
in.close();
archive = new SubPackageFilterArchive(memoryArchive);
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/fs/filter/WorkspaceFilterTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/fs/filter/WorkspaceFilterTest.java?rev=1870009&r1=1870008&r2=1870009&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/fs/filter/WorkspaceFilterTest.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/fs/filter/WorkspaceFilterTest.java Tue Nov 19 08:52:27 2019
@@ -24,8 +24,10 @@ import static org.junit.Assert.assertTru
import java.io.IOException;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import java.util.List;
+import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.vault.fs.api.FilterSet;
import org.apache.jackrabbit.vault.fs.api.PathFilter;
import org.apache.jackrabbit.vault.fs.api.PathFilterSet;
@@ -34,7 +36,6 @@ import org.apache.jackrabbit.vault.fs.ap
import org.apache.jackrabbit.vault.fs.api.WorkspaceFilter;
import org.apache.jackrabbit.vault.fs.config.ConfigurationException;
import org.apache.jackrabbit.vault.fs.config.DefaultWorkspaceFilter;
-import org.apache.tika.io.IOUtils;
import org.junit.Test;
/**
@@ -143,20 +144,22 @@ public class WorkspaceFilterTest {
// make sure serialization format is kept (including comments)
try (InputStream input = getClass().getResourceAsStream("workspacefilters/items.xml");
InputStream actualInput = filter.getSource()) {
- assertEquals(IOUtils.toString(input), IOUtils.toString(actualInput));
+ assertEquals(IOUtils.toString(input, StandardCharsets.UTF_8), IOUtils.toString(actualInput, StandardCharsets.UTF_8));
}
}
@Test
public void testToSource() throws IOException, ConfigurationException {
-
DefaultWorkspaceFilter filter = new DefaultWorkspaceFilter();
- filter.load(getClass().getResourceAsStream("workspacefilters/complex.xml"));
+ try (InputStream input = getClass().getResourceAsStream("workspacefilters/complex.xml")) {
+ filter.load(input);
+ }
filter.resetSource();
-
- String expected = IOUtils.toString(getClass().getResourceAsStream("workspacefilters/complex-expected.xml"));
-
- assertEquals("Filter source", expected, filter.getSourceAsString());
+
+ try (InputStream input = getClass().getResourceAsStream("workspacefilters/complex-expected.xml")) {
+ String expected = IOUtils.toString(input, StandardCharsets.UTF_8);
+ assertEquals("Filter source", expected, filter.getSourceAsString());
+ }
}
@Test
@@ -232,18 +235,18 @@ public class WorkspaceFilterTest {
filter.add(new PathFilterSet("/newroot"));
String previousSerialization;
try (InputStream input = getClass().getResourceAsStream("workspacefilters/items.xml")) {
- previousSerialization = IOUtils.toString(input);
+ previousSerialization = IOUtils.toString(input, StandardCharsets.UTF_8);
}
// and check the serialization again
try (InputStream actualInput = filter.getSource()) {
- String actual = IOUtils.toString(actualInput);
+ String actual = IOUtils.toString(actualInput, StandardCharsets.UTF_8);
assertNotEquals(previousSerialization, actual);
previousSerialization = actual;
}
filter.add(new PathFilterSet("/someotherroot"), new PathFilterSet("/someotherroot"));
// and check the serialization again
try (InputStream actualInput = filter.getSource()) {
- String actual = IOUtils.toString(actualInput);
+ String actual = IOUtils.toString(actualInput, StandardCharsets.UTF_8);
assertNotEquals(previousSerialization, actual);
previousSerialization = actual;
}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/fs/io/DocViewFormatTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/fs/io/DocViewFormatTest.java?rev=1870009&r1=1870008&r2=1870009&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/fs/io/DocViewFormatTest.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/fs/io/DocViewFormatTest.java Tue Nov 19 08:52:27 2019
@@ -26,6 +26,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
import java.util.Calendar;
import java.util.Collections;
import java.util.List;
@@ -52,8 +53,7 @@ public class DocViewFormatTest {
docViewFile = new File(dir.getPath() + File.separator + "malformed.xml");
assert docViewFile.createNewFile();
- try (InputStream in = this.getClass().getClassLoader()
- .getResourceAsStream("org/apache/jackrabbit/vault/fs/io/DocViewFormat/malformed.xml")) {
+ try (InputStream in = this.getClass().getResourceAsStream("DocViewFormat/malformed.xml")) {
try (OutputStream out = new FileOutputStream(docViewFile)) {
IOUtils.copy(in, out);
}
@@ -82,9 +82,10 @@ public class DocViewFormatTest {
format.format(dir, patterns, false);
assertTrue("malformed.xml is expected to be formatted", format.format(dir, patterns, true).isEmpty());
- final String expected = IOUtils.toString(this.getClass().getClassLoader()
- .getResourceAsStream("org/apache/jackrabbit/vault/fs/io/DocViewFormat/formatted.xml"), "utf-8");
- final String result = FileUtils.readFileToString(docViewFile, "utf-8");
- assertEquals(expected, result);
+ try (InputStream input = this.getClass().getResourceAsStream("DocViewFormat/formatted.xml")) {
+ final String expected = IOUtils.toString(input, StandardCharsets.UTF_8);
+ final String result = FileUtils.readFileToString(docViewFile, StandardCharsets.UTF_8);
+ assertEquals(expected, result);
+ }
}
}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/fs/io/ZipArchiveTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/fs/io/ZipArchiveTest.java?rev=1870009&r1=1870008&r2=1870009&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/fs/io/ZipArchiveTest.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/fs/io/ZipArchiveTest.java Tue Nov 19 08:52:27 2019
@@ -33,7 +33,7 @@ public class ZipArchiveTest {
@Test
public void testSmallArchiveViaStream() throws IOException {
- try (InputStream in = getClass().getResourceAsStream("/org/apache/jackrabbit/vault/packaging/integration/testpackages/atomic-counter-test.zip");
+ try (InputStream in = getClass().getResourceAsStream("/test-packages/atomic-counter-test.zip");
ZipStreamArchive a = new ZipStreamArchive(in)) {
a.open(true);
Properties props = a.getMetaInf().getProperties();
@@ -49,7 +49,7 @@ public class ZipArchiveTest {
@Test
public void testSmallArchiveViaFile() throws IOException {
- File file = new File(getClass().getResource("/org/apache/jackrabbit/vault/packaging/integration/testpackages/atomic-counter-test.zip").getFile());
+ File file = new File(getClass().getResource("/test-packages/atomic-counter-test.zip").getFile());
try (ZipArchive a = new ZipArchive(file, false)) {
a.open(true);
Properties props = a.getMetaInf().getProperties();
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageManagerImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageManagerImplTest.java?rev=1870009&r1=1870008&r2=1870009&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageManagerImplTest.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageManagerImplTest.java Tue Nov 19 08:52:27 2019
@@ -204,7 +204,7 @@ public class JcrPackageManagerImplTest e
@Test
public void testListPackages() throws IOException, PackageException, RepositoryException {
assertTrue("initially the packages set is empty", packMgr.listPackages().isEmpty());
- packMgr.upload(getStream("../integration/testpackages/tmp.zip"), false);
+ packMgr.upload(getStream("/test-packages/tmp.zip"), false);
assertEquals("package list contains 1 element", 1, packMgr.listPackages().size());
JcrPackage pkg = packMgr.listPackages().get(0);
assertEquals("contains new package", TMP_PACKAGE_ID, pkg.getDefinition().getId());
@@ -215,7 +215,7 @@ public class JcrPackageManagerImplTest e
*/
@Test
public void testListPackagesWithGroup() throws IOException, PackageException, RepositoryException {
- packMgr.upload(getStream("../integration/testpackages/tmp.zip"), false);
+ packMgr.upload(getStream("/test-packages/tmp.zip"), false);
packMgr.create("foo", "test-package");
assertEquals("package list contains 2 elements", 2, packMgr.listPackages().size());
@@ -235,15 +235,15 @@ public class JcrPackageManagerImplTest e
@Test
public void testListPackagesMultiRoot() throws IOException, PackageException, RepositoryException {
assertTrue("initially the packages set is empty", packMgr.listPackages().isEmpty());
- packMgr.upload(getStream("../integration/" + TEST_PACKAGE_A_10), false);
- packMgr.upload(getStream("../integration/" + TEST_PACKAGE_B_10), false);
+ packMgr.upload(getStream(TEST_PACKAGE_A_10), false);
+ packMgr.upload(getStream(TEST_PACKAGE_B_10), false);
assertEquals("package list contains 2 elements", 2, packMgr.listPackages().size());
JcrPackageManager multiRootMgr = new JcrPackageManagerImpl(admin, new String[]{"/var/packages" , "/etc/packages"});
assertEquals("package list contains 2 elements", 2, multiRootMgr.listPackages().size());
// install 3rd package in /var
- multiRootMgr.upload(getStream("../integration/" + TEST_PACKAGE_C_10), false);
+ multiRootMgr.upload(getStream(TEST_PACKAGE_C_10), false);
List<JcrPackage> pkgs = multiRootMgr.listPackages();
assertEquals("packages contains 3 elements", 3, pkgs.size());
Set<PackageId> ids = new HashSet<PackageId>();
@@ -262,8 +262,8 @@ public class JcrPackageManagerImplTest e
@Test
public void testListPackagesMultiRootAndGroup() throws IOException, PackageException, RepositoryException {
assertTrue("initially the packages set is empty", packMgr.listPackages().isEmpty());
- packMgr.upload(getStream("../integration/" + TEST_PACKAGE_A_10), false);
- packMgr.upload(getStream("../integration/" + TEST_PACKAGE_B_10), false);
+ packMgr.upload(getStream(TEST_PACKAGE_A_10), false);
+ packMgr.upload(getStream(TEST_PACKAGE_B_10), false);
packMgr.create("foo", "test-package");
assertEquals("package list contains 3 elements", 3, packMgr.listPackages().size());
@@ -271,7 +271,7 @@ public class JcrPackageManagerImplTest e
assertEquals("package list contains 3 elements", 3, multiRootMgr.listPackages().size());
// install 3rd package in /var
- multiRootMgr.upload(getStream("../integration/" + TEST_PACKAGE_C_10), false);
+ multiRootMgr.upload(getStream(TEST_PACKAGE_C_10), false);
multiRootMgr.create("foo", "var-test-package");
List<JcrPackage> pkgs = multiRootMgr.listPackages("foo", false);
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ImportTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ImportTests.java?rev=1870009&r1=1870008&r2=1870009&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ImportTests.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ImportTests.java Tue Nov 19 08:52:27 2019
@@ -65,7 +65,7 @@ public class ImportTests extends Integra
@Test
public void testImport() throws IOException, RepositoryException, ConfigurationException {
- ZipArchive archive = new ZipArchive(getTempFile("testpackages/tmp.zip"));
+ ZipArchive archive = new ZipArchive(getTempFile("/test-packages/tmp.zip"));
archive.open(true);
Node rootNode = admin.getRootNode();
ImportOptions opts = getDefaultOptions();
@@ -77,7 +77,7 @@ public class ImportTests extends Integra
@Test
public void testReimportLess() throws IOException, RepositoryException, ConfigurationException {
- ZipArchive archive = new ZipArchive(getTempFile("testpackages/tmp.zip"));
+ ZipArchive archive = new ZipArchive(getTempFile("/test-packages/tmp.zip"));
archive.open(true);
Node rootNode = admin.getRootNode();
ImportOptions opts = getDefaultOptions();
@@ -86,7 +86,7 @@ public class ImportTests extends Integra
assertNodeExists("/tmp/foo/bar/tobi");
- ZipArchive archive2 = new ZipArchive(getTempFile("testpackages/tmp_less.zip"));
+ ZipArchive archive2 = new ZipArchive(getTempFile("/test-packages/tmp_less.zip"));
archive2.open(true);
importer.run(archive2, rootNode);
@@ -95,7 +95,7 @@ public class ImportTests extends Integra
@Test
public void testFilteredImport() throws IOException, RepositoryException, ConfigurationException {
- ZipArchive archive = new ZipArchive(getTempFile("testpackages/filtered_package.zip"));
+ ZipArchive archive = new ZipArchive(getTempFile("/test-packages/filtered_package.zip"));
archive.open(true);
Node rootNode = admin.getRootNode();
ImportOptions opts = getDefaultOptions();
@@ -112,7 +112,7 @@ public class ImportTests extends Integra
@Test
public void testUnFilteredImport() throws IOException, RepositoryException, ConfigurationException {
- ZipArchive archive = new ZipArchive(getTempFile("testpackages/unfiltered_package.zip"));
+ ZipArchive archive = new ZipArchive(getTempFile("/test-packages/unfiltered_package.zip"));
archive.open(true);
Node rootNode = admin.getRootNode();
ImportOptions opts = getDefaultOptions();
@@ -129,7 +129,7 @@ public class ImportTests extends Integra
@Test
public void testRelativeImport() throws IOException, RepositoryException, ConfigurationException {
- ZipArchive archive = new ZipArchive(getTempFile("testpackages/tmp.zip"));
+ ZipArchive archive = new ZipArchive(getTempFile("/test-packages/tmp.zip"));
admin.getRootNode().addNode(TEST_ROOT.substring(1, TEST_ROOT.length()));
admin.save();
@@ -155,7 +155,7 @@ public class ImportTests extends Integra
*/
@Test
public void testRelativeEmptyImport() throws IOException, RepositoryException, ConfigurationException {
- ZipArchive archive = new ZipArchive(getTempFile("testpackages/empty_testnode.zip"));
+ ZipArchive archive = new ZipArchive(getTempFile("/test-packages/empty_testnode.zip"));
admin.getRootNode().addNode(TEST_ROOT.substring(1, TEST_ROOT.length()));
admin.save();
@@ -200,7 +200,7 @@ public class ImportTests extends Integra
@Test
public void testConcurrentModificationHandling() throws IOException, RepositoryException, PackageException, ConfigurationException {
- ZipArchive archive = new ZipArchive(getTempFile("testpackages/tags.zip"));
+ ZipArchive archive = new ZipArchive(getTempFile("/test-packages/tags.zip"));
archive.open(true);
Node rootNode = admin.getRootNode();
ImportOptions opts = getDefaultOptions();
@@ -220,7 +220,7 @@ public class ImportTests extends Integra
@Test
public void testSNSImport() throws IOException, RepositoryException, ConfigurationException {
- ZipArchive archive = new ZipArchive(getTempFile("testpackages/test_sns.zip"));
+ ZipArchive archive = new ZipArchive(getTempFile("/test-packages/test_sns.zip"));
archive.open(true);
Node rootNode = admin.getRootNode();
ImportOptions opts = getDefaultOptions();
@@ -248,7 +248,7 @@ public class ImportTests extends Integra
@Test
public void testSubArchiveExtract() throws IOException, RepositoryException, ConfigurationException {
- ZipArchive archive = new ZipArchive(getTempFile("testpackages/tmp_with_thumbnail.zip"));
+ ZipArchive archive = new ZipArchive(getTempFile("/test-packages/tmp_with_thumbnail.zip"));
archive.open(true);
Node rootNode = admin.getRootNode();
Node tmpNode = rootNode.addNode("tmp");
@@ -299,7 +299,7 @@ public class ImportTests extends Integra
// Import with a session associated to the test user
Session session = repository.login(new SimpleCredentials(userId, userPwd.toCharArray()));
- ZipArchive archive = new ZipArchive(getTempFile("testpackages/tmp.zip"));
+ ZipArchive archive = new ZipArchive(getTempFile("/test-packages/tmp.zip"));
archive.open(true);
ImportOptions opts = getDefaultOptions();
Importer importer = new Importer(opts);
@@ -333,7 +333,7 @@ public class ImportTests extends Integra
// Import with a session associated to the test user
Session session = repository.login(new SimpleCredentials(userId, userPwd.toCharArray()));
- ZipArchive archive = new ZipArchive(getTempFile("testpackages/tmp_foo.zip"));
+ ZipArchive archive = new ZipArchive(getTempFile("/test-packages/tmp_foo.zip"));
archive.open(true);
ImportOptions opts = getDefaultOptions();
Importer importer = new Importer(opts);
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java?rev=1870009&r1=1870008&r2=1870009&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java Tue Nov 19 08:52:27 2019
@@ -146,17 +146,17 @@ public class IntegrationTestBase {
/**
* Test package A-1.0. Depends on B and C-1.X
*/
- public static String TEST_PACKAGE_A_10 = "testpackages/test_a-1.0.zip";
+ public static String TEST_PACKAGE_A_10 = "/test-packages/test_a-1.0.zip";
/**
* Test package B-1.0. Depends on C
*/
- public static String TEST_PACKAGE_B_10 = "testpackages/test_b-1.0.zip";
+ public static String TEST_PACKAGE_B_10 = "/test-packages/test_b-1.0.zip";
/**
* Test package C-1.0
*/
- public static String TEST_PACKAGE_C_10 = "testpackages/test_c-1.0.zip";
+ public static String TEST_PACKAGE_C_10 = "/test-packages/test_c-1.0.zip";
@ClassRule
@@ -333,11 +333,7 @@ public class IntegrationTestBase {
public InputStream getStream(String name) {
InputStream in;
- if (name.startsWith("/")) {
- in = getClass().getClassLoader().getResourceAsStream(name);
- } else {
- in = getClass().getResourceAsStream(name);
- }
+ in = getClass().getResourceAsStream(name);
return in;
}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/PrincipalBasedTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/PrincipalBasedTest.java?rev=1870009&r1=1870008&r2=1870009&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/PrincipalBasedTest.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/PrincipalBasedTest.java Tue Nov 19 08:52:27 2019
@@ -208,7 +208,7 @@ public class PrincipalBasedTest extends
opts.setAccessControlHandling(AccessControlHandling.IGNORE);
opts.setImportMode(ImportMode.UPDATE);
- extractVaultPackage("testpackages/principalbased.zip", opts);
+ extractVaultPackage("/test-packages/principalbased.zip", opts);
assertPolicy(testUser.getPrincipal(), existingEntries);
}
@@ -219,7 +219,7 @@ public class PrincipalBasedTest extends
opts.setAccessControlHandling(AccessControlHandling.IGNORE);
opts.setImportMode(ImportMode.MERGE);
- extractVaultPackage("testpackages/principalbased.zip", opts);
+ extractVaultPackage("/test-packages/principalbased.zip", opts);
assertPolicy(testUser.getPrincipal(), existingEntries);
}
@@ -231,7 +231,7 @@ public class PrincipalBasedTest extends
opts.setAccessControlHandling(AccessControlHandling.IGNORE);
opts.setImportMode(ImportMode.REPLACE);
- extractVaultPackage("testpackages/principalbased.zip", opts);
+ extractVaultPackage("/test-packages/principalbased.zip", opts);
// user may have been moved due to 'replace' mode -> need to retrieve again
Principal p = userManager.getAuthorizable(SYSTEM_USER_ID).getPrincipal();
assertEquals(0, acMgr.getPolicies(p).length);
@@ -244,7 +244,7 @@ public class PrincipalBasedTest extends
opts.setAccessControlHandling(AccessControlHandling.OVERWRITE);
opts.setImportMode(ImportMode.UPDATE);
- extractVaultPackage("testpackages/principalbased.zip");
+ extractVaultPackage("/test-packages/principalbased.zip");
assertPolicy(testUser.getPrincipal(), packageEntries);
}
@@ -255,7 +255,7 @@ public class PrincipalBasedTest extends
opts.setAccessControlHandling(AccessControlHandling.OVERWRITE);
opts.setImportMode(ImportMode.MERGE);
- extractVaultPackage("testpackages/principalbased.zip");
+ extractVaultPackage("/test-packages/principalbased.zip");
assertPolicy(testUser.getPrincipal(), packageEntries);
}
@@ -266,7 +266,7 @@ public class PrincipalBasedTest extends
opts.setAccessControlHandling(AccessControlHandling.OVERWRITE);
opts.setImportMode(ImportMode.REPLACE);
- extractVaultPackage("testpackages/principalbased.zip");
+ extractVaultPackage("/test-packages/principalbased.zip");
assertPolicy(testUser.getPrincipal(), packageEntries);
}
@@ -277,7 +277,7 @@ public class PrincipalBasedTest extends
opts.setAccessControlHandling(AccessControlHandling.MERGE);
opts.setImportMode(ImportMode.UPDATE);
- extractVaultPackage("testpackages/principalbased.zip", opts);
+ extractVaultPackage("/test-packages/principalbased.zip", opts);
List<AccessControlEntry> expected = Lists.newArrayList(existingEntries);
expected.addAll(ImmutableList.copyOf(packageEntries));
@@ -291,7 +291,7 @@ public class PrincipalBasedTest extends
opts.setAccessControlHandling(AccessControlHandling.MERGE);
opts.setImportMode(ImportMode.MERGE);
- extractVaultPackage("testpackages/principalbased.zip", opts);
+ extractVaultPackage("/test-packages/principalbased.zip", opts);
List<AccessControlEntry> expected = Lists.newArrayList(existingEntries);
expected.addAll(ImmutableList.copyOf(packageEntries));
@@ -306,7 +306,7 @@ public class PrincipalBasedTest extends
opts.setAccessControlHandling(AccessControlHandling.MERGE);
opts.setImportMode(ImportMode.REPLACE);
- extractVaultPackage("testpackages/principalbased.zip", opts);
+ extractVaultPackage("/test-packages/principalbased.zip", opts);
// user may have been moved due to 'replace' mode -> need to retrieve again
assertPolicy(userManager.getAuthorizable(SYSTEM_USER_ID).getPrincipal(), packageEntries);
@@ -319,7 +319,7 @@ public class PrincipalBasedTest extends
opts.setAccessControlHandling(AccessControlHandling.MERGE_PRESERVE);
opts.setImportMode(ImportMode.UPDATE);
- extractVaultPackage("testpackages/principalbased.zip", opts);
+ extractVaultPackage("/test-packages/principalbased.zip", opts);
assertPolicy(testUser.getPrincipal(), existingEntries);
}
@@ -330,7 +330,7 @@ public class PrincipalBasedTest extends
opts.setAccessControlHandling(AccessControlHandling.MERGE_PRESERVE);
opts.setImportMode(ImportMode.MERGE);
- extractVaultPackage("testpackages/principalbased.zip", opts);
+ extractVaultPackage("/test-packages/principalbased.zip", opts);
assertPolicy(testUser.getPrincipal(), existingEntries);
}
@@ -342,7 +342,7 @@ public class PrincipalBasedTest extends
opts.setAccessControlHandling(AccessControlHandling.MERGE_PRESERVE);
opts.setImportMode(ImportMode.REPLACE);
- extractVaultPackage("testpackages/principalbased.zip", opts);
+ extractVaultPackage("/test-packages/principalbased.zip", opts);
// user may have been moved due to 'replace' mode -> need to retrieve again
Principal p = userManager.getAuthorizable(SYSTEM_USER_ID).getPrincipal();
assertEquals(0, acMgr.getPolicies(p).length);
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACLAndMerge.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACLAndMerge.java?rev=1870009&r1=1870008&r2=1870009&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACLAndMerge.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACLAndMerge.java Tue Nov 19 08:52:27 2019
@@ -81,13 +81,13 @@ public class TestACLAndMerge extends Int
public void testACAndMerge() throws RepositoryException, IOException, PackageException {
assertNodeMissing("/testroot");
- extractVaultPackage("testpackages/mode_ac_test_a.zip");
+ extractVaultPackage("/test-packages/mode_ac_test_a.zip");
// test if nodes and ACLs of first package exist
assertNodeExists("/testroot/node_a");
assertPermission("/testroot/secured", false, new String[]{"jcr:all"}, "everyone", null);
- extractVaultPackage("testpackages/mode_ac_test_b.zip");
+ extractVaultPackage("/test-packages/mode_ac_test_b.zip");
// test if nodes and ACLs of 2nd package exist
assertNodeExists("/testroot/node_a");
@@ -105,13 +105,13 @@ public class TestACLAndMerge extends Int
public void testACMerge() throws RepositoryException, IOException, PackageException {
assertNodeMissing("/testroot");
- extractVaultPackage("testpackages/mode_ac_test_a.zip");
+ extractVaultPackage("/test-packages/mode_ac_test_a.zip");
// test if nodes and ACLs of first package exist
assertNodeExists("/testroot/node_a");
assertPermission("/testroot/secured", false, new String[]{"jcr:all"}, "everyone", null);
- extractVaultPackage("testpackages/mode_ac_test_b_merge.zip");
+ extractVaultPackage("/test-packages/mode_ac_test_b_merge.zip");
// test if nodes and ACLs of 2nd package exist
assertNodeExists("/testroot/node_a");
@@ -128,13 +128,13 @@ public class TestACLAndMerge extends Int
public void testACMergeSubpackage() throws RepositoryException, IOException, PackageException {
assertNodeMissing("/testroot");
- extractVaultPackage("testpackages/mode_ac_test_a.zip");
+ extractVaultPackage("/test-packages/mode_ac_test_a.zip");
// test if nodes and ACLs of first package exist
assertNodeExists("/testroot/node_a");
assertPermission("/testroot/secured", false, new String[]{"jcr:all"}, "everyone", null);
- installPackage("testpackages/mode_ac_subpackage.zip");
+ installPackage("/test-packages/mode_ac_subpackage.zip");
// test if nodes and ACLs of 2nd package exist
assertNodeExists("/testroot/node_a");
@@ -151,13 +151,13 @@ public class TestACLAndMerge extends Int
public void testACMerge4() throws RepositoryException, IOException, PackageException {
assertNodeMissing("/testroot");
- extractVaultPackage("testpackages/mode_ac_test_b2_merge.zip");
+ extractVaultPackage("/test-packages/mode_ac_test_b2_merge.zip");
// test if nodes and ACLs of first package exist
assertNodeExists("/testroot/node_a");
assertPermission("/testroot/secured", true, new String[]{"jcr:read", "jcr:write"}, "everyone", null);
- extractVaultPackage("testpackages/mode_ac_test_b3_merge.zip");
+ extractVaultPackage("/test-packages/mode_ac_test_b3_merge.zip");
// test if nodes and ACLs of 2nd package exist
assertNodeExists("/testroot/node_a");
@@ -173,13 +173,13 @@ public class TestACLAndMerge extends Int
public void testACMerge2() throws RepositoryException, IOException, PackageException {
assertNodeMissing("/testroot");
- extractVaultPackage("testpackages/mode_ac_test_a.zip");
+ extractVaultPackage("/test-packages/mode_ac_test_a.zip");
// test if nodes and ACLs of first package exist
assertNodeExists("/testroot/node_a");
assertPermission("/testroot/secured", false, new String[]{"jcr:all"}, "everyone", null);
- extractVaultPackage("testpackages/mode_ac_test_c_merge.zip");
+ extractVaultPackage("/test-packages/mode_ac_test_c_merge.zip");
// test if nodes and ACLs of 2nd package exist
assertNodeExists("/testroot/node_a");
@@ -196,13 +196,13 @@ public class TestACLAndMerge extends Int
public void testACMerge3() throws RepositoryException, IOException, PackageException {
assertNodeMissing("/testroot");
- extractVaultPackage("testpackages/mode_ac_test_a.zip");
+ extractVaultPackage("/test-packages/mode_ac_test_a.zip");
// test if nodes and ACLs of first package exist
assertNodeExists("/testroot/node_a");
assertPermission("/testroot/secured", false, new String[]{"jcr:all"}, "everyone", null);
- extractVaultPackage("testpackages/mode_ac_test_d.zip");
+ extractVaultPackage("/test-packages/mode_ac_test_d.zip");
// test if nodes and ACLs of 2nd package exist
assertNodeExists("/testroot/node_a");
@@ -219,7 +219,7 @@ public class TestACLAndMerge extends Int
public void testACMergePreserve2() throws RepositoryException, IOException, PackageException {
assertNodeMissing("/testroot");
- extractVaultPackage("testpackages/mode_ac_test_a.zip");
+ extractVaultPackage("/test-packages/mode_ac_test_a.zip");
// test if nodes and ACLs of first package exist
assertNodeExists("/testroot/node_a");
@@ -227,7 +227,7 @@ public class TestACLAndMerge extends Int
ImportOptions opts = getDefaultOptions();
opts.setAccessControlHandling(AccessControlHandling.MERGE_PRESERVE);
- extractVaultPackage("testpackages/mode_ac_test_d.zip", opts);
+ extractVaultPackage("/test-packages/mode_ac_test_d.zip", opts);
// test if nodes and ACLs of 2nd package exist
assertNodeExists("/testroot/node_a");
@@ -246,13 +246,13 @@ public class TestACLAndMerge extends Int
public void testACMergePreserve() throws RepositoryException, IOException, PackageException {
assertNodeMissing("/testroot");
- extractVaultPackage("testpackages/mode_ac_test_a.zip");
+ extractVaultPackage("/test-packages/mode_ac_test_a.zip");
// test if nodes and ACLs of first package exist
assertNodeExists("/testroot/node_a");
assertPermission("/testroot/secured", false, new String[]{"jcr:all"}, "everyone", null);
- extractVaultPackage("testpackages/mode_ac_test_b_preserve.zip");
+ extractVaultPackage("/test-packages/mode_ac_test_b_preserve.zip");
// test if nodes and ACLs of 2nd package exist
assertNodeExists("/testroot/node_a");
@@ -269,14 +269,14 @@ public class TestACLAndMerge extends Int
public void testACMergePreserveNodeType() throws RepositoryException, IOException, PackageException {
assertNodeMissing("/testroot");
- extractVaultPackage("testpackages/mode_ac_test_a.zip");
+ extractVaultPackage("/test-packages/mode_ac_test_a.zip");
// test if nodes and ACLs of first package exist
assertNodeExists("/testroot/node_a");
assertPermission("/testroot/secured", false, new String[]{"jcr:all"}, "everyone", null);
assertProperty("/testroot/secured/jcr:primaryType", "nt:folder");
- extractVaultPackage("testpackages/mode_ac_test_unsecured_nodetype.zip");
+ extractVaultPackage("/test-packages/mode_ac_test_unsecured_nodetype.zip");
// test if permissions remain and pt changed
assertPermission("/testroot/secured", false, new String[]{"jcr:all"}, "everyone", null);
@@ -341,7 +341,7 @@ public class TestACLAndMerge extends Int
private void doOrderTest(AccessControlHandling ac) throws Exception {
ImportOptions opts = getDefaultOptions();
opts.setAccessControlHandling(ac);
- extractVaultPackage("testpackages/mode_ac_test_e.zip", opts);
+ extractVaultPackage("/test-packages/mode_ac_test_e.zip", opts);
// test if nodes and ACLs of first package exist
assertNodeExists("/testroot/node_e");
@@ -362,7 +362,7 @@ public class TestACLAndMerge extends Int
Assume.assumeTrue(isOak());
assertNodeMissing("/testroot");
- extractVaultPackage("testpackages/oak_ac_content_test.zip");
+ extractVaultPackage("/test-packages/oak_ac_content_test.zip");
// test if nodes and ACLs of first package exist
assertNodeExists("/testroot/node_a");
@@ -383,7 +383,7 @@ public class TestACLAndMerge extends Int
public void testMissingUser() throws RepositoryException, IOException, PackageException {
assertNodeMissing("/testroot");
- extractVaultPackage("testpackages/mode_ac_test_lateuser.zip");
+ extractVaultPackage("/test-packages/mode_ac_test_lateuser.zip");
// test if nodes and ACLs of first package exist
assertNodeExists("/testroot/node_d");
@@ -400,7 +400,7 @@ public class TestACLAndMerge extends Int
ImportOptions opts = getDefaultOptions();
opts.setAccessControlHandling(AccessControlHandling.OVERWRITE);
- extractVaultPackage("testpackages/repo_policy.zip", opts);
+ extractVaultPackage("/test-packages/repo_policy.zip", opts);
// test if nodes and ACLs of first package exist
assertPermission(null, false, new String[]{"jcr:all"}, "everyone", null);
@@ -408,7 +408,7 @@ public class TestACLAndMerge extends Int
opts = getDefaultOptions();
opts.setAccessControlHandling(AccessControlHandling.OVERWRITE);
- extractVaultPackage("testpackages/repo_no_policy.zip", opts);
+ extractVaultPackage("/test-packages/repo_no_policy.zip", opts);
assertPermissionMissing(null, false, new String[]{"jcr:all"}, "everyone", null);
assertPermissionMissing(null, false, new String[]{"jcr:all"}, "testuser", null);
@@ -428,7 +428,7 @@ public class TestACLAndMerge extends Int
ImportOptions opts = getDefaultOptions();
opts.setAccessControlHandling(AccessControlHandling.MERGE);
- extractVaultPackage("testpackages/repo_policy.zip", opts);
+ extractVaultPackage("/test-packages/repo_policy.zip", opts);
// test if nodes and ACLs of first package exist
assertPermission(null, false, new String[]{"jcr:all"}, "everyone", null);
@@ -449,7 +449,7 @@ public class TestACLAndMerge extends Int
ImportOptions opts = getDefaultOptions();
opts.setAccessControlHandling(AccessControlHandling.MERGE_PRESERVE);
- extractVaultPackage("testpackages/repo_policy.zip", opts);
+ extractVaultPackage("/test-packages/repo_policy.zip", opts);
// test if nodes and ACLs of first package exist
assertPermission(null, false, new String[]{"jcr:all"}, "everyone", null);
@@ -464,7 +464,7 @@ public class TestACLAndMerge extends Int
public void testRootACL() throws RepositoryException, IOException, PackageException {
ImportOptions opts = getDefaultOptions();
opts.setAccessControlHandling(AccessControlHandling.OVERWRITE);
- extractVaultPackage("testpackages/root_policy.zip", opts);
+ extractVaultPackage("/test-packages/root_policy.zip", opts);
// test if nodes and ACLs of first package exist
assertPermission("/", true, new String[]{"jcr:all"}, "everyone", null);
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestAceOrder.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestAceOrder.java?rev=1870009&r1=1870008&r2=1870009&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestAceOrder.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestAceOrder.java Tue Nov 19 08:52:27 2019
@@ -102,7 +102,7 @@ public class TestAceOrder extends Integr
public void testHandlingOverwrite() throws Exception {
assertNodeMissing("/testroot/secured");
- extractVaultPackage("testpackages/ace_order_overwrite.zip");
+ extractVaultPackage("/test-packages/ace_order_overwrite.zip");
// test if nodes and ACLs of first package exist
assertNodeExists("/testroot/secured");
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestArchiveExtraction.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestArchiveExtraction.java?rev=1870009&r1=1870008&r2=1870009&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestArchiveExtraction.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestArchiveExtraction.java Tue Nov 19 08:52:27 2019
@@ -82,7 +82,7 @@ public class TestArchiveExtraction exten
@Test
public void testDefaultArchiveInstall() throws RepositoryException, IOException, PackageException {
- Archive a = getFileArchive("testpackages/tmp.zip");
+ Archive a = getFileArchive("/test-packages/tmp.zip");
ImportOptions opts = getDefaultOptions();
PackageId[] ids = packMgr.extract(a, opts, true);
validateArchive(a);
@@ -113,8 +113,8 @@ public class TestArchiveExtraction exten
@Test
public void testDefaultArchiveInstallFailsWithoutReplace() throws RepositoryException, IOException, PackageException {
- uploadPackage("testpackages/tmp.zip");
- Archive a = getFileArchive("testpackages/tmp.zip");
+ uploadPackage("/test-packages/tmp.zip");
+ Archive a = getFileArchive("/test-packages/tmp.zip");
ImportOptions opts = getDefaultOptions();
try {
packMgr.extract(a, opts, false);
@@ -128,8 +128,8 @@ public class TestArchiveExtraction exten
@Test
public void testDefaultArchiveInstallCanReplace() throws RepositoryException, IOException, PackageException {
- uploadPackage("testpackages/tmp.zip");
- Archive a = getFileArchive("testpackages/tmp.zip");
+ uploadPackage("/test-packages/tmp.zip");
+ Archive a = getFileArchive("/test-packages/tmp.zip");
ImportOptions opts = getDefaultOptions();
PackageId[] ids = packMgr.extract(a, opts, true);
assertEquals(1, ids.length);
@@ -138,7 +138,7 @@ public class TestArchiveExtraction exten
@Test
public void testNonRecursive() throws RepositoryException, IOException, PackageException {
- Archive a = getFileArchive("testpackages/subtest.zip");
+ Archive a = getFileArchive("/test-packages/subtest.zip");
// install
ImportOptions opts = getDefaultOptions();
@@ -161,7 +161,7 @@ public class TestArchiveExtraction exten
@Test
public void testRecursive() throws RepositoryException, IOException, PackageException {
- Archive a = getFileArchive("testpackages/subtest.zip");
+ Archive a = getFileArchive("/test-packages/subtest.zip");
// install
ImportOptions opts = getDefaultOptions();
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestAtomicCounter.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestAtomicCounter.java?rev=1870009&r1=1870008&r2=1870009&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestAtomicCounter.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestAtomicCounter.java Tue Nov 19 08:52:27 2019
@@ -66,7 +66,7 @@ public class TestAtomicCounter extends I
public void installAtomicCounter() throws RepositoryException, IOException, PackageException {
Assume.assumeTrue(isOak());
- JcrPackage pack = packMgr.upload(getStream("testpackages/atomic-counter-test.zip"), false);
+ JcrPackage pack = packMgr.upload(getStream("/test-packages/atomic-counter-test.zip"), false);
assertNotNull(pack);
ImportOptions opts = getDefaultOptions();
pack.install(opts);
@@ -88,7 +88,7 @@ public class TestAtomicCounter extends I
admin.save();
assertEquals(5L, testroot.getProperty("oak:counter").getLong());
- JcrPackage pack = packMgr.upload(getStream("testpackages/atomic-counter-test.zip"), false);
+ JcrPackage pack = packMgr.upload(getStream("/test-packages/atomic-counter-test.zip"), false);
assertNotNull(pack);
ImportOptions opts = getDefaultOptions();
pack.install(opts);
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestCugHandling.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestCugHandling.java?rev=1870009&r1=1870008&r2=1870009&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestCugHandling.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestCugHandling.java Tue Nov 19 08:52:27 2019
@@ -71,12 +71,12 @@ public final class TestCugHandling {
/**
* contains cugPolicy with rep:principalNames=[principal-1,principal-2]
*/
- private static final String CUG_PACKAGE_1 = "testpackages/cug-test-1.zip";
+ private static final String CUG_PACKAGE_1 = "/test-packages/cug-test-1.zip";
/**
* contains cugPolicy with rep:principalNames=[principal-2,principal-3]
*/
- private static final String CUG_PACKAGE_2 = "testpackages/cug-test-2.zip";
+ private static final String CUG_PACKAGE_2 = "/test-packages/cug-test-2.zip";
private Repository repository;
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestCustomPrivileges.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestCustomPrivileges.java?rev=1870009&r1=1870008&r2=1870009&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestCustomPrivileges.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestCustomPrivileges.java Tue Nov 19 08:52:27 2019
@@ -40,7 +40,7 @@ public class TestCustomPrivileges extend
*/
@Test
public void installWithPrivs() throws RepositoryException, IOException, PackageException {
- JcrPackage pack = packMgr.upload(getStream("testpackages/privileges.zip"), false);
+ JcrPackage pack = packMgr.upload(getStream("/test-packages/privileges.zip"), false);
assertNotNull(pack);
pack.install(getDefaultOptions());
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestEmptyPackage.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestEmptyPackage.java?rev=1870009&r1=1870008&r2=1870009&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestEmptyPackage.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestEmptyPackage.java Tue Nov 19 08:52:27 2019
@@ -43,13 +43,13 @@ public class TestEmptyPackage extends In
*/
@Test
public void installEmptyLevel1() throws RepositoryException, IOException, PackageException {
- JcrPackage pack = packMgr.upload(getStream("testpackages/tmp.zip"), false);
+ JcrPackage pack = packMgr.upload(getStream("/test-packages/tmp.zip"), false);
assertNotNull(pack);
pack.install(getDefaultOptions());
assertNodeExists("/tmp/foo/bar/tobi");
// now install the empty package
- pack = packMgr.upload(getStream("testpackages/empty_tmp.zip"), false);
+ pack = packMgr.upload(getStream("/test-packages/empty_tmp.zip"), false);
assertNotNull(pack);
pack.install(getDefaultOptions());
assertNodeMissing("/tmp");
@@ -61,13 +61,13 @@ public class TestEmptyPackage extends In
*/
@Test
public void installEmptyLevel2() throws RepositoryException, IOException, PackageException {
- JcrPackage pack = packMgr.upload(getStream("testpackages/tmp.zip"), false);
+ JcrPackage pack = packMgr.upload(getStream("/test-packages/tmp.zip"), false);
assertNotNull(pack);
pack.install(getDefaultOptions());
assertNodeExists("/tmp/foo/bar/tobi");
// now install the empty package
- pack = packMgr.upload(getStream("testpackages/empty_tmp_foo.zip"), false);
+ pack = packMgr.upload(getStream("/test-packages/empty_tmp_foo.zip"), false);
assertNotNull(pack);
pack.install(getDefaultOptions());
assertNodeExists("/tmp");
@@ -80,13 +80,13 @@ public class TestEmptyPackage extends In
*/
@Test
public void installEmptyLevel3() throws RepositoryException, IOException, PackageException {
- JcrPackage pack = packMgr.upload(getStream("testpackages/tmp.zip"), false);
+ JcrPackage pack = packMgr.upload(getStream("/test-packages/tmp.zip"), false);
assertNotNull(pack);
pack.install(getDefaultOptions());
assertNodeExists("/tmp/foo/bar/tobi");
// now install the empty package
- pack = packMgr.upload(getStream("testpackages/empty_tmp_foo_bar.zip"), false);
+ pack = packMgr.upload(getStream("/test-packages/empty_tmp_foo_bar.zip"), false);
assertNotNull(pack);
pack.install(getDefaultOptions());
assertNodeExists("/tmp/foo");
@@ -99,7 +99,7 @@ public class TestEmptyPackage extends In
*/
@Test
public void installEmptyFolder() throws RepositoryException, IOException, PackageException {
- JcrPackage pack = packMgr.upload(getStream("testpackages/tmp_test_folders.zip"), false);
+ JcrPackage pack = packMgr.upload(getStream("/test-packages/tmp_test_folders.zip"), false);
assertNotNull(pack);
pack.install(getDefaultOptions());
assertNodeExists("/tmp/test/content/foo/foo.jsp");
@@ -123,7 +123,7 @@ public class TestEmptyPackage extends In
*/
@Test
public void installUninstallLevel1() throws RepositoryException, IOException, PackageException {
- JcrPackage pack = packMgr.upload(getStream("testpackages/tmp.zip"), false);
+ JcrPackage pack = packMgr.upload(getStream("/test-packages/tmp.zip"), false);
assertNotNull(pack);
pack.install(getDefaultOptions());
assertNodeExists("/tmp/foo/bar/tobi");
@@ -138,7 +138,7 @@ public class TestEmptyPackage extends In
*/
@Test
public void installUninstallLevel2() throws RepositoryException, IOException, PackageException {
- JcrPackage pack = packMgr.upload(getStream("testpackages/tmp_foo.zip"), false);
+ JcrPackage pack = packMgr.upload(getStream("/test-packages/tmp_foo.zip"), false);
assertNotNull(pack);
pack.install(getDefaultOptions());
assertNodeExists("/tmp/foo/bar/tobi");
@@ -154,7 +154,7 @@ public class TestEmptyPackage extends In
*/
@Test
public void installUninstallLevel3() throws RepositoryException, IOException, PackageException {
- JcrPackage pack = packMgr.upload(getStream("testpackages/tmp_foo_bar.zip"), false);
+ JcrPackage pack = packMgr.upload(getStream("/test-packages/tmp_foo_bar.zip"), false);
assertNotNull(pack);
pack.install(getDefaultOptions());
assertNodeExists("/tmp/foo/bar/tobi");
@@ -171,13 +171,13 @@ public class TestEmptyPackage extends In
*/
@Test
public void installUninstallSubsequent() throws RepositoryException, IOException, PackageException {
- JcrPackage pack = packMgr.upload(getStream("testpackages/tmp.zip"), false);
+ JcrPackage pack = packMgr.upload(getStream("/test-packages/tmp.zip"), false);
assertNotNull(pack);
pack.install(getDefaultOptions());
assertNodeExists("/tmp/foo/bar/tobi");
// now install the empty package
- JcrPackage pack2 = packMgr.upload(getStream("testpackages/empty_tmp_foo_bar.zip"), false);
+ JcrPackage pack2 = packMgr.upload(getStream("/test-packages/empty_tmp_foo_bar.zip"), false);
assertNotNull(pack2);
pack2.install(getDefaultOptions());
@@ -193,7 +193,7 @@ public class TestEmptyPackage extends In
*/
@Test
public void installUninstallFile() throws RepositoryException, IOException, PackageException {
- JcrPackage pack = packMgr.upload(getStream("testpackages/tmp_foo_bar_test.zip"), false);
+ JcrPackage pack = packMgr.upload(getStream("/test-packages/tmp_foo_bar_test.zip"), false);
assertNotNull(pack);
pack.install(getDefaultOptions());
assertNodeExists("/tmp/foo/bar/test.txt");
@@ -209,7 +209,7 @@ public class TestEmptyPackage extends In
*/
@Test
public void installInstallNoFilter() throws RepositoryException, IOException, PackageException {
- JcrPackage pack = packMgr.upload(getStream("testpackages/tmp_foo_bar_test_nofilter.zip"), false);
+ JcrPackage pack = packMgr.upload(getStream("/test-packages/tmp_foo_bar_test_nofilter.zip"), false);
assertNotNull(pack);
pack.install(getDefaultOptions());
assertNodeExists("/tmp/foo/bar/test.txt");
@@ -224,7 +224,7 @@ public class TestEmptyPackage extends In
*/
@Test
public void installInstallMinimal() throws RepositoryException, IOException, PackageException {
- JcrPackage pack = packMgr.upload(getStream("testpackages/tmp_foo_bar_test_minimal.zip"), false);
+ JcrPackage pack = packMgr.upload(getStream("/test-packages/tmp_foo_bar_test_minimal.zip"), false);
assertNotNull(pack);
pack.install(getDefaultOptions());
assertNodeExists("/tmp/foo/bar/test.txt");
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestEnforcedDependencies.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestEnforcedDependencies.java?rev=1870009&r1=1870008&r2=1870009&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestEnforcedDependencies.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestEnforcedDependencies.java Tue Nov 19 08:52:27 2019
@@ -43,42 +43,42 @@ public class TestEnforcedDependencies ex
/**
* Test package A-1.0. Depends on B and C-1.X
*/
- private static String TEST_PACKAGE_A_10 = "testpackages/test_a-1.0.zip";
+ private static String TEST_PACKAGE_A_10 = "/test-packages/test_a-1.0.zip";
/**
* Test package A-2.0. Depends on B and C-2.X
*/
- private static String TEST_PACKAGE_A_20 = "testpackages/test_a-2.0.zip";
+ private static String TEST_PACKAGE_A_20 = "/test-packages/test_a-2.0.zip";
/**
* Test package B-1.0. Depends on C
*/
- private static String TEST_PACKAGE_B_10 = "testpackages/test_b-1.0.zip";
+ private static String TEST_PACKAGE_B_10 = "/test-packages/test_b-1.0.zip";
/**
* Test package C-1.0
*/
- private static String TEST_PACKAGE_C_10 = "testpackages/test_c-1.0.zip";
+ private static String TEST_PACKAGE_C_10 = "/test-packages/test_c-1.0.zip";
/**
* Test package C-1.1
*/
- private static String TEST_PACKAGE_C_11 = "testpackages/test_c-1.1.zip";
+ private static String TEST_PACKAGE_C_11 = "/test-packages/test_c-1.1.zip";
/**
* Test package C-2.0
*/
- private static String TEST_PACKAGE_C_20 = "testpackages/test_c-2.0.zip";
+ private static String TEST_PACKAGE_C_20 = "/test-packages/test_c-2.0.zip";
/**
* Test package D-1.0. Depends on B and E
*/
- private static String TEST_PACKAGE_D_10 = "testpackages/test_d-1.0.zip";
+ private static String TEST_PACKAGE_D_10 = "/test-packages/test_d-1.0.zip";
/**
* Test package E-1.0. Depends on D
*/
- private static String TEST_PACKAGE_E_10 = "testpackages/test_e-1.0.zip";
+ private static String TEST_PACKAGE_E_10 = "/test-packages/test_e-1.0.zip";
/**
* Tests if dependencies are ignored by default
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestExecutionPlan.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestExecutionPlan.java?rev=1870009&r1=1870008&r2=1870009&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestExecutionPlan.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestExecutionPlan.java Tue Nov 19 08:52:27 2019
@@ -49,30 +49,30 @@ public class TestExecutionPlan extends I
/**
* Test package A-1.0. Depends on B and C-1.X
*/
- private static String TEST_PACKAGE_A_10 = "testpackages/test_a-1.0.zip";
+ private static String TEST_PACKAGE_A_10 = "/test-packages/test_a-1.0.zip";
private static PackageId TEST_PACKAGE_ID_A_10 = PackageId.fromString("my_packages:test_a:1.0");
/**
* Test package B-1.0. Depends on C
*/
- private static String TEST_PACKAGE_B_10 = "testpackages/test_b-1.0.zip";
+ private static String TEST_PACKAGE_B_10 = "/test-packages/test_b-1.0.zip";
private static PackageId TEST_PACKAGE_ID_B_10 = PackageId.fromString("my_packages:test_b:1.0");
/**
* Test package C-1.0
*/
- private static String TEST_PACKAGE_C_10 = "testpackages/test_c-1.0.zip";
+ private static String TEST_PACKAGE_C_10 = "/test-packages/test_c-1.0.zip";
private static PackageId TEST_PACKAGE_ID_C_10 = PackageId.fromString("my_packages:test_c:1.0");
/**
* Test package D-1.0. Depends on B and E
*/
- private static String TEST_PACKAGE_D_10 = "testpackages/test_d-1.0.zip";
+ private static String TEST_PACKAGE_D_10 = "/test-packages/test_d-1.0.zip";
/**
* Test package E-1.0. Depends on D
*/
- private static String TEST_PACKAGE_E_10 = "testpackages/test_e-1.0.zip";
+ private static String TEST_PACKAGE_E_10 = "/test-packages/test_e-1.0.zip";
private PackageRegistry registry;
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFSPackageRegistry.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFSPackageRegistry.java?rev=1870009&r1=1870008&r2=1870009&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFSPackageRegistry.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFSPackageRegistry.java Tue Nov 19 08:52:27 2019
@@ -111,7 +111,7 @@ public class TestFSPackageRegistry exten
*/
@Test
public void testRegisterStream() throws IOException, PackageException {
- PackageId id = registry.register(getStream("testpackages/tmp.zip"), false);
+ PackageId id = registry.register(getStream("/test-packages/tmp.zip"), false);
assertEquals("package id", TMP_PACKAGE_ID, id);
try (RegisteredPackage pkg = registry.open(id)) {
@@ -125,11 +125,11 @@ public class TestFSPackageRegistry exten
*/
@Test
public void testRegisterStreamTwiceFails() throws IOException, PackageException {
- PackageId id = registry.register(getStream("testpackages/tmp.zip"), false);
+ PackageId id = registry.register(getStream("/test-packages/tmp.zip"), false);
assertEquals("package id", TMP_PACKAGE_ID, id);
try {
- registry.register(getStream("testpackages/tmp.zip"), false);
+ registry.register(getStream("/test-packages/tmp.zip"), false);
fail("registering the package twice should fail");
} catch (PackageExistsException e) {
// expected
@@ -142,9 +142,9 @@ public class TestFSPackageRegistry exten
*/
@Test
public void testRegisterStreamTwiceSucceeds() throws IOException, PackageException {
- PackageId id = registry.register(getStream("testpackages/tmp.zip"), false);
+ PackageId id = registry.register(getStream("/test-packages/tmp.zip"), false);
assertEquals("package id", TMP_PACKAGE_ID, id);
- registry.register(getStream("testpackages/tmp.zip"), true);
+ registry.register(getStream("/test-packages/tmp.zip"), true);
}
/**
@@ -152,7 +152,7 @@ public class TestFSPackageRegistry exten
*/
@Test
public void testRegisterFileTwiceFails() throws IOException, PackageException {
- File file = getTempFile("testpackages/tmp.zip");
+ File file = getTempFile("/test-packages/tmp.zip");
PackageId id = registry.register(file, false);
assertEquals("package id", TMP_PACKAGE_ID, id);
assertTrue("file should still exist", file.exists());
@@ -178,7 +178,7 @@ public class TestFSPackageRegistry exten
*/
@Test
public void testRegisterTempFileTwiceFails() throws IOException, PackageException {
- File file = getTempFile("testpackages/tmp.zip");
+ File file = getTempFile("/test-packages/tmp.zip");
PackageId id = registry.register(file, false);
assertEquals("package id", TMP_PACKAGE_ID, id);
@@ -187,7 +187,7 @@ public class TestFSPackageRegistry exten
assertFalse("Package is not installed", pkg.isInstalled());
}
- file = getTempFile("testpackages/tmp.zip");
+ file = getTempFile("/test-packages/tmp.zip");
try {
registry.register(file, false);
fail("registering the package twice should fail");
@@ -202,7 +202,7 @@ public class TestFSPackageRegistry exten
*/
@Test
public void testRegisterFileTwiceSucceeds() throws IOException, PackageException {
- File file = getTempFile("testpackages/tmp.zip");
+ File file = getTempFile("/test-packages/tmp.zip");
PackageId id = registry.register(file, false);
assertEquals("package id", TMP_PACKAGE_ID, id);
assertTrue("file should still exist", file.exists());
@@ -215,7 +215,7 @@ public class TestFSPackageRegistry exten
*/
@Test
public void testRegisterExternalFileTwiceFails() throws IOException, PackageException {
- File file = getTempFile("testpackages/tmp.zip");
+ File file = getTempFile("/test-packages/tmp.zip");
PackageId id = registry.registerExternal(file, false);
assertEquals("package id", TMP_PACKAGE_ID, id);
@@ -224,7 +224,7 @@ public class TestFSPackageRegistry exten
assertFalse("Package is not installed", pkg.isInstalled());
}
- file = getTempFile("testpackages/tmp.zip");
+ file = getTempFile("/test-packages/tmp.zip");
try {
registry.registerExternal(file, false);
fail("registering the package twice should fail");
@@ -239,7 +239,7 @@ public class TestFSPackageRegistry exten
*/
@Test
public void testRegisterExternalFileTwiceFailsLoadedRegistry() throws IOException, PackageException {
- File file = getTempFile("testpackages/tmp.zip");
+ File file = getTempFile("/test-packages/tmp.zip");
PackageId id = registry.registerExternal(file, false);
assertEquals("package id", TMP_PACKAGE_ID, id);
@@ -266,7 +266,7 @@ public class TestFSPackageRegistry exten
*/
@Test
public void testRegisterExternalFileTwiceSucceeds() throws IOException, PackageException {
- File file = getTempFile("testpackages/tmp.zip");
+ File file = getTempFile("/test-packages/tmp.zip");
PackageId id = registry.registerExternal(file, false);
assertEquals("package id", TMP_PACKAGE_ID, id);
assertTrue("file should still exist", file.exists());
@@ -279,7 +279,7 @@ public class TestFSPackageRegistry exten
*/
@Test
public void testRegisterExternalWithSubPackages() throws IOException, PackageException {
- File file = getTempFile("testpackages/subtest.zip");
+ File file = getTempFile("/test-packages/subtest.zip");
registry.registerExternal(file, false);
assertTrue(registry.contains(PACKAGE_ID_SUB_A));
@@ -292,7 +292,7 @@ public class TestFSPackageRegistry exten
*/
@Test
public void testInstallExternalWithSubPackages() throws IOException, PackageException {
- File file = getTempFile("testpackages/subtest.zip");
+ File file = getTempFile("/test-packages/subtest.zip");
PackageId parentPkg = registry.registerExternal(file, false);
ExecutionPlanBuilder builder = registry.createExecutionPlan();
@@ -319,7 +319,7 @@ public class TestFSPackageRegistry exten
@SuppressWarnings("deprecation")
@Test
public void testInstallExternalUnScoped() throws IOException, PackageException, RepositoryException, org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException {
- File file = getTempFile("testpackages/mixed_package.zip");
+ File file = getTempFile("/test-packages/mixed_package.zip");
cleanPaths(APPLICATION_PATHS);
cleanPaths(CONTENT_PATHS);
@@ -340,7 +340,7 @@ public class TestFSPackageRegistry exten
@SuppressWarnings("deprecation")
@Test
public void testInstallExternalContentScoped() throws IOException, PackageException, RepositoryException, org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException {
- File file = getTempFile("testpackages/mixed_package.zip");
+ File file = getTempFile("/test-packages/mixed_package.zip");
cleanPaths(APPLICATION_PATHS);
cleanPaths(CONTENT_PATHS);
@@ -367,7 +367,7 @@ public class TestFSPackageRegistry exten
@SuppressWarnings("deprecation")
@Test
public void testInstallExternalApplicationScoped() throws IOException, PackageException, RepositoryException, org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException {
- File file = getTempFile("testpackages/mixed_package.zip");
+ File file = getTempFile("/test-packages/mixed_package.zip");
cleanPaths(APPLICATION_PATHS);
cleanPaths(CONTENT_PATHS);
@@ -391,7 +391,7 @@ public class TestFSPackageRegistry exten
*/
@Test
public void testRemovePackage() throws IOException, PackageException {
- PackageId id = registry.register(getStream("testpackages/tmp.zip"), false);
+ PackageId id = registry.register(getStream("/test-packages/tmp.zip"), false);
assertEquals("package id", TMP_PACKAGE_ID, id);
registry.remove(id);
@@ -405,7 +405,7 @@ public class TestFSPackageRegistry exten
@Test
public void testPackages() throws IOException, PackageException {
assertTrue("initially the packages set is empty", registry.packages().isEmpty());
- registry.register(getStream("testpackages/tmp.zip"), false);
+ registry.register(getStream("/test-packages/tmp.zip"), false);
assertEquals("packages contains 1 element", 1, registry.packages().size());
assertTrue("contains new package", registry.packages().contains(TMP_PACKAGE_ID));
}
@@ -540,7 +540,7 @@ public class TestFSPackageRegistry exten
@Test
public void testExtractSubPackage() throws IOException, PackageException, RepositoryException {
- registry.register(getStream("testpackages/subtest.zip"), false);
+ registry.register(getStream("/test-packages/subtest.zip"), false);
assertTrue(registry.contains(PACKAGE_ID_SUB_A));
assertTrue(registry.contains(PACKAGE_ID_SUB_B));
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestGroupMergePackage.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestGroupMergePackage.java?rev=1870009&r1=1870008&r2=1870009&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestGroupMergePackage.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestGroupMergePackage.java Tue Nov 19 08:52:27 2019
@@ -64,7 +64,7 @@ public class TestGroupMergePackage exten
assertNull("test-group must not exist", mgr.getAuthorizable("test-group"));
assertNull("test-user-a must not exist", mgr.getAuthorizable("test-user-a"));
- JcrPackage pack = packMgr.upload(getStream("testpackages/group_with_a.zip"), false);
+ JcrPackage pack = packMgr.upload(getStream("/test-packages/group_with_a.zip"), false);
assertNotNull(pack);
pack.install(getDefaultOptions());
@@ -89,11 +89,11 @@ public class TestGroupMergePackage exten
assertNull("test-user-b must not exist", mgr.getAuthorizable("test-user-b"));
assertNull("test-user-c must not exist", mgr.getAuthorizable("test-user-c"));
- JcrPackage pack = packMgr.upload(getStream("testpackages/group_with_a.zip"), false);
+ JcrPackage pack = packMgr.upload(getStream("/test-packages/group_with_a.zip"), false);
assertNotNull(pack);
pack.install(getDefaultOptions());
- pack = packMgr.upload(getStream("testpackages/group_with_bc.zip"), false);
+ pack = packMgr.upload(getStream("/test-packages/group_with_bc.zip"), false);
assertNotNull(pack);
pack.install(getDefaultOptions());
assertABC(mgr);
@@ -112,11 +112,11 @@ public class TestGroupMergePackage exten
assertNull("test-user-b must not exist", mgr.getAuthorizable("test-user-b"));
assertNull("test-user-c must not exist", mgr.getAuthorizable("test-user-c"));
- JcrPackage pack = packMgr.upload(getStream("testpackages/group_with_bc.zip"), false);
+ JcrPackage pack = packMgr.upload(getStream("/test-packages/group_with_bc.zip"), false);
assertNotNull(pack);
pack.install(getDefaultOptions());
- pack = packMgr.upload(getStream("testpackages/group_with_a_moved.zip"), false);
+ pack = packMgr.upload(getStream("/test-packages/group_with_a_moved.zip"), false);
assertNotNull(pack);
pack.install(getDefaultOptions());
assertABC(mgr);
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestImportMode.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestImportMode.java?rev=1870009&r1=1870008&r2=1870009&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestImportMode.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestImportMode.java Tue Nov 19 08:52:27 2019
@@ -43,7 +43,7 @@ public class TestImportMode extends Inte
assertNodeExists("/tmp/foo/old");
assertNodeMissing("/tmp/foo/bar");
- JcrPackage pack = packMgr.upload(getStream("testpackages/tmp_mode_replace.zip"), false);
+ JcrPackage pack = packMgr.upload(getStream("/test-packages/tmp_mode_replace.zip"), false);
pack.extract(getDefaultOptions());
assertNodeMissing("/tmp/foo/old");
@@ -65,7 +65,7 @@ public class TestImportMode extends Inte
assertNodeExists("/tmp/foo/old");
assertNodeMissing("/tmp/foo/new");
- JcrPackage pack = packMgr.upload(getStream("testpackages/tmp_mode_merge.zip"), false);
+ JcrPackage pack = packMgr.upload(getStream("/test-packages/tmp_mode_merge.zip"), false);
pack.extract(getDefaultOptions());
assertNodeExists("/tmp/foo/old");
@@ -88,7 +88,7 @@ public class TestImportMode extends Inte
assertNodeExists("/tmp/foo/old");
assertNodeMissing("/tmp/foo/new");
- JcrPackage pack = packMgr.upload(getStream("testpackages/tmp_mode_update.zip"), false);
+ JcrPackage pack = packMgr.upload(getStream("/test-packages/tmp_mode_update.zip"), false);
pack.extract(getDefaultOptions());
assertNodeExists("/tmp/foo/old");
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestManifestCreationExport.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestManifestCreationExport.java?rev=1870009&r1=1870008&r2=1870009&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestManifestCreationExport.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestManifestCreationExport.java Tue Nov 19 08:52:27 2019
@@ -42,7 +42,7 @@ public class TestManifestCreationExport
@Test
public void exportPackageCreatesManifest() throws RepositoryException, IOException, PackageException {
- JcrPackage pack = packMgr.upload(getStream("testpackages/tmp_foo_bar_test.zip"), false);
+ JcrPackage pack = packMgr.upload(getStream("/test-packages/tmp_foo_bar_test.zip"), false);
assertNotNull(pack);
pack.extract(getDefaultOptions());
assertNodeExists("/tmp/foo/bar/test.txt");
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestMappedExport.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestMappedExport.java?rev=1870009&r1=1870008&r2=1870009&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestMappedExport.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestMappedExport.java Tue Nov 19 08:52:27 2019
@@ -43,7 +43,7 @@ public class TestMappedExport extends In
@Test
public void exportMapped() throws RepositoryException, IOException, PackageException {
- JcrPackage pack = packMgr.upload(getStream("testpackages/tmp_foo_bar_test.zip"), false);
+ JcrPackage pack = packMgr.upload(getStream("/test-packages/tmp_foo_bar_test.zip"), false);
assertNotNull(pack);
pack.extract(getDefaultOptions());
assertNodeExists("/tmp/foo/bar/test.txt");