Make SLC projects compatible with the latest M2Eclipse plugin.

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

diff --git a/sandbox/argeo.slc.jemmytest/.classpath b/sandbox/argeo.slc.jemmytest/.classpath
index 2996c14a07754bb4c804f786c930c3f45715356e..9ff4bc875b4070f37771a919e6560e521dd066ed 100644 (file)
--- a/sandbox/argeo.slc.jemmytest/.classpath
+++ b/sandbox/argeo.slc.jemmytest/.classpath
@@ -1,9 +1,9 @@
 <?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" path="src/test/java"/>
+       <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+       <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
        <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-       <classpathentry kind="output" path="bin"/>
+       <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/sandbox/argeo.slc.jemmytest/.settings/org.eclipse.jdt.core.prefs b/sandbox/argeo.slc.jemmytest/.settings/org.eclipse.jdt.core.prefs
index 668eec6b7518f67847596a56d309836e3c2a2586..ed92a2c8db029f92da64ec2233523aa6d382f41c 100644 (file)
--- a/sandbox/argeo.slc.jemmytest/.settings/org.eclipse.jdt.core.prefs
+++ b/sandbox/argeo.slc.jemmytest/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Wed Sep 24 19:17:13 CEST 2008
+#Sun Oct 12 08:45:48 CEST 2008
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
@@ -9,4 +9,4 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.compiler.source=1.4

diff --git a/sandbox/argeo.slc.jemmytest/pom.xml b/sandbox/argeo.slc.jemmytest/pom.xml
index 9a3edf3910ef4505a6ad95ce8cb967d0341518a1..ee45006b2db4630cd8415112c34e3d2f0be2a1d7 100644 (file)
--- a/sandbox/argeo.slc.jemmytest/pom.xml
+++ b/sandbox/argeo.slc.jemmytest/pom.xml
@@ -12,6 +12,7 @@
     <artifactId>org.argeo.slc.sandbox.jemmytest</artifactId>
     <name>SLC Sandbox JemmyTest</name>
     <packaging>bundle</packaging>
+    <properties></properties>
     <build>
         <plugins>
             <plugin>
@@ -39,15 +40,17 @@
                         <Require-Bundle>
                             org.argeo.slc.detached
                         </Require-Bundle>
+                        <_removeheaders>Bnd-LastModified</_removeheaders>
                     </instructions>
+                    
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.3</source>
-                    <target>1.3</target>
+                    <source>1.4</source>
+                    <target>1.2</target>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/MANIFEST.MF b/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/MANIFEST.MF
index 7368a243798ea6c4d60b5abea10951ffbf9a77ee..59270fef7c67f32515fb4bd23fafcee4c8ef34cc 100644 (file)
--- a/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/MANIFEST.MF
+++ b/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/MANIFEST.MF
@@ -1,10 +1,9 @@
 Manifest-Version: 1.0\r
 Export-Package: org.argeo.slc.jemmytest.uiparts;uses:="org.argeo.slc.d\r
  etached.ui,javax.swing,org.netbeans.jemmy,org.netbeans.jemmy.operator\r
- s,org.argeo.slc.detached",org.argeo.slc.jemmytest;uses:="org.apache.c\r
- ommons.logging,org.netbeans.jemmy.operators,org.argeo.slc.detached",o\r
- rg.argeo.slc.jemmytest.steps;uses:="org.argeo.slc.jemmytest.uiparts,o\r
- rg.argeo.slc.detached.ui,org.argeo.slc.detached"\r
+ s,org.argeo.slc.detached",org.argeo.slc.jemmytest;uses:="org.argeo.sl\r
+ c.detached",org.argeo.slc.jemmytest.steps;uses:="org.argeo.slc.jemmyt\r
+ est.uiparts,org.argeo.slc.detached.ui,org.argeo.slc.detached"\r
 Built-By: mbaudier\r
 Tool: Bnd-0.0.255\r
 Bundle-Name: SLC Sandbox JemmyTest\r
@@ -13,17 +12,18 @@ Require-Bundle: org.argeo.slc.detached
 Bundle-Vendor: Argeo\r
 Build-Jdk: 1.6.0\r
 Bundle-Version: 0.11.1.SNAPSHOT\r
-Bnd-LastModified: 1223229086154\r
 Bundle-Activator: org.argeo.slc.jemmytest.JemmyTestActivator\r
 Bundle-ManifestVersion: 2\r
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
 Bundle-Description: SLC Distribution\r
-Import-Package: javax.swing,org.apache.commons.logging,org.argeo.slc.d\r
- etached,org.argeo.slc.detached.ui,org.argeo.slc.jemmytest,org.argeo.s\r
- lc.jemmytest.steps,org.argeo.slc.jemmytest.uiparts,org.netbeans.jemmy\r
- ,org.netbeans.jemmy.operators,org.springframework.beans.factory.xml;v\r
- ersion="2.0.8"\r
+Import-Package: javax.swing,org.argeo.slc.detached,org.argeo.slc.detac\r
+ hed.ui,org.argeo.slc.jemmytest,org.argeo.slc.jemmytest.steps,org.arge\r
+ o.slc.jemmytest.uiparts,org.netbeans.jemmy,org.netbeans.jemmy.operato\r
+ rs,org.springframework.beans.factory.xml;version="2.0.8"\r
 Bundle-SymbolicName: org.argeo.slc.sandbox.jemmytest\r
 Bundle-DocURL: http://www.argeo.org\r
+Include-Resource: META-INF/spring/slc-detached.xml=src/main/resources/\r
+ META-INF/spring/slc-detached.xml,META-INF/MANIFEST.MF=src/main/resour\r
+ ces/META-INF/MANIFEST.MF\r
 Originally-Created-By: Apache Maven Bundle Plugin\r
 \r