You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2018/04/05 11:03:49 UTC
[sling-ide-tooling] 03/14: SLING-5648 - Make Non-Eclipse Module
regular Maven Packages
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch feature/intellij
in repository https://gitbox.apache.org/repos/asf/sling-ide-tooling.git
commit 076717d93402cab77b84b0a949f46d1d6219a085
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Apr 3 17:23:23 2018 +0300
SLING-5648 - Make Non-Eclipse Module regular Maven Packages
Move the impl-vlt and impl-vlt-test modules under shared/modules.
---
eclipse/impl-vlt-test/README.md | 3 -
eclipse/impl-vlt-test/pom.xml | 129 -------------
.../src/main/resources/META-INF/LICENSE | 202 ---------------------
.../src/main/resources/META-INF/NOTICE | 11 --
eclipse/impl-vlt/META-INF/LICENSE | 202 ---------------------
eclipse/impl-vlt/META-INF/MANIFEST.MF | 39 ----
eclipse/impl-vlt/META-INF/NOTICE | 11 --
eclipse/impl-vlt/OSGI-INF/VaultFsLocatorImpl.xml | 23 ---
eclipse/impl-vlt/OSGI-INF/VltFilterLocator.xml | 25 ---
eclipse/impl-vlt/OSGI-INF/VltRepositoryFactory.xml | 25 ---
.../OSGI-INF/VltSerializationManagerImpl.xml | 25 ---
eclipse/impl-vlt/build.properties | 7 -
eclipse/impl-vlt/pom.xml | 61 -------
.../org/apache/sling/ide/impl/vlt/Activator.java | 83 ---------
eclipse/pom.xml | 2 -
{eclipse => shared/modules}/impl-vlt/.options | 0
{eclipse => shared/modules}/impl-vlt/README.md | 0
shared/modules/impl-vlt/bnd.bnd | 2 +
{eclipse => shared/modules}/impl-vlt/plugin.xml | 0
shared/modules/impl-vlt/pom.xml | 143 +++++++++++++++
.../sling/ide/impl/vlt/AddOrUpdateNodeCommand.java | 0
.../apache/sling/ide/impl/vlt/ConversionUtils.java | 0
.../sling/ide/impl/vlt/DeleteNodeCommand.java | 0
.../apache/sling/ide/impl/vlt/GetNodeCommand.java | 0
.../sling/ide/impl/vlt/GetNodeContentCommand.java | 0
.../org/apache/sling/ide/impl/vlt/JcrCommand.java | 0
.../org/apache/sling/ide/impl/vlt/JcrResult.java | 0
.../sling/ide/impl/vlt/ListChildrenCommand.java | 0
.../apache/sling/ide/impl/vlt/ListTreeCommand.java | 0
.../org/apache/sling/ide/impl/vlt/NoOpCommand.java | 0
.../ide/impl/vlt/ReorderChildNodesCommand.java | 0
.../apache/sling/ide/impl/vlt/VaultFsLocator.java | 0
.../sling/ide/impl/vlt/VaultFsLocatorImpl.java | 2 +
.../sling/ide/impl/vlt/VltNodeDefinition.java | 0
.../org/apache/sling/ide/impl/vlt/VltNodeType.java | 0
.../sling/ide/impl/vlt/VltNodeTypeFactory.java | 0
.../sling/ide/impl/vlt/VltNodeTypeRegistry.java | 0
.../sling/ide/impl/vlt/VltPropertyDefinition.java | 0
.../apache/sling/ide/impl/vlt/VltRepository.java | 5 +-
.../sling/ide/impl/vlt/VltRepositoryFactory.java | 10 +-
.../sling/ide/impl/vlt/filter/VltFilter.java | 0
.../ide/impl/vlt/filter/VltFilterLocator.java | 4 +
.../impl/vlt/serialization/ContentXmlHandler.java | 11 +-
.../serialization/VltSerializationDataBuilder.java | 10 +-
.../vlt/serialization/VltSerializationManager.java | 12 +-
.../org/apache/sling/ide/jcr/RepositoryUtils.java | 4 +-
.../org/apache/sling/ide/jcr/package-info.java | 25 +--
.../ide/impl/vlt/AddOrUpdateNodeCommandTest.java | 0
.../ide/impl/vlt/ReorderChildNodesCommandTest.java | 0
.../org/apache/sling/ide/impl/vlt/Slf4jLogger.java | 2 +-
.../sling/ide/impl/vlt/filter/VltFilterTest.java | 0
.../vlt/serialization/ContentXmlHandlerTest.java | 3 +-
.../serialization/VltSerializationManagerTest.java | 0
.../ide/impl/vlt/transport/DefaultBatcherTest.java | 0
.../apache/sling/ide/jcr/RepositoryUtilsTest.java | 0
.../sling/ide/impl/vlt/filter/filter-deep.xml | 0
.../sling/ide/impl/vlt/filter/filter-default.xml | 0
.../ide/impl/vlt/filter/filter-with-include.xml | 0
.../org/apache/sling/ide/impl/vlt/folder.cnd | 0
.../sling/ide/impl/vlt/serialization/bin.binary | 0
.../ide/impl/vlt/serialization/binary-property.xml | 0
.../serialization/empty-multivalued-property.xml | 0
.../vlt/serialization/encoded-child-content.xml | 0
.../escaped-braces-at-start-of-property.xml | 0
.../escaped-comma-in-multi-valued-property.xml | 0
.../serialization/escaped-value-in-property.xml | 0
.../sling/ide/impl/vlt/serialization/file.xml | 0
.../serialization/full-coverage-escaped-names.xml | 0
.../ide/impl/vlt/serialization/full-coverage.xml | 0
.../multivalued-properties-content.xml | 0
.../ide/impl/vlt/serialization/root-content.xml | 0
.../ide/impl/vlt/serialization/simple-content.xml | 0
...gle-explicit-multivalued-properties-content.xml | 0
.../apache/sling/ide/impl/vlt/test-definitions.cnd | 0
shared/p2/shared-feature/feature.xml | 7 +
shared/p2/shared-feature/pom.xml | 5 +
76 files changed, 205 insertions(+), 888 deletions(-)
diff --git a/eclipse/impl-vlt-test/README.md b/eclipse/impl-vlt-test/README.md
deleted file mode 100644
index 7dc86fd..0000000
--- a/eclipse/impl-vlt-test/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Apache Sling IDE Tools FileVault Implementation Tests
-
-This module is part of the [Apache Sling](https://sling.apache.org) project.
diff --git a/eclipse/impl-vlt-test/pom.xml b/eclipse/impl-vlt-test/pom.xml
deleted file mode 100644
index 89e2e6e..0000000
--- a/eclipse/impl-vlt-test/pom.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<!--
- 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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.sling.ide</groupId>
- <artifactId>sling-ide-tooling</artifactId>
- <version>1.2.3-SNAPSHOT</version>
- </parent>
- <artifactId>org.apache.sling.ide.impl-vlt-test</artifactId>
- <name>Apache Sling IDE Tools FileVault Implementation Tests</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>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>3.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling.ide</groupId>
- <artifactId>org.apache.sling.ide.impl-vlt</artifactId>
- <version>${project.version}</version>
- <type>eclipse-plugin</type>
- <scope>test</scope>
- </dependency>
- <!--
- we need to pull in all transitive dependencies of the impl-vlt
- bundle, since they are not exposed by Tycho(?)
- -->
- <dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- <version>2.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.4</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.7.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-commons</artifactId>
- <version>${jackrabbit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- <version>${jackrabbit.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit.vault</groupId>
- <artifactId>org.apache.jackrabbit.vault</artifactId>
- <version>${vault.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit.vault</groupId>
- <artifactId>vault-davex</artifactId>
- <version>${vault.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling.ide</groupId>
- <artifactId>org.apache.sling.ide.api</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <properties>
- <!-- must match the version being referenced in the pom.xml of filevault -->
- <jackrabbit.version>2.14.0</jackrabbit.version>
- <vault.version>3.1.38</vault.version>
- </properties>
-</project>
diff --git a/eclipse/impl-vlt-test/src/main/resources/META-INF/LICENSE b/eclipse/impl-vlt-test/src/main/resources/META-INF/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/eclipse/impl-vlt-test/src/main/resources/META-INF/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "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
- the copyright owner that is granting the License.
-
- "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
- 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
- exercising permissions granted by this License.
-
- "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
- 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
- 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
- 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
- of this License, Derivative Works shall not include works that remain
- 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
- 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"
- 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."
-
- "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.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- 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
- 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
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 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,
- 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
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- 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
- 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
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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,
- 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.
diff --git a/eclipse/impl-vlt-test/src/main/resources/META-INF/NOTICE b/eclipse/impl-vlt-test/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index c8b4089..0000000
--- a/eclipse/impl-vlt-test/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,11 +0,0 @@
-
-Sling IDE Tools: FileVault Implementation Tests
-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/eclipse/impl-vlt/META-INF/LICENSE b/eclipse/impl-vlt/META-INF/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/eclipse/impl-vlt/META-INF/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "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
- the copyright owner that is granting the License.
-
- "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
- 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
- exercising permissions granted by this License.
-
- "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
- 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
- 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
- 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
- of this License, Derivative Works shall not include works that remain
- 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
- 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"
- 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."
-
- "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.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- 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
- 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
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 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,
- 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
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- 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
- 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
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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,
- 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.
diff --git a/eclipse/impl-vlt/META-INF/MANIFEST.MF b/eclipse/impl-vlt/META-INF/MANIFEST.MF
deleted file mode 100644
index 7f361f0..0000000
--- a/eclipse/impl-vlt/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,39 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
-Bundle-Name: Sling IDE Vlt Impl
-Bundle-SymbolicName: org.apache.sling.ide.impl-vlt;singleton:=true
-Bundle-Version: 1.2.3.qualifier
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: org.eclipse.equinox.ds;bundle-version="1.2.1",
- org.eclipse.osgi.services;bundle-version="3.2.100"
-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,
- org.apache.jackrabbit.vault.fs.api,
- org.apache.jackrabbit.vault.fs.config,
- org.apache.jackrabbit.vault.fs.impl,
- org.apache.jackrabbit.vault.fs.impl.aggregator,
- org.apache.jackrabbit.vault.fs.impl.io,
- org.apache.jackrabbit.vault.util,
- org.apache.sling.ide.eclipse.core,
- org.apache.sling.ide.eclipse.core.debug,
- org.apache.sling.ide.filter,
- org.apache.sling.ide.log,
- org.apache.sling.ide.serialization,
- org.apache.sling.ide.transport,
- org.apache.sling.ide.util,
- org.eclipse.core.runtime;version="3.4.0",
- org.osgi.framework;version="1.7.0",
- org.osgi.service.event;version="1.3.0",
- org.osgi.util.tracker;version="1.5.1"
-Export-Package: org.apache.sling.ide.jcr
-Service-Component: OSGI-INF/*.xml
-Bundle-Activator: org.apache.sling.ide.impl.vlt.Activator
diff --git a/eclipse/impl-vlt/META-INF/NOTICE b/eclipse/impl-vlt/META-INF/NOTICE
deleted file mode 100644
index 35cf0e1..0000000
--- a/eclipse/impl-vlt/META-INF/NOTICE
+++ /dev/null
@@ -1,11 +0,0 @@
-
-Sling IDE Tools: FileVault implementation
-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/eclipse/impl-vlt/OSGI-INF/VaultFsLocatorImpl.xml b/eclipse/impl-vlt/OSGI-INF/VaultFsLocatorImpl.xml
deleted file mode 100644
index c981e50..0000000
--- a/eclipse/impl-vlt/OSGI-INF/VaultFsLocatorImpl.xml
+++ /dev/null
@@ -1,23 +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.
--->
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="false">
- <implementation class="org.apache.sling.ide.impl.vlt.VaultFsLocatorImpl"/>
- <service>
- <provide interface="org.apache.sling.ide.impl.vlt.VaultFsLocator"/>
- </service>
-</scr:component>
diff --git a/eclipse/impl-vlt/OSGI-INF/VltFilterLocator.xml b/eclipse/impl-vlt/OSGI-INF/VltFilterLocator.xml
deleted file mode 100644
index 98b7881..0000000
--- a/eclipse/impl-vlt/OSGI-INF/VltFilterLocator.xml
+++ /dev/null
@@ -1,25 +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.
--->
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="false">
- <implementation class="org.apache.sling.ide.impl.vlt.filter.VltFilterLocator"/>
- <reference bind="bindVaultFsLocator" cardinality="1..1" interface="org.apache.sling.ide.impl.vlt.VaultFsLocator" name="VaultFsLocator" policy="static" unbind="unbindVaultFsLocator"/>
- <property name="service.ranking" type="Integer" value="100"/>
- <service>
- <provide interface="org.apache.sling.ide.filter.FilterLocator"/>
- </service>
-</scr:component>
diff --git a/eclipse/impl-vlt/OSGI-INF/VltRepositoryFactory.xml b/eclipse/impl-vlt/OSGI-INF/VltRepositoryFactory.xml
deleted file mode 100644
index a97b2de..0000000
--- a/eclipse/impl-vlt/OSGI-INF/VltRepositoryFactory.xml
+++ /dev/null
@@ -1,25 +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.
--->
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="false">
- <implementation class="org.apache.sling.ide.impl.vlt.VltRepositoryFactory"/>
- <reference bind="bindEventAdmin" cardinality="1..1" interface="org.osgi.service.event.EventAdmin" name="EventAdmin" policy="static" unbind="unbindEventAdmin"/>
- <property name="service.ranking" type="Integer" value="100"/>
- <service>
- <provide interface="org.apache.sling.ide.transport.RepositoryFactory"/>
- </service>
-</scr:component>
diff --git a/eclipse/impl-vlt/OSGI-INF/VltSerializationManagerImpl.xml b/eclipse/impl-vlt/OSGI-INF/VltSerializationManagerImpl.xml
deleted file mode 100644
index 4af9c30..0000000
--- a/eclipse/impl-vlt/OSGI-INF/VltSerializationManagerImpl.xml
+++ /dev/null
@@ -1,25 +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.
--->
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="false">
- <implementation class="org.apache.sling.ide.impl.vlt.serialization.VltSerializationManager"/>
- <service>
- <provide interface="org.apache.sling.ide.serialization.SerializationManager"/>
- </service>
- <reference bind="bindVaultFsLocator" cardinality="1..1" interface="org.apache.sling.ide.impl.vlt.VaultFsLocator" name="VaultFsLocator" policy="static" unbind="unbindVaultFsLocator"/>
- <property name="service.ranking" type="Integer" value="100"/>
-</scr:component>
diff --git a/eclipse/impl-vlt/build.properties b/eclipse/impl-vlt/build.properties
deleted file mode 100644
index 4b3f18f..0000000
--- a/eclipse/impl-vlt/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-output.. = bin/
-bin.includes = .,\
- META-INF/,\
- OSGI-INF/,\
- plugin.xml,\
- .options
-source.. = src/
diff --git a/eclipse/impl-vlt/pom.xml b/eclipse/impl-vlt/pom.xml
deleted file mode 100644
index 70fdab0..0000000
--- a/eclipse/impl-vlt/pom.xml
+++ /dev/null
@@ -1,61 +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-tooling</artifactId>
- <version>1.2.3-SNAPSHOT</version>
- </parent>
- <artifactId>org.apache.sling.ide.impl-vlt</artifactId>
- <packaging>eclipse-plugin</packaging>
- <name>Apache Sling IDE Tools FileVault implementation</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>
- <include>OSGI-INF/*</include>
- <include>.options</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/Activator.java b/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/Activator.java
deleted file mode 100644
index 512809f..0000000
--- a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/Activator.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * 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.impl.vlt;
-
-import org.apache.sling.ide.eclipse.core.ServiceUtil;
-import org.apache.sling.ide.eclipse.core.debug.PluginLoggerRegistrar;
-import org.apache.sling.ide.log.Logger;
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.util.tracker.ServiceTracker;
-
-/**
- * The activator class controls the plug-in life cycle
- *
- * <p>
- * Since the WST framework is based on Eclipse extension points, rather than OSGi services, this class provides a static
- * entry point to well-known services.
- * </p>
- */
-public class Activator extends Plugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.apache.sling.ide.impl-vlt"; //$NON-NLS-1$
-
- // The shared instance
- private static Activator plugin;
-
- private ServiceTracker<Logger, Logger> tracer;
-
- private ServiceRegistration<Logger> tracerRegistration;
-
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
-
- tracerRegistration = PluginLoggerRegistrar.register(this);
-
- tracer = new ServiceTracker<>(context, tracerRegistration.getReference(), null);
- tracer.open();
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
-
- tracerRegistration.unregister();
-
- tracer.close();
-
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
- public Logger getPluginLogger() {
- return (Logger) ServiceUtil.getNotNull(tracer);
- }
-}
diff --git a/eclipse/pom.xml b/eclipse/pom.xml
index 650f63e..7fcb529 100644
--- a/eclipse/pom.xml
+++ b/eclipse/pom.xml
@@ -39,8 +39,6 @@
<modules>
<module>target-definition</module>
<module>artifacts</module>
- <module>impl-vlt</module>
- <module>impl-vlt-test</module>
<module>eclipse-core</module>
<module>eclipse-ui</module>
<module>feature</module>
diff --git a/eclipse/impl-vlt/.options b/shared/modules/impl-vlt/.options
similarity index 100%
rename from eclipse/impl-vlt/.options
rename to shared/modules/impl-vlt/.options
diff --git a/eclipse/impl-vlt/README.md b/shared/modules/impl-vlt/README.md
similarity index 100%
rename from eclipse/impl-vlt/README.md
rename to shared/modules/impl-vlt/README.md
diff --git a/shared/modules/impl-vlt/bnd.bnd b/shared/modules/impl-vlt/bnd.bnd
new file mode 100644
index 0000000..ced3679
--- /dev/null
+++ b/shared/modules/impl-vlt/bnd.bnd
@@ -0,0 +1,2 @@
+-exportcontents: ${packages;VERSIONED}
+-includeresource: plugin.xml, .options
\ No newline at end of file
diff --git a/eclipse/impl-vlt/plugin.xml b/shared/modules/impl-vlt/plugin.xml
similarity index 100%
rename from eclipse/impl-vlt/plugin.xml
rename to shared/modules/impl-vlt/plugin.xml
diff --git a/shared/modules/impl-vlt/pom.xml b/shared/modules/impl-vlt/pom.xml
new file mode 100644
index 0000000..8333a97
--- /dev/null
+++ b/shared/modules/impl-vlt/pom.xml
@@ -0,0 +1,143 @@
+<?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</artifactId>
+ <version>33</version>
+ </parent>
+
+ <artifactId>org.apache.sling.ide.impl-vlt</artifactId>
+ <version>1.2.3-SNAPSHOT</version>
+ <name>Apache Sling IDE Tools FileVault implementation</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>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>derby.log</exclude>
+ <exclude>**/bin.binary</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.ide.api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.jackrabbit.vault</groupId>
+ <artifactId>org.apache.jackrabbit.vault</artifactId>
+ <version>3.1.44</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.jackrabbit.vault</groupId>
+ <artifactId>vault-davex</artifactId>
+ <version>3.1.44</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-spi-commons</artifactId>
+ <version>2.16.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- TODO - must be removed, OSGi deps not allowed here -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Note that OSGi annotations are OK since they are not retained
+ at compile time -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.metatype.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-all</artifactId>
+ <version>1.3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
+ <version>2.16.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommand.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommand.java
similarity index 100%
rename from eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommand.java
rename to shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommand.java
diff --git a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/ConversionUtils.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/ConversionUtils.java
similarity index 100%
rename from eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/ConversionUtils.java
rename to shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/ConversionUtils.java
diff --git a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/DeleteNodeCommand.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/DeleteNodeCommand.java
similarity index 100%
rename from eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/DeleteNodeCommand.java
rename to shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/DeleteNodeCommand.java
diff --git a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/GetNodeCommand.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/GetNodeCommand.java
similarity index 100%
rename from eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/GetNodeCommand.java
rename to shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/GetNodeCommand.java
diff --git a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/GetNodeContentCommand.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/GetNodeContentCommand.java
similarity index 100%
rename from eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/GetNodeContentCommand.java
rename to shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/GetNodeContentCommand.java
diff --git a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrCommand.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/JcrCommand.java
similarity index 100%
rename from eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrCommand.java
rename to shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/JcrCommand.java
diff --git a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrResult.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/JcrResult.java
similarity index 100%
rename from eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrResult.java
rename to shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/JcrResult.java
diff --git a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/ListChildrenCommand.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/ListChildrenCommand.java
similarity index 100%
rename from eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/ListChildrenCommand.java
rename to shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/ListChildrenCommand.java
diff --git a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/ListTreeCommand.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/ListTreeCommand.java
similarity index 100%
rename from eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/ListTreeCommand.java
rename to shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/ListTreeCommand.java
diff --git a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/NoOpCommand.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/NoOpCommand.java
similarity index 100%
copy from eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/NoOpCommand.java
copy to shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/NoOpCommand.java
diff --git a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/ReorderChildNodesCommand.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/ReorderChildNodesCommand.java
similarity index 100%
rename from eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/ReorderChildNodesCommand.java
rename to shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/ReorderChildNodesCommand.java
diff --git a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocator.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/VaultFsLocator.java
similarity index 100%
rename from eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocator.java
rename to shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/VaultFsLocator.java
diff --git a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java
similarity index 97%
rename from eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java
rename to shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java
index 2dbfce7..ec329ad 100644
--- a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java
+++ b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java
@@ -30,7 +30,9 @@ import org.apache.jackrabbit.vault.fs.config.AbstractVaultFsConfig;
import org.apache.jackrabbit.vault.fs.config.ConfigurationException;
import org.apache.jackrabbit.vault.fs.config.DefaultWorkspaceFilter;
import org.apache.jackrabbit.vault.util.Constants;
+import org.osgi.service.component.annotations.Component;
+@Component(service = VaultFsLocator.class)
public class VaultFsLocatorImpl implements VaultFsLocator {
@Override
diff --git a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/VltNodeDefinition.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/VltNodeDefinition.java
similarity index 100%
rename from eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/VltNodeDefinition.java
rename to shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/VltNodeDefinition.java
diff --git a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/VltNodeType.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/VltNodeType.java
similarity index 100%
rename from eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/VltNodeType.java
rename to shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/VltNodeType.java
diff --git a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/VltNodeTypeFactory.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/VltNodeTypeFactory.java
similarity index 100%
rename from eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/VltNodeTypeFactory.java
rename to shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/VltNodeTypeFactory.java
diff --git a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/VltNodeTypeRegistry.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/VltNodeTypeRegistry.java
similarity index 100%
rename from eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/VltNodeTypeRegistry.java
rename to shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/VltNodeTypeRegistry.java
diff --git a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/VltPropertyDefinition.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/VltPropertyDefinition.java
similarity index 100%
rename from eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/VltPropertyDefinition.java
rename to shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/VltPropertyDefinition.java
diff --git a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/VltRepository.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/VltRepository.java
similarity index 97%
rename from eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/VltRepository.java
rename to shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/VltRepository.java
index 5b88aa2..c065e22 100644
--- a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/VltRepository.java
+++ b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/VltRepository.java
@@ -46,11 +46,10 @@ public class VltRepository implements Repository {
private boolean disconnected = false;
private final Logger logger;
- public VltRepository(RepositoryInfo repositoryInfo, EventAdmin eventAdmin) {
+ public VltRepository(RepositoryInfo repositoryInfo, EventAdmin eventAdmin, Logger logger) {
this.repositoryInfo = repositoryInfo;
this.eventAdmin = eventAdmin;
- // TODO - this should be injected here as well
- this.logger = Activator.getDefault().getPluginLogger();
+ this.logger = logger;
}
public synchronized void disconnected() {
diff --git a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/VltRepositoryFactory.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/VltRepositoryFactory.java
similarity index 91%
rename from eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/VltRepositoryFactory.java
rename to shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/VltRepositoryFactory.java
index fd744b9..fab8329 100644
--- a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/VltRepositoryFactory.java
+++ b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/VltRepositoryFactory.java
@@ -19,19 +19,27 @@ package org.apache.sling.ide.impl.vlt;
import java.util.HashMap;
import java.util.Map;
+import org.apache.sling.ide.log.Logger;
import org.apache.sling.ide.transport.Repository;
import org.apache.sling.ide.transport.RepositoryException;
import org.apache.sling.ide.transport.RepositoryFactory;
import org.apache.sling.ide.transport.RepositoryInfo;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
import org.osgi.service.event.EventAdmin;
/**
* The <tt>VltRepositoryFactory</tt> instatiantes <tt>VltRepository</tt> instances
*
*/
+@Component(service = RepositoryFactory.class)
public class VltRepositoryFactory implements RepositoryFactory {
+ @Reference
private EventAdmin eventAdmin;
+
+ @Reference
+ private Logger logger;
private Map<String,VltRepository> repositoryMap = new HashMap<>();
@@ -65,7 +73,7 @@ public class VltRepositoryFactory implements RepositoryFactory {
return repo;
}
- repo = new VltRepository(repositoryInfo, eventAdmin);
+ repo = new VltRepository(repositoryInfo, eventAdmin, logger);
repo.connect();
repositoryMap.put(key, repo);
diff --git a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/filter/VltFilter.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/filter/VltFilter.java
similarity index 100%
rename from eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/filter/VltFilter.java
rename to shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/filter/VltFilter.java
diff --git a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/filter/VltFilterLocator.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/filter/VltFilterLocator.java
similarity index 91%
rename from eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/filter/VltFilterLocator.java
rename to shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/filter/VltFilterLocator.java
index 060dfb1..c73403e 100644
--- a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/filter/VltFilterLocator.java
+++ b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/filter/VltFilterLocator.java
@@ -24,9 +24,13 @@ import org.apache.jackrabbit.vault.fs.config.ConfigurationException;
import org.apache.sling.ide.filter.Filter;
import org.apache.sling.ide.filter.FilterLocator;
import org.apache.sling.ide.impl.vlt.VaultFsLocator;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+@Component(service = FilterLocator.class)
public class VltFilterLocator implements FilterLocator {
+ @Reference
private VaultFsLocator fsLocator;
protected void bindVaultFsLocator(VaultFsLocator fsLocator) {
diff --git a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandler.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandler.java
similarity index 97%
rename from eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandler.java
rename to shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandler.java
index 22c0b45..55640fc 100644
--- a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandler.java
+++ b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandler.java
@@ -35,7 +35,7 @@ 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.log.Logger;
import org.apache.sling.ide.transport.ResourceProxy;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -56,6 +56,7 @@ public class ContentXmlHandler extends DefaultHandler implements NamespaceResolv
* the default name path resolver
*/
private final DefaultNamePathResolver npResolver = new DefaultNamePathResolver(this);
+ private Logger logger;
/**
* all type hint classes in a map (key = type integer value)
@@ -69,9 +70,11 @@ public class ContentXmlHandler extends DefaultHandler implements NamespaceResolv
}
}
- public ContentXmlHandler(String rootResourcePath) {
+ public ContentXmlHandler(String rootResourcePath, Logger logger) {
root = new ResourceProxy(rootResourcePath);
uriPrefixMap = new HashMap<>();
+
+ this.logger = logger;
}
@Override
@@ -116,13 +119,13 @@ public class ContentXmlHandler extends DefaultHandler implements NamespaceResolv
}
current.addProperty(entry.getKey(), typedValue);
} catch (Throwable t) {
- Activator.getDefault().getPluginLogger().error("Could not parse property '" + entry.getValue().name, t);
+ logger.error("Could not parse property '" + entry.getValue().name, t);
}
}
queue.add(current);
} catch (NamespaceException e) {
- Activator.getDefault().getPluginLogger().error("Could not resolve a JCR namespace.", e);
+ logger.error("Could not resolve a JCR namespace.", e);
}
}
diff --git a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationDataBuilder.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/serialization/VltSerializationDataBuilder.java
similarity index 98%
rename from eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationDataBuilder.java
rename to shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/serialization/VltSerializationDataBuilder.java
index 52db030..fd33687 100644
--- a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationDataBuilder.java
+++ b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/serialization/VltSerializationDataBuilder.java
@@ -48,9 +48,9 @@ import org.apache.jackrabbit.vault.util.JcrConstants;
import org.apache.jackrabbit.vault.util.MimeTypes;
import org.apache.jackrabbit.vault.util.PlatformNameFormat;
import org.apache.jackrabbit.vault.util.Text;
-import org.apache.sling.ide.impl.vlt.Activator;
import org.apache.sling.ide.impl.vlt.VaultFsLocator;
import org.apache.sling.ide.jcr.RepositoryUtils;
+import org.apache.sling.ide.log.Logger;
import org.apache.sling.ide.serialization.SerializationData;
import org.apache.sling.ide.serialization.SerializationDataBuilder;
import org.apache.sling.ide.serialization.SerializationException;
@@ -65,6 +65,11 @@ public class VltSerializationDataBuilder implements SerializationDataBuilder {
private org.apache.sling.ide.transport.Repository repo;
private Session session;
private VaultFileSystem fs;
+ private Logger logger;
+
+ public VltSerializationDataBuilder(Logger logger) {
+ this.logger = logger;
+ }
public void init(org.apache.sling.ide.transport.Repository repository, File contentSyncRoot)
throws SerializationException {
@@ -131,8 +136,7 @@ public class VltSerializationDataBuilder implements SerializationDataBuilder {
nameHint += ".xml";
}
- Activator.getDefault().getPluginLogger()
- .trace("Got location {0} for path {1}", fileOrFolderPathHint, resource.getPath());
+ logger.trace("Got location {0} for path {1}", fileOrFolderPathHint, resource.getPath());
if (!needsDir(aggregate)) {
return SerializationData.empty(fileOrFolderPathHint, serializationKind);
diff --git a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java
similarity index 96%
rename from eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java
rename to shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java
index 1c78928..42909a6 100644
--- a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java
+++ b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java
@@ -42,19 +42,27 @@ import org.apache.jackrabbit.vault.util.PlatformNameFormat;
import org.apache.jackrabbit.vault.util.RepositoryProvider;
import org.apache.jackrabbit.vault.util.Text;
import org.apache.sling.ide.impl.vlt.VaultFsLocator;
+import org.apache.sling.ide.log.Logger;
import org.apache.sling.ide.serialization.SerializationDataBuilder;
import org.apache.sling.ide.serialization.SerializationException;
import org.apache.sling.ide.serialization.SerializationKind;
import org.apache.sling.ide.serialization.SerializationManager;
import org.apache.sling.ide.transport.ResourceProxy;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
+@Component(service = SerializationManager.class)
public class VltSerializationManager implements SerializationManager {
static final String EXTENSION_XML = ".xml";
+ @Reference
private VltSerializationDataBuilder builder;
+
+ @Reference
+ private Logger logger;
public static void main(String[] args) throws RepositoryException, URISyntaxException, IOException {
RepositoryAddress address = new RepositoryAddress("http://localhost:8080/server/root");
@@ -214,7 +222,7 @@ public class VltSerializationManager implements SerializationManager {
private VltSerializationDataBuilder getBuilder() {
if (builder==null) {
- builder = new VltSerializationDataBuilder();
+ builder = new VltSerializationDataBuilder(logger);
}
return builder;
}
@@ -241,7 +249,7 @@ public class VltSerializationManager implements SerializationManager {
factory.setNamespaceAware(true);
factory.setFeature("http://xml.org/sax/features/namespace-prefixes", false);
SAXParser parser = factory.newSAXParser();
- ContentXmlHandler handler = new ContentXmlHandler(repositoryPath);
+ ContentXmlHandler handler = new ContentXmlHandler(repositoryPath, logger);
parser.parse(source, handler);
return handler.getRoot();
diff --git a/eclipse/impl-vlt/src/org/apache/sling/ide/jcr/RepositoryUtils.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/jcr/RepositoryUtils.java
similarity index 96%
rename from eclipse/impl-vlt/src/org/apache/sling/ide/jcr/RepositoryUtils.java
rename to shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/jcr/RepositoryUtils.java
index aa4b673..7d40302 100644
--- a/eclipse/impl-vlt/src/org/apache/sling/ide/jcr/RepositoryUtils.java
+++ b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/jcr/RepositoryUtils.java
@@ -30,7 +30,6 @@ import javax.jcr.SimpleCredentials;
import org.apache.jackrabbit.vault.davex.DAVExRepositoryFactory;
import org.apache.jackrabbit.vault.fs.api.RepositoryAddress;
import org.apache.jackrabbit.vault.fs.api.RepositoryFactory;
-import org.apache.sling.ide.impl.vlt.Activator;
import org.apache.sling.ide.transport.RepositoryInfo;
public abstract class RepositoryUtils {
@@ -95,7 +94,8 @@ public abstract class RepositoryUtils {
} catch (URISyntaxException e) {
throw new RuntimeException(e);
} catch (RepositoryException e) {
- Activator.getDefault().getPluginLogger().trace("Failed connecting to repository at " + url, e);
+ // TODO-m12n - reactivate this error trace
+// Activator.getDefault().getPluginLogger().trace("Failed connecting to repository at " + url, e);
errors.append(url).append(" : ").append(e.getMessage()).append('\n');
continue;
} finally {
diff --git a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/NoOpCommand.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/jcr/package-info.java
similarity index 58%
rename from eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/NoOpCommand.java
rename to shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/jcr/package-info.java
index 0257878..a3594b1 100644
--- a/eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/NoOpCommand.java
+++ b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/jcr/package-info.java
@@ -14,26 +14,5 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.ide.impl.vlt;
-
-import java.io.IOException;
-
-import javax.jcr.Credentials;
-import javax.jcr.Repository;
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-
-import org.apache.sling.ide.log.Logger;
-
-public class NoOpCommand<T> extends JcrCommand<T> {
-
- public NoOpCommand(Repository repository, Credentials credentials, Logger logger) {
- super(repository, credentials, null, logger);
- }
-
- @Override
- protected T execute0(Session session) throws RepositoryException, IOException {
- return null;
- }
-
-}
+@org.osgi.annotation.versioning.Version("1.2.0")
+package org.apache.sling.ide.jcr;
\ No newline at end of file
diff --git a/eclipse/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommandTest.java b/shared/modules/impl-vlt/src/test/java/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommandTest.java
similarity index 100%
rename from eclipse/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommandTest.java
rename to shared/modules/impl-vlt/src/test/java/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommandTest.java
diff --git a/eclipse/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/ReorderChildNodesCommandTest.java b/shared/modules/impl-vlt/src/test/java/org/apache/sling/ide/impl/vlt/ReorderChildNodesCommandTest.java
similarity index 100%
rename from eclipse/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/ReorderChildNodesCommandTest.java
rename to shared/modules/impl-vlt/src/test/java/org/apache/sling/ide/impl/vlt/ReorderChildNodesCommandTest.java
diff --git a/eclipse/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/Slf4jLogger.java b/shared/modules/impl-vlt/src/test/java/org/apache/sling/ide/impl/vlt/Slf4jLogger.java
similarity index 98%
rename from eclipse/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/Slf4jLogger.java
rename to shared/modules/impl-vlt/src/test/java/org/apache/sling/ide/impl/vlt/Slf4jLogger.java
index acd8de6..1a86154 100644
--- a/eclipse/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/Slf4jLogger.java
+++ b/shared/modules/impl-vlt/src/test/java/org/apache/sling/ide/impl/vlt/Slf4jLogger.java
@@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory;
* </p>
*
*/
-class Slf4jLogger implements Logger {
+public class Slf4jLogger implements Logger {
private static final long PERF_IGNORE_THRESHOLD = 50;
diff --git a/eclipse/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/filter/VltFilterTest.java b/shared/modules/impl-vlt/src/test/java/org/apache/sling/ide/impl/vlt/filter/VltFilterTest.java
similarity index 100%
rename from eclipse/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/filter/VltFilterTest.java
rename to shared/modules/impl-vlt/src/test/java/org/apache/sling/ide/impl/vlt/filter/VltFilterTest.java
diff --git a/eclipse/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java b/shared/modules/impl-vlt/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java
similarity index 99%
rename from eclipse/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java
rename to shared/modules/impl-vlt/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java
index 0203021..f462a44 100644
--- a/eclipse/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java
+++ b/shared/modules/impl-vlt/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java
@@ -31,6 +31,7 @@ import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
+import org.apache.sling.ide.impl.vlt.Slf4jLogger;
import org.apache.sling.ide.transport.ResourceProxy;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
@@ -74,7 +75,7 @@ public class ContentXmlHandlerTest {
factory.setNamespaceAware(true);
factory.setFeature("http://xml.org/sax/features/namespace-prefixes", false);
SAXParser parser = factory.newSAXParser();
- ContentXmlHandler handler = new ContentXmlHandler(rootResourcePath);
+ ContentXmlHandler handler = new ContentXmlHandler(rootResourcePath, new Slf4jLogger());
parser.parse(source, handler);
return handler.getRoot();
diff --git a/eclipse/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManagerTest.java b/shared/modules/impl-vlt/src/test/java/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManagerTest.java
similarity index 100%
rename from eclipse/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManagerTest.java
rename to shared/modules/impl-vlt/src/test/java/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManagerTest.java
diff --git a/eclipse/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/transport/DefaultBatcherTest.java b/shared/modules/impl-vlt/src/test/java/org/apache/sling/ide/impl/vlt/transport/DefaultBatcherTest.java
similarity index 100%
rename from eclipse/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/transport/DefaultBatcherTest.java
rename to shared/modules/impl-vlt/src/test/java/org/apache/sling/ide/impl/vlt/transport/DefaultBatcherTest.java
diff --git a/eclipse/impl-vlt-test/src/test/java/org/apache/sling/ide/jcr/RepositoryUtilsTest.java b/shared/modules/impl-vlt/src/test/java/org/apache/sling/ide/jcr/RepositoryUtilsTest.java
similarity index 100%
rename from eclipse/impl-vlt-test/src/test/java/org/apache/sling/ide/jcr/RepositoryUtilsTest.java
rename to shared/modules/impl-vlt/src/test/java/org/apache/sling/ide/jcr/RepositoryUtilsTest.java
diff --git a/eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/filter/filter-deep.xml b/shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/filter/filter-deep.xml
similarity index 100%
rename from eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/filter/filter-deep.xml
rename to shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/filter/filter-deep.xml
diff --git a/eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/filter/filter-default.xml b/shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/filter/filter-default.xml
similarity index 100%
rename from eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/filter/filter-default.xml
rename to shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/filter/filter-default.xml
diff --git a/eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/filter/filter-with-include.xml b/shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/filter/filter-with-include.xml
similarity index 100%
rename from eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/filter/filter-with-include.xml
rename to shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/filter/filter-with-include.xml
diff --git a/eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/folder.cnd b/shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/folder.cnd
similarity index 100%
rename from eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/folder.cnd
rename to shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/folder.cnd
diff --git a/eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/bin.binary b/shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/bin.binary
similarity index 100%
rename from eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/bin.binary
rename to shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/bin.binary
diff --git a/eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/binary-property.xml b/shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/binary-property.xml
similarity index 100%
rename from eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/binary-property.xml
rename to shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/binary-property.xml
diff --git a/eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/empty-multivalued-property.xml b/shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/empty-multivalued-property.xml
similarity index 100%
rename from eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/empty-multivalued-property.xml
rename to shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/empty-multivalued-property.xml
diff --git a/eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/encoded-child-content.xml b/shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/encoded-child-content.xml
similarity index 100%
rename from eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/encoded-child-content.xml
rename to shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/encoded-child-content.xml
diff --git a/eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/escaped-braces-at-start-of-property.xml b/shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/escaped-braces-at-start-of-property.xml
similarity index 100%
rename from eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/escaped-braces-at-start-of-property.xml
rename to shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/escaped-braces-at-start-of-property.xml
diff --git a/eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/escaped-comma-in-multi-valued-property.xml b/shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/escaped-comma-in-multi-valued-property.xml
similarity index 100%
rename from eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/escaped-comma-in-multi-valued-property.xml
rename to shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/escaped-comma-in-multi-valued-property.xml
diff --git a/eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/escaped-value-in-property.xml b/shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/escaped-value-in-property.xml
similarity index 100%
rename from eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/escaped-value-in-property.xml
rename to shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/escaped-value-in-property.xml
diff --git a/eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/file.xml b/shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/file.xml
similarity index 100%
rename from eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/file.xml
rename to shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/file.xml
diff --git a/eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/full-coverage-escaped-names.xml b/shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/full-coverage-escaped-names.xml
similarity index 100%
rename from eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/full-coverage-escaped-names.xml
rename to shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/full-coverage-escaped-names.xml
diff --git a/eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/full-coverage.xml b/shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/full-coverage.xml
similarity index 100%
rename from eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/full-coverage.xml
rename to shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/full-coverage.xml
diff --git a/eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/multivalued-properties-content.xml b/shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/multivalued-properties-content.xml
similarity index 100%
rename from eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/multivalued-properties-content.xml
rename to shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/multivalued-properties-content.xml
diff --git a/eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/root-content.xml b/shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/root-content.xml
similarity index 100%
rename from eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/root-content.xml
rename to shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/root-content.xml
diff --git a/eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/simple-content.xml b/shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/simple-content.xml
similarity index 100%
rename from eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/simple-content.xml
rename to shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/simple-content.xml
diff --git a/eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/single-explicit-multivalued-properties-content.xml b/shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/single-explicit-multivalued-properties-content.xml
similarity index 100%
rename from eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/single-explicit-multivalued-properties-content.xml
rename to shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/single-explicit-multivalued-properties-content.xml
diff --git a/eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/test-definitions.cnd b/shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/test-definitions.cnd
similarity index 100%
rename from eclipse/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/test-definitions.cnd
rename to shared/modules/impl-vlt/src/test/resources/org/apache/sling/ide/impl/vlt/test-definitions.cnd
diff --git a/shared/p2/shared-feature/feature.xml b/shared/p2/shared-feature/feature.xml
index 0533ba2..9425636 100644
--- a/shared/p2/shared-feature/feature.xml
+++ b/shared/p2/shared-feature/feature.xml
@@ -238,5 +238,12 @@
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"/>
</feature>
diff --git a/shared/p2/shared-feature/pom.xml b/shared/p2/shared-feature/pom.xml
index d41000f..3fa19d0 100644
--- a/shared/p2/shared-feature/pom.xml
+++ b/shared/p2/shared-feature/pom.xml
@@ -25,6 +25,11 @@
<artifactId>org.apache.sling.ide.vlt-wrapper</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.ide.impl-vlt</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</project>
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.