Remove dependency to Eclipse WTP

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

diff --git a/org.argeo.slc.webapp/.classpath b/org.argeo.slc.webapp/.classpath
index 596529b7b338ec81d0195f94ca943374e6fa9614..014fb9dc7ec4c1a44ab6b67372a9f493f35c04c4 100644 (file)
--- a/org.argeo.slc.webapp/.classpath
+++ b/org.argeo.slc.webapp/.classpath
@@ -2,13 +2,7 @@
 <classpath>\r
        <classpathentry kind="src" path="src/main/java"/>\r
        <classpathentry kind="src" path="src/main/resources"/>\r
-       <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v5.5"/>\r
-       <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>\r
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">\r
-               <attributes>\r
-                       <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>\r
-               </attributes>\r
-       </classpathentry>\r
+       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\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="output" path="build/classes"/>\r
 </classpath>\r

diff --git a/org.argeo.slc.webapp/.project b/org.argeo.slc.webapp/.project
index 9c84f1a570225af1b051aa5fdd7f9b7de5b5c79f..d0138d1fdf28ebd9b074f40f5bbdeeef1477c9fe 100644 (file)
--- a/org.argeo.slc.webapp/.project
+++ b/org.argeo.slc.webapp/.project
@@ -12,16 +12,6 @@
                        <arguments>\r
                        </arguments>\r
                </buildCommand>\r
-               <buildCommand>\r
-                       <name>org.eclipse.wst.common.project.facet.core.builder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-               <buildCommand>\r
-                       <name>org.eclipse.wst.validation.validationbuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
                <buildCommand>\r
                        <name>org.maven.ide.eclipse.maven2Builder</name>\r
                        <arguments>\r
@@ -31,8 +21,5 @@
        <natures>\r
                <nature>org.eclipse.jdt.core.javanature</nature>\r
                <nature>org.maven.ide.eclipse.maven2Nature</nature>\r
-               <nature>org.eclipse.wst.common.project.facet.core.nature</nature>\r
-               <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>\r
-               <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>\r
        </natures>\r
 </projectDescription>\r

diff --git a/org.argeo.slc.webapp/.settings/org.eclipse.jst.common.project.facet.core.prefs b/org.argeo.slc.webapp/.settings/org.eclipse.jst.common.project.facet.core.prefs
deleted file mode 100644 (file)
index 7060fbf..0000000
--- a/org.argeo.slc.webapp/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Apr 21 18:27:10 CEST 2008\r
-classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:jre1.5.0_07/owners=jst.java\:5.0\r
-classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v5.5/owners=jst.web\:2.4\r
-eclipse.preferences.version=1\r

diff --git a/org.argeo.slc.webapp/.settings/org.eclipse.wst.common.component b/org.argeo.slc.webapp/.settings/org.eclipse.wst.common.component
deleted file mode 100644 (file)
index 4ad4a5b..0000000
--- a/org.argeo.slc.webapp/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<project-modules id="moduleCoreId" project-version="1.5.0">\r
-<wb-module deploy-name="org.argeo.slc.webapp">\r
-<wb-resource deploy-path="/" source-path="/src/main/webapp"/>\r
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>\r
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>\r
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/org.argeo.slc.server/org.argeo.slc.server">\r
-<dependency-type>uses</dependency-type>\r
-</dependent-module>\r
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/org.argeo.slc.core/org.argeo.slc.core">\r
-<dependency-type>uses</dependency-type>\r
-</dependent-module>\r
-<property name="context-root" value="org.argeo.slc.webapp"/>\r
-<property name="java-output-path" value="build/classes"/>\r
-</wb-module>\r
-</project-modules>\r

diff --git a/org.argeo.slc.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.argeo.slc.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644 (file)
index 8e832a1..0000000
--- a/org.argeo.slc.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<faceted-project>\r
-  <runtime name="Apache Tomcat v5.5"/>\r
-  <fixed facet="jst.web"/>\r
-  <fixed facet="jst.java"/>\r
-  <installed facet="jst.java" version="5.0"/>\r
-  <installed facet="jst.web" version="2.4"/>\r
-</faceted-project>\r

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/local-template.properties b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/local-template.properties
index 17ff29cddd70aeb4cb5a475fb55a02e03107bb33..1eed96a7c13ccea3f4e4ebf7f08c2f6ee91017f9 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/local-template.properties
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/local-template.properties
@@ -1,10 +1,10 @@
 # Rename this file to local.properties\r
 \r
 # For in memory database switch following lines\r
-#dataSourceBean=slcTemplates.dataSource.inMemoryTestHSQL\r
-dataSourceBean=persistentDataSource\r
+dataSourceBean=slcDefault.dataSource.inMemoryTestHSQL\r
+#dataSourceBean=persistentDataSource\r
 \r
-# URL of the peristent database\r
+# URL of the persistent database\r
 jdbcUrl=jdbc:hsqldb:file:/<path to a directory>/<db name>;shutdown=true\r
 # Under Windows use the following form (with /!)\r
 #jdbcUrl=jdbc:hsqldb:file:/C:/dev/test/dbSlc/db;shutdown=true\r