[richfaces-svn-commits] JBoss Rich Faces SVN: r11228 - in trunk/framework/jsf-test/src: main/java/org/richfaces/test/staging and 1 other directories.

Author: alexsmirnov Date: 2008-11-18 17:44:40 -0500 (Tue, 18 Nov 2008) New Revision: 11228 Added: trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/EventInvoker.java trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/HttpMethod.java trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/InvocationErrorEvent.java trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/InvocationEvent.java trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/InvocationListener.java trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/PageContextExtension.java trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerLogger.java trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingConnection.java trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingServer.java Removed: trunk/framework/jsf-test/src/main/java/org/richfaces/test/EventInvoker.java trunk/framework/jsf-test/src/main/java/org/richfaces/test/HttpMethod.java trunk/framework/jsf-test/src/main/java/org/richfaces/test/ServerLogger.java trunk/framework/jsf-test/src/main/java/org/richfaces/test/StagingConnection.java trunk/framework/jsf-test/src/main/java/org/richfaces/test/StagingServer.java Modified: trunk/framework/jsf-test/src/main/java/org/richfaces/test/AbstractFacesTest.java trunk/framework/jsf-test/src/main/java/org/richfaces/test/LocalWebClient.java trunk/framework/jsf-test/src/main/java/org/richfaces/test/LocalWebConnection.java trunk/framework/jsf-test/src/main/java/org/richfaces/test/LocalWebResponse.java trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/AbstractServerResource.java trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/ClasspathServerResource.java trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/FilterContainer.java trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/RequestChain.java trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerResourcesDirectory.java trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServletContainer.java trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StaggingJspApplicationContext.java trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StaggingJspFactory.java trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingHttpRequest.java trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingHttpResponse.java trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingHttpSession.java trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingServletContext.java trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/UrlServerResource.java trunk/framework/jsf-test/src/test/java/org/richfaces/test/staging/ServletTest.java Log: Merge test project from JSF2.0 branch. Modified: trunk/framework/jsf-test/src/main/java/org/richfaces/test/AbstractFacesTest.java =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/AbstractFacesTest.java 2008-11-18 17:55:45 UTC (rev 11227) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/AbstractFacesTest.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -27,6 +27,8 @@ import org.richfaces.test.staging.FilterContainer; import org.richfaces.test.staging.RequestChain; import org.richfaces.test.staging.ServletContainer; +import org.richfaces.test.staging.StagingConnection; +import org.richfaces.test.staging.StagingServer; /** * @author asmirnov Deleted: trunk/framework/jsf-test/src/main/java/org/richfaces/test/EventInvoker.java =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/EventInvoker.java 2008-11-18 17:55:45 UTC (rev 11227) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/EventInvoker.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -1,10 +0,0 @@ -/** - * - */ -package org.richfaces.test; - -import java.util.EventListener; - -public interface EventInvoker<T extends EventListener> { - public void invoke(T listener); -} \ No newline at end of file Deleted: trunk/framework/jsf-test/src/main/java/org/richfaces/test/HttpMethod.java =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/HttpMethod.java 2008-11-18 17:55:45 UTC (rev 11227) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/HttpMethod.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -1,33 +0,0 @@ -/** - * - */ -package org.richfaces.test; - -/** - * @author asmirnov - * - */ -public enum HttpMethod { - - GET("GET"), - POST("POST"), - HEAD("HEAD"), - PUT("PUT"), - OPTIONS("OPTIONS"), - TRACE("TRACE"), - DELETE("DELETE"); - - /** - * @param name - */ - private HttpMethod(String name) { - this.name = name; - } - - private String name; - - @Override - public String toString() { - return name; - } -} Modified: trunk/framework/jsf-test/src/main/java/org/richfaces/test/LocalWebClient.java =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/LocalWebClient.java 2008-11-18 17:55:45 UTC (rev 11227) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/LocalWebClient.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -3,6 +3,8 @@ */ package org.richfaces.test; +import org.richfaces.test.staging.StagingServer; + import com.gargoylesoftware.htmlunit.BrowserVersion; import com.gargoylesoftware.htmlunit.NicelyResynchronizingAjaxController; import com.gargoylesoftware.htmlunit.WebClient; Modified: trunk/framework/jsf-test/src/main/java/org/richfaces/test/LocalWebConnection.java =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/LocalWebConnection.java 2008-11-18 17:55:45 UTC (rev 11227) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/LocalWebConnection.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -8,7 +8,9 @@ import javax.servlet.ServletException; import org.apache.commons.httpclient.NameValuePair; -import org.richfaces.test.staging.StagingHttpRequest; +import org.richfaces.test.staging.HttpMethod; +import org.richfaces.test.staging.StagingConnection; +import org.richfaces.test.staging.StagingServer; import com.gargoylesoftware.htmlunit.FormEncodingType; import com.gargoylesoftware.htmlunit.WebConnection; @@ -32,14 +34,13 @@ connection.addRequestParameter(param.getName(), param.getValue()); } HttpMethod httpMethod = HttpMethod.valueOf(settings.getHttpMethod().toString()); - connection.setMethod(httpMethod); - StagingHttpRequest request = connection.getRequest(); - request.setCharacterEncoding(settings.getCharset()); + connection.setRequestMethod(httpMethod); + connection.setRequestCharacterEncoding(settings.getCharset()); String body = settings.getRequestBody(); String contentType = settings.getEncodingType().getName(); - request.setRequestBody(body); - request.setContentType(contentType); - request.addHeaders(settings.getAdditionalHeaders()); + connection.setRequestBody(body); + connection.setRequestContentType(contentType); + connection.addRequestHeaders(settings.getAdditionalHeaders()); if(null != body && FormEncodingType.URL_ENCODED.getName().equals(contentType)){ connection.parseFormParameters(body); } Modified: trunk/framework/jsf-test/src/main/java/org/richfaces/test/LocalWebResponse.java =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/LocalWebResponse.java 2008-11-18 17:55:45 UTC (rev 11227) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/LocalWebResponse.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -14,6 +14,7 @@ import java.util.Map.Entry; import org.apache.commons.httpclient.NameValuePair; +import org.richfaces.test.staging.StagingConnection; import com.gargoylesoftware.htmlunit.WebRequestSettings; import com.gargoylesoftware.htmlunit.WebResponse; @@ -78,7 +79,7 @@ public List<NameValuePair> getResponseHeaders() { ArrayList<NameValuePair> headers = new ArrayList<NameValuePair>(10); - for (Entry<String, String[]> entry : serverConnection.getResponse().getHeaders().entrySet()) { + for (Entry<String, String[]> entry : serverConnection.getResponseHeaders().entrySet()) { for (String value : entry.getValue()) { headers.add(new NameValuePair(entry.getKey(),value)); } Deleted: trunk/framework/jsf-test/src/main/java/org/richfaces/test/ServerLogger.java =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/ServerLogger.java 2008-11-18 17:55:45 UTC (rev 11227) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/ServerLogger.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -1,41 +0,0 @@ -/** - * - */ -package org.richfaces.test; - -import java.util.logging.Logger; - -/** - * @author asmirnov - * - */ -public enum ServerLogger { - - RESOURCE("resource"), - CONNECTION("connection"), - SERVER("server"); - - private static final String PREFIX="org.richfaces.test."; - - private static final String LOGGING_BUNDLE="org.richfaces.test.LogMessages"; - private final String name; - - /** - * @param name - */ - private ServerLogger(String name) { - this.name = PREFIX+name; - } - - /** - * @return the name - */ - public String getName() { - return name; - } - - public Logger getLogger(){ - return Logger.getLogger(name, LOGGING_BUNDLE); - } - -} Deleted: trunk/framework/jsf-test/src/main/java/org/richfaces/test/StagingConnection.java =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/StagingConnection.java 2008-11-18 17:55:45 UTC (rev 11227) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/StagingConnection.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -1,477 +0,0 @@ -/** - * - */ -package org.richfaces.test; - -import java.io.IOException; -import java.io.InvalidClassException; -import java.io.UnsupportedEncodingException; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLDecoder; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.logging.Logger; - -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletRequestEvent; -import javax.servlet.ServletResponse; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -import org.richfaces.test.staging.RequestChain; -import org.richfaces.test.staging.StagingHttpRequest; -import org.richfaces.test.staging.StagingHttpResponse; -import org.richfaces.test.staging.StagingServletContext; - -import com.gargoylesoftware.htmlunit.WebRequestSettings; -import com.gargoylesoftware.htmlunit.WebResponse; - -/** - * This class represent single connection to the server. - * - * @author asmirnov - * - */ -public class StagingConnection { - - private static final Logger log = ServerLogger.SERVER.getLogger(); - - private final StagingServer server; - - final URL url; - - private ConnectionRequest request; - - ConnectionResponse response; - - private final RequestChain servlet; - - private HttpMethod method = HttpMethod.GET; - - private static final Cookie[] COOKIE = new Cookie[] {}; - - private List<Cookie> cookies = new ArrayList<Cookie>(); - - private Map<String, String[]> requestParameters = new HashMap<String, String[]>(); - - private final String pathInfo; - - private final String servletPath; - - private boolean finished = false; - - private boolean started = false; - - private String queryString; - - public StagingConnection(StagingServer localServer, URL url) { - this.server = localServer; - this.url = url; - String path = url.getPath(); - servlet = localServer.getServlet(path); - if (null == servlet) { - throw new IllegalArgumentException(); - } - this.pathInfo = servlet.getPathInfo(path); - this.servletPath = servlet.getServletPath(path); - this.request = new ConnectionRequest(); - this.response = new ConnectionResponse(); - this.request.setAttribute("javax.servlet.include.path_info", - this.pathInfo); - this.request.setAttribute("javax.servlet.include.servlet_path", - this.servletPath); - setQueryString(url.getQuery()); - if (null != getQueryString()) { - parseFormParameters(queryString); - } - - } - - public void parseFormParameters(String queryString) { - String[] queryParams = queryString.split("&"); - for (int i = 0; i < queryParams.length; i++) { - try { - String par = queryParams[i]; - int eqIndex = par.indexOf('='); - if (eqIndex >= 0) { - // TODO - decode url-decoded values. - String name = URLDecoder.decode(par.substring(0, eqIndex), - request.getCharacterEncoding()); - String value = URLDecoder.decode( - par.substring(eqIndex + 1), request - .getCharacterEncoding()); - addRequestParameter(name, value); - } else { - addRequestParameter(URLDecoder.decode(par, request - .getCharacterEncoding()), null); - } - } catch (UnsupportedEncodingException e) { - throw new TestException(e); - } - } - } - - /** - * @return the finished - */ - public boolean isFinished() { - return finished; - } - - /** - * @return the started - */ - public boolean isStarted() { - return started; - } - - private void checkStarted() { - if (!isFinished()) { - throw new IllegalStateException("request have not been started"); - } - } - - public void execute() throws ServletException, IOException { - if (isStarted() || isFinished()) { - throw new IllegalStateException( - "request have already been executed"); - } - start(); - this.servlet.execute(request, response); - finish(); - } - - public void finish() { - server.requestFinished(request); - finished = true; - } - - public void start() { - log.fine("start " + getMethod() + " request processing for file " - + url.getFile()); - log.fine("request parameters: " + requestParameters); - server.requestStarted(request); - started = true; - } - - /** - * @return the method - */ - public HttpMethod getMethod() { - return method; - } - - /** - * @param method - * the method to set - */ - public void setMethod(HttpMethod method) { - this.method = method; - } - - /** - * @return the url - */ - public URL getUrl() { - return url; - } - - public void addRequestParameter(String name, String value) { - String[] values = requestParameters.get(name); - if (null == values) { - values = new String[1]; - } else { - String[] newValues = new String[values.length + 1]; - System.arraycopy(values, 0, newValues, 0, values.length); - values = newValues; - } - values[values.length - 1] = value; - requestParameters.put(name, values); - } - - public String getContentAsString() { - checkStarted(); - String content = response.getWriterContent(); - if (null == content) { - byte[] streamContent = response.getStreamContent(); - if (null != streamContent) { - String encoding = response.getCharacterEncoding(); - if (null != encoding) { - try { - content = new String(streamContent, encoding); - } catch (UnsupportedEncodingException e) { - // TODO Auto-generated catch block - } - } else { - content = new String(streamContent); - } - } - } - return content; - } - - public byte[] getResponseBody() { - checkStarted(); - byte[] content = response.getStreamContent(); - if (null == content) { - String writerContent = response.getWriterContent(); - if (null != writerContent) { - try { - content = writerContent.getBytes(response - .getCharacterEncoding()); - } catch (UnsupportedEncodingException e) { - content = writerContent.getBytes(); - } - } else { - content = new byte[0]; - } - } - return content; - } - - /** - * @return the cookies - */ - public List<Cookie> getCookies() { - return cookies; - } - - /** - * @return the request - */ - public StagingHttpRequest getRequest() { - return request; - } - - /** - * @return the response - */ - public StagingHttpResponse getResponse() { - return response; - } - - private class ConnectionRequest extends StagingHttpRequest { - - public Cookie[] getCookies() { - return cookies.toArray(COOKIE); - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletRequest#getMethod() - */ - public String getMethod() { - return method.toString(); - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletRequest#getServletPath() - */ - public String getServletPath() { - return servletPath; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletRequest#getPathInfo() - */ - public String getPathInfo() { - return pathInfo; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletRequest#getQueryString() - */ - public String getQueryString() { - return queryString; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletRequest#getRequestURI() - */ - public String getRequestURI() { - return url.getPath(); - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletRequest#getParameter(java.lang.String) - */ - public String getParameter(String name) { - String[] values = requestParameters.get(name); - if (null != values && values.length > 0) { - return values[0]; - } - return null; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletRequest#getParameterMap() - */ - @SuppressWarnings("unchecked") - public Map getParameterMap() { - return Collections.unmodifiableMap(requestParameters); - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletRequest#getParameterNames() - */ - @SuppressWarnings("unchecked") - public Enumeration getParameterNames() { - return Collections.enumeration(requestParameters.keySet()); - } - - /* - * (non-Javadoc) - * - * @see - * javax.servlet.ServletRequest#getParameterValues(java.lang.String) - */ - public String[] getParameterValues(String name) { - return requestParameters.get(name); - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletRequest#getSession() - */ - public HttpSession getSession() { - return server.getSession(); - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletRequest#getSession(boolean) - */ - public HttpSession getSession(boolean create) { - return server.getSession(create); - } - - @Override - public RequestDispatcher getRequestDispatcher(String path) { - RequestDispatcher dispatcher = null; - if (!path.startsWith("/")) { - try { - URL absoluteUrl = new URL(url, path); - path = absoluteUrl.getFile(); - } catch (MalformedURLException e) { - return null; - } - } - final RequestChain dispatchedServlet = server.getServlet(path); - if (null != dispatchedServlet) { - dispatcher = new RequestDispatcher() { - - public void forward(ServletRequest request, - ServletResponse response) throws ServletException, - IOException { - response.reset(); - dispatchedServlet.execute(request, response); - } - - public void include(ServletRequest request, - ServletResponse response) throws ServletException, - IOException { - dispatchedServlet.execute(request, response); - } - - }; - } - return dispatcher; - } - - @Override - protected void attributeAdded(String name, Object o) { - server.requestAttributeAdded(this, name, o); - - } - - @Override - protected void attributeRemoved(String name, Object removed) { - server.requestAttributeRemoved(this, name, removed); - - } - - @Override - protected void attributeReplaced(String name, Object o) { - server.requestAttributeReplaced(this, name, o); - - } - - } - - private class ConnectionResponse extends StagingHttpResponse { - /* - * (non-Javadoc) - * - * @see - * javax.servlet.http.HttpServletResponse#addCookie(javax.servlet.http - * .Cookie ) - */ - public void addCookie(Cookie cookie) { - cookies.add(cookie); - - } - - } - - public String getCharacterEncoding() { - checkStarted(); - return response.getCharacterEncoding(); - } - - public String getContentType() { - checkStarted(); - return response.getContentType(); - } - - public int getStatus() { - checkStarted(); - return response.getStatus(); - } - - public String getErrorMessage() { - checkStarted(); - return response.getErrorMessage(); - } - - /** - * @param queryString - * the queryString to set - */ - public void setQueryString(String queryString) { - this.queryString = queryString; - } - - /** - * @return the queryString - */ - public String getQueryString() { - return queryString; - } - -} Deleted: trunk/framework/jsf-test/src/main/java/org/richfaces/test/StagingServer.java =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/StagingServer.java 2008-11-18 17:55:45 UTC (rev 11227) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/StagingServer.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -1,348 +0,0 @@ -package org.richfaces.test; - -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; -import java.util.EventListener; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.servlet.Servlet; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextAttributeEvent; -import javax.servlet.ServletContextAttributeListener; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletRequestAttributeEvent; -import javax.servlet.ServletRequestAttributeListener; -import javax.servlet.ServletRequestEvent; -import javax.servlet.ServletRequestListener; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionAttributeListener; -import javax.servlet.http.HttpSessionBindingEvent; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; -import javax.servlet.jsp.JspFactory; - -import org.richfaces.test.staging.ClasspathServerResource; -import org.richfaces.test.staging.RequestChain; -import org.richfaces.test.staging.ServerResource; -import org.richfaces.test.staging.ServerResourcePath; -import org.richfaces.test.staging.ServerResourcesDirectory; -import org.richfaces.test.staging.ServletContainer; -import org.richfaces.test.staging.StaggingJspFactory; -import org.richfaces.test.staging.StagingHttpSession; -import org.richfaces.test.staging.StagingServletContext; -import org.richfaces.test.staging.StaticServlet; -import org.richfaces.test.staging.UrlServerResource; - - -/** - * Hello world! - * - */ -public class StagingServer { - - - private static final Class<ServletRequestListener> REQUEST_LISTENER_CLASS = ServletRequestListener.class; - - private static final Class<ServletRequestAttributeListener> REQUEST_ATTRIBUTE_LISTENER_CLASS = ServletRequestAttributeListener.class; - - private static final Class<ServletContextListener> CONTEXT_LISTENER_CLASS = ServletContextListener.class; - - private static final Class<HttpSessionListener> SESSION_LISTENER_CLASS = HttpSessionListener.class; - - private static final Class<HttpSessionAttributeListener> SESSION_ATTRIBUTE_LISTENER_CLASS = HttpSessionAttributeListener.class; - - private List<RequestChain> servlets = new ArrayList<RequestChain>(); - - private RequestChain defaultServlet; - - private List<EventListener> contextListeners = new ArrayList<EventListener>(); - - private Map<String,String> initParameters=new HashMap<String, String>(); - - private ServerResource serverRoot = new ServerResourcesDirectory(); - - private class LocalContext extends StagingServletContext{ - - @Override - protected void valueBound(ServletContextAttributeEvent event) { - // inform listeners. - for (EventListener listener : contextListeners) { - if (listener instanceof ServletContextAttributeListener) { - ServletContextAttributeListener contextListener = (ServletContextAttributeListener) listener; - contextListener.attributeAdded(event); - } - } - } - - @Override - protected void valueReplaced(ServletContextAttributeEvent event) { - // inform listeners. - for (EventListener listener : contextListeners) { - if (listener instanceof ServletContextAttributeListener) { - ServletContextAttributeListener contextListener = (ServletContextAttributeListener) listener; - contextListener.attributeReplaced(event); - } - } - } - - @Override - protected void valueUnbound( - ServletContextAttributeEvent event) { - // inform listeners. - for (EventListener listener : contextListeners) { - if (listener instanceof ServletContextAttributeListener) { - ServletContextAttributeListener contextListener = (ServletContextAttributeListener) listener; - contextListener.attributeRemoved(event); - } - } - } - - @Override - /** - * @param path - * @return - */ - protected ServerResource getServerResource(String path) { - return serverRoot.getResource(new ServerResourcePath(path)); - } - - } - - private StagingServletContext context; - - private class ServerHttpSession extends StagingHttpSession { - - - public ServletContext getServletContext() { - return context; - } - - @Override - protected void valueBound(final HttpSessionBindingEvent sessionBindingEvent) { - // inform session listeners. - fireEvent(SESSION_ATTRIBUTE_LISTENER_CLASS,new EventInvoker<HttpSessionAttributeListener>(){ - public void invoke(HttpSessionAttributeListener listener) { - listener.attributeAdded(sessionBindingEvent); - } - }); - } - - @Override - protected void valueUnbound(final HttpSessionBindingEvent sessionBindingEvent) { - // inform session listeners. - fireEvent(SESSION_ATTRIBUTE_LISTENER_CLASS,new EventInvoker<HttpSessionAttributeListener>(){ - public void invoke(HttpSessionAttributeListener listener) { - listener.attributeRemoved(sessionBindingEvent); - } - }); - } - - @Override - protected void valueReplaced(final HttpSessionBindingEvent sessionBindingEvent) { - // inform session listeners. - fireEvent(SESSION_ATTRIBUTE_LISTENER_CLASS,new EventInvoker<HttpSessionAttributeListener>(){ - public void invoke(HttpSessionAttributeListener listener) { - listener.attributeReplaced(sessionBindingEvent); - } - }); - } - } - - private ServerHttpSession session; - - - public void addServlet(RequestChain servlet) { - servlets.add(servlet); - } - - public void addServlet(String mapping,Servlet servlet){ - servlets.add(new ServletContainer(mapping,servlet)); - } - - public RequestChain getServlet(String path) { - RequestChain result = null; - for (RequestChain servlet : servlets) { - if(servlet.isApplicable(path)){ - result = servlet; - break; - } - } - if(null == result){ - try { - URL resource = context.getResource(path); - if(null != resource){ - result = defaultServlet; - } - } catch (MalformedURLException e) { - // do nothing, just return no servlet. - } - } - return result; - } - - public void addInitParameter(String name, String value) { - initParameters.put(name, value); - } - - public void addResource(String path, String resource){ - serverRoot.addResource(new ServerResourcePath(path), new ClasspathServerResource(resource)); - } - - public void addResource(String path, URL resource){ - serverRoot.addResource(new ServerResourcePath(path), new UrlServerResource(resource)); - } - - public void addWebListener(EventListener listener) { - contextListeners.add(listener); - } - - public HttpSession getSession(){ - return getSession(true); - } - - public synchronized HttpSession getSession(boolean create){ - if(null == this.session && create){ - this.session = new ServerHttpSession(); - // inform session listeners. - final HttpSessionEvent event = new HttpSessionEvent(session); - fireEvent(SESSION_LISTENER_CLASS,new EventInvoker<HttpSessionListener>(){ - public void invoke(HttpSessionListener listener) { - listener.sessionCreated(event); - } - }); - } - return session; - } - - /** - * - */ - @SuppressWarnings("unchecked") - private <T extends EventListener> void fireEvent(Class<T> listenerClass,EventInvoker<T> invoker) { - for (EventListener listener : contextListeners) { - if (listenerClass.isInstance(listener)) { - invoker.invoke((T) listener); - } - } - } - - public void init() { - // Create context. - this.context = new LocalContext(); - // Create Jsp factory - JspFactory.setDefaultFactory(new StaggingJspFactory()); - // Create init parameters - context.addInitParameters(initParameters); - // Inform listeners - final ServletContextEvent event = new ServletContextEvent(context); - fireEvent(CONTEXT_LISTENER_CLASS,new EventInvoker<ServletContextListener>(){ - public void invoke(ServletContextListener listener) { - listener.contextInitialized(event); - } - }); - // Init servlets - try { - for (RequestChain servlet : servlets) { - // init servlet - servlet.init(this.context); - } - defaultServlet = new ServletContainer(null,new StaticServlet()); - defaultServlet.init(getContext()); - } catch(ServletException e){ - throw new TestException(e); - } - } - - public void destroy(){ - // Destroy session - if (null != this.session) { - // inform session listeners. - final HttpSessionEvent event = new HttpSessionEvent(session); - fireEvent(SESSION_LISTENER_CLASS,new EventInvoker<HttpSessionListener>(){ - public void invoke(HttpSessionListener listener) { - listener.sessionDestroyed(event); - } - }); - session.destroy(); - session = null; - } - // Inform listeners - final ServletContextEvent event = new ServletContextEvent(context); - fireEvent(CONTEXT_LISTENER_CLASS,new EventInvoker<ServletContextListener>(){ - public void invoke(ServletContextListener listener) { - listener.contextDestroyed(event); - } - }); - // Destroy servlets - for (RequestChain servlet : servlets) { - servlet.destroy(); - } - defaultServlet.destroy(); - // Create Jsp factory - JspFactory.setDefaultFactory(null); - - } - - public StagingConnection getConnection(URL url) { - return new StagingConnection(this,url); - } - - public StagingServletContext getContext() { - return context; - } - - public void requestStarted(ServletRequest request) { - final ServletRequestEvent event = new ServletRequestEvent(context,request); - fireEvent(REQUEST_LISTENER_CLASS, new EventInvoker<ServletRequestListener>(){ - public void invoke(ServletRequestListener listener) { - listener.requestInitialized(event); - - } - }); - } - - public void requestFinished(ServletRequest request) { - final ServletRequestEvent event = new ServletRequestEvent(context,request); - fireEvent(REQUEST_LISTENER_CLASS, new EventInvoker<ServletRequestListener>(){ - public void invoke(ServletRequestListener listener) { - listener.requestDestroyed(event); - } - }); - } - - public void requestAttributeAdded(ServletRequest request, - String name, Object o) { - final ServletRequestAttributeEvent event = new ServletRequestAttributeEvent(context,request,name,o); - fireEvent(REQUEST_ATTRIBUTE_LISTENER_CLASS, new EventInvoker<ServletRequestAttributeListener>(){ - public void invoke(ServletRequestAttributeListener listener) { - listener.attributeAdded(event); - } - }); - } - - public void requestAttributeRemoved(ServletRequest request, - String name, Object removed) { - final ServletRequestAttributeEvent event = new ServletRequestAttributeEvent(context,request,name,removed); - fireEvent(REQUEST_ATTRIBUTE_LISTENER_CLASS, new EventInvoker<ServletRequestAttributeListener>(){ - public void invoke(ServletRequestAttributeListener listener) { - listener.attributeRemoved(event); - } - }); - } - - public void requestAttributeReplaced(ServletRequest request, - String name, Object value) { - final ServletRequestAttributeEvent event = new ServletRequestAttributeEvent(context,request,name,value); - fireEvent(REQUEST_ATTRIBUTE_LISTENER_CLASS, new EventInvoker<ServletRequestAttributeListener>(){ - public void invoke(ServletRequestAttributeListener listener) { - listener.attributeReplaced(event); - } - }); - } -} Modified: trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/AbstractServerResource.java =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/AbstractServerResource.java 2008-11-18 17:55:45 UTC (rev 11227) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/AbstractServerResource.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -8,8 +8,12 @@ import java.util.Set; import java.util.logging.Logger; -import org.richfaces.test.ServerLogger; +/** + * Base abstract class for an all file references in the 'virtual' staging server directory. + * @author asmirnov + * + */ public abstract class AbstractServerResource implements ServerResource { private static final Logger log = ServerLogger.RESOURCE.getLogger(); @@ -17,6 +21,10 @@ public AbstractServerResource() { } + /** This implementation creates stream from the resource URL. I also tries to disable + * url connection cache, to prevent jar file locking in the windows environment. + * @see org.richfaces.test.staging.ServerResource#getAsStream() + */ public InputStream getAsStream() throws IOException { URL url = getURL(); if (url != null) { @@ -32,22 +40,34 @@ } } + /** + * File-like resources do not allows resources additions. + * @throws UnsupportedOperationException + * @see org.richfaces.test.staging.ServerResource#addResource(org.richfaces.test.staging.ServerResourcePath, org.richfaces.test.staging.ServerResource) + */ public void addResource(ServerResourcePath path, ServerResource resource) { throw new UnsupportedOperationException(); } + /* (non-Javadoc) + * @see org.richfaces.test.staging.ServerResource#getResource(org.richfaces.test.staging.ServerResourcePath) + */ public ServerResource getResource(ServerResourcePath path) { if(null == path){ throw new NullPointerException(); } + // If path points to the resource itself, returns this instance. if(path.isFile()){ return this; } return null; } + /** File-like resources does not contain any other, so this method always returns null. + * @see org.richfaces.test.staging.ServerResource#getPaths() + */ public Set<String> getPaths() { - return Collections.emptySet(); + return null;//Collections.emptySet(); } } \ No newline at end of file Modified: trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/ClasspathServerResource.java =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/ClasspathServerResource.java 2008-11-18 17:55:45 UTC (rev 11227) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/ClasspathServerResource.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -3,29 +3,28 @@ */ package org.richfaces.test.staging; -import java.io.IOException; -import java.io.InputStream; import java.net.URL; -import java.net.URLConnection; -import java.util.Collections; -import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import javax.servlet.ServletResponse; -import org.richfaces.test.ServerLogger; - /** + * This class represents file from classpath in the virtual web application + * content. + * * @author asmirnov - * + * */ public class ClasspathServerResource extends AbstractServerResource { - + + /** + * + */ private final String classpath; - + + private volatile URL url = null; + private static final Logger log = ServerLogger.RESOURCE.getLogger(); - /** * @param name @@ -35,16 +34,29 @@ this.classpath = classpath; } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see org.richfaces.test.staging.ServerResource#getURL() */ public URL getURL() { - ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); - if(null == classLoader){ - classLoader = this.getClass().getClassLoader(); + if (url == null) { + // JDK-5 singleton-like synchronization. + // @see http://jeremymanson.blogspot.com/2008/05/double-checked-locking.html + synchronized (this) { + if(log.isLoggable(Level.FINEST)){ + log.finest("get classpath resource from "+this.classpath); + } + ClassLoader classLoader = Thread.currentThread() + .getContextClassLoader(); + if (null == classLoader) { + classLoader = this.getClass().getClassLoader(); + } + url = classLoader.getResource(classpath); + } } - return classLoader.getResource(classpath); + + return url; } - } Copied: trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/EventInvoker.java (from rev 11221, branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/EventInvoker.java) =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/EventInvoker.java (rev 0) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/EventInvoker.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -0,0 +1,10 @@ +/** + * + */ +package org.richfaces.test.staging; + +import java.util.EventListener; + +interface EventInvoker<T extends EventListener> { + public void invoke(T listener); +} \ No newline at end of file Modified: trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/FilterContainer.java =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/FilterContainer.java 2008-11-18 17:55:45 UTC (rev 11227) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/FilterContainer.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -5,6 +5,7 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.Map; +import java.util.logging.Logger; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -14,40 +15,94 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; + +/** + * Holds a filter instance and reference to the next executable server object ( + * filter or servlet ) in the chain. + * + * @author asmirnov + * + */ public class FilterContainer implements RequestChain { + private static final Logger log = ServerLogger.SERVER.getLogger(); + + /** + * Servlet filter instance. + */ private final Filter filter; + /** + * Next object in the chain. + */ private final RequestChain next; + /** + * Filter name. + */ private String name = "Default"; + /** + * Filter initialization parameters. + */ private final Map<String, String> initParameters; + /** + * Initialization flag to avoid double calls. + */ private boolean initialized = false; /** * @param filter + * instance of the web application filter. * @param next + * next executable object in the filter chain. + * @throws NullPointerException if any of parameter is null. */ public FilterContainer(Filter filter, RequestChain next) { + if(null == filter || null == next){ + throw new NullPointerException(); + } this.filter = filter; this.next = next; this.initParameters = new HashMap<String, String>(); } + /** + * @return filter name. + */ public String getName() { return name; } + /** + * @param name + * new filter name. + */ public void setName(String name) { + if (initialized) { + throw new IllegalStateException( + "Filter have already been initialized, name can't be changed"); + } this.name = name; } + /* + * (non-Javadoc) + * + * @see + * org.richfaces.test.staging.RequestChain#execute(javax.servlet.ServletRequest + * , javax.servlet.ServletResponse) + */ public void execute(ServletRequest request, ServletResponse response) throws ServletException, IOException { + if (!initialized) { + throw new IllegalStateException( + "Filter "+getName()+" have not been initialized, could'n execute request"); + } + log.finest("Request '"+request+"' executes by the '"+getName()+"' filter"); FilterChain chain = new FilterChain() { - + // Execute next object in the chain. public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException { @@ -60,14 +115,41 @@ } + /** + * Append filter initialization parameter. Name and value are same as + * defined in the web.xml + * + * <code> + * &lt;init-param&gt; + * &lt;param-name&gt;foo&lt;/param-name&gt; + * &lt;param-value&gt;bar&lt;/param-value&gt; + * &lt;/init-param&gt; + * </code> + * + * @param name + * name of the parameter + * @param value + * its value + */ public void addInitParameter(String name, String value) { + if (initialized) { + throw new IllegalStateException( + "Filter have already been initialized, init parameters can't be changed"); + } initParameters.put(name, value); } + /* (non-Javadoc) + * @see org.richfaces.test.staging.RequestChain#isApplicable(java.lang.String) + */ public boolean isApplicable(String path) { + // Delegate to the next object. Filter has a same mapping as target servlet. return next.isApplicable(path); } + /* (non-Javadoc) + * @see org.richfaces.test.staging.RequestChain#destroy() + */ public void destroy() { if (initialized) { next.destroy(); @@ -76,7 +158,10 @@ } } - public void init(final StagingServletContext context) + /* (non-Javadoc) + * @see org.richfaces.test.staging.RequestChain#init(org.richfaces.test.staging.StagingServletContext) + */ + public void init(final ServletContext context) throws ServletException { if (!initialized) { filter.init(new FilterConfig() { @@ -104,11 +189,19 @@ } } + /* (non-Javadoc) + * @see org.richfaces.test.staging.RequestChain#getPathInfo(java.lang.String) + */ public String getPathInfo(String path) { + // Delegate to the next object. Filter has a same mapping as target servlet. return next.getPathInfo(path); } + /* (non-Javadoc) + * @see org.richfaces.test.staging.RequestChain#getServletPath(java.lang.String) + */ public String getServletPath(String path) { + // Delegate to the next object. Filter has a same mapping as target servlet. return next.getServletPath(path); } Copied: trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/HttpMethod.java (from rev 11221, branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/HttpMethod.java) =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/HttpMethod.java (rev 0) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/HttpMethod.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -0,0 +1,33 @@ +/** + * + */ +package org.richfaces.test.staging; + +/** + * @author asmirnov + * + */ +public enum HttpMethod { + + GET("GET"), + POST("POST"), + HEAD("HEAD"), + PUT("PUT"), + OPTIONS("OPTIONS"), + TRACE("TRACE"), + DELETE("DELETE"); + + /** + * @param name + */ + private HttpMethod(String name) { + this.name = name; + } + + private String name; + + @Override + public String toString() { + return name; + } +} Copied: trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/InvocationErrorEvent.java (from rev 11221, branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/InvocationErrorEvent.java) =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/InvocationErrorEvent.java (rev 0) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/InvocationErrorEvent.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -0,0 +1,36 @@ +package org.richfaces.test.staging; + +import java.lang.reflect.Method; +import java.util.EventObject; + +public class InvocationErrorEvent extends EventObject { + private Object target; + private Method method; + private Object[] args; + private Throwable e; + + public InvocationErrorEvent(Object target, Method method, Object[] args, + Throwable e) { + super(target); + this.target = target; + this.method = method; + this.args = args; + this.e = e; + } + + public Object getTarget() { + return target; + } + + public Method getMethod() { + return method; + } + + public Object[] getArgs() { + return args; + } + + public Throwable getE() { + return e; + } +} \ No newline at end of file Copied: trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/InvocationEvent.java (from rev 11221, branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/InvocationEvent.java) =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/InvocationEvent.java (rev 0) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/InvocationEvent.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -0,0 +1,36 @@ +package org.richfaces.test.staging; + +import java.lang.reflect.Method; +import java.util.EventObject; + +public class InvocationEvent extends EventObject { + private Object target; + private Method method; + private Object[] args; + private Object result; + + public InvocationEvent(Object target, Method method, Object[] args, + Object result) { + super(target); + this.target = target; + this.method = method; + this.args = args; + this.result = result; + } + + public Object getTarget() { + return target; + } + + public Method getMethod() { + return method; + } + + public Object[] getArgs() { + return args; + } + + public Object getResult() { + return result; + } +} \ No newline at end of file Copied: trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/InvocationListener.java (from rev 11221, branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/InvocationListener.java) =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/InvocationListener.java (rev 0) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/InvocationListener.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -0,0 +1,32 @@ +/** + * + */ +package org.richfaces.test.staging; + +import java.util.EventListener; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + + +/** + * Listener interface to inspect all calls to {@link HttpServletRequest} , {@link HttpServletResponse}, {@link HttpSession} and {@link ServletContext} objects. + * @author asmirnov + * + */ +public interface InvocationListener extends EventListener{ + + /** + * This metod called after successful invocation on the target object. + * @param invocationEvent + */ + public void afterInvoke(InvocationEvent invocationEvent); + + /** + * This method called after any {@link Throwable} thrown during method invocation. + * @param invocationErrorEvent + */ + public void processException(InvocationErrorEvent invocationErrorEvent); + +} Copied: trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/PageContextExtension.java (from rev 11221, branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/PageContextExtension.java) =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/PageContextExtension.java (rev 0) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/PageContextExtension.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -0,0 +1,201 @@ +/** + * + */ +package org.richfaces.test.staging; + +import java.io.IOException; +import java.util.Enumeration; + +import javax.el.ELContext; +import javax.servlet.Servlet; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import javax.servlet.jsp.JspWriter; +import javax.servlet.jsp.PageContext; +import javax.servlet.jsp.el.ExpressionEvaluator; +import javax.servlet.jsp.el.VariableResolver; + +final class PageContextExtension extends PageContext { + private ServletResponse response; + private Servlet servlet; + private ServletRequest request; + private boolean needsSession; + private int bufferSize; + private boolean autoFlush; + + + @Override + public void forward(String relativeUrlPath) + throws ServletException, IOException { + // TODO Auto-generated method stub + + } + + @Override + public Exception getException() { + // TODO Auto-generated method stub + return null; + } + + @Override + public Object getPage() { + return servlet; + } + + @Override + public ServletRequest getRequest() { + return request; + } + + @Override + public ServletResponse getResponse() { + return response; + } + + @Override + public ServletConfig getServletConfig() { + return servlet.getServletConfig(); + } + + @Override + public ServletContext getServletContext() { + return servlet.getServletConfig().getServletContext(); + } + + @Override + public HttpSession getSession() { + HttpServletRequest httpRequest = (HttpServletRequest) request; + return httpRequest.getSession(needsSession); + } + + @Override + public void handlePageException(Exception e) + throws ServletException, IOException { + throw new ServletException(e); + + } + + @Override + public void handlePageException(Throwable t) + throws ServletException, IOException { + throw new ServletException(t); + + } + + @Override + public void include(String relativeUrlPath) + throws ServletException, IOException { + // TODO Auto-generated method stub + + } + + @Override + public void include(String relativeUrlPath, boolean flush) + throws ServletException, IOException { + // TODO Auto-generated method stub + + } + + @Override + public void initialize(Servlet servlet, ServletRequest request, + ServletResponse response, String errorPageURL, + boolean needsSession, int bufferSize, boolean autoFlush) + throws IOException, IllegalStateException, + IllegalArgumentException { + this.response = response; + this.servlet = servlet; + this.request = request; + this.needsSession = needsSession; + this.bufferSize = bufferSize; + this.autoFlush = autoFlush; + } + + @Override + public void release() { + // TODO Auto-generated method stub + + } + + @Override + public Object findAttribute(String name) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Object getAttribute(String name) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Object getAttribute(String name, int scope) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Enumeration<String> getAttributeNamesInScope(int scope) { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getAttributesScope(String name) { + // TODO Auto-generated method stub + return 0; + } + + @Override + public ELContext getELContext() { + // TODO Auto-generated method stub + return null; + } + + @Override + public ExpressionEvaluator getExpressionEvaluator() { + // TODO Auto-generated method stub + return null; + } + + @Override + public JspWriter getOut() { + // TODO Auto-generated method stub + return null; + } + + @Override + public VariableResolver getVariableResolver() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void removeAttribute(String name) { + // TODO Auto-generated method stub + + } + + @Override + public void removeAttribute(String name, int scope) { + // TODO Auto-generated method stub + + } + + @Override + public void setAttribute(String name, Object value) { + // TODO Auto-generated method stub + + } + + @Override + public void setAttribute(String name, Object value, int scope) { + // TODO Auto-generated method stub + + } +} \ No newline at end of file Modified: trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/RequestChain.java =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/RequestChain.java 2008-11-18 17:55:45 UTC (rev 11227) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/RequestChain.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -2,23 +2,60 @@ import java.io.IOException; +import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +/** + * Implementations of the this interface represent any executable request object ( filter or servlet ) in the virtual server. + * Filter implementation also hold a reference to the next server object in the chain. + * @author asmirnov + * + */ public interface RequestChain { + /** + * Is this object applicable to process given path ? + * @param path request path relative to web application context. + * @return true if this object was configured to process given path. + */ public abstract boolean isApplicable(String path); + /** + * Execute request with current object. Filter objects also delegate doFilter calls to the next object in the chain. + * @param request + * @param response + * @throws ServletException + * @throws IOException + */ public abstract void execute(ServletRequest request, ServletResponse response) throws ServletException, IOException; + /** + * Destroy containing web server objects. + */ public abstract void destroy(); - public abstract void init(StagingServletContext context) throws ServletException; + /** + * Init containing objects ( filters or servlet ). + * @param servletContext + * @throws ServletException + */ + public abstract void init(ServletContext servletContext) throws ServletException; + /** + * Calculate path info for a request path. + * @param path request path relative to the web application context. + * @return part of the path after servlet path or null for a suffix-based mapping. + */ public abstract String getPathInfo(String path); + /** + * Calculate servlet path for a given request. + * @param path request path relative to the web application context. + * @return prefix part from servlet mapping or {@code path} for a suffix-based mapping. + */ public abstract String getServletPath(String path); } \ No newline at end of file Copied: trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerLogger.java (from rev 11221, branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerLogger.java) =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerLogger.java (rev 0) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerLogger.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -0,0 +1,41 @@ +/** + * + */ +package org.richfaces.test.staging; + +import java.util.logging.Logger; + +/** + * @author asmirnov + * + */ +public enum ServerLogger { + + RESOURCE("resource"), + CONNECTION("connection"), + SERVER("server"); + + private static final String PREFIX="org.richfaces.test."; + + private static final String LOGGING_BUNDLE="org.richfaces.test.LogMessages"; + private final String name; + + /** + * @param name + */ + private ServerLogger(String name) { + this.name = PREFIX+name; + } + + /** + * @return the name + */ + public String getName() { + return name; + } + + public Logger getLogger(){ + return Logger.getLogger(name, LOGGING_BUNDLE); + } + +} Modified: trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerResourcesDirectory.java =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerResourcesDirectory.java 2008-11-18 17:55:45 UTC (rev 11227) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerResourcesDirectory.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -11,6 +11,7 @@ import java.util.Set; /** + * Directory-like resource for a virtual web application content. * @author asmirnov * */ @@ -18,6 +19,9 @@ + /** + * Directory content. + */ private final Map<String,ServerResource> children = new HashMap<String,ServerResource>(); /* (non-Javadoc) @@ -28,8 +32,10 @@ if(null == path || path.isFile()){ throw new IllegalArgumentException(); } else if(path.getNextPath().isFile()) { + // This is a last part in the path - append resource to the directory content. children.put(path.getNextElementName(), resource); } else { + // Create a next directory entry. ServerResource nextDirectory = children.get(path.getNextElementName()); if(null == nextDirectory){ nextDirectory = new ServerResourcesDirectory(); @@ -48,10 +54,12 @@ } ServerResource resource = null; //children.get(path.getName()); if(path.isFile()){ + // Path points to the resource itself. resource=this; } else { resource = children.get(path.getNextElementName()); if(!path.getNextPath().isFile() && null!=resource){ + // Get next resource in the tree, if exists. resource = resource.getResource(path.getNextPath()); } } Modified: trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServletContainer.java =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServletContainer.java 2008-11-18 17:55:45 UTC (rev 11227) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServletContainer.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -17,9 +17,9 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import org.richfaces.test.ServerLogger; /** + * This class represens Servlet in the web application. * @author asmirnov * */ @@ -40,10 +40,14 @@ private boolean initialized = false; /** - * @param mapping - * @param servlet + * @param mapping Servlet mapping pattern, as defined in the &lt;servlet-mapping&gt; element. + * @param servlet servlet instance. Can't be null. + * @throws NullPointerException if servlet parameter is null. */ public ServletContainer(String mapping, Servlet servlet) { + if(null == servlet){ + throw new NullPointerException(); + } if (null == mapping) { this.prefixMapped = true; this.mapping = ""; @@ -60,12 +64,31 @@ this.initParameters = new HashMap<String, String>(); } + /** + * Append filter initialization parameter. Name and value are same as + * defined in the web.xml + * + * <code> + * &lt;init-param&gt; + * &lt;param-name&gt;foo&lt;/param-name&gt; + * &lt;param-value&gt;bar&lt;/param-value&gt; + * &lt;/init-param&gt; + * </code> + * + * @param name + * @param value + * @throws IllegalStateException if servlet was already initialized. + */ public void addInitParameter(String name, String value) { + if (initialized) { + throw new IllegalStateException( + "Servlet have already been initialized, init parameters can't be changed"); + } initParameters.put(name, value); } /** - * @return the name + * @return the name of servlet */ public String getName() { return name; @@ -74,8 +97,13 @@ /** * @param name * the name to set + * @throws IllegalStateException if servlet was already initialized. */ public void setName(String name) { + if (initialized) { + throw new IllegalStateException( + "Servlet have already been initialized, name can't be changed"); + } this.name = name; } @@ -95,6 +123,9 @@ } } + /* (non-Javadoc) + * @see org.richfaces.test.staging.RequestChain#getServletPath(java.lang.String) + */ public String getServletPath(String path) { if (!isApplicable(path)) { return null; @@ -106,6 +137,9 @@ } } + /* (non-Javadoc) + * @see org.richfaces.test.staging.RequestChain#getPathInfo(java.lang.String) + */ public String getPathInfo(String path) { if (!isApplicable(path)) { return null; @@ -118,9 +152,13 @@ } - public void init(final StagingServletContext context) + /* (non-Javadoc) + * @see org.richfaces.test.staging.RequestChain#init(org.richfaces.test.staging.StagingServletContext) + */ + public void init(final ServletContext context) throws ServletException { if (!initialized) { + log.finest("Initialize servlet "+getName()); servlet.init(new ServletConfig() { public String getInitParameter(String name) { @@ -154,10 +192,18 @@ */ public void execute(ServletRequest request, ServletResponse response) throws ServletException, IOException { + if (!initialized) { + throw new IllegalStateException( + "Servlet "+getName()+" have not been initialized, could'n execute request"); + } + log.finest("Request '"+request+"' executes by the '"+getName()+"' servlet"); this.servlet.service(request, response); } + /* (non-Javadoc) + * @see org.richfaces.test.staging.RequestChain#destroy() + */ public void destroy() { if (initialized) { this.servlet.destroy(); Modified: trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StaggingJspApplicationContext.java =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StaggingJspApplicationContext.java 2008-11-18 17:55:45 UTC (rev 11227) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StaggingJspApplicationContext.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -6,6 +6,7 @@ import javax.el.ELContextListener; import javax.el.ELResolver; import javax.el.ExpressionFactory; +import javax.servlet.ServletContext; import javax.servlet.jsp.JspApplicationContext; import com.sun.el.ExpressionFactoryImpl; @@ -17,8 +18,11 @@ public class StaggingJspApplicationContext implements JspApplicationContext { private final ExpressionFactory expressionFactory ; + private final ServletContext servletContext; - public StaggingJspApplicationContext() { + + public StaggingJspApplicationContext(ServletContext servletContext) { + this.servletContext = servletContext; expressionFactory = ExpressionFactory.newInstance(); } @@ -26,7 +30,6 @@ * @see javax.servlet.jsp.JspApplicationContext#addELContextListener(javax.el.ELContextListener) */ public void addELContextListener(ELContextListener listener) { - // TODO Auto-generated method stub } Modified: trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StaggingJspFactory.java =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StaggingJspFactory.java 2008-11-18 17:55:45 UTC (rev 11227) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StaggingJspFactory.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -3,6 +3,8 @@ */ package org.richfaces.test.staging; +import java.io.IOException; + import javax.servlet.Servlet; import javax.servlet.ServletContext; import javax.servlet.ServletRequest; @@ -13,27 +15,31 @@ import javax.servlet.jsp.PageContext; /** + * Stagging implementation of the {@link JspFactory} to simulate JSP processing in the stagging server. + * TODO - implement JSP functionality. * @author asmirnov - * + * */ public class StaggingJspFactory extends JspFactory { - - private static final JspEngineInfo engineInfo = new JspEngineInfo(){ - + private static final JspEngineInfo engineInfo = new JspEngineInfo() { + @Override public String getSpecificationVersion() { return "2.1"; } - + }; - private final JspApplicationContext context; + private final JspApplicationContext context; - public StaggingJspFactory() { - this.context = new StaggingJspApplicationContext(); + public StaggingJspFactory(ServletContext servletContext) { + this.context = new StaggingJspApplicationContext(servletContext); } - /* (non-Javadoc) + + /* + * (non-Javadoc) + * * @see javax.servlet.jsp.JspFactory#getEngineInfo() */ @Override @@ -42,31 +48,47 @@ return engineInfo; } - /* (non-Javadoc) - * @see javax.servlet.jsp.JspFactory#getJspApplicationContext(javax.servlet.ServletContext) + /* + * (non-Javadoc) + * + * @seejavax.servlet.jsp.JspFactory#getJspApplicationContext(javax.servlet. + * ServletContext) */ @Override public JspApplicationContext getJspApplicationContext(ServletContext context) { return this.context; } - /* (non-Javadoc) - * @see javax.servlet.jsp.JspFactory#getPageContext(javax.servlet.Servlet, javax.servlet.ServletRequest, javax.servlet.ServletResponse, java.lang.String, boolean, int, boolean) + /* + * (non-Javadoc) + * + * @see javax.servlet.jsp.JspFactory#getPageContext(javax.servlet.Servlet, + * javax.servlet.ServletRequest, javax.servlet.ServletResponse, + * java.lang.String, boolean, int, boolean) */ @Override - public PageContext getPageContext(Servlet servlet, ServletRequest request, - ServletResponse response, String errorPageURL, - boolean needsSession, int buffer, boolean autoflush) { - // TODO Auto-generated method stub - return null; + public PageContext getPageContext(final Servlet servlet, final ServletRequest request, + final ServletResponse response, String errorPageURL, + final boolean needsSession, int buffer, boolean autoflush) { + PageContextExtension pageContextExtension = new PageContextExtension(); + try { + pageContextExtension.initialize(servlet, request, response, errorPageURL, needsSession, buffer, autoflush); + } catch (IOException e) { + throw new IllegalStateException(e); + } + return pageContextExtension; } - /* (non-Javadoc) - * @see javax.servlet.jsp.JspFactory#releasePageContext(javax.servlet.jsp.PageContext) + /* + * (non-Javadoc) + * + * @see + * javax.servlet.jsp.JspFactory#releasePageContext(javax.servlet.jsp.PageContext + * ) */ @Override public void releasePageContext(PageContext pc) { - // TODO Auto-generated method stub + pc.release(); } Copied: trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingConnection.java (from rev 11221, branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingConnection.java) =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingConnection.java (rev 0) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingConnection.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -0,0 +1,521 @@ +/** + * + */ +package org.richfaces.test.staging; + +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.lang.reflect.Proxy; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLDecoder; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.logging.Logger; + +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +import org.richfaces.test.TestException; + +/** + * This class represent single connection to the server. + * + * @author asmirnov + * + */ +public class StagingConnection { + + private static final Logger log = ServerLogger.SERVER.getLogger(); + + private final StagingServer server; + + final URL url; + + private ConnectionRequest request; + + private ConnectionResponse response; + + private final RequestChain servlet; + + private HttpMethod method = HttpMethod.GET; + + private static final Cookie[] COOKIE = new Cookie[] {}; + + private List<Cookie> cookies = new ArrayList<Cookie>(); + + private Map<String, String[]> requestParameters = new HashMap<String, String[]>(); + + private final String pathInfo; + + private final String servletPath; + + private boolean finished = false; + + private boolean started = false; + + private String queryString; + + private HttpServletRequest requestProxy; + + private HttpServletResponse responseProxy; + + public StagingConnection(StagingServer localServer, URL url) { + this.server = localServer; + this.url = url; + String path = url.getPath(); + servlet = localServer.getServlet(path); + if (null == servlet) { + throw new IllegalArgumentException(); + } + this.pathInfo = servlet.getPathInfo(path); + this.servletPath = servlet.getServletPath(path); + this.request = new ConnectionRequest(); + this.response = new ConnectionResponse(); + this.request.setAttribute("javax.servlet.include.path_info", + this.pathInfo); + this.request.setAttribute("javax.servlet.include.servlet_path", + this.servletPath); + setQueryString(url.getQuery()); + if (null != getQueryString()) { + parseFormParameters(queryString); + } + + // Create proxy objects. + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + if(null == loader){ + loader = this.getClass().getClassLoader(); + } + requestProxy = (HttpServletRequest) Proxy.newProxyInstance(loader, new Class[]{HttpServletRequest.class}, server.getInvocationHandler(request)); + responseProxy = (HttpServletResponse) Proxy.newProxyInstance(loader, new Class[]{HttpServletResponse.class}, server.getInvocationHandler(response)); + } + + public void parseFormParameters(String queryString) { + String[] queryParams = queryString.split("&"); + for (int i = 0; i < queryParams.length; i++) { + try { + String par = queryParams[i]; + int eqIndex = par.indexOf('='); + if (eqIndex >= 0) { + // decode url-decoded values. + String name = URLDecoder.decode(par.substring(0, eqIndex), + request.getCharacterEncoding()); + String value = URLDecoder.decode( + par.substring(eqIndex + 1), request + .getCharacterEncoding()); + addRequestParameter(name, value); + } else { + addRequestParameter(URLDecoder.decode(par, request + .getCharacterEncoding()), null); + } + } catch (UnsupportedEncodingException e) { + throw new TestException(e); + } + } + } + + /** + * @return the finished + */ + public boolean isFinished() { + return finished; + } + + /** + * @return the started + */ + public boolean isStarted() { + return started; + } + + private void checkStarted() { + if (!isFinished()) { + throw new IllegalStateException("request have not been started"); + } + } + + private void checkNotStarted() { + if (isStarted()) { + throw new IllegalStateException("request was started, no parameters changes allowed"); + } + } + + public void execute() throws ServletException, IOException { + if (isStarted() || isFinished()) { + throw new IllegalStateException( + "request have already been executed"); + } + start(); + this.servlet.execute(request, response); + finish(); + } + + public void finish() { + server.requestFinished(request); + finished = true; + } + + public void start() { + log.fine("start " + getMethod() + " request processing for file " + + url.getFile()); + log.fine("request parameters: " + requestParameters); + server.requestStarted(request); + started = true; + } + + /** + * @return the method + */ + public HttpMethod getMethod() { + return method; + } + + /** + * @param method + * the method to set + */ + public void setRequestMethod(HttpMethod method) { + checkNotStarted(); + this.method = method; + } + + /** + * @return the url + */ + public URL getUrl() { + return url; + } + + public void addRequestParameter(String name, String value) { + checkNotStarted(); + String[] values = requestParameters.get(name); + if (null == values) { + values = new String[1]; + } else { + String[] newValues = new String[values.length + 1]; + System.arraycopy(values, 0, newValues, 0, values.length); + values = newValues; + } + values[values.length - 1] = value; + requestParameters.put(name, values); + } + + /** + * @return + */ + public String getContentAsString() { + checkStarted(); + String content = response.getWriterContent(); + if (null == content) { + byte[] streamContent = response.getStreamContent(); + if (null != streamContent) { + String encoding = response.getCharacterEncoding(); + if (null != encoding) { + try { + content = new String(streamContent, encoding); + } catch (UnsupportedEncodingException e) { + throw new TestException(e); + } + } else { + content = new String(streamContent); + } + } + } + return content; + } + + public byte[] getResponseBody() { + checkStarted(); + byte[] content = response.getStreamContent(); + if (null == content) { + String writerContent = response.getWriterContent(); + if (null != writerContent) { + try { + content = writerContent.getBytes(response + .getCharacterEncoding()); + } catch (UnsupportedEncodingException e) { + content = writerContent.getBytes(); + } + } else { + content = new byte[0]; + } + } + return content; + } + + /** + * @return the cookies + */ + public List<Cookie> getCookies() { + return cookies; + } + + /** + * @return the request + */ + public HttpServletRequest getRequest() { + return requestProxy; + } + + /** + * @return the response + */ + public HttpServletResponse getResponse() { + return responseProxy; + } + + private class ConnectionRequest extends StagingHttpRequest { + + public Cookie[] getCookies() { + return cookies.toArray(COOKIE); + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletRequest#getMethod() + */ + public String getMethod() { + return method.toString(); + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletRequest#getServletPath() + */ + public String getServletPath() { + return servletPath; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletRequest#getPathInfo() + */ + public String getPathInfo() { + return pathInfo; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletRequest#getQueryString() + */ + public String getQueryString() { + return queryString; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletRequest#getRequestURI() + */ + public String getRequestURI() { + return url.getPath(); + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletRequest#getParameter(java.lang.String) + */ + public String getParameter(String name) { + String[] values = requestParameters.get(name); + if (null != values && values.length > 0) { + return values[0]; + } + return null; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletRequest#getParameterMap() + */ + @SuppressWarnings("unchecked") + public Map getParameterMap() { + return Collections.unmodifiableMap(requestParameters); + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletRequest#getParameterNames() + */ + @SuppressWarnings("unchecked") + public Enumeration getParameterNames() { + return Collections.enumeration(requestParameters.keySet()); + } + + /* + * (non-Javadoc) + * + * @see + * javax.servlet.ServletRequest#getParameterValues(java.lang.String) + */ + public String[] getParameterValues(String name) { + return requestParameters.get(name); + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletRequest#getSession() + */ + public HttpSession getSession() { + return server.getSession(); + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletRequest#getSession(boolean) + */ + public HttpSession getSession(boolean create) { + return server.getSession(create); + } + + @Override + public RequestDispatcher getRequestDispatcher(String path) { + RequestDispatcher dispatcher = null; + if (!path.startsWith("/")) { + try { + URL absoluteUrl = new URL(url, path); + path = absoluteUrl.getFile(); + } catch (MalformedURLException e) { + return null; + } + } + final RequestChain dispatchedServlet = server.getServlet(path); + if (null != dispatchedServlet) { + dispatcher = new RequestDispatcher() { + + public void forward(ServletRequest request, + ServletResponse response) throws ServletException, + IOException { + response.reset(); + dispatchedServlet.execute(request, response); + } + + public void include(ServletRequest request, + ServletResponse response) throws ServletException, + IOException { + dispatchedServlet.execute(request, response); + } + + }; + } + return dispatcher; + } + + @Override + protected void attributeAdded(String name, Object o) { + server.requestAttributeAdded(this, name, o); + + } + + @Override + protected void attributeRemoved(String name, Object removed) { + server.requestAttributeRemoved(this, name, removed); + + } + + @Override + protected void attributeReplaced(String name, Object o) { + server.requestAttributeReplaced(this, name, o); + + } + + } + + private class ConnectionResponse extends StagingHttpResponse { + /* + * (non-Javadoc) + * + * @see + * javax.servlet.http.HttpServletResponse#addCookie(javax.servlet.http + * .Cookie ) + */ + public void addCookie(Cookie cookie) { + cookies.add(cookie); + + } + + } + + public String getCharacterEncoding() { + checkStarted(); + return response.getCharacterEncoding(); + } + + public String getContentType() { + checkStarted(); + return response.getContentType(); + } + + public int getStatus() { + checkStarted(); + return response.getStatus(); + } + + public String getErrorMessage() { + checkStarted(); + return response.getErrorMessage(); + } + + /** + * @param queryString + * the queryString to set + */ + public void setQueryString(String queryString) { + checkNotStarted(); + this.queryString = queryString; + } + + /** + * @return the queryString + */ + public String getQueryString() { + return queryString; + } + + /** + * @return + */ + public Map<String, String[]> getResponseHeaders() { + checkStarted(); + return response.getHeaders(); + } + + public void setRequestCharacterEncoding(String charset) throws UnsupportedEncodingException { + checkNotStarted(); + request.setCharacterEncoding(charset); + } + + public void setRequestBody(String body) { + checkNotStarted(); + request.setRequestBody(body); + } + + public void setRequestContentType(String contentType) { + checkNotStarted(); + request.setContentType(contentType); + + } + + public void addRequestHeaders(Map<String, String> headers) { + request.addHeaders(headers); + } + +} Modified: trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingHttpRequest.java =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingHttpRequest.java 2008-11-18 17:55:45 UTC (rev 11227) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingHttpRequest.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -8,6 +8,7 @@ import java.io.IOException; import java.io.StringReader; import java.io.UnsupportedEncodingException; +import java.nio.charset.Charset; import java.security.Principal; import java.text.DateFormat; import java.text.ParseException; @@ -26,13 +27,12 @@ import javax.servlet.ServletInputStream; import javax.servlet.http.HttpServletRequest; -import org.richfaces.test.ServerLogger; /** * @author asmirnov * */ -public abstract class StagingHttpRequest implements HttpServletRequest { +abstract class StagingHttpRequest implements HttpServletRequest { private static final Logger log = ServerLogger.CONNECTION.getLogger(); @@ -57,7 +57,7 @@ /** * @return the requestBody */ - public String getRequestBody() { + String getRequestBody() { return requestBody; } @@ -65,7 +65,7 @@ * @param requestBody * the requestBody to set */ - public void setRequestBody(String requestBody) { + void setRequestBody(String requestBody) { this.requestBody = requestBody; } @@ -157,11 +157,11 @@ return -1; } - public void addHeader(String name, String value) { + void addHeader(String name, String value) { headers.put(name, value); } - public void addHeaders(Map<String, String> headers) { + void addHeaders(Map<String, String> headers) { this.headers.putAll(headers); } @@ -541,6 +541,9 @@ */ public void setCharacterEncoding(String env) throws UnsupportedEncodingException { + if (!Charset.isSupported(env)) { + throw new UnsupportedEncodingException("Unknown charset "+env); + } this.characterEncoding = env; } Modified: trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingHttpResponse.java =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingHttpResponse.java 2008-11-18 17:55:45 UTC (rev 11227) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingHttpResponse.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -22,13 +22,12 @@ import org.apache.commons.httpclient.HttpStatus; import org.junit.internal.matchers.SubstringMatcher; -import org.richfaces.test.ServerLogger; /** * @author asmirnov * */ -public abstract class StagingHttpResponse implements HttpServletResponse { +abstract class StagingHttpResponse implements HttpServletResponse { private static final Logger log = ServerLogger.CONNECTION.getLogger(); @@ -63,7 +62,7 @@ /** * @return the headers */ - public Map<String, String[]> getHeaders() { + Map<String, String[]> getHeaders() { return headers; } @@ -445,21 +444,21 @@ /** * @return the status */ - public int getStatus() { + int getStatus() { return status; } /** * @return the redirectLocation */ - public String getRedirectLocation() { + String getRedirectLocation() { return redirectLocation; } /** * @return the errorMessage */ - public String getErrorMessage() { + String getErrorMessage() { return errorMessage; } Modified: trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingHttpSession.java =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingHttpSession.java 2008-11-18 17:55:45 UTC (rev 11227) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingHttpSession.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -21,7 +21,7 @@ * @author asmirnov * */ -public abstract class StagingHttpSession implements HttpSession { +abstract class StagingHttpSession implements HttpSession { private static final int DEFAULT_INACTIVE_TIME = 30; @@ -43,7 +43,7 @@ /** * */ - public void destroy() { + void destroy() { // Destroy all session attributes. unboundAttributes(); } Copied: trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingServer.java (from rev 11221, branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingServer.java) =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingServer.java (rev 0) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingServer.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -0,0 +1,558 @@ +package org.richfaces.test.staging; + +import java.io.File; +import java.io.IOException; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.EventListener; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; + +import javax.servlet.Filter; +import javax.servlet.Servlet; +import javax.servlet.ServletContext; +import javax.servlet.ServletContextAttributeEvent; +import javax.servlet.ServletContextAttributeListener; +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletRequestAttributeEvent; +import javax.servlet.ServletRequestAttributeListener; +import javax.servlet.ServletRequestEvent; +import javax.servlet.ServletRequestListener; +import javax.servlet.http.HttpSession; +import javax.servlet.http.HttpSessionAttributeListener; +import javax.servlet.http.HttpSessionBindingEvent; +import javax.servlet.http.HttpSessionEvent; +import javax.servlet.http.HttpSessionListener; +import javax.servlet.jsp.JspFactory; + +import org.richfaces.test.TestException; + +/** + * This class implements limited Http servlet container 2.5 functionality. It + * supports only calls only, java code configuration, just one web application + * etc... + * + */ +public class StagingServer { + + private static final Class<ServletRequestListener> REQUEST_LISTENER_CLASS = ServletRequestListener.class; + + private static final Class<ServletRequestAttributeListener> REQUEST_ATTRIBUTE_LISTENER_CLASS = ServletRequestAttributeListener.class; + + private static final Class<ServletContextListener> CONTEXT_LISTENER_CLASS = ServletContextListener.class; + + private static final Class<HttpSessionListener> SESSION_LISTENER_CLASS = HttpSessionListener.class; + + private static final Class<HttpSessionAttributeListener> SESSION_ATTRIBUTE_LISTENER_CLASS = HttpSessionAttributeListener.class; + + private List<RequestChain> servlets = new ArrayList<RequestChain>(); + + private RequestChain defaultServlet; + + private List<EventListener> contextListeners = new ArrayList<EventListener>(); + + private Map<String, String> initParameters = new HashMap<String, String>(); + + private ServerResource serverRoot = new ServerResourcesDirectory(); + + private final Map<String, String> mimeTypes = new HashMap<String, String>(); + + + private InvocationListener invocationListener; + + + private StagingServletContext context; + + private ServletContext contextProxy; + + + private ServerHttpSession session; + + private HttpSession sessionProxy; + + + private class LocalContext extends StagingServletContext { + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletContext#getMimeType(java.lang.String) + */ + public String getMimeType(String file) { + int indexOfDot = file.lastIndexOf('.'); + // get extension. + if (indexOfDot >= 0) { + file = file.substring(indexOfDot); + } + return mimeTypes.get(file); + } + + @Override + protected void valueBound(ServletContextAttributeEvent event) { + // inform listeners. + for (EventListener listener : contextListeners) { + if (listener instanceof ServletContextAttributeListener) { + ServletContextAttributeListener contextListener = (ServletContextAttributeListener) listener; + contextListener.attributeAdded(event); + } + } + } + + @Override + protected void valueReplaced(ServletContextAttributeEvent event) { + // inform listeners. + for (EventListener listener : contextListeners) { + if (listener instanceof ServletContextAttributeListener) { + ServletContextAttributeListener contextListener = (ServletContextAttributeListener) listener; + contextListener.attributeReplaced(event); + } + } + } + + @Override + protected void valueUnbound(ServletContextAttributeEvent event) { + // inform listeners. + for (EventListener listener : contextListeners) { + if (listener instanceof ServletContextAttributeListener) { + ServletContextAttributeListener contextListener = (ServletContextAttributeListener) listener; + contextListener.attributeRemoved(event); + } + } + } + + @Override + /* + * @param path + * + * @return + */ + protected ServerResource getServerResource(String path) { + return serverRoot.getResource(new ServerResourcePath(path)); + } + + } + + private class ServerHttpSession extends StagingHttpSession { + + public ServletContext getServletContext() { + return context; + } + + @Override + protected void valueBound( + final HttpSessionBindingEvent sessionBindingEvent) { + // inform session listeners. + fireEvent(SESSION_ATTRIBUTE_LISTENER_CLASS, + new EventInvoker<HttpSessionAttributeListener>() { + public void invoke(HttpSessionAttributeListener listener) { + listener.attributeAdded(sessionBindingEvent); + } + }); + } + + @Override + protected void valueUnbound( + final HttpSessionBindingEvent sessionBindingEvent) { + // inform session listeners. + fireEvent(SESSION_ATTRIBUTE_LISTENER_CLASS, + new EventInvoker<HttpSessionAttributeListener>() { + public void invoke(HttpSessionAttributeListener listener) { + listener.attributeRemoved(sessionBindingEvent); + } + }); + } + + @Override + protected void valueReplaced( + final HttpSessionBindingEvent sessionBindingEvent) { + // inform session listeners. + fireEvent(SESSION_ATTRIBUTE_LISTENER_CLASS, + new EventInvoker<HttpSessionAttributeListener>() { + public void invoke(HttpSessionAttributeListener listener) { + listener.attributeReplaced(sessionBindingEvent); + } + }); + } + } + + /** + * + */ + @SuppressWarnings("unchecked") + private <T extends EventListener> void fireEvent(Class<T> listenerClass, + EventInvoker<T> invoker) { + for (EventListener listener : contextListeners) { + if (listenerClass.isInstance(listener)) { + invoker.invoke((T) listener); + } + } + } + + /** + * Append executable server object ( {@link Filter} or {@link Servlet} + * container. + * + * @param servlet + */ + public void addServlet(RequestChain servlet) { + servlets.add(servlet); + } + + /** + * Add servlet to the server. + * + * @param mapping + * servlet mapping + * @param servlet + * {@link Servlet} instance. + */ + public void addServlet(String mapping, Servlet servlet) { + servlets.add(new ServletContainer(mapping, servlet)); + } + + /** + * Get appropriate object ( Filter or Servlet ) for a given path. + * + * @param path + * request path relative to web application context. + * @return + */ + public RequestChain getServlet(String path) { + RequestChain result = null; + for (RequestChain servlet : servlets) { + if (servlet.isApplicable(path)) { + result = servlet; + break; + } + } + if (null == result) { + try { + URL resource = context.getResource(path); + if (null != resource) { + result = defaultServlet; + } + } catch (MalformedURLException e) { + // do nothing, just return no servlet. + } + } + return result; + } + + public void addInitParameter(String name, String value) { + initParameters.put(name, value); + } + + void addMimeType(String extension, String mimeType) { + mimeTypes.put(extension, mimeType); + } + + public void addResource(String path, String resource) { + ServerResourcePath resourcePath = new ServerResourcePath(path); + serverRoot.addResource(resourcePath, new ClasspathServerResource( + resource)); + } + + public void addResource(String path, URL resource) { + serverRoot.addResource(new ServerResourcePath(path), + new UrlServerResource(resource)); + } + + public void addResourcesFromDirectory(String path, URL resource) { + ServerResourcePath resourcePath = new ServerResourcePath(path); + ServerResource baseDirectory = serverRoot.getResource(resourcePath); + if (null == baseDirectory) { + baseDirectory = new ServerResourcesDirectory(); + serverRoot.addResource(resourcePath, baseDirectory); + } + String protocol = resource.getProtocol(); + if ("jar".equals(protocol)) { + addResourcesFromJar(resource, baseDirectory); + } else if ("file".equals(protocol)) { + addResourcesFromFile(resource, baseDirectory); + } else { + throw new TestException("Unsupported protocol " + protocol); + } + } + + protected void addResourcesFromFile(URL resource, + ServerResource baseDirectory) { + File file = new File(resource.getPath()); + if (!file.isDirectory()) { + file = file.getParentFile(); + } + try { + addFiles(baseDirectory, file); + } catch (MalformedURLException e) { + throw new TestException(e); + } + } + + protected void addResourcesFromJar(URL resource, + ServerResource baseDirectory) { + try { + String jarPath = resource.getPath(); + String entry = jarPath.substring(jarPath.indexOf('!') + 2); + jarPath = jarPath.substring(0, jarPath.indexOf('!')); + File file = new File(new URI(jarPath)); + ZipFile zip = new ZipFile(file); + Enumeration<? extends ZipEntry> entries = zip.entries(); + entry = entry.substring(0, entry.lastIndexOf('/') + 1); + while (entries.hasMoreElements()) { + ZipEntry zzz = (ZipEntry) entries.nextElement(); + if (zzz.getName().startsWith(entry) && !zzz.isDirectory()) { + String relativePath = zzz.getName().substring( + entry.length()); + URL relativeResource = new URL(resource, relativePath); + baseDirectory.addResource(new ServerResourcePath("/" + + relativePath), new UrlServerResource( + relativeResource)); + } + } + + } catch (IOException e) { + throw new TestException(e); + } catch (URISyntaxException e) { + throw new TestException(e); + } + } + + /** + * @param baseDirectory + * @param file + * @throws MalformedURLException + */ + protected void addFiles(ServerResource baseDirectory, File file) + throws MalformedURLException { + File[] files = file.listFiles(); + for (File subfile : files) { + ServerResourcePath serverResourcePath = new ServerResourcePath("/" + + subfile.getName()); + if (subfile.isDirectory()) { + ServerResourcesDirectory subDir = new ServerResourcesDirectory(); + baseDirectory.addResource(serverResourcePath, subDir); + addFiles(subDir, subfile); + } else { + UrlServerResource resource = new UrlServerResource(subfile + .toURL()); + baseDirectory.addResource(serverResourcePath, resource); + + } + } + } + + public void addWebListener(EventListener listener) { + contextListeners.add(listener); + } + + /** + * @return the invocationListener + */ + public InvocationListener getInvocationListener() { + return invocationListener; + } + + /** + * @param invocationListener the invocationListener to set + */ + public void setInvocationListener(InvocationListener invocationListener) { + this.invocationListener = invocationListener; + } + + /** + * @return the invocationHandler + */ + public InvocationHandler getInvocationHandler(final Object target) { + return new InvocationHandler() { + + public Object invoke(Object proxy, Method method, Object[] args) + throws Throwable { + InvocationListener listener = getInvocationListener(); + try { + Object result = method.invoke(target, args); + if(null != listener){ + listener.afterInvoke(new InvocationEvent(target,method,args,result)); + } + return result; + } catch (Throwable e) { + if(null != listener){ + listener.processException(new InvocationErrorEvent(target,method,args,e)); + } + throw e; + } + } + + }; + + } + + public HttpSession getSession() { + return getSession(true); + } + + public synchronized HttpSession getSession(boolean create) { + if (null == this.session && create) { + this.session = new ServerHttpSession(); + // Create proxy objects. + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + if(null == loader){ + loader = this.getClass().getClassLoader(); + } + this.sessionProxy = (HttpSession) Proxy.newProxyInstance(loader, new Class[]{HttpSession.class}, getInvocationHandler(session)); + // inform session listeners. + final HttpSessionEvent event = new HttpSessionEvent(session); + fireEvent(SESSION_LISTENER_CLASS, + new EventInvoker<HttpSessionListener>() { + public void invoke(HttpSessionListener listener) { + listener.sessionCreated(event); + } + }); + } + return sessionProxy; + } + + public void init() { + // Create context. + this.context = new LocalContext(); + // Create Jsp factory + JspFactory.setDefaultFactory(new StaggingJspFactory(this.context)); + // Create init parameters + context.addInitParameters(initParameters); + // Inform listeners + // Create proxy objects. + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + if(null == loader){ + loader = this.getClass().getClassLoader(); + } + this.contextProxy = (ServletContext) Proxy.newProxyInstance(loader, new Class[]{ServletContext.class}, getInvocationHandler(context)); + final ServletContextEvent event = new ServletContextEvent(context); + fireEvent(CONTEXT_LISTENER_CLASS, + new EventInvoker<ServletContextListener>() { + public void invoke(ServletContextListener listener) { + listener.contextInitialized(event); + } + }); + // Init servlets + try { + for (RequestChain servlet : servlets) { + // init servlet + servlet.init(this.context); + } + defaultServlet = new ServletContainer(null, new StaticServlet()); + defaultServlet.init(getContext()); + } catch (ServletException e) { + throw new TestException(e); + } + } + + public void destroy() { + // Destroy session + if (null != this.session) { + // inform session listeners. + final HttpSessionEvent event = new HttpSessionEvent(session); + fireEvent(SESSION_LISTENER_CLASS, + new EventInvoker<HttpSessionListener>() { + public void invoke(HttpSessionListener listener) { + listener.sessionDestroyed(event); + } + }); + session.destroy(); + session = null; + } + // Inform listeners + final ServletContextEvent event = new ServletContextEvent(context); + fireEvent(CONTEXT_LISTENER_CLASS, + new EventInvoker<ServletContextListener>() { + public void invoke(ServletContextListener listener) { + listener.contextDestroyed(event); + } + }); + // Destroy servlets + for (RequestChain servlet : servlets) { + servlet.destroy(); + } + defaultServlet.destroy(); + // Create Jsp factory + JspFactory.setDefaultFactory(null); + + } + + public StagingConnection getConnection(URL url) { + return new StagingConnection(this, url); + } + + public ServletContext getContext() { + return contextProxy; + } + + public void requestStarted(ServletRequest request) { + final ServletRequestEvent event = new ServletRequestEvent(context, + request); + fireEvent(REQUEST_LISTENER_CLASS, + new EventInvoker<ServletRequestListener>() { + public void invoke(ServletRequestListener listener) { + listener.requestInitialized(event); + + } + }); + } + + public void requestFinished(ServletRequest request) { + final ServletRequestEvent event = new ServletRequestEvent(context, + request); + fireEvent(REQUEST_LISTENER_CLASS, + new EventInvoker<ServletRequestListener>() { + public void invoke(ServletRequestListener listener) { + listener.requestDestroyed(event); + } + }); + } + + public void requestAttributeAdded(ServletRequest request, String name, + Object o) { + final ServletRequestAttributeEvent event = new ServletRequestAttributeEvent( + context, request, name, o); + fireEvent(REQUEST_ATTRIBUTE_LISTENER_CLASS, + new EventInvoker<ServletRequestAttributeListener>() { + public void invoke(ServletRequestAttributeListener listener) { + listener.attributeAdded(event); + } + }); + } + + public void requestAttributeRemoved(ServletRequest request, String name, + Object removed) { + final ServletRequestAttributeEvent event = new ServletRequestAttributeEvent( + context, request, name, removed); + fireEvent(REQUEST_ATTRIBUTE_LISTENER_CLASS, + new EventInvoker<ServletRequestAttributeListener>() { + public void invoke(ServletRequestAttributeListener listener) { + listener.attributeRemoved(event); + } + }); + } + + public void requestAttributeReplaced(ServletRequest request, String name, + Object value) { + final ServletRequestAttributeEvent event = new ServletRequestAttributeEvent( + context, request, name, value); + fireEvent(REQUEST_ATTRIBUTE_LISTENER_CLASS, + new EventInvoker<ServletRequestAttributeListener>() { + public void invoke(ServletRequestAttributeListener listener) { + listener.attributeReplaced(event); + } + }); + } +} Modified: trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingServletContext.java =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingServletContext.java 2008-11-18 17:55:45 UTC (rev 11227) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingServletContext.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -24,13 +24,12 @@ import javax.servlet.ServletContextAttributeListener; import javax.servlet.ServletException; -import org.richfaces.test.ServerLogger; /** * @author asmirnov * */ -public abstract class StagingServletContext implements ServletContext { +abstract class StagingServletContext implements ServletContext { private static final Logger log = ServerLogger.SERVER.getLogger(); @@ -38,7 +37,7 @@ private static final String APPLICATION_NAME = "stub"; private final Map<String, Object> attributes = new ConcurrentHashMap<String, Object>(); - private Map<String,String> initParameters = new HashMap<String, String>(); + private final Map<String,String> initParameters = new HashMap<String, String>(); /* (non-Javadoc) * @see javax.servlet.ServletContext#getAttribute(java.lang.String) @@ -106,14 +105,6 @@ return 2; } - /* (non-Javadoc) - * @see javax.servlet.ServletContext#getMimeType(java.lang.String) - */ - public String getMimeType(String file) { - // TODO create mime-types table. - log.info("unimplemented servlet context method getMimeType"); - return null; - } /* (non-Javadoc) * @see javax.servlet.ServletContext#getMinorVersion() Modified: trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/UrlServerResource.java =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/UrlServerResource.java 2008-11-18 17:55:45 UTC (rev 11227) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/UrlServerResource.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -6,18 +6,24 @@ import java.net.URL; import java.util.logging.Logger; -import org.richfaces.test.ServerLogger; /** + * This class represent file-like virtual web application object, loaded from the any URL. * @author asmirnov * */ public class UrlServerResource extends AbstractServerResource { + /** + * Resource target URL + */ private final URL resource; static final Logger log = ServerLogger.RESOURCE.getLogger(); + /** + * @param resource url to the resource content. + */ public UrlServerResource(URL resource) { this.resource = resource; } Modified: trunk/framework/jsf-test/src/test/java/org/richfaces/test/staging/ServletTest.java =================================================================== --- trunk/framework/jsf-test/src/test/java/org/richfaces/test/staging/ServletTest.java 2008-11-18 17:55:45 UTC (rev 11227) +++ trunk/framework/jsf-test/src/test/java/org/richfaces/test/staging/ServletTest.java 2008-11-18 22:44:40 UTC (rev 11228) @@ -59,6 +59,10 @@ RequestChain servlet = new ServletContainer("/foo/*",staticServlet); StagingServletContext context = new StagingServletContext(){ + public String getMimeType(String file){ + return null; + } + @Override protected ServerResource getServerResource(String path) { // TODO Auto-generated method stub