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:46 UTC
[sling-ide-tooling] branch feature/intellij updated (2e2bc9d ->
88f99e0)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch feature/intellij
in repository https://gitbox.apache.org/repos/asf/sling-ide-tooling.git.
from 2e2bc9d SLING-5648 - Make Non-Eclipse Module regular Maven Packages
new 0740871 SLING-5648 - Make Non-Eclipse Module regular Maven Packages
new 8aed7d9 SLING-5648 - Make Non-Eclipse Module regular Maven Packages
new 076717d SLING-5648 - Make Non-Eclipse Module regular Maven Packages
new c49053e Do not track derby.log files
new f7a4d47 SLING-5648 - Make Non-Eclipse Module regular Maven Packages
new 21a335d SLING-5648 - Make Non-Eclipse Module regular Maven Packages
new 17de862 SLING-5648 - Make Non-Eclipse Module regular Maven Packages
new 09c7666 SLING-5648 - Make Non-Eclipse Module regular Maven Packages
new d56e434 SLING-5648 - Make Non-Eclipse Module regular Maven Packages
new cf54694 SLING-5648 - Make Non-Eclipse Module regular Maven Packages
new f74cc26 SLING-5648 - Make Non-Eclipse Module regular Maven Packages
new 741787b SLING-5648 - Make Non-Eclipse Module regular Maven Packages
new 1fa5d56 SLING-5648 - Make Non-Eclipse Module regular Maven Packages
new 88f99e0 SLING-5648 - Make Non-Eclipse Module regular Maven Packages
The 14 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 1 +
.../eclipse/core/debug/PluginLoggerRegistrar.java | 62 ++++++-
.../sling/ide/eclipse/core/debug/impl/Tracer.java | 15 +-
.../sling/ide/eclipse/core/internal/Activator.java | 11 +-
.../sling/ide/eclipse/m2e/internal/Activator.java | 2 +-
.../ide/eclipse/sightly/internal/Activator.java | 2 +-
.../sling/ide/eclipse/ui/internal/Activator.java | 2 +-
eclipse/impl-resource-test/README.md | 3 -
eclipse/impl-resource-test/pom.xml | 68 -------
.../src/main/resources/META-INF/LICENSE | 202 ---------------------
.../src/main/resources/META-INF/NOTICE | 11 --
eclipse/impl-resource/META-INF/LICENSE | 202 ---------------------
eclipse/impl-resource/META-INF/MANIFEST.MF | 19 --
eclipse/impl-resource/META-INF/NOTICE | 11 --
.../OSGI-INF/RepositoryFactoryImpl.xml | 24 ---
.../impl-resource/OSGI-INF/SimpleFilterLocator.xml | 23 ---
.../OSGI-INF/SimpleXmlSerializationManager.xml | 23 ---
eclipse/impl-resource/build.properties | 5 -
eclipse/impl-resource/pom.xml | 60 ------
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 | 5 -
eclipse/vlt-wrapper/META-INF/LICENSE | 202 ---------------------
eclipse/vlt-wrapper/META-INF/MANIFEST.MF | 60 ------
eclipse/vlt-wrapper/META-INF/NOTICE | 11 --
eclipse/vlt-wrapper/build.properties | 18 --
eclipse/vlt-wrapper/lib/.gitignore | 1 -
eclipse/vlt-wrapper/pom.xml | 178 ------------------
shared/modules/api/bnd.bnd | 5 +
shared/modules/api/pom.xml | 1 +
.../modules}/impl-resource/README.md | 0
shared/modules/impl-resource/bnd.bnd | 2 +
shared/modules/{api => impl-resource}/pom.xml | 38 ++--
.../ide/impl/resource/filer/SimpleFilter.java | 0
.../impl/resource/filer/SimpleFilterLocator.java | 2 +
.../SimpleXmlSerializationManager.java | 2 +
.../impl/resource/transport/AbstractCommand.java | 0
.../impl/resource/transport/AbstractResult.java | 0
.../impl/resource/transport/DeleteNodeCommand.java | 0
.../impl/resource/transport/GetNodeCommand.java | 0
.../resource/transport/GetNodeContentCommand.java | 0
.../resource/transport/ListChildrenCommand.java | 0
.../resource/transport/RepositoryFactoryImpl.java | 4 +
.../impl/resource/transport/RepositoryImpl.java | 0
.../resource/transport/UpdateContentCommand.java | 0
.../sling/ide/impl/resource/util/Constants.java | 0
.../SimpleXmlSerializationManagerTest.java | 0
...lizationManagerTest.serializedDataIsEscaped.xml | 0
...rializationManagerTest.stringSerializedData.xml | 0
{eclipse => shared/modules}/impl-vlt/.options | 0
{eclipse => shared/modules}/impl-vlt/README.md | 0
shared/modules/impl-vlt/bnd.bnd | 5 +
{eclipse => shared/modules}/impl-vlt/plugin.xml | 0
shared/modules/{api => impl-vlt}/pom.xml | 83 +++++++--
.../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 | 12 +-
.../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 | 11 +-
.../org/apache/sling/ide/jcr/RepositoryUtils.java | 4 +-
.../org/apache/sling/ide/jcr}/package-info.java | 2 +-
.../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/modules/pom.xml | 41 +++++
{eclipse => shared/modules}/vlt-wrapper/README.md | 0
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 | 12 +-
shared/p2/shared-feature/pom.xml | 12 +-
shared/p2/shared-repository/pom.xml | 12 +-
128 files changed, 486 insertions(+), 2061 deletions(-)
delete mode 100644 eclipse/impl-resource-test/README.md
delete mode 100644 eclipse/impl-resource-test/pom.xml
delete mode 100644 eclipse/impl-resource-test/src/main/resources/META-INF/LICENSE
delete mode 100644 eclipse/impl-resource-test/src/main/resources/META-INF/NOTICE
delete mode 100644 eclipse/impl-resource/META-INF/LICENSE
delete mode 100644 eclipse/impl-resource/META-INF/MANIFEST.MF
delete mode 100644 eclipse/impl-resource/META-INF/NOTICE
delete mode 100644 eclipse/impl-resource/OSGI-INF/RepositoryFactoryImpl.xml
delete mode 100644 eclipse/impl-resource/OSGI-INF/SimpleFilterLocator.xml
delete mode 100644 eclipse/impl-resource/OSGI-INF/SimpleXmlSerializationManager.xml
delete mode 100644 eclipse/impl-resource/build.properties
delete mode 100644 eclipse/impl-resource/pom.xml
delete mode 100644 eclipse/impl-vlt-test/README.md
delete mode 100644 eclipse/impl-vlt-test/pom.xml
delete mode 100644 eclipse/impl-vlt-test/src/main/resources/META-INF/LICENSE
delete mode 100644 eclipse/impl-vlt-test/src/main/resources/META-INF/NOTICE
delete mode 100644 eclipse/impl-vlt/META-INF/LICENSE
delete mode 100644 eclipse/impl-vlt/META-INF/MANIFEST.MF
delete mode 100644 eclipse/impl-vlt/META-INF/NOTICE
delete mode 100644 eclipse/impl-vlt/OSGI-INF/VaultFsLocatorImpl.xml
delete mode 100644 eclipse/impl-vlt/OSGI-INF/VltFilterLocator.xml
delete mode 100644 eclipse/impl-vlt/OSGI-INF/VltRepositoryFactory.xml
delete mode 100644 eclipse/impl-vlt/OSGI-INF/VltSerializationManagerImpl.xml
delete mode 100644 eclipse/impl-vlt/build.properties
delete mode 100644 eclipse/impl-vlt/pom.xml
delete mode 100644 eclipse/impl-vlt/src/org/apache/sling/ide/impl/vlt/Activator.java
delete mode 100644 eclipse/vlt-wrapper/META-INF/LICENSE
delete mode 100644 eclipse/vlt-wrapper/META-INF/MANIFEST.MF
delete mode 100644 eclipse/vlt-wrapper/META-INF/NOTICE
delete mode 100644 eclipse/vlt-wrapper/build.properties
delete mode 100644 eclipse/vlt-wrapper/lib/.gitignore
delete mode 100644 eclipse/vlt-wrapper/pom.xml
create mode 100644 shared/modules/api/bnd.bnd
rename {eclipse => shared/modules}/impl-resource/README.md (100%)
create mode 100644 shared/modules/impl-resource/bnd.bnd
copy shared/modules/{api => impl-resource}/pom.xml (79%)
rename {eclipse/impl-resource/src => shared/modules/impl-resource/src/main/java}/org/apache/sling/ide/impl/resource/filer/SimpleFilter.java (100%)
rename {eclipse/impl-resource/src => shared/modules/impl-resource/src/main/java}/org/apache/sling/ide/impl/resource/filer/SimpleFilterLocator.java (95%)
rename {eclipse/impl-resource/src => shared/modules/impl-resource/src/main/java}/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java (98%)
rename {eclipse/impl-resource/src => shared/modules/impl-resource/src/main/java}/org/apache/sling/ide/impl/resource/transport/AbstractCommand.java (100%)
rename {eclipse/impl-resource/src => shared/modules/impl-resource/src/main/java}/org/apache/sling/ide/impl/resource/transport/AbstractResult.java (100%)
rename {eclipse/impl-resource/src => shared/modules/impl-resource/src/main/java}/org/apache/sling/ide/impl/resource/transport/DeleteNodeCommand.java (100%)
rename {eclipse/impl-resource/src => shared/modules/impl-resource/src/main/java}/org/apache/sling/ide/impl/resource/transport/GetNodeCommand.java (100%)
rename {eclipse/impl-resource/src => shared/modules/impl-resource/src/main/java}/org/apache/sling/ide/impl/resource/transport/GetNodeContentCommand.java (100%)
rename {eclipse/impl-resource/src => shared/modules/impl-resource/src/main/java}/org/apache/sling/ide/impl/resource/transport/ListChildrenCommand.java (100%)
rename {eclipse/impl-resource/src => shared/modules/impl-resource/src/main/java}/org/apache/sling/ide/impl/resource/transport/RepositoryFactoryImpl.java (92%)
rename {eclipse/impl-resource/src => shared/modules/impl-resource/src/main/java}/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java (100%)
rename {eclipse/impl-resource/src => shared/modules/impl-resource/src/main/java}/org/apache/sling/ide/impl/resource/transport/UpdateContentCommand.java (100%)
rename {eclipse/impl-resource/src => shared/modules/impl-resource/src/main/java}/org/apache/sling/ide/impl/resource/util/Constants.java (100%)
rename {eclipse/impl-resource-test => shared/modules/impl-resource}/src/test/java/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManagerTest.java (100%)
rename {eclipse/impl-resource-test => shared/modules/impl-resource}/src/test/resources/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManagerTest.serializedDataIsEscaped.xml (100%)
rename {eclipse/impl-resource-test => shared/modules/impl-resource}/src/test/resources/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManagerTest.stringSerializedData.xml (100%)
rename {eclipse => shared/modules}/impl-vlt/.options (100%)
rename {eclipse => shared/modules}/impl-vlt/README.md (100%)
create mode 100644 shared/modules/impl-vlt/bnd.bnd
rename {eclipse => shared/modules}/impl-vlt/plugin.xml (100%)
copy shared/modules/{api => impl-vlt}/pom.xml (58%)
rename {eclipse/impl-vlt/src => shared/modules/impl-vlt/src/main/java}/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommand.java (100%)
rename {eclipse/impl-vlt/src => shared/modules/impl-vlt/src/main/java}/org/apache/sling/ide/impl/vlt/ConversionUtils.java (100%)
rename {eclipse/impl-vlt/src => shared/modules/impl-vlt/src/main/java}/org/apache/sling/ide/impl/vlt/DeleteNodeCommand.java (100%)
rename {eclipse/impl-vlt/src => shared/modules/impl-vlt/src/main/java}/org/apache/sling/ide/impl/vlt/GetNodeCommand.java (100%)
rename {eclipse/impl-vlt/src => shared/modules/impl-vlt/src/main/java}/org/apache/sling/ide/impl/vlt/GetNodeContentCommand.java (100%)
rename {eclipse/impl-vlt/src => shared/modules/impl-vlt/src/main/java}/org/apache/sling/ide/impl/vlt/JcrCommand.java (100%)
rename {eclipse/impl-vlt/src => shared/modules/impl-vlt/src/main/java}/org/apache/sling/ide/impl/vlt/JcrResult.java (100%)
rename {eclipse/impl-vlt/src => shared/modules/impl-vlt/src/main/java}/org/apache/sling/ide/impl/vlt/ListChildrenCommand.java (100%)
rename {eclipse/impl-vlt/src => shared/modules/impl-vlt/src/main/java}/org/apache/sling/ide/impl/vlt/ListTreeCommand.java (100%)
rename {eclipse/impl-vlt/src => shared/modules/impl-vlt/src/main/java}/org/apache/sling/ide/impl/vlt/NoOpCommand.java (100%)
rename {eclipse/impl-vlt/src => shared/modules/impl-vlt/src/main/java}/org/apache/sling/ide/impl/vlt/ReorderChildNodesCommand.java (100%)
rename {eclipse/impl-vlt/src => shared/modules/impl-vlt/src/main/java}/org/apache/sling/ide/impl/vlt/VaultFsLocator.java (100%)
rename {eclipse/impl-vlt/src => shared/modules/impl-vlt/src/main/java}/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java (97%)
rename {eclipse/impl-vlt/src => shared/modules/impl-vlt/src/main/java}/org/apache/sling/ide/impl/vlt/VltNodeDefinition.java (100%)
rename {eclipse/impl-vlt/src => shared/modules/impl-vlt/src/main/java}/org/apache/sling/ide/impl/vlt/VltNodeType.java (100%)
rename {eclipse/impl-vlt/src => shared/modules/impl-vlt/src/main/java}/org/apache/sling/ide/impl/vlt/VltNodeTypeFactory.java (100%)
rename {eclipse/impl-vlt/src => shared/modules/impl-vlt/src/main/java}/org/apache/sling/ide/impl/vlt/VltNodeTypeRegistry.java (100%)
rename {eclipse/impl-vlt/src => shared/modules/impl-vlt/src/main/java}/org/apache/sling/ide/impl/vlt/VltPropertyDefinition.java (100%)
rename {eclipse/impl-vlt/src => shared/modules/impl-vlt/src/main/java}/org/apache/sling/ide/impl/vlt/VltRepository.java (97%)
rename {eclipse/impl-vlt/src => shared/modules/impl-vlt/src/main/java}/org/apache/sling/ide/impl/vlt/VltRepositoryFactory.java (89%)
rename {eclipse/impl-vlt/src => shared/modules/impl-vlt/src/main/java}/org/apache/sling/ide/impl/vlt/filter/VltFilter.java (100%)
rename {eclipse/impl-vlt/src => shared/modules/impl-vlt/src/main/java}/org/apache/sling/ide/impl/vlt/filter/VltFilterLocator.java (91%)
rename {eclipse/impl-vlt/src => shared/modules/impl-vlt/src/main/java}/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandler.java (97%)
rename {eclipse/impl-vlt/src => shared/modules/impl-vlt/src/main/java}/org/apache/sling/ide/impl/vlt/serialization/VltSerializationDataBuilder.java (98%)
rename {eclipse/impl-vlt/src => shared/modules/impl-vlt/src/main/java}/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java (96%)
rename {eclipse/impl-vlt/src => shared/modules/impl-vlt/src/main/java}/org/apache/sling/ide/jcr/RepositoryUtils.java (96%)
copy shared/modules/{api/src/main/java/org/apache/sling/ide/log => impl-vlt/src/main/java/org/apache/sling/ide/jcr}/package-info.java (96%)
rename {eclipse/impl-vlt-test => shared/modules/impl-vlt}/src/test/java/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommandTest.java (100%)
rename {eclipse/impl-vlt-test => shared/modules/impl-vlt}/src/test/java/org/apache/sling/ide/impl/vlt/ReorderChildNodesCommandTest.java (100%)
rename {eclipse/impl-vlt-test => shared/modules/impl-vlt}/src/test/java/org/apache/sling/ide/impl/vlt/Slf4jLogger.java (98%)
rename {eclipse/impl-vlt-test => shared/modules/impl-vlt}/src/test/java/org/apache/sling/ide/impl/vlt/filter/VltFilterTest.java (100%)
rename {eclipse/impl-vlt-test => shared/modules/impl-vlt}/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java (99%)
rename {eclipse/impl-vlt-test => shared/modules/impl-vlt}/src/test/java/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManagerTest.java (100%)
rename {eclipse/impl-vlt-test => shared/modules/impl-vlt}/src/test/java/org/apache/sling/ide/impl/vlt/transport/DefaultBatcherTest.java (100%)
rename {eclipse/impl-vlt-test => shared/modules/impl-vlt}/src/test/java/org/apache/sling/ide/jcr/RepositoryUtilsTest.java (100%)
rename {eclipse/impl-vlt-test => shared/modules/impl-vlt}/src/test/resources/org/apache/sling/ide/impl/vlt/filter/filter-deep.xml (100%)
rename {eclipse/impl-vlt-test => shared/modules/impl-vlt}/src/test/resources/org/apache/sling/ide/impl/vlt/filter/filter-default.xml (100%)
rename {eclipse/impl-vlt-test => shared/modules/impl-vlt}/src/test/resources/org/apache/sling/ide/impl/vlt/filter/filter-with-include.xml (100%)
rename {eclipse/impl-vlt-test => shared/modules/impl-vlt}/src/test/resources/org/apache/sling/ide/impl/vlt/folder.cnd (100%)
rename {eclipse/impl-vlt-test => shared/modules/impl-vlt}/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/bin.binary (100%)
rename {eclipse/impl-vlt-test => shared/modules/impl-vlt}/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/binary-property.xml (100%)
rename {eclipse/impl-vlt-test => shared/modules/impl-vlt}/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/empty-multivalued-property.xml (100%)
rename {eclipse/impl-vlt-test => shared/modules/impl-vlt}/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/encoded-child-content.xml (100%)
rename {eclipse/impl-vlt-test => shared/modules/impl-vlt}/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/escaped-braces-at-start-of-property.xml (100%)
rename {eclipse/impl-vlt-test => shared/modules/impl-vlt}/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/escaped-comma-in-multi-valued-property.xml (100%)
rename {eclipse/impl-vlt-test => shared/modules/impl-vlt}/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/escaped-value-in-property.xml (100%)
rename {eclipse/impl-vlt-test => shared/modules/impl-vlt}/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/file.xml (100%)
rename {eclipse/impl-vlt-test => shared/modules/impl-vlt}/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/full-coverage-escaped-names.xml (100%)
rename {eclipse/impl-vlt-test => shared/modules/impl-vlt}/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/full-coverage.xml (100%)
rename {eclipse/impl-vlt-test => shared/modules/impl-vlt}/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/multivalued-properties-content.xml (100%)
rename {eclipse/impl-vlt-test => shared/modules/impl-vlt}/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/root-content.xml (100%)
rename {eclipse/impl-vlt-test => shared/modules/impl-vlt}/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/simple-content.xml (100%)
rename {eclipse/impl-vlt-test => shared/modules/impl-vlt}/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/single-explicit-multivalued-properties-content.xml (100%)
rename {eclipse/impl-vlt-test => shared/modules/impl-vlt}/src/test/resources/org/apache/sling/ide/impl/vlt/test-definitions.cnd (100%)
create mode 100644 shared/modules/pom.xml
rename {eclipse => shared/modules}/vlt-wrapper/README.md (100%)
create mode 100644 shared/modules/vlt-wrapper/bnd.bnd
create mode 100644 shared/modules/vlt-wrapper/pom.xml
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-ide-tooling] 03/14: SLING-5648 - Make Non-Eclipse Module
regular Maven Packages
Posted by ro...@apache.org.
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.
[sling-ide-tooling] 01/14: SLING-5648 - Make Non-Eclipse Module
regular Maven Packages
Posted by ro...@apache.org.
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 0740871bc4deeb5b68ba47bcd0e8a52dec8bc283
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 vlt-wrapper module to shared/modules.
---
eclipse/pom.xml | 1 -
eclipse/vlt-wrapper/META-INF/LICENSE | 202 ----------------------
eclipse/vlt-wrapper/META-INF/MANIFEST.MF | 60 -------
eclipse/vlt-wrapper/META-INF/NOTICE | 11 --
eclipse/vlt-wrapper/build.properties | 18 --
eclipse/vlt-wrapper/lib/.gitignore | 1 -
eclipse/vlt-wrapper/pom.xml | 178 -------------------
{eclipse => shared/modules}/vlt-wrapper/README.md | 0
shared/modules/vlt-wrapper/bnd.bnd | 37 ++++
shared/modules/vlt-wrapper/pom.xml | 132 ++++++++++++++
shared/p2/pom.xml | 5 +
shared/p2/shared-feature/feature.xml | 17 +-
shared/p2/shared-feature/pom.xml | 5 +
13 files changed, 180 insertions(+), 487 deletions(-)
diff --git a/eclipse/pom.xml b/eclipse/pom.xml
index e11145b..4e65fb5 100644
--- a/eclipse/pom.xml
+++ b/eclipse/pom.xml
@@ -41,7 +41,6 @@
<module>artifacts</module>
<module>impl-resource</module>
<module>impl-resource-test</module>
- <module>vlt-wrapper</module>
<module>impl-vlt</module>
<module>impl-vlt-test</module>
<module>eclipse-core</module>
diff --git a/eclipse/vlt-wrapper/META-INF/LICENSE b/eclipse/vlt-wrapper/META-INF/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/eclipse/vlt-wrapper/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/vlt-wrapper/META-INF/MANIFEST.MF b/eclipse/vlt-wrapper/META-INF/MANIFEST.MF
deleted file mode 100644
index 8f8c1d5..0000000
--- a/eclipse/vlt-wrapper/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,60 +0,0 @@
-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,
- javax.jcr.nodetype,
- org.apache.jackrabbit.api,
- org.apache.jackrabbit.spi.commons.conversion,
- org.apache.jackrabbit.spi.commons.namespace,
- org.apache.jackrabbit.util,
- org.apache.jackrabbit.vault.davex,
- org.apache.jackrabbit.vault.fs,
- org.apache.jackrabbit.vault.fs.api,
- org.apache.jackrabbit.vault.fs.config,
- org.apache.jackrabbit.vault.fs.filter,
- org.apache.jackrabbit.vault.fs.impl,
- org.apache.jackrabbit.vault.fs.impl.aggregator,
- org.apache.jackrabbit.vault.fs.impl.io,
- org.apache.jackrabbit.vault.fs.impl.io.legacycnd,
- org.apache.jackrabbit.vault.fs.io,
- org.apache.jackrabbit.vault.fs.spi,
- org.apache.jackrabbit.vault.fs.spi.impl.jcr20,
- org.apache.jackrabbit.vault.packaging,
- org.apache.jackrabbit.vault.packaging.impl,
- org.apache.jackrabbit.vault.util,
- org.apache.jackrabbit.vault.util.xml.serialize,
- org.apache.jackrabbit.vault.util.xml.xerces.dom,
- org.apache.jackrabbit.vault.util.xml.xerces.util,
- org.apache.jackrabbit.vault.util.xml.xerces.xni,
- org.apache.jackrabbit.vault.util.xml.xerces.xni.parser
-Require-Bundle: org.eclipse.core.runtime
-Import-Package: org.apache.commons.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/eclipse/vlt-wrapper/META-INF/NOTICE b/eclipse/vlt-wrapper/META-INF/NOTICE
deleted file mode 100644
index 45dda0c..0000000
--- a/eclipse/vlt-wrapper/META-INF/NOTICE
+++ /dev/null
@@ -1,11 +0,0 @@
-
-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/eclipse/vlt-wrapper/build.properties b/eclipse/vlt-wrapper/build.properties
deleted file mode 100644
index d3b5912..0000000
--- a/eclipse/vlt-wrapper/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-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/eclipse/vlt-wrapper/lib/.gitignore b/eclipse/vlt-wrapper/lib/.gitignore
deleted file mode 100644
index f23b948..0000000
--- a/eclipse/vlt-wrapper/lib/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.jar
\ No newline at end of file
diff --git a/eclipse/vlt-wrapper/pom.xml b/eclipse/vlt-wrapper/pom.xml
deleted file mode 100644
index 1dd9674..0000000
--- a/eclipse/vlt-wrapper/pom.xml
+++ /dev/null
@@ -1,178 +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.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>
diff --git a/eclipse/vlt-wrapper/README.md b/shared/modules/vlt-wrapper/README.md
similarity index 100%
rename from eclipse/vlt-wrapper/README.md
rename to shared/modules/vlt-wrapper/README.md
diff --git a/shared/modules/vlt-wrapper/bnd.bnd b/shared/modules/vlt-wrapper/bnd.bnd
new file mode 100644
index 0000000..378e706
--- /dev/null
+++ b/shared/modules/vlt-wrapper/bnd.bnd
@@ -0,0 +1,37 @@
+-exportcontents: javax.jcr,\
+ javax.jcr.nodetype,\
+ 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, \
+ http*.jar;lib:=true
+
diff --git a/shared/modules/vlt-wrapper/pom.xml b/shared/modules/vlt-wrapper/pom.xml
new file mode 100644
index 0000000..dd0c636
--- /dev/null
+++ b/shared/modules/vlt-wrapper/pom.xml
@@ -0,0 +1,132 @@
+<?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.vlt-wrapper</artifactId>
+ <version>1.2.3-SNAPSHOT</version>
+ <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>
+ </properties>
+</project>
diff --git a/shared/p2/pom.xml b/shared/p2/pom.xml
index edda3a4..c9902c7 100644
--- a/shared/p2/pom.xml
+++ b/shared/p2/pom.xml
@@ -43,6 +43,11 @@
<layout>p2</layout>
<url>http://download.eclipse.org/releases/luna</url>
</repository>
+ <repository>
+ <id>orbit</id>
+ <layout>p2</layout>
+ <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/</url>
+ </repository>
</repositories>
<build>
diff --git a/shared/p2/shared-feature/feature.xml b/shared/p2/shared-feature/feature.xml
index 65c0500..0533ba2 100644
--- a/shared/p2/shared-feature/feature.xml
+++ b/shared/p2/shared-feature/feature.xml
@@ -233,25 +233,10 @@
unpack="false"/>
<plugin
- id="org.apache.commons.io"
+ id="org.apache.sling.ide.vlt-wrapper"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
-
- <plugin
- id="org.apache.commons.httpclient"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="com.google.gson"
- 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 18f93ee..d41000f 100644
--- a/shared/p2/shared-feature/pom.xml
+++ b/shared/p2/shared-feature/pom.xml
@@ -20,6 +20,11 @@
<artifactId>org.apache.sling.ide.api</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.ide.vlt-wrapper</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</project>
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-ide-tooling] 11/14: SLING-5648 - Make Non-Eclipse Module
regular Maven Packages
Posted by ro...@apache.org.
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 f74cc26c5528579ef29c1b8994c64745be488137
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Apr 3 17:23:23 2018 +0300
SLING-5648 - Make Non-Eclipse Module regular Maven Packages
Make the impl-vlt bundle a singleton, otherwise Eclipse does not
parse the extension points.
---
shared/modules/impl-vlt/bnd.bnd | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/shared/modules/impl-vlt/bnd.bnd b/shared/modules/impl-vlt/bnd.bnd
index ced3679..0aff61c 100644
--- a/shared/modules/impl-vlt/bnd.bnd
+++ b/shared/modules/impl-vlt/bnd.bnd
@@ -1,2 +1,3 @@
-exportcontents: ${packages;VERSIONED}
--includeresource: plugin.xml, .options
\ No newline at end of file
+-includeresource: plugin.xml, .options
+Bundle-SymbolicName: org.apache.sling.ide.impl-vlt;singleton:=true
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-ide-tooling] 12/14: SLING-5648 - Make Non-Eclipse Module
regular Maven Packages
Posted by ro...@apache.org.
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 741787b6e66f43b93ba884fd5e50bae5b7e3392f
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Apr 3 17:23:23 2018 +0300
SLING-5648 - Make Non-Eclipse Module regular Maven Packages
Include all needed vault classes in the impl-vlt module.
---
shared/modules/vlt-wrapper/bnd.bnd | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/shared/modules/vlt-wrapper/bnd.bnd b/shared/modules/vlt-wrapper/bnd.bnd
index 8982497..337bb25 100644
--- a/shared/modules/vlt-wrapper/bnd.bnd
+++ b/shared/modules/vlt-wrapper/bnd.bnd
@@ -41,6 +41,7 @@
-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
@@ -48,4 +49,7 @@ 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.*, \
*
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-ide-tooling] 02/14: SLING-5648 - Make Non-Eclipse Module
regular Maven Packages
Posted by ro...@apache.org.
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 8aed7d9732fb731a3fbf72e3190a4c8051e97c88
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-resource and impl-resource-test modules to shared/modules.
They ended up as part of a single Maven module, now that we don't
have to split them anymore.
Note that this is not included in the p2 update site since it's not
included in the final product.
---
eclipse/impl-resource-test/README.md | 3 -
eclipse/impl-resource-test/pom.xml | 68 -------
.../src/main/resources/META-INF/LICENSE | 202 ---------------------
.../src/main/resources/META-INF/NOTICE | 11 --
eclipse/impl-resource/META-INF/LICENSE | 202 ---------------------
eclipse/impl-resource/META-INF/MANIFEST.MF | 19 --
eclipse/impl-resource/META-INF/NOTICE | 11 --
.../OSGI-INF/RepositoryFactoryImpl.xml | 24 ---
.../impl-resource/OSGI-INF/SimpleFilterLocator.xml | 23 ---
.../OSGI-INF/SimpleXmlSerializationManager.xml | 23 ---
eclipse/impl-resource/build.properties | 5 -
eclipse/impl-resource/pom.xml | 60 ------
eclipse/pom.xml | 2 -
.../modules}/impl-resource/README.md | 0
shared/modules/impl-resource/pom.xml | 88 +++++++++
.../ide/impl/resource/filer/SimpleFilter.java | 0
.../impl/resource/filer/SimpleFilterLocator.java | 2 +
.../SimpleXmlSerializationManager.java | 2 +
.../impl/resource/transport/AbstractCommand.java | 0
.../impl/resource/transport/AbstractResult.java | 0
.../impl/resource/transport/DeleteNodeCommand.java | 0
.../impl/resource/transport/GetNodeCommand.java | 0
.../resource/transport/GetNodeContentCommand.java | 0
.../resource/transport/ListChildrenCommand.java | 0
.../resource/transport/RepositoryFactoryImpl.java | 4 +
.../impl/resource/transport/RepositoryImpl.java | 0
.../resource/transport/UpdateContentCommand.java | 0
.../sling/ide/impl/resource/util/Constants.java | 0
.../SimpleXmlSerializationManagerTest.java | 0
...lizationManagerTest.serializedDataIsEscaped.xml | 0
...rializationManagerTest.stringSerializedData.xml | 0
31 files changed, 96 insertions(+), 653 deletions(-)
diff --git a/eclipse/impl-resource-test/README.md b/eclipse/impl-resource-test/README.md
deleted file mode 100644
index 6367dad..0000000
--- a/eclipse/impl-resource-test/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Apache Sling IDE Tools Resource-based Implementation Tests
-
-This module is part of the [Apache Sling](https://sling.apache.org) project.
diff --git a/eclipse/impl-resource-test/pom.xml b/eclipse/impl-resource-test/pom.xml
deleted file mode 100644
index 84b1d3f..0000000
--- a/eclipse/impl-resource-test/pom.xml
+++ /dev/null
@@ -1,68 +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-resource-test</artifactId>
- <name>Apache Sling IDE Tools Resource-based 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>
- </dependency>
- <dependency>
- <groupId>org.apache.sling.ide</groupId>
- <artifactId>org.apache.sling.ide.impl-resource</artifactId>
- <version>${project.version}</version>
- <type>eclipse-plugin</type>
- </dependency>
- <!--
- we need to pull in all transitive dependencies of the impl-resource
- bundle, since they are not exposed by Tycho(?)
- -->
- <dependency>
- <groupId>org.apache.sling.ide</groupId>
- <artifactId>org.apache.sling.ide.api</artifactId>
- <version>${project.version}</version>
- <type>eclipse-plugin</type>
- </dependency>
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20090211</version>
- </dependency>
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- <version>1.4</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/eclipse/impl-resource-test/src/main/resources/META-INF/LICENSE b/eclipse/impl-resource-test/src/main/resources/META-INF/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/eclipse/impl-resource-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-resource-test/src/main/resources/META-INF/NOTICE b/eclipse/impl-resource-test/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 98e599e..0000000
--- a/eclipse/impl-resource-test/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,11 +0,0 @@
-
-Sling IDE Tools: Resource-based 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-resource/META-INF/LICENSE b/eclipse/impl-resource/META-INF/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/eclipse/impl-resource/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-resource/META-INF/MANIFEST.MF b/eclipse/impl-resource/META-INF/MANIFEST.MF
deleted file mode 100644
index d97ade6..0000000
--- a/eclipse/impl-resource/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
-Bundle-Name: Sling IDE Resource Impl
-Bundle-SymbolicName: org.apache.sling.ide.impl-resource
-Bundle-Version: 1.2.3.qualifier
-Require-Bundle: org.eclipse.core.runtime,
- org.apache.sling.ide.api;bundle-version="0.0.1",
- org.apache.commons.httpclient;bundle-version="3.1.0",
- org.eclipse.equinox.ds;bundle-version="1.2.1",
- org.eclipse.osgi.services;bundle-version="3.2.100"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Service-Component: OSGI-INF/RepositoryFactoryImpl.xml,
- OSGI-INF/SimpleXmlSerializationManager.xml,
- OSGI-INF/SimpleFilterLocator.xml
-Import-Package: com.google.gson;version="2.2.4",
- com.google.gson.annotations;version="2.2.4",
- com.google.gson.stream;version="2.2.4"
diff --git a/eclipse/impl-resource/META-INF/NOTICE b/eclipse/impl-resource/META-INF/NOTICE
deleted file mode 100644
index ef6edea..0000000
--- a/eclipse/impl-resource/META-INF/NOTICE
+++ /dev/null
@@ -1,11 +0,0 @@
-
-Sling IDE Tools: Resource-based 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-resource/OSGI-INF/RepositoryFactoryImpl.xml b/eclipse/impl-resource/OSGI-INF/RepositoryFactoryImpl.xml
deleted file mode 100644
index 39fcdaa..0000000
--- a/eclipse/impl-resource/OSGI-INF/RepositoryFactoryImpl.xml
+++ /dev/null
@@ -1,24 +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.resource.transport.RepositoryFactoryImpl"/>
- <service>
- <provide interface="org.apache.sling.ide.transport.RepositoryFactory"/>
- </service>
- <reference bind="bindEventAdmin" cardinality="1..1" interface="org.osgi.service.event.EventAdmin" name="EventAdmin" policy="static" unbind="unbindEventAdmin"/>
-</scr:component>
diff --git a/eclipse/impl-resource/OSGI-INF/SimpleFilterLocator.xml b/eclipse/impl-resource/OSGI-INF/SimpleFilterLocator.xml
deleted file mode 100644
index 9ea7b60..0000000
--- a/eclipse/impl-resource/OSGI-INF/SimpleFilterLocator.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.resource.filer.SimpleFilterLocator"/>
- <service>
- <provide interface="org.apache.sling.ide.filter.FilterLocator"/>
- </service>>
-</scr:component>
diff --git a/eclipse/impl-resource/OSGI-INF/SimpleXmlSerializationManager.xml b/eclipse/impl-resource/OSGI-INF/SimpleXmlSerializationManager.xml
deleted file mode 100644
index e03ba83..0000000
--- a/eclipse/impl-resource/OSGI-INF/SimpleXmlSerializationManager.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.resource.serialization.SimpleXmlSerializationManager"/>
- <service>
- <provide interface="org.apache.sling.ide.serialization.SerializationManager"/>
- </service>
-</scr:component>
diff --git a/eclipse/impl-resource/build.properties b/eclipse/impl-resource/build.properties
deleted file mode 100644
index 39aa3ed..0000000
--- a/eclipse/impl-resource/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- OSGI-INF/,
-source.. = src/
diff --git a/eclipse/impl-resource/pom.xml b/eclipse/impl-resource/pom.xml
deleted file mode 100644
index 94e2a62..0000000
--- a/eclipse/impl-resource/pom.xml
+++ /dev/null
@@ -1,60 +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-resource</artifactId>
- <packaging>eclipse-plugin</packaging>
- <name>Apache Sling IDE Tools Resource-based 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>
- </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/pom.xml b/eclipse/pom.xml
index 4e65fb5..650f63e 100644
--- a/eclipse/pom.xml
+++ b/eclipse/pom.xml
@@ -39,8 +39,6 @@
<modules>
<module>target-definition</module>
<module>artifacts</module>
- <module>impl-resource</module>
- <module>impl-resource-test</module>
<module>impl-vlt</module>
<module>impl-vlt-test</module>
<module>eclipse-core</module>
diff --git a/eclipse/impl-resource/README.md b/shared/modules/impl-resource/README.md
similarity index 100%
rename from eclipse/impl-resource/README.md
rename to shared/modules/impl-resource/README.md
diff --git a/shared/modules/impl-resource/pom.xml b/shared/modules/impl-resource/pom.xml
new file mode 100644
index 0000000..f89329c
--- /dev/null
+++ b/shared/modules/impl-resource/pom.xml
@@ -0,0 +1,88 @@
+<?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-resource</artifactId>
+ <version>1.2.3-SNAPSHOT</version>
+ <name>Apache Sling IDE Tools Resource-based 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>
+ </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>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.8.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.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.metatype.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <version>1.4</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/filer/SimpleFilter.java b/shared/modules/impl-resource/src/main/java/org/apache/sling/ide/impl/resource/filer/SimpleFilter.java
similarity index 100%
rename from eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/filer/SimpleFilter.java
rename to shared/modules/impl-resource/src/main/java/org/apache/sling/ide/impl/resource/filer/SimpleFilter.java
diff --git a/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/filer/SimpleFilterLocator.java b/shared/modules/impl-resource/src/main/java/org/apache/sling/ide/impl/resource/filer/SimpleFilterLocator.java
similarity index 95%
rename from eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/filer/SimpleFilterLocator.java
rename to shared/modules/impl-resource/src/main/java/org/apache/sling/ide/impl/resource/filer/SimpleFilterLocator.java
index ac6739c..5c0dcc5 100644
--- a/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/filer/SimpleFilterLocator.java
+++ b/shared/modules/impl-resource/src/main/java/org/apache/sling/ide/impl/resource/filer/SimpleFilterLocator.java
@@ -26,6 +26,7 @@ import java.util.List;
import org.apache.sling.ide.filter.Filter;
import org.apache.sling.ide.filter.FilterLocator;
+import org.osgi.service.component.annotations.Component;
/**
* The <tt>SimpleFilterLocator</tt> looks for a file named {@value #FILTERS_FILE_NAME} in the parent folder of the
@@ -38,6 +39,7 @@ import org.apache.sling.ide.filter.FilterLocator;
* @see SimpleFilter
*
*/
+@Component(service = FilterLocator.class)
public class SimpleFilterLocator implements FilterLocator {
private static final String FILTERS_FILE_NAME = "filters.txt";
diff --git a/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java b/shared/modules/impl-resource/src/main/java/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java
similarity index 98%
rename from eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java
rename to shared/modules/impl-resource/src/main/java/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java
index 0d9c632..eefe97d 100644
--- a/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java
+++ b/shared/modules/impl-resource/src/main/java/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java
@@ -44,12 +44,14 @@ import org.apache.sling.ide.serialization.SerializationKind;
import org.apache.sling.ide.serialization.SerializationManager;
import org.apache.sling.ide.transport.Repository;
import org.apache.sling.ide.transport.ResourceProxy;
+import org.osgi.service.component.annotations.Component;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
import org.xml.sax.helpers.DefaultHandler;
+@Component(service = SerializationManager.class)
public class SimpleXmlSerializationManager implements SerializationManager, SerializationDataBuilder {
private static final String TAG_PROPERTY = "property";
diff --git a/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/AbstractCommand.java b/shared/modules/impl-resource/src/main/java/org/apache/sling/ide/impl/resource/transport/AbstractCommand.java
similarity index 100%
rename from eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/AbstractCommand.java
rename to shared/modules/impl-resource/src/main/java/org/apache/sling/ide/impl/resource/transport/AbstractCommand.java
diff --git a/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/AbstractResult.java b/shared/modules/impl-resource/src/main/java/org/apache/sling/ide/impl/resource/transport/AbstractResult.java
similarity index 100%
rename from eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/AbstractResult.java
rename to shared/modules/impl-resource/src/main/java/org/apache/sling/ide/impl/resource/transport/AbstractResult.java
diff --git a/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/DeleteNodeCommand.java b/shared/modules/impl-resource/src/main/java/org/apache/sling/ide/impl/resource/transport/DeleteNodeCommand.java
similarity index 100%
rename from eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/DeleteNodeCommand.java
rename to shared/modules/impl-resource/src/main/java/org/apache/sling/ide/impl/resource/transport/DeleteNodeCommand.java
diff --git a/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/GetNodeCommand.java b/shared/modules/impl-resource/src/main/java/org/apache/sling/ide/impl/resource/transport/GetNodeCommand.java
similarity index 100%
rename from eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/GetNodeCommand.java
rename to shared/modules/impl-resource/src/main/java/org/apache/sling/ide/impl/resource/transport/GetNodeCommand.java
diff --git a/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/GetNodeContentCommand.java b/shared/modules/impl-resource/src/main/java/org/apache/sling/ide/impl/resource/transport/GetNodeContentCommand.java
similarity index 100%
rename from eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/GetNodeContentCommand.java
rename to shared/modules/impl-resource/src/main/java/org/apache/sling/ide/impl/resource/transport/GetNodeContentCommand.java
diff --git a/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/ListChildrenCommand.java b/shared/modules/impl-resource/src/main/java/org/apache/sling/ide/impl/resource/transport/ListChildrenCommand.java
similarity index 100%
rename from eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/ListChildrenCommand.java
rename to shared/modules/impl-resource/src/main/java/org/apache/sling/ide/impl/resource/transport/ListChildrenCommand.java
diff --git a/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryFactoryImpl.java b/shared/modules/impl-resource/src/main/java/org/apache/sling/ide/impl/resource/transport/RepositoryFactoryImpl.java
similarity index 92%
rename from eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryFactoryImpl.java
rename to shared/modules/impl-resource/src/main/java/org/apache/sling/ide/impl/resource/transport/RepositoryFactoryImpl.java
index c468acb..0753271 100644
--- a/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryFactoryImpl.java
+++ b/shared/modules/impl-resource/src/main/java/org/apache/sling/ide/impl/resource/transport/RepositoryFactoryImpl.java
@@ -20,14 +20,18 @@ 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>RepositoryFactoryImpl</tt> creates <tt>RepositoryImpl</tt> instances
*
*/
+@Component(service = RepositoryFactory.class)
public class RepositoryFactoryImpl implements RepositoryFactory {
+ @Reference
private EventAdmin eventAdmin;
@Override
diff --git a/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java b/shared/modules/impl-resource/src/main/java/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java
similarity index 100%
rename from eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java
rename to shared/modules/impl-resource/src/main/java/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java
diff --git a/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/UpdateContentCommand.java b/shared/modules/impl-resource/src/main/java/org/apache/sling/ide/impl/resource/transport/UpdateContentCommand.java
similarity index 100%
rename from eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/UpdateContentCommand.java
rename to shared/modules/impl-resource/src/main/java/org/apache/sling/ide/impl/resource/transport/UpdateContentCommand.java
diff --git a/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/Constants.java b/shared/modules/impl-resource/src/main/java/org/apache/sling/ide/impl/resource/util/Constants.java
similarity index 100%
rename from eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/Constants.java
rename to shared/modules/impl-resource/src/main/java/org/apache/sling/ide/impl/resource/util/Constants.java
diff --git a/eclipse/impl-resource-test/src/test/java/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManagerTest.java b/shared/modules/impl-resource/src/test/java/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManagerTest.java
similarity index 100%
rename from eclipse/impl-resource-test/src/test/java/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManagerTest.java
rename to shared/modules/impl-resource/src/test/java/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManagerTest.java
diff --git a/eclipse/impl-resource-test/src/test/resources/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManagerTest.serializedDataIsEscaped.xml b/shared/modules/impl-resource/src/test/resources/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManagerTest.serializedDataIsEscaped.xml
similarity index 100%
rename from eclipse/impl-resource-test/src/test/resources/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManagerTest.serializedDataIsEscaped.xml
rename to shared/modules/impl-resource/src/test/resources/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManagerTest.serializedDataIsEscaped.xml
diff --git a/eclipse/impl-resource-test/src/test/resources/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManagerTest.stringSerializedData.xml b/shared/modules/impl-resource/src/test/resources/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManagerTest.stringSerializedData.xml
similarity index 100%
rename from eclipse/impl-resource-test/src/test/resources/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManagerTest.stringSerializedData.xml
rename to shared/modules/impl-resource/src/test/resources/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManagerTest.stringSerializedData.xml
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-ide-tooling] 14/14: SLING-5648 - Make Non-Eclipse Module
regular Maven Packages
Posted by ro...@apache.org.
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 88f99e046b7e3d33890b441ffc62b2bef743c348
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Apr 3 17:23:23 2018 +0300
SLING-5648 - Make Non-Eclipse Module regular Maven Packages
Allow impl-vlt to contribute a PluginLogger without explicitly relying on eclipse-core.
---
.../eclipse/core/debug/PluginLoggerRegistrar.java | 62 +++++++++++++++++++---
.../sling/ide/eclipse/core/debug/impl/Tracer.java | 15 +++---
.../sling/ide/eclipse/core/internal/Activator.java | 11 +++-
.../sling/ide/eclipse/m2e/internal/Activator.java | 2 +-
.../ide/eclipse/sightly/internal/Activator.java | 2 +-
.../sling/ide/eclipse/ui/internal/Activator.java | 2 +-
shared/modules/impl-vlt/bnd.bnd | 1 +
.../sling/ide/impl/vlt/VltRepositoryFactory.java | 4 +-
.../vlt/serialization/VltSerializationManager.java | 1 -
9 files changed, 78 insertions(+), 22 deletions(-)
diff --git a/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/PluginLoggerRegistrar.java b/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/PluginLoggerRegistrar.java
index 969a756..25b40fc 100644
--- a/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/PluginLoggerRegistrar.java
+++ b/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/PluginLoggerRegistrar.java
@@ -18,38 +18,84 @@ package org.apache.sling.ide.eclipse.core.debug;
import java.util.Dictionary;
import java.util.Hashtable;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import org.apache.sling.ide.eclipse.core.debug.impl.Tracer;
import org.apache.sling.ide.log.Logger;
-import org.eclipse.core.runtime.Plugin;
import org.eclipse.osgi.service.debug.DebugOptions;
import org.eclipse.osgi.service.debug.DebugOptionsListener;
+import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.BundleListener;
import org.osgi.framework.ServiceRegistration;
/**
* The <tt>PluginLoggerRegistrar</tt> registers {@link Logger} implementations for use for specific plugins
*
*/
-public class PluginLoggerRegistrar {
+public class PluginLoggerRegistrar implements BundleListener {
+
+ private final ConcurrentMap<Long, ServiceRegistration<Logger>> registrations = new ConcurrentHashMap<>();
/**
- * Registers a new tracer for the specified plugin
+ * Registers a new tracer for the specified bundle
*
- * @param plugin the plugin to register for
+ * @param bundle the bundle to register for
* @return the service registration
*/
- public static ServiceRegistration<Logger> register(Plugin plugin) {
+ public static ServiceRegistration<Logger> register(Bundle bundle) {
Dictionary<String, Object> props = new Hashtable<>();
- props.put(DebugOptions.LISTENER_SYMBOLICNAME, plugin.getBundle().getSymbolicName());
- BundleContext ctx = plugin.getBundle().getBundleContext();
+ props.put(DebugOptions.LISTENER_SYMBOLICNAME, bundle.getSymbolicName());
+ BundleContext ctx = bundle.getBundleContext();
// safe to downcast since we are registering the Tracer which implements Logger
@SuppressWarnings("unchecked")
ServiceRegistration<Logger> serviceRegistration = (ServiceRegistration<Logger>) ctx.registerService(new String[] { DebugOptionsListener.class.getName(), Logger.class.getName() },
- new Tracer(plugin), props);
+ new Tracer(bundle), props);
+
return serviceRegistration;
}
+
+ public void init(Bundle[] bundles) {
+ for ( Bundle bundle : bundles )
+ registerIfEnabled(bundle);
+ }
+
+ public void shutdown() {
+ for ( ServiceRegistration<Logger> reg : registrations.values() )
+ reg.unregister();
+ }
+
+ @Override
+ public void bundleChanged(BundleEvent evt) {
+ switch ( evt.getType() ) {
+ case BundleEvent.STARTED:
+ registerIfEnabled(evt.getBundle());
+ break;
+
+ case BundleEvent.STOPPING:
+ unregister(evt.getBundle());
+ break;
+ }
+ }
+
+ private void unregister(Bundle bundle) {
+ ServiceRegistration<Logger> reg = registrations.remove(bundle.getBundleId());
+ if ( reg != null )
+ reg.unregister();
+
+ }
+
+ private void registerIfEnabled(final Bundle bundle) {
+ String enabled = bundle.getHeaders().get("SlingIDE-PluginLoggerEnabled");
+ if ( Boolean.valueOf(enabled)) {
+ System.out.println("Registering for bundle " + bundle.getSymbolicName());
+ ServiceRegistration<Logger> reg = register(bundle);
+ registrations.put(bundle.getBundleId(), reg);
+ }
+ }
}
diff --git a/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/impl/Tracer.java b/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/impl/Tracer.java
index d5abe22..cea6f88 100644
--- a/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/impl/Tracer.java
+++ b/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/impl/Tracer.java
@@ -20,12 +20,13 @@ import java.util.Date;
import org.apache.sling.ide.log.Logger;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.osgi.service.debug.DebugOptions;
import org.eclipse.osgi.service.debug.DebugOptionsListener;
import org.eclipse.osgi.service.debug.DebugTrace;
import org.eclipse.osgi.util.NLS;
+import org.osgi.framework.Bundle;
/**
* The <tt>Tracer</tt> is the default implementation of the <tt>Logger</tt>
@@ -34,20 +35,20 @@ public class Tracer implements DebugOptionsListener, Logger {
private static final long PERF_IGNORE_THRESHOLD = 50;
- private final Plugin plugin;
+ private final Bundle bundle;
private boolean debugEnabled;
private boolean consoleEnabled;
private boolean performanceEnabled;
private DebugTrace trace;
- public Tracer(Plugin plugin) {
- this.plugin = plugin;
+ public Tracer(Bundle bundle) {
+ this.bundle = bundle;
}
@Override
public void optionsChanged(DebugOptions options) {
- String pluginId = plugin.getBundle().getSymbolicName();
+ String pluginId = bundle.getSymbolicName();
debugEnabled = options.getBooleanOption(pluginId + "/debug", false);
consoleEnabled = options.getBooleanOption(pluginId + "/debug/console", false) && debugEnabled;
@@ -73,7 +74,7 @@ public class Tracer implements DebugOptionsListener, Logger {
private void writeToConsole(String message, Throwable t) {
System.out.println("[" + Thread.currentThread().getName() + "] " + new Date() + " "
- + plugin.getBundle().getSymbolicName() + " : " + message);
+ + bundle.getSymbolicName() + " : " + message);
if (t != null)
t.printStackTrace(System.out);
}
@@ -130,6 +131,6 @@ public class Tracer implements DebugOptionsListener, Logger {
}
private void logInternal(int statusCode, String message, Throwable cause) {
- plugin.getLog().log(new Status(statusCode, plugin.getBundle().getSymbolicName(), message, cause));
+ Platform.getLog(bundle).log(new Status(statusCode, bundle.getSymbolicName(), message, cause));
}
}
diff --git a/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Activator.java b/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Activator.java
index f3671d5..1cebe9c 100644
--- a/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Activator.java
+++ b/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Activator.java
@@ -70,11 +70,17 @@ public class Activator extends Plugin {
private Preferences preferences;
+ private PluginLoggerRegistrar pluginLoggerRegistrar;
+
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
+
+ pluginLoggerRegistrar = new PluginLoggerRegistrar();
+ pluginLoggerRegistrar.init(context.getBundles());
+ context.addBundleListener(pluginLoggerRegistrar);
- tracerRegistration = PluginLoggerRegistrar.register(this);
+ tracerRegistration = PluginLoggerRegistrar.register(context.getBundle());
eventAdmin = new ServiceTracker<>(context, EventAdmin.class, null);
eventAdmin.open();
@@ -111,6 +117,9 @@ public class Activator extends Plugin {
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
public void stop(BundleContext context) throws Exception {
+
+ context.removeBundleListener(pluginLoggerRegistrar);
+ pluginLoggerRegistrar.shutdown();
tracerRegistration.unregister();
diff --git a/eclipse/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/Activator.java b/eclipse/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/Activator.java
index 10ef667..2c7401d 100644
--- a/eclipse/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/Activator.java
+++ b/eclipse/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/Activator.java
@@ -62,7 +62,7 @@ public class Activator extends Plugin {
null);
osgiClientFactory.open();
- tracerRegistration = PluginLoggerRegistrar.register(this);
+ tracerRegistration = PluginLoggerRegistrar.register(context.getBundle());
tracer = new ServiceTracker<>(context, tracerRegistration.getReference(), null);
tracer.open();
diff --git a/eclipse/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/Activator.java b/eclipse/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/Activator.java
index 554c372..42c07a0 100644
--- a/eclipse/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/Activator.java
+++ b/eclipse/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/Activator.java
@@ -39,7 +39,7 @@ public class Activator extends Plugin {
public void start(BundleContext context) throws Exception {
- loggerRegistration = PluginLoggerRegistrar.register(this);
+ loggerRegistration = PluginLoggerRegistrar.register(context.getBundle());
loggerTracker = new ServiceTracker<>(context, loggerRegistration.getReference(), null);
loggerTracker.open();
diff --git a/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java b/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java
index 27141be..c8864dc 100644
--- a/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java
+++ b/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java
@@ -59,7 +59,7 @@ public class Activator extends AbstractUIPlugin {
public void start(BundleContext context) throws Exception {
super.start(context);
- tracerRegistration = PluginLoggerRegistrar.register(this);
+ tracerRegistration = PluginLoggerRegistrar.register(context.getBundle());
serializationManager = new ServiceTracker<>(context, SerializationManager.class, null);
serializationManager.open();
diff --git a/shared/modules/impl-vlt/bnd.bnd b/shared/modules/impl-vlt/bnd.bnd
index 9906412..398eae2 100644
--- a/shared/modules/impl-vlt/bnd.bnd
+++ b/shared/modules/impl-vlt/bnd.bnd
@@ -2,3 +2,4 @@ Bundle-ActivationPolicy: lazy
-exportcontents: ${packages;VERSIONED}
-includeresource: plugin.xml, .options
Bundle-SymbolicName: org.apache.sling.ide.impl-vlt;singleton:=true
+SlingIDE-PluginLoggerEnabled: true
\ No newline at end of file
diff --git a/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/VltRepositoryFactory.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/VltRepositoryFactory.java
index fab8329..5b3dc00 100644
--- a/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/VltRepositoryFactory.java
+++ b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/VltRepositoryFactory.java
@@ -38,9 +38,9 @@ public class VltRepositoryFactory implements RepositoryFactory {
@Reference
private EventAdmin eventAdmin;
- @Reference
+ @Reference(target = "(listener.symbolic.name=org.apache.sling.ide.impl-vlt)")
private Logger logger;
-
+
private Map<String,VltRepository> repositoryMap = new HashMap<>();
@Override
diff --git a/shared/modules/impl-vlt/src/main/java/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
index 42909a6..a68475f 100644
--- a/shared/modules/impl-vlt/src/main/java/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
@@ -58,7 +58,6 @@ public class VltSerializationManager implements SerializationManager {
static final String EXTENSION_XML = ".xml";
- @Reference
private VltSerializationDataBuilder builder;
@Reference
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-ide-tooling] 08/14: SLING-5648 - Make Non-Eclipse Module
regular Maven Packages
Posted by ro...@apache.org.
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 09c7666927acb6ff9e133fd1160fc54d932a9771
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Apr 3 17:23:23 2018 +0300
SLING-5648 - Make Non-Eclipse Module regular Maven Packages
Wider import range for commons-io in the API module to ensure it
resolves against the Eclipse-provided bundles.
---
shared/modules/api/bnd.bnd | 2 ++
1 file changed, 2 insertions(+)
diff --git a/shared/modules/api/bnd.bnd b/shared/modules/api/bnd.bnd
index dbeea24..c3a24eb 100644
--- a/shared/modules/api/bnd.bnd
+++ b/shared/modules/api/bnd.bnd
@@ -1 +1,3 @@
-exportcontents: ${packages;VERSIONED}
+Import-Package: org.apache.commons.io;version="[1.4,3)", \
+ *
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-ide-tooling] 09/14: SLING-5648 - Make Non-Eclipse Module
regular Maven Packages
Posted by ro...@apache.org.
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 d56e4349ae94d174cc1973201a211be84fe3895b
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Apr 3 17:23:23 2018 +0300
SLING-5648 - Make Non-Eclipse Module regular Maven Packages
Ensure that vlt-wrapper dependencies resolve in the Eclipse target
platform.
---
shared/modules/vlt-wrapper/bnd.bnd | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/shared/modules/vlt-wrapper/bnd.bnd b/shared/modules/vlt-wrapper/bnd.bnd
index 449975b..61c8f7b 100644
--- a/shared/modules/vlt-wrapper/bnd.bnd
+++ b/shared/modules/vlt-wrapper/bnd.bnd
@@ -43,4 +43,8 @@
vault-*;lib:=true, \
http*.jar;lib:=true
-Import-Package: sun.misc;resolution:=optional, *
+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)", \
+ *
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-ide-tooling] 13/14: SLING-5648 - Make Non-Eclipse Module
regular Maven Packages
Posted by ro...@apache.org.
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 1fa5d5621d27b40d8e49363559a8bf8aa02bb938
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Apr 3 17:23:23 2018 +0300
SLING-5648 - Make Non-Eclipse Module regular Maven Packages
Make all module bundles lazily activated, as recommended by
Eclipse best practices.
---
shared/modules/api/bnd.bnd | 4 +++-
shared/modules/impl-resource/bnd.bnd | 1 +
shared/modules/impl-vlt/bnd.bnd | 1 +
shared/modules/vlt-wrapper/bnd.bnd | 2 ++
4 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/shared/modules/api/bnd.bnd b/shared/modules/api/bnd.bnd
index c3a24eb..560e80b 100644
--- a/shared/modules/api/bnd.bnd
+++ b/shared/modules/api/bnd.bnd
@@ -1,3 +1,5 @@
+Bundle-ActivationPolicy: lazy
+
-exportcontents: ${packages;VERSIONED}
Import-Package: org.apache.commons.io;version="[1.4,3)", \
- *
+ *
\ No newline at end of file
diff --git a/shared/modules/impl-resource/bnd.bnd b/shared/modules/impl-resource/bnd.bnd
index dbeea24..bd7875f 100644
--- a/shared/modules/impl-resource/bnd.bnd
+++ b/shared/modules/impl-resource/bnd.bnd
@@ -1 +1,2 @@
+Bundle-ActivationPolicy: lazy
-exportcontents: ${packages;VERSIONED}
diff --git a/shared/modules/impl-vlt/bnd.bnd b/shared/modules/impl-vlt/bnd.bnd
index 0aff61c..9906412 100644
--- a/shared/modules/impl-vlt/bnd.bnd
+++ b/shared/modules/impl-vlt/bnd.bnd
@@ -1,3 +1,4 @@
+Bundle-ActivationPolicy: lazy
-exportcontents: ${packages;VERSIONED}
-includeresource: plugin.xml, .options
Bundle-SymbolicName: org.apache.sling.ide.impl-vlt;singleton:=true
diff --git a/shared/modules/vlt-wrapper/bnd.bnd b/shared/modules/vlt-wrapper/bnd.bnd
index 337bb25..b27c029 100644
--- a/shared/modules/vlt-wrapper/bnd.bnd
+++ b/shared/modules/vlt-wrapper/bnd.bnd
@@ -1,3 +1,5 @@
+Bundle-ActivationPolicy: lazy
+
-exportcontents: javax.jcr,\
javax.jcr.nodetype,\
javax.jcr.lock,\
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-ide-tooling] 10/14: SLING-5648 - Make Non-Eclipse Module
regular Maven Packages
Posted by ro...@apache.org.
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 cf5469409611ca2c25c1c1fe860e8145742dc394
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Apr 3 17:23:23 2018 +0300
SLING-5648 - Make Non-Eclipse Module regular Maven Packages
Actually include the javax.jcr classes in the vlt-wrapper module.
---
shared/modules/vlt-wrapper/bnd.bnd | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/shared/modules/vlt-wrapper/bnd.bnd b/shared/modules/vlt-wrapper/bnd.bnd
index 61c8f7b..8982497 100644
--- a/shared/modules/vlt-wrapper/bnd.bnd
+++ b/shared/modules/vlt-wrapper/bnd.bnd
@@ -41,7 +41,8 @@
-includeresource: guava-*.jar;lib:=true,\
jackrabbit-*.jar;lib:=true, \
vault-*;lib:=true, \
- http*.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)", \
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-ide-tooling] 04/14: Do not track derby.log files
Posted by ro...@apache.org.
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 c49053e75b7d9bd30900bede7e525d85b2c378a5
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Wed Apr 4 13:20:52 2018 +0300
Do not track derby.log files
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index 7fa4d65..6cb7699 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ maven-eclipse.xml
.DS_Store
jcr.log
atlassian-ide-plugin.xml
+derby.log
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-ide-tooling] 06/14: SLING-5648 - Make Non-Eclipse Module
regular Maven Packages
Posted by ro...@apache.org.
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 21a335da52f9b6d0aaa9757f253fa94d1011fbce
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Apr 3 17:23:23 2018 +0300
SLING-5648 - Make Non-Eclipse Module regular Maven Packages
Make the p2 repository for the shared modules actually work.
---
shared/p2/shared-feature/pom.xml | 11 ++++++++---
shared/p2/shared-repository/pom.xml | 17 ++++++++++++++++-
2 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/shared/p2/shared-feature/pom.xml b/shared/p2/shared-feature/pom.xml
index 3fa19d0..0498268 100644
--- a/shared/p2/shared-feature/pom.xml
+++ b/shared/p2/shared-feature/pom.xml
@@ -16,20 +16,25 @@
<dependencies>
<dependency>
- <groupId>org.apache.sling</groupId>
+ <groupId>org.apache.sling.ide</groupId>
<artifactId>org.apache.sling.ide.api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.sling</groupId>
+ <groupId>org.apache.sling.ide</groupId>
<artifactId>org.apache.sling.ide.vlt-wrapper</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.sling</groupId>
+ <groupId>org.apache.sling.ide</groupId>
<artifactId>org.apache.sling.ide.impl-vlt</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>2.0</version>
+ </dependency>
</dependencies>
</project>
diff --git a/shared/p2/shared-repository/pom.xml b/shared/p2/shared-repository/pom.xml
index 7ec884d..daadf5e 100644
--- a/shared/p2/shared-repository/pom.xml
+++ b/shared/p2/shared-repository/pom.xml
@@ -16,10 +16,25 @@
<dependencies>
<dependency>
- <groupId>org.apache.sling</groupId>
+ <groupId>org.apache.sling.ide</groupId>
<artifactId>org.apache.sling.ide.api</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.sling.ide</groupId>
+ <artifactId>org.apache.sling.ide.vlt-wrapper</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling.ide</groupId>
+ <artifactId>org.apache.sling.ide.impl-vlt</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>2.0</version>
+ </dependency>
</dependencies>
</project>
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-ide-tooling] 05/14: SLING-5648 - Make Non-Eclipse Module
regular Maven Packages
Posted by ro...@apache.org.
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 f7a4d476e4183d370d7656035df9837502d30976
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Apr 3 17:23:23 2018 +0300
SLING-5648 - Make Non-Eclipse Module regular Maven Packages
Improvements to shared/modules:
- add bnd.bnd files to make sure the bnd profile is picked up
and the correct MANIFEST.MF packed
- add a reactor module
---
shared/modules/api/bnd.bnd | 1 +
shared/modules/api/pom.xml | 1 +
shared/modules/impl-resource/bnd.bnd | 1 +
shared/modules/impl-resource/pom.xml | 3 ++-
shared/modules/impl-vlt/pom.xml | 3 ++-
shared/modules/pom.xml | 41 ++++++++++++++++++++++++++++++++++++
shared/modules/vlt-wrapper/bnd.bnd | 1 +
shared/modules/vlt-wrapper/pom.xml | 1 +
8 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/shared/modules/api/bnd.bnd b/shared/modules/api/bnd.bnd
new file mode 100644
index 0000000..dbeea24
--- /dev/null
+++ b/shared/modules/api/bnd.bnd
@@ -0,0 +1 @@
+-exportcontents: ${packages;VERSIONED}
diff --git a/shared/modules/api/pom.xml b/shared/modules/api/pom.xml
index ca1c466..2f6a2c1 100644
--- a/shared/modules/api/pom.xml
+++ b/shared/modules/api/pom.xml
@@ -19,6 +19,7 @@
<artifactId>sling</artifactId>
<version>33</version>
</parent>
+ <groupId>org.apache.sling.ide</groupId>
<artifactId>org.apache.sling.ide.api</artifactId>
<name>Apache Sling IDE Tools API</name>
<version>1.2.3-SNAPSHOT</version>
diff --git a/shared/modules/impl-resource/bnd.bnd b/shared/modules/impl-resource/bnd.bnd
new file mode 100644
index 0000000..dbeea24
--- /dev/null
+++ b/shared/modules/impl-resource/bnd.bnd
@@ -0,0 +1 @@
+-exportcontents: ${packages;VERSIONED}
diff --git a/shared/modules/impl-resource/pom.xml b/shared/modules/impl-resource/pom.xml
index f89329c..29aeccf 100644
--- a/shared/modules/impl-resource/pom.xml
+++ b/shared/modules/impl-resource/pom.xml
@@ -20,6 +20,7 @@
<version>33</version>
</parent>
+ <groupId>org.apache.sling.ide</groupId>
<artifactId>org.apache.sling.ide.impl-resource</artifactId>
<version>1.2.3-SNAPSHOT</version>
<name>Apache Sling IDE Tools Resource-based Implementation</name>
@@ -41,7 +42,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.sling</groupId>
+ <groupId>org.apache.sling.ide</groupId>
<artifactId>org.apache.sling.ide.api</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
diff --git a/shared/modules/impl-vlt/pom.xml b/shared/modules/impl-vlt/pom.xml
index 8333a97..19e9fb0 100644
--- a/shared/modules/impl-vlt/pom.xml
+++ b/shared/modules/impl-vlt/pom.xml
@@ -20,6 +20,7 @@
<version>33</version>
</parent>
+ <groupId>org.apache.sling.ide</groupId>
<artifactId>org.apache.sling.ide.impl-vlt</artifactId>
<version>1.2.3-SNAPSHOT</version>
<name>Apache Sling IDE Tools FileVault implementation</name>
@@ -51,7 +52,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.sling</groupId>
+ <groupId>org.apache.sling.ide</groupId>
<artifactId>org.apache.sling.ide.api</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
diff --git a/shared/modules/pom.xml b/shared/modules/pom.xml
new file mode 100644
index 0000000..11a3734
--- /dev/null
+++ b/shared/modules/pom.xml
@@ -0,0 +1,41 @@
+<?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</groupId>
+ <artifactId>apache</artifactId>
+ <version>14</version>
+ </parent>
+ <groupId>org.apache.sling.ide</groupId>
+ <artifactId>sling-ide-tooling-shared</artifactId>
+ <version>1.2.3-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Apache Sling IDE Tools - Shared Modules</name>
+ <url>http://sling.apache.org</url>
+
+ <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>
+
+ <modules>
+ <module>api</module>
+ <module>impl-resource</module>
+ <module>impl-vlt</module>
+ <module>vlt-wrapper</module>
+ </modules>
+</project>
diff --git a/shared/modules/vlt-wrapper/bnd.bnd b/shared/modules/vlt-wrapper/bnd.bnd
index 378e706..679bf03 100644
--- a/shared/modules/vlt-wrapper/bnd.bnd
+++ b/shared/modules/vlt-wrapper/bnd.bnd
@@ -35,3 +35,4 @@
vault-*;lib:=true, \
http*.jar;lib:=true
+Import-Package: sun.misc;resolution:=optional, *
\ No newline at end of file
diff --git a/shared/modules/vlt-wrapper/pom.xml b/shared/modules/vlt-wrapper/pom.xml
index dd0c636..2c6d95a 100644
--- a/shared/modules/vlt-wrapper/pom.xml
+++ b/shared/modules/vlt-wrapper/pom.xml
@@ -20,6 +20,7 @@
<version>33</version>
</parent>
+ <groupId>org.apache.sling.ide</groupId>
<artifactId>org.apache.sling.ide.vlt-wrapper</artifactId>
<version>1.2.3-SNAPSHOT</version>
<name>Apache Sling IDE Tools FileVault wrapper</name>
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-ide-tooling] 07/14: SLING-5648 - Make Non-Eclipse Module
regular Maven Packages
Posted by ro...@apache.org.
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 17de862040526bd1b5e1b2cf57afc77a273c2035
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Apr 3 17:23:23 2018 +0300
SLING-5648 - Make Non-Eclipse Module regular Maven Packages
Export all javax.jcr packages from impl-vlt, removing the need to
reference the javax.jcr artifact.
---
shared/modules/vlt-wrapper/bnd.bnd | 10 +++++++++-
shared/p2/shared-feature/pom.xml | 5 -----
shared/p2/shared-repository/pom.xml | 5 -----
3 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/shared/modules/vlt-wrapper/bnd.bnd b/shared/modules/vlt-wrapper/bnd.bnd
index 679bf03..449975b 100644
--- a/shared/modules/vlt-wrapper/bnd.bnd
+++ b/shared/modules/vlt-wrapper/bnd.bnd
@@ -1,5 +1,13 @@
-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, \
@@ -35,4 +43,4 @@
vault-*;lib:=true, \
http*.jar;lib:=true
-Import-Package: sun.misc;resolution:=optional, *
\ No newline at end of file
+Import-Package: sun.misc;resolution:=optional, *
diff --git a/shared/p2/shared-feature/pom.xml b/shared/p2/shared-feature/pom.xml
index 0498268..ad1b93d 100644
--- a/shared/p2/shared-feature/pom.xml
+++ b/shared/p2/shared-feature/pom.xml
@@ -30,11 +30,6 @@
<artifactId>org.apache.sling.ide.impl-vlt</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- <version>2.0</version>
- </dependency>
</dependencies>
</project>
diff --git a/shared/p2/shared-repository/pom.xml b/shared/p2/shared-repository/pom.xml
index daadf5e..68bd30e 100644
--- a/shared/p2/shared-repository/pom.xml
+++ b/shared/p2/shared-repository/pom.xml
@@ -30,11 +30,6 @@
<artifactId>org.apache.sling.ide.impl-vlt</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- <version>2.0</version>
- </dependency>
</dependencies>
</project>
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.