You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2017/01/10 23:00:33 UTC
svn commit: r1778218 - in /sling/trunk/tooling/ide:
impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/
impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/
impl-vlt/META-INF/ impl-vlt/src/org/apache/sling/...
Author: kwin
Date: Tue Jan 10 23:00:33 2017
New Revision: 1778218
URL: http://svn.apache.org/viewvc?rev=1778218&view=rev
Log:
SLING-6368 - rely on FileVaults DocViewProperty and DocViewNode for the deserialization of vlt files.
Update to newest Jackrabbit FileVault and transitive dependencies.
This fixes the issue with escaped character not properly being resolved.
Added:
sling/trunk/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/escaped-value-in-property.xml (with props)
Modified:
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java
sling/trunk/tooling/ide/impl-vlt/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandler.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
Modified: sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java?rev=1778218&r1=1778217&r2=1778218&view=diff
==============================================================================
--- sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java (original)
+++ sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java Tue Jan 10 23:00:33 2017
@@ -180,6 +180,14 @@ public class ContentXmlHandlerTest {
}
@Test
+ public void parseContentXmlWithEscapedValues() throws ParserConfigurationException, SAXException, IOException {
+ ResourceProxy root = parseContentXmlFile("escaped-value-in-property.xml", "/");
+
+ assertThat(root.getProperties(), hasEntry("property",
+ (Object) "{\"template\":\"<p class=\\\"contexthub-module-line1\\\">\"}"));
+ }
+
+ @Test
public void escapedBraceAtStartOfPropertyValue() throws Exception {
ResourceProxy root = parseContentXmlFile("escaped-braces-at-start-of-property.xml", "/");
Added: sling/trunk/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/escaped-value-in-property.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/escaped-value-in-property.xml?rev=1778218&view=auto
==============================================================================
--- sling/trunk/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/escaped-value-in-property.xml (added)
+++ sling/trunk/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/escaped-value-in-property.xml Tue Jan 10 23:00:33 2017
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+ jcr:primaryType="nt:unstructured"
+ property="\{"template":"<p class=\\"contexthub-module-line1\\">"}"/>
\ No newline at end of file
Propchange: sling/trunk/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/escaped-value-in-property.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: sling/trunk/tooling/ide/impl-vlt/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt/META-INF/MANIFEST.MF?rev=1778218&r1=1778217&r2=1778218&view=diff
==============================================================================
--- sling/trunk/tooling/ide/impl-vlt/META-INF/MANIFEST.MF (original)
+++ sling/trunk/tooling/ide/impl-vlt/META-INF/MANIFEST.MF Tue Jan 10 23:00:33 2017
@@ -9,6 +9,9 @@ Require-Bundle: org.eclipse.equinox.ds;b
Import-Package: javax.jcr,
javax.jcr.nodetype,
org.apache.commons.io;version="2.0.1",
+ org.apache.jackrabbit.api,
+ org.apache.jackrabbit.spi.commons.conversion,
+ org.apache.jackrabbit.spi.commons.namespace,
org.apache.jackrabbit.util,
org.apache.jackrabbit.vault.davex,
org.apache.jackrabbit.vault.fs,
Modified: sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandler.java?rev=1778218&r1=1778217&r2=1778218&view=diff
==============================================================================
--- sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandler.java (original)
+++ sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandler.java Tue Jan 10 23:00:33 2017
@@ -17,66 +17,113 @@
package org.apache.sling.ide.impl.vlt.serialization;
import java.math.BigDecimal;
-import java.util.ArrayList;
+import java.net.URISyntaxException;
import java.util.Calendar;
import java.util.Deque;
import java.util.EnumSet;
+import java.util.HashMap;
import java.util.LinkedList;
-import java.util.List;
+import java.util.Map;
import java.util.UUID;
+import javax.jcr.NamespaceException;
+import javax.jcr.PropertyType;
+
+import org.apache.jackrabbit.spi.commons.conversion.DefaultNamePathResolver;
+import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver;
import org.apache.jackrabbit.util.ISO8601;
import org.apache.jackrabbit.util.ISO9075;
+import org.apache.jackrabbit.vault.util.DocViewNode;
+import org.apache.jackrabbit.vault.util.DocViewProperty;
+import org.apache.sling.ide.impl.vlt.Activator;
import org.apache.sling.ide.transport.ResourceProxy;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
-// TODO - worth investigating whether we can properly use org.apache.jackrabbit.vault.util.DocViewProperty instead
-public class ContentXmlHandler extends DefaultHandler {
+public class ContentXmlHandler extends DefaultHandler implements NamespaceResolver {
private static final String JCR_ROOT = "jcr:root";
private final ResourceProxy root;
private final Deque<ResourceProxy> queue = new LinkedList<>();
+ /**
+ * map containing fully qualified uris as keys and their defined prefixes as values
+ */
+ private final Map<String, String> uriPrefixMap;
+
+ /**
+ * the default name path resolver
+ */
+ private final DefaultNamePathResolver npResolver = new DefaultNamePathResolver(this);
+
+ /**
+ * all type hint classes in a map (key = type integer value)
+ */
+ private static final Map<Integer, TypeHint> TYPE_HINT_MAP;
+
+ static {
+ TYPE_HINT_MAP = new HashMap<>();
+ for (TypeHint hint : EnumSet.allOf(TypeHint.class)) {
+ TYPE_HINT_MAP.put(hint.propertyType, hint);
+ }
+ }
+
public ContentXmlHandler(String rootResourcePath) {
root = new ResourceProxy(rootResourcePath);
+ uriPrefixMap = new HashMap<>();
+ }
+
+ @Override
+ public void startPrefixMapping(String prefix, String uri) throws SAXException {
+ uriPrefixMap.put(uri, prefix);
}
@Override
public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
ResourceProxy current;
- if (qName.equals(JCR_ROOT)) {
- current = root;
- } else {
- ResourceProxy parent = queue.peekLast();
-
- StringBuilder path = new StringBuilder(parent.getPath());
- if (path.charAt(path.length() - 1) != '/')
- path.append('/');
- path.append(qName);
+ // name is equal to label except for SNS
+ String label = ISO9075.decode(qName);
+ String name = label;
+ // code mostly taken from {@link org.apache.jackrabbit.vault.fs.impl.io.DocViewSaxImporter}
+ DocViewNode node;
+ try {
+ node = new DocViewNode(name, label, attributes, npResolver);
+
+ if (qName.equals(JCR_ROOT)) {
+ current = root;
+ } else {
+ ResourceProxy parent = queue.peekLast();
+ StringBuilder path = new StringBuilder(parent.getPath());
+ if (path.charAt(path.length() - 1) != '/')
+ path.append('/');
+ path.append(qName);
- current = new ResourceProxy(ISO9075.decode(path.toString()));
- parent.addChild(current);
- }
+ current = new ResourceProxy(ISO9075.decode(path.toString()));
+ parent.addChild(current);
+ }
- for (int i = 0; i < attributes.getLength(); i++) {
+ for (Map.Entry<String, DocViewProperty> entry : node.props.entrySet()) {
- String attributeQName = attributes.getQName(i);
- String value = attributes.getValue(i);
- Object typedValue = TypeHint.parsePossiblyTypedValue(value);
-
- // unsupported
- if (typedValue == null) {
- continue;
+ try {
+ Object typedValue = TypeHint.convertDocViewPropertyToTypedValue(entry.getValue());
+
+ // unsupported
+ if (typedValue == null) {
+ continue;
+ }
+ current.addProperty(entry.getKey(), typedValue);
+ } catch (Throwable t) {
+ Activator.getDefault().getPluginLogger().error("Could not parse property '" + entry.getValue().name, t);
+ }
}
- current.addProperty(attributeQName, typedValue);
+ queue.add(current);
+ } catch (NamespaceException e) {
+ Activator.getDefault().getPluginLogger().error("Could not resolve a JCR namespace.", e);
}
-
- queue.add(current);
}
@Override
@@ -89,15 +136,31 @@ public class ContentXmlHandler extends D
return root;
}
- // TODO - validate that this is comprehensive
+ /**
+ * Each enum implements the {@link TypeHint#parseValues(String[], boolean)} in a way, that the String[] value is converted to the closest underlying type.
+ */
static enum TypeHint {
- BINARY("Binary") {
+ UNDEFINED(PropertyType.UNDEFINED) {
+ Object parseValues(String[] values, boolean explicitMultiValue) {
+ return STRING.parseValues(values, explicitMultiValue);
+ }
+ },
+ STRING(PropertyType.STRING) {
+ Object parseValues(String[] values, boolean explicitMultiValue) {
+ if (values.length == 1 && !explicitMultiValue) {
+ return values[0];
+ } else {
+ return values;
+ }
+ }
+ },
+ BINARY(PropertyType.BINARY) {
@Override
Object parseValues(String[] values, boolean explicitMultiValue) {
return null;
}
},
- BOOLEAN("Boolean") {
+ BOOLEAN(PropertyType.BOOLEAN) {
@Override
Object parseValues(String[] values, boolean explicitMultiValue) {
if (values.length == 1 && !explicitMultiValue) {
@@ -109,10 +172,9 @@ public class ContentXmlHandler extends D
ret[i] = Boolean.parseBoolean(values[i]);
}
return ret;
-
}
},
- DATE("Date") {
+ DATE(PropertyType.DATE) {
@Override
Object parseValues(String[] values, boolean explicitMultiValue) {
@@ -127,7 +189,7 @@ public class ContentXmlHandler extends D
return ret;
}
},
- DOUBLE("Double") {
+ DOUBLE(PropertyType.DOUBLE) {
@Override
Object parseValues(String[] values, boolean explicitMultiValue) {
if (values.length == 1 && !explicitMultiValue) {
@@ -141,7 +203,7 @@ public class ContentXmlHandler extends D
return ret;
}
},
- LONG("Long") {
+ LONG(PropertyType.LONG) {
@Override
Object parseValues(String[] values, boolean explicitMultiValue) {
if (values.length == 1 && !explicitMultiValue) {
@@ -155,7 +217,7 @@ public class ContentXmlHandler extends D
return ret;
}
},
- DECIMAL("Decimal") {
+ DECIMAL(PropertyType.DECIMAL) {
@Override
Object parseValues(String[] values, boolean explicitMultiValue) {
if (values.length == 1 && !explicitMultiValue) {
@@ -169,21 +231,22 @@ public class ContentXmlHandler extends D
return ret;
}
},
- NAME("Name") {
+ NAME(PropertyType.NAME) {
@Override
Object parseValues(String[] values, boolean explicitMultiValue) {
+ if (values.length == 1 && !explicitMultiValue) {
+ return values[0];
+ }
return values;
}
},
- PATH("Path") {
-
+ PATH(PropertyType.PATH) {
@Override
Object parseValues(String[] values, boolean explicitMultiValue) {
return NAME.parseValues(values, explicitMultiValue);
}
-
},
- REFERENCE("Reference") {
+ REFERENCE(PropertyType.REFERENCE) {
@Override
Object parseValues(String[] values, boolean explicitMultiValue) {
if (values.length == 1 && !explicitMultiValue) {
@@ -200,116 +263,70 @@ public class ContentXmlHandler extends D
}
},
- WEAKREFERENCE("WeakReference") {
+ WEAKREFERENCE(PropertyType.WEAKREFERENCE) {
@Override
Object parseValues(String[] values, boolean explicitMultiValue) {
return REFERENCE.parseValues(values, explicitMultiValue);
}
-
- };
-
- static Object parsePossiblyTypedValue(String value) {
-
- boolean explicitMultiValue = false;
- String rawValue;
- int hintEnd = -1;
-
- if (value.isEmpty()) {
- return value;
- }
-
- if (value.charAt(0) != '{') {
- rawValue = value;
- } else {
- hintEnd = value.indexOf('}');
- rawValue = value.substring(hintEnd + 1);
- }
-
- String[] values;
-
- // SLING-3609
- if (rawValue.length()>0 && rawValue.charAt(0) == '[') {
-
- if (rawValue.charAt(rawValue.length() - 1) != ']') {
- throw new IllegalArgumentException("Invalid multi-valued property definition : '" + rawValue + "'");
- }
-
- String rawValues = rawValue.substring(1, rawValue.length() - 1);
- values = splitValues(rawValues);
- explicitMultiValue = true;
- } else {
- values = new String[] { rawValue };
- }
-
- // no hint -> string type
- if (hintEnd == -1) {
- unescape(values);
- if (values.length == 1 && !explicitMultiValue) {
- return values[0];
+ },
+ URI(PropertyType.URI) {
+ @Override
+ Object parseValues(String[] values, boolean explicitMultiValue) {
+ try {
+ if (values.length == 1 && !explicitMultiValue) {
+ return new java.net.URI(values[0]);
+ }
+
+ java.net.URI[] refs = new java.net.URI[values.length];
+ for (int i = 0; i < values.length; i++) {
+ String value = values[i];
+ refs[i] = new java.net.URI(value);
+ }
+ return refs;
+ } catch (URISyntaxException e) {
+ throw new IllegalArgumentException("Given value cannot be converted to URI", e);
}
- return values;
}
+ };
- String rawHint = value.substring(1, hintEnd);
-
- for (TypeHint hint : EnumSet.allOf(TypeHint.class)) {
- if (hint.rawHint.equals(rawHint)) {
- return hint.parseValues(values, explicitMultiValue);
- }
+ static Object convertDocViewPropertyToTypedValue(DocViewProperty property) {
+ TypeHint hint = TYPE_HINT_MAP.get(property.type);
+ if (hint == null) {
+ throw new IllegalArgumentException("Unknown type value '" + property.type + "'");
}
-
- throw new IllegalArgumentException("Unknown typeHint value '" + rawHint + "'");
+ return hint.parseValues(property.values, property.isMulti);
}
- private static String[] splitValues(String rawValues) {
-
- if ( rawValues.isEmpty() ) {
- return new String[0];
- }
-
- List<String> values = new ArrayList<>();
- String[] firstPass = rawValues.split(",");
- for ( int i = 0 ; i < firstPass.length; i++) {
-
- String val = firstPass[i];
-
- boolean trailingSlash = val.endsWith("\\");
- boolean moreEntries = i < firstPass.length;
-
- // special case where the comma is escaped, so this means that
- // two values should be joined
- if ( trailingSlash && moreEntries ) {
- // re-establish the value, e.g. first\,second becomes a single first,second entry
- values.add(val.substring(0, val.length() - 1) + "," + firstPass[i+1]);
- // manually advance the iteration couter since we consumed the next entry
- i++;
- continue;
- }
-
- values.add(val);
- }
-
- return values.toArray(new String[values.size()]);
-
- }
+ private final int propertyType;
- private static void unescape(String[] values) {
+ /**
+ *
+ * @param propertyType one of type values being defined in {@link javax.jcr.PropertyType}
+ */
+ private TypeHint(int propertyType) {
- for (int i = 0; i < values.length; i++) {
- if (values[i].length() > 0 && values[i].charAt(0) == '\\') {
- values[i] = values[i].substring(1);
- }
- }
+ this.propertyType = propertyType;
}
- private final String rawHint;
-
- private TypeHint(String rawHint) {
+ abstract Object parseValues(String[] values, boolean explicitMultiValue);
- this.rawHint = rawHint;
- }
+ }
- abstract Object parseValues(String[] values, boolean explicitMultiValue);
+ /**
+ * {@inheritDoc}
+ */
+ public String getURI(String prefix) throws NamespaceException {
+ throw new UnsupportedOperationException("The method getUri is not implemented as this is not being used");
+ }
+ /**
+ * {@inheritDoc}
+ */
+ public String getPrefix(String uri) throws NamespaceException {
+ String prefix = uriPrefixMap.get(uri);
+ if (prefix == null) {
+ throw new NamespaceException("Could not find defined prefix for uri " + uri);
+ }
+ return prefix;
}
}
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=1778218&r1=1778217&r2=1778218&view=diff
==============================================================================
--- sling/trunk/tooling/ide/vlt-wrapper/META-INF/MANIFEST.MF (original)
+++ sling/trunk/tooling/ide/vlt-wrapper/META-INF/MANIFEST.MF Tue Jan 10 23:00:33 2017
@@ -5,29 +5,44 @@ Bundle-Version: 1.1.1.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ClassPath: .,
- lib/org.apache.jackrabbit.vault-3.0.0.jar,
+ lib/org.apache.jackrabbit.vault-3.1.30.jar,
+ lib/vault-davex-3.1.30.jar,
lib/jcr-2.0.jar,
- lib/vault-davex-3.0.0.jar,
- lib/jackrabbit-spi2dav-2.4.0.jar,
- lib/jackrabbit-spi-2.4.0.jar,
- lib/jackrabbit-jcr-client-2.4.0.jar,
- lib/jackrabbit-jcr2spi-2.4.0.jar,
- lib/jackrabbit-jcr-commons-2.4.0.jar,
- lib/jackrabbit-spi-commons-2.4.0.jar,
- lib/jackrabbit-webdav-2.4.0.jar
-Export-Package: javax.jcr,javax.jcr.nodetype,org.apache.jackrabbit.uti
- l,org.apache.jackrabbit.vault.davex,org.apache.jackrabbit.vault.fs,or
- g.apache.jackrabbit.vault.fs.api,org.apache.jackrabbit.vault.fs.confi
- g,org.apache.jackrabbit.vault.fs.filter,org.apache.jackrabbit.vault.f
- s.impl,org.apache.jackrabbit.vault.fs.impl.aggregator,org.apache.jack
- rabbit.vault.fs.impl.io,org.apache.jackrabbit.vault.fs.impl.io.legacy
- cnd,org.apache.jackrabbit.vault.fs.io,org.apache.jackrabbit.vault.fs.
- spi,org.apache.jackrabbit.vault.fs.spi.impl.jcr20,org.apache.jackrabb
- it.vault.packaging,org.apache.jackrabbit.vault.packaging.impl,org.apa
- che.jackrabbit.vault.util,org.apache.jackrabbit.vault.util.xml.serial
- ize,org.apache.jackrabbit.vault.util.xml.xerces.dom,org.apache.jackra
- bbit.vault.util.xml.xerces.util,org.apache.jackrabbit.vault.util.xml.
- xerces.xni,org.apache.jackrabbit.vault.util.xml.xerces.xni.parser
+ 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
+Export-Package: javax.jcr,
+ javax.jcr.nodetype,
+ org.apache.jackrabbit.api,
+ org.apache.jackrabbit.spi.commons.conversion,
+ org.apache.jackrabbit.spi.commons.namespace,
+ org.apache.jackrabbit.util,
+ org.apache.jackrabbit.vault.davex,
+ org.apache.jackrabbit.vault.fs,
+ org.apache.jackrabbit.vault.fs.api,
+ org.apache.jackrabbit.vault.fs.config,
+ org.apache.jackrabbit.vault.fs.filter,
+ org.apache.jackrabbit.vault.fs.impl,
+ org.apache.jackrabbit.vault.fs.impl.aggregator,
+ org.apache.jackrabbit.vault.fs.impl.io,
+ org.apache.jackrabbit.vault.fs.impl.io.legacycnd,
+ org.apache.jackrabbit.vault.fs.io,
+ org.apache.jackrabbit.vault.fs.spi,
+ org.apache.jackrabbit.vault.fs.spi.impl.jcr20,
+ org.apache.jackrabbit.vault.packaging,
+ org.apache.jackrabbit.vault.packaging.impl,
+ org.apache.jackrabbit.vault.util,
+ org.apache.jackrabbit.vault.util.xml.serialize,
+ org.apache.jackrabbit.vault.util.xml.xerces.dom,
+ org.apache.jackrabbit.vault.util.xml.xerces.util,
+ 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",
Modified: sling/trunk/tooling/ide/vlt-wrapper/build.properties
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/vlt-wrapper/build.properties?rev=1778218&r1=1778217&r2=1778218&view=diff
==============================================================================
--- sling/trunk/tooling/ide/vlt-wrapper/build.properties (original)
+++ sling/trunk/tooling/ide/vlt-wrapper/build.properties Tue Jan 10 23:00:33 2017
@@ -1,13 +1,15 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- lib/org.apache.jackrabbit.vault-3.0.0.jar,\
+ lib/org.apache.jackrabbit.vault-3.1.30.jar,\
+ lib/vault-davex-3.1.30.jar,\
lib/jcr-2.0.jar,\
- lib/vault-davex-3.0.0.jar,\
- lib/jackrabbit-spi2dav-2.4.0.jar,\
- lib/jackrabbit-spi-2.4.0.jar,\
- lib/jackrabbit-jcr-client-2.4.0.jar,\
- lib/jackrabbit-jcr2spi-2.4.0.jar,\
- lib/jackrabbit-jcr-commons-2.4.0.jar,\
- lib/jackrabbit-spi-commons-2.4.0.jar,\
- lib/jackrabbit-webdav-2.4.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
Modified: sling/trunk/tooling/ide/vlt-wrapper/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/vlt-wrapper/pom.xml?rev=1778218&r1=1778217&r2=1778218&view=diff
==============================================================================
--- sling/trunk/tooling/ide/vlt-wrapper/pom.xml (original)
+++ sling/trunk/tooling/ide/vlt-wrapper/pom.xml Tue Jan 10 23:00:33 2017
@@ -45,6 +45,19 @@
</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>
@@ -69,6 +82,11 @@
<!-- START Apache Jackrabbit dependencies -->
<artifactItem>
<groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-api</artifactId>
+ <version>${jackrabbit.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-webdav</artifactId>
<version>${jackrabbit.version}</version>
</artifactItem>
@@ -82,6 +100,12 @@
<artifactId>jackrabbit-jcr-commons</artifactId>
<version>${jackrabbit.version}</version>
</artifactItem>
+ <!-- transitive dependency of jackrabbit-jcr-commons -->
+ <artifactItem>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>15.0</version>
+ </artifactItem>
<artifactItem>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr2spi</artifactId>
@@ -132,7 +156,8 @@
</build>
<properties>
- <jackrabbit.version>2.4.0</jackrabbit.version>
- <vault.version>3.0.0</vault.version>
+ <!-- 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>
</properties>
</project>