Author: kwin
Date: Thu Apr 6 10:51:26 2017
New Revision: 1790374
URL: http://svn.apache.org/viewvc?rev=1790374&view=rev
Log:
SLING-6618 include filevault 3.1.38 (and transitive dependencies) and always
explicitly specify the default workspace name
Added:
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/jcr/
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/jcr/RepositoryUtilsTest.java
(with props)
Modified:
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/jcr/RepositoryUtils.java
sling/trunk/tooling/ide/vlt-wrapper/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/vlt-wrapper/build.properties
sling/trunk/tooling/ide/vlt-wrapper/pom.xml
Added:
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/jcr/RepositoryUtilsTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/jcr/RepositoryUtilsTest.java?rev=1790374&view=auto
==============================================================================
---
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/jcr/RepositoryUtilsTest.java
(added)
+++
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/jcr/RepositoryUtilsTest.java
Thu Apr 6 10:51:26 2017
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+package org.apache.sling.ide.jcr;
+
+import java.net.URISyntaxException;
+
+import org.apache.jackrabbit.vault.fs.api.RepositoryAddress;
+import org.apache.sling.ide.jcr.RepositoryUtils;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class RepositoryUtilsTest {
+
+ @Test
+ public void testWebDavUrlLocationForAEM() throws URISyntaxException {
+ // make sure AEM url contains workspace name
+ String url = "http://localhost:4502/"; +
RepositoryUtils.WEBDAV_URL_LOCATIONS[1];
+ RepositoryAddress address = new RepositoryAddress(url);
+ // make sure the workspace name is correctly extracted
+ Assert.assertEquals("crx.default", address.getWorkspace());
+ }
+
+ @Test
+ public void testWebDavUrlLocationForSling() throws URISyntaxException {
+ // make sure AEM url contains workspace name
+ String url = "http://localhost:4502/"; +
RepositoryUtils.WEBDAV_URL_LOCATIONS[0];
+ RepositoryAddress address = new RepositoryAddress(url);
+ // make sure the workspace name is correctly extracted
+ Assert.assertEquals("default", address.getWorkspace());
+ }
+}
Propchange:
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/jcr/RepositoryUtilsTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/jcr/RepositoryUtils.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/jcr/RepositoryUtils.java?rev=1790374&r1=1790373&r2=1790374&view=diff
==============================================================================
---
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/jcr/RepositoryUtils.java
(original)
+++
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/jcr/RepositoryUtils.java
Thu Apr 6 10:51:26 2017
@@ -36,7 +36,15 @@ import org.apache.sling.ide.transport.Re
public abstract class RepositoryUtils {
private static final Object SYNC = new Object();
- private static final String[] WEBDAV_URL_LOCATIONS = new String[] {
"server/-/jcr:root", "crx/-/jcr:root" };
+ /**
+ * Path of DavEx server (by default listens on {@code /server}, for AEM
below {@code /crx/server}), followed by workspace name.
+ * Must not start with a slash.
+ * Always give explicit workspace name to workaround the faulty fix from
https://issues.apache.org/jira/browse/JCRVLT-144.
+ * The original issue is https://issues.apache.org/jira/browse/JCR-4120,
as soon as that one is fixed,
+ * the default workspace name does no longer need to be explicitly listed
here.
+ * @see RepositoryAddress
+ */
+ static final String[] WEBDAV_URL_LOCATIONS = new String[] {
"server/default/jcr:root", "crx/server/crx.default/jcr:root" };
private static final RepositoryFactory FACTORY = new
DAVExRepositoryFactory();
private static final Map<RepositoryAddress, Repository>
REGISTERED_REPOSITORIES = new HashMap<>();
Modified: sling/trunk/tooling/ide/vlt-wrapper/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/vlt-wrapper/META-INF/MANIFEST.MF?rev=1790374&r1=1790373&r2=1790374&view=diff
==============================================================================
--- sling/trunk/tooling/ide/vlt-wrapper/META-INF/MANIFEST.MF (original)
+++ sling/trunk/tooling/ide/vlt-wrapper/META-INF/MANIFEST.MF Thu Apr 6
10:51:26 2017
@@ -5,18 +5,21 @@ Bundle-Version: 1.1.1.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ClassPath: .,
- lib/org.apache.jackrabbit.vault-3.1.30.jar,
- lib/vault-davex-3.1.30.jar,
+ lib/org.apache.jackrabbit.vault-3.1.38.jar,
+ lib/vault-davex-3.1.38.jar,
lib/jcr-2.0.jar,
lib/guava-15.0.jar,
- lib/jackrabbit-api-2.11.3.jar,
- lib/jackrabbit-spi2dav-2.11.3.jar,
- lib/jackrabbit-spi-2.11.3.jar,
- lib/jackrabbit-jcr-client-2.11.3.jar,
- lib/jackrabbit-jcr2spi-2.11.3.jar,
- lib/jackrabbit-jcr-commons-2.11.3.jar,
- lib/jackrabbit-spi-commons-2.11.3.jar,
- lib/jackrabbit-webdav-2.11.3.jar
+ lib/jackrabbit-api-2.14.0.jar,
+ lib/jackrabbit-spi2dav-2.14.0.jar,
+ lib/jackrabbit-spi-2.14.0.jar,
+ lib/jackrabbit-jcr-client-2.14.0.jar,
+ lib/jackrabbit-jcr2spi-2.14.0.jar,
+ lib/jackrabbit-jcr-commons-2.14.0.jar,
+ lib/jackrabbit-spi-commons-2.14.0.jar,
+ lib/jackrabbit-webdav-2.14.0.jar,
+ lib/httpmime-4.5.3.jar,
+ lib/httpclient-4.5.3.jar,
+ lib/httpcore-4.4.6.jar
Export-Package: javax.jcr,
javax.jcr.nodetype,
org.apache.jackrabbit.api,
@@ -44,18 +47,13 @@ Export-Package: javax.jcr,
org.apache.jackrabbit.vault.util.xml.xerces.xni,
org.apache.jackrabbit.vault.util.xml.xerces.xni.parser
Require-Bundle: org.eclipse.core.runtime
-Import-Package: org.apache.commons.httpclient;version="3.1.0",
- org.apache.commons.httpclient.auth;version="3.1.0",
- org.apache.commons.httpclient.methods;version="3.1.0",
- org.apache.commons.httpclient.methods.multipart;version="3.1.0",
- org.apache.commons.httpclient.params;version="3.1.0",
- org.apache.commons.httpclient.util;version="3.1.0",
- org.apache.commons.collections,
+Import-Package: org.apache.commons.collections,
org.apache.commons.collections.map,
org.apache.commons.collections.list,
org.apache.commons.collections.iterators,
org.apache.commons.logging,
org.apache.commons.codec,
+ org.apache.commons.codec.binary,
org.apache.commons.io,
org.apache.commons.io.output,
org.osgi.framework,
Modified: sling/trunk/tooling/ide/vlt-wrapper/build.properties
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/vlt-wrapper/build.properties?rev=1790374&r1=1790373&r2=1790374&view=diff
==============================================================================
--- sling/trunk/tooling/ide/vlt-wrapper/build.properties (original)
+++ sling/trunk/tooling/ide/vlt-wrapper/build.properties Thu Apr 6 10:51:26
2017
@@ -1,15 +1,18 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- lib/org.apache.jackrabbit.vault-3.1.30.jar,\
- lib/vault-davex-3.1.30.jar,\
+ lib/org.apache.jackrabbit.vault-3.1.38.jar,\
+ lib/vault-davex-3.1.38.jar,\
lib/jcr-2.0.jar,\
lib/guava-15.0.jar,\
- lib/jackrabbit-api-2.11.3.jar,\
- lib/jackrabbit-spi2dav-2.11.3.jar,\
- lib/jackrabbit-spi-2.11.3.jar,\
- lib/jackrabbit-jcr-client-2.11.3.jar,\
- lib/jackrabbit-jcr2spi-2.11.3.jar,\
- lib/jackrabbit-jcr-commons-2.11.3.jar,\
- lib/jackrabbit-spi-commons-2.11.3.jar,\
- lib/jackrabbit-webdav-2.11.3.jar
+ lib/jackrabbit-api-2.14.0.jar,\
+ lib/jackrabbit-spi2dav-2.14.0.jar,\
+ lib/jackrabbit-spi-2.14.0.jar,\
+ lib/jackrabbit-jcr-client-2.14.0.jar,\
+ lib/jackrabbit-jcr2spi-2.14.0.jar,\
+ lib/jackrabbit-jcr-commons-2.14.0.jar,\
+ lib/jackrabbit-spi-commons-2.14.0.jar,\
+ lib/jackrabbit-webdav-2.14.0.jar,\
+ lib/httpmime-4.5.3.jar,\
+ lib/httpclient-4.5.3.jar,\
+ lib/httpcore-4.4.6.jar
Modified: sling/trunk/tooling/ide/vlt-wrapper/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/vlt-wrapper/pom.xml?rev=1790374&r1=1790373&r2=1790374&view=diff
==============================================================================
--- sling/trunk/tooling/ide/vlt-wrapper/pom.xml (original)
+++ sling/trunk/tooling/ide/vlt-wrapper/pom.xml Thu Apr 6 10:51:26 2017
@@ -17,55 +17,55 @@
-->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.sling.ide</groupId>
- <artifactId>reactor</artifactId>
- <version>1.1.1-SNAPSHOT</version>
- </parent>
- <artifactId>org.apache.sling.ide.vlt-wrapper</artifactId>
- <packaging>eclipse-plugin</packaging>
- <name>Sling IDE Tools: FileVault wrapper</name>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.sling.ide</groupId>
+ <artifactId>reactor</artifactId>
+ <version>1.1.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.apache.sling.ide.vlt-wrapper</artifactId>
+ <packaging>eclipse-plugin</packaging>
+ <name>Sling IDE Tools: FileVault wrapper</name>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/ide/vlt-wrapper</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/ide/vlt-wrapper</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/tooling/ide/vlt-wrapper</url>
- </scm>
- <build>
- <!-- ensure that extra files are picked up by the maven-source-plugin -->
- <resources>
- <resource>
- <directory>.</directory>
- <includes>
- <include>build.properties</include>
- <include>META-INF/*</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>lib</directory>
- <includes>
- <include>**/*.jar</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/ide/vlt-wrapper</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/ide/vlt-wrapper</developerConnection>
+
<url>http://svn.apache.org/viewvc/sling/trunk/tooling/ide/vlt-wrapper</url>
+ </scm>
+ <build>
+ <!-- ensure that extra files are picked up by the maven-source-plugin
-->
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>build.properties</include>
+ <include>META-INF/*</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>lib</directory>
+ <includes>
+ <include>**/*.jar</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -78,7 +78,7 @@
<version>2.0</version>
</artifactItem>
<!-- END JCR dependencies -->
-
+
<!-- START Apache Jackrabbit dependencies -->
<artifactItem>
<groupId>org.apache.jackrabbit</groupId>
@@ -100,7 +100,7 @@
<artifactId>jackrabbit-jcr-commons</artifactId>
<version>${jackrabbit.version}</version>
</artifactItem>
- <!-- transitive dependency of jackrabbit-jcr-commons
-->
+ <!-- transitive dependency of jackrabbit-jcr-commons
-->
<artifactItem>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -126,8 +126,23 @@
<artifactId>jackrabbit-spi2dav</artifactId>
<version>${jackrabbit.version}</version>
</artifactItem>
+ <artifactItem>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <version>4.5.3</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5.3</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.4.6</version>
+ </artifactItem>
<!-- END Apache Jackrabbit dependencies -->
-
+
<!-- START Apache Jackrabbit FileVault dependencies -->
<artifactItem>
<groupId>org.apache.jackrabbit.vault</groupId>
@@ -139,8 +154,8 @@
<artifactId>org.apache.jackrabbit.vault</artifactId>
<version>${vault.version}</version>
</artifactItem>
- <!-- END Apache Jackrabbit FileVault dependencies -->
-
+ <!-- END Apache Jackrabbit FileVault dependencies -->
+
</artifactItems>
<outputDirectory>lib</outputDirectory>
</configuration>
@@ -157,7 +172,7 @@
<properties>
<!-- must match the version being referenced in the pom.xml of
filevault -->
- <jackrabbit.version>2.11.3</jackrabbit.version>
- <vault.version>3.1.30</vault.version>
+ <jackrabbit.version>2.14.0</jackrabbit.version>
+ <vault.version>3.1.38</vault.version>
</properties>
</project>
