Author: costin
Date: Fri Aug 29 21:24:45 2008
New Revision: 690457
URL: http://svn.apache.org/viewvc?rev=690457&view=rev
Log:
Remove unused files ( they are in the other dir ), small fixes
Removed:
tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/util/buf/res/LocalStrings.properties
tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/util/buf/res/LocalStrings_es.properties
tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/util/buf/res/LocalStrings_fr.properties
tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/util/buf/res/LocalStrings_ja.properties
tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/util/threads/res/LocalStrings.properties
tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/util/threads/res/LocalStrings_es.properties
tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/util/threads/res/LocalStrings_fr.properties
tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/util/threads/res/LocalStrings_ja.properties
Modified:
tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/lite/ServletContextImpl.java
tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/lite/TomcatLiteMain.java
tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/servlets/config/WebXml.java
Modified:
tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/lite/ServletContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/lite/ServletContextImpl.java?rev=690457&r1=690456&r2=690457&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/lite/ServletContextImpl.java
(original)
+++
tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/lite/ServletContextImpl.java
Fri Aug 29 21:24:45 2008
@@ -66,6 +66,7 @@
import org.apache.tomcat.servlets.util.Enumerator;
import org.apache.tomcat.servlets.util.RequestUtil;
import org.apache.tomcat.servlets.util.UrlUtils;
+import org.apache.tomcat.util.http.MimeMap;
import org.apache.tomcat.util.res.StringManager;
@@ -110,18 +111,7 @@
StringManager.getManager("org.apache.tomcat.lite");
- static Properties contentTypes=new Properties();
- static {
- initContentTypes();
- }
- // TODO: proper implementation
- static void initContentTypes() {
- contentTypes.put("xhtml", "text/html");
- contentTypes.put("html", "text/html");
- contentTypes.put("txt", "text/plain");
- contentTypes.put("css", "text/css");
- contentTypes.put("xul", "application/vnd.mozilla.xul+xml");
- }
+ MimeMap contentTypes = new MimeMap();
/**
* The context attributes for this context.
@@ -275,7 +265,7 @@
}
public void addMimeType(String ext, String type) {
- contentTypes.put(ext, type);
+ contentTypes.addContentType(ext, type);
}
public WebappServletMapper getMapper() {
@@ -410,15 +400,7 @@
* @param file Filename for which to identify a MIME type
*/
public String getMimeType(String file) {
- if (file == null)
- return (null);
- int period = file.lastIndexOf(".");
- if (period < 0)
- return (null);
- String extension = file.substring(period + 1);
- if (extension.length() < 1)
- return (null);
- return contentTypes.getProperty(extension);
+ return contentTypes.getMimeType(file);
}
/**
Modified:
tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/lite/TomcatLiteMain.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/lite/TomcatLiteMain.java?rev=690457&r1=690456&r2=690457&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/lite/TomcatLiteMain.java
(original)
+++ tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/lite/TomcatLiteMain.java
Fri Aug 29 21:24:45 2008
@@ -16,6 +16,13 @@
*/
package org.apache.tomcat.lite;
+import java.io.IOException;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.tomcat.servlets.addon.ConfigurableServletContext;
import org.apache.tomcat.util.IntrospectionUtils;
/**
@@ -43,7 +50,7 @@
// TODO: integrate this with JMX
IntrospectionUtils.processArgs(lite, args);
IntrospectionUtils.processArgs(lite.coyote, args);
-
+
lite.init();
lite.start();
lite.startConnector();
Modified:
tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/servlets/config/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/servlets/config/WebXml.java?rev=690457&r1=690456&r2=690457&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/servlets/config/WebXml.java
(original)
+++
tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/servlets/config/WebXml.java
Fri Aug 29 21:24:45 2008
@@ -312,13 +312,17 @@
private void processServletMapping(Node confNode) {
String name = DomUtil.getChildContent(confNode,"servlet-name");
- String path = DomUtil.getChildContent(confNode,"url-pattern").trim();
-
- if (! (path.startsWith("/") || path.startsWith("*"))) {
- // backward compat
- path = "/" + path;
+ Node dataN = DomUtil.getChild(confNode, "url-pattern");
+ while (dataN != null) {
+ String path = DomUtil.getContent(dataN).trim();
+ dataN = DomUtil.getNext(dataN);
+
+ if (! (path.startsWith("/") || path.startsWith("*"))) {
+ // backward compat
+ path = "/" + path;
+ }
+ d.servletMapping.put(path, name);
}
- d.servletMapping.put(path, name);
}
private void processFilterMapping(Node confNode) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
