[lib-update] update servlet-api 2.4 -> 2.5 and move to lib/build
authorStefan Hühner <stefan.huehner@openbravo.com>
Wed, 27 Apr 2011 13:21:51 +0200
changeset 11883 bb2232613986
parent 11882 075131dbf837
child 11885 327528aa52ae
[lib-update] update servlet-api 2.4 -> 2.5 and move to lib/build
- Update to version 2.5 as that matches the version provided by tcomat6
which is the minimum required version
- adjust various .classpath files for new jar location
- cleanup src/build.xml as now no need to exclude this jar from being copied
when fetching jars from runtime as its now located in build (and so
not copied)
lib/build/servlet-api.jar
lib/runtime/servlet-api.jar
src-core/.classpath
src-trl/.classpath
src-wad/.classpath
src/build.xml
Binary file lib/build/servlet-api.jar has changed
Binary file lib/runtime/servlet-api.jar has changed
--- a/src-core/.classpath	Wed Apr 27 11:50:10 2011 +0200
+++ b/src-core/.classpath	Wed Apr 27 13:21:51 2011 +0200
@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/openbravo/lib/runtime/servlet-api.jar"/>
 	<classpathentry kind="lib" path="/openbravo/lib/runtime/commons-dbcp-1.4.jar"/>
 	<classpathentry kind="lib" path="/openbravo/lib/runtime/commons-pool-1.5.6.jar"/>
 	<classpathentry kind="lib" path="/openbravo/lib/runtime/fop.jar"/>
@@ -16,5 +15,6 @@
 	<classpathentry kind="lib" path="/openbravo/lib/runtime/commons-io-2.0.1.jar"/>
 	<classpathentry kind="lib" path="/openbravo/lib/runtime/ant-1.7.1.jar"/>
 	<classpathentry kind="lib" path="/openbravo/lib/runtime/ant-apache-log4j.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/build/servlet-api.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
--- a/src-trl/.classpath	Wed Apr 27 11:50:10 2011 +0200
+++ b/src-trl/.classpath	Wed Apr 27 13:21:51 2011 +0200
@@ -4,11 +4,11 @@
 	<classpathentry kind="src" path="build/javasqlc/src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/OpenbravoCore"/>
-	<classpathentry kind="lib" path="/openbravo/lib/runtime/servlet-api.jar"/>
 	<classpathentry kind="lib" path="/openbravo/lib/runtime/nekohtml.jar"/>
 	<classpathentry kind="lib" path="/openbravo/lib/runtime/xercesImpl.jar"/>
 	<classpathentry kind="lib" path="/openbravo/lib/runtime/ojdbc6.jar"/>
 	<classpathentry kind="lib" path="/openbravo/lib/runtime/postgresql-9.0-801.jdbc4.jar"/>
 	<classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-1.2.16.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/build/servlet-api.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
--- a/src-wad/.classpath	Wed Apr 27 11:50:10 2011 +0200
+++ b/src-wad/.classpath	Wed Apr 27 13:21:51 2011 +0200
@@ -6,10 +6,10 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/OpenbravoCore"/>
 	<classpathentry kind="lib" path="/openbravo/lib/runtime/xercesImpl.jar"/>
 	<classpathentry kind="lib" path="/openbravo/lib/runtime/ojdbc6.jar"/>
-	<classpathentry kind="lib" path="/openbravo/lib/runtime/servlet-api.jar"/>
 	<classpathentry kind="lib" path="/openbravo/lib/runtime/postgresql-9.0-801.jdbc4.jar"/>
 	<classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-1.2.16.jar"/>
 	<classpathentry kind="lib" path="/openbravo/lib/runtime/ant-1.7.1.jar"/>
 	<classpathentry kind="lib" path="/openbravo/lib/runtime/commons-collections-3.2.1.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/build/servlet-api.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
--- a/src/build.xml	Wed Apr 27 11:50:10 2011 +0200
+++ b/src/build.xml	Wed Apr 27 13:21:51 2011 +0200
@@ -551,7 +551,6 @@
       <fileset dir="${base.lib}/runtime">
         <exclude name="openbravo-wad.jar" />
         <exclude name="openbravo-trl.jar" />
-        <exclude name="servlet-api.jar" />
         <exclude name="*.war" />
       </fileset>
       <fileset dir="${base.db}/lib">
@@ -871,7 +870,6 @@
     <war compress="true" destfile="${base.lib}/${context.name}.war" encoding="UTF-8" webxml="${base.context}/WEB-INF/web.xml">
       <zipfileset dir="${base.context}">
         <exclude name="**/WEB-INF/web.xml" />
-        <exclude name="**/WEB-INF/lib/servlet-api.jar" />
       </zipfileset>
       <classes dir="${build}" />
     </war>