SLING-5209: have all distribution package data under a common tree
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1711029 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 59c0a7b..9a74f5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -280,6 +280,7 @@
<sling.additional.bundle.1>httpcore-osgi</sling.additional.bundle.1>
<sling.additional.bundle.2>httpclient-osgi</sling.additional.bundle.2>
+ <sling.additional.bundle.30>org.apache.sling.jcr.resource</sling.additional.bundle.30>
<sling.additional.bundle.3>org.apache.sling.discovery.impl</sling.additional.bundle.3>
<sling.additional.bundle.4>org.apache.sling.hc.core</sling.additional.bundle.4>
<sling.additional.bundle.5>org.apache.jackrabbit.vault</sling.additional.bundle.5>
@@ -320,6 +321,12 @@
<version>1.0.12</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.jcr.resource</artifactId>
+ <version>2.3.12</version>
+ <scope>provided</scope>
+ </dependency>
<!-- FILEVAULT -->
<dependency>
<groupId>org.apache.jackrabbit.vault</groupId>
diff --git a/src/test/java/org/apache/sling/distribution/it/DistributionIntegrationTestBase.java b/src/test/java/org/apache/sling/distribution/it/DistributionIntegrationTestBase.java
index f50c662..0e2be7b 100644
--- a/src/test/java/org/apache/sling/distribution/it/DistributionIntegrationTestBase.java
+++ b/src/test/java/org/apache/sling/distribution/it/DistributionIntegrationTestBase.java
@@ -126,16 +126,13 @@
public static void checkNoPackagesLeft() throws IOException, JSONException {
- assertEmptyFolder(author, authorClient, "/var/sling/distribution/packages");
+ assertEmptyFolder(author, authorClient, "/var/sling/distribution/packages/vlt/shared");
+ assertEmptyFolder(author, authorClient, "/var/sling/distribution/packages/vlt/data");
assertEmptyFolder(author, authorClient, "/etc/packages/sling/distribution");
- assertEmptyFolder(author, authorClient, "/var/sling/distribution/jcrpackages");
-
- assertEmptyFolder(publish, publishClient, "/var/sling/distribution/packages");
+ assertEmptyFolder(author, authorClient, "/var/sling/distribution/packages/vlt/shared");
+ assertEmptyFolder(author, authorClient, "/var/sling/distribution/packages/vlt/data");
assertEmptyFolder(publish, publishClient, "/etc/packages/sling/distribution");
- assertEmptyFolder(publish, publishClient, "/var/sling/distribution/jcrpackages");
-
-
}
}
diff --git a/src/test/java/org/apache/sling/distribution/it/DistributionPackageExporterImporterTemporaryFoldersTest.java b/src/test/java/org/apache/sling/distribution/it/DistributionPackageExporterImporterTemporaryFoldersTest.java
index 2fc4dc6..13f408c 100644
--- a/src/test/java/org/apache/sling/distribution/it/DistributionPackageExporterImporterTemporaryFoldersTest.java
+++ b/src/test/java/org/apache/sling/distribution/it/DistributionPackageExporterImporterTemporaryFoldersTest.java
@@ -40,15 +40,14 @@
@Test
public void testAddExportImportTemp() throws Exception {
- List<String> jcrPackages = getChildrenForFolder(publish, "/var/sling/distribution/jcrpackages");
- assertEquals(0, jcrPackages.size());
+ List<String> jcrPackages = null;
String nodePath = createRandomNode(publishClient, "/content/export_" + System.nanoTime());
assertExists(publishClient, nodePath);
distribute(publish, "temp", DistributionRequestType.ADD, nodePath);
- jcrPackages = getChildrenForFolder(publish, "/var/sling/distribution/jcrpackages");
+ jcrPackages = getChildrenForFolder(publish, "/var/sling/distribution/packages/tempvlt/data");
assertEquals(1, jcrPackages.size());
publishClient.delete(nodePath);
@@ -56,7 +55,7 @@
String content = doExport(publish, "temp", DistributionRequestType.PULL);
- jcrPackages = getChildrenForFolder(publish, "/var/sling/distribution/jcrpackages");
+ jcrPackages = getChildrenForFolder(publish, "/var/sling/distribution/packages/tempvlt/data");
assertEquals(0, jcrPackages.size());
doImport(publish, "temp", content.getBytes(HTTP.DEFAULT_CONTENT_CHARSET));
