Experimental PDE config for core projects

git-svn-id: https://svn.argeo.org/slc/trunk@3262 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/runtime/org.argeo.slc.core/.classpath b/runtime/org.argeo.slc.core/.classpath
index 9653ef0ac65d46aeb55b97fc2273c071f8ec4f1b..a0707243bdea6c3287ce031ea4bf98883b9b586d 100644 (file)
--- a/runtime/org.argeo.slc.core/.classpath
+++ b/runtime/org.argeo.slc.core/.classpath
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="src" output="target/classes" path="src/main/java"/>\r
-       <classpathentry kind="src" output="target/classes" path="src/main/resources"/>\r
-       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
-       <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>\r
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
-       <classpathentry kind="output" path="target/classes"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="src" path="src/main/java"/>
+       <classpathentry kind="src" path="src/main/resources"/>
+       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+       <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="output" path="bin"/>
+</classpath>

diff --git a/runtime/org.argeo.slc.core/.project b/runtime/org.argeo.slc.core/.project
index ba3744df4a9057a1e7523603c9525a6fac673410..a304482ca15d75c180531843944506990fb9266b 100644 (file)
--- a/runtime/org.argeo.slc.core/.project
+++ b/runtime/org.argeo.slc.core/.project
@@ -11,13 +11,18 @@
                        </arguments>
                </buildCommand>
                <buildCommand>
-                       <name>org.maven.ide.eclipse.maven2Builder</name>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
        </buildSpec>
        <natures>
                <nature>org.eclipse.jdt.core.javanature</nature>
-               <nature>org.maven.ide.eclipse.maven2Nature</nature>
+               <nature>org.eclipse.pde.PluginNature</nature>
        </natures>
 </projectDescription>

diff --git a/runtime/org.argeo.slc.core/pom.xml b/runtime/org.argeo.slc.core/pom.xml
index fbd77f4097e40766719ee10d45e8c90ef1b84c9b..9b305e67eebacb7e37bc5055e3c5efcae03e2302 100644 (file)
--- a/runtime/org.argeo.slc.core/pom.xml
+++ b/runtime/org.argeo.slc.core/pom.xml
@@ -12,6 +12,17 @@
        <name>SLC Core</name>
        <description>Basic implementations of SLC Specifications</description>
        <build>
+               <resources>
+                       <resource>
+                               <directory>src/main/resources</directory>
+                       </resource>
+                       <resource>
+                               <directory>.</directory>
+                               <includes>
+                                       <include>META-INF/**</include>
+                               </includes>
+                       </resource>
+               </resources>
                <plugins>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
@@ -28,18 +39,18 @@
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-jar-plugin</artifactId>
-                               <!--
-                                       <executions> <execution> <goals> <goal>test-jar</goal> </goals>
-                                       <configuration> <archive>
-                                       <manifestFile>target/test-classes/META-INF/MANIFEST.MF</manifestFile>
-                                       </archive> </configuration> </execution> </executions>
-                               -->
+                               <configuration>
+                                       <archive>
+                                               <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+                                       </archive>
+                               </configuration>
                        </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
                                <version>${version.maven-bundle-plugin}</version>
                                <configuration>
+                                       <manifestLocation>META-INF</manifestLocation>
                                        <instructions>
                                                <Export-Package>
                                                        org.argeo.slc.*,org.argeo.slc.core.test.spring
@@ -49,7 +60,9 @@
                                                        org.dbunit.database;resolution:="optional",
                                                        org.dbunit.dataset;resolution:="optional",
                                                        org.dbunit.dataset.xml;resolution:="optional",
-                                                       org.dbunit.operation;resolution:="optional"
+                                                       org.dbunit.operation;resolution:="optional",
+                                                       junit.framework;resolution:="optional",
+                                                       org.springframework.context.support;resolution:=optional
                                                </Import-Package>
                                        </instructions>
                                </configuration>

diff --git a/runtime/org.argeo.slc.support.simple/.classpath b/runtime/org.argeo.slc.support.simple/.classpath
index 9653ef0ac65d46aeb55b97fc2273c071f8ec4f1b..110fd7f0b1110a8a65097dcfb44037afd6ad6938 100644 (file)
--- a/runtime/org.argeo.slc.support.simple/.classpath
+++ b/runtime/org.argeo.slc.support.simple/.classpath
@@ -5,6 +5,6 @@
        <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
        <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>\r
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
-       <classpathentry kind="output" path="target/classes"/>\r
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
+       <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/runtime/org.argeo.slc.support.simple/.project b/runtime/org.argeo.slc.support.simple/.project
index ee695c860f8faa85daa010be8bb231f4abfde622..356a393c59b4787cda82c3dae8bf3ac2bcf847bd 100644 (file)
--- a/runtime/org.argeo.slc.support.simple/.project
+++ b/runtime/org.argeo.slc.support.simple/.project
@@ -11,13 +11,18 @@
                        </arguments>
                </buildCommand>
                <buildCommand>
-                       <name>org.maven.ide.eclipse.maven2Builder</name>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
        </buildSpec>
        <natures>
                <nature>org.eclipse.jdt.core.javanature</nature>
-               <nature>org.maven.ide.eclipse.maven2Nature</nature>
+               <nature>org.eclipse.pde.PluginNature</nature>
        </natures>
 </projectDescription>

diff --git a/runtime/org.argeo.slc.support.simple/pom.xml b/runtime/org.argeo.slc.support.simple/pom.xml
index 189a8da9f1747861339f63f569facdf3c39f5435..d8765d8735e729651ae793653f8fa24683fdf759 100644 (file)
--- a/runtime/org.argeo.slc.support.simple/pom.xml
+++ b/runtime/org.argeo.slc.support.simple/pom.xml
@@ -12,6 +12,17 @@
        <name>SLC Support Simple</name>
        <description>Basic implementations of SLC Specifications</description>
        <build>
+               <resources>
+                       <resource>
+                               <directory>src/main/resources</directory>
+                       </resource>
+                       <resource>
+                               <directory>.</directory>
+                               <includes>
+                                       <include>META-INF/**</include>
+                               </includes>
+                       </resource>
+               </resources>
                <plugins>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
@@ -28,18 +39,18 @@
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-jar-plugin</artifactId>
-                               <!--
-                                       <executions> <execution> <goals> <goal>test-jar</goal> </goals>
-                                       <configuration> <archive>
-                                       <manifestFile>target/test-classes/META-INF/MANIFEST.MF</manifestFile>
-                                       </archive> </configuration> </execution> </executions>
-                               -->
+                               <configuration>
+                                       <archive>
+                                               <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+                                       </archive>
+                               </configuration>
                        </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
                                <version>${version.maven-bundle-plugin}</version>
                                <configuration>
+                                       <manifestLocation>META-INF</manifestLocation>
                                        <instructions>
                                                <Export-Package>
                                                        org.argeo.slc.*,org.argeo.slc.core.test.spring
@@ -49,7 +60,8 @@
                                                        org.dbunit.database;resolution:="optional",
                                                        org.dbunit.dataset;resolution:="optional",
                                                        org.dbunit.dataset.xml;resolution:="optional",
-                                                       org.dbunit.operation;resolution:="optional"
+                                                       org.dbunit.operation;resolution:="optional",
+                                                       junit.framework;resolution:="optional",
                                                </Import-Package>
                                        </instructions>
                                </configuration>