Remove dependency to M2Eclipse

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

diff --git a/demo/.classpath b/demo/.classpath
deleted file mode 100644 (file)
index d0bec0f..0000000
--- a/demo/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <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.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-       <classpathentry kind="output" path="target/classes"/>
-</classpath>

diff --git a/demo/.project b/demo/.project
index ba427f6cbf62b1fdbb68f5bc9640728e1dd9b55f..46d39a88e4fc5ec45b06ec2f271c7a7bdf39af42 100644 (file)
--- a/demo/.project
+++ b/demo/.project
@@ -5,19 +5,7 @@
        <projects>
        </projects>
        <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.maven.ide.eclipse.maven2Builder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
        </buildSpec>
        <natures>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-               <nature>org.maven.ide.eclipse.maven2Nature</nature>
        </natures>
 </projectDescription>

diff --git a/demo/.settings/org.eclipse.jdt.core.prefs b/demo/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644 (file)
index 05f7316..0000000
--- a/demo/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Tue Apr 28 16:14:04 CEST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5

diff --git a/demo/.settings/org.maven.ide.eclipse.prefs b/demo/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644 (file)
index 74021b5..0000000
--- a/demo/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Tue Apr 28 16:13:53 CEST 2009
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1

diff --git a/demo/site/org.argeo.slc.demo.log4j/log4j.properties b/demo/site/org.argeo.slc.demo.log4j/log4j.properties
index 694a56334ac70e72d0d716c574549dd4d989cd93..7729f85f7c6ef735846f2920d054ed3c55bc2da8 100644 (file)
--- a/demo/site/org.argeo.slc.demo.log4j/log4j.properties
+++ b/demo/site/org.argeo.slc.demo.log4j/log4j.properties
@@ -29,6 +29,7 @@ log4j.logger.org.apache.activemq.ActiveMQMessageProducer=INFO
 log4j.logger.org.apache.catalina=INFO
 log4j.logger.org.apache.coyote=INFO
 log4j.logger.org.apache.tomcat=INFO
+log4j.logger.org.springframework.osgi.web.tomcat=INFO
 
 log4j.logger.org.apache.directory.server=INFO
 log4j.logger.org.apache.directory.server.core.partition=ERROR

diff --git a/integration-tests/org.argeo.slc.it.webapp/.classpath b/integration-tests/org.argeo.slc.it.webapp/.classpath
index 9bedaab94670ce601c4dcd2047dd06f61c380416..291d54ad482980a1cf1386fa4ad8b668d20e4d9e 100644 (file)
--- a/integration-tests/org.argeo.slc.it.webapp/.classpath
+++ b/integration-tests/org.argeo.slc.it.webapp/.classpath
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="src" path="src/test/java" output="target/test-classes" />
-       <classpathentry kind="src" path="src/test/resources"
-               output="target/test-classes" />
-       <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.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
-       <classpathentry kind="output" path="target/classes" />
+       <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.pde.core.requiredPlugins"/>
+       <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="target/classes"/>
 </classpath>

diff --git a/integration-tests/org.argeo.slc.it.webapp/.project b/integration-tests/org.argeo.slc.it.webapp/.project
index e91f29da356be3548e2f85f99387331e56edf65d..5d251937a0d70272a92fd5ae38f03e241de6e3e7 100644 (file)
--- a/integration-tests/org.argeo.slc.it.webapp/.project
+++ b/integration-tests/org.argeo.slc.it.webapp/.project
@@ -6,20 +6,23 @@
        </projects>
        <buildSpec>
                <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder
-                       </name>
+                       <name>org.eclipse.jdt.core.javabuilder</name>
                        <arguments>
                        </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/integration-tests/org.argeo.slc.it.webapp/META-INF/MANIFEST.MF b/integration-tests/org.argeo.slc.it.webapp/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..518e792
--- /dev/null
+++ b/integration-tests/org.argeo.slc.it.webapp/META-INF/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: SLC Integration Tests
+Bundle-SymbolicName: org.argeo.slc.it.webapp
+Bundle-Version: 0.13.0.SNAPSHOT
+Import-Package: junit.framework;version="3.8.2",
+ org.argeo.slc;version="0.13.0.SNAPSHOT-r3650",
+ org.argeo.slc.msg;version="0.13.0.SNAPSHOT-r3653",
+ org.argeo.slc.runtime;version="0.13.0.SNAPSHOT-r3650",
+ org.argeo.slc.server;version="0.13.0.SNAPSHOT-r3650",
+ org.argeo.slc.server.client;version="0.13.0.SNAPSHOT-r3641",
+ org.argeo.slc.server.unit;version="0.13.0.SNAPSHOT-r3641"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5