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/03 15:15:47 UTC
[sling-ide-tooling] 02/05: SLING-5648 - Make Non-Eclipse Module
regular Maven Packages
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch feature/intellij
in repository https://gitbox.apache.org/repos/asf/sling-ide-tooling.git
commit 3bc2b68b9c3608472245af7683ff5e7b5d1efa8e
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 api module to a separate shared/modules directory. This is now a
plain Maven + bnd module so it also includes the test files from api-test.
The eclipse build is not yet adjusted so it's expected to fail.
---
eclipse/api-test/README.md | 3 -
eclipse/api-test/pom.xml | 80 --------
.../api-test/src/main/resources/META-INF/LICENSE | 202 ---------------------
.../api-test/src/main/resources/META-INF/NOTICE | 11 --
eclipse/api/META-INF/LICENSE | 202 ---------------------
eclipse/api/META-INF/MANIFEST.MF | 27 ---
eclipse/api/META-INF/NOTICE | 11 --
eclipse/api/OSGI-INF/DefaultBatcherFactory.xml | 23 ---
eclipse/api/OSGI-INF/HttpOsgiClientFactory.xml | 24 ---
eclipse/api/build.properties | 5 -
eclipse/api/pom.xml | 60 ------
eclipse/pom.xml | 2 -
{eclipse => shared/modules}/api/README.md | 0
shared/modules/api/pom.xml | 95 ++++++++++
.../java}/org/apache/sling/ide/filter/Filter.java | 0
.../org/apache/sling/ide/filter/FilterLocator.java | 0
.../org/apache/sling/ide/filter/FilterResult.java | 0
.../apache/sling/ide/filter/IgnoredResources.java | 0
.../org/apache/sling/ide/filter/package-info.java | 11 +-
.../java}/org/apache/sling/ide/log/Logger.java | 0
.../org/apache/sling/ide/log/package-info.java | 11 +-
.../sling/ide/osgi/MavenSourceReference.java | 0
.../org/apache/sling/ide/osgi/OsgiClient.java | 0
.../apache/sling/ide/osgi/OsgiClientException.java | 0
.../apache/sling/ide/osgi/OsgiClientFactory.java | 0
.../org/apache/sling/ide/osgi/SourceReference.java | 0
.../apache/sling/ide/osgi/impl/HttpOsgiClient.java | 0
.../sling/ide/osgi/impl/HttpOsgiClientFactory.java | 4 +
.../ide/osgi/impl/MavenSourceReferenceImpl.java | 0
.../sling/ide/osgi/impl/TracingOsgiClient.java | 0
.../org/apache/sling/ide/osgi/package-info.java | 11 +-
.../sling/ide/serialization/SerializationData.java | 0
.../serialization/SerializationDataBuilder.java | 0
.../ide/serialization/SerializationException.java | 0
.../sling/ide/serialization/SerializationKind.java | 0
.../serialization/SerializationKindManager.java | 0
.../ide/serialization/SerializationManager.java | 0
.../sling/ide/serialization/package-info.java | 10 +-
.../org/apache/sling/ide/transport/Batcher.java | 0
.../apache/sling/ide/transport/BatcherFactory.java | 0
.../org/apache/sling/ide/transport/Command.java | 0
.../apache/sling/ide/transport/CommandContext.java | 0
.../ide/transport/CommandExecutionProperties.java | 0
.../ide/transport/FallbackNodeTypeRegistry.java | 0
.../org/apache/sling/ide/transport/FileInfo.java | 0
.../sling/ide/transport/NodeTypeRegistry.java | 0
.../apache/sling/ide/transport/ProtectedNodes.java | 0
.../org/apache/sling/ide/transport/Repository.java | 0
.../sling/ide/transport/RepositoryException.java | 0
.../sling/ide/transport/RepositoryFactory.java | 0
.../apache/sling/ide/transport/RepositoryInfo.java | 0
.../sling/ide/transport/RepositoryResponse.java | 0
.../apache/sling/ide/transport/ResourceProxy.java | 0
.../org/apache/sling/ide/transport/Result.java | 0
.../apache/sling/ide/transport/TracingCommand.java | 0
.../sling/ide/transport/impl/DefaultBatcher.java | 0
.../ide/transport/impl/DefaultBatcherFactory.java | 2 +
.../apache/sling/ide/transport/package-info.java | 10 +-
.../java}/org/apache/sling/ide/util/PathUtil.java | 0
.../org/apache/sling/ide/util/package-info.java | 10 +-
.../sling/ide/filter/IgnoredResourcesTest.java | 0
.../sling/ide/osgi/impl/HttpOsgiClientTest.java | 0
.../ide/serialization/NodeTypeResourceBuilder.java | 0
.../SerializationKindManagerTest.java | 0
.../sling/ide/serialization/StubRepository.java | 0
.../transport/FallbackNodeTypeRegistryTest.java | 0
.../sling/ide/transport/ResourceProxyTest.java | 0
.../org/apache/sling/ide/util/PathUtilTest.java | 0
.../modules/api}/src/test/resources/bundles.json | 0
.../api}/src/test/resources/sourceReferences.json | 0
70 files changed, 113 insertions(+), 701 deletions(-)
diff --git a/eclipse/api-test/README.md b/eclipse/api-test/README.md
deleted file mode 100644
index 762a784..0000000
--- a/eclipse/api-test/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Apache Sling IDE Tools API Tests
-
-This module is part of the [Apache Sling](https://sling.apache.org) project.
diff --git a/eclipse/api-test/pom.xml b/eclipse/api-test/pom.xml
deleted file mode 100644
index 62b92b1..0000000
--- a/eclipse/api-test/pom.xml
+++ /dev/null
@@ -1,80 +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.api-test</artifactId>
- <name>Apache Sling IDE Tools API 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>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes combine.children="append">
- <exclude>src/test/resources/bundles.json</exclude>
- <exclude>src/test/resources/sourceReferences.json</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <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.api</artifactId>
- <version>${project.version}</version>
- <type>eclipse-plugin</type>
- </dependency>
- <dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.9.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/eclipse/api-test/src/main/resources/META-INF/LICENSE b/eclipse/api-test/src/main/resources/META-INF/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/eclipse/api-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/api-test/src/main/resources/META-INF/NOTICE b/eclipse/api-test/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index a2b90f4..0000000
--- a/eclipse/api-test/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,11 +0,0 @@
-
-Sling IDE Tools: API 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/api/META-INF/LICENSE b/eclipse/api/META-INF/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/eclipse/api/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/api/META-INF/MANIFEST.MF b/eclipse/api/META-INF/MANIFEST.MF
deleted file mode 100644
index 1db504a..0000000
--- a/eclipse/api/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
-Bundle-Name: Sling IDE API
-Bundle-SymbolicName: org.apache.sling.ide.api
-Bundle-Version: 1.2.3.qualifier
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Export-Package: org.apache.sling.ide.filter,
- org.apache.sling.ide.log,
- org.apache.sling.ide.osgi,
- org.apache.sling.ide.serialization,
- org.apache.sling.ide.transport,
- org.apache.sling.ide.util
-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",
- javax.jcr.nodetype,
- org.apache.commons.httpclient;version="3.1.0",
- org.apache.commons.httpclient.auth;version="3.1.0",
- org.apache.commons.httpclient.methods;version="3.1.0",
- org.apache.commons.httpclient.methods.multipart;version="3.1.0",
- org.apache.commons.httpclient.params;version="3.1.0",
- org.apache.commons.io;version="2.0.1",
- org.osgi.framework;version="1.6.0",
- org.osgi.service.event
-Service-Component: OSGI-INF/*.xml
diff --git a/eclipse/api/META-INF/NOTICE b/eclipse/api/META-INF/NOTICE
deleted file mode 100644
index 69e1c54..0000000
--- a/eclipse/api/META-INF/NOTICE
+++ /dev/null
@@ -1,11 +0,0 @@
-
-Sling IDE Tools: API
-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/api/OSGI-INF/DefaultBatcherFactory.xml b/eclipse/api/OSGI-INF/DefaultBatcherFactory.xml
deleted file mode 100644
index 91947f3..0000000
--- a/eclipse/api/OSGI-INF/DefaultBatcherFactory.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.transport.impl.DefaultBatcherFactory"/>
- <service>
- <provide interface="org.apache.sling.ide.transport.BatcherFactory"/>
- </service>
-</scr:component>
diff --git a/eclipse/api/OSGI-INF/HttpOsgiClientFactory.xml b/eclipse/api/OSGI-INF/HttpOsgiClientFactory.xml
deleted file mode 100644
index ea4eda3..0000000
--- a/eclipse/api/OSGI-INF/HttpOsgiClientFactory.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.osgi.impl.HttpOsgiClientFactory"/>
- <service>
- <provide interface="org.apache.sling.ide.osgi.OsgiClientFactory"/>
- </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/api/build.properties b/eclipse/api/build.properties
deleted file mode 100644
index c58ea21..0000000
--- a/eclipse/api/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- OSGI-INF/
diff --git a/eclipse/api/pom.xml b/eclipse/api/pom.xml
deleted file mode 100644
index fe858bb..0000000
--- a/eclipse/api/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.api</artifactId>
- <packaging>eclipse-plugin</packaging>
- <name>Apache Sling IDE Tools API</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 639bcad..3c6b394 100644
--- a/eclipse/pom.xml
+++ b/eclipse/pom.xml
@@ -38,8 +38,6 @@
<modules>
<module>target-definition</module>
- <module>api</module>
- <module>api-test</module>
<module>artifacts</module>
<module>impl-resource</module>
<module>impl-resource-test</module>
diff --git a/eclipse/api/README.md b/shared/modules/api/README.md
similarity index 100%
rename from eclipse/api/README.md
rename to shared/modules/api/README.md
diff --git a/shared/modules/api/pom.xml b/shared/modules/api/pom.xml
new file mode 100644
index 0000000..ca1c466
--- /dev/null
+++ b/shared/modules/api/pom.xml
@@ -0,0 +1,95 @@
+<?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.api</artifactId>
+ <name>Apache Sling IDE Tools API</name>
+ <version>1.2.3-SNAPSHOT</version>
+
+ <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>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <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>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- TODO - must be removed, OSGi deps not allowed here -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ <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>
+ </dependencies>
+</project>
diff --git a/eclipse/api/src/org/apache/sling/ide/filter/Filter.java b/shared/modules/api/src/main/java/org/apache/sling/ide/filter/Filter.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/filter/Filter.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/filter/Filter.java
diff --git a/eclipse/api/src/org/apache/sling/ide/filter/FilterLocator.java b/shared/modules/api/src/main/java/org/apache/sling/ide/filter/FilterLocator.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/filter/FilterLocator.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/filter/FilterLocator.java
diff --git a/eclipse/api/src/org/apache/sling/ide/filter/FilterResult.java b/shared/modules/api/src/main/java/org/apache/sling/ide/filter/FilterResult.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/filter/FilterResult.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/filter/FilterResult.java
diff --git a/eclipse/api/src/org/apache/sling/ide/filter/IgnoredResources.java b/shared/modules/api/src/main/java/org/apache/sling/ide/filter/IgnoredResources.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/filter/IgnoredResources.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/filter/IgnoredResources.java
diff --git a/eclipse/api/src/org/apache/sling/ide/transport/Result.java b/shared/modules/api/src/main/java/org/apache/sling/ide/filter/package-info.java
similarity index 85%
copy from eclipse/api/src/org/apache/sling/ide/transport/Result.java
copy to shared/modules/api/src/main/java/org/apache/sling/ide/filter/package-info.java
index 987100e..9f9297c 100644
--- a/eclipse/api/src/org/apache/sling/ide/transport/Result.java
+++ b/shared/modules/api/src/main/java/org/apache/sling/ide/filter/package-info.java
@@ -14,12 +14,5 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.ide.transport;
-
-public interface Result<T> {
-
- boolean isSuccess();
-
- T get() throws RepositoryException;
-
-}
+@org.osgi.annotation.versioning.Version("1.2.0")
+package org.apache.sling.ide.filter;
\ No newline at end of file
diff --git a/eclipse/api/src/org/apache/sling/ide/log/Logger.java b/shared/modules/api/src/main/java/org/apache/sling/ide/log/Logger.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/log/Logger.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/log/Logger.java
diff --git a/eclipse/api/src/org/apache/sling/ide/transport/Result.java b/shared/modules/api/src/main/java/org/apache/sling/ide/log/package-info.java
similarity index 85%
copy from eclipse/api/src/org/apache/sling/ide/transport/Result.java
copy to shared/modules/api/src/main/java/org/apache/sling/ide/log/package-info.java
index 987100e..4357afd 100644
--- a/eclipse/api/src/org/apache/sling/ide/transport/Result.java
+++ b/shared/modules/api/src/main/java/org/apache/sling/ide/log/package-info.java
@@ -14,12 +14,5 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.ide.transport;
-
-public interface Result<T> {
-
- boolean isSuccess();
-
- T get() throws RepositoryException;
-
-}
+@org.osgi.annotation.versioning.Version("1.2.0")
+package org.apache.sling.ide.log;
\ No newline at end of file
diff --git a/eclipse/api/src/org/apache/sling/ide/osgi/MavenSourceReference.java b/shared/modules/api/src/main/java/org/apache/sling/ide/osgi/MavenSourceReference.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/osgi/MavenSourceReference.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/osgi/MavenSourceReference.java
diff --git a/eclipse/api/src/org/apache/sling/ide/osgi/OsgiClient.java b/shared/modules/api/src/main/java/org/apache/sling/ide/osgi/OsgiClient.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/osgi/OsgiClient.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/osgi/OsgiClient.java
diff --git a/eclipse/api/src/org/apache/sling/ide/osgi/OsgiClientException.java b/shared/modules/api/src/main/java/org/apache/sling/ide/osgi/OsgiClientException.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/osgi/OsgiClientException.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/osgi/OsgiClientException.java
diff --git a/eclipse/api/src/org/apache/sling/ide/osgi/OsgiClientFactory.java b/shared/modules/api/src/main/java/org/apache/sling/ide/osgi/OsgiClientFactory.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/osgi/OsgiClientFactory.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/osgi/OsgiClientFactory.java
diff --git a/eclipse/api/src/org/apache/sling/ide/osgi/SourceReference.java b/shared/modules/api/src/main/java/org/apache/sling/ide/osgi/SourceReference.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/osgi/SourceReference.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/osgi/SourceReference.java
diff --git a/eclipse/api/src/org/apache/sling/ide/osgi/impl/HttpOsgiClient.java b/shared/modules/api/src/main/java/org/apache/sling/ide/osgi/impl/HttpOsgiClient.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/osgi/impl/HttpOsgiClient.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/osgi/impl/HttpOsgiClient.java
diff --git a/eclipse/api/src/org/apache/sling/ide/osgi/impl/HttpOsgiClientFactory.java b/shared/modules/api/src/main/java/org/apache/sling/ide/osgi/impl/HttpOsgiClientFactory.java
similarity index 90%
rename from eclipse/api/src/org/apache/sling/ide/osgi/impl/HttpOsgiClientFactory.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/osgi/impl/HttpOsgiClientFactory.java
index cedaf61..e8959d2 100644
--- a/eclipse/api/src/org/apache/sling/ide/osgi/impl/HttpOsgiClientFactory.java
+++ b/shared/modules/api/src/main/java/org/apache/sling/ide/osgi/impl/HttpOsgiClientFactory.java
@@ -19,10 +19,14 @@ package org.apache.sling.ide.osgi.impl;
import org.apache.sling.ide.osgi.OsgiClient;
import org.apache.sling.ide.osgi.OsgiClientFactory;
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;
+@Component(service = OsgiClientFactory.class)
public class HttpOsgiClientFactory implements OsgiClientFactory {
+ @Reference
private EventAdmin eventAdmin;
public OsgiClient createOsgiClient(RepositoryInfo repositoryInfo) {
diff --git a/eclipse/api/src/org/apache/sling/ide/osgi/impl/MavenSourceReferenceImpl.java b/shared/modules/api/src/main/java/org/apache/sling/ide/osgi/impl/MavenSourceReferenceImpl.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/osgi/impl/MavenSourceReferenceImpl.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/osgi/impl/MavenSourceReferenceImpl.java
diff --git a/eclipse/api/src/org/apache/sling/ide/osgi/impl/TracingOsgiClient.java b/shared/modules/api/src/main/java/org/apache/sling/ide/osgi/impl/TracingOsgiClient.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/osgi/impl/TracingOsgiClient.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/osgi/impl/TracingOsgiClient.java
diff --git a/eclipse/api/src/org/apache/sling/ide/transport/Result.java b/shared/modules/api/src/main/java/org/apache/sling/ide/osgi/package-info.java
similarity index 85%
copy from eclipse/api/src/org/apache/sling/ide/transport/Result.java
copy to shared/modules/api/src/main/java/org/apache/sling/ide/osgi/package-info.java
index 987100e..c1d15c7 100644
--- a/eclipse/api/src/org/apache/sling/ide/transport/Result.java
+++ b/shared/modules/api/src/main/java/org/apache/sling/ide/osgi/package-info.java
@@ -14,12 +14,5 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.ide.transport;
-
-public interface Result<T> {
-
- boolean isSuccess();
-
- T get() throws RepositoryException;
-
-}
+@org.osgi.annotation.versioning.Version("1.2.0")
+package org.apache.sling.ide.osgi;
\ No newline at end of file
diff --git a/eclipse/api/src/org/apache/sling/ide/serialization/SerializationData.java b/shared/modules/api/src/main/java/org/apache/sling/ide/serialization/SerializationData.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/serialization/SerializationData.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/serialization/SerializationData.java
diff --git a/eclipse/api/src/org/apache/sling/ide/serialization/SerializationDataBuilder.java b/shared/modules/api/src/main/java/org/apache/sling/ide/serialization/SerializationDataBuilder.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/serialization/SerializationDataBuilder.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/serialization/SerializationDataBuilder.java
diff --git a/eclipse/api/src/org/apache/sling/ide/serialization/SerializationException.java b/shared/modules/api/src/main/java/org/apache/sling/ide/serialization/SerializationException.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/serialization/SerializationException.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/serialization/SerializationException.java
diff --git a/eclipse/api/src/org/apache/sling/ide/serialization/SerializationKind.java b/shared/modules/api/src/main/java/org/apache/sling/ide/serialization/SerializationKind.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/serialization/SerializationKind.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/serialization/SerializationKind.java
diff --git a/eclipse/api/src/org/apache/sling/ide/serialization/SerializationKindManager.java b/shared/modules/api/src/main/java/org/apache/sling/ide/serialization/SerializationKindManager.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/serialization/SerializationKindManager.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/serialization/SerializationKindManager.java
diff --git a/eclipse/api/src/org/apache/sling/ide/serialization/SerializationManager.java b/shared/modules/api/src/main/java/org/apache/sling/ide/serialization/SerializationManager.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/serialization/SerializationManager.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/serialization/SerializationManager.java
diff --git a/eclipse/api/src/org/apache/sling/ide/transport/Result.java b/shared/modules/api/src/main/java/org/apache/sling/ide/serialization/package-info.java
similarity index 85%
copy from eclipse/api/src/org/apache/sling/ide/transport/Result.java
copy to shared/modules/api/src/main/java/org/apache/sling/ide/serialization/package-info.java
index 987100e..f51cd9c 100644
--- a/eclipse/api/src/org/apache/sling/ide/transport/Result.java
+++ b/shared/modules/api/src/main/java/org/apache/sling/ide/serialization/package-info.java
@@ -14,12 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.ide.transport;
-public interface Result<T> {
-
- boolean isSuccess();
-
- T get() throws RepositoryException;
-
-}
+@org.osgi.annotation.versioning.Version("1.2.0")
+package org.apache.sling.ide.serialization;
\ No newline at end of file
diff --git a/eclipse/api/src/org/apache/sling/ide/transport/Batcher.java b/shared/modules/api/src/main/java/org/apache/sling/ide/transport/Batcher.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/transport/Batcher.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/transport/Batcher.java
diff --git a/eclipse/api/src/org/apache/sling/ide/transport/BatcherFactory.java b/shared/modules/api/src/main/java/org/apache/sling/ide/transport/BatcherFactory.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/transport/BatcherFactory.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/transport/BatcherFactory.java
diff --git a/eclipse/api/src/org/apache/sling/ide/transport/Command.java b/shared/modules/api/src/main/java/org/apache/sling/ide/transport/Command.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/transport/Command.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/transport/Command.java
diff --git a/eclipse/api/src/org/apache/sling/ide/transport/CommandContext.java b/shared/modules/api/src/main/java/org/apache/sling/ide/transport/CommandContext.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/transport/CommandContext.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/transport/CommandContext.java
diff --git a/eclipse/api/src/org/apache/sling/ide/transport/CommandExecutionProperties.java b/shared/modules/api/src/main/java/org/apache/sling/ide/transport/CommandExecutionProperties.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/transport/CommandExecutionProperties.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/transport/CommandExecutionProperties.java
diff --git a/eclipse/api/src/org/apache/sling/ide/transport/FallbackNodeTypeRegistry.java b/shared/modules/api/src/main/java/org/apache/sling/ide/transport/FallbackNodeTypeRegistry.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/transport/FallbackNodeTypeRegistry.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/transport/FallbackNodeTypeRegistry.java
diff --git a/eclipse/api/src/org/apache/sling/ide/transport/FileInfo.java b/shared/modules/api/src/main/java/org/apache/sling/ide/transport/FileInfo.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/transport/FileInfo.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/transport/FileInfo.java
diff --git a/eclipse/api/src/org/apache/sling/ide/transport/NodeTypeRegistry.java b/shared/modules/api/src/main/java/org/apache/sling/ide/transport/NodeTypeRegistry.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/transport/NodeTypeRegistry.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/transport/NodeTypeRegistry.java
diff --git a/eclipse/api/src/org/apache/sling/ide/transport/ProtectedNodes.java b/shared/modules/api/src/main/java/org/apache/sling/ide/transport/ProtectedNodes.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/transport/ProtectedNodes.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/transport/ProtectedNodes.java
diff --git a/eclipse/api/src/org/apache/sling/ide/transport/Repository.java b/shared/modules/api/src/main/java/org/apache/sling/ide/transport/Repository.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/transport/Repository.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/transport/Repository.java
diff --git a/eclipse/api/src/org/apache/sling/ide/transport/RepositoryException.java b/shared/modules/api/src/main/java/org/apache/sling/ide/transport/RepositoryException.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/transport/RepositoryException.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/transport/RepositoryException.java
diff --git a/eclipse/api/src/org/apache/sling/ide/transport/RepositoryFactory.java b/shared/modules/api/src/main/java/org/apache/sling/ide/transport/RepositoryFactory.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/transport/RepositoryFactory.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/transport/RepositoryFactory.java
diff --git a/eclipse/api/src/org/apache/sling/ide/transport/RepositoryInfo.java b/shared/modules/api/src/main/java/org/apache/sling/ide/transport/RepositoryInfo.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/transport/RepositoryInfo.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/transport/RepositoryInfo.java
diff --git a/eclipse/api/src/org/apache/sling/ide/transport/RepositoryResponse.java b/shared/modules/api/src/main/java/org/apache/sling/ide/transport/RepositoryResponse.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/transport/RepositoryResponse.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/transport/RepositoryResponse.java
diff --git a/eclipse/api/src/org/apache/sling/ide/transport/ResourceProxy.java b/shared/modules/api/src/main/java/org/apache/sling/ide/transport/ResourceProxy.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/transport/ResourceProxy.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/transport/ResourceProxy.java
diff --git a/eclipse/api/src/org/apache/sling/ide/transport/Result.java b/shared/modules/api/src/main/java/org/apache/sling/ide/transport/Result.java
similarity index 100%
copy from eclipse/api/src/org/apache/sling/ide/transport/Result.java
copy to shared/modules/api/src/main/java/org/apache/sling/ide/transport/Result.java
diff --git a/eclipse/api/src/org/apache/sling/ide/transport/TracingCommand.java b/shared/modules/api/src/main/java/org/apache/sling/ide/transport/TracingCommand.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/transport/TracingCommand.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/transport/TracingCommand.java
diff --git a/eclipse/api/src/org/apache/sling/ide/transport/impl/DefaultBatcher.java b/shared/modules/api/src/main/java/org/apache/sling/ide/transport/impl/DefaultBatcher.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/transport/impl/DefaultBatcher.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/transport/impl/DefaultBatcher.java
diff --git a/eclipse/api/src/org/apache/sling/ide/transport/impl/DefaultBatcherFactory.java b/shared/modules/api/src/main/java/org/apache/sling/ide/transport/impl/DefaultBatcherFactory.java
similarity index 91%
rename from eclipse/api/src/org/apache/sling/ide/transport/impl/DefaultBatcherFactory.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/transport/impl/DefaultBatcherFactory.java
index a63b738..6ef8f41 100644
--- a/eclipse/api/src/org/apache/sling/ide/transport/impl/DefaultBatcherFactory.java
+++ b/shared/modules/api/src/main/java/org/apache/sling/ide/transport/impl/DefaultBatcherFactory.java
@@ -18,7 +18,9 @@ package org.apache.sling.ide.transport.impl;
import org.apache.sling.ide.transport.Batcher;
import org.apache.sling.ide.transport.BatcherFactory;
+import org.osgi.service.component.annotations.Component;
+@Component(service = BatcherFactory.class)
public class DefaultBatcherFactory implements BatcherFactory {
@Override
diff --git a/eclipse/api/src/org/apache/sling/ide/transport/Result.java b/shared/modules/api/src/main/java/org/apache/sling/ide/transport/package-info.java
similarity index 85%
copy from eclipse/api/src/org/apache/sling/ide/transport/Result.java
copy to shared/modules/api/src/main/java/org/apache/sling/ide/transport/package-info.java
index 987100e..1fd6f18 100644
--- a/eclipse/api/src/org/apache/sling/ide/transport/Result.java
+++ b/shared/modules/api/src/main/java/org/apache/sling/ide/transport/package-info.java
@@ -14,12 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.ide.transport;
-public interface Result<T> {
-
- boolean isSuccess();
-
- T get() throws RepositoryException;
-
-}
+@org.osgi.annotation.versioning.Version("1.2.0")
+package org.apache.sling.ide.transport;
\ No newline at end of file
diff --git a/eclipse/api/src/org/apache/sling/ide/util/PathUtil.java b/shared/modules/api/src/main/java/org/apache/sling/ide/util/PathUtil.java
similarity index 100%
rename from eclipse/api/src/org/apache/sling/ide/util/PathUtil.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/util/PathUtil.java
diff --git a/eclipse/api/src/org/apache/sling/ide/transport/Result.java b/shared/modules/api/src/main/java/org/apache/sling/ide/util/package-info.java
similarity index 85%
rename from eclipse/api/src/org/apache/sling/ide/transport/Result.java
rename to shared/modules/api/src/main/java/org/apache/sling/ide/util/package-info.java
index 987100e..13a75c0 100644
--- a/eclipse/api/src/org/apache/sling/ide/transport/Result.java
+++ b/shared/modules/api/src/main/java/org/apache/sling/ide/util/package-info.java
@@ -14,12 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.ide.transport;
-public interface Result<T> {
-
- boolean isSuccess();
-
- T get() throws RepositoryException;
-
-}
+@org.osgi.annotation.versioning.Version("1.2.0")
+package org.apache.sling.ide.util;
\ No newline at end of file
diff --git a/eclipse/api-test/src/test/java/org/apache/sling/ide/filter/IgnoredResourcesTest.java b/shared/modules/api/src/test/java/org/apache/sling/ide/filter/IgnoredResourcesTest.java
similarity index 100%
rename from eclipse/api-test/src/test/java/org/apache/sling/ide/filter/IgnoredResourcesTest.java
rename to shared/modules/api/src/test/java/org/apache/sling/ide/filter/IgnoredResourcesTest.java
diff --git a/eclipse/api-test/src/test/java/org/apache/sling/ide/osgi/impl/HttpOsgiClientTest.java b/shared/modules/api/src/test/java/org/apache/sling/ide/osgi/impl/HttpOsgiClientTest.java
similarity index 100%
rename from eclipse/api-test/src/test/java/org/apache/sling/ide/osgi/impl/HttpOsgiClientTest.java
rename to shared/modules/api/src/test/java/org/apache/sling/ide/osgi/impl/HttpOsgiClientTest.java
diff --git a/eclipse/api-test/src/test/java/org/apache/sling/ide/serialization/NodeTypeResourceBuilder.java b/shared/modules/api/src/test/java/org/apache/sling/ide/serialization/NodeTypeResourceBuilder.java
similarity index 100%
rename from eclipse/api-test/src/test/java/org/apache/sling/ide/serialization/NodeTypeResourceBuilder.java
rename to shared/modules/api/src/test/java/org/apache/sling/ide/serialization/NodeTypeResourceBuilder.java
diff --git a/eclipse/api-test/src/test/java/org/apache/sling/ide/serialization/SerializationKindManagerTest.java b/shared/modules/api/src/test/java/org/apache/sling/ide/serialization/SerializationKindManagerTest.java
similarity index 100%
rename from eclipse/api-test/src/test/java/org/apache/sling/ide/serialization/SerializationKindManagerTest.java
rename to shared/modules/api/src/test/java/org/apache/sling/ide/serialization/SerializationKindManagerTest.java
diff --git a/eclipse/api-test/src/test/java/org/apache/sling/ide/serialization/StubRepository.java b/shared/modules/api/src/test/java/org/apache/sling/ide/serialization/StubRepository.java
similarity index 100%
rename from eclipse/api-test/src/test/java/org/apache/sling/ide/serialization/StubRepository.java
rename to shared/modules/api/src/test/java/org/apache/sling/ide/serialization/StubRepository.java
diff --git a/eclipse/api-test/src/test/java/org/apache/sling/ide/transport/FallbackNodeTypeRegistryTest.java b/shared/modules/api/src/test/java/org/apache/sling/ide/transport/FallbackNodeTypeRegistryTest.java
similarity index 100%
rename from eclipse/api-test/src/test/java/org/apache/sling/ide/transport/FallbackNodeTypeRegistryTest.java
rename to shared/modules/api/src/test/java/org/apache/sling/ide/transport/FallbackNodeTypeRegistryTest.java
diff --git a/eclipse/api-test/src/test/java/org/apache/sling/ide/transport/ResourceProxyTest.java b/shared/modules/api/src/test/java/org/apache/sling/ide/transport/ResourceProxyTest.java
similarity index 100%
rename from eclipse/api-test/src/test/java/org/apache/sling/ide/transport/ResourceProxyTest.java
rename to shared/modules/api/src/test/java/org/apache/sling/ide/transport/ResourceProxyTest.java
diff --git a/eclipse/api-test/src/test/java/org/apache/sling/ide/util/PathUtilTest.java b/shared/modules/api/src/test/java/org/apache/sling/ide/util/PathUtilTest.java
similarity index 100%
rename from eclipse/api-test/src/test/java/org/apache/sling/ide/util/PathUtilTest.java
rename to shared/modules/api/src/test/java/org/apache/sling/ide/util/PathUtilTest.java
diff --git a/eclipse/api-test/src/test/resources/bundles.json b/shared/modules/api/src/test/resources/bundles.json
similarity index 100%
rename from eclipse/api-test/src/test/resources/bundles.json
rename to shared/modules/api/src/test/resources/bundles.json
diff --git a/eclipse/api-test/src/test/resources/sourceReferences.json b/shared/modules/api/src/test/resources/sourceReferences.json
similarity index 100%
rename from eclipse/api-test/src/test/resources/sourceReferences.json
rename to shared/modules/api/src/test/resources/sourceReferences.json
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.