You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2018/11/26 18:01:25 UTC

[sling-ide-tooling] branch master updated: make sure to include Eclipse project files along with shared modules.

This is an automated email from the ASF dual-hosted git repository.

kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-ide-tooling.git


The following commit(s) were added to refs/heads/master by this push:
     new 19a1052  make sure to include Eclipse project files along with shared modules.
19a1052 is described below

commit 19a10522b690aed37aa0f9893e7bdc46692e59ae
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Mon Nov 26 19:01:04 2018 +0100

    make sure to include Eclipse project files along with shared modules.
    
    This ensures those projects are detected as plugins as well by PDE (and
    contained in subsequent debug launches) because they only have packaging
    "jar".
---
 shared/modules/.gitignore             |  2 ++
 shared/modules/api/.project           | 34 ++++++++++++++++++++++++++++++++++
 shared/modules/artifacts/.project     | 34 ++++++++++++++++++++++++++++++++++
 shared/modules/impl-resource/.project | 34 ++++++++++++++++++++++++++++++++++
 shared/modules/impl-vlt/.project      | 34 ++++++++++++++++++++++++++++++++++
 shared/modules/parent/.project        | 17 +++++++++++++++++
 shared/modules/parent/pom.xml         | 12 ++++++++++++
 shared/modules/sync-fs/.project       | 34 ++++++++++++++++++++++++++++++++++
 8 files changed, 201 insertions(+)

diff --git a/shared/modules/.gitignore b/shared/modules/.gitignore
index bb6adf5..ec02436 100644
--- a/shared/modules/.gitignore
+++ b/shared/modules/.gitignore
@@ -1,2 +1,4 @@
 META-INF/
 OSGI-INF/
+!*/.project
+build.properties
diff --git a/shared/modules/api/.project b/shared/modules/api/.project
new file mode 100644
index 0000000..53aa37e
--- /dev/null
+++ b/shared/modules/api/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.apache.sling.ide.api</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/shared/modules/artifacts/.project b/shared/modules/artifacts/.project
new file mode 100644
index 0000000..d0ed5f0
--- /dev/null
+++ b/shared/modules/artifacts/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.apache.sling.ide.artifacts</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/shared/modules/impl-resource/.project b/shared/modules/impl-resource/.project
new file mode 100644
index 0000000..11534a1
--- /dev/null
+++ b/shared/modules/impl-resource/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.apache.sling.ide.impl-resource</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/shared/modules/impl-vlt/.project b/shared/modules/impl-vlt/.project
new file mode 100644
index 0000000..a5eecdb
--- /dev/null
+++ b/shared/modules/impl-vlt/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.apache.sling.ide.impl-vlt</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/shared/modules/parent/.project b/shared/modules/parent/.project
new file mode 100644
index 0000000..944b2a9
--- /dev/null
+++ b/shared/modules/parent/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>sling-ide-shared-parent</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/shared/modules/parent/pom.xml b/shared/modules/parent/pom.xml
index e0e68fe..c1821a0 100644
--- a/shared/modules/parent/pom.xml
+++ b/shared/modules/parent/pom.xml
@@ -47,6 +47,14 @@
                 </configuration>
             </plugin>
         </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>3.1.0</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 
     <profiles>
@@ -60,6 +68,9 @@
                 </property>
             </activation>
             <build>
+                <!-- as currently PDE cannot deal with the MANIFEST.MF in the target folder
+                https://bugs.eclipse.org/bugs/show_bug.cgi?id=533263 copy both 
+                Manifest and component descriptors to the project's root -->
                 <plugins>
                     <plugin>
                         <artifactId>maven-clean-plugin</artifactId>
@@ -90,6 +101,7 @@
                                     <goal>copy-resources</goal>
                                 </goals>
                                 <configuration>
+                                    <overwrite>true</overwrite>
                                     <outputDirectory>META-INF</outputDirectory>
                                     <resources>
                                         <resource>
diff --git a/shared/modules/sync-fs/.project b/shared/modules/sync-fs/.project
new file mode 100644
index 0000000..4c63d87
--- /dev/null
+++ b/shared/modules/sync-fs/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.apache.sling.ide.sync-fs</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>