You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by mc...@apache.org on 2008/03/21 14:00:16 UTC
svn commit: r639612 -
/incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/
Author: mcombellack
Date: Fri Mar 21 06:00:10 2008
New Revision: 639612
URL: http://svn.apache.org/viewvc?rev=639612&view=rev
Log:
Minor JavaDoc updates and spelling corrections
Modified:
incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java
incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java
incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java
incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java
incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java
incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
Modified: incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java?rev=639612&r1=639611&r2=639612&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java (original)
+++ incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java Fri Mar 21 06:00:10 2008
@@ -31,7 +31,7 @@
* SCA contribution jars. All contribution jars found in the repository
* directory named "sca-contributions" will be contributed to the SCA
* domain. Any changes to the contributions in the repository will be
- * automatically detected and the sca domain updated accordingly.
+ * automatically detected and the SCADomain updated accordingly.
*/
public class HotUpdateContextListener extends TuscanyContextListener {
Modified: incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java?rev=639612&r1=639611&r2=639612&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java (original)
+++ incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java Fri Mar 21 06:00:10 2008
@@ -50,11 +50,11 @@
try {
URL rootURL = servletContext.getResource("/");
if (rootURL.getProtocol().equals("jndi")) {
- //this is tomcat case, we should use getRealPath
+ //this is Tomcat case, we should use getRealPath
File warRootFile = new File(servletContext.getRealPath("/"));
contributionRoot = warRootFile.toURL().toString();
} else {
- //this is jetty case
+ //this is Jetty case
contributionRoot = rootURL.toString();
}
} catch(MalformedURLException mf) {
Modified: incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java?rev=639612&r1=639611&r2=639612&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java (original)
+++ incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java Fri Mar 21 06:00:10 2008
@@ -31,7 +31,7 @@
import javax.servlet.http.HttpServletRequest;
/**
- * A servlet that forwards requests to the servlets registered with the Tuscany
+ * A Servlet that forwards requests to the Servlets registered with the Tuscany
* ServletHost.
*
* @deprecated Not needed anymore, TuscanyServletFilter is sufficient
Modified: incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java?rev=639612&r1=639611&r2=639612&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java (original)
+++ incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java Fri Mar 21 06:00:10 2008
@@ -33,7 +33,7 @@
import javax.servlet.http.HttpServletRequest;
/**
- * A servlet filter that forwards service requests to the servlets registered with
+ * A Servlet filter that forwards service requests to the Servlets registered with
* the Tuscany ServletHost.
*/
public class TuscanyServletFilter implements Filter {
@@ -46,7 +46,7 @@
// TODO: must be a better way to get this than using a static
servletHost = WebAppServletHost.getInstance();
- // Initialize the servlet host
+ // Initialize the Servlet host
servletHost.init(new ServletConfig() {
public String getInitParameter(String name) {
return config.getInitParameter(name);
@@ -73,7 +73,7 @@
public void doFilter(ServletRequest request, ServletResponse response, javax.servlet.FilterChain chain)
throws IOException, ServletException {
- // Get the servlet path
+ // Get the Servlet path
HttpServletRequest httpRequest = (HttpServletRequest)request;
String path = httpRequest.getPathInfo();
if (path == null) {
@@ -83,11 +83,11 @@
path = "/";
}
- // Get a request dispatcher for the servlet mapped to that path
+ // Get a request dispatcher for the Servlet mapped to that path
RequestDispatcher dispatcher = servletHost.getRequestDispatcher(path);
if (dispatcher != null) {
- // Let the dispatcher forward the request to the servlet
+ // Let the dispatcher forward the request to the Servlet
dispatcher.forward(request, response);
} else {
Modified: incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java?rev=639612&r1=639611&r2=639612&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java (original)
+++ incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java Fri Mar 21 06:00:10 2008
@@ -31,8 +31,8 @@
import javax.servlet.http.HttpServletRequestWrapper;
/**
- * A servlet request dispatcher that can be used to delegate requests to a
- * serlvet registered with the Webapp servlet host.
+ * A Servlet request dispatcher that can be used to delegate requests to a
+ * Servlet registered with the Webapp Servlet host.
*/
class WebAppRequestDispatcher implements RequestDispatcher {
private String servletPath;
@@ -50,7 +50,7 @@
}
/**
- * Returns a request wrapper which will return the correct servlet path
+ * Returns a request wrapper which will return the correct Servlet path
* and path info.
*
* @param request
@@ -81,7 +81,7 @@
}
/**
- * Remove any path suffix thats part of the servlet context path
+ * Remove any path suffix thats part of the Servlet context path
*/
protected String fiddlePath(String path, String servletPath) {
StringTokenizer st = new StringTokenizer(path, "/");
Modified: incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java?rev=639612&r1=639611&r2=639612&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java (original)
+++ incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java Fri Mar 21 06:00:10 2008
@@ -120,7 +120,7 @@
suri = contextPath + suri;
}
- // Get the servlet mapped to the given path
+ // Get the Servlet mapped to the given path
Servlet servlet = servlets.get(suri);
return servlet;
}
@@ -174,7 +174,7 @@
suri = contextPath + suri;
- // Get the servlet mapped to the given path
+ // Get the Servlet mapped to the given path
Servlet servlet = servlets.get(suri);
if (servlet != null) {
return new WebAppRequestDispatcher(suri, servlet);
@@ -194,7 +194,7 @@
}
}
- // No servlet found
+ // No Servlet found
return null;
}
@@ -216,7 +216,7 @@
servletContext.setAttribute(SCA_DOMAIN_ATTRIBUTE, scaDomain);
}
- // Initialize the registered servlets
+ // Initialize the registered Servlets
for (Servlet servlet : servlets.values()) {
servlet.init(config);
}
@@ -243,11 +243,11 @@
}
URL rootURL = servletContext.getResource(root);
if (rootURL.getProtocol().equals("jndi")) {
- //this is tomcat case, we should use getRealPath
+ //this is Tomcat case, we should use getRealPath
File warRootFile = new File(servletContext.getRealPath(root));
contributionRoot = warRootFile.toURL().toString();
} else {
- //this is jetty case
+ //this is Jetty case
contributionRoot = rootURL.toString();
}
@@ -261,7 +261,7 @@
/**
* Initializes the contextPath
- * The 2.5 Servlet API has a getter for this, for pre 2.5 servlet
+ * The 2.5 Servlet API has a getter for this, for pre 2.5 Servlet
* containers use an init parameter.
*/
@SuppressWarnings("unchecked")
@@ -286,7 +286,7 @@
void destroy() {
- // Destroy the registered servlets
+ // Destroy the registered Servlets
for (Servlet servlet : servlets.values()) {
servlet.destroy();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org