From 9b93c0db9151aec3c69f96b78149039bb0efa376 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 15 May 2008 10:01:39 +0000
Subject: [PATCH] Remove dependency to Eclipse WTP

git-svn-id: https://svn.argeo.org/slc/trunk@1143 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 org.argeo.slc.webapp/.classpath                  |  8 +-------
 org.argeo.slc.webapp/.project                    | 13 -------------
 ...g.eclipse.jst.common.project.facet.core.prefs |  4 ----
 .../.settings/org.eclipse.wst.common.component   | 16 ----------------
 ...org.eclipse.wst.common.project.facet.core.xml |  8 --------
 .../webapp/WEB-INF/local-template.properties     |  6 +++---
 6 files changed, 4 insertions(+), 51 deletions(-)
 delete mode 100644 org.argeo.slc.webapp/.settings/org.eclipse.jst.common.project.facet.core.prefs
 delete mode 100644 org.argeo.slc.webapp/.settings/org.eclipse.wst.common.component
 delete mode 100644 org.argeo.slc.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml

diff --git a/org.argeo.slc.webapp/.classpath b/org.argeo.slc.webapp/.classpath
index 596529b7b..014fb9dc7 100644
--- a/org.argeo.slc.webapp/.classpath
+++ b/org.argeo.slc.webapp/.classpath
@@ -2,13 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v5.5"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
+	<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="build/classes"/>
 </classpath>
diff --git a/org.argeo.slc.webapp/.project b/org.argeo.slc.webapp/.project
index 9c84f1a57..d0138d1fd 100644
--- a/org.argeo.slc.webapp/.project
+++ b/org.argeo.slc.webapp/.project
@@ -12,16 +12,6 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.maven.ide.eclipse.maven2Builder</name>
 			<arguments>
@@ -31,8 +21,5 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
 	</natures>
 </projectDescription>
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
index 7060fbfed..000000000
--- 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
-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
-classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v5.5/owners=jst.web\:2.4
-eclipse.preferences.version=1
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
index 4ad4a5ba2..000000000
--- a/org.argeo.slc.webapp/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-<wb-module deploy-name="org.argeo.slc.webapp">
-<wb-resource deploy-path="/" source-path="/src/main/webapp"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/org.argeo.slc.server/org.argeo.slc.server">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/org.argeo.slc.core/org.argeo.slc.core">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<property name="context-root" value="org.argeo.slc.webapp"/>
-<property name="java-output-path" value="build/classes"/>
-</wb-module>
-</project-modules>
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
index 8e832a1bf..000000000
--- 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"?>
-<faceted-project>
-  <runtime name="Apache Tomcat v5.5"/>
-  <fixed facet="jst.web"/>
-  <fixed facet="jst.java"/>
-  <installed facet="jst.java" version="5.0"/>
-  <installed facet="jst.web" version="2.4"/>
-</faceted-project>
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 17ff29cdd..1eed96a7c 100644
--- 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
 
 # For in memory database switch following lines
-#dataSourceBean=slcTemplates.dataSource.inMemoryTestHSQL
-dataSourceBean=persistentDataSource
+dataSourceBean=slcDefault.dataSource.inMemoryTestHSQL
+#dataSourceBean=persistentDataSource
 
-# URL of the peristent database
+# URL of the persistent database
 jdbcUrl=jdbc:hsqldb:file:/<path to a directory>/<db name>;shutdown=true
 # Under Windows use the following form (with /!)
 #jdbcUrl=jdbc:hsqldb:file:/C:/dev/test/dbSlc/db;shutdown=true
-- 
2.39.2