Remove dependency on servlet-api-3.0 until Java 6 is required

wocommunity · Aug 19, 2014 · d2c8a86 · d2c8a86
1 parent 21a9dd3
commit d2c8a86
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXServletApplication.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXServletApplication.java
@@ -33,8 +33,8 @@ public WOResponse dispatchRequest(WORequest request) {
     		didSetBaseUrl = true;
     		ServletContext servletContext = (ServletContext) request.userInfo().get("ServletContext");
     		if (servletContext != null) {
-    			setApplicationBaseURL(servletContext.getContextPath() + "/static/"); // "static" is the built-in static resource servlet for Tomcat and Jetty
-    			setFrameworksBaseURL(servletContext.getContextPath() + "/static/Frameworks/");
+//    			setApplicationBaseURL(servletContext.getContextPath() + "/static/"); // "static" is the built-in static resource servlet for Tomcat and Jetty
+//    			setFrameworksBaseURL(servletContext.getContextPath() + "/static/Frameworks/");
     		}
     	}
 

diff --git a/Frameworks/Core/ERJars/.classpath b/Frameworks/Core/ERJars/.classpath
@@ -20,6 +20,5 @@
 	<classpathentry exported="true" kind="lib" path="Libraries/httpclient-cache-4.3.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="Libraries/httpcore-4.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="Libraries/httpmime-4.3.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="Libraries/servlet-api-3.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/Frameworks/Core/ERJars/Libraries/servlet-api-3.0.jar b/Frameworks/Core/ERJars/Libraries/servlet-api-3.0.jar