This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch feature/SLING-5618 in repository https://gitbox.apache.org/repos/asf/sling-ide-tooling.git
commit adb052307c99d3a21232eaab48b6b855c66b3cf9 Author: Robert Munteanu <[email protected]> AuthorDate: Mon Apr 16 23:56:31 2018 +0300 SLING-7585 - Fix Eclipse in-IDE errors after creating shared modules Move vlt-wrapper under shared/p2 . This artifact is only needed in Eclipse, where OSGi bundles need to come from p2 repos, so it's not really needed in the 'shared/modules' part. Additionally, the packages it exports are not available in Eclipse and cause compiler errors (although Tycho works fine). The module could have ended up under eclipse/, but in order to build the shared p2 feature we need a bundle providing javax.jcr.* and a couple of Jackrabbit packages, so we went with shared/p2. --- eclipse/eclipse-test/META-INF/MANIFEST.MF | 1 + shared/modules/pom.xml | 1 - shared/modules/vlt-wrapper/bnd.bnd | 57 ------- shared/modules/vlt-wrapper/pom.xml | 133 --------------- shared/p2/pom.xml | 5 +- shared/p2/shared-feature/feature.xml | 6 +- shared/p2/shared-feature/pom.xml | 6 +- .../feature.xml => vlt-wrapper/META-INF/LICENSE} | 98 +++--------- shared/p2/vlt-wrapper/META-INF/MANIFEST.MF | 73 +++++++++ shared/p2/vlt-wrapper/META-INF/NOTICE | 11 ++ shared/{modules => p2}/vlt-wrapper/README.md | 0 shared/p2/vlt-wrapper/build.properties | 18 +++ shared/p2/vlt-wrapper/lib/.gitignore | 1 + shared/p2/vlt-wrapper/pom.xml | 178 +++++++++++++++++++++ 14 files changed, 313 insertions(+), 275 deletions(-) diff --git a/eclipse/eclipse-test/META-INF/MANIFEST.MF b/eclipse/eclipse-test/META-INF/MANIFEST.MF index 5cf871d..2913950 100644 --- a/eclipse/eclipse-test/META-INF/MANIFEST.MF +++ b/eclipse/eclipse-test/META-INF/MANIFEST.MF @@ -11,6 +11,7 @@ Require-Bundle: org.junit, org.eclipse.jdt.core, org.eclipse.jdt.launching, org.eclipse.wst.server.core, + org.eclipse.ui.navigator, org.apache.sling.ide.eclipse-core, org.apache.sling.ide.eclipse-ui, org.apache.sling.ide.eclipse-sightly-core, diff --git a/shared/modules/pom.xml b/shared/modules/pom.xml index a9c1920..3d11973 100644 --- a/shared/modules/pom.xml +++ b/shared/modules/pom.xml @@ -37,7 +37,6 @@ <module>api</module> <module>impl-resource</module> <module>impl-vlt</module> - <module>vlt-wrapper</module> <module>artifacts</module> </modules> </project> diff --git a/shared/modules/vlt-wrapper/bnd.bnd b/shared/modules/vlt-wrapper/bnd.bnd deleted file mode 100644 index b27c029..0000000 --- a/shared/modules/vlt-wrapper/bnd.bnd +++ /dev/null @@ -1,57 +0,0 @@ -Bundle-ActivationPolicy: lazy - --exportcontents: javax.jcr,\ - javax.jcr.nodetype,\ - javax.jcr.lock,\ - javax.jcr.observation, \ - javax.jcr.query, \ - javax.jcr.query.qom, \ - javax.jcr.retention, \ - javax.jcr.security , \ - javax.jcr.util, \ - javax.jcr.version, \ - org.apache.jackrabbit.api,\ - org.apache.jackrabbit.api.management, \ - org.apache.jackrabbit.api.security.authorization, \ - org.apache.jackrabbit.api.security.principal, \ - org.apache.jackrabbit.api.security.user, \ - org.apache.jackrabbit.spi,\ - 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 - --includeresource: guava-*.jar;lib:=true,\ - jackrabbit-*.jar;lib:=true, \ - vault-*;lib:=true, \ - org.apache.jackrabbit.vault-*.jar;lib:=true, \ - http*.jar;lib:=true, \ - jcr-*.jar;lib:=true - -Import-Package: sun.misc;resolution:=optional, \ - org.apache.commons.codec;version="[1.3.0,2)", \ - org.apache.commons.codec.binary;version="[1.3.0,2)", \ - org.apache.commons.io;version="[1.4,3)", \ - org.apache.commons.io.input;version="[1.4,3)", \ - org.apache.commons.io.output;version="[1.4,3)", \ - !org.apache.sling.*, \ - * diff --git a/shared/modules/vlt-wrapper/pom.xml b/shared/modules/vlt-wrapper/pom.xml deleted file mode 100644 index 5deb99b..0000000 --- a/shared/modules/vlt-wrapper/pom.xml +++ /dev/null @@ -1,133 +0,0 @@ -<?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. --> -<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>sling-ide-shared-parent</artifactId> - <version>1.2.3-SNAPSHOT</version> - <relativePath>../parent/</relativePath> - </parent> - - <artifactId>org.apache.sling.ide.vlt-wrapper</artifactId> - <name>Apache Sling IDE Tools FileVault wrapper</name> - - <scm> - <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-ide-tooling.git</connection> - <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-ide-tooling.git</developerConnection> - <url>https://gitbox.apache.org/repos/asf?p=sling-ide-tooling.git</url> - </scm> - - <build> - <plugins> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-maven-plugin</artifactId> - </plugin> - </plugins> - </build> - - <dependencies> - <!-- START JCR dependencies --> - <dependency> - <groupId>javax.jcr</groupId> - <artifactId>jcr</artifactId> - </dependency> - <!-- END JCR dependencies --> - - <!-- START Apache Jackrabbit dependencies --> - <dependency> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-api</artifactId> - <version>${jackrabbit.version}</version> - </dependency> - <dependency> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-webdav</artifactId> - <version>${jackrabbit.version}</version> - </dependency> - <dependency> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-spi-commons</artifactId> - <version>${jackrabbit.version}</version> - </dependency> - <dependency> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-jcr-commons</artifactId> - <version>${jackrabbit.version}</version> - </dependency> - <!-- transitive dependency of jackrabbit-jcr-commons --> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>15.0</version> - </dependency> - <dependency> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-jcr2spi</artifactId> - <version>${jackrabbit.version}</version> - </dependency> - <dependency> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-jcr-client</artifactId> - <version>${jackrabbit.version}</version> - </dependency> - <dependency> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-spi</artifactId> - <version>${jackrabbit.version}</version> - </dependency> - <dependency> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-spi2dav</artifactId> - <version>${jackrabbit.version}</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpmime</artifactId> - <version>4.5.3</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>4.5.3</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - <version>4.4.6</version> - </dependency> - <!-- END Apache Jackrabbit dependencies --> - - <!-- START Apache Jackrabbit FileVault dependencies --> - <dependency> - <groupId>org.apache.jackrabbit.vault</groupId> - <artifactId>vault-davex</artifactId> - <version>${vault.version}</version> - </dependency> - <dependency> - <groupId>org.apache.jackrabbit.vault</groupId> - <artifactId>org.apache.jackrabbit.vault</artifactId> - <version>${vault.version}</version> - </dependency> - </dependencies> - - <properties> - <!-- must match the version being referenced in the pom.xml of filevault --> - <jackrabbit.version>2.16.1</jackrabbit.version> - <vault.version>3.1.44</vault.version> - <sling.java.version>8</sling.java.version> - </properties> -</project> diff --git a/shared/p2/pom.xml b/shared/p2/pom.xml index a65f175..5362ea2 100644 --- a/shared/p2/pom.xml +++ b/shared/p2/pom.xml @@ -33,6 +33,7 @@ </scm> <modules> + <module>vlt-wrapper</module> <module>shared-feature</module> <module>shared-repository</module> </modules> @@ -46,8 +47,8 @@ <repository> <id>orbit</id> <layout>p2</layout> - <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/</url> - </repository> + <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository</url> + </repository> </repositories> <build> diff --git a/shared/p2/shared-feature/feature.xml b/shared/p2/shared-feature/feature.xml index e76ed1a..1d0a0e4 100644 --- a/shared/p2/shared-feature/feature.xml +++ b/shared/p2/shared-feature/feature.xml @@ -233,21 +233,21 @@ unpack="false"/> <plugin - id="org.apache.sling.ide.vlt-wrapper" + id="org.apache.sling.ide.impl-vlt" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin - id="org.apache.sling.ide.impl-vlt" + id="org.apache.sling.ide.artifacts" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin - id="org.apache.sling.ide.artifacts" + id="org.apache.sling.ide.vlt-wrapper" download-size="0" install-size="0" version="0.0.0" diff --git a/shared/p2/shared-feature/pom.xml b/shared/p2/shared-feature/pom.xml index 24f7584..a22ba75 100644 --- a/shared/p2/shared-feature/pom.xml +++ b/shared/p2/shared-feature/pom.xml @@ -22,17 +22,17 @@ </dependency> <dependency> <groupId>org.apache.sling.ide</groupId> - <artifactId>org.apache.sling.ide.vlt-wrapper</artifactId> + <artifactId>org.apache.sling.ide.impl-vlt</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.sling.ide</groupId> - <artifactId>org.apache.sling.ide.impl-vlt</artifactId> + <artifactId>org.apache.sling.ide.artifacts</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.sling.ide</groupId> - <artifactId>org.apache.sling.ide.artifacts</artifactId> + <artifactId>org.apache.sling.ide.vlt-wrapper</artifactId> <version>${project.version}</version> </dependency> </dependencies> diff --git a/shared/p2/shared-feature/feature.xml b/shared/p2/vlt-wrapper/META-INF/LICENSE similarity index 75% copy from shared/p2/shared-feature/feature.xml copy to shared/p2/vlt-wrapper/META-INF/LICENSE index e76ed1a..d645695 100644 --- a/shared/p2/shared-feature/feature.xml +++ b/shared/p2/vlt-wrapper/META-INF/LICENSE @@ -1,28 +1,5 @@ -<?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. ---> -<feature - id="org.apache.sling.ide.shared.feature" - label="Sling IDE Tools - Shared" - version="1.2.3.qualifier" - provider-name="The Apache Software Foundation"> - - <license url="http://www.apache.org/licenses/LICENSE-2.0";> - Apache License + + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -30,38 +7,38 @@ 1. Definitions. - "License" shall mean the terms and conditions for use, reproduction, + "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. - "Licensor" shall mean the copyright owner or entity authorized by + "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. - "Legal Entity" shall mean the union of the acting entity and all + "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the + "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. - "You" (or "Your") shall mean an individual or Legal Entity + "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. - "Source" form shall mean the preferred form for making modifications, + "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. - "Object" form shall mean any form resulting from mechanical + "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. - "Work" shall mean the work of authorship, whether in Source or + "Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). - "Derivative Works" shall mean any work, whether in Source or Object + "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes @@ -69,21 +46,21 @@ separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. - "Contribution" shall mean any work of authorship, including + "Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" + the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." + designated in writing by the copyright owner as "Not a Contribution." - "Contributor" shall mean Licensor and any individual or Legal Entity + "Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. @@ -127,7 +104,7 @@ excluding those notices that do not pertain to any part of the Derivative Works; and - (d) If the Work includes a "NOTICE" text file as part of its + (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not @@ -166,7 +143,7 @@ 7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, + Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A @@ -202,55 +179,24 @@ APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier + same "printed page" as the copyright notice for easier identification within third-party archives. Copyright [yyyy] [name of copyright owner] - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed 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, + 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. - </license> - - <plugin - id="org.apache.sling.ide.api" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.sling.ide.vlt-wrapper" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.sling.ide.impl-vlt" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.sling.ide.artifacts" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> -</feature> - diff --git a/shared/p2/vlt-wrapper/META-INF/MANIFEST.MF b/shared/p2/vlt-wrapper/META-INF/MANIFEST.MF new file mode 100644 index 0000000..67ae9d5 --- /dev/null +++ b/shared/p2/vlt-wrapper/META-INF/MANIFEST.MF @@ -0,0 +1,73 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.apache.sling.ide.vlt-wrapper +Bundle-Version: 1.2.3.qualifier +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-ClassPath: ., + lib/org.apache.jackrabbit.vault-3.1.44.jar, + lib/vault-davex-3.1.44.jar, + lib/jcr-2.0.jar, + lib/guava-15.0.jar, + lib/jackrabbit-api-2.16.1.jar, + lib/jackrabbit-spi2dav-2.16.1.jar, + lib/jackrabbit-spi-2.16.1.jar, + lib/jackrabbit-jcr-client-2.16.1.jar, + lib/jackrabbit-jcr2spi-2.16.1.jar, + lib/jackrabbit-jcr-commons-2.16.1.jar, + lib/jackrabbit-spi-commons-2.16.1.jar, + lib/jackrabbit-webdav-2.16.1.jar, + lib/httpmime-4.5.3.jar, + lib/httpclient-4.5.3.jar, + lib/httpcore-4.4.6.jar +Export-Package: javax.jcr;version="2.0.0", + javax.jcr.nodetype;version="2.0.0", + javax.jcr.lock;version="2.0.0", + javax.jcr.observation;version="2.0.0", + javax.jcr.query;version="2.0.0", + javax.jcr.query.qom;version="2.0.0", + javax.jcr.retention;version="2.0.0", + javax.jcr.security;version="2.0.0", + javax.jcr.util;version="2.0.0", + javax.jcr.version;version="2.0.0", + org.apache.jackrabbit.api;version="2.16.0", + org.apache.jackrabbit.api.management;version="2.16.0", + org.apache.jackrabbit.api.security;version="2.16.0", + org.apache.jackrabbit.api.security.authorization;version="2.16.0", + org.apache.jackrabbit.api.security.principal;version="2.16.0", + org.apache.jackrabbit.api.security.user;version="2.16.0", + org.apache.jackrabbit.spi.commons.conversion;version="2.16.0", + org.apache.jackrabbit.spi.commons.namespace;version="2.16.0", + org.apache.jackrabbit.util;version="2.16.0", + org.apache.jackrabbit.vault.davex;version="2.4.0", + org.apache.jackrabbit.vault.fs;version="2.4.0", + org.apache.jackrabbit.vault.fs.api;version="2.6.0", + org.apache.jackrabbit.vault.fs.config;version="2.5.0", + org.apache.jackrabbit.vault.fs.filter;version="2.4.0", + org.apache.jackrabbit.vault.fs.impl;version="2.4.0", + org.apache.jackrabbit.vault.fs.impl.aggregator;version="2.4.0", + org.apache.jackrabbit.vault.fs.impl.io;version="2.4.0", + org.apache.jackrabbit.vault.fs.impl.io.legacycnd;version="2.4.0", + org.apache.jackrabbit.vault.fs.io;version="2.4.0", + org.apache.jackrabbit.vault.fs.spi;version="2.4.0", + org.apache.jackrabbit.vault.fs.spi.impl.jcr20;version="2.4.0", + org.apache.jackrabbit.vault.packaging;version="2.4.0", + org.apache.jackrabbit.vault.packaging.impl;version="2.4.0", + org.apache.jackrabbit.vault.util;version="2.4.0", + org.apache.jackrabbit.vault.util.xml.serialize;version="2.4.0", + org.apache.jackrabbit.vault.util.xml.xerces.dom;version="2.4.0", + org.apache.jackrabbit.vault.util.xml.xerces.util;version="2.4.0", + org.apache.jackrabbit.vault.util.xml.xerces.xni;version="2.4.0", + org.apache.jackrabbit.vault.util.xml.xerces.xni.parser;version="2.4.0" +Require-Bundle: org.eclipse.core.runtime +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, + org.slf4j diff --git a/shared/p2/vlt-wrapper/META-INF/NOTICE b/shared/p2/vlt-wrapper/META-INF/NOTICE new file mode 100644 index 0000000..45dda0c --- /dev/null +++ b/shared/p2/vlt-wrapper/META-INF/NOTICE @@ -0,0 +1,11 @@ + +Sling IDE Tools: FileVault wrapper +Copyright 2007-2014 The Apache Software Foundation + +Apache Sling is based on source code originally developed +by Day Software (http://www.day.com/). + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + + diff --git a/shared/modules/vlt-wrapper/README.md b/shared/p2/vlt-wrapper/README.md similarity index 100% rename from shared/modules/vlt-wrapper/README.md rename to shared/p2/vlt-wrapper/README.md diff --git a/shared/p2/vlt-wrapper/build.properties b/shared/p2/vlt-wrapper/build.properties new file mode 100644 index 0000000..d3b5912 --- /dev/null +++ b/shared/p2/vlt-wrapper/build.properties @@ -0,0 +1,18 @@ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + lib/org.apache.jackrabbit.vault-3.1.44.jar,\ + lib/vault-davex-3.1.44.jar,\ + lib/jcr-2.0.jar,\ + lib/guava-15.0.jar,\ + lib/jackrabbit-api-2.16.1.jar,\ + lib/jackrabbit-spi2dav-2.16.1.jar,\ + lib/jackrabbit-spi-2.16.1.jar,\ + lib/jackrabbit-jcr-client-2.16.1.jar,\ + lib/jackrabbit-jcr2spi-2.16.1.jar,\ + lib/jackrabbit-jcr-commons-2.16.1.jar,\ + lib/jackrabbit-spi-commons-2.16.1.jar,\ + lib/jackrabbit-webdav-2.16.1.jar,\ + lib/httpmime-4.5.3.jar,\ + lib/httpclient-4.5.3.jar,\ + lib/httpcore-4.4.6.jar diff --git a/shared/p2/vlt-wrapper/lib/.gitignore b/shared/p2/vlt-wrapper/lib/.gitignore new file mode 100644 index 0000000..f23b948 --- /dev/null +++ b/shared/p2/vlt-wrapper/lib/.gitignore @@ -0,0 +1 @@ +*.jar \ No newline at end of file diff --git a/shared/p2/vlt-wrapper/pom.xml b/shared/p2/vlt-wrapper/pom.xml new file mode 100644 index 0000000..d9e99f1 --- /dev/null +++ b/shared/p2/vlt-wrapper/pom.xml @@ -0,0 +1,178 @@ +<?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. +--> +<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</groupId> + <artifactId>sling-ide-tooling-p2</artifactId> + <version>1.2.3-SNAPSHOT</version> + </parent> + <artifactId>org.apache.sling.ide.vlt-wrapper</artifactId> + <packaging>eclipse-plugin</packaging> + <name>Apache Sling IDE Tools FileVault wrapper</name> + + <scm> + <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-ide-tooling.git</connection> + <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-ide-tooling.git</developerConnection> + <url>https://gitbox.apache.org/repos/asf?p=sling-ide-tooling.git</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> + <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-api</artifactId> + <version>${jackrabbit.version}</version> + </artifactItem> + <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> + <!-- 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> + <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> + <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> + <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> + + <properties> + <!-- must match the version being referenced in the pom.xml of filevault --> + <jackrabbit.version>2.16.1</jackrabbit.version> + <vault.version>3.1.44</vault.version> + </properties> +</project> -- To stop receiving notification emails like this one, please contact [email protected].
