fixes issue 40308: Improvements for the Openbravo Eclipse project
authorCarlos Aristu <carlos.aristu@openbravo.com>
Mon, 04 Mar 2019 16:41:53 +0100
changeset 35535 c5133206f8ce
parent 35534 9df381ec1641
child 35536 46a06da3a17a
child 35665 ae728c352442
fixes issue 40308: Improvements for the Openbravo Eclipse project

- Include servlet-api in the classpath of the main and src-test projects instead of adding it through Tomcat 7 libraries
- Set OpenbravoCore as required project
- Remove OpenbravoTrl and OpenbravoWad as required projects
- Remove src-test and broken OpenbravoCore entry from the Web Deployment Assembly
.classpath.template
.settings/org.eclipse.wst.common.component.template
src-test/.classpath.template
--- a/.classpath.template	Mon Mar 04 14:38:05 2019 +0100
+++ b/.classpath.template	Mon Mar 04 16:41:53 2019 +0100
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/OpenbravoTrl"/>
-	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/OpenbravoWAD"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/OpenbravoCore"/>
 	<classpathentry including="**/*.ext|**/*.ftl|**/*.java|**/*.oaw|**/*.properties|**/*.xml|**/*.xpt|**/*.xslt" kind="src" path="src"/>
 	<classpathentry kind="src" path="modules/org.openbravo.apachejdbcconnectionpool/src"/>
 	<classpathentry kind="src" path="modules/org.openbravo.client.widgets/src"/>
@@ -27,6 +25,7 @@
 	<classpathentry including="**/*.java" kind="src" path="build/javasqlc/srcAD"/>
 	<classpathentry including="**/*.java" kind="src" path="build/javasqlc/src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="lib/build/servlet-api.jar"/>
 	<classpathentry kind="lib" path="lib/build/js.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
--- a/.settings/org.eclipse.wst.common.component.template	Mon Mar 04 14:38:05 2019 +0100
+++ b/.settings/org.eclipse.wst.common.component.template	Mon Mar 04 16:41:53 2019 +0100
@@ -7,10 +7,6 @@
 <wb-resource deploy-path="/WEB-INF/classes" source-path="/build/javasqlc/srcAD"/>
 <wb-resource deploy-path="/WEB-INF/classes" source-path="/build/javasqlc/src"/>
 <wb-resource deploy-path="/WEB-INF/classes" source-path="/src-gen"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src-test"/>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/OpenbravoCore/OpenbravoCore">
-<dependency-type>uses</dependency-type>
-</dependent-module>
 <property name="java-output-path" value="build/classes"/>
 <property name="context-root" value="openbravo"/>
 </wb-module>
--- a/src-test/.classpath.template	Mon Mar 04 14:38:05 2019 +0100
+++ b/src-test/.classpath.template	Mon Mar 04 16:41:53 2019 +0100
@@ -6,11 +6,11 @@
 	<classpathentry kind="src" path="test-lib"/>
 	<classpathentry kind="src" path="client.application-src-test"/>
 	<classpathentry kind="src" path="weld-src-test"/>
+	<classpathentry kind="lib" path="/openbravo/lib/build/servlet-api.jar"/>
 	<classpathentry kind="lib" path="/openbravo/lib/test/junit.jar"/>
 	<classpathentry kind="lib" path="/openbravo/lib/test/hamcrest-all-1.3.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container/openbravo"/>
-	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/OpenbravoWAD"/>
 	<classpathentry kind="lib" path="test-lib/arquillian-container-impl-base-1.1.8.Final.jar"/>
 	<classpathentry kind="lib" path="test-lib/arquillian-container-spi-1.1.8.Final.jar"/>