From febc4c5e4ab3870abe5898e3bc498121d4616038 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 14 Oct 2008 21:05:03 +0000
Subject: [PATCH 1/1] Make SLC projects compatible with the latest M2Eclipse
 plugin.

git-svn-id: https://svn.argeo.org/slc/trunk@1738 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 sandbox/argeo.slc.jemmytest/.classpath        | 10 +++++-----
 .../.settings/org.eclipse.jdt.core.prefs      |  4 ++--
 sandbox/argeo.slc.jemmytest/pom.xml           |  7 +++++--
 .../src/main/resources/META-INF/MANIFEST.MF   | 20 +++++++++----------
 4 files changed, 22 insertions(+), 19 deletions(-)

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