Author: rombert
Date: Fri Aug 16 15:52:46 2013
New Revision: 1514761
URL: http://svn.apache.org/r1514761
Log:
SLING-2989 - [Tooling] integrate with vlt once available
Create a vlt-wrapper bundle which wraps and re-export the
org.apache.jackrabbit.vault.* packages, and also javax.jcr.
Added:
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/META-INF/
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/META-INF/MANIFEST.MF
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/build.properties
(with props)
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-jcr-client-2.4.0.jar
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-jcr-commons-2.4.0.jar
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-jcr2spi-2.4.0.jar
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-spi-2.4.0.jar
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-spi-commons-2.4.0.jar
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-spi2dav-2.4.0.jar
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-webdav-2.4.0.jar
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jcr-2.0.jar
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/org.apache.jackrabbit.vault-3.0.0-SNAPSHOT.jar
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/vault-davex-3.0.0-SNAPSHOT.jar
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/pom.xml (with
props)
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/pom.xml
sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target
Modified: sling/branches/tooling-ide-vlt/tooling/ide/pom.xml
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/pom.xml?rev=1514761&r1=1514760&r2=1514761&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/pom.xml (original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/pom.xml Fri Aug 16 15:52:46 2013
@@ -13,6 +13,7 @@
<module>api</module>
<module>impl-resource</module>
<module>impl-resource-test</module>
+ <module>vlt-wrapper</module>
<module>eclipse-core</module>
<module>eclipse-ui</module>
<module>feature</module>
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target?rev=1514761&r1=1514760&r2=1514761&view=diff
==============================================================================
---
sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target
Fri Aug 16 15:52:46 2013
@@ -1,17 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Sling IDE Tools" sequenceNumber="8">
+<?pde version="3.8"?><target name="Sling IDE Tools" sequenceNumber="11">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false"
includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
-<unit id="org.json" version="1.0.0.v201011060100"/>
-<repository
location="http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false"
includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.wst.server_adapters.feature.feature.group"
version="3.2.100.v20110303-51EoAkF77g8HBSc"/>
<unit id="org.eclipse.jdt.feature.group"
version="3.7.2.v20120120-1414-7z8gFcuFMP7BW5XTz0jLTnz0l9B1"/>
<unit id="org.eclipse.platform.feature.group"
version="3.7.2.v20120207-1839-9gF7UHPDFxGjd-PqDr2jX_4yKaumkoHTz04_q-q"/>
<unit id="org.eclipse.jst.enterprise_ui.feature.feature.group"
version="3.3.2.v201111030500-7b7II1YFSK2WIuPRDEnExPV-RvTn"/>
<repository location="http://download.eclipse.org/releases/indigo"/>
</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false"
includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.json" version="1.0.0.v201011060100"/>
+<unit id="org.slf4j.api" version="1.6.4.v20120130-2120"/>
+<unit id="ch.qos.logback.slf4j" version="1.0.0.v20120123-1500"/>
+<unit id="org.apache.commons.collections" version="3.2.0.v201005080500"/>
+<unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
+<repository
location="http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository"/>
+</location>
</locations>
</target>
Added:
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/META-INF/MANIFEST.MF?rev=1514761&view=auto
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/META-INF/MANIFEST.MF
(added)
+++ sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/META-INF/MANIFEST.MF
Fri Aug 16 15:52:46 2013
@@ -0,0 +1,47 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.apache.sling.ide.vlt-wrapper
+Bundle-Version: 0.0.1.qualifier
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ClassPath: .,
+ lib/org.apache.jackrabbit.vault-3.0.0-SNAPSHOT.jar,
+ lib/jcr-2.0.jar,
+ lib/vault-davex-3.0.0-SNAPSHOT.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,
+ 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",
+ org.apache.commons.httpclient.methods;version="3.1.0",
+ org.apache.commons.httpclient.params;version="3.1.0",
+ org.apache.commons.collections.map,
+ org.apache.commons.collections.list,
+ org.osgi.framework,
+ org.slf4j
Added: sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/build.properties
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/build.properties?rev=1514761&view=auto
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/build.properties
(added)
+++ sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/build.properties Fri
Aug 16 15:52:46 2013
@@ -0,0 +1,14 @@
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ lib/org.apache.jackrabbit.vault-3.0.0-SNAPSHOT.jar,\
+ lib/jcr-2.0.jar,\
+ lib/vault-davex-3.0.0-SNAPSHOT.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
+source.. = src/
Propchange:
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/build.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added:
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-jcr-client-2.4.0.jar
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-jcr-client-2.4.0.jar?rev=1514761&view=auto
==============================================================================
Files
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-jcr-client-2.4.0.jar
(added) and
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-jcr-client-2.4.0.jar
Fri Aug 16 15:52:46 2013 differ
Added:
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-jcr-commons-2.4.0.jar
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-jcr-commons-2.4.0.jar?rev=1514761&view=auto
==============================================================================
Files
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-jcr-commons-2.4.0.jar
(added) and
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-jcr-commons-2.4.0.jar
Fri Aug 16 15:52:46 2013 differ
Added:
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-jcr2spi-2.4.0.jar
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-jcr2spi-2.4.0.jar?rev=1514761&view=auto
==============================================================================
Files
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-jcr2spi-2.4.0.jar
(added) and
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-jcr2spi-2.4.0.jar
Fri Aug 16 15:52:46 2013 differ
Added:
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-spi-2.4.0.jar
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-spi-2.4.0.jar?rev=1514761&view=auto
==============================================================================
Files
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-spi-2.4.0.jar
(added) and
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-spi-2.4.0.jar
Fri Aug 16 15:52:46 2013 differ
Added:
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-spi-commons-2.4.0.jar
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-spi-commons-2.4.0.jar?rev=1514761&view=auto
==============================================================================
Files
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-spi-commons-2.4.0.jar
(added) and
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-spi-commons-2.4.0.jar
Fri Aug 16 15:52:46 2013 differ
Added:
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-spi2dav-2.4.0.jar
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-spi2dav-2.4.0.jar?rev=1514761&view=auto
==============================================================================
Files
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-spi2dav-2.4.0.jar
(added) and
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-spi2dav-2.4.0.jar
Fri Aug 16 15:52:46 2013 differ
Added:
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-webdav-2.4.0.jar
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-webdav-2.4.0.jar?rev=1514761&view=auto
==============================================================================
Files
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-webdav-2.4.0.jar
(added) and
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-webdav-2.4.0.jar
Fri Aug 16 15:52:46 2013 differ
Added: sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jcr-2.0.jar
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jcr-2.0.jar?rev=1514761&view=auto
==============================================================================
Files sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jcr-2.0.jar
(added) and
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jcr-2.0.jar Fri Aug
16 15:52:46 2013 differ
Added:
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/org.apache.jackrabbit.vault-3.0.0-SNAPSHOT.jar
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/org.apache.jackrabbit.vault-3.0.0-SNAPSHOT.jar?rev=1514761&view=auto
==============================================================================
Files
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/org.apache.jackrabbit.vault-3.0.0-SNAPSHOT.jar
(added) and
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/org.apache.jackrabbit.vault-3.0.0-SNAPSHOT.jar
Fri Aug 16 15:52:46 2013 differ
Added:
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/vault-davex-3.0.0-SNAPSHOT.jar
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/vault-davex-3.0.0-SNAPSHOT.jar?rev=1514761&view=auto
==============================================================================
Files
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/vault-davex-3.0.0-SNAPSHOT.jar
(added) and
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/vault-davex-3.0.0-SNAPSHOT.jar
Fri Aug 16 15:52:46 2013 differ
Added: sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/pom.xml
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/pom.xml?rev=1514761&view=auto
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/pom.xml (added)
+++ sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/pom.xml Fri Aug 16
15:52:46 2013
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>0.0.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.apache.sling.ide.vlt-wrapper</artifactId>
+ <packaging>eclipse-plugin</packaging>
+ <name>Sling IDE Tools: FileVault wrapper</name>
+
+ <profiles>
+ <profile>
+ <id>refresh-embedded-deps</id>
+ <!--
+ We embed most dependencies required by vlt since they are not
available in a p2 repo
+ To refresh them, execute
+ mvn -pl vlt-wrapper -Prefresh-embedded-deps dependency:copy
+
+ Those dependencies which are available as bundles (
commons-collections, commons-httpclient etc )
+ need to be managed using the bundle's manifest.
+
+ -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <artifactItems>
+ <!-- START JCR dependencies -->
+ <artifactItem>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>2.0</version>
+ </artifactItem>
+ <!-- END JCR dependencies -->
+
+ <!-- START Apache Jackrabbit dependencies -->
+ <artifactItem>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-webdav</artifactId>
+ <version>${jackrabbit.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.jackrabbit</groupId>
+
<artifactId>jackrabbit-spi-commons</artifactId>
+ <version>${jackrabbit.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.jackrabbit</groupId>
+
<artifactId>jackrabbit-jcr-commons</artifactId>
+ <version>${jackrabbit.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr2spi</artifactId>
+ <version>${jackrabbit.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.jackrabbit</groupId>
+
<artifactId>jackrabbit-jcr-client</artifactId>
+ <version>${jackrabbit.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-spi</artifactId>
+ <version>${jackrabbit.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-spi2dav</artifactId>
+ <version>${jackrabbit.version}</version>
+ </artifactItem>
+ <!-- END Apache Jackrabbit dependencies -->
+
+ <!-- START Apache Jackrabbit FileVault
dependencies -->
+ <artifactItem>
+
<groupId>org.apache.jackrabbit.vault</groupId>
+ <artifactId>vault-davex</artifactId>
+ <version>${vault.version}</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.jackrabbit.vault</groupId>
+
<artifactId>org.apache.jackrabbit.vault</artifactId>
+ <version>${vault.version}</version>
+ </artifactItem>
+ <!-- END Apache Jackrabbit FileVault
dependencies -->
+
+ </artifactItems>
+ <outputDirectory>lib</outputDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <properties>
+ <jackrabbit.version>2.4.0</jackrabbit.version>
+ <vault.version>3.0.0-SNAPSHOT</vault.version>
+ </properties>
+</project>
Propchange: sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
