sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From romb...@apache.org
Subject [sling-ide-tooling] 05/05: SLING-5648 - Make Non-Eclipse Module regular Maven Packages
Date Thu, 05 Apr 2018 18:00:51 GMT
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 af50b7b423972d01c9d2147f77e0c9d9475fc81c
Author: Robert Munteanu <rombert@apache.org>
AuthorDate: Thu Apr 5 19:43:18 2018 +0300

    SLING-5648 - Make Non-Eclipse Module regular Maven Packages
    
    Move artifacts to shared/modules
---
 eclipse/artifacts/META-INF/LICENSE                 | 202 ---------------------
 eclipse/artifacts/META-INF/MANIFEST.MF             |  14 --
 eclipse/artifacts/META-INF/NOTICE                  |  11 --
 .../artifacts/OSGI-INF/ArtifactsLocatorImpl.xml    |  23 ---
 eclipse/artifacts/build.properties                 |   6 -
 eclipse/artifacts/pom.xml                          |  94 ----------
 eclipse/pom.xml                                    |   1 -
 {eclipse => shared/modules}/artifacts/README.md    |   0
 shared/modules/artifacts/bnd.bnd                   |   5 +
 shared/modules/artifacts/pom.xml                   |  89 +++++++++
 .../sling/ide/artifacts/EmbeddedArtifact.java      |   0
 .../ide/artifacts/EmbeddedArtifactLocator.java     |   0
 .../ide/artifacts/impl/ArtifactsLocatorImpl.java   |  10 +-
 .../apache/sling/ide/artifacts/package-info.java   |  14 +-
 shared/modules/parent/pom.xml                      |  14 ++
 shared/modules/pom.xml                             |   1 +
 shared/p2/shared-feature/feature.xml               |   7 +
 shared/p2/shared-feature/pom.xml                   |   7 +-
 shared/p2/shared-repository/pom.xml                |   7 +-
 19 files changed, 134 insertions(+), 371 deletions(-)

diff --git a/eclipse/artifacts/META-INF/LICENSE b/eclipse/artifacts/META-INF/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/eclipse/artifacts/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/artifacts/META-INF/MANIFEST.MF b/eclipse/artifacts/META-INF/MANIFEST.MF
deleted file mode 100644
index 7285a02..0000000
--- a/eclipse/artifacts/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
-Bundle-Name: Sling IDE Embedded Artifacts
-Bundle-SymbolicName: org.apache.sling.ide.artifacts
-Bundle-Version: 1.2.3.qualifier
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Import-Package: org.osgi.service.component,
-  org.osgi.framework
-Require-Bundle: org.eclipse.equinox.ds;bundle-version="1.3.1",
- org.eclipse.osgi.services;bundle-version="3.2.100"
-Service-Component: OSGI-INF/*.xml
-Export-Package: org.apache.sling.ide.artifacts
diff --git a/eclipse/artifacts/META-INF/NOTICE b/eclipse/artifacts/META-INF/NOTICE
deleted file mode 100644
index 71efb3e..0000000
--- a/eclipse/artifacts/META-INF/NOTICE
+++ /dev/null
@@ -1,11 +0,0 @@
-
-Sling IDE Tools: Embedded Artifacts
-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/artifacts/OSGI-INF/ArtifactsLocatorImpl.xml b/eclipse/artifacts/OSGI-INF/ArtifactsLocatorImpl.xml
deleted file mode 100644
index 3c67c8e..0000000
--- a/eclipse/artifacts/OSGI-INF/ArtifactsLocatorImpl.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">
-    <implementation class="org.apache.sling.ide.artifacts.impl.ArtifactsLocatorImpl" />
-    <service>
-       <provide interface="org.apache.sling.ide.artifacts.EmbeddedArtifactLocator"/>
-    </service>
-</scr:component>
diff --git a/eclipse/artifacts/build.properties b/eclipse/artifacts/build.properties
deleted file mode 100644
index 27307cb..0000000
--- a/eclipse/artifacts/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/,\
-               target/artifacts/
diff --git a/eclipse/artifacts/pom.xml b/eclipse/artifacts/pom.xml
deleted file mode 100644
index 1832d97..0000000
--- a/eclipse/artifacts/pom.xml
+++ /dev/null
@@ -1,94 +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.artifacts</artifactId>
-    <packaging>eclipse-plugin</packaging>
-    <name>Apache Sling IDE Tools Embedded Artifacts</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>        
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.8</version>
-                <executions>
-                    <execution>
-                        <id>copy</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.sling</groupId>
-                                    <artifactId>org.apache.sling.tooling.support.install</artifactId>
-                                    <version>1.0.4</version>
-                                    <outputDirectory>${project.build.directory}/artifacts/sling-tooling-support-install</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.sling</groupId>
-                                    <artifactId>org.apache.sling.tooling.support.source</artifactId>
-                                    <version>1.0.4</version>
-                                    <outputDirectory>${project.build.directory}/artifacts/sling-tooling-support-source</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                            <stripVersion>true</stripVersion>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/eclipse/pom.xml b/eclipse/pom.xml
index f2903b0..038ce60 100644
--- a/eclipse/pom.xml
+++ b/eclipse/pom.xml
@@ -38,7 +38,6 @@
 
     <modules>
         <module>target-definition</module>
-        <module>artifacts</module>
         <module>eclipse-core</module>
         <module>eclipse-ui</module>
         <module>feature</module>
diff --git a/eclipse/artifacts/README.md b/shared/modules/artifacts/README.md
similarity index 100%
rename from eclipse/artifacts/README.md
rename to shared/modules/artifacts/README.md
diff --git a/shared/modules/artifacts/bnd.bnd b/shared/modules/artifacts/bnd.bnd
new file mode 100644
index 0000000..a2bd473
--- /dev/null
+++ b/shared/modules/artifacts/bnd.bnd
@@ -0,0 +1,5 @@
+Bundle-ActivationPolicy: lazy
+
+-exportcontents: ${packages;VERSIONED}
+
+-includeresource: org.apache.sling.tooling.support*.jar
\ No newline at end of file
diff --git a/shared/modules/artifacts/pom.xml b/shared/modules/artifacts/pom.xml
new file mode 100644
index 0000000..066793e
--- /dev/null
+++ b/shared/modules/artifacts/pom.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+    license agreements. See the NOTICE file distributed with this work for additional 
+    information regarding copyright ownership. The ASF licenses this file to 
+    you under the Apache License, Version 2.0 (the "License"); you may not use 
+    this file except in compliance with the License. You may obtain a copy of 
+    the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+    by applicable law or agreed to in writing, software distributed under the 
+    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+    OF ANY KIND, either express or implied. See the License for the specific 
+    language governing permissions and limitations under the License. -->
+<project
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.sling.ide</groupId>
+        <artifactId>sling-ide-shared-parent</artifactId>
+        <version>1.2.3-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+    <artifactId>org.apache.sling.ide.artifacts</artifactId>
+    <name>Apache Sling IDE Tools Embedded Artifacts</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>
+
+        <!-- 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>osgi.cmpn</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>
+
+        <!-- will be embedded -->
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.tooling.support.install</artifactId>
+            <version>1.0.4</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- will be embedded -->
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.tooling.support.source</artifactId>
+            <version>1.0.4</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/eclipse/artifacts/src/org/apache/sling/ide/artifacts/EmbeddedArtifact.java b/shared/modules/artifacts/src/main/java/org/apache/sling/ide/artifacts/EmbeddedArtifact.java
similarity index 100%
rename from eclipse/artifacts/src/org/apache/sling/ide/artifacts/EmbeddedArtifact.java
rename to shared/modules/artifacts/src/main/java/org/apache/sling/ide/artifacts/EmbeddedArtifact.java
diff --git a/eclipse/artifacts/src/org/apache/sling/ide/artifacts/EmbeddedArtifactLocator.java
b/shared/modules/artifacts/src/main/java/org/apache/sling/ide/artifacts/EmbeddedArtifactLocator.java
similarity index 100%
copy from eclipse/artifacts/src/org/apache/sling/ide/artifacts/EmbeddedArtifactLocator.java
copy to shared/modules/artifacts/src/main/java/org/apache/sling/ide/artifacts/EmbeddedArtifactLocator.java
diff --git a/eclipse/artifacts/src/org/apache/sling/ide/artifacts/impl/ArtifactsLocatorImpl.java
b/shared/modules/artifacts/src/main/java/org/apache/sling/ide/artifacts/impl/ArtifactsLocatorImpl.java
similarity index 89%
rename from eclipse/artifacts/src/org/apache/sling/ide/artifacts/impl/ArtifactsLocatorImpl.java
rename to shared/modules/artifacts/src/main/java/org/apache/sling/ide/artifacts/impl/ArtifactsLocatorImpl.java
index 54a6dd8..51d63b2 100644
--- a/eclipse/artifacts/src/org/apache/sling/ide/artifacts/impl/ArtifactsLocatorImpl.java
+++ b/shared/modules/artifacts/src/main/java/org/apache/sling/ide/artifacts/impl/ArtifactsLocatorImpl.java
@@ -22,17 +22,15 @@ import org.apache.sling.ide.artifacts.EmbeddedArtifact;
 import org.apache.sling.ide.artifacts.EmbeddedArtifactLocator;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.component.ComponentContext;
+import org.osgi.service.component.annotations.Component;
 
+@Component(service = EmbeddedArtifactLocator.class)
 public class ArtifactsLocatorImpl implements EmbeddedArtifactLocator {
 
-    private static final String ARTIFACTS_LOCATION = "target/artifacts";
-
     private ComponentContext context;
 
     protected void activate(ComponentContext context) {
-
         this.context = context;
-
     }
 
     @Override
@@ -44,7 +42,7 @@ public class ArtifactsLocatorImpl implements EmbeddedArtifactLocator {
         String artifactId = "org.apache.sling.tooling.support.install";
         String extension = "jar";
 
-        URL jarUrl = loadResource(bundleContext, ARTIFACTS_LOCATION + "/sling-tooling-support-install/"
+ artifactId
+        URL jarUrl = loadResource(bundleContext, artifactId + "-" + version
                 + "." + extension);
 
         return new EmbeddedArtifact(artifactId + "-" + version + "." + extension, version,
jarUrl);
@@ -59,7 +57,7 @@ public class ArtifactsLocatorImpl implements EmbeddedArtifactLocator {
         String artifactId = "org.apache.sling.tooling.support.source";
         String extension = "jar";
         
-        URL jarUrl = loadResource(bundleContext, ARTIFACTS_LOCATION + "/sling-tooling-support-source/"
+ artifactId
+        URL jarUrl = loadResource(bundleContext, artifactId + "-" + version
                 + "." + extension);
         
         return new EmbeddedArtifact(artifactId + "-" + version + "." + extension, version,
jarUrl);
diff --git a/eclipse/artifacts/src/org/apache/sling/ide/artifacts/EmbeddedArtifactLocator.java
b/shared/modules/artifacts/src/main/java/org/apache/sling/ide/artifacts/package-info.java
similarity index 66%
rename from eclipse/artifacts/src/org/apache/sling/ide/artifacts/EmbeddedArtifactLocator.java
rename to shared/modules/artifacts/src/main/java/org/apache/sling/ide/artifacts/package-info.java
index 6982de9..9daca7a 100644
--- a/eclipse/artifacts/src/org/apache/sling/ide/artifacts/EmbeddedArtifactLocator.java
+++ b/shared/modules/artifacts/src/main/java/org/apache/sling/ide/artifacts/package-info.java
@@ -14,15 +14,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.ide.artifacts;
-
-public interface EmbeddedArtifactLocator {
-
-    public static final String SUPPORT_BUNDLE_SYMBOLIC_NAME = "org.apache.sling.tooling.support.install";
-    
-    public static final String SUPPORT_SOURCE_BUNDLE_SYMBOLIC_NAME = "org.apache.sling.tooling.support.source";
-
-    EmbeddedArtifact loadToolingSupportBundle();
-    
-    EmbeddedArtifact loadSourceSupportBundle();
-}
+@org.osgi.annotation.versioning.Version("1.2.0")
+package org.apache.sling.ide.artifacts;
\ No newline at end of file
diff --git a/shared/modules/parent/pom.xml b/shared/modules/parent/pom.xml
index b5f8dea..b5c67dc 100644
--- a/shared/modules/parent/pom.xml
+++ b/shared/modules/parent/pom.xml
@@ -33,6 +33,20 @@
         <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>
+                        <exclude>**/MANIFEST.MF</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
     <profiles>
         <profile>
diff --git a/shared/modules/pom.xml b/shared/modules/pom.xml
index 5121b6b..a9c1920 100644
--- a/shared/modules/pom.xml
+++ b/shared/modules/pom.xml
@@ -38,5 +38,6 @@
         <module>impl-resource</module>
         <module>impl-vlt</module>
         <module>vlt-wrapper</module>
+        <module>artifacts</module>
     </modules>
 </project>
diff --git a/shared/p2/shared-feature/feature.xml b/shared/p2/shared-feature/feature.xml
index 9425636..e76ed1a 100644
--- a/shared/p2/shared-feature/feature.xml
+++ b/shared/p2/shared-feature/feature.xml
@@ -245,5 +245,12 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+
+   <plugin
+         id="org.apache.sling.ide.artifacts"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 </feature>
 
diff --git a/shared/p2/shared-feature/pom.xml b/shared/p2/shared-feature/pom.xml
index ad1b93d..24f7584 100644
--- a/shared/p2/shared-feature/pom.xml
+++ b/shared/p2/shared-feature/pom.xml
@@ -30,6 +30,11 @@
       <artifactId>org.apache.sling.ide.impl-vlt</artifactId>
       <version>${project.version}</version>
     </dependency>
-  </dependencies>
+    <dependency>
+      <groupId>org.apache.sling.ide</groupId>
+      <artifactId>org.apache.sling.ide.artifacts</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+   </dependencies>
 
 </project>
diff --git a/shared/p2/shared-repository/pom.xml b/shared/p2/shared-repository/pom.xml
index 68bd30e..073a363 100644
--- a/shared/p2/shared-repository/pom.xml
+++ b/shared/p2/shared-repository/pom.xml
@@ -30,6 +30,11 @@
       <artifactId>org.apache.sling.ide.impl-vlt</artifactId>
       <version>${project.version}</version>
     </dependency>
-  </dependencies>
+    <dependency>
+      <groupId>org.apache.sling.ide</groupId>
+      <artifactId>org.apache.sling.ide.artifacts</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+   </dependencies>
 
 </project>

-- 
To stop receiving notification emails like this one, please contact
rombert@apache.org.

Mime
View raw message