[wsas-java-dev] svn commit r669 -
wsas/java/trunk/modules/standalone-edition/src/org/wso2/wsas/transport/jetty
svn at wso2.com
svn at wso2.com
Thu Feb 1 05:11:23 PST 2007
Author: saminda
Date: Thu Feb 1 05:11:15 2007
New Revision: 669
Modified:
wsas/java/trunk/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/Axis2Handler.java
wsas/java/trunk/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/JettyServer.java
Log:
cleaning up Axis2Handler and JettyServer
Modified: wsas/java/trunk/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/Axis2Handler.java
==============================================================================
--- wsas/java/trunk/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/Axis2Handler.java (original)
+++ wsas/java/trunk/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/Axis2Handler.java Thu Feb 1 05:11:15 2007
@@ -35,19 +35,15 @@
import org.mortbay.jetty.HttpConnection;
import org.mortbay.jetty.Request;
import org.mortbay.jetty.handler.AbstractHandler;
-import org.wso2.utils.NetworkUtils;
import org.wso2.utils.ServerConfiguration;
-import org.wso2.wsas.ServerConstants;
import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import javax.xml.namespace.QName;
import java.io.IOException;
import java.io.OutputStream;
-import java.net.SocketException;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
@@ -60,12 +56,6 @@
public Axis2Handler(ConfigurationContext configurationContext) {
this.configurationContext = configurationContext;
-
- // TODO setting the ServletConfig to AxisConfiguration
- // setting ServletContext into configctx
-// this.configurationContext
-// .setProperty(HTTPConstants.MC_HTTP_SERVLETCONTEXT, getServletContext());
-
}
protected Map getHeaders(HttpServletRequest request) {
@@ -148,8 +138,7 @@
msgContext.setFrom(new EndpointReference(request.getRemoteAddr()));
- //TODO Session management for admin services.
- //TODO if needed use a switch here
+ /*Session Management for Admin Services*/
manageSessionContext(request, response, msgContext);
String method = request.getMethod();
@@ -238,55 +227,36 @@
}
}
+ /**
+ * This method will determine, which requests should be injected with SessionContext.
+ * @param request
+ * @param response
+ * @param msgContext
+ * @throws ServletException
+ */
protected void manageSessionContext(HttpServletRequest request, HttpServletResponse response,
MessageContext msgContext) throws ServletException {
- //TODO due instance dispatcher depends on httpServletRequest.
-
- ////////////////////////////////////////////////////////////
- Cookie[] cookies = request.getCookies();
- if (cookies != null) {
- for (int i = 0; i < cookies.length; i++) {
- Cookie cookie = cookies[i];
- System.out.print("## Cookie value :: " + cookie.getValue() +
- "## cookie name :: " + cookie.getName() + " ### cookie path :: " + cookie.getPath() +" ##");
- }
- }
- if (cookies != null)
- System.out.print(" ### Cookie length :: " + cookies.length + "\n");
-
- ///////////////////////////////////////////////////////////
HttpSession httpSession = request.getSession(true);
if (httpSession != null) {
- // session manangement is ON for handlers
SessionContext sessionContext =
(SessionContext) httpSession.getAttribute(Constants.SESSION_CONTEXT_PROPERTY);
if (sessionContext == null && httpSession.isNew()) {
if (!explicitlyIngnorePaths(request)) {
- System.out.print(" ### Created New SessionContext Request URI :: " +
- request.getRequestURI());
-// String cookieValueString = createSessionCookie(response);
String cookieValueString = httpSession.getId();
- System.out.print(" \n### new Cookie Id :: " + cookieValueString + "\n");
sessionContext = new SessionContext(null);
sessionContext.setCookieID(cookieValueString);
httpSession.setAttribute(Constants.SESSION_CONTEXT_PROPERTY, sessionContext);
msgContext.setSessionContext(sessionContext);
}
- } else {
-// response.addCookie(createCookieForSession(ServerConstants.Jetty.JSESSIONID,
-// sessionContext.getCookieID()));
- System.out
- .println("##### Using existing session :: " + sessionContext.getCookieID());
}
-
}
}
/**
- * This is a temp method; that will used to temporary supress creation of SessionContexts
+ * TODO This is a temp method; that will used to temporary supress creation of SessionContexts
*
* @param request
* @return bolean
Modified: wsas/java/trunk/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/JettyServer.java
==============================================================================
--- wsas/java/trunk/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/JettyServer.java (original)
+++ wsas/java/trunk/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/JettyServer.java Thu Feb 1 05:11:15 2007
@@ -73,10 +73,8 @@
// Hold HTTP related Contexts
ContextHandler context1 = new ContextHandler();
context1.setContextPath(jettyConfig.docsWebCtx);
-// SessionHandler sessionHandler1 = new SessionHandler();
ResourceHandler docsResourceHandler = new ResourceHandler();
docsResourceHandler.setResourceBase(jettyConfig.docsWebResourceBase);
-// sessionHandler1.addHandler(docsResourceHandler);
context1.addHandler(docsResourceHandler);
ContextHandler context2 = new ContextHandler();
@@ -96,51 +94,39 @@
ContextHandler context4 = new ContextHandler();
context4.setContextPath(jettyConfig.serviceUiWebCtx);
ResourceHandler serviceUiResourceHandler = new ResourceHandler();
-// SessionHandler sessionHandler4 = new SessionHandler();
serviceUiResourceHandler.setResourceBase(jettyConfig.serviceUiResourceBase);
-// sessionHandler4.addHandler(serviceUiResourceHandler);
context4.addHandler(serviceUiResourceHandler);
ContextHandler context5 = new ContextHandler();
context5.setContextPath(jettyConfig.feedsWebCtx);
ResourceHandler feedsWebResourceHandler = new ResourceHandler();
-// SessionHandler sessionHandler5 = new SessionHandler();
feedsWebResourceHandler.setResourceBase(jettyConfig.feedsWebResourceBase);
-// sessionHandler5.addHandler(feedsWebResourceHandler);
context5.addHandler(feedsWebResourceHandler);
ContextHandler context6 = new ContextHandler();
context6.setContextPath(jettyConfig.stylesWebCtx);
ResourceHandler schemaWebResourceHandler = new ResourceHandler();
-// SessionHandler sessionHandler6 = new SessionHandler();
schemaWebResourceHandler.setResourceBase(jettyConfig.stylesWebResourceBase);
-// sessionHandler6.addHandler(schemaWebResourceHandler);
context6.addHandler(schemaWebResourceHandler);
//File upload context for Http. Used in tools mainly.
ContextHandler context11 = new ContextHandler();
context11.setContextPath(ServerConstants.ContextPaths.UPLOAD_PATH);
-// SessionHandler sessionHandler11 = new SessionHandler();
Handler axis2FileUploadHandler0 = new Axis2FileUploadHandler(configurationContext);
-// sessionHandler11.addHandler(axis2FileUploadHandler0);
context11.addHandler(axis2FileUploadHandler0);
//File download context for Http. Used in tools mainly.
ContextHandler context12 = new ContextHandler();
context12.setContextPath(ServerConstants.ContextPaths.DOWNLOAD_PATH);
-// SessionHandler sessionHandler12 = new SessionHandler();
Handler axis2FileDownloadHandler0 =
new Axis2FileDownloadHandler(configurationContext);
-// sessionHandler12.addHandler(axis2FileDownloadHandler0);
context12.addHandler(axis2FileDownloadHandler0);
//For Extra Documents
ContextHandler context17 = new ContextHandler();
context17.setContextPath(jettyConfig.samplesWebCtx);
ResourceHandler extraDocsResourceHandler = new ResourceHandler();
-// SessionHandler sessionHandler17 = new SessionHandler();
extraDocsResourceHandler.setResourceBase(jettyConfig.samplesWebResourceBase);
-// sessionHandler17.addHandler(extraDocsResourceHandler);
context17.addHandler(extraDocsResourceHandler);
httpContext
@@ -155,17 +141,13 @@
ContextHandler context5 = new ContextHandler();
context5.setContextPath(jettyConfig.feedsWebCtx);
ResourceHandler feedsWebResourceHandler = new ResourceHandler();
-// SessionHandler sessionHandler5 = new SessionHandler();
feedsWebResourceHandler.setResourceBase(jettyConfig.feedsWebResourceBase);
-// sessionHandler5.addHandler(feedsWebResourceHandler);
context5.addHandler(feedsWebResourceHandler);
ContextHandler context6 = new ContextHandler();
context6.setContextPath(jettyConfig.stylesWebCtx);
ResourceHandler schemaWebResourceHandler = new ResourceHandler();
-// SessionHandler sessionHandler6 = new SessionHandler();
schemaWebResourceHandler.setResourceBase(jettyConfig.stylesWebResourceBase);
-// sessionHandler6.addHandler(schemaWebResourceHandler);
context6.addHandler(schemaWebResourceHandler);
/* Web admin related code */
@@ -186,59 +168,45 @@
//File upload context
ContextHandler context9 = new ContextHandler();
context9.setContextPath(ServerConstants.ContextPaths.UPLOAD_PATH);
-// SessionHandler sessionHandler9 = new SessionHandler();
Handler axis2FileUploadHandler = new Axis2FileUploadHandler(configurationContext);
-// sessionHandler9.addHandler(axis2FileUploadHandler);
context9.addHandler(axis2FileUploadHandler);
//File download context
ContextHandler context10 = new ContextHandler();
context10.setContextPath(ServerConstants.ContextPaths.DOWNLOAD_PATH);
-// SessionHandler sessionHandler10 = new SessionHandler();
Handler axis2FileDownloadHandler =
new Axis2FileDownloadHandler(configurationContext);
-// sessionHandler10.addHandler(axis2FileDownloadHandler);
context10.addHandler(axis2FileDownloadHandler);
//Server startServer/restartServer
ContextHandler context13 = new ContextHandler();
context13.setContextPath(ServerConstants.ContextPaths.SERVER_PATH);
-// SessionHandler sessionHandler13 = new SessionHandler();
Handler serverHandler = new ServerHandler(configurationContext);
-// sessionHandler13.addHandler(serverHandler);
context13.addHandler(serverHandler);
ContextHandler context14 = new ContextHandler();
context14.setContextPath(jettyConfig.adminWebCtx);
context14.setResourceBase(jettyConfig.adminWebResourceBase);
-// SessionHandler sessionHandler14 = new SessionHandler();
Handler managementConsoleRequestHandler =
new ManagementConsoleRequestHandler(configurationContext);
-// sessionHandler14.addHandler(managementConsoleRequestHandler);
context14.addHandler(managementConsoleRequestHandler);
ContextHandler context15 = new ContextHandler();
context15.setContextPath(jettyConfig.serviceUiWebCtx);
-// SessionHandler sessionHandler15 = new SessionHandler();
ResourceHandler serviceUiResourceHandler = new ResourceHandler();
-// sessionHandler15.addHandler(serviceUiResourceHandler);
context15.addHandler(serviceUiResourceHandler);
ContextHandler context16 = new ContextHandler();
context16.setContextPath(jettyConfig.docsWebCtx);
ResourceHandler httpsDocsResourceHandler = new ResourceHandler();
-// SessionHandler sessionHandler16 = new SessionHandler();
httpsDocsResourceHandler.setResourceBase(jettyConfig.docsWebResourceBase);
-// sessionHandler16.addHandler(httpsDocsResourceHandler);
context16.addHandler(httpsDocsResourceHandler);
//For Extra Documents
ContextHandler context17 = new ContextHandler();
context17.setContextPath(jettyConfig.samplesWebCtx);
ResourceHandler extraDocsResourceHandler = new ResourceHandler();
-// SessionHandler sessionHandler17 = new SessionHandler();
extraDocsResourceHandler.setResourceBase(jettyConfig.samplesWebResourceBase);
-// sessionHandler17.addHandler(extraDocsResourceHandler);
context17.addHandler(extraDocsResourceHandler);
httpsContext
More information about the Wsas-java-dev
mailing list