November 2008 - richfaces-svn-commits

JBoss Rich Faces SVN: r11100 - trunk/sandbox/ui/editor/src/main/antlr.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2008-11-12 03:51:36 -0500 (Wed, 12 Nov 2008) New Revision: 11100 Modified: trunk/sandbox/ui/editor/src/main/antlr/html-seamtext.g Log: Modified: trunk/sandbox/ui/editor/src/main/antlr/html-seamtext.g =================================================================== --- trunk/sandbox/ui/editor/src/main/antlr/html-seamtext.g 2008-11-12 07:15:09 UTC (rev 11099) +++ trunk/sandbox/ui/editor/src/main/antlr/html-seamtext.g 2008-11-12 08:51:36 UTC (rev 11100) @@ -1,6 +1,6 @@ header { - package org.richfaces.antlr; + package org.richfaces; } { @@ -61,7 +61,7 @@ private final String SEAMTEXT_BACKTICK = "`"; - private final String SEAMTEXT_PARAGRAPH = "\n\n"; + private final String BLANK_LINE = "\n\n"; private final String SEAM_DOUBLEQUOTE = "\""; @@ -74,17 +74,17 @@ protected java.util.Set<String> seamTextSymbols = new java.util.HashSet(java.util.Arrays.asList( SEAMTEXT_MONOSPACE, SEAMTEXT_TWIDDLE, SEAMTEXT_HASH, SEAMTEXT_HAT, SEAMTEXT_PLUS, SEAMTEXT_STAR, - SEAMTEXT_UNDERSCORE, SEAMTEXT_EQ, SEAMTEXT_BACKTICK, SEAMTEXT_PARAGRAPH, SEAM_DOUBLEQUOTE, SEAM_OPEN, + SEAMTEXT_UNDERSCORE, SEAMTEXT_EQ, SEAMTEXT_BACKTICK, BLANK_LINE, SEAM_DOUBLEQUOTE, SEAM_OPEN, SEAM_CLOSE, SEAM_GT )); protected java.util.Set<String> htmlSeamTextElements = new java.util.HashSet(java.util.Arrays.asList( - "del", "sup", "pre","p", "q" ,"h1" ,"h2" ,"h3" ,"h4" ,"ul" ,"ol" ,"li" ,"i" ,"tt" ,"u" ,"a")); + "del", "sup", "pre","p", "q" ,"h1" ,"h2" ,"h3" ,"h4" ,"ul" ,"ol" ,"li" ,"i" ,"tt" ,"u" ,"a","blockqoute")); protected java.util.Set<String> simpleHtmlSeamTextElements = new java.util.HashSet(java.util.Arrays.asList( - "del", "sup", "pre","p", "q" ,"i" ,"tt" ,"u")); + "del", "sup", "pre", "q", "i" ,"tt" ,"u")); protected java.util.Set<String> formattedHtmlSeamTextElements = new java.util.HashSet(java.util.Arrays.asList( - "ul", "ol", "li", "h1", "h2", "h3", "h4", "a")); + "ul", "ol", "li", "h1", "h2", "h3", "h4", "a", "p", "blockqoute")); private Sanitizer sanitizer = new DefaultSanitizer(); @@ -92,13 +92,13 @@ private StringBuilder mainBuilder = new StringBuilder(); - private StringBuilder linkValueCollector = new StringBuilder(); - private String linkHolder; private StringBuilder builder = mainBuilder; + public StringBuilder valueCollector; + public void setSanitizer(Sanitizer sanitizer) { this.sanitizer = sanitizer; } @@ -168,7 +168,7 @@ return seamHeader.toString(); } - public void healingHeaderMarkup(java.util.Stack <Token> htmlElementStack) throws TokenStreamException{ + public void healingHeaderMarkup() throws TokenStreamException{ int EOF = 1; int ALPHANUMERICWORD = 4; int i = 0; @@ -195,15 +195,20 @@ } } - public String getSeamParagraphMarkup() throws TokenStreamException{ + public boolean isParagraph(Token token) { + String name = token.getText().toLowerCase(); + return "p".equals(name) ; + } + + public String healingParagraphMarkup() throws TokenStreamException{ int i = 0; Token token; do { i++; token = LT(i); if (token.getType() == ALPHANUMERICWORD) { - if("p".equals(token.getText())) { - return SEAMTEXT_PARAGRAPH; + if(isParagraph(token) || isList(token)) { + return BLANK_LINE; } else if(isHeader(token)) { return "\n"; } @@ -231,9 +236,9 @@ Token parent = htmlElementStack.peek(); String parentName = parent.getText().toLowerCase(); if(parentName.equals("ul")) { + seamText = SEAMTEXT_EQ; + } else if (parentName.equals("ol")){ seamText = SEAMTEXT_HASH; - } else if (parentName.equals("ol")){ - seamText = SEAMTEXT_EQ; } else { String message = "<li> must follow <ol> or <ul> not <" + parent.getText() + ">"; throw new SemanticException( message, parent.getFilename(), parent.getLine(), parent.getColumn()); @@ -244,20 +249,25 @@ public boolean isPlainHMTLRequired(Token name, java.util.Stack <Token> htmlElementStack) throws SemanticException { boolean required = false; - if(!htmlElementStack.isEmpty()) { - for(Token token : htmlElementStack) { - if(token.getText().equals("h1") || token.getText().equals("h2") || token.getText().equals("h3") - || token.getText().equals("h4") || token.getText().equals("li")) { - required = true; - } - } + + if(!isSeamTextElement(name)) { + return true; } - - return required; + + if(!htmlElementStack.isEmpty() && !"a".equals(name.getText().toLowerCase()) && !"p".equals(name.getText().toLowerCase())) { + for(Token token : htmlElementStack) { + if(token.getText().equals("h1") || token.getText().equals("h2") || token.getText().equals("h3") + || token.getText().equals("h4") || token.getText().equals("li")) { + return true; + } + } + } + + return false; } - public String createSimpleSeamText(Token token) throws SemanticException,TokenStreamException{ + public String getSimpleSeamText(Token token) throws SemanticException,TokenStreamException{ String name = token.getText().toLowerCase(); StringBuilder seamText = new StringBuilder(); @@ -274,14 +284,9 @@ seamText.append(SEAMTEXT_UNDERSCORE); } else if("pre".equals(name)) { seamText.append(SEAMTEXT_BACKTICK); - } else if("p".equals(name)) { - seamText.append(getSeamParagraphMarkup()); } else if("q".equals(name)) { seamText.append(SEAM_DOUBLEQUOTE); - } else if("blockquote".equals(name)) { - seamText.append(SEAM_DOUBLEQUOTE); - } - + } return seamText.toString(); } @@ -330,24 +335,7 @@ String name = element.getText().toLowerCase(); return formattedHtmlSeamTextElements.contains(name); } - - public void validateFormattedHtmlSeamText(Token token) { - - Token token; - int next = 0; - - do { - next++; - token = LT(next); - - - - } while (token.getType() != EOF); - - } - - public void validateSimpleHtmlSeamText(Token token) { - } + } @@ -413,7 +401,7 @@ if(!isSeamTextElement(token)) { append(s.getText()); } - } + } } ; @@ -433,34 +421,39 @@ { Token token = htmlElementStack.peek(); boolean isLink = isLink(token); - linkValueCollector = new StringBuilder(); + } ( seamCharacters| { - if(isLink) { - beginCapture(); - } - + beginCapture(); } plain { - if(isLink) { - String plain = endCapture(); - linkValueCollector.append(plain); - } + String plain = endCapture(); + if(valueCollector == null) { + valueCollector = new StringBuilder(); + } + valueCollector.append(plain); } |html - |htmlSpecialChars + | { + append(valueCollector.toString()); + valueCollector=null; + } + htmlSpecialChars + { if(isLink) { String message = "unexpected token"; throw new SemanticException(message); } + + } |NEWLINE )*) @@ -473,18 +466,40 @@ sanitizer.validateHtmlElement(name); Token token = null; - - if (isFormattedHtmlSeamTextElement(name) && !isPlainHMTLRequired(name, htmlElementStack)) { - if (isListItem(name)) { - append(createSeamTextList(name, htmlElementStack)); - } else if (isHeader(name)) { - append(createSeamTextHeader(name)); + + if (isFormattedHtmlSeamTextElement(name)) { + if(!isPlainHMTLRequired(name, htmlElementStack)) { + if (isListItem(name)) { + append(createSeamTextList(name, htmlElementStack)); + }else if (isHeader(name)) { + append(createSeamTextHeader(name)); + } + if(valueCollector != null) { + append(valueCollector.toString().trim()); + valueCollector = null; + } + } else { + if(valueCollector != null) { + append(valueCollector.toString().trim()); + valueCollector = null; + } + append("<"); + append(name.getText()); } - + + } else if(isSimpleSeamTextElement(name)){ - createSimpleSeamText(name) + if(valueCollector != null) { + append(valueCollector.toString()); + valueCollector = null; + } + append(getSimpleSeamText(name)); } else { - append("<"); + if(valueCollector != null) { + append(valueCollector.toString().trim()); + valueCollector = null; + } + append("<"); append(name.getText()); } @@ -506,9 +521,10 @@ beforeBody: GT { Token name = htmlElementStack.pop(); - if(!isSimpleSeamTextElement && !isPlainHMTLRequired(name,htmlElementStack)) { + if((isFormattedHtmlSeamTextElement(name) && isPlainHMTLRequired(name,htmlElementStack)) || !isSeamTextElement(name)) { append(">"); - } + } + htmlElementStack.push(name); } ; @@ -527,39 +543,52 @@ LT SLASH name:ALPHANUMERICWORD GT { htmlElementStack.pop(); - - if(isSimpleSeamTextElement(name)) { - append(createSimpleSeamText(name)); + String value = ""; + if(valueCollector != null) { + value = valueCollector.toString(); } - - if(isFormattedSeamTextElement) { + + if(isFormattedHtmlSeamTextElement(name)) { if(isLink(name)){ - append(createSeamTextLink(linkHolder,linkValueCollector.toString().trim())); + append(createSeamTextLink(linkHolder,value.trim())); + } else if(isParagraph(name)) { + append(value); + append(healingParagraphMarkup()); + }else { + append(value.trim()); } - + if(!isPlainHMTLRequired(name, htmlElementStack)) { - - if(isHeader(name)) { + if(isHeader(name)) { append("\n"); - healingHeaderMarkup(htmlElementStack); + healingHeaderMarkup(); } + + if(isList(name)) { + append("\n"); + } if(isListItem(name)){ append("\n"); } - } else { append("</"); - append(name.getText()); + append(name.getText()); append(">"); } - } else { + } else if(isSimpleSeamTextElement(name)) { + append(value.trim()); + append(getSimpleSeamText(name)); + } else { + append(value); append("</"); append(name.getText()); append(">"); } + valueCollector = null; + } ;

17 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r11099 - in trunk/framework/jsf-test: src/main/java/org/richfaces and 5 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2008-11-12 02:15:09 -0500 (Wed, 12 Nov 2008) New Revision: 11099 Added: trunk/framework/jsf-test/src/main/resources/org/richfaces/test/ajax-web.xml trunk/framework/jsf-test/src/test/java/org/richfaces/test/staging/ Removed: trunk/framework/jsf-test/src/main/java/org/richfaces/collections/ trunk/framework/jsf-test/src/test/java/org/richfaces/test/stub/ Modified: trunk/framework/jsf-test/pom.xml trunk/framework/jsf-test/src/main/java/org/richfaces/test/AbstractFacesTest.java trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/FilterContainer.java trunk/framework/jsf-test/src/test/java/org/richfaces/test/staging/ServerResourcePathTest.java trunk/framework/jsf-test/src/test/java/org/richfaces/test/staging/ServerResourceTest.java trunk/framework/jsf-test/src/test/java/org/richfaces/test/staging/ServletTest.java Log: Add ajax4jsf filter check. Modified: trunk/framework/jsf-test/pom.xml =================================================================== --- trunk/framework/jsf-test/pom.xml 2008-11-12 02:11:00 UTC (rev 11098) +++ trunk/framework/jsf-test/pom.xml 2008-11-12 07:15:09 UTC (rev 11099) @@ -21,16 +21,16 @@ <artifactId>htmlunit</artifactId> <version>2.3</version> </dependency> - <dependency> - <groupId>javax.faces</groupId> + <dependency> + <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> + <artifactId>jsf-impl</artifactId> - <version>1.2_10</version> + <version>1.2_10</version> - <scope>provided</scope> - </dependency> - <dependency> + <scope>provided</scope> + </dependency> + <dependency> <groupId>el-impl</groupId> <artifactId>el-impl</artifactId> <version>1.0</version> 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-12 02:11:00 UTC (rev 11098) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/AbstractFacesTest.java 2008-11-12 07:15:09 UTC (rev 11099) @@ -20,9 +20,13 @@ import javax.faces.lifecycle.Lifecycle; import javax.faces.lifecycle.LifecycleFactory; import javax.faces.webapp.FacesServlet; +import javax.servlet.Filter; import org.junit.After; import org.junit.Before; +import org.richfaces.test.staging.FilterContainer; +import org.richfaces.test.staging.RequestChain; +import org.richfaces.test.staging.ServletContainer; /** * @author asmirnov @@ -67,22 +71,37 @@ } } facesServer = new StagingServer(); - facesServer.addServlet("*.jsf", new FacesServlet()); - facesServer.addResource("/WEB-INF/web.xml", - "org/richfaces/test/web.xml"); + ServletContainer facesServletContainer = new ServletContainer("*.jsf", new FacesServlet()); + facesServletContainer.setName("Faces Servlet"); + try { + // Check for an ajax4jsf filter. + Class<? extends Filter> ajaxFilterClass = contextClassLoader + .loadClass("org.ajax4jsf.Filter") + .asSubclass(Filter.class); + Filter ajaxFilter = ajaxFilterClass.newInstance(); + FilterContainer filterContainer = new FilterContainer(ajaxFilter,facesServletContainer); + filterContainer.setName("ajax4jsf"); + facesServer.addResource("/WEB-INF/web.xml", + "org/richfaces/test/ajax-web.xml"); + facesServer.addServlet(filterContainer); + } catch (ClassNotFoundException e) { + // No Richfaces filter, uses servlet directly. + facesServer.addResource("/WEB-INF/web.xml", + "org/richfaces/test/web.xml"); + facesServer.addServlet(facesServletContainer); + } facesServer.addInitParameter( StateManager.STATE_SAVING_METHOD_PARAM_NAME, StateManager.STATE_SAVING_METHOD_SERVER); facesServer.addInitParameter(ViewHandler.DEFAULT_SUFFIX_PARAM_NAME, ".xhtml"); - facesServer.addInitParameter("com.sun.faces.validateXml", "true"); - facesServer.addInitParameter("com.sun.faces.verifyObjects", "true"); EventListener listener = null; try { Class<? extends EventListener> listenerClass = contextClassLoader .loadClass("com.sun.faces.config.ConfigureListener") .asSubclass(EventListener.class); listener = listenerClass.newInstance(); + setupSunFaces(); } catch (ClassNotFoundException e) { // No JSF RI listener Class<? extends EventListener> listenerClass; @@ -92,6 +111,7 @@ "org.apache.myfaces.webapp.StartupServletContextListener") .asSubclass(EventListener.class); listener = listenerClass.newInstance(); + setupMyFaces(); } catch (ClassNotFoundException e1) { throw new TestException("No JSF listeners have been found", e1); } catch (Exception e2) { @@ -105,6 +125,15 @@ facesServer.init(); } + protected void setupMyFaces() { + // Do nothing by default. + } + + protected void setupSunFaces() { + facesServer.addInitParameter("com.sun.faces.validateXml", "true"); + facesServer.addInitParameter("com.sun.faces.verifyObjects", "true"); + } + protected void setupWebContent(StagingServer facesServer){ } 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-12 02:11:00 UTC (rev 11098) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/FilterContainer.java 2008-11-12 07:15:09 UTC (rev 11099) @@ -34,6 +34,14 @@ this.initParameters = new HashMap<String, String>(); } + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + public void execute(ServletRequest request, ServletResponse response) throws ServletException, IOException { FilterChain chain = new FilterChain(){ Added: trunk/framework/jsf-test/src/main/resources/org/richfaces/test/ajax-web.xml =================================================================== --- trunk/framework/jsf-test/src/main/resources/org/richfaces/test/ajax-web.xml (rev 0) +++ trunk/framework/jsf-test/src/main/resources/org/richfaces/test/ajax-web.xml 2008-11-12 07:15:09 UTC (rev 11099) @@ -0,0 +1,71 @@ +<?xml version='1.0' encoding='UTF-8'?> + +<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + + <display-name>Stub test</display-name> + <description> + Stub testing server + </description> + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>server</param-value> + </context-param> + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + <context-param> + <description> + Set this flag to true if you want the JavaServer Faces + Reference Implementation to validate the XML in your + faces-config.xml resources against the DTD. Default + value is false. + </description> + <param-name>com.sun.faces.validateXml</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <description> + Set this flag to true if you want the JavaServer Faces + Reference Implementation to verify that all of the application + objects you have configured (components, converters, + renderers, and validators) can be successfully created. + Default value is false. + </description> + <param-name>com.sun.faces.verifyObjects</param-name> + <param-value>true</param-value> + </context-param> + <filter> + <display-name>Ajax4jsf Filter</display-name> + <filter-name>ajax4jsf</filter-name> + <filter-class>org.ajax4jsf.Filter</filter-class> + </filter> + <filter-mapping> + <filter-name>ajax4jsf</filter-name> + <servlet-name>Faces Servlet</servlet-name> + <dispatcher>REQUEST</dispatcher> + <dispatcher>FORWARD</dispatcher> + <dispatcher>INCLUDE</dispatcher> + <dispatcher>ERROR</dispatcher> + </filter-mapping> + +  + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + </servlet> + + +  + + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + + +</web-app> + + Property changes on: trunk/framework/jsf-test/src/main/resources/org/richfaces/test/ajax-web.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Copied: trunk/framework/jsf-test/src/test/java/org/richfaces/test/staging (from rev 11098, trunk/framework/jsf-test/src/test/java/org/richfaces/test/stub) Modified: trunk/framework/jsf-test/src/test/java/org/richfaces/test/staging/ServerResourcePathTest.java =================================================================== --- trunk/framework/jsf-test/src/test/java/org/richfaces/test/stub/ServerResourcePathTest.java 2008-11-12 02:11:00 UTC (rev 11098) +++ trunk/framework/jsf-test/src/test/java/org/richfaces/test/staging/ServerResourcePathTest.java 2008-11-12 07:15:09 UTC (rev 11099) @@ -1,7 +1,7 @@ /** * */ -package org.richfaces.test.stub; +package org.richfaces.test.staging; import static org.junit.Assert.*; Modified: trunk/framework/jsf-test/src/test/java/org/richfaces/test/staging/ServerResourceTest.java =================================================================== --- trunk/framework/jsf-test/src/test/java/org/richfaces/test/stub/ServerResourceTest.java 2008-11-12 02:11:00 UTC (rev 11098) +++ trunk/framework/jsf-test/src/test/java/org/richfaces/test/staging/ServerResourceTest.java 2008-11-12 07:15:09 UTC (rev 11099) @@ -1,7 +1,7 @@ /** * */ -package org.richfaces.test.stub; +package org.richfaces.test.staging; import static org.junit.Assert.*; Modified: trunk/framework/jsf-test/src/test/java/org/richfaces/test/staging/ServletTest.java =================================================================== --- trunk/framework/jsf-test/src/test/java/org/richfaces/test/stub/ServletTest.java 2008-11-12 02:11:00 UTC (rev 11098) +++ trunk/framework/jsf-test/src/test/java/org/richfaces/test/staging/ServletTest.java 2008-11-12 07:15:09 UTC (rev 11099) @@ -1,4 +1,4 @@ -package org.richfaces.test.stub; +package org.richfaces.test.staging; import static org.junit.Assert.*;

17 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r11098 - in trunk/framework/jsf-test/src: main/java/org/richfaces/test and 4 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2008-11-11 21:11:00 -0500 (Tue, 11 Nov 2008) New Revision: 11098 Added: trunk/framework/jsf-test/src/test/resources/org/richfaces/test/faces-config.xml Removed: trunk/framework/jsf-test/src/main/java/org/richfaces/collections/base/ trunk/framework/jsf-test/src/main/java/org/richfaces/collections/collect/ trunk/framework/jsf-test/src/main/resources/org/richfaces/test/faces-config.xml Modified: trunk/framework/jsf-test/src/main/java/org/richfaces/test/AbstractFacesTest.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/test/java/org/richfaces/test/FacesServerTest.java Log: Fix teste with JSF 1.2 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-12 01:28:07 UTC (rev 11097) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/AbstractFacesTest.java 2008-11-12 02:11:00 UTC (rev 11098) @@ -70,8 +70,6 @@ facesServer.addServlet("*.jsf", new FacesServlet()); facesServer.addResource("/WEB-INF/web.xml", "org/richfaces/test/web.xml"); - facesServer.addResource("/WEB-INF/faces-config.xml", - "org/richfaces/test/faces-config.xml"); facesServer.addInitParameter( StateManager.STATE_SAVING_METHOD_PARAM_NAME, StateManager.STATE_SAVING_METHOD_SERVER); 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-12 01:28:07 UTC (rev 11097) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingHttpRequest.java 2008-11-12 02:11:00 UTC (rev 11098) @@ -7,6 +7,7 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.security.Principal; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Enumeration; @@ -17,15 +18,8 @@ import javax.servlet.RequestDispatcher; import javax.servlet.ServletInputStream; -import javax.servlet.ServletRequestListener; -import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import org.richfaces.collections.collect.ImmutableCollection; -import org.richfaces.collections.collect.ImmutableList; -import org.richfaces.collections.collect.Multimap; -import org.richfaces.collections.collect.Multimaps; import org.richfaces.test.ServerLogger; /** @@ -255,7 +249,7 @@ * @see javax.servlet.ServletRequest#getCharacterEncoding() */ public String getCharacterEncoding() { - return UTF8; + return characterEncoding; } /* @@ -324,7 +318,7 @@ return Locale.US; } - private final ImmutableCollection<Locale> locales = ImmutableList.of( + private Collection<Locale> locales = Arrays.asList( Locale.US, Locale.GERMANY); /* @@ -337,7 +331,7 @@ return Collections.enumeration(locales); } - private String characterEncoding; + private String characterEncoding = UTF8; /* * (non-Javadoc) 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-12 01:28:07 UTC (rev 11097) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingHttpResponse.java 2008-11-12 02:11:00 UTC (rev 11098) @@ -17,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.httpclient.HttpStatus; +import org.junit.internal.matchers.SubstringMatcher; import org.richfaces.test.ServerLogger; /** @@ -399,7 +400,19 @@ * @see javax.servlet.ServletResponse#setContentType(java.lang.String) */ public void setContentType(String type) { - contentType = type; + if(null == type){ + throw new NullPointerException(); + } + int i = type.indexOf(';'); + if(i>=0){ + contentType = type.substring(0, i).trim(); + i=type.lastIndexOf('='); + if(i>=0){ + setCharacterEncoding(type.substring(i+1).trim()); + } + } else { + contentType = type; + } } /* Deleted: trunk/framework/jsf-test/src/main/resources/org/richfaces/test/faces-config.xml =================================================================== --- trunk/framework/jsf-test/src/main/resources/org/richfaces/test/faces-config.xml 2008-11-12 01:28:07 UTC (rev 11097) +++ trunk/framework/jsf-test/src/main/resources/org/richfaces/test/faces-config.xml 2008-11-12 02:11:00 UTC (rev 11098) @@ -1,68 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> - - - -<faces-config xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd" - version="1.2"> -  - <managed-bean> - <managed-bean-name>HelloBean</managed-bean-name> - <managed-bean-class>org.richfaces.test.HelloBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - -  - <navigation-rule> - <from-view-id>/hello.xhtml</from-view-id> - <navigation-case> - <from-outcome>success</from-outcome> - <to-view-id>/response.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - -  - <navigation-rule> - <from-view-id>/response.xhtml</from-view-id> - <navigation-case> - <from-outcome>success</from-outcome> - <to-view-id>/hello.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - -</faces-config> Modified: trunk/framework/jsf-test/src/test/java/org/richfaces/test/FacesServerTest.java =================================================================== --- trunk/framework/jsf-test/src/test/java/org/richfaces/test/FacesServerTest.java 2008-11-12 01:28:07 UTC (rev 11097) +++ trunk/framework/jsf-test/src/test/java/org/richfaces/test/FacesServerTest.java 2008-11-12 02:11:00 UTC (rev 11098) @@ -49,6 +49,8 @@ @Override protected void setupWebContent(StagingServer facesServer) { + facesServer.addResource("/WEB-INF/faces-config.xml", + "org/richfaces/test/faces-config.xml"); facesServer.addResource("/hello.xhtml", "org/richfaces/test/hello.xhtml"); facesServer.addResource("/response.xhtml", "org/richfaces/test/response.xhtml"); facesServer.addResource("/wave.med.gif", "org/richfaces/test/wave.med.gif"); Added: trunk/framework/jsf-test/src/test/resources/org/richfaces/test/faces-config.xml =================================================================== --- trunk/framework/jsf-test/src/test/resources/org/richfaces/test/faces-config.xml (rev 0) +++ trunk/framework/jsf-test/src/test/resources/org/richfaces/test/faces-config.xml 2008-11-12 02:11:00 UTC (rev 11098) @@ -0,0 +1,72 @@ +<?xml version='1.0' encoding='UTF-8'?> + + + +<faces-config xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd" + version="1.2"> + <application> +  + <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> + </application> +  + <managed-bean> + <managed-bean-name>HelloBean</managed-bean-name> + <managed-bean-class>org.richfaces.test.HelloBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + +  + <navigation-rule> + <from-view-id>/hello.xhtml</from-view-id> + <navigation-case> + <from-outcome>success</from-outcome> + <to-view-id>/response.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + +  + <navigation-rule> + <from-view-id>/response.xhtml</from-view-id> + <navigation-case> + <from-outcome>success</from-outcome> + <to-view-id>/hello.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + +</faces-config> Property changes on: trunk/framework/jsf-test/src/test/resources/org/richfaces/test/faces-config.xml ___________________________________________________________________ Name: svn:mime-type + text/plain

17 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r11097 - in trunk/framework/jsf-test: src/main/java/org/richfaces/test and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2008-11-11 20:28:07 -0500 (Tue, 11 Nov 2008) New Revision: 11097 Modified: trunk/framework/jsf-test/pom.xml trunk/framework/jsf-test/src/main/java/org/richfaces/test/AbstractFacesTest.java trunk/framework/jsf-test/src/main/resources/org/richfaces/test/faces-config.xml Log: switch to jsf 1.2 Modified: trunk/framework/jsf-test/pom.xml =================================================================== --- trunk/framework/jsf-test/pom.xml 2008-11-12 01:00:39 UTC (rev 11096) +++ trunk/framework/jsf-test/pom.xml 2008-11-12 01:28:07 UTC (rev 11097) @@ -3,32 +3,34 @@ <parent> <artifactId>framework</artifactId> <groupId>org.richfaces</groupId> - <version>4.0.0-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <artifactId>jsf-test</artifactId> <name>jsf-test</name> - <version>4.0.0-SNAPSHOT</version> - <url>http://maven.apache.org</url> + <version>3.3.0-SNAPSHOT</version> <dependencies> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.5</version> - <scope>test</scope> </dependency> <dependency> <groupId>net.sourceforge.htmlunit</groupId> <artifactId>htmlunit</artifactId> <version>2.3</version> </dependency> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>mojarra-jsf-impl</artifactId> - <version>2.0.0-SNAPSHOT</version> - </dependency> - <dependency> + <dependency> + <groupId>javax.faces</groupId> + + <artifactId>jsf-impl</artifactId> + + <version>1.2_10</version> + + <scope>provided</scope> + </dependency> + <dependency> <groupId>el-impl</groupId> <artifactId>el-impl</artifactId> <version>1.0</version> 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-12 01:00:39 UTC (rev 11096) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/AbstractFacesTest.java 2008-11-12 01:28:07 UTC (rev 11097) @@ -51,7 +51,7 @@ contextClassLoader = Thread.currentThread().getContextClassLoader(); Thread.currentThread().setContextClassLoader( this.getClass().getClassLoader()); - InputStream stream = FacesServerTest.class + InputStream stream = this.getClass() .getResourceAsStream("logging.properties"); if (null != stream) { try { Modified: trunk/framework/jsf-test/src/main/resources/org/richfaces/test/faces-config.xml =================================================================== --- trunk/framework/jsf-test/src/main/resources/org/richfaces/test/faces-config.xml 2008-11-12 01:00:39 UTC (rev 11096) +++ trunk/framework/jsf-test/src/main/resources/org/richfaces/test/faces-config.xml 2008-11-12 01:28:07 UTC (rev 11097) @@ -38,9 +38,8 @@ <faces-config xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" - version="2.0"> - + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd" + version="1.2">  <managed-bean> <managed-bean-name>HelloBean</managed-bean-name>

17 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r11096 - trunk/framework.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2008-11-11 20:00:39 -0500 (Tue, 11 Nov 2008) New Revision: 11096 Added: trunk/framework/jsf-test/ Log: copy JSF 2.0 test framework into trunk Copied: trunk/framework/jsf-test (from rev 11095, branches/jsf2.0/framework/jsf-test)

17 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r11095 - in branches/jsf2.0/framework/jsf-test/src: main/java/org/richfaces/test/staging and 4 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2008-11-11 19:43:49 -0500 (Tue, 11 Nov 2008) New Revision: 11095 Added: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/AbstractFacesTest.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/EventInvoker.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/StagingConnection.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/StagingServer.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ClasspathServerResource.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/FilterContainer.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/NotImplementedException.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/RequestChain.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerResource.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerResourcePath.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerResourcesDirectory.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServletContainer.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingHttpRequest.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingHttpResponse.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingHttpSession.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingServletContext.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StaticServlet.java branches/jsf2.0/framework/jsf-test/src/main/resources/org/richfaces/test/faces-config.xml branches/jsf2.0/framework/jsf-test/src/main/resources/org/richfaces/test/web.xml branches/jsf2.0/framework/jsf-test/src/test/resources/org/richfaces/test/response.xhtml branches/jsf2.0/framework/jsf-test/src/test/resources/org/richfaces/test/wave.med.gif Removed: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/LocalServer.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/ServerConnection.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ClasspathServerResource.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerResource.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerResourcePath.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerResourcesDirectory.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServletContainer.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StaticServlet.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StubHttpRequest.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StubHttpResponse.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StubHttpSession.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StubServletConfig.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StubServletContext.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/stub/ branches/jsf2.0/framework/jsf-test/src/test/resources/org/richfaces/test/faces-config.xml branches/jsf2.0/framework/jsf-test/src/test/resources/org/richfaces/test/web.xml Modified: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/LocalWebClient.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/LocalWebConnection.java branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/LocalWebResponse.java branches/jsf2.0/framework/jsf-test/src/test/java/org/richfaces/test/FacesServerTest.java branches/jsf2.0/framework/jsf-test/src/test/java/org/richfaces/test/stub/ServerResourcePathTest.java branches/jsf2.0/framework/jsf-test/src/test/java/org/richfaces/test/stub/ServerResourceTest.java branches/jsf2.0/framework/jsf-test/src/test/java/org/richfaces/test/stub/ServletTest.java Log: Finish test framework implementation Added: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/AbstractFacesTest.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/AbstractFacesTest.java (rev 0) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/AbstractFacesTest.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -0,0 +1,159 @@ +/** + * + */ +package org.richfaces.test; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.EventListener; +import java.util.logging.LogManager; + +import javax.faces.FactoryFinder; +import javax.faces.application.Application; +import javax.faces.application.ApplicationFactory; +import javax.faces.application.StateManager; +import javax.faces.application.ViewHandler; +import javax.faces.component.UIViewRoot; +import javax.faces.context.FacesContext; +import javax.faces.context.FacesContextFactory; +import javax.faces.lifecycle.Lifecycle; +import javax.faces.lifecycle.LifecycleFactory; +import javax.faces.webapp.FacesServlet; + +import org.junit.After; +import org.junit.Before; + +/** + * @author asmirnov + * + */ +public abstract class AbstractFacesTest { + + private ClassLoader contextClassLoader; + + protected StagingServer facesServer; + + protected StagingConnection connection; + + protected FacesContext facesContext; + + protected Lifecycle lifecycle; + + protected Application application; + + + /** + * @throws java.lang.Exception + */ + @Before + public void setUpServer() throws Exception { + contextClassLoader = Thread.currentThread().getContextClassLoader(); + Thread.currentThread().setContextClassLoader( + this.getClass().getClassLoader()); + InputStream stream = FacesServerTest.class + .getResourceAsStream("logging.properties"); + if (null != stream) { + try { + LogManager.getLogManager().readConfiguration(stream); + } catch (Exception e) { + // Ignore it. + } finally { + try { + stream.close(); + } catch (IOException e) { + // Ignore it. + } + } + } + facesServer = new StagingServer(); + facesServer.addServlet("*.jsf", new FacesServlet()); + facesServer.addResource("/WEB-INF/web.xml", + "org/richfaces/test/web.xml"); + facesServer.addResource("/WEB-INF/faces-config.xml", + "org/richfaces/test/faces-config.xml"); + facesServer.addInitParameter( + StateManager.STATE_SAVING_METHOD_PARAM_NAME, + StateManager.STATE_SAVING_METHOD_SERVER); + facesServer.addInitParameter(ViewHandler.DEFAULT_SUFFIX_PARAM_NAME, + ".xhtml"); + facesServer.addInitParameter("com.sun.faces.validateXml", "true"); + facesServer.addInitParameter("com.sun.faces.verifyObjects", "true"); + EventListener listener = null; + try { + Class<? extends EventListener> listenerClass = contextClassLoader + .loadClass("com.sun.faces.config.ConfigureListener") + .asSubclass(EventListener.class); + listener = listenerClass.newInstance(); + } catch (ClassNotFoundException e) { + // No JSF RI listener + Class<? extends EventListener> listenerClass; + try { + listenerClass = contextClassLoader + .loadClass( + "org.apache.myfaces.webapp.StartupServletContextListener") + .asSubclass(EventListener.class); + listener = listenerClass.newInstance(); + } catch (ClassNotFoundException e1) { + throw new TestException("No JSF listeners have been found", e1); + } catch (Exception e2) { + throw new TestException("Error instantiate MyFaces listener", e2); + } + } catch (Exception e) { + throw new TestException("Error instantiate JSF RI listener", e); + } + facesServer.addWebListener(listener); + setupWebContent(facesServer); + facesServer.init(); + } + + protected void setupWebContent(StagingServer facesServer){ + + } + + + + protected void setupFacesRequest() throws Exception { + connection = facesServer.getConnection(new URL("http://localhost/index.jsf")); + setupConnection(connection); + connection.start(); + ApplicationFactory applicationFactory = (ApplicationFactory) FactoryFinder.getFactory(FactoryFinder.APPLICATION_FACTORY); + application = applicationFactory.getApplication(); + LifecycleFactory lifecycleFactory = (LifecycleFactory) FactoryFinder.getFactory(FactoryFinder.LIFECYCLE_FACTORY); + lifecycle = lifecycleFactory.getLifecycle(LifecycleFactory.DEFAULT_LIFECYCLE); + FacesContextFactory facesContextFactory = (FacesContextFactory) FactoryFinder.getFactory(FactoryFinder.FACES_CONTEXT_FACTORY); + facesContext = facesContextFactory.getFacesContext(facesServer.getContext(), connection.getRequest(), connection.getResponse(), lifecycle); + facesContext.setViewRoot(setupView()); + } + + protected UIViewRoot setupView() { + return null; + } + + protected void setupConnection(StagingConnection connection) { + + } + + /** + * @throws java.lang.Exception + */ + @After + public void tearDownServer() throws Exception { + if(null != facesContext){ + facesContext.release(); + facesContext = null; + } + if(null != connection){ + if(!connection.isFinished()){ + connection.finish(); + } + connection = null; + } + facesServer.destroy(); + Thread.currentThread().setContextClassLoader(contextClassLoader); + facesServer = null; + application = null; + lifecycle = null; + } + +} Property changes on: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/AbstractFacesTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/EventInvoker.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/EventInvoker.java (rev 0) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/EventInvoker.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -0,0 +1,10 @@ +/** + * + */ +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 Property changes on: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/EventInvoker.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/LocalServer.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/LocalServer.java 2008-11-11 20:12:38 UTC (rev 11094) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/LocalServer.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -1,234 +0,0 @@ -package org.richfaces.test; - -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.http.HttpSession; -import javax.servlet.http.HttpSessionAttributeListener; -import javax.servlet.http.HttpSessionBindingEvent; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; - -import org.richfaces.test.stub.ClasspathServerResource; -import org.richfaces.test.stub.ServerResource; -import org.richfaces.test.stub.ServerResourcePath; -import org.richfaces.test.stub.ServerResourcesDirectory; -import org.richfaces.test.stub.ServletContainer; -import org.richfaces.test.stub.StaticServlet; -import org.richfaces.test.stub.StubHttpSession; -import org.richfaces.test.stub.StubServletContext; - - -/** - * Hello world! - * - */ -public class LocalServer { - - - private List<ServletContainer> servlets = new ArrayList<ServletContainer>(); - - private ServletContainer 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 StubServletContext{ - - @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 StubServletContext context; - - private class ServerHttpSession extends StubHttpSession { - - public ServletContext getServletContext() { - return context; - } - - @Override - protected void valueBound(HttpSessionBindingEvent sessionBindingEvent) { - // inform session listeners. - for (EventListener listener : contextListeners) { - if (listener instanceof HttpSessionAttributeListener) { - HttpSessionAttributeListener contextListener = (HttpSessionAttributeListener) listener; - contextListener.attributeAdded(sessionBindingEvent); - } - } - } - - @Override - protected void valueUnbound(HttpSessionBindingEvent sessionBindingEvent) { - // inform session listeners. - for (EventListener listener : contextListeners) { - if (listener instanceof HttpSessionAttributeListener) { - HttpSessionAttributeListener contextListener = (HttpSessionAttributeListener) listener; - contextListener.attributeRemoved(sessionBindingEvent); - } - } - } - - } - - private ServerHttpSession session; - - - public void addServlet(String mapping,Servlet servlet){ - servlets.add(new ServletContainer(mapping,servlet)); - } - - public ServletContainer getServlet(String path) { - ServletContainer result = defaultServlet; - for (ServletContainer servlet : servlets) { - if(servlet.isApplicable(path)){ - result = servlet; - break; - } - } - 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 addWebListener(EventListener listener) { - contextListeners.add(listener); - } - - public HttpSession getSession(){ - return getSession(true); - } - - public HttpSession getSession(boolean create){ - if(null == this.session && create){ - this.session = new ServerHttpSession(); - // inform session listeners. - for (EventListener listener : contextListeners) { - if (listener instanceof HttpSessionListener) { - HttpSessionListener contextListener = (HttpSessionListener) listener; - contextListener.sessionCreated(new HttpSessionEvent(session)); - } - } - } - return session; - } - - public void init() throws ServletException { - // Create context. - this.context = new LocalContext(); - // Create init parameters - context.addInitParameters(initParameters); - // Inform listeners - for (EventListener listener : contextListeners) { - if (listener instanceof ServletContextListener) { - ServletContextListener contextListener = (ServletContextListener) listener; - contextListener.contextInitialized(new ServletContextEvent(context)); - - } - } - // Init servlets - for (ServletContainer servlet : servlets) { - // init servlet - servlet.init(this.context); - } - defaultServlet = new ServletContainer(null,new StaticServlet()); - defaultServlet.init(getContext()); - - } - - public void destroy(){ - // Destroy session - if (null != this.session) { - // inform session listeners. - for (EventListener listener : contextListeners) { - if (listener instanceof HttpSessionListener) { - HttpSessionListener contextListener = (HttpSessionListener) listener; - contextListener.sessionDestroyed(new HttpSessionEvent(session)); - } - } - session.destroy(); - } - // Inform listeners - for (EventListener listener : contextListeners) { - if (listener instanceof ServletContextListener) { - ServletContextListener contextListener = (ServletContextListener) listener; - contextListener.contextDestroyed(new ServletContextEvent(context)); - - } - } - // Destroy servlets - for (ServletContainer servlet : servlets) { - servlet.destroy(); - } - defaultServlet.destroy(); - } - - public ServerConnection getConnection(URL url) { - return new ServerConnection(this,url); - } - - public StubServletContext getContext() { - return context; - } -} Modified: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/LocalWebClient.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/LocalWebClient.java 2008-11-11 20:12:38 UTC (rev 11094) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/LocalWebClient.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -14,14 +14,14 @@ @SuppressWarnings("serial") public class LocalWebClient extends WebClient { - private final LocalServer server; + private final StagingServer server; private transient WebConnection webConnection; /** * */ - public LocalWebClient(LocalServer server) { + public LocalWebClient(StagingServer server) { super(); this.server = server; } @@ -29,7 +29,7 @@ /** * @param browserVersion */ - public LocalWebClient(LocalServer server,BrowserVersion browserVersion) { + public LocalWebClient(StagingServer server,BrowserVersion browserVersion) { super(browserVersion); this.server = server; } Modified: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/LocalWebConnection.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/LocalWebConnection.java 2008-11-11 20:12:38 UTC (rev 11094) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/LocalWebConnection.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -7,23 +7,28 @@ import javax.servlet.ServletException; +import org.apache.commons.httpclient.NameValuePair; + import com.gargoylesoftware.htmlunit.WebConnection; import com.gargoylesoftware.htmlunit.WebRequestSettings; import com.gargoylesoftware.htmlunit.WebResponse; public final class LocalWebConnection implements WebConnection { - private final LocalServer localServer; + private final StagingServer localServer; /** * @param localServer */ - public LocalWebConnection(LocalServer localServer) { + public LocalWebConnection(StagingServer localServer) { this.localServer = localServer; } public WebResponse getResponse(WebRequestSettings settings) throws IOException { - ServerConnection connection = localServer.getConnection(settings.getUrl()); + StagingConnection connection = localServer.getConnection(settings.getUrl()); + for (NameValuePair param : settings.getRequestParameters()) { + connection.addRequestParameter(param.getName(), param.getValue()); + } try { connection.execute(); } catch (ServletException e) { Modified: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/LocalWebResponse.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/LocalWebResponse.java 2008-11-11 20:12:38 UTC (rev 11094) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/LocalWebResponse.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -18,9 +18,9 @@ public final class LocalWebResponse implements WebResponse { private final WebRequestSettings settings; - private final ServerConnection serverConnection; + private final StagingConnection serverConnection; - public LocalWebResponse(WebRequestSettings settings,ServerConnection serverConnection) { + public LocalWebResponse(WebRequestSettings settings,StagingConnection serverConnection) { this.settings = settings; this.serverConnection = serverConnection; } Deleted: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/ServerConnection.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/ServerConnection.java 2008-11-11 20:12:38 UTC (rev 11094) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/ServerConnection.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -1,355 +0,0 @@ -/** - * - */ -package org.richfaces.test; - -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URL; -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 javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -import org.richfaces.test.stub.ServletContainer; -import org.richfaces.test.stub.StubHttpRequest; -import org.richfaces.test.stub.StubHttpResponse; -import org.richfaces.test.stub.StubServletContext; - -import com.gargoylesoftware.htmlunit.WebRequestSettings; -import com.gargoylesoftware.htmlunit.WebResponse; - -/** - * This class represent single connection to the server. - * - * @author asmirnov - * - */ -public class ServerConnection { - - private final LocalServer server; - - final URL url; - - private ConnectionRequest request; - - ConnectionResponse response; - - private final ServletContainer 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; - - public ServerConnection(LocalServer 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); - } - - /** - * @return the finished - */ - public boolean isFinished() { - return finished; - } - - /** - * @param finished - * the finished to set - */ - public void setFinished(boolean finished) { - this.finished = finished; - } - - private void checkFinished() { - if (!isFinished()) { - throw new IllegalStateException("request have not been executed"); - } - } - - public void execute() throws ServletException, IOException { - if (isFinished()) { - throw new IllegalStateException( - "request already have been executed"); - } - this.servlet.execute(request, response); - setFinished(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() { - checkFinished(); - 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() { - checkFinished(); - 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 StubHttpRequest getRequest() { - return request; - } - - /** - * @return the response - */ - public StubHttpResponse getResponse() { - return response; - } - - private class ConnectionRequest extends StubHttpRequest { - - 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 url.getQuery(); - } - - /* - * (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); - } - - } - - private class ConnectionResponse extends StubHttpResponse { - /* - * (non-Javadoc) - * - * @see - * javax.servlet.http.HttpServletResponse#addCookie(javax.servlet.http - * .Cookie ) - */ - public void addCookie(Cookie cookie) { - cookies.add(cookie); - - } - - } - - public String getCharacterEncoding() { - checkFinished(); - return response.getCharacterEncoding(); - } - - public String getContentType() { - checkFinished(); - return response.getContentType(); - } - - public int getStatus() { - checkFinished(); - return response.getStatus(); - } - - public String getErrorMessage() { - checkFinished(); - return response.getErrorMessage(); - } - -} Copied: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/StagingConnection.java (from rev 11071, branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/ServerConnection.java) =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/StagingConnection.java (rev 0) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/StagingConnection.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -0,0 +1,440 @@ +/** + * + */ +package org.richfaces.test; + +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.MalformedURLException; +import java.net.URL; +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 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 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); + queryString = url.getQuery(); + if (null != queryString) { + String[] queryParams = queryString.split("&"); + for (int i = 0; i < queryParams.length; i++) { + String par = queryParams[i]; + int eqIndex = par.indexOf('='); + if(eqIndex>=0){ + addRequestParameter(par.substring(0, eqIndex), par.substring(eqIndex+1)); + } else { + addRequestParameter(par, null); + } + } + } + + } + + /** + * @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() { + 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(); + } + +} Copied: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/StagingServer.java (from rev 11071, branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/LocalServer.java) =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/StagingServer.java (rev 0) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/StagingServer.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -0,0 +1,336 @@ +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 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.RequestChain; +import org.richfaces.test.staging.ServletContainer; +import org.richfaces.test.staging.StaticServlet; +import org.richfaces.test.staging.StagingHttpSession; +import org.richfaces.test.staging.StagingServletContext; + + +/** + * 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 addWebListener(EventListener listener) { + contextListeners.add(listener); + } + + public HttpSession getSession(){ + return getSession(true); + } + + public 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 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(); + } + // 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(); + } + + 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); + } + }); + } +} Copied: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging (from rev 10973, branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/stub) Deleted: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ClasspathServerResource.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/stub/ClasspathServerResource.java 2008-10-30 00:26:08 UTC (rev 10973) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ClasspathServerResource.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -1,97 +0,0 @@ -/** - * - */ -package org.richfaces.test.stub; - -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; - -/** - * @author asmirnov - * - */ -public class ClasspathServerResource implements ServerResource { - - private final String classpath; - - private static final Logger log = ServerLogger.RESOURCE.getLogger(); - - - /** - * @param name - * @param classpath - */ - public ClasspathServerResource(String classpath) { - this.classpath = classpath; - } - - /* (non-Javadoc) - * @see org.richfaces.test.stub.ServerResource#addResource(org.richfaces.test.stub.ServerResource) - */ - public void addResource(ServerResourcePath path, ServerResource resource) { - throw new UnsupportedOperationException(); - } - - /* (non-Javadoc) - * @see org.richfaces.test.stub.ServerResource#getResource(org.richfaces.test.stub.ServerResourcePath) - */ - public ServerResource getResource(ServerResourcePath path) { - if(null == path){ - throw new NullPointerException(); - } - if(path.isFile()){ - return this; - } - return null; - } - /* (non-Javadoc) - * @see org.richfaces.test.stub.ServerResource#getPaths() - */ - public Set<String> getPaths() { - return Collections.emptySet(); - } - - - - /* (non-Javadoc) - * @see org.richfaces.test.stub.ServerResource#getAsStream() - */ - public InputStream getAsStream() throws IOException { - URL url = getURL(); - if (url != null) { - URLConnection connection = url.openConnection(); - try { - connection.setUseCaches(false); - } catch (IllegalArgumentException e) { - log.info("RESOURCE_NOT_CACHEABLE"); - } - return connection.getInputStream(); - } else { - return null; - } - } - - - /* (non-Javadoc) - * @see org.richfaces.test.stub.ServerResource#getURL() - */ - public URL getURL() { - ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); - if(null == classLoader){ - classLoader = this.getClass().getClassLoader(); - } - return classLoader.getResource(classpath); - } - - -} Copied: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ClasspathServerResource.java (from rev 11094, branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/stub/ClasspathServerResource.java) =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ClasspathServerResource.java (rev 0) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ClasspathServerResource.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -0,0 +1,97 @@ +/** + * + */ +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; + +/** + * @author asmirnov + * + */ +public class ClasspathServerResource implements ServerResource { + + private final String classpath; + + private static final Logger log = ServerLogger.RESOURCE.getLogger(); + + + /** + * @param name + * @param classpath + */ + public ClasspathServerResource(String classpath) { + this.classpath = classpath; + } + + /* (non-Javadoc) + * @see org.richfaces.test.staging.ServerResource#addResource(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.isFile()){ + return this; + } + return null; + } + /* (non-Javadoc) + * @see org.richfaces.test.staging.ServerResource#getPaths() + */ + public Set<String> getPaths() { + return Collections.emptySet(); + } + + + + /* (non-Javadoc) + * @see org.richfaces.test.staging.ServerResource#getAsStream() + */ + public InputStream getAsStream() throws IOException { + URL url = getURL(); + if (url != null) { + URLConnection connection = url.openConnection(); + try { + connection.setUseCaches(false); + } catch (IllegalArgumentException e) { + log.info("RESOURCE_NOT_CACHEABLE"); + } + return connection.getInputStream(); + } else { + return null; + } + } + + + /* (non-Javadoc) + * @see org.richfaces.test.staging.ServerResource#getURL() + */ + public URL getURL() { + ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); + if(null == classLoader){ + classLoader = this.getClass().getClassLoader(); + } + return classLoader.getResource(classpath); + } + + +} Added: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/FilterContainer.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/FilterContainer.java (rev 0) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/FilterContainer.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -0,0 +1,98 @@ +package org.richfaces.test.staging; + +import java.io.IOException; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; + +public class FilterContainer implements RequestChain { + + private final Filter filter; + + private final RequestChain next; + + private String name = "Default"; + + private final Map<String, String> initParameters; + + /** + * @param filter + * @param next + */ + public FilterContainer(Filter filter, RequestChain next) { + this.filter = filter; + this.next = next; + this.initParameters = new HashMap<String, String>(); + } + + public void execute(ServletRequest request, ServletResponse response) + throws ServletException, IOException { + FilterChain chain = new FilterChain(){ + + public void doFilter(ServletRequest request, + ServletResponse response) throws IOException, + ServletException { + next.execute(request, response); + + } + + }; + filter.doFilter(request, response, chain); + + } + + public void addInitParameter(String name, String value){ + initParameters.put(name, value); + } + + public boolean isApplicable(String path) { + return next.isApplicable(path); + } + + public void destroy() { + next.destroy(); + filter.destroy(); + } + + public void init(final StagingServletContext context) throws ServletException { + filter.init(new FilterConfig(){ + + public String getFilterName() { + return name; + } + + public String getInitParameter(String name) { + return initParameters.get(name); + } + + @SuppressWarnings("unchecked") + public Enumeration getInitParameterNames() { + return Collections.enumeration(initParameters.keySet()); + } + + public ServletContext getServletContext() { + return context; + } + + }); + next.init(context); + } + + public String getPathInfo(String path) { + return next.getPathInfo(path); + } + + public String getServletPath(String path) { + return next.getServletPath(path); + } + +} Property changes on: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/FilterContainer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/NotImplementedException.java (from rev 11094, branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/stub/NotImplementedException.java) =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/NotImplementedException.java (rev 0) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/NotImplementedException.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -0,0 +1,46 @@ +/** + * + */ +package org.richfaces.test.staging; + +/** + * This exception indicates feature not yet implemented in the stub server. + * @author asmirnov + * + */ +@SuppressWarnings("serial") +public class NotImplementedException extends RuntimeException { + + /** + * + */ + public NotImplementedException() { + super("This feature not yet implemented"); + } + + /** + * @param message + */ + public NotImplementedException(String message) { + super(message); + // TODO Auto-generated constructor stub + } + + /** + * @param cause + */ + public NotImplementedException(Throwable cause) { + super(cause); + // TODO Auto-generated constructor stub + } + + /** + * @param message + * @param cause + */ + public NotImplementedException(String message, Throwable cause) { + super(message, cause); + // TODO Auto-generated constructor stub + } + +} Added: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/RequestChain.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/RequestChain.java (rev 0) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/RequestChain.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -0,0 +1,24 @@ +package org.richfaces.test.staging; + +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; + +public interface RequestChain { + + public abstract boolean isApplicable(String path); + + public abstract void execute(ServletRequest request, + ServletResponse response) throws ServletException, IOException; + + public abstract void destroy(); + + public abstract void init(StagingServletContext context) throws ServletException; + + public abstract String getPathInfo(String path); + + public abstract String getServletPath(String path); + +} \ No newline at end of file Property changes on: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/RequestChain.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerResource.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/stub/ServerResource.java 2008-10-30 00:26:08 UTC (rev 10973) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerResource.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -1,50 +0,0 @@ -/** - * - */ -package org.richfaces.test.stub; - -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.util.Set; - -/** - * @author asmirnov - * - */ -public interface ServerResource { - - - /** - * Get URL for a test server resource content. Directories should return null or "stub" - * @return - */ - public URL getURL(); - - /** - * Create input stream to read content. Directories returns {@code null} - * @return - * @throws IOException - */ - public InputStream getAsStream() throws IOException; - - /** - * @return strings representing directory content. File-like resources return null. - */ - public Set<String> getPaths(); - - /** - * Append resource to the current directory-like structure. - * @param path - * @param resource - */ - public void addResource(ServerResourcePath path, ServerResource resource); - - /** - * Get resource from the current directory or its subdirectories. - * @param path - * @return - */ - public ServerResource getResource(ServerResourcePath path); - -} Copied: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerResource.java (from rev 11094, branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/stub/ServerResource.java) =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerResource.java (rev 0) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerResource.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -0,0 +1,50 @@ +/** + * + */ +package org.richfaces.test.staging; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.Set; + +/** + * @author asmirnov + * + */ +public interface ServerResource { + + + /** + * Get URL for a test server resource content. Directories should return null or "stub" + * @return + */ + public URL getURL(); + + /** + * Create input stream to read content. Directories returns {@code null} + * @return + * @throws IOException + */ + public InputStream getAsStream() throws IOException; + + /** + * @return strings representing directory content. File-like resources return null. + */ + public Set<String> getPaths(); + + /** + * Append resource to the current directory-like structure. + * @param path + * @param resource + */ + public void addResource(ServerResourcePath path, ServerResource resource); + + /** + * Get resource from the current directory or its subdirectories. + * @param path + * @return + */ + public ServerResource getResource(ServerResourcePath path); + +} Deleted: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerResourcePath.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/stub/ServerResourcePath.java 2008-10-30 00:26:08 UTC (rev 10973) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerResourcePath.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -1,100 +0,0 @@ -/** - * - */ -package org.richfaces.test.stub; - -import java.util.regex.Pattern; - -import javax.servlet.ServletContext; - -/** - * Class to represent web server resources directory path. - * @author asmirnov - * - */ -public class ServerResourcePath { - - private static final Pattern SLASH = Pattern.compile("/"); - - public static final ServerResourcePath WEB_INF=new ServerResourcePath("/WEB-INF"); - - public static final ServerResourcePath META_INF=new ServerResourcePath("/META-INF"); - public static final ServerResourcePath WEB_XML=new ServerResourcePath("/WEB-INF/web.xml"); - public static final ServerResourcePath FACES_CONFIG=new ServerResourcePath("/WEB-INF/faces-config.xml"); - - - private final String[] pathElements; - - /** - * Private constructor for next sub - path. - * @param pathElements - */ - private ServerResourcePath(String[] pathElements) { - this.pathElements = pathElements; - } - - /** - * Create path from string representation. Path have to started with training slash, as required for - * {@link ServletContext#getResource(String)} - * @param path - */ - public ServerResourcePath(String path) { - if (null == path) { - throw new NullPointerException(); - } - if (!path.startsWith("/")) { - throw new IllegalArgumentException(); - } - pathElements = SLASH.split(path); - } - - /** - * Method to detect last element in the path. - * @return true for a last element in the path. - */ - public boolean isFile() { - return pathElements.length <= 1; - } - - /** - * Name of the next element ( directory or file ) name. - * For the "/foo/bar/baz" it should be "foo" , /bar/baz : "bar" , "/" : null. - * @return name of the next element or null if it is last element in the chain ( file ). - */ - public String getNextElementName() { - if (pathElements.length > 1) { - return pathElements[1]; - } else { - return null; - } - } - - /** - * Create next path of the path chain. - * Path /foo/bar/baz should be converted to /bar/baz , /bar/baz -> /baz -> / ( empty path ) - * @return next subdirectory path or null. - */ - public ServerResourcePath getNextPath() { - if (pathElements.length > 1) { - String[] nextElenemts = new String[pathElements.length - 1]; - System.arraycopy(pathElements, 1, nextElenemts, 0, nextElenemts.length); - return new ServerResourcePath(nextElenemts); - } else { - return null; - } - } - - @Override - public String toString() { - StringBuilder str = new StringBuilder(); - if (pathElements.length > 1) { - for (int i = 1; i < pathElements.length; i++) { - String element = pathElements[i]; - str.append("/").append(element); - } - } else { - str.append("/"); - } - return str.toString(); - } -} Copied: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerResourcePath.java (from rev 11094, branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/stub/ServerResourcePath.java) =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerResourcePath.java (rev 0) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerResourcePath.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -0,0 +1,100 @@ +/** + * + */ +package org.richfaces.test.staging; + +import java.util.regex.Pattern; + +import javax.servlet.ServletContext; + +/** + * Class to represent web server resources directory path. + * @author asmirnov + * + */ +public class ServerResourcePath { + + private static final Pattern SLASH = Pattern.compile("/"); + + public static final ServerResourcePath WEB_INF=new ServerResourcePath("/WEB-INF"); + + public static final ServerResourcePath META_INF=new ServerResourcePath("/META-INF"); + public static final ServerResourcePath WEB_XML=new ServerResourcePath("/WEB-INF/web.xml"); + public static final ServerResourcePath FACES_CONFIG=new ServerResourcePath("/WEB-INF/faces-config.xml"); + + + private final String[] pathElements; + + /** + * Private constructor for next sub - path. + * @param pathElements + */ + private ServerResourcePath(String[] pathElements) { + this.pathElements = pathElements; + } + + /** + * Create path from string representation. Path have to started with training slash, as required for + * {@link ServletContext#getResource(String)} + * @param path + */ + public ServerResourcePath(String path) { + if (null == path) { + throw new NullPointerException(); + } + if (!path.startsWith("/")) { + throw new IllegalArgumentException(); + } + pathElements = SLASH.split(path); + } + + /** + * Method to detect last element in the path. + * @return true for a last element in the path. + */ + public boolean isFile() { + return pathElements.length <= 1; + } + + /** + * Name of the next element ( directory or file ) name. + * For the "/foo/bar/baz" it should be "foo" , /bar/baz : "bar" , "/" : null. + * @return name of the next element or null if it is last element in the chain ( file ). + */ + public String getNextElementName() { + if (pathElements.length > 1) { + return pathElements[1]; + } else { + return null; + } + } + + /** + * Create next path of the path chain. + * Path /foo/bar/baz should be converted to /bar/baz , /bar/baz -> /baz -> / ( empty path ) + * @return next subdirectory path or null. + */ + public ServerResourcePath getNextPath() { + if (pathElements.length > 1) { + String[] nextElenemts = new String[pathElements.length - 1]; + System.arraycopy(pathElements, 1, nextElenemts, 0, nextElenemts.length); + return new ServerResourcePath(nextElenemts); + } else { + return null; + } + } + + @Override + public String toString() { + StringBuilder str = new StringBuilder(); + if (pathElements.length > 1) { + for (int i = 1; i < pathElements.length; i++) { + String element = pathElements[i]; + str.append("/").append(element); + } + } else { + str.append("/"); + } + return str.toString(); + } +} Deleted: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerResourcesDirectory.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/stub/ServerResourcesDirectory.java 2008-10-30 00:26:08 UTC (rev 10973) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerResourcesDirectory.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -1,86 +0,0 @@ -/** - * - */ -package org.richfaces.test.stub; - -import java.io.InputStream; -import java.net.URL; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -/** - * @author asmirnov - * - */ -public class ServerResourcesDirectory implements ServerResource { - - - - private final Map<String,ServerResource> children = new HashMap<String,ServerResource>(); - - /* (non-Javadoc) - * @see org.richfaces.test.stub.ServerResource#addResource(org.richfaces.test.stub.ServerResource) - */ - public void addResource(ServerResourcePath path,ServerResource resource) { - - if(null == path || path.isFile()){ - throw new IllegalArgumentException(); - } else if(path.getNextPath().isFile()) { - children.put(path.getNextElementName(), resource); - } else { - ServerResource nextDirectory = children.get(path.getNextElementName()); - if(null == nextDirectory){ - nextDirectory = new ServerResourcesDirectory(); - children.put(path.getNextElementName(), nextDirectory); - } - nextDirectory.addResource(path.getNextPath(), resource); - } - } - - /* (non-Javadoc) - * @see org.richfaces.test.stub.ServerResource#getResource(org.richfaces.test.stub.ServerResourcePath) - */ - public ServerResource getResource(ServerResourcePath path) { - if(null == path){ - throw new NullPointerException(); - } - ServerResource resource = null; //children.get(path.getName()); - if(path.isFile()){ - resource=this; - } else { - resource = children.get(path.getNextElementName()); - if(!path.getNextPath().isFile() && null!=resource){ - resource = resource.getResource(path.getNextPath()); - } - } - return resource; - } - /* (non-Javadoc) - * @see org.richfaces.test.stub.ServerResource#getAsStream() - */ - public InputStream getAsStream() { - // can't read directory. - return null; - } - - - /* (non-Javadoc) - * @see org.richfaces.test.stub.ServerResource#getPaths() - */ - public Set<String> getPaths() { - return children.keySet(); - } - - /* (non-Javadoc) - * @see org.richfaces.test.stub.ServerResource#getURL() - */ - public URL getURL() { - // Directory don't have url. - return null; - } - - - -} Copied: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerResourcesDirectory.java (from rev 11094, branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/stub/ServerResourcesDirectory.java) =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerResourcesDirectory.java (rev 0) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerResourcesDirectory.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -0,0 +1,86 @@ +/** + * + */ +package org.richfaces.test.staging; + +import java.io.InputStream; +import java.net.URL; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +/** + * @author asmirnov + * + */ +public class ServerResourcesDirectory implements ServerResource { + + + + private final Map<String,ServerResource> children = new HashMap<String,ServerResource>(); + + /* (non-Javadoc) + * @see org.richfaces.test.staging.ServerResource#addResource(org.richfaces.test.staging.ServerResource) + */ + public void addResource(ServerResourcePath path,ServerResource resource) { + + if(null == path || path.isFile()){ + throw new IllegalArgumentException(); + } else if(path.getNextPath().isFile()) { + children.put(path.getNextElementName(), resource); + } else { + ServerResource nextDirectory = children.get(path.getNextElementName()); + if(null == nextDirectory){ + nextDirectory = new ServerResourcesDirectory(); + children.put(path.getNextElementName(), nextDirectory); + } + nextDirectory.addResource(path.getNextPath(), resource); + } + } + + /* (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(); + } + ServerResource resource = null; //children.get(path.getName()); + if(path.isFile()){ + resource=this; + } else { + resource = children.get(path.getNextElementName()); + if(!path.getNextPath().isFile() && null!=resource){ + resource = resource.getResource(path.getNextPath()); + } + } + return resource; + } + /* (non-Javadoc) + * @see org.richfaces.test.staging.ServerResource#getAsStream() + */ + public InputStream getAsStream() { + // can't read directory. + return null; + } + + + /* (non-Javadoc) + * @see org.richfaces.test.staging.ServerResource#getPaths() + */ + public Set<String> getPaths() { + return children.keySet(); + } + + /* (non-Javadoc) + * @see org.richfaces.test.staging.ServerResource#getURL() + */ + public URL getURL() { + // Directory don't have url. + return null; + } + + + +} Deleted: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServletContainer.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/stub/ServletContainer.java 2008-10-30 00:26:08 UTC (rev 10973) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServletContainer.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -1,97 +0,0 @@ -/** - * - */ -package org.richfaces.test.stub; - -import java.io.IOException; -import java.util.Collections; -import java.util.Map; - -import javax.servlet.Servlet; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; - - -/** - * @author asmirnov - * - */ -public class ServletContainer { - - private final Servlet servlet; - - private final boolean prefixMapped; - - private final String mapping; - - private final Map<String, String> initParameters; - - /** - * @param mapping - * @param servlet - */ - public ServletContainer(String mapping, Servlet servlet, Map<String, String> initParameters) { - if(null == mapping){ - this.prefixMapped = true; - this.mapping = ""; - } else if (mapping.startsWith("*")) { - this.prefixMapped = false; - this.mapping = mapping.substring(1); - } else if (mapping.endsWith("*")) { - this.prefixMapped = true; - this.mapping = mapping.substring(0,mapping.length()-1); - } else { - throw new IllegalArgumentException("Invalid mapping "+mapping); - } - this.servlet = servlet; - this.initParameters = initParameters; - } - - public ServletContainer(String mapping, Servlet servlet) { - this(mapping, servlet, Collections.<String, String>emptyMap()); - } - - public boolean isApplicable(String path) { - if(prefixMapped && path.startsWith(mapping)){ - return true; - } else if(!prefixMapped && path.endsWith(mapping)){ - return true; - } else { - return false; - } - } - - public String getServletPath(String path){ - if (!isApplicable(path)) { - return null; - } - if(prefixMapped){ - return mapping; - } else { - return path; - } - } - - public String getPathInfo(String path) { - if (!isApplicable(path)) { - return null; - } - if(prefixMapped){ - return path.substring(mapping.length()); - } else { - return null; - } - - } - - public void init(StubServletContext context) throws ServletException { - StubServletConfig config = new StubServletConfig(context, this.initParameters); - servlet.init(config); - } - - public void execute(ServletRequest request, ServletResponse response) throws ServletException, IOException { - this.servlet.service(request, response); - - } -} Copied: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServletContainer.java (from rev 11094, branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/stub/ServletContainer.java) =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServletContainer.java (rev 0) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServletContainer.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -0,0 +1,150 @@ +/** + * + */ +package org.richfaces.test.staging; + +import java.io.IOException; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; +import java.util.logging.Logger; + +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 org.richfaces.test.ServerLogger; + + +/** + * @author asmirnov + * + */ +public class ServletContainer implements RequestChain { + + private static final Logger log = ServerLogger.SERVER.getLogger(); + + private final Servlet servlet; + + private final boolean prefixMapped; + + private final String mapping; + + private final Map<String, String> initParameters; + + private String name = "Default"; + + /** + * @param mapping + * @param servlet + */ + public ServletContainer(String mapping, Servlet servlet) { + if(null == mapping){ + this.prefixMapped = true; + this.mapping = ""; + } else if (mapping.startsWith("*")) { + this.prefixMapped = false; + this.mapping = mapping.substring(1); + } else if (mapping.endsWith("*")) { + this.prefixMapped = true; + this.mapping = mapping.substring(0,mapping.length()-1); + } else { + throw new IllegalArgumentException("Invalid mapping "+mapping); + } + this.servlet = servlet; + this.initParameters = new HashMap<String, String>(); + } + + + public void addInitParameter(String name, String value){ + initParameters.put(name, value); + } + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @param name the name to set + */ + public void setName(String name) { + this.name = name; + } + + /* (non-Javadoc) + * @see org.richfaces.test.staging.RequestChain#isApplicable(java.lang.String) + */ + public boolean isApplicable(String path) { + if(prefixMapped && path.startsWith(mapping)){ + return true; + } else if(!prefixMapped && path.endsWith(mapping)){ + return true; + } else { + return false; + } + } + + public String getServletPath(String path){ + if (!isApplicable(path)) { + return null; + } + if(prefixMapped){ + return mapping; + } else { + return path; + } + } + + public String getPathInfo(String path) { + if (!isApplicable(path)) { + return null; + } + if(prefixMapped){ + return path.substring(mapping.length()); + } else { + return null; + } + + } + + public void init(final StagingServletContext context) throws ServletException { + servlet.init(new ServletConfig(){ + + public String getInitParameter(String name) { + return initParameters.get(name); + } + + @SuppressWarnings("unchecked") + public Enumeration getInitParameterNames() { + return Collections.enumeration(initParameters.keySet()); + } + + public ServletContext getServletContext() { + return context; + } + + public String getServletName() { + return 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 { + this.servlet.service(request, response); + + } + + public void destroy() { + this.servlet.destroy(); + } +} Added: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingHttpRequest.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingHttpRequest.java (rev 0) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingHttpRequest.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -0,0 +1,495 @@ +/** + * + */ +package org.richfaces.test.staging; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.security.Principal; +import java.util.Collection; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; +import java.util.logging.Logger; + +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletInputStream; +import javax.servlet.ServletRequestListener; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + +import org.richfaces.collections.collect.ImmutableCollection; +import org.richfaces.collections.collect.ImmutableList; +import org.richfaces.collections.collect.Multimap; +import org.richfaces.collections.collect.Multimaps; +import org.richfaces.test.ServerLogger; + +/** + * @author asmirnov + * + */ +public abstract class StagingHttpRequest implements HttpServletRequest { + + private static final Logger log = ServerLogger.CONNECTION.getLogger(); + + public static final String LOCALHOST = "localhost"; + public static final String HTTP = "http"; + public static final String LOCALHOST_IP = "127.0.0.1"; + public static final String UTF8 = "UTF-8"; + + + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletRequest#getAuthType() + */ + public String getAuthType() { + // TODO configure test auth. + log.info("unimplemented request method getAuthType"); + return null; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletRequest#getContextPath() + */ + public String getContextPath() { + return StagingServletContext.CONTEXT_PATH; + } + + + /* + * (non-Javadoc) + * + * @see + * javax.servlet.http.HttpServletRequest#getDateHeader(java.lang.String) + */ + public long getDateHeader(String name) { + // TODO create headers support + log.info("unimplemented request method getDateHeader"); + return -1; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletRequest#getHeader(java.lang.String) + */ + public String getHeader(String name) { + // TODO create headers support + log.info("unimplemented request method getHeader"); + return null; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletRequest#getHeaderNames() + */ + @SuppressWarnings("unchecked") + public Enumeration getHeaderNames() { + // TODO create headers support + log.info("unimplemented request method getHeaderNames"); + return null; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletRequest#getHeaders(java.lang.String) + */ + @SuppressWarnings("unchecked") + public Enumeration getHeaders(String name) { + // TODO create headers support + log.info("unimplemented request method getHeaders"); + return Collections.enumeration(Collections.EMPTY_LIST); + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletRequest#getIntHeader(java.lang.String) + */ + public int getIntHeader(String name) { + // TODO create headers support + log.info("unimplemented request method getIntHeader"); + return -1; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletRequest#getPathTranslated() + */ + public String getPathTranslated() { + // we have only 'virtual' server. + return null; + } + + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletRequest#getRemoteUser() + */ + public String getRemoteUser() { + // TODO configure test auth. + log.info("unimplemented request method getRemoteUser"); + return null; + } + + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletRequest#getRequestURL() + */ + public StringBuffer getRequestURL() { + StringBuffer requestURL = new StringBuffer(HTTP + "://" + LOCALHOST + + getRequestURI()); + return requestURL; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletRequest#getRequestedSessionId() + */ + public String getRequestedSessionId() { + return StagingHttpSession.SESSION_ID; + } + + + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletRequest#getUserPrincipal() + */ + public Principal getUserPrincipal() { + // TODO implement test auth. + log.info("unimplemented request method getUserPrincipal"); + return null; + } + + /* + * (non-Javadoc) + * + * @see + * javax.servlet.http.HttpServletRequest#isRequestedSessionIdFromCookie() + */ + public boolean isRequestedSessionIdFromCookie() { + // test do not supports cookie + return false; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdFromURL() + */ + public boolean isRequestedSessionIdFromURL() { + return true; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdFromUrl() + */ + public boolean isRequestedSessionIdFromUrl() { + return true; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdValid() + */ + public boolean isRequestedSessionIdValid() { + // TODO - check session. + return false; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletRequest#isUserInRole(java.lang.String) + */ + public boolean isUserInRole(String role) { + // TODO implement test auth. + log.info("unimplemented request method isUserInRole"); + return false; + } + + private Map<String, Object> attributes = new HashMap<String, Object>(); + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletRequest#getAttribute(java.lang.String) + */ + public Object getAttribute(String name) { + return attributes.get(name); + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletRequest#getAttributeNames() + */ + @SuppressWarnings("unchecked") + public Enumeration getAttributeNames() { + return Collections.enumeration(attributes.keySet()); + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletRequest#getCharacterEncoding() + */ + public String getCharacterEncoding() { + return UTF8; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletRequest#getContentLength() + */ + public int getContentLength() { + return -1; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletRequest#getContentType() + */ + public String getContentType() { + log.info("unimplemented request method getContentType"); + return null; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletRequest#getInputStream() + */ + public ServletInputStream getInputStream() throws IOException { + // TODO implement post stream. + log.info("unimplemented request method getInputStream"); + return null; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletRequest#getLocalAddr() + */ + public String getLocalAddr() { + return LOCALHOST_IP; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletRequest#getLocalName() + */ + public String getLocalName() { + return LOCALHOST; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletRequest#getLocalPort() + */ + public int getLocalPort() { + return 80; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletRequest#getLocale() + */ + public Locale getLocale() { + return Locale.US; + } + + private final ImmutableCollection<Locale> locales = ImmutableList.of( + Locale.US, Locale.GERMANY); + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletRequest#getLocales() + */ + @SuppressWarnings("unchecked") + public Enumeration getLocales() { + return Collections.enumeration(locales); + } + + private String characterEncoding; + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletRequest#getProtocol() + */ + public String getProtocol() { + return "HTTP/1.1"; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletRequest#getReader() + */ + public BufferedReader getReader() throws IOException { + // TODO implements request buffer. + log.info("unimplemented request method getReader"); + return null; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletRequest#getRealPath(java.lang.String) + */ + public String getRealPath(String path) { + return null; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletRequest#getRemoteAddr() + */ + public String getRemoteAddr() { + return LOCALHOST_IP; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletRequest#getRemoteHost() + */ + public String getRemoteHost() { + return LOCALHOST; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletRequest#getRemotePort() + */ + public int getRemotePort() { + return 1223340; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletRequest#getRequestDispatcher(java.lang.String) + */ + public RequestDispatcher getRequestDispatcher(String path) { + // TODO Auto-generated method stub + throw new NotImplementedException(); + // return null; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletRequest#getScheme() + */ + public String getScheme() { + return HTTP; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletRequest#getServerName() + */ + public String getServerName() { + return LOCALHOST; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletRequest#getServerPort() + */ + public int getServerPort() { + return 80; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletRequest#isSecure() + */ + public boolean isSecure() { + return false; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletRequest#removeAttribute(java.lang.String) + */ + public void removeAttribute(String name) { + // TODO - inform listeners + Object removed = attributes.remove(name); + if(null != removed){ + attributeRemoved(name,removed); + } + } + + protected abstract void attributeRemoved(String name, Object removed); + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletRequest#setAttribute(java.lang.String, + * java.lang.Object) + */ + public void setAttribute(String name, Object o) { + if(null == o){ + removeAttribute(name); + } else { + Object oldValue = attributes.put(name, o); + if(null != oldValue){ + attributeReplaced(name,o); + } else { + attributeAdded(name,o); + } + } + + } + + protected abstract void attributeAdded(String name, Object o); + + protected abstract void attributeReplaced(String name, Object o); + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletRequest#setCharacterEncoding(java.lang.String) + */ + public void setCharacterEncoding(String env) + throws UnsupportedEncodingException { + this.characterEncoding=env; + + } + +} Added: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingHttpResponse.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingHttpResponse.java (rev 0) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingHttpResponse.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -0,0 +1,436 @@ +/** + * + */ +package org.richfaces.test.staging; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.logging.Logger; + +import javax.servlet.ServletOutputStream; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.httpclient.HttpStatus; +import org.richfaces.test.ServerLogger; + +/** + * @author asmirnov + * + */ +public abstract class StagingHttpResponse implements HttpServletResponse { + + + private static final Logger log = ServerLogger.CONNECTION.getLogger(); + + + private int status = 200; + + private String redirectLocation = null; + + private String errorMessage = null; + + private int bufferSize = 8196; + + private StringWriter outputWriter; + + private ByteArrayOutputStream outputStream; + + private PrintWriter printWriter; + + private ServletOutputStream servletOutputStream; + + private Locale locale = Locale.US; + + private String contentType="text"; + + private String encoding = StagingHttpRequest.UTF8; + + + /* + * (non-Javadoc) + * + * @see + * javax.servlet.http.HttpServletResponse#addDateHeader(java.lang.String, + * long) + */ + public void addDateHeader(String name, long date) { + log.info("unimplemented response method addDateHeader"); + // TODO Auto-generated method stub + + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletResponse#addHeader(java.lang.String, + * java.lang.String) + */ + public void addHeader(String name, String value) { + // TODO Auto-generated method stub + log.info("unimplemented response method addHeader"); + + } + + /* + * (non-Javadoc) + * + * @see + * javax.servlet.http.HttpServletResponse#addIntHeader(java.lang.String, + * int) + */ + public void addIntHeader(String name, int value) { + // TODO Auto-generated method stub + log.info("unimplemented response method addIntHeader"); + + } + + /* + * (non-Javadoc) + * + * @see + * javax.servlet.http.HttpServletResponse#containsHeader(java.lang.String) + */ + public boolean containsHeader(String name) { + // TODO Auto-generated method stub + log.info("unimplemented response method containsHeader"); + return false; + } + + /* + * (non-Javadoc) + * + * @see + * javax.servlet.http.HttpServletResponse#encodeRedirectURL(java.lang.String + * ) + */ + public String encodeRedirectURL(String url) { + return url; + } + + /* + * (non-Javadoc) + * + * @see + * javax.servlet.http.HttpServletResponse#encodeRedirectUrl(java.lang.String + * ) + */ + public String encodeRedirectUrl(String url) { + return encodeRedirectURL(url); + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletResponse#encodeURL(java.lang.String) + */ + public String encodeURL(String url) { + return url; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletResponse#encodeUrl(java.lang.String) + */ + public String encodeUrl(String url) { + return encodeURL(url); + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletResponse#sendError(int) + */ + public void sendError(int sc) throws IOException { + status = sc; + + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletResponse#sendError(int, + * java.lang.String) + */ + public void sendError(int sc, String msg) throws IOException { + status = sc; + errorMessage = msg; + } + + /* + * (non-Javadoc) + * + * @see + * javax.servlet.http.HttpServletResponse#sendRedirect(java.lang.String) + */ + public void sendRedirect(String location) throws IOException { + redirectLocation = location; + } + + /* + * (non-Javadoc) + * + * @see + * javax.servlet.http.HttpServletResponse#setDateHeader(java.lang.String, + * long) + */ + public void setDateHeader(String name, long date) { + // TODO Auto-generated method stub + log.info("unimplemented response method setDateHeader"); + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletResponse#setHeader(java.lang.String, + * java.lang.String) + */ + public void setHeader(String name, String value) { + // TODO Auto-generated method stub + log.info("unimplemented response method setHeader"); + } + + /* + * (non-Javadoc) + * + * @see + * javax.servlet.http.HttpServletResponse#setIntHeader(java.lang.String, + * int) + */ + public void setIntHeader(String name, int value) { + // TODO Auto-generated method stub + log.info("unimplemented response method setIntHeader"); + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletResponse#setStatus(int) + */ + public void setStatus(int sc) { + status = sc; + + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpServletResponse#setStatus(int, + * java.lang.String) + */ + public void setStatus(int sc, String sm) { + status = sc; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletResponse#flushBuffer() + */ + public void flushBuffer() throws IOException { + // do nothing + log.info("unimplemented response method flushBuffer"); + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletResponse#getBufferSize() + */ + public int getBufferSize() { + return bufferSize; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletResponse#getCharacterEncoding() + */ + public String getCharacterEncoding() { + return encoding; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletResponse#getContentType() + */ + public String getContentType() { + return contentType; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletResponse#getLocale() + */ + public Locale getLocale() { + return locale; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletResponse#getOutputStream() + */ + public ServletOutputStream getOutputStream() throws IOException { + if (null != this.outputWriter) { + throw new IllegalStateException(); + } + if (this.outputStream == null) { + this.outputStream = new ByteArrayOutputStream(getBufferSize()); + servletOutputStream = new ServletOutputStream(){ + + @Override + public void write(int b) throws IOException { + StagingHttpResponse.this.outputStream.write(b); + } + + }; + } + return servletOutputStream; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletResponse#getWriter() + */ + public PrintWriter getWriter() throws IOException { + if (null != this.outputStream) { + throw new IllegalStateException(); + } + if (this.outputWriter == null) { + this.outputWriter = new StringWriter(getBufferSize()); + printWriter = new PrintWriter(outputWriter); + } + return printWriter; + } + + + public String getWriterContent() { + if(null != this.outputWriter){ + return this.outputWriter.toString(); + } + return null; + } + + public byte[] getStreamContent() { + if(null!=outputStream){ + return outputStream.toByteArray(); + } + return null; + } + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletResponse#isCommitted() + */ + public boolean isCommitted() { + // TODO Auto-generated method stub + log.info("unimplemented response method isCommited"); + return false; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletResponse#reset() + */ + public void reset() { + if(isCommitted()){ + throw new IllegalStateException(); + } + resetBuffer(); + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletResponse#resetBuffer() + */ + public void resetBuffer() { + if(isCommitted()){ + throw new IllegalStateException(); + } + this.servletOutputStream = null; + this.outputStream = null; + this.printWriter = null; + this.outputWriter = null; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletResponse#setBufferSize(int) + */ + public void setBufferSize(int size) { + this.bufferSize = size; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletResponse#setCharacterEncoding(java.lang.String) + */ + public void setCharacterEncoding(String charset) { + encoding = charset; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletResponse#setContentLength(int) + */ + public void setContentLength(int len) { + // TODO Auto-generated method stub + log.info("unimplemented response method setContentLenght"); + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletResponse#setContentType(java.lang.String) + */ + public void setContentType(String type) { + contentType = type; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.ServletResponse#setLocale(java.util.Locale) + */ + public void setLocale(Locale loc) { + this.locale = loc; + + } + + /** + * @return the status + */ + public int getStatus() { + return status; + } + + /** + * @return the redirectLocation + */ + public String getRedirectLocation() { + return redirectLocation; + } + + /** + * @return the errorMessage + */ + public String getErrorMessage() { + return errorMessage; + } + +} Added: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingHttpSession.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingHttpSession.java (rev 0) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingHttpSession.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -0,0 +1,281 @@ +/** + * + */ +package org.richfaces.test.staging; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.ServletContext; +import javax.servlet.http.HttpSession; +import javax.servlet.http.HttpSessionBindingEvent; +import javax.servlet.http.HttpSessionBindingListener; +import javax.servlet.http.HttpSessionContext; + +/** + * @author asmirnov + * + */ +public abstract class StagingHttpSession implements HttpSession { + + private static final int DEFAULT_INACTIVE_TIME = 30; + + public static final String SESSION_ID = "1234567890"; + + private final Map<String, Object> attributes = new HashMap<String, Object>(); + + private final long creationTime; + + private int inactiveTime = DEFAULT_INACTIVE_TIME; + + private boolean valid; + + public StagingHttpSession() { + this.creationTime = System.currentTimeMillis(); + this.valid = true; + } + + /** + * + */ + public void destroy() { + // Destroy all session attributes. + unboundAttributes(); + } + + private void unboundAttributes() { + for (String name : getValueNames()) { + removeAttribute(name); + } + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpSession#getAttribute(java.lang.String) + */ + public Object getAttribute(String name) { + checkValid(); + return attributes.get(name); + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpSession#getAttributeNames() + */ + @SuppressWarnings("unchecked") + public Enumeration getAttributeNames() { + checkValid(); + return Collections.enumeration(attributes.keySet()); + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpSession#getCreationTime() + */ + public long getCreationTime() { + checkValid(); + return creationTime; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpSession#getId() + */ + public String getId() { + return SESSION_ID; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpSession#getLastAccessedTime() + */ + public long getLastAccessedTime() { + checkValid(); + // TODO fix accessing time + return 0; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpSession#getMaxInactiveInterval() + */ + public int getMaxInactiveInterval() { + return inactiveTime; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpSession#getSessionContext() + */ + @SuppressWarnings("deprecation") + public HttpSessionContext getSessionContext() { + throw new NotImplementedException("Session context is not implemented"); + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpSession#getValue(java.lang.String) + */ + public Object getValue(String name) { + return getAttribute(name); + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpSession#getValueNames() + */ + public String[] getValueNames() { + checkValid(); + ArrayList<String> names = new ArrayList<String>(attributes.keySet()); + return names.toArray(new String[names.size()]); + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpSession#invalidate() + */ + public void invalidate() { + checkValid(); + unboundAttributes(); + this.valid=false; + + } + + protected void checkValid(){ + if(!valid){ + throw new IllegalStateException("Session have been invalidated"); + } + } + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpSession#isNew() + */ + public boolean isNew() { + checkValid(); + // TODO Auto-generated method stub + return false; + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpSession#putValue(java.lang.String, + * java.lang.Object) + */ + public void putValue(String name, Object value) { + setAttribute(name, value); + + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpSession#removeAttribute(java.lang.String) + */ + public void removeAttribute(String name) { + checkValid(); + Object removed = this.attributes.remove(name); + if (null != removed) { + removedFromSession(name, removed); + } + + } + + protected void removedFromSession(String name, Object removed) { + HttpSessionBindingEvent sessionBindingEvent = new HttpSessionBindingEvent( + this, name, removed); + if (removed instanceof HttpSessionBindingListener) { + HttpSessionBindingListener listener = (HttpSessionBindingListener) removed; + listener.valueUnbound(sessionBindingEvent); + } + valueUnbound(sessionBindingEvent); + } + + protected abstract void valueUnbound( + HttpSessionBindingEvent sessionBindingEvent); + + protected void boundToSession(String name, Object value) { + HttpSessionBindingEvent sessionBindingEvent = new HttpSessionBindingEvent( + this, name, value); + if (value instanceof HttpSessionBindingListener) { + HttpSessionBindingListener listener = (HttpSessionBindingListener) value; + listener.valueBound(sessionBindingEvent); + } + valueBound(sessionBindingEvent); + } + + protected abstract void valueBound( + HttpSessionBindingEvent sessionBindingEvent); + + protected void replacedInSession(String name, Object oldValue, Object value) { + HttpSessionBindingEvent sessionBindingEvent = new HttpSessionBindingEvent( + this, name, value); + if (oldValue instanceof HttpSessionBindingListener) { + HttpSessionBindingListener listener = (HttpSessionBindingListener) oldValue; + listener.valueUnbound(sessionBindingEvent); + } + if (value instanceof HttpSessionBindingListener) { + HttpSessionBindingListener listener = (HttpSessionBindingListener) value; + listener.valueBound(sessionBindingEvent); + } + valueReplaced(sessionBindingEvent); + } + + protected abstract void valueReplaced( + HttpSessionBindingEvent sessionBindingEvent); + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpSession#removeValue(java.lang.String) + */ + public void removeValue(String name) { + removeAttribute(name); + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpSession#setAttribute(java.lang.String, + * java.lang.Object) + */ + public void setAttribute(String name, Object value) { + checkValid(); + if (null == value) { + removeAttribute(name); + } else { + Object oldValue = attributes.put(name, value); + if (null != oldValue) { + replacedInSession(name, oldValue, value); + } else { + boundToSession(name, value); + } + } + } + + /* + * (non-Javadoc) + * + * @see javax.servlet.http.HttpSession#setMaxInactiveInterval(int) + */ + public void setMaxInactiveInterval(int interval) { + this.inactiveTime = interval; + + } + +} Added: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingServletContext.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingServletContext.java (rev 0) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingServletContext.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -0,0 +1,297 @@ +/** + * + */ +package org.richfaces.test.staging; + +import java.io.IOException; +import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Collection; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.servlet.RequestDispatcher; +import javax.servlet.Servlet; +import javax.servlet.ServletContext; +import javax.servlet.ServletContextAttributeEvent; +import javax.servlet.ServletContextAttributeListener; +import javax.servlet.ServletException; + +import org.richfaces.test.ServerLogger; + +/** + * @author asmirnov + * + */ +public abstract class StagingServletContext implements ServletContext { + + private static final Logger log = ServerLogger.SERVER.getLogger(); + + public static final String CONTEXT_PATH = ""; + + private static final String APPLICATION_NAME = "stub"; + private final Map<String, Object> attributes = new HashMap<String, Object>(); + private Map<String,String> initParameters = new HashMap<String, String>(); + + /* (non-Javadoc) + * @see javax.servlet.ServletContext#getAttribute(java.lang.String) + */ + public Object getAttribute(String name) { + return attributes.get(name); + } + + /* (non-Javadoc) + * @see javax.servlet.ServletContext#getAttributeNames() + */ + @SuppressWarnings("unchecked") + public Enumeration getAttributeNames() { + return Collections.enumeration(attributes.keySet()); + } + + /* (non-Javadoc) + * @see javax.servlet.ServletContext#getContext(java.lang.String) + */ + public ServletContext getContext(String uripath) { + // stub server has only one context. + return null; + } + + /* (non-Javadoc) + * @see javax.servlet.ServletContext#getContextPath() + */ + public String getContextPath() { + // Test always run in the root context. + return CONTEXT_PATH; + } + + public void addInitParameters(Map<String,String>parameters) { + initParameters.putAll(parameters); + } + /* (non-Javadoc) + * @see javax.servlet.ServletContext#getInitParameter(java.lang.String) + */ + public String getInitParameter(String name) { + return initParameters.get(name); + } + + + /** + * Put new init parameter to the Map. + * @param name + * @param value + */ + public void setInitParameter(String name, String value) { + initParameters.put(name, value); + } + + /* (non-Javadoc) + * @see javax.servlet.ServletContext#getInitParameterNames() + */ + @SuppressWarnings("unchecked") + public Enumeration getInitParameterNames() { + return Collections.enumeration(initParameters.keySet()); + } + + /* (non-Javadoc) + * @see javax.servlet.ServletContext#getMajorVersion() + */ + public int getMajorVersion() { + 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() + */ + public int getMinorVersion() { + return 5; + } + + /* (non-Javadoc) + * @see javax.servlet.ServletContext#getNamedDispatcher(java.lang.String) + */ + public RequestDispatcher getNamedDispatcher(String name) { + // TODO create stub dispatcher. + log.info("unimplemented response method getNamedDispatcher"); + return null; + } + + /* (non-Javadoc) + * @see javax.servlet.ServletContext#getRealPath(java.lang.String) + */ + public String getRealPath(String path) { + // we always use 'virtual' configuration. + return null; + } + + /* (non-Javadoc) + * @see javax.servlet.ServletContext#getRequestDispatcher(java.lang.String) + */ + public RequestDispatcher getRequestDispatcher(String path) { + // TODO implement stub dispatcher. + log.info("unimplemented response method getRequestDispatcher"); + return null; + } + + /* (non-Javadoc) + * @see javax.servlet.ServletContext#getResource(java.lang.String) + */ + public URL getResource(String path) throws MalformedURLException { + URL url = null; + ServerResource resource = getServerResource(path); + if(null != resource){ + url = resource.getURL(); + } + return url; + } + + /** + * @param path + * @return + */ + protected abstract ServerResource getServerResource(String path); + + /* (non-Javadoc) + * @see javax.servlet.ServletContext#getResourceAsStream(java.lang.String) + */ + public InputStream getResourceAsStream(String path) { + ServerResource resource = getServerResource(path); + if(null != resource){ + try { + return resource.getAsStream(); + } catch (IOException e) { + return null; + } + } + return null; + } + + /* (non-Javadoc) + * @see javax.servlet.ServletContext#getResourcePaths(java.lang.String) + */ + @SuppressWarnings("unchecked") + public Set getResourcePaths(String path) { + ServerResource resource = getServerResource(path); + if(null != resource){ + return resource.getPaths(); + } + return null; + } + + /* (non-Javadoc) + * @see javax.servlet.ServletContext#getServerInfo() + */ + public String getServerInfo() { + return "Stub test server"; + } + + /* (non-Javadoc) + * @see javax.servlet.ServletContext#getServlet(java.lang.String) + */ + public Servlet getServlet(String name) throws ServletException { + // always return null. + log.info("unimplemented response method getServlet"); + return null; + } + + /* (non-Javadoc) + * @see javax.servlet.ServletContext#getServletContextName() + */ + public String getServletContextName() { + // Stub server has no declared name. + return APPLICATION_NAME; + } + + /* (non-Javadoc) + * @see javax.servlet.ServletContext#getServletNames() + */ + @SuppressWarnings("unchecked") + public Enumeration getServletNames() { + log.info("unimplemented response method getServletNames"); + return Collections.enumeration(Collections.EMPTY_LIST); + } + + /* (non-Javadoc) + * @see javax.servlet.ServletContext#getServlets() + */ + @SuppressWarnings("unchecked") + public Enumeration getServlets() { + log.info("unimplemented response method getServlets"); + return Collections.enumeration(Collections.EMPTY_LIST); + } + + /* (non-Javadoc) + * @see javax.servlet.ServletContext#log(java.lang.String) + */ + public void log(String msg) { + log.finest(msg); + + } + + /* (non-Javadoc) + * @see javax.servlet.ServletContext#log(java.lang.Exception, java.lang.String) + */ + public void log(Exception exception, String msg) { + log.log(Level.FINEST, msg, exception); + + } + + /* (non-Javadoc) + * @see javax.servlet.ServletContext#log(java.lang.String, java.lang.Throwable) + */ + public void log(String message, Throwable throwable) { + log.log(Level.FINEST, message, throwable); + } + + /* (non-Javadoc) + * @see javax.servlet.ServletContext#removeAttribute(java.lang.String) + */ + public void removeAttribute(String name) { + // TODO - inform listeners + Object removed = attributes.remove(name); + if(null != removed){ + valueUnbound(new ServletContextAttributeEvent(this,name,removed)); + } + } + + + /* (non-Javadoc) + * @see javax.servlet.ServletContext#setAttribute(java.lang.String, java.lang.Object) + */ + public void setAttribute(String name, Object object) { + // TODO - inform listeners + if (null == object) { + removeAttribute(name); + } else { + Object oldValue = attributes.put(name, object); + ServletContextAttributeEvent event = new ServletContextAttributeEvent(this,name,object); + if(null != oldValue){ + valueReplaced(event); + } else { + valueBound(event); + } + } + } + + protected abstract void valueBound(ServletContextAttributeEvent event); + + protected abstract void valueReplaced(ServletContextAttributeEvent event); + + protected abstract void valueUnbound( + ServletContextAttributeEvent servletContextAttributeEvent); + +} Deleted: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StaticServlet.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/stub/StaticServlet.java 2008-10-30 00:26:08 UTC (rev 10973) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StaticServlet.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -1,44 +0,0 @@ -/** - * - */ -package org.richfaces.test.stub; - -import java.io.IOException; -import java.io.InputStream; - -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * @author asmirnov - * - */ -@SuppressWarnings("serial") -public class StaticServlet extends HttpServlet { - - @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) - throws ServletException, IOException { - InputStream inputStream = getServletContext().getResourceAsStream(req.getServletPath()); - if(null != inputStream){ - ServletOutputStream outputStream = resp.getOutputStream(); - int c; - while((c = inputStream.read())>0){ - outputStream.write(c); - } - inputStream.close(); - outputStream.close(); - } else { - resp.sendError(404, "not found"); - } - } - - @Override - protected void doPost(HttpServletRequest req, HttpServletResponse resp) - throws ServletException, IOException { - doGet(req, resp); - } -} Copied: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StaticServlet.java (from rev 11094, branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/stub/StaticServlet.java) =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StaticServlet.java (rev 0) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StaticServlet.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -0,0 +1,44 @@ +/** + * + */ +package org.richfaces.test.staging; + +import java.io.IOException; +import java.io.InputStream; + +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * @author asmirnov + * + */ +@SuppressWarnings("serial") +public class StaticServlet extends HttpServlet { + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + InputStream inputStream = getServletContext().getResourceAsStream(req.getServletPath()); + if(null != inputStream){ + ServletOutputStream outputStream = resp.getOutputStream(); + int c; + while((c = inputStream.read())>0){ + outputStream.write(c); + } + inputStream.close(); + outputStream.close(); + } else { + resp.sendError(404, "not found"); + } + } + + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + doGet(req, resp); + } +} Deleted: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StubHttpRequest.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/stub/StubHttpRequest.java 2008-10-30 00:26:08 UTC (rev 10973) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StubHttpRequest.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -1,483 +0,0 @@ -/** - * - */ -package org.richfaces.test.stub; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.security.Principal; -import java.util.Collection; -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; - -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletInputStream; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -import org.richfaces.collections.collect.ImmutableCollection; -import org.richfaces.collections.collect.ImmutableList; -import org.richfaces.collections.collect.Multimap; -import org.richfaces.collections.collect.Multimaps; - -/** - * @author asmirnov - * - */ -public abstract class StubHttpRequest implements HttpServletRequest { - - public static final String LOCALHOST = "localhost"; - public static final String HTTP = "http"; - public static final String LOCALHOST_IP = "127.0.0.1"; - public static final String UTF8 = "UTF-8"; - - - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletRequest#getAuthType() - */ - public String getAuthType() { - // TODO configure test auth. - return null; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletRequest#getContextPath() - */ - public String getContextPath() { - return StubServletContext.CONTEXT_PATH; - } - - - /* - * (non-Javadoc) - * - * @see - * javax.servlet.http.HttpServletRequest#getDateHeader(java.lang.String) - */ - public long getDateHeader(String name) { - // TODO create headers support - return -1; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletRequest#getHeader(java.lang.String) - */ - public String getHeader(String name) { - // TODO create headers support - return null; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletRequest#getHeaderNames() - */ - @SuppressWarnings("unchecked") - public Enumeration getHeaderNames() { - // TODO create headers support - return null; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletRequest#getHeaders(java.lang.String) - */ - @SuppressWarnings("unchecked") - public Enumeration getHeaders(String name) { - // TODO create headers support - return Collections.enumeration(Collections.EMPTY_LIST); - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletRequest#getIntHeader(java.lang.String) - */ - public int getIntHeader(String name) { - // TODO create headers support - return -1; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletRequest#getPathTranslated() - */ - public String getPathTranslated() { - // we have only 'virtual' server. - return null; - } - - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletRequest#getRemoteUser() - */ - public String getRemoteUser() { - // TODO configure test auth. - return null; - } - - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletRequest#getRequestURL() - */ - public StringBuffer getRequestURL() { - StringBuffer requestURL = new StringBuffer(HTTP + "://" + LOCALHOST - + getRequestURI()); - return requestURL; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletRequest#getRequestedSessionId() - */ - public String getRequestedSessionId() { - return StubHttpSession.SESSION_ID; - } - - - private StubHttpSession session; - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletRequest#getSession() - */ - public HttpSession getSession() { - if (session == null) { - session = new StubHttpSession(); - } - return session; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletRequest#getSession(boolean) - */ - public HttpSession getSession(boolean create) { - if (session == null && create) { - session = new StubHttpSession(); - } - return session; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletRequest#getUserPrincipal() - */ - public Principal getUserPrincipal() { - // TODO implement test auth. - return null; - } - - /* - * (non-Javadoc) - * - * @see - * javax.servlet.http.HttpServletRequest#isRequestedSessionIdFromCookie() - */ - public boolean isRequestedSessionIdFromCookie() { - // test do not supports cookie - return false; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdFromURL() - */ - public boolean isRequestedSessionIdFromURL() { - return true; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdFromUrl() - */ - public boolean isRequestedSessionIdFromUrl() { - return true; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdValid() - */ - public boolean isRequestedSessionIdValid() { - return session != null; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletRequest#isUserInRole(java.lang.String) - */ - public boolean isUserInRole(String role) { - // TODO implement test auth. - return false; - } - - private Map<String, Object> attributes = new HashMap<String, Object>(); - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletRequest#getAttribute(java.lang.String) - */ - public Object getAttribute(String name) { - return attributes.get(name); - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletRequest#getAttributeNames() - */ - @SuppressWarnings("unchecked") - public Enumeration getAttributeNames() { - return Collections.enumeration(attributes.keySet()); - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletRequest#getCharacterEncoding() - */ - public String getCharacterEncoding() { - return UTF8; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletRequest#getContentLength() - */ - public int getContentLength() { - return -1; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletRequest#getContentType() - */ - public String getContentType() { - return null; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletRequest#getInputStream() - */ - public ServletInputStream getInputStream() throws IOException { - // TODO implement post stream. - return null; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletRequest#getLocalAddr() - */ - public String getLocalAddr() { - return LOCALHOST_IP; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletRequest#getLocalName() - */ - public String getLocalName() { - return LOCALHOST; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletRequest#getLocalPort() - */ - public int getLocalPort() { - return 80; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletRequest#getLocale() - */ - public Locale getLocale() { - return Locale.US; - } - - private final ImmutableCollection<Locale> locales = ImmutableList.of( - Locale.US, Locale.GERMANY); - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletRequest#getLocales() - */ - public Enumeration getLocales() { - // TODO Auto-generated method stub - return Collections.enumeration(locales); - } - - private String characterEncoding; - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletRequest#getProtocol() - */ - public String getProtocol() { - return "HTTP/1.1"; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletRequest#getReader() - */ - public BufferedReader getReader() throws IOException { - // TODO implements request buffer. - return null; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletRequest#getRealPath(java.lang.String) - */ - public String getRealPath(String path) { - return null; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletRequest#getRemoteAddr() - */ - public String getRemoteAddr() { - return LOCALHOST_IP; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletRequest#getRemoteHost() - */ - public String getRemoteHost() { - return LOCALHOST; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletRequest#getRemotePort() - */ - public int getRemotePort() { - return 1223340; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletRequest#getRequestDispatcher(java.lang.String) - */ - public RequestDispatcher getRequestDispatcher(String path) { - // TODO Auto-generated method stub - return null; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletRequest#getScheme() - */ - public String getScheme() { - return HTTP; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletRequest#getServerName() - */ - public String getServerName() { - return LOCALHOST; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletRequest#getServerPort() - */ - public int getServerPort() { - return 80; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletRequest#isSecure() - */ - public boolean isSecure() { - return false; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletRequest#removeAttribute(java.lang.String) - */ - public void removeAttribute(String name) { - attributes.remove(name); - - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletRequest#setAttribute(java.lang.String, - * java.lang.Object) - */ - public void setAttribute(String name, Object o) { - attributes.put(name, o); - - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletRequest#setCharacterEncoding(java.lang.String) - */ - public void setCharacterEncoding(String env) - throws UnsupportedEncodingException { - this.characterEncoding=env; - - } - -} Deleted: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StubHttpResponse.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/stub/StubHttpResponse.java 2008-10-30 00:26:08 UTC (rev 10973) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StubHttpResponse.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -1,402 +0,0 @@ -/** - * - */ -package org.richfaces.test.stub; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; - -import javax.servlet.ServletOutputStream; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletResponse; - -/** - * @author asmirnov - * - */ -public abstract class StubHttpResponse implements HttpServletResponse { - - - private int status = 0; - - private String redirectLocation = null; - - private String errorMessage = null; - - private int bufferSize = 8196; - - private StringWriter outputWriter; - - private ByteArrayOutputStream outputStream; - - private PrintWriter printWriter; - - private ServletOutputStream servletOutputStream; - - private Locale locale = Locale.US; - - - /* - * (non-Javadoc) - * - * @see - * javax.servlet.http.HttpServletResponse#addDateHeader(java.lang.String, - * long) - */ - public void addDateHeader(String name, long date) { - // TODO Auto-generated method stub - - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletResponse#addHeader(java.lang.String, - * java.lang.String) - */ - public void addHeader(String name, String value) { - // TODO Auto-generated method stub - - } - - /* - * (non-Javadoc) - * - * @see - * javax.servlet.http.HttpServletResponse#addIntHeader(java.lang.String, - * int) - */ - public void addIntHeader(String name, int value) { - // TODO Auto-generated method stub - - } - - /* - * (non-Javadoc) - * - * @see - * javax.servlet.http.HttpServletResponse#containsHeader(java.lang.String) - */ - public boolean containsHeader(String name) { - // TODO Auto-generated method stub - return false; - } - - /* - * (non-Javadoc) - * - * @see - * javax.servlet.http.HttpServletResponse#encodeRedirectURL(java.lang.String - * ) - */ - public String encodeRedirectURL(String url) { - return url; - } - - /* - * (non-Javadoc) - * - * @see - * javax.servlet.http.HttpServletResponse#encodeRedirectUrl(java.lang.String - * ) - */ - public String encodeRedirectUrl(String url) { - // TODO Auto-generated method stub - return encodeRedirectURL(url); - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletResponse#encodeURL(java.lang.String) - */ - public String encodeURL(String url) { - return url; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletResponse#encodeUrl(java.lang.String) - */ - public String encodeUrl(String url) { - return encodeURL(url); - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletResponse#sendError(int) - */ - public void sendError(int sc) throws IOException { - status = sc; - - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletResponse#sendError(int, - * java.lang.String) - */ - public void sendError(int sc, String msg) throws IOException { - status = sc; - errorMessage = msg; - } - - /* - * (non-Javadoc) - * - * @see - * javax.servlet.http.HttpServletResponse#sendRedirect(java.lang.String) - */ - public void sendRedirect(String location) throws IOException { - redirectLocation = location; - } - - /* - * (non-Javadoc) - * - * @see - * javax.servlet.http.HttpServletResponse#setDateHeader(java.lang.String, - * long) - */ - public void setDateHeader(String name, long date) { - // TODO Auto-generated method stub - - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletResponse#setHeader(java.lang.String, - * java.lang.String) - */ - public void setHeader(String name, String value) { - // TODO Auto-generated method stub - - } - - /* - * (non-Javadoc) - * - * @see - * javax.servlet.http.HttpServletResponse#setIntHeader(java.lang.String, - * int) - */ - public void setIntHeader(String name, int value) { - // TODO Auto-generated method stub - - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletResponse#setStatus(int) - */ - public void setStatus(int sc) { - status = sc; - - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletResponse#setStatus(int, - * java.lang.String) - */ - public void setStatus(int sc, String sm) { - status = sc; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletResponse#flushBuffer() - */ - public void flushBuffer() throws IOException { - // do nothing - - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletResponse#getBufferSize() - */ - public int getBufferSize() { - return bufferSize; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletResponse#getCharacterEncoding() - */ - public String getCharacterEncoding() { - return StubHttpRequest.UTF8; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletResponse#getContentType() - */ - public String getContentType() { - return "text/html;charset=UTF-8"; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletResponse#getLocale() - */ - public Locale getLocale() { - return locale; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletResponse#getOutputStream() - */ - public ServletOutputStream getOutputStream() throws IOException { - if (null != this.outputWriter) { - throw new IllegalStateException(); - } - if (this.outputStream == null) { - this.outputStream = new ByteArrayOutputStream(getBufferSize()); - servletOutputStream = new ServletOutputStream(){ - - @Override - public void write(int b) throws IOException { - StubHttpResponse.this.outputStream.write(b); - } - - }; - } - return servletOutputStream; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletResponse#getWriter() - */ - public PrintWriter getWriter() throws IOException { - if (null != this.outputStream) { - throw new IllegalStateException(); - } - if (this.outputWriter == null) { - this.outputWriter = new StringWriter(getBufferSize()); - printWriter = new PrintWriter(outputWriter); - } - return printWriter; - } - - - public String getWriterContent() { - if(null != this.outputWriter){ - return this.outputWriter.toString(); - } - return null; - } - - public byte[] getStreamContent() { - if(null!=outputStream){ - return outputStream.toByteArray(); - } - return null; - } - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletResponse#isCommitted() - */ - public boolean isCommitted() { - // TODO Auto-generated method stub - return false; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletResponse#reset() - */ - public void reset() { - if(isCommitted()){ - throw new IllegalStateException(); - } - resetBuffer(); - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletResponse#resetBuffer() - */ - public void resetBuffer() { - if(isCommitted()){ - throw new IllegalStateException(); - } - this.servletOutputStream = null; - this.outputStream = null; - this.printWriter = null; - this.outputWriter = null; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletResponse#setBufferSize(int) - */ - public void setBufferSize(int size) { - this.bufferSize = size; - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletResponse#setCharacterEncoding(java.lang.String) - */ - public void setCharacterEncoding(String charset) { - // TODO Auto-generated method stub - - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletResponse#setContentLength(int) - */ - public void setContentLength(int len) { - // TODO Auto-generated method stub - - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletResponse#setContentType(java.lang.String) - */ - public void setContentType(String type) { - // TODO Auto-generated method stub - - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletResponse#setLocale(java.util.Locale) - */ - public void setLocale(Locale loc) { - this.locale = loc; - - } - -} Deleted: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StubHttpSession.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/stub/StubHttpSession.java 2008-10-30 00:26:08 UTC (rev 10973) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StubHttpSession.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -1,156 +0,0 @@ -/** - * - */ -package org.richfaces.test.stub; - -import java.util.Enumeration; - -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionContext; - -/** - * @author asmirnov - * - */ -public class StubHttpSession implements HttpSession { - - public static final String SESSION_ID="1234567890"; - - /* (non-Javadoc) - * @see javax.servlet.http.HttpSession#getAttribute(java.lang.String) - */ - public Object getAttribute(String name) { - // TODO Auto-generated method stub - return null; - } - - /* (non-Javadoc) - * @see javax.servlet.http.HttpSession#getAttributeNames() - */ - public Enumeration getAttributeNames() { - // TODO Auto-generated method stub - return null; - } - - /* (non-Javadoc) - * @see javax.servlet.http.HttpSession#getCreationTime() - */ - public long getCreationTime() { - // TODO Auto-generated method stub - return 0; - } - - /* (non-Javadoc) - * @see javax.servlet.http.HttpSession#getId() - */ - public String getId() { - // TODO Auto-generated method stub - return null; - } - - /* (non-Javadoc) - * @see javax.servlet.http.HttpSession#getLastAccessedTime() - */ - public long getLastAccessedTime() { - // TODO Auto-generated method stub - return 0; - } - - /* (non-Javadoc) - * @see javax.servlet.http.HttpSession#getMaxInactiveInterval() - */ - public int getMaxInactiveInterval() { - // TODO Auto-generated method stub - return 0; - } - - /* (non-Javadoc) - * @see javax.servlet.http.HttpSession#getServletContext() - */ - public ServletContext getServletContext() { - // TODO Auto-generated method stub - return null; - } - - /* (non-Javadoc) - * @see javax.servlet.http.HttpSession#getSessionContext() - */ - public HttpSessionContext getSessionContext() { - // TODO Auto-generated method stub - return null; - } - - /* (non-Javadoc) - * @see javax.servlet.http.HttpSession#getValue(java.lang.String) - */ - public Object getValue(String name) { - // TODO Auto-generated method stub - return null; - } - - /* (non-Javadoc) - * @see javax.servlet.http.HttpSession#getValueNames() - */ - public String[] getValueNames() { - // TODO Auto-generated method stub - return null; - } - - /* (non-Javadoc) - * @see javax.servlet.http.HttpSession#invalidate() - */ - public void invalidate() { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see javax.servlet.http.HttpSession#isNew() - */ - public boolean isNew() { - // TODO Auto-generated method stub - return false; - } - - /* (non-Javadoc) - * @see javax.servlet.http.HttpSession#putValue(java.lang.String, java.lang.Object) - */ - public void putValue(String name, Object value) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see javax.servlet.http.HttpSession#removeAttribute(java.lang.String) - */ - public void removeAttribute(String name) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see javax.servlet.http.HttpSession#removeValue(java.lang.String) - */ - public void removeValue(String name) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see javax.servlet.http.HttpSession#setAttribute(java.lang.String, java.lang.Object) - */ - public void setAttribute(String name, Object value) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see javax.servlet.http.HttpSession#setMaxInactiveInterval(int) - */ - public void setMaxInactiveInterval(int interval) { - // TODO Auto-generated method stub - - } - -} Deleted: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StubServletConfig.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/stub/StubServletConfig.java 2008-10-30 00:26:08 UTC (rev 10973) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StubServletConfig.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -1,70 +0,0 @@ -/** - * - */ -package org.richfaces.test.stub; - -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; - -/** - * @author asmirnov - * - */ -public class StubServletConfig implements ServletConfig { - - public static final String FACES_SERVLET = "Faces Servlet"; - - private final ServletContext context; - - private Map<String, String> initParameters ; - - - - public StubServletConfig(ServletContext context) { - this.context = context; - this.initParameters = new HashMap<String, String>(); - } - - public StubServletConfig(ServletContext context,Map<String, String> initParameters) { - this.context = context; - this.initParameters = initParameters; - } - /* (non-Javadoc) - * @see javax.servlet.ServletConfig#getInitParameter(java.lang.String) - */ - public String getInitParameter(String name) { - return initParameters.get(name); - } - - /* (non-Javadoc) - * @see javax.servlet.ServletConfig#getInitParameterNames() - */ - @SuppressWarnings("unchecked") - public Enumeration getInitParameterNames() { - return Collections.enumeration(initParameters.keySet()); - } - - public void setInitParameter(String name, String value) { - initParameters.put(name, value); - } - - /* (non-Javadoc) - * @see javax.servlet.ServletConfig#getServletContext() - */ - public ServletContext getServletContext() { - return context; - } - - /* (non-Javadoc) - * @see javax.servlet.ServletConfig#getServletName() - */ - public String getServletName() { - return FACES_SERVLET; - } - -} Deleted: branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StubServletContext.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/stub/StubServletContext.java 2008-10-30 00:26:08 UTC (rev 10973) +++ branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StubServletContext.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -1,267 +0,0 @@ -/** - * - */ -package org.richfaces.test.stub; - -import java.io.IOException; -import java.io.InputStream; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Collection; -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -import javax.servlet.RequestDispatcher; -import javax.servlet.Servlet; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; - -/** - * @author asmirnov - * - */ -public class StubServletContext implements ServletContext { - - public static final String CONTEXT_PATH = ""; - private final Map<String, Object> attributes = new HashMap<String, Object>(); - private final ServerResource serverRoot; - - private Map<String,String> initParameters = new HashMap<String, String>(); - - public StubServletContext(ServerResource serverRoot) { - this.serverRoot = serverRoot; - } - - /* (non-Javadoc) - * @see javax.servlet.ServletContext#getAttribute(java.lang.String) - */ - public Object getAttribute(String name) { - return attributes.get(name); - } - - /* (non-Javadoc) - * @see javax.servlet.ServletContext#getAttributeNames() - */ - @SuppressWarnings("unchecked") - public Enumeration getAttributeNames() { - return Collections.enumeration(attributes.keySet()); - } - - /* (non-Javadoc) - * @see javax.servlet.ServletContext#getContext(java.lang.String) - */ - public ServletContext getContext(String uripath) { - // stub server has only one context. - return null; - } - - /* (non-Javadoc) - * @see javax.servlet.ServletContext#getContextPath() - */ - public String getContextPath() { - // Test always run in the root context. - return CONTEXT_PATH; - } - - public void addInitParameters(Map<String,String>parameters) { - initParameters.putAll(parameters); - } - /* (non-Javadoc) - * @see javax.servlet.ServletContext#getInitParameter(java.lang.String) - */ - public String getInitParameter(String name) { - return initParameters.get(name); - } - - - /** - * Put new init parameter to the Map. - * @param name - * @param value - */ - public void setInitParameter(String name, String value) { - initParameters.put(name, value); - } - - /* (non-Javadoc) - * @see javax.servlet.ServletContext#getInitParameterNames() - */ - @SuppressWarnings("unchecked") - public Enumeration getInitParameterNames() { - return Collections.enumeration(initParameters.keySet()); - } - - /* (non-Javadoc) - * @see javax.servlet.ServletContext#getMajorVersion() - */ - public int getMajorVersion() { - return 2; - } - - /* (non-Javadoc) - * @see javax.servlet.ServletContext#getMimeType(java.lang.String) - */ - public String getMimeType(String file) { - // TODO create mime-types table. - return null; - } - - /* (non-Javadoc) - * @see javax.servlet.ServletContext#getMinorVersion() - */ - public int getMinorVersion() { - return 5; - } - - /* (non-Javadoc) - * @see javax.servlet.ServletContext#getNamedDispatcher(java.lang.String) - */ - public RequestDispatcher getNamedDispatcher(String name) { - // TODO create stub dispatcher. - return null; - } - - /* (non-Javadoc) - * @see javax.servlet.ServletContext#getRealPath(java.lang.String) - */ - public String getRealPath(String path) { - // we always use 'virtual' configuration. - return null; - } - - /* (non-Javadoc) - * @see javax.servlet.ServletContext#getRequestDispatcher(java.lang.String) - */ - public RequestDispatcher getRequestDispatcher(String path) { - // TODO implement stub dispatcher. - return null; - } - - /* (non-Javadoc) - * @see javax.servlet.ServletContext#getResource(java.lang.String) - */ - public URL getResource(String path) throws MalformedURLException { - URL url = null; - ServerResource resource = getServerResource(path); - if(null != resource){ - url = resource.getURL(); - } - return url; - } - - /** - * @param path - * @return - */ - protected ServerResource getServerResource(String path) { - return serverRoot.getResource(new ServerResourcePath(path)); - } - - /* (non-Javadoc) - * @see javax.servlet.ServletContext#getResourceAsStream(java.lang.String) - */ - public InputStream getResourceAsStream(String path) { - ServerResource resource = getServerResource(path); - if(null != resource){ - try { - return resource.getAsStream(); - } catch (IOException e) { - return null; - } - } - return null; - } - - /* (non-Javadoc) - * @see javax.servlet.ServletContext#getResourcePaths(java.lang.String) - */ - @SuppressWarnings("unchecked") - public Set getResourcePaths(String path) { - ServerResource resource = getServerResource(path); - if(null != resource){ - return resource.getPaths(); - } - return null; - } - - /* (non-Javadoc) - * @see javax.servlet.ServletContext#getServerInfo() - */ - public String getServerInfo() { - return "Stub test server"; - } - - /* (non-Javadoc) - * @see javax.servlet.ServletContext#getServlet(java.lang.String) - */ - public Servlet getServlet(String name) throws ServletException { - // always return null. - return null; - } - - /* (non-Javadoc) - * @see javax.servlet.ServletContext#getServletContextName() - */ - public String getServletContextName() { - // Stub server has no declared name. - return null; - } - - /* (non-Javadoc) - * @see javax.servlet.ServletContext#getServletNames() - */ - @SuppressWarnings("unchecked") - public Enumeration getServletNames() { - return Collections.enumeration(Collections.EMPTY_LIST); - } - - /* (non-Javadoc) - * @see javax.servlet.ServletContext#getServlets() - */ - @SuppressWarnings("unchecked") - public Enumeration getServlets() { - return Collections.enumeration(Collections.EMPTY_LIST); - } - - /* (non-Javadoc) - * @see javax.servlet.ServletContext#log(java.lang.String) - */ - public void log(String msg) { - // TODO implement logging. - - } - - /* (non-Javadoc) - * @see javax.servlet.ServletContext#log(java.lang.Exception, java.lang.String) - */ - public void log(Exception exception, String msg) { - // TODO implement logging. - - } - - /* (non-Javadoc) - * @see javax.servlet.ServletContext#log(java.lang.String, java.lang.Throwable) - */ - public void log(String message, Throwable throwable) { - // TODO implement logging. - - } - - /* (non-Javadoc) - * @see javax.servlet.ServletContext#removeAttribute(java.lang.String) - */ - public void removeAttribute(String name) { - attributes.remove(name); - } - - /* (non-Javadoc) - * @see javax.servlet.ServletContext#setAttribute(java.lang.String, java.lang.Object) - */ - public void setAttribute(String name, Object object) { - attributes.put(name, object); - } - -} Copied: branches/jsf2.0/framework/jsf-test/src/main/resources/org/richfaces/test/faces-config.xml (from rev 11026, branches/jsf2.0/framework/jsf-test/src/test/resources/org/richfaces/test/faces-config.xml) =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/resources/org/richfaces/test/faces-config.xml (rev 0) +++ branches/jsf2.0/framework/jsf-test/src/main/resources/org/richfaces/test/faces-config.xml 2008-11-12 00:43:49 UTC (rev 11095) @@ -0,0 +1,69 @@ +<?xml version='1.0' encoding='UTF-8'?> + + + +<faces-config xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" + version="2.0"> + +  + <managed-bean> + <managed-bean-name>HelloBean</managed-bean-name> + <managed-bean-class>org.richfaces.test.HelloBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + +  + <navigation-rule> + <from-view-id>/hello.xhtml</from-view-id> + <navigation-case> + <from-outcome>success</from-outcome> + <to-view-id>/response.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + +  + <navigation-rule> + <from-view-id>/response.xhtml</from-view-id> + <navigation-case> + <from-outcome>success</from-outcome> + <to-view-id>/hello.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + +</faces-config> Copied: branches/jsf2.0/framework/jsf-test/src/main/resources/org/richfaces/test/web.xml (from rev 10995, branches/jsf2.0/framework/jsf-test/src/test/resources/org/richfaces/test/web.xml) =================================================================== --- branches/jsf2.0/framework/jsf-test/src/main/resources/org/richfaces/test/web.xml (rev 0) +++ branches/jsf2.0/framework/jsf-test/src/main/resources/org/richfaces/test/web.xml 2008-11-12 00:43:49 UTC (rev 11095) @@ -0,0 +1,59 @@ +<?xml version='1.0' encoding='UTF-8'?> + +<web-app version="2.5" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" > + + <display-name>Stub test</display-name> + <description> + Stub testing server + </description> + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>server</param-value> + </context-param> + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + <context-param> + <param-name>com.sun.faces.validateXml</param-name> + <param-value>true</param-value> + <description> + Set this flag to true if you want the JavaServer Faces + Reference Implementation to validate the XML in your + faces-config.xml resources against the DTD. Default + value is false. + </description> + </context-param> + <context-param> + <param-name>com.sun.faces.verifyObjects</param-name> + <param-value>true</param-value> + <description> + Set this flag to true if you want the JavaServer Faces + Reference Implementation to verify that all of the application + objects you have configured (components, converters, + renderers, and validators) can be successfully created. + Default value is false. + </description> + </context-param> + +  + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + </servlet> + + +  + + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + + +</web-app> + + Modified: branches/jsf2.0/framework/jsf-test/src/test/java/org/richfaces/test/FacesServerTest.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/test/java/org/richfaces/test/FacesServerTest.java 2008-11-11 20:12:38 UTC (rev 11094) +++ branches/jsf2.0/framework/jsf-test/src/test/java/org/richfaces/test/FacesServerTest.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -15,16 +15,21 @@ import javax.faces.application.StateManager; import javax.faces.application.ViewHandler; import javax.faces.webapp.FacesServlet; +import javax.servlet.http.HttpSession; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.w3c.dom.Element; import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.WebClient; +import com.gargoylesoftware.htmlunit.html.HtmlForm; +import com.gargoylesoftware.htmlunit.html.HtmlInput; import com.gargoylesoftware.htmlunit.html.HtmlPage; +import com.gargoylesoftware.htmlunit.html.SubmittableElement; import com.sun.faces.config.ConfigureListener; import com.sun.faces.util.FacesLogger; @@ -32,60 +37,22 @@ * @author asmirnov * */ -public class FacesServerTest { +public class FacesServerTest extends AbstractFacesTest { - private static ClassLoader contextClassLoader; - private static LocalServer facesServer; - /** * @throws java.lang.Exception */ - @BeforeClass - public static void setUpBeforeClass() throws Exception { - contextClassLoader = Thread.currentThread().getContextClassLoader(); - Thread.currentThread().setContextClassLoader( - LocalServer.class.getClassLoader()); - InputStream stream = FacesServerTest.class - .getResourceAsStream("logging.properties"); - if (null != stream) { - try { - LogManager.getLogManager().readConfiguration(stream); - } finally { - stream.close(); - } - } - facesServer = new LocalServer(); - facesServer.addServlet("*.jsf", new FacesServlet()); - facesServer.addResource("/WEB-INF/web.xml", - "org/richfaces/test/web.xml"); - facesServer.addResource("/WEB-INF/faces-config.xml", - "org/richfaces/test/faces-config.xml"); - facesServer.addResource("/hello.xhtml", "org/richfaces/test/hello.xhtml"); - facesServer.addInitParameter(StateManager.STATE_SAVING_METHOD_PARAM_NAME, StateManager.STATE_SAVING_METHOD_SERVER); - facesServer.addInitParameter(ViewHandler.DEFAULT_SUFFIX_PARAM_NAME, ".xhtml"); - facesServer.addInitParameter("com.sun.faces.validateXml", "true"); - facesServer.addInitParameter("com.sun.faces.verifyObjects", "true"); - facesServer.addWebListener(new ConfigureListener()); - facesServer.init(); - } - - /** - * @throws java.lang.Exception - */ - @AfterClass - public static void tearDownAfterClass() throws Exception { - facesServer.destroy(); - Thread.currentThread().setContextClassLoader(contextClassLoader); - } - - /** - * @throws java.lang.Exception - */ @Before public void setUp() throws Exception { } + @Override + protected void setupWebContent(StagingServer facesServer) { + facesServer.addResource("/hello.xhtml", "org/richfaces/test/hello.xhtml"); + facesServer.addResource("/response.xhtml", "org/richfaces/test/response.xhtml"); + facesServer.addResource("/wave.med.gif", "org/richfaces/test/wave.med.gif"); + } /** * @throws java.lang.Exception */ @@ -95,15 +62,33 @@ /** * Test method for - * {@link org.richfaces.test.LocalServer#getConnection(java.net.URL)}. + * {@link org.richfaces.test.StagingServer#getConnection(java.net.URL)}. * * @throws Exception */ @Test - public void testGetConnection() throws Exception { + public void testHelloFacelets() throws Exception { WebClient webClient = new LocalWebClient(facesServer); HtmlPage page = webClient.getPage("http://localhost/hello.jsf"); - System.out.println(page.asXml()); + System.out.println(page.asXml()); + Element submitElement = page.getElementById("helloForm:submit"); + HtmlForm htmlForm = page.getFormByName("helloForm"); + htmlForm.getInputByName("helloForm:username"); + assertNotNull(htmlForm); + HtmlInput input = htmlForm.getInputByName("helloForm:username"); + assertNotNull(input); + input.setValueAttribute("foo"); + HtmlPage responsePage = (HtmlPage) htmlForm.submit((SubmittableElement) submitElement); + assertNotNull(responsePage); + System.out.println(responsePage.asXml()); + HttpSession session = facesServer.getSession(false); + assertNotNull(session); + HelloBean bean = (HelloBean) session.getAttribute("HelloBean"); + assertNotNull(bean); + assertEquals("foo", bean.getName()); + Element span = responsePage.getElementById("responseform:userLabel"); + assertNotNull(span); + assertEquals("foo", span.getTextContent().trim()); } } Modified: branches/jsf2.0/framework/jsf-test/src/test/java/org/richfaces/test/stub/ServerResourcePathTest.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/test/java/org/richfaces/test/stub/ServerResourcePathTest.java 2008-11-11 20:12:38 UTC (rev 11094) +++ branches/jsf2.0/framework/jsf-test/src/test/java/org/richfaces/test/stub/ServerResourcePathTest.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -6,6 +6,7 @@ import static org.junit.Assert.*; import org.junit.Test; +import org.richfaces.test.staging.ServerResourcePath; /** * @author asmirnov @@ -14,7 +15,7 @@ public class ServerResourcePathTest { /** - * Test method for {@link org.richfaces.test.stub.ServerResourcePath#ServerResourcePath(java.lang.String)}. + * Test method for {@link org.richfaces.test.staging.ServerResourcePath#ServerResourcePath(java.lang.String)}. */ @Test public void testRootPath() { @@ -26,7 +27,7 @@ } /** - * Test method for {@link org.richfaces.test.stub.ServerResourcePath#ServerResourcePath(java.lang.String)}. + * Test method for {@link org.richfaces.test.staging.ServerResourcePath#ServerResourcePath(java.lang.String)}. */ @Test public void testWebInfPath() { @@ -44,7 +45,7 @@ } /** - * Test method for {@link org.richfaces.test.stub.ServerResourcePath#ServerResourcePath(java.lang.String)}. + * Test method for {@link org.richfaces.test.staging.ServerResourcePath#ServerResourcePath(java.lang.String)}. */ @Test public void testWebInfTrainingSlashPath() { @@ -63,7 +64,7 @@ /** - * Test method for {@link org.richfaces.test.stub.ServerResourcePath#ServerResourcePath(java.lang.String)}. + * Test method for {@link org.richfaces.test.staging.ServerResourcePath#ServerResourcePath(java.lang.String)}. */ @Test public void testWebXmlPath() { Modified: branches/jsf2.0/framework/jsf-test/src/test/java/org/richfaces/test/stub/ServerResourceTest.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/test/java/org/richfaces/test/stub/ServerResourceTest.java 2008-11-11 20:12:38 UTC (rev 11094) +++ branches/jsf2.0/framework/jsf-test/src/test/java/org/richfaces/test/stub/ServerResourceTest.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -11,6 +11,10 @@ import java.util.Set; import org.junit.Test; +import org.richfaces.test.staging.ClasspathServerResource; +import org.richfaces.test.staging.ServerResource; +import org.richfaces.test.staging.ServerResourcePath; +import org.richfaces.test.staging.ServerResourcesDirectory; /** * @author asmirnov @@ -46,7 +50,7 @@ /** * Test method for - * {@link org.richfaces.test.stub.ServerResourcesDirectory#addResource(org.richfaces.test.stub.ServerResourcePath, org.richfaces.test.stub.ServerResource)} + * {@link org.richfaces.test.staging.ServerResourcesDirectory#addResource(org.richfaces.test.staging.ServerResourcePath, org.richfaces.test.staging.ServerResource)} * . */ @Test @@ -69,7 +73,7 @@ /** * Test method for - * {@link org.richfaces.test.stub.ServerResourcesDirectory#getResource(org.richfaces.test.stub.ServerResourcePath)} + * {@link org.richfaces.test.staging.ServerResourcesDirectory#getResource(org.richfaces.test.staging.ServerResourcePath)} * . */ @Test @@ -90,7 +94,7 @@ /** * Test method for - * {@link org.richfaces.test.stub.ServerResourcesDirectory#getResource(org.richfaces.test.stub.ServerResourcePath)} + * {@link org.richfaces.test.staging.ServerResourcesDirectory#getResource(org.richfaces.test.staging.ServerResourcePath)} * . */ @Test @@ -107,7 +111,7 @@ /** * Test method for - * {@link org.richfaces.test.stub.ServerResourcesDirectory#getAsStream()}. + * {@link org.richfaces.test.staging.ServerResourcesDirectory#getAsStream()}. * * @throws IOException */ @@ -129,7 +133,7 @@ /** * Test method for - * {@link org.richfaces.test.stub.ServerResourcesDirectory#getURL()}. + * {@link org.richfaces.test.staging.ServerResourcesDirectory#getURL()}. */ @Test public void testGetURL() { Modified: branches/jsf2.0/framework/jsf-test/src/test/java/org/richfaces/test/stub/ServletTest.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/test/java/org/richfaces/test/stub/ServletTest.java 2008-11-11 20:12:38 UTC (rev 11094) +++ branches/jsf2.0/framework/jsf-test/src/test/java/org/richfaces/test/stub/ServletTest.java 2008-11-12 00:43:49 UTC (rev 11095) @@ -6,13 +6,18 @@ import javax.servlet.ServletException; import org.junit.Test; +import org.richfaces.test.staging.RequestChain; +import org.richfaces.test.staging.ServerResource; +import org.richfaces.test.staging.ServletContainer; +import org.richfaces.test.staging.StaticServlet; +import org.richfaces.test.staging.StagingServletContext; public class ServletTest { @Test public void testIsApplicable() { StaticServlet staticServlet = new StaticServlet(); - ServletContainer servlet = new ServletContainer("/foo/*",staticServlet); + RequestChain servlet = new ServletContainer("/foo/*",staticServlet); assertTrue(servlet.isApplicable("/foo/bar.jsf")); assertFalse(servlet.isApplicable("/foz/bar.jsf")); assertFalse(servlet.isApplicable("bar")); @@ -30,7 +35,7 @@ @Test public void testGetServletPath() { StaticServlet staticServlet = new StaticServlet(); - ServletContainer servlet = new ServletContainer("/foo/*",staticServlet); + RequestChain servlet = new ServletContainer("/foo/*",staticServlet); assertEquals("/foo/", servlet.getServletPath("/foo/bar.jsf")); assertNull(servlet.getServletPath("/foz/bar.jsf")); servlet = new ServletContainer("*.jsf",staticServlet); @@ -40,7 +45,7 @@ @Test public void testGetPathInfo() { StaticServlet staticServlet = new StaticServlet(); - ServletContainer servlet = new ServletContainer("/foo/*",staticServlet); + RequestChain servlet = new ServletContainer("/foo/*",staticServlet); assertEquals("bar.jsf", servlet.getPathInfo("/foo/bar.jsf")); assertNull(servlet.getPathInfo("/foz/bar.jsf")); servlet = new ServletContainer("*.jsf",staticServlet); @@ -51,8 +56,8 @@ @Test public void testInit() throws ServletException { StaticServlet staticServlet = new StaticServlet(); - ServletContainer servlet = new ServletContainer("/foo/*",staticServlet); - StubServletContext context = new StubServletContext(){ + RequestChain servlet = new ServletContainer("/foo/*",staticServlet); + StagingServletContext context = new StagingServletContext(){ @Override protected ServerResource getServerResource(String path) { Deleted: branches/jsf2.0/framework/jsf-test/src/test/resources/org/richfaces/test/faces-config.xml =================================================================== --- branches/jsf2.0/framework/jsf-test/src/test/resources/org/richfaces/test/faces-config.xml 2008-11-11 20:12:38 UTC (rev 11094) +++ branches/jsf2.0/framework/jsf-test/src/test/resources/org/richfaces/test/faces-config.xml 2008-11-12 00:43:49 UTC (rev 11095) @@ -1,69 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> - - - -<faces-config xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" - version="2.0"> - -  - <managed-bean> - <managed-bean-name>HelloBean</managed-bean-name> - <managed-bean-class>org.richfaces.test.HelloBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - -  - <navigation-rule> - <from-view-id>/hello.xhtml</from-view-id> - <navigation-case> - <from-outcome>success</from-outcome> - <to-view-id>/response.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - -  - <navigation-rule> - <from-view-id>/response.xhtml</from-view-id> - <navigation-case> - <from-outcome>success</from-outcome> - <to-view-id>/hello.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - -</faces-config> Added: branches/jsf2.0/framework/jsf-test/src/test/resources/org/richfaces/test/response.xhtml =================================================================== --- branches/jsf2.0/framework/jsf-test/src/test/resources/org/richfaces/test/response.xhtml (rev 0) +++ branches/jsf2.0/framework/jsf-test/src/test/resources/org/richfaces/test/response.xhtml 2008-11-12 00:43:49 UTC (rev 11095) @@ -0,0 +1,13 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html"> +<body> + + <h:form id="responseform"> + <h:graphicImage id="waveImg" url="/wave.med.gif" /> + <h2>Hi, <h:outputText id="userLabel" value=" #{HelloBean.name}" /> </h2> + <h:commandButton id="back" value="Back" action="success" /> + </h:form> +</body> +</html> \ No newline at end of file Property changes on: branches/jsf2.0/framework/jsf-test/src/test/resources/org/richfaces/test/response.xhtml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jsf2.0/framework/jsf-test/src/test/resources/org/richfaces/test/wave.med.gif =================================================================== (Binary files differ) Property changes on: branches/jsf2.0/framework/jsf-test/src/test/resources/org/richfaces/test/wave.med.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: branches/jsf2.0/framework/jsf-test/src/test/resources/org/richfaces/test/web.xml =================================================================== --- branches/jsf2.0/framework/jsf-test/src/test/resources/org/richfaces/test/web.xml 2008-11-11 20:12:38 UTC (rev 11094) +++ branches/jsf2.0/framework/jsf-test/src/test/resources/org/richfaces/test/web.xml 2008-11-12 00:43:49 UTC (rev 11095) @@ -1,59 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> - -<web-app version="2.5" - xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" > - - <display-name>Stub test</display-name> - <description> - Stub testing server - </description> - <context-param> - <param-name>javax.faces.STATE_SAVING_METHOD</param-name> - <param-value>server</param-value> - </context-param> - <context-param> - <param-name>javax.faces.DEFAULT_SUFFIX</param-name> - <param-value>.xhtml</param-value> - </context-param> - <context-param> - <param-name>com.sun.faces.validateXml</param-name> - <param-value>true</param-value> - <description> - Set this flag to true if you want the JavaServer Faces - Reference Implementation to validate the XML in your - faces-config.xml resources against the DTD. Default - value is false. - </description> - </context-param> - <context-param> - <param-name>com.sun.faces.verifyObjects</param-name> - <param-value>true</param-value> - <description> - Set this flag to true if you want the JavaServer Faces - Reference Implementation to verify that all of the application - objects you have configured (components, converters, - renderers, and validators) can be successfully created. - Default value is false. - </description> - </context-param> - -  - <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - </servlet> - - -  - - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>*.jsf</url-pattern> - </servlet-mapping> - - -</web-app> - -

17 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r11094 - in trunk/docs/migrationguide/en/src/main/resources: images and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: artdaw Date: 2008-11-11 15:12:38 -0500 (Tue, 11 Nov 2008) New Revision: 11094 Added: trunk/docs/migrationguide/en/src/main/resources/images/close.png trunk/docs/migrationguide/en/src/main/resources/images/feedback_logo.png trunk/docs/migrationguide/en/src/main/resources/script/effects.js trunk/docs/migrationguide/en/src/main/resources/script/prototype-1.6.0.2.js trunk/docs/migrationguide/en/src/main/resources/script/scriptaculous.js trunk/docs/migrationguide/en/src/main/resources/script/send_mail.php Modified: trunk/docs/migrationguide/en/src/main/resources/css/html.css trunk/docs/migrationguide/en/src/main/resources/script/toggle.js trunk/docs/migrationguide/en/src/main/resources/xslt/org/jboss/richfaces/xhtml.xsl Log: https://jira.jboss.org/jira/browse/RF-4644 - feedback was implemented in the multipage guide Modified: trunk/docs/migrationguide/en/src/main/resources/css/html.css =================================================================== --- trunk/docs/migrationguide/en/src/main/resources/css/html.css 2008-11-11 19:51:34 UTC (rev 11093) +++ trunk/docs/migrationguide/en/src/main/resources/css/html.css 2008-11-11 20:12:38 UTC (rev 11094) @@ -148,4 +148,120 @@ } div.table-contents table{ font-size:12px; +} + +* html div#feedback-wrapper {position: absolute; +top:expression(eval(document.compatMode && +document.compatMode=='CSS1Compat') ? +documentElement.scrollTop ++(documentElement.clientHeight-this.clientHeight) +: document.body.scrollTop ++(document.body.clientHeight-this.clientHeight));} + + +#feedback-wrapper{ + margin: 0px; + padding: 0px; + position:fixed; + bottom:0px; + right:0px; + height:322px; + width: 136px; + overflow: hidden; +} + +#feedback-link{ + float: left; + display: block; +} + +#feedback-state{ + font-weight: bold; + height: 20px; + width: 460px; + overflow: hidden; + float: left; +} +/* +#feedback-maincontainer{ + width: 520px; + height: 320px; + border: 1px dotted #CCC; + font-size: 12px; + font-family: Arial, Helvetica, sans-serif; + margin-left: 132px; + text-align:center; + background: #F5F5F5; + padding:0 50px 30px 10px; +} +*/ + +#feedback-maincontainer{ + z-index:2000; + padding: 5px; + text-align: center; + + background: #F5F5F5; + border: 1px solid #CCC; + position: fixed; + top: 250px; + left: 350px; + +} +*html #feedback-maincontainer{ + width: 550px; +} +#feedback-slidedown{ + z-index:2000; + padding: 5px; + text-align: left; + width:300px; + height:100px; + background: #F5F5F5; + border: 1px solid #CCC; + position: absolute; + top: -250px; + right:-400px; + overflow: hidden; +} + +.feedback-textbox-div{ + font-weight: bold; + padding-right: 20px; + margin: 5px 0px 5px 0px; + text-align: right; + color: #415973; + vertical-align: middle; +} + +#message{ + width: 200px; + height: 150px; + padding: 2px; +} + +.feedback-formbutton{ +font-size: 12px; +font-family: Arial, Helvetica, sans-serif; +color: #415973; +} + +.feedback-textbox, #message{ +background-color:#FFFFFF; +border:1px solid #A5ACB2; +padding:2px 1px 3px 5px; +width: 400px; +font-size: 12px; +font-family: Arial, Helvetica, sans-serif; +color: #000; +} + +.feedback-button-container{ +margin: 0px 5px 0px 0px; +} + +.feedback-images{ +border:0; +margin:0; +display: inline; } \ No newline at end of file Added: trunk/docs/migrationguide/en/src/main/resources/images/close.png =================================================================== (Binary files differ) Property changes on: trunk/docs/migrationguide/en/src/main/resources/images/close.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/docs/migrationguide/en/src/main/resources/images/feedback_logo.png =================================================================== (Binary files differ) Property changes on: trunk/docs/migrationguide/en/src/main/resources/images/feedback_logo.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/docs/migrationguide/en/src/main/resources/script/effects.js =================================================================== --- trunk/docs/migrationguide/en/src/main/resources/script/effects.js (rev 0) +++ trunk/docs/migrationguide/en/src/main/resources/script/effects.js 2008-11-11 20:12:38 UTC (rev 11094) @@ -0,0 +1,1122 @@ +// script.aculo.us effects.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008 + +// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) +// Contributors: +// Justin Palmer (http://encytemedia.com/) +// Mark Pilgrim (http://diveintomark.org/) +// Martin Bialasinki +// +// script.aculo.us is freely distributable under the terms of an MIT-style license. +// For details, see the script.aculo.us web site: http://script.aculo.us/ + +// converts rgb() and #xxx to #xxxxxx format, +// returns self (or first argument) if not convertable +String.prototype.parseColor = function() { + var color = '#'; + if (this.slice(0,4) == 'rgb(') { + var cols = this.slice(4,this.length-1).split(','); + var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3); + } else { + if (this.slice(0,1) == '#') { + if (this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase(); + if (this.length==7) color = this.toLowerCase(); + } + } + return (color.length==7 ? color : (arguments[0] || this)); +}; + +/*--------------------------------------------------------------------------*/ + +Element.collectTextNodes = function(element) { + return $A($(element).childNodes).collect( function(node) { + return (node.nodeType==3 ? node.nodeValue : + (node.hasChildNodes() ? Element.collectTextNodes(node) : '')); + }).flatten().join(''); +}; + +Element.collectTextNodesIgnoreClass = function(element, className) { + return $A($(element).childNodes).collect( function(node) { + return (node.nodeType==3 ? node.nodeValue : + ((node.hasChildNodes() && !Element.hasClassName(node,className)) ? + Element.collectTextNodesIgnoreClass(node, className) : '')); + }).flatten().join(''); +}; + +Element.setContentZoom = function(element, percent) { + element = $(element); + element.setStyle({fontSize: (percent/100) + 'em'}); + if (Prototype.Browser.WebKit) window.scrollBy(0,0); + return element; +}; + +Element.getInlineOpacity = function(element){ + return $(element).style.opacity || ''; +}; + +Element.forceRerendering = function(element) { + try { + element = $(element); + var n = document.createTextNode(' '); + element.appendChild(n); + element.removeChild(n); + } catch(e) { } +}; + +/*--------------------------------------------------------------------------*/ + +var Effect = { + _elementDoesNotExistError: { + name: 'ElementDoesNotExistError', + message: 'The specified DOM element does not exist, but is required for this effect to operate' + }, + Transitions: { + linear: Prototype.K, + sinoidal: function(pos) { + return (-Math.cos(pos*Math.PI)/2) + 0.5; + }, + reverse: function(pos) { + return 1-pos; + }, + flicker: function(pos) { + var pos = ((-Math.cos(pos*Math.PI)/4) + 0.75) + Math.random()/4; + return pos > 1 ? 1 : pos; + }, + wobble: function(pos) { + return (-Math.cos(pos*Math.PI*(9*pos))/2) + 0.5; + }, + pulse: function(pos, pulses) { + pulses = pulses || 5; + return ( + ((pos % (1/pulses)) * pulses).round() == 0 ? + ((pos * pulses * 2) - (pos * pulses * 2).floor()) : + 1 - ((pos * pulses * 2) - (pos * pulses * 2).floor()) + ); + }, + spring: function(pos) { + return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6)); + }, + none: function(pos) { + return 0; + }, + full: function(pos) { + return 1; + } + }, + DefaultOptions: { + duration: 1.0, // seconds + fps: 100, // 100= assume 66fps max. + sync: false, // true for combining + from: 0.0, + to: 1.0, + delay: 0.0, + queue: 'parallel' + }, + tagifyText: function(element) { + var tagifyStyle = 'position:relative'; + if (Prototype.Browser.IE) tagifyStyle += ';zoom:1'; + + element = $(element); + $A(element.childNodes).each( function(child) { + if (child.nodeType==3) { + child.nodeValue.toArray().each( function(character) { + element.insertBefore( + new Element('span', {style: tagifyStyle}).update( + character == ' ' ? String.fromCharCode(160) : character), + child); + }); + Element.remove(child); + } + }); + }, + multiple: function(element, effect) { + var elements; + if (((typeof element == 'object') || + Object.isFunction(element)) && + (element.length)) + elements = element; + else + elements = $(element).childNodes; + + var options = Object.extend({ + speed: 0.1, + delay: 0.0 + }, arguments[2] || { }); + var masterDelay = options.delay; + + $A(elements).each( function(element, index) { + new effect(element, Object.extend(options, { delay: index * options.speed + masterDelay })); + }); + }, + PAIRS: { + 'slide': ['SlideDown','SlideUp'], + 'blind': ['BlindDown','BlindUp'], + 'appear': ['Appear','Fade'] + }, + toggle: function(element, effect) { + element = $(element); + effect = (effect || 'appear').toLowerCase(); + var options = Object.extend({ + queue: { position:'end', scope:(element.id || 'global'), limit: 1 } + }, arguments[2] || { }); + Effect[element.visible() ? + Effect.PAIRS[effect][1] : Effect.PAIRS[effect][0]](element, options); + } +}; + +Effect.DefaultOptions.transition = Effect.Transitions.sinoidal; + +/* ------------- core effects ------------- */ + +Effect.ScopedQueue = Class.create(Enumerable, { + initialize: function() { + this.effects = []; + this.interval = null; + }, + _each: function(iterator) { + this.effects._each(iterator); + }, + add: function(effect) { + var timestamp = new Date().getTime(); + + var position = Object.isString(effect.options.queue) ? + effect.options.queue : effect.options.queue.position; + + switch(position) { + case 'front': + // move unstarted effects after this effect + this.effects.findAll(function(e){ return e.state=='idle' }).each( function(e) { + e.startOn += effect.finishOn; + e.finishOn += effect.finishOn; + }); + break; + case 'with-last': + timestamp = this.effects.pluck('startOn').max() || timestamp; + break; + case 'end': + // start effect after last queued effect has finished + timestamp = this.effects.pluck('finishOn').max() || timestamp; + break; + } + + effect.startOn += timestamp; + effect.finishOn += timestamp; + + if (!effect.options.queue.limit || (this.effects.length < effect.options.queue.limit)) + this.effects.push(effect); + + if (!this.interval) + this.interval = setInterval(this.loop.bind(this), 15); + }, + remove: function(effect) { + this.effects = this.effects.reject(function(e) { return e==effect }); + if (this.effects.length == 0) { + clearInterval(this.interval); + this.interval = null; + } + }, + loop: function() { + var timePos = new Date().getTime(); + for(var i=0, len=this.effects.length;i<len;i++) + this.effects[i] && this.effects[i].loop(timePos); + } +}); + +Effect.Queues = { + instances: $H(), + get: function(queueName) { + if (!Object.isString(queueName)) return queueName; + + return this.instances.get(queueName) || + this.instances.set(queueName, new Effect.ScopedQueue()); + } +}; +Effect.Queue = Effect.Queues.get('global'); + +Effect.Base = Class.create({ + position: null, + start: function(options) { + function codeForEvent(options,eventName){ + return ( + (options[eventName+'Internal'] ? 'this.options.'+eventName+'Internal(this);' : '') + + (options[eventName] ? 'this.options.'+eventName+'(this);' : '') + ); + } + if (options && options.transition === false) options.transition = Effect.Transitions.linear; + this.options = Object.extend(Object.extend({ },Effect.DefaultOptions), options || { }); + this.currentFrame = 0; + this.state = 'idle'; + this.startOn = this.options.delay*1000; + this.finishOn = this.startOn+(this.options.duration*1000); + this.fromToDelta = this.options.to-this.options.from; + this.totalTime = this.finishOn-this.startOn; + this.totalFrames = this.options.fps*this.options.duration; + + eval('this.render = function(pos){ '+ + 'if (this.state=="idle"){this.state="running";'+ + codeForEvent(this.options,'beforeSetup')+ + (this.setup ? 'this.setup();':'')+ + codeForEvent(this.options,'afterSetup')+ + '};if (this.state=="running"){'+ + 'pos=this.options.transition(pos)*'+this.fromToDelta+'+'+this.options.from+';'+ + 'this.position=pos;'+ + codeForEvent(this.options,'beforeUpdate')+ + (this.update ? 'this.update(pos);':'')+ + codeForEvent(this.options,'afterUpdate')+ + '}}'); + + this.event('beforeStart'); + if (!this.options.sync) + Effect.Queues.get(Object.isString(this.options.queue) ? + 'global' : this.options.queue.scope).add(this); + }, + loop: function(timePos) { + if (timePos >= this.startOn) { + if (timePos >= this.finishOn) { + this.render(1.0); + this.cancel(); + this.event('beforeFinish'); + if (this.finish) this.finish(); + this.event('afterFinish'); + return; + } + var pos = (timePos - this.startOn) / this.totalTime, + frame = (pos * this.totalFrames).round(); + if (frame > this.currentFrame) { + this.render(pos); + this.currentFrame = frame; + } + } + }, + cancel: function() { + if (!this.options.sync) + Effect.Queues.get(Object.isString(this.options.queue) ? + 'global' : this.options.queue.scope).remove(this); + this.state = 'finished'; + }, + event: function(eventName) { + if (this.options[eventName + 'Internal']) this.options[eventName + 'Internal'](this); + if (this.options[eventName]) this.options[eventName](this); + }, + inspect: function() { + var data = $H(); + for(property in this) + if (!Object.isFunction(this[property])) data.set(property, this[property]); + return '#<Effect:' + data.inspect() + ',options:' + $H(this.options).inspect() + '>'; + } +}); + +Effect.Parallel = Class.create(Effect.Base, { + initialize: function(effects) { + this.effects = effects || []; + this.start(arguments[1]); + }, + update: function(position) { + this.effects.invoke('render', position); + }, + finish: function(position) { + this.effects.each( function(effect) { + effect.render(1.0); + effect.cancel(); + effect.event('beforeFinish'); + if (effect.finish) effect.finish(position); + effect.event('afterFinish'); + }); + } +}); + +Effect.Tween = Class.create(Effect.Base, { + initialize: function(object, from, to) { + object = Object.isString(object) ? $(object) : object; + var args = $A(arguments), method = args.last(), + options = args.length == 5 ? args[3] : null; + this.method = Object.isFunction(method) ? method.bind(object) : + Object.isFunction(object[method]) ? object[method].bind(object) : + function(value) { object[method] = value }; + this.start(Object.extend({ from: from, to: to }, options || { })); + }, + update: function(position) { + this.method(position); + } +}); + +Effect.Event = Class.create(Effect.Base, { + initialize: function() { + this.start(Object.extend({ duration: 0 }, arguments[0] || { })); + }, + update: Prototype.emptyFunction +}); + +Effect.Opacity = Class.create(Effect.Base, { + initialize: function(element) { + this.element = $(element); + if (!this.element) throw(Effect._elementDoesNotExistError); + // make this work on IE on elements without 'layout' + if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout)) + this.element.setStyle({zoom: 1}); + var options = Object.extend({ + from: this.element.getOpacity() || 0.0, + to: 1.0 + }, arguments[1] || { }); + this.start(options); + }, + update: function(position) { + this.element.setOpacity(position); + } +}); + +Effect.Move = Class.create(Effect.Base, { + initialize: function(element) { + this.element = $(element); + if (!this.element) throw(Effect._elementDoesNotExistError); + var options = Object.extend({ + x: 0, + y: 0, + mode: 'relative' + }, arguments[1] || { }); + this.start(options); + }, + setup: function() { + this.element.makePositioned(); + this.originalLeft = parseFloat(this.element.getStyle('left') || '0'); + this.originalTop = parseFloat(this.element.getStyle('top') || '0'); + if (this.options.mode == 'absolute') { + this.options.x = this.options.x - this.originalLeft; + this.options.y = this.options.y - this.originalTop; + } + }, + update: function(position) { + this.element.setStyle({ + left: (this.options.x * position + this.originalLeft).round() + 'px', + top: (this.options.y * position + this.originalTop).round() + 'px' + }); + } +}); + +// for backwards compatibility +Effect.MoveBy = function(element, toTop, toLeft) { + return new Effect.Move(element, + Object.extend({ x: toLeft, y: toTop }, arguments[3] || { })); +}; + +Effect.Scale = Class.create(Effect.Base, { + initialize: function(element, percent) { + this.element = $(element); + if (!this.element) throw(Effect._elementDoesNotExistError); + var options = Object.extend({ + scaleX: true, + scaleY: true, + scaleContent: true, + scaleFromCenter: false, + scaleMode: 'box', // 'box' or 'contents' or { } with provided values + scaleFrom: 100.0, + scaleTo: percent + }, arguments[2] || { }); + this.start(options); + }, + setup: function() { + this.restoreAfterFinish = this.options.restoreAfterFinish || false; + this.elementPositioning = this.element.getStyle('position'); + + this.originalStyle = { }; + ['top','left','width','height','fontSize'].each( function(k) { + this.originalStyle[k] = this.element.style[k]; + }.bind(this)); + + this.originalTop = this.element.offsetTop; + this.originalLeft = this.element.offsetLeft; + + var fontSize = this.element.getStyle('font-size') || '100%'; + ['em','px','%','pt'].each( function(fontSizeType) { + if (fontSize.indexOf(fontSizeType)>0) { + this.fontSize = parseFloat(fontSize); + this.fontSizeType = fontSizeType; + } + }.bind(this)); + + this.factor = (this.options.scaleTo - this.options.scaleFrom)/100; + + this.dims = null; + if (this.options.scaleMode=='box') + this.dims = [this.element.offsetHeight, this.element.offsetWidth]; + if (/^content/.test(this.options.scaleMode)) + this.dims = [this.element.scrollHeight, this.element.scrollWidth]; + if (!this.dims) + this.dims = [this.options.scaleMode.originalHeight, + this.options.scaleMode.originalWidth]; + }, + update: function(position) { + var currentScale = (this.options.scaleFrom/100.0) + (this.factor * position); + if (this.options.scaleContent && this.fontSize) + this.element.setStyle({fontSize: this.fontSize * currentScale + this.fontSizeType }); + this.setDimensions(this.dims[0] * currentScale, this.dims[1] * currentScale); + }, + finish: function(position) { + if (this.restoreAfterFinish) this.element.setStyle(this.originalStyle); + }, + setDimensions: function(height, width) { + var d = { }; + if (this.options.scaleX) d.width = width.round() + 'px'; + if (this.options.scaleY) d.height = height.round() + 'px'; + if (this.options.scaleFromCenter) { + var topd = (height - this.dims[0])/2; + var leftd = (width - this.dims[1])/2; + if (this.elementPositioning == 'absolute') { + if (this.options.scaleY) d.top = this.originalTop-topd + 'px'; + if (this.options.scaleX) d.left = this.originalLeft-leftd + 'px'; + } else { + if (this.options.scaleY) d.top = -topd + 'px'; + if (this.options.scaleX) d.left = -leftd + 'px'; + } + } + this.element.setStyle(d); + } +}); + +Effect.Highlight = Class.create(Effect.Base, { + initialize: function(element) { + this.element = $(element); + if (!this.element) throw(Effect._elementDoesNotExistError); + var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] || { }); + this.start(options); + }, + setup: function() { + // Prevent executing on elements not in the layout flow + if (this.element.getStyle('display')=='none') { this.cancel(); return; } + // Disable background image during the effect + this.oldStyle = { }; + if (!this.options.keepBackgroundImage) { + this.oldStyle.backgroundImage = this.element.getStyle('background-image'); + this.element.setStyle({backgroundImage: 'none'}); + } + if (!this.options.endcolor) + this.options.endcolor = this.element.getStyle('background-color').parseColor('#ffffff'); + if (!this.options.restorecolor) + this.options.restorecolor = this.element.getStyle('background-color'); + // init color calculations + this._base = $R(0,2).map(function(i){ return parseInt(this.options.startcolor.slice(i*2+1,i*2+3),16) }.bind(this)); + this._delta = $R(0,2).map(function(i){ return parseInt(this.options.endcolor.slice(i*2+1,i*2+3),16)-this._base[i] }.bind(this)); + }, + update: function(position) { + this.element.setStyle({backgroundColor: $R(0,2).inject('#',function(m,v,i){ + return m+((this._base[i]+(this._delta[i]*position)).round().toColorPart()); }.bind(this)) }); + }, + finish: function() { + this.element.setStyle(Object.extend(this.oldStyle, { + backgroundColor: this.options.restorecolor + })); + } +}); + +Effect.ScrollTo = function(element) { + var options = arguments[1] || { }, + scrollOffsets = document.viewport.getScrollOffsets(), + elementOffsets = $(element).cumulativeOffset(), + max = (window.height || document.body.scrollHeight) - document.viewport.getHeight(); + + if (options.offset) elementOffsets[1] += options.offset; + + return new Effect.Tween(null, + scrollOffsets.top, + elementOffsets[1] > max ? max : elementOffsets[1], + options, + function(p){ scrollTo(scrollOffsets.left, p.round()) } + ); +}; + +/* ------------- combination effects ------------- */ + +Effect.Fade = function(element) { + element = $(element); + var oldOpacity = element.getInlineOpacity(); + var options = Object.extend({ + from: element.getOpacity() || 1.0, + to: 0.0, + afterFinishInternal: function(effect) { + if (effect.options.to!=0) return; + effect.element.hide().setStyle({opacity: oldOpacity}); + } + }, arguments[1] || { }); + return new Effect.Opacity(element,options); +}; + +Effect.Appear = function(element) { + element = $(element); + var options = Object.extend({ + from: (element.getStyle('display') == 'none' ? 0.0 : element.getOpacity() || 0.0), + to: 1.0, + // force Safari to render floated elements properly + afterFinishInternal: function(effect) { + effect.element.forceRerendering(); + }, + beforeSetup: function(effect) { + effect.element.setOpacity(effect.options.from).show(); + }}, arguments[1] || { }); + return new Effect.Opacity(element,options); +}; + +Effect.Puff = function(element) { + element = $(element); + var oldStyle = { + opacity: element.getInlineOpacity(), + position: element.getStyle('position'), + top: element.style.top, + left: element.style.left, + width: element.style.width, + height: element.style.height + }; + return new Effect.Parallel( + [ new Effect.Scale(element, 200, + { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }), + new Effect.Opacity(element, { sync: true, to: 0.0 } ) ], + Object.extend({ duration: 1.0, + beforeSetupInternal: function(effect) { + Position.absolutize(effect.effects[0].element) + }, + afterFinishInternal: function(effect) { + effect.effects[0].element.hide().setStyle(oldStyle); } + }, arguments[1] || { }) + ); +}; + +Effect.BlindUp = function(element) { + element = $(element); + element.makeClipping(); + return new Effect.Scale(element, 0, + Object.extend({ scaleContent: false, + scaleX: false, + restoreAfterFinish: true, + afterFinishInternal: function(effect) { + effect.element.hide().undoClipping(); + } + }, arguments[1] || { }) + ); +}; + +Effect.BlindDown = function(element) { + element = $(element); + var elementDimensions = element.getDimensions(); + return new Effect.Scale(element, 100, Object.extend({ + scaleContent: false, + scaleX: false, + scaleFrom: 0, + scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width}, + restoreAfterFinish: true, + afterSetup: function(effect) { + effect.element.makeClipping().setStyle({height: '0px'}).show(); + }, + afterFinishInternal: function(effect) { + effect.element.undoClipping(); + } + }, arguments[1] || { })); +}; + +Effect.SwitchOff = function(element) { + element = $(element); + var oldOpacity = element.getInlineOpacity(); + return new Effect.Appear(element, Object.extend({ + duration: 0.4, + from: 0, + transition: Effect.Transitions.flicker, + afterFinishInternal: function(effect) { + new Effect.Scale(effect.element, 1, { + duration: 0.3, scaleFromCenter: true, + scaleX: false, scaleContent: false, restoreAfterFinish: true, + beforeSetup: function(effect) { + effect.element.makePositioned().makeClipping(); + }, + afterFinishInternal: function(effect) { + effect.element.hide().undoClipping().undoPositioned().setStyle({opacity: oldOpacity}); + } + }) + } + }, arguments[1] || { })); +}; + +Effect.DropOut = function(element) { + element = $(element); + var oldStyle = { + top: element.getStyle('top'), + left: element.getStyle('left'), + opacity: element.getInlineOpacity() }; + return new Effect.Parallel( + [ new Effect.Move(element, {x: 0, y: 100, sync: true }), + new Effect.Opacity(element, { sync: true, to: 0.0 }) ], + Object.extend( + { duration: 0.5, + beforeSetup: function(effect) { + effect.effects[0].element.makePositioned(); + }, + afterFinishInternal: function(effect) { + effect.effects[0].element.hide().undoPositioned().setStyle(oldStyle); + } + }, arguments[1] || { })); +}; + +Effect.Shake = function(element) { + element = $(element); + var options = Object.extend({ + distance: 20, + duration: 0.5 + }, arguments[1] || {}); + var distance = parseFloat(options.distance); + var split = parseFloat(options.duration) / 10.0; + var oldStyle = { + top: element.getStyle('top'), + left: element.getStyle('left') }; + return new Effect.Move(element, + { x: distance, y: 0, duration: split, afterFinishInternal: function(effect) { + new Effect.Move(effect.element, + { x: -distance*2, y: 0, duration: split*2, afterFinishInternal: function(effect) { + new Effect.Move(effect.element, + { x: distance*2, y: 0, duration: split*2, afterFinishInternal: function(effect) { + new Effect.Move(effect.element, + { x: -distance*2, y: 0, duration: split*2, afterFinishInternal: function(effect) { + new Effect.Move(effect.element, + { x: distance*2, y: 0, duration: split*2, afterFinishInternal: function(effect) { + new Effect.Move(effect.element, + { x: -distance, y: 0, duration: split, afterFinishInternal: function(effect) { + effect.element.undoPositioned().setStyle(oldStyle); + }}) }}) }}) }}) }}) }}); +}; + +Effect.SlideDown = function(element) { + element = $(element).cleanWhitespace(); + // SlideDown need to have the content of the element wrapped in a container element with fixed height! + var oldInnerBottom = element.down().getStyle('bottom'); + var elementDimensions = element.getDimensions(); + return new Effect.Scale(element, 100, Object.extend({ + scaleContent: false, + scaleX: false, + scaleFrom: window.opera ? 0 : 1, + scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width}, + restoreAfterFinish: true, + afterSetup: function(effect) { + effect.element.makePositioned(); + effect.element.down().makePositioned(); + if (window.opera) effect.element.setStyle({top: ''}); + effect.element.makeClipping().setStyle({height: '0px'}).show(); + }, + afterUpdateInternal: function(effect) { + effect.element.down().setStyle({bottom: + (effect.dims[0] - effect.element.clientHeight) + 'px' }); + }, + afterFinishInternal: function(effect) { + effect.element.undoClipping().undoPositioned(); + effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom}); } + }, arguments[1] || { }) + ); +}; + +Effect.SlideUp = function(element) { + element = $(element).cleanWhitespace(); + var oldInnerBottom = element.down().getStyle('bottom'); + var elementDimensions = element.getDimensions(); + return new Effect.Scale(element, window.opera ? 0 : 1, + Object.extend({ scaleContent: false, + scaleX: false, + scaleMode: 'box', + scaleFrom: 100, + scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width}, + restoreAfterFinish: true, + afterSetup: function(effect) { + effect.element.makePositioned(); + effect.element.down().makePositioned(); + if (window.opera) effect.element.setStyle({top: ''}); + effect.element.makeClipping().show(); + }, + afterUpdateInternal: function(effect) { + effect.element.down().setStyle({bottom: + (effect.dims[0] - effect.element.clientHeight) + 'px' }); + }, + afterFinishInternal: function(effect) { + effect.element.hide().undoClipping().undoPositioned(); + effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom}); + } + }, arguments[1] || { }) + ); +}; + +// Bug in opera makes the TD containing this element expand for a instance after finish +Effect.Squish = function(element) { + return new Effect.Scale(element, window.opera ? 1 : 0, { + restoreAfterFinish: true, + beforeSetup: function(effect) { + effect.element.makeClipping(); + }, + afterFinishInternal: function(effect) { + effect.element.hide().undoClipping(); + } + }); +}; + +Effect.Grow = function(element) { + element = $(element); + var options = Object.extend({ + direction: 'center', + moveTransition: Effect.Transitions.sinoidal, + scaleTransition: Effect.Transitions.sinoidal, + opacityTransition: Effect.Transitions.full + }, arguments[1] || { }); + var oldStyle = { + top: element.style.top, + left: element.style.left, + height: element.style.height, + width: element.style.width, + opacity: element.getInlineOpacity() }; + + var dims = element.getDimensions(); + var initialMoveX, initialMoveY; + var moveX, moveY; + + switch (options.direction) { + case 'top-left': + initialMoveX = initialMoveY = moveX = moveY = 0; + break; + case 'top-right': + initialMoveX = dims.width; + initialMoveY = moveY = 0; + moveX = -dims.width; + break; + case 'bottom-left': + initialMoveX = moveX = 0; + initialMoveY = dims.height; + moveY = -dims.height; + break; + case 'bottom-right': + initialMoveX = dims.width; + initialMoveY = dims.height; + moveX = -dims.width; + moveY = -dims.height; + break; + case 'center': + initialMoveX = dims.width / 2; + initialMoveY = dims.height / 2; + moveX = -dims.width / 2; + moveY = -dims.height / 2; + break; + } + + return new Effect.Move(element, { + x: initialMoveX, + y: initialMoveY, + duration: 0.01, + beforeSetup: function(effect) { + effect.element.hide().makeClipping().makePositioned(); + }, + afterFinishInternal: function(effect) { + new Effect.Parallel( + [ new Effect.Opacity(effect.element, { sync: true, to: 1.0, from: 0.0, transition: options.opacityTransition }), + new Effect.Move(effect.element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }), + new Effect.Scale(effect.element, 100, { + scaleMode: { originalHeight: dims.height, originalWidth: dims.width }, + sync: true, scaleFrom: window.opera ? 1 : 0, transition: options.scaleTransition, restoreAfterFinish: true}) + ], Object.extend({ + beforeSetup: function(effect) { + effect.effects[0].element.setStyle({height: '0px'}).show(); + }, + afterFinishInternal: function(effect) { + effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle); + } + }, options) + ) + } + }); +}; + +Effect.Shrink = function(element) { + element = $(element); + var options = Object.extend({ + direction: 'center', + moveTransition: Effect.Transitions.sinoidal, + scaleTransition: Effect.Transitions.sinoidal, + opacityTransition: Effect.Transitions.none + }, arguments[1] || { }); + var oldStyle = { + top: element.style.top, + left: element.style.left, + height: element.style.height, + width: element.style.width, + opacity: element.getInlineOpacity() }; + + var dims = element.getDimensions(); + var moveX, moveY; + + switch (options.direction) { + case 'top-left': + moveX = moveY = 0; + break; + case 'top-right': + moveX = dims.width; + moveY = 0; + break; + case 'bottom-left': + moveX = 0; + moveY = dims.height; + break; + case 'bottom-right': + moveX = dims.width; + moveY = dims.height; + break; + case 'center': + moveX = dims.width / 2; + moveY = dims.height / 2; + break; + } + + return new Effect.Parallel( + [ new Effect.Opacity(element, { sync: true, to: 0.0, from: 1.0, transition: options.opacityTransition }), + new Effect.Scale(element, window.opera ? 1 : 0, { sync: true, transition: options.scaleTransition, restoreAfterFinish: true}), + new Effect.Move(element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }) + ], Object.extend({ + beforeStartInternal: function(effect) { + effect.effects[0].element.makePositioned().makeClipping(); + }, + afterFinishInternal: function(effect) { + effect.effects[0].element.hide().undoClipping().undoPositioned().setStyle(oldStyle); } + }, options) + ); +}; + +Effect.Pulsate = function(element) { + element = $(element); + var options = arguments[1] || { }; + var oldOpacity = element.getInlineOpacity(); + var transition = options.transition || Effect.Transitions.sinoidal; + var reverser = function(pos){ return transition(1-Effect.Transitions.pulse(pos, options.pulses)) }; + reverser.bind(transition); + return new Effect.Opacity(element, + Object.extend(Object.extend({ duration: 2.0, from: 0, + afterFinishInternal: function(effect) { effect.element.setStyle({opacity: oldOpacity}); } + }, options), {transition: reverser})); +}; + +Effect.Fold = function(element) { + element = $(element); + var oldStyle = { + top: element.style.top, + left: element.style.left, + width: element.style.width, + height: element.style.height }; + element.makeClipping(); + return new Effect.Scale(element, 5, Object.extend({ + scaleContent: false, + scaleX: false, + afterFinishInternal: function(effect) { + new Effect.Scale(element, 1, { + scaleContent: false, + scaleY: false, + afterFinishInternal: function(effect) { + effect.element.hide().undoClipping().setStyle(oldStyle); + } }); + }}, arguments[1] || { })); +}; + +Effect.Morph = Class.create(Effect.Base, { + initialize: function(element) { + this.element = $(element); + if (!this.element) throw(Effect._elementDoesNotExistError); + var options = Object.extend({ + style: { } + }, arguments[1] || { }); + + if (!Object.isString(options.style)) this.style = $H(options.style); + else { + if (options.style.include(':')) + this.style = options.style.parseStyle(); + else { + this.element.addClassName(options.style); + this.style = $H(this.element.getStyles()); + this.element.removeClassName(options.style); + var css = this.element.getStyles(); + this.style = this.style.reject(function(style) { + return style.value == css[style.key]; + }); + options.afterFinishInternal = function(effect) { + effect.element.addClassName(effect.options.style); + effect.transforms.each(function(transform) { + effect.element.style[transform.style] = ''; + }); + } + } + } + this.start(options); + }, + + setup: function(){ + function parseColor(color){ + if (!color || ['rgba(0, 0, 0, 0)','transparent'].include(color)) color = '#ffffff'; + color = color.parseColor(); + return $R(0,2).map(function(i){ + return parseInt( color.slice(i*2+1,i*2+3), 16 ) + }); + } + this.transforms = this.style.map(function(pair){ + var property = pair[0], value = pair[1], unit = null; + + if (value.parseColor('#zzzzzz') != '#zzzzzz') { + value = value.parseColor(); + unit = 'color'; + } else if (property == 'opacity') { + value = parseFloat(value); + if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout)) + this.element.setStyle({zoom: 1}); + } else if (Element.CSS_LENGTH.test(value)) { + var components = value.match(/^([\+\-]?[0-9\.]+)(.*)$/); + value = parseFloat(components[1]); + unit = (components.length == 3) ? components[2] : null; + } + + var originalValue = this.element.getStyle(property); + return { + style: property.camelize(), + originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0), + targetValue: unit=='color' ? parseColor(value) : value, + unit: unit + }; + }.bind(this)).reject(function(transform){ + return ( + (transform.originalValue == transform.targetValue) || + ( + transform.unit != 'color' && + (isNaN(transform.originalValue) || isNaN(transform.targetValue)) + ) + ) + }); + }, + update: function(position) { + var style = { }, transform, i = this.transforms.length; + while(i--) + style[(transform = this.transforms[i]).style] = + transform.unit=='color' ? '#'+ + (Math.round(transform.originalValue[0]+ + (transform.targetValue[0]-transform.originalValue[0])*position)).toColorPart() + + (Math.round(transform.originalValue[1]+ + (transform.targetValue[1]-transform.originalValue[1])*position)).toColorPart() + + (Math.round(transform.originalValue[2]+ + (transform.targetValue[2]-transform.originalValue[2])*position)).toColorPart() : + (transform.originalValue + + (transform.targetValue - transform.originalValue) * position).toFixed(3) + + (transform.unit === null ? '' : transform.unit); + this.element.setStyle(style, true); + } +}); + +Effect.Transform = Class.create({ + initialize: function(tracks){ + this.tracks = []; + this.options = arguments[1] || { }; + this.addTracks(tracks); + }, + addTracks: function(tracks){ + tracks.each(function(track){ + track = $H(track); + var data = track.values().first(); + this.tracks.push($H({ + ids: track.keys().first(), + effect: Effect.Morph, + options: { style: data } + })); + }.bind(this)); + return this; + }, + play: function(){ + return new Effect.Parallel( + this.tracks.map(function(track){ + var ids = track.get('ids'), effect = track.get('effect'), options = track.get('options'); + var elements = [$(ids) || $$(ids)].flatten(); + return elements.map(function(e){ return new effect(e, Object.extend({ sync:true }, options)) }); + }).flatten(), + this.options + ); + } +}); + +Element.CSS_PROPERTIES = $w( + 'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' + + 'borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth ' + + 'borderRightColor borderRightStyle borderRightWidth borderSpacing ' + + 'borderTopColor borderTopStyle borderTopWidth bottom clip color ' + + 'fontSize fontWeight height left letterSpacing lineHeight ' + + 'marginBottom marginLeft marginRight marginTop markerOffset maxHeight '+ + 'maxWidth minHeight minWidth opacity outlineColor outlineOffset ' + + 'outlineWidth paddingBottom paddingLeft paddingRight paddingTop ' + + 'right textIndent top width wordSpacing zIndex'); + +Element.CSS_LENGTH = /^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/; + +String.__parseStyleElement = document.createElement('div'); +String.prototype.parseStyle = function(){ + var style, styleRules = $H(); + if (Prototype.Browser.WebKit) + style = new Element('div',{style:this}).style; + else { + String.__parseStyleElement.innerHTML = '<div style="' + this + '"></div>'; + style = String.__parseStyleElement.childNodes[0].style; + } + + Element.CSS_PROPERTIES.each(function(property){ + if (style[property]) styleRules.set(property, style[property]); + }); + + if (Prototype.Browser.IE && this.include('opacity')) + styleRules.set('opacity', this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1]); + + return styleRules; +}; + +if (document.defaultView && document.defaultView.getComputedStyle) { + Element.getStyles = function(element) { + var css = document.defaultView.getComputedStyle($(element), null); + return Element.CSS_PROPERTIES.inject({ }, function(styles, property) { + styles[property] = css[property]; + return styles; + }); + }; +} else { + Element.getStyles = function(element) { + element = $(element); + var css = element.currentStyle, styles; + styles = Element.CSS_PROPERTIES.inject({ }, function(results, property) { + results[property] = css[property]; + return results; + }); + if (!styles.opacity) styles.opacity = element.getOpacity(); + return styles; + }; +}; + +Effect.Methods = { + morph: function(element, style) { + element = $(element); + new Effect.Morph(element, Object.extend({ style: style }, arguments[2] || { })); + return element; + }, + visualEffect: function(element, effect, options) { + element = $(element) + var s = effect.dasherize().camelize(), klass = s.charAt(0).toUpperCase() + s.substring(1); + new Effect[klass](element, options); + return element; + }, + highlight: function(element, options) { + element = $(element); + new Effect.Highlight(element, options); + return element; + } +}; + +$w('fade appear grow shrink fold blindUp blindDown slideUp slideDown '+ + 'pulsate shake puff squish switchOff dropOut').each( + function(effect) { + Effect.Methods[effect] = function(element, options){ + element = $(element); + Effect[effect.charAt(0).toUpperCase() + effect.substring(1)](element, options); + return element; + } + } +); + +$w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles').each( + function(f) { Effect.Methods[f] = Element[f]; } +); + +Element.addMethods(Effect.Methods); Property changes on: trunk/docs/migrationguide/en/src/main/resources/script/effects.js ___________________________________________________________________ Name: svn:executable + * Added: trunk/docs/migrationguide/en/src/main/resources/script/prototype-1.6.0.2.js =================================================================== --- trunk/docs/migrationguide/en/src/main/resources/script/prototype-1.6.0.2.js (rev 0) +++ trunk/docs/migrationguide/en/src/main/resources/script/prototype-1.6.0.2.js 2008-11-11 20:12:38 UTC (rev 11094) @@ -0,0 +1,4240 @@ +/* Prototype JavaScript framework, version 1.6.0.2 + * (c) 2005-2008 Sam Stephenson + * + * Prototype is freely distributable under the terms of an MIT-style license. + * For details, see the Prototype web site: http://www.prototypejs.org/ + * + *--------------------------------------------------------------------------*/ + +var Prototype = { + Version: '1.6.0.2', + + Browser: { + IE: !!(window.attachEvent && !window.opera), + Opera: !!window.opera, + WebKit: navigator.userAgent.indexOf('AppleWebKit/') > -1, + Gecko: navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('KHTML') == -1, + MobileSafari: !!navigator.userAgent.match(/Apple.*Mobile.*Safari/) + }, + + BrowserFeatures: { + XPath: !!document.evaluate, + ElementExtensions: !!window.HTMLElement, + SpecificElementExtensions: + document.createElement('div').__proto__ && + document.createElement('div').__proto__ !== + document.createElement('form').__proto__ + }, + + ScriptFragment: '<script[^>]*>([\\S\\s]*?)<\/script>', + JSONFilter: /^\/\*-secure-([\s\S]*)\*\/\s*$/, + + emptyFunction: function() { }, + K: function(x) { return x } +}; + +if (Prototype.Browser.MobileSafari) + Prototype.BrowserFeatures.SpecificElementExtensions = false; + + +/* Based on Alex Arnell's inheritance implementation. */ +var Class = { + create: function() { + var parent = null, properties = $A(arguments); + if (Object.isFunction(properties[0])) + parent = properties.shift(); + + function klass() { + this.initialize.apply(this, arguments); + } + + Object.extend(klass, Class.Methods); + klass.superclass = parent; + klass.subclasses = []; + + if (parent) { + var subclass = function() { }; + subclass.prototype = parent.prototype; + klass.prototype = new subclass; + parent.subclasses.push(klass); + } + + for (var i = 0; i < properties.length; i++) + klass.addMethods(properties[i]); + + if (!klass.prototype.initialize) + klass.prototype.initialize = Prototype.emptyFunction; + + klass.prototype.constructor = klass; + + return klass; + } +}; + +Class.Methods = { + addMethods: function(source) { + var ancestor = this.superclass && this.superclass.prototype; + var properties = Object.keys(source); + + if (!Object.keys({ toString: true }).length) + properties.push("toString", "valueOf"); + + for (var i = 0, length = properties.length; i < length; i++) { + var property = properties[i], value = source[property]; + if (ancestor && Object.isFunction(value) && + value.argumentNames().first() == "$super") { + var method = value, value = Object.extend((function(m) { + return function() { return ancestor[m].apply(this, arguments) }; + })(property).wrap(method), { + valueOf: function() { return method }, + toString: function() { return method.toString() } + }); + } + this.prototype[property] = value; + } + + return this; + } +}; + +var Abstract = { }; + +Object.extend = function(destination, source) { + for (var property in source) + destination[property] = source[property]; + return destination; +}; + +Object.extend(Object, { + inspect: function(object) { + try { + if (Object.isUndefined(object)) return 'undefined'; + if (object === null) return 'null'; + return object.inspect ? object.inspect() : String(object); + } catch (e) { + if (e instanceof RangeError) return '...'; + throw e; + } + }, + + toJSON: function(object) { + var type = typeof object; + switch (type) { + case 'undefined': + case 'function': + case 'unknown': return; + case 'boolean': return object.toString(); + } + + if (object === null) return 'null'; + if (object.toJSON) return object.toJSON(); + if (Object.isElement(object)) return; + + var results = []; + for (var property in object) { + var value = Object.toJSON(object[property]); + if (!Object.isUndefined(value)) + results.push(property.toJSON() + ': ' + value); + } + + return '{' + results.join(', ') + '}'; + }, + + toQueryString: function(object) { + return $H(object).toQueryString(); + }, + + toHTML: function(object) { + return object && object.toHTML ? object.toHTML() : String.interpret(object); + }, + + keys: function(object) { + var keys = []; + for (var property in object) + keys.push(property); + return keys; + }, + + values: function(object) { + var values = []; + for (var property in object) + values.push(object[property]); + return values; + }, + + clone: function(object) { + return Object.extend({ }, object); + }, + + isElement: function(object) { + return object && object.nodeType == 1; + }, + + isArray: function(object) { + return object != null && typeof object == "object" && + 'splice' in object && 'join' in object; + }, + + isHash: function(object) { + return object instanceof Hash; + }, + + isFunction: function(object) { + return typeof object == "function"; + }, + + isString: function(object) { + return typeof object == "string"; + }, + + isNumber: function(object) { + return typeof object == "number"; + }, + + isUndefined: function(object) { + return typeof object == "undefined"; + } +}); + +Object.extend(Function.prototype, { + argumentNames: function() { + var names = this.toString().match(/^[\s$]*function[^(]*\((.*?)$/)[1].split(",").invoke("strip"); + return names.length == 1 && !names[0] ? [] : names; + }, + + bind: function() { + if (arguments.length < 2 && Object.isUndefined(arguments[0])) return this; + var __method = this, args = $A(arguments), object = args.shift(); + return function() { + return __method.apply(object, args.concat($A(arguments))); + } + }, + + bindAsEventListener: function() { + var __method = this, args = $A(arguments), object = args.shift(); + return function(event) { + return __method.apply(object, [event || window.event].concat(args)); + } + }, + + curry: function() { + if (!arguments.length) return this; + var __method = this, args = $A(arguments); + return function() { + return __method.apply(this, args.concat($A(arguments))); + } + }, + + delay: function() { + var __method = this, args = $A(arguments), timeout = args.shift() * 1000; + return window.setTimeout(function() { + return __method.apply(__method, args); + }, timeout); + }, + + wrap: function(wrapper) { + var __method = this; + return function() { + return wrapper.apply(this, [__method.bind(this)].concat($A(arguments))); + } + }, + + methodize: function() { + if (this._methodized) return this._methodized; + var __method = this; + return this._methodized = function() { + return __method.apply(null, [this].concat($A(arguments))); + }; + } +}); + +Function.prototype.defer = Function.prototype.delay.curry(0.01); + +Date.prototype.toJSON = function() { + return '"' + this.getUTCFullYear() + '-' + + (this.getUTCMonth() + 1).toPaddedString(2) + '-' + + this.getUTCDate().toPaddedString(2) + 'T' + + this.getUTCHours().toPaddedString(2) + ':' + + this.getUTCMinutes().toPaddedString(2) + ':' + + this.getUTCSeconds().toPaddedString(2) + 'Z"'; +}; + +var Try = { + these: function() { + var returnValue; + + for (var i = 0, length = arguments.length; i < length; i++) { + var lambda = arguments[i]; + try { + returnValue = lambda(); + break; + } catch (e) { } + } + + return returnValue; + } +}; + +RegExp.prototype.match = RegExp.prototype.test; + +RegExp.escape = function(str) { + return String(str).replace(/([.*+?^=!:${}()|[\]\/\\])/g, '\\$1'); +}; + +/*--------------------------------------------------------------------------*/ + +var PeriodicalExecuter = Class.create({ + initialize: function(callback, frequency) { + this.callback = callback; + this.frequency = frequency; + this.currentlyExecuting = false; + + this.registerCallback(); + }, + + registerCallback: function() { + this.timer = setInterval(this.onTimerEvent.bind(this), this.frequency * 1000); + }, + + execute: function() { + this.callback(this); + }, + + stop: function() { + if (!this.timer) return; + clearInterval(this.timer); + this.timer = null; + }, + + onTimerEvent: function() { + if (!this.currentlyExecuting) { + try { + this.currentlyExecuting = true; + this.execute(); + } finally { + this.currentlyExecuting = false; + } + } + } +}); +Object.extend(String, { + interpret: function(value) { + return value == null ? '' : String(value); + }, + specialChar: { + '\b': '\\b', + '\t': '\\t', + '\n': '\\n', + '\f': '\\f', + '\r': '\\r', + '\\': '\\\\' + } +}); + +Object.extend(String.prototype, { + gsub: function(pattern, replacement) { + var result = '', source = this, match; + replacement = arguments.callee.prepareReplacement(replacement); + + while (source.length > 0) { + if (match = source.match(pattern)) { + result += source.slice(0, match.index); + result += String.interpret(replacement(match)); + source = source.slice(match.index + match[0].length); + } else { + result += source, source = ''; + } + } + return result; + }, + + sub: function(pattern, replacement, count) { + replacement = this.gsub.prepareReplacement(replacement); + count = Object.isUndefined(count) ? 1 : count; + + return this.gsub(pattern, function(match) { + if (--count < 0) return match[0]; + return replacement(match); + }); + }, + + scan: function(pattern, iterator) { + this.gsub(pattern, iterator); + return String(this); + }, + + truncate: function(length, truncation) { + length = length || 30; + truncation = Object.isUndefined(truncation) ? '...' : truncation; + return this.length > length ? + this.slice(0, length - truncation.length) + truncation : String(this); + }, + + strip: function() { + return this.replace(/^\s+/, '').replace(/\s+$/, ''); + }, + + stripTags: function() { + return this.replace(/<\/?[^>]+>/gi, ''); + }, + + stripScripts: function() { + return this.replace(new RegExp(Prototype.ScriptFragment, 'img'), ''); + }, + + extractScripts: function() { + var matchAll = new RegExp(Prototype.ScriptFragment, 'img'); + var matchOne = new RegExp(Prototype.ScriptFragment, 'im'); + return (this.match(matchAll) || []).map(function(scriptTag) { + var result = (scriptTag.match(matchOne) || ['', ''])[1]; + result = result.replace(/</,"<").replace(/\s* + + + + <div id="feedback-maincontainer" style="display:none"> + <div id="feedback-state"><xsl:text> </xsl:text></div> + <a href="#" onclick="$('feedback-maincontainer').hide(); return false;"> + <img src="images/close.png" class="feedback-images" /> + </a> + <form id="feedback-mailform"> + <div class="feedback-textbox-div"> + Subject:<input type="text" id="subject" title="Enter the subject of your message" class="feedback-textbox" /> + </div> + <div class="feedback-textbox-div"> + <span style="vertical-align: top;">Message:</span> + <textarea name="message" title="Type here the text of your message" id="message"><xsl:text> </xsl:text></textarea> + </div> + <div class="feedback-textbox-div"> + Your name:<input type="text" id="name" title="Enter your name" class="feedback-textbox" /> + </div> + <div class="feedback-textbox-div"> + Your email:<input type="text" id="email" title="Enter your email address" class="feedback-textbox" /> + </div> + <span class="feedback-button-container"> + <input type="submit" value="Send Message" class="feedback-formbutton" title="Send Message" /> + </span> + <span class="feedback-button-container"> + <input type="reset" value="Clear All Fields" class="feedback-formbutton" title="Clear All Fields" /> + </span> + </form> +</div> +<div id="feedback-wrapper"> + <a id="feedback-link" href="#" onclick="$('feedback-maincontainer').appear(); return false;"> + <img src="images/feedback_logo.png" class="feedback-images" width="136px"/> + </a> +</div> + + + + +  + + <p xmlns="http://www.w3.org/1999/xhtml"> + <xsl:attribute name="id"> + <xsl:text>title</xsl:text> + </xsl:attribute> + <a> + <xsl:attribute name="href"> + <xsl:value-of select="$siteHref" /> + </xsl:attribute> + <xsl:attribute name="class"> + <xsl:text>site_href</xsl:text> + </xsl:attribute> + <strong> + <xsl:value-of select="$siteLinkText"/> + </strong> + </a> + <a> + <xsl:attribute name="href"> + <xsl:value-of select="$docHref" /> + </xsl:attribute> + <xsl:attribute name="class"> + <xsl:text>doc_href</xsl:text> + </xsl:attribute> + <strong> + <xsl:value-of select="$docLinkText"/> + </strong> + </a> + </p> + </xsl:if> + <xsl:if test="$row2"> + <ul class="docnav" xmlns="http://www.w3.org/1999/xhtml"> + <li class="previous"> + <xsl:if test="count($prev)>0"> + <a accesskey="p"> + <xsl:attribute name="href"> + <xsl:call-template name="href.target"> + <xsl:with-param name="object" select="$prev"/> + </xsl:call-template> + </xsl:attribute> + <strong> + <xsl:call-template name="navig.content"> + <xsl:with-param name="direction" select="'prev'"/> + </xsl:call-template> + </strong> + </a> + </xsl:if> + </li> + <li class="next"> + <xsl:if test="count($next)>0"> + <a accesskey="n"> + <xsl:attribute name="href"> + <xsl:call-template name="href.target"> + <xsl:with-param name="object" select="$next"/> + </xsl:call-template> + </xsl:attribute> + <strong> + <xsl:call-template name="navig.content"> + <xsl:with-param name="direction" select="'next'"/> + </xsl:call-template> + </strong> + </a> + </xsl:if> + </li> + </ul> + </xsl:if> + </xsl:if> + <xsl:if test="$header.rule != 0"> + <hr/> + </xsl:if> + </xsl:if> +</xsl:template> + <xsl:template name="chunk"> <xsl:param name="node" select="."/>

17 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r11093 - in trunk/sandbox/ui/queue/src/main: java/org/richfaces/component and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2008-11-11 14:51:34 -0500 (Tue, 11 Nov 2008) New Revision: 11093 Modified: trunk/sandbox/ui/queue/src/main/config/component/queue.xml trunk/sandbox/ui/queue/src/main/java/org/richfaces/component/UIQueue.java trunk/sandbox/ui/queue/src/main/java/org/richfaces/renderkit/html/QueueRegistry.java Log: Queue: discovery services & renderer updated Modified: trunk/sandbox/ui/queue/src/main/config/component/queue.xml =================================================================== --- trunk/sandbox/ui/queue/src/main/config/component/queue.xml 2008-11-11 19:51:05 UTC (rev 11092) +++ trunk/sandbox/ui/queue/src/main/config/component/queue.xml 2008-11-11 19:51:34 UTC (rev 11093) @@ -35,7 +35,7 @@ <property> <name>name</name> <classname>java.lang.String</classname> - <defaultvalue>GLOBAL_QUEUE_NAME</defaultvalue> + <defaultvalue>""</defaultvalue> </property> <property> Modified: trunk/sandbox/ui/queue/src/main/java/org/richfaces/component/UIQueue.java =================================================================== --- trunk/sandbox/ui/queue/src/main/java/org/richfaces/component/UIQueue.java 2008-11-11 19:51:05 UTC (rev 11092) +++ trunk/sandbox/ui/queue/src/main/java/org/richfaces/component/UIQueue.java 2008-11-11 19:51:34 UTC (rev 11093) @@ -25,7 +25,6 @@ import javax.faces.component.UIComponent; import javax.faces.component.UIComponentBase; import javax.faces.component.UIForm; -import javax.faces.component.UIViewRoot; import javax.faces.context.FacesContext; /** @@ -48,22 +47,36 @@ return COMPONENT_FAMILY; } - @Override - public void setParent(UIComponent parent) { - if (parent != null && !(parent instanceof UIViewRoot) && !(parent instanceof UIForm)) { - throw new IllegalArgumentException("Queue component:" + getClientId(getFacesContext()) + - " should have UIViewRoot or UIForm as its immediate parent"); + private UIComponent findParentForm() { + UIComponent component = getParent(); + while (component != null && !(component instanceof UIForm)) { + component = component.getParent(); } - super.setParent(parent); + return component; } public String getClientName(FacesContext context) { - UIComponent parent = getParent(); - if (parent instanceof UIForm) { - return parent.getClientId(context) + NamingContainer.SEPARATOR_CHAR + getName(); + UIComponent form = findParentForm(); + String name = getName(); + String clientName; + + if (form != null) { + String formClientId = form.getClientId(context); + + if (name != null && name.length() != 0) { + clientName = formClientId + NamingContainer.SEPARATOR_CHAR + name; + } else { + clientName = formClientId; + } } else { - return context.getExternalContext().encodeNamespace(getName()); + if (name == null || name.length() == 0) { + name = UIQueue.GLOBAL_QUEUE_NAME; + } + + clientName = context.getExternalContext().encodeNamespace(name); } + + return clientName; } } Modified: trunk/sandbox/ui/queue/src/main/java/org/richfaces/renderkit/html/QueueRegistry.java =================================================================== --- trunk/sandbox/ui/queue/src/main/java/org/richfaces/renderkit/html/QueueRegistry.java 2008-11-11 19:51:05 UTC (rev 11092) +++ trunk/sandbox/ui/queue/src/main/java/org/richfaces/renderkit/html/QueueRegistry.java 2008-11-11 19:51:34 UTC (rev 11093) @@ -51,7 +51,7 @@ if (!registryMap.containsKey(clientName)) { registryMap.put(clientName, data); } else { - throw new IllegalArgumentException("Queue with name '" + clientName + "' has already been registered"); + context.getExternalContext().log("Queue with name '" + clientName + "' has already been registered"); } }

17 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r11092 - in trunk/framework/impl/src/main: javascript/ajaxjsf and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2008-11-11 14:51:05 -0500 (Tue, 11 Nov 2008) New Revision: 11092 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js Log: Queue: discovery services & renderer updated Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2008-11-11 19:06:29 UTC (rev 11091) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2008-11-11 19:51:05 UTC (rev 11092) @@ -317,24 +317,29 @@ options.put("status", status); } String queue = (String) componentAttributes.get(AJAX_QUEUE_ATTR); + String implicitQueue = null; + Integer requestDelay = (Integer) componentAttributes .get(AJAX_DELAY_ATTR); if (null != requestDelay && requestDelay.intValue() > 0) { options.put(AJAX_DELAY_ATTR, requestDelay); -// if (null == queue) { -// queue = clientId; -// } + if (null == queue) { + implicitQueue = clientId; + } } Boolean ignoreDupResponses = (Boolean) componentAttributes .get(AJAX_ABORT_ATTR); if (null != ignoreDupResponses && ignoreDupResponses.booleanValue()) { options.put(AJAX_ABORT_ATTR, JSReference.TRUE); -// if (null == queue) { -// queue = clientId; -// } + if (null == queue) { + implicitQueue = clientId; + } } + if (null != queue) { options.put(AJAX_QUEUE_ATTR, queue); + } else if (implicitQueue != null) { + options.put("implicitEventsQueue", clientId); } String namespace = facesContext.getExternalContext().encodeNamespace(""); Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js =================================================================== --- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-11-11 19:06:29 UTC (rev 11091) +++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-11-11 19:51:05 UTC (rev 11092) @@ -792,7 +792,7 @@ A4J.AJAX.Submit = function( containerId, formId, event , options ) { var query = A4J.AJAX.PrepareQuery(containerId, formId, event, options); if (query) { - var queue = A4J.AJAX.EventQueue.getOrCreateQueue(options.eventsQueue, options.requestId, options.namespace, formId); + var queue = A4J.AJAX.EventQueue.getOrCreateQueue(options, formId); if (queue) { queue.push(query, options); Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js =================================================================== --- trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js 2008-11-11 19:06:29 UTC (rev 11091) +++ trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js 2008-11-11 19:51:05 UTC (rev 11092) @@ -31,34 +31,51 @@ //TODO A4J.AJAX.EventQueue.getQueue ? -A4J.AJAX.EventQueue.getOrCreateQueue = function(queueName, requestId, namespace, formId) { - //uncomment to switch on global queue - var name = queueName || A4J.AJAX.EventQueue.DEFAULT_QUEUE_NAME; +A4J.AJAX.EventQueue.getOrCreateQueue = function(){ + var qualifyName = function(name, prefix) { + if (prefix) { + return prefix + ':' + name; + } else { + return name; + } + }; + + return function(options, formId) { + var queueName = options.eventsQueue; + var namespace = options.namespace; - var queue; - if (formId) { - queue = A4J.AJAX._eventQueues[formId + ":" + name]; - } - - if (!queue) { - queue = A4J.AJAX._eventQueues[namespace ? (namespace + ":" + name) : name]; - } - - if (!queue) { - name = queueName || requestId; - if (namespace) { - name = namespace + ":" + name; + var formQueueName; + var viewQueueName; + var implicitQueueName; + + if (queueName) { + formQueueName = qualifyName(queueName, formId); + viewQueueName = qualifyName(queueName, namespace); + + //TODO nick - support settings for default queue scope + implicitQueueName = viewQueueName; + } else { + formQueueName = formId; + viewQueueName = qualifyName(A4J.AJAX.EventQueue.DEFAULT_QUEUE_NAME, namespace); + + implicitQueueName = options.implicitEventsQueue; } - LOG.debug("Creating new transient queue '" + name + "' with default settings"); - queue = new A4J.AJAX.EventQueue(name); - queue._transient = true; + var queue = A4J.AJAX._eventQueues[formQueueName]; + if (!queue) { + queue = A4J.AJAX._eventQueues[viewQueueName]; + if (!queue && implicitQueueName) { + LOG.debug("Creating new transient queue '" + implicitQueueName + "' with default settings"); + queue = new A4J.AJAX.EventQueue(implicitQueueName); + queue._transient = true; + + A4J.AJAX.EventQueue.addQueue(queue); + } + } - A4J.AJAX.EventQueue.addQueue(queue); - } - - return queue; -}; + return queue; + } +}(); A4J.AJAX.EventQueue.prototype = function() { @@ -151,12 +168,18 @@ submit: function() { if (!this.request) { - var queueData = this.queue.shift(); + var queueData = this.queue[0]; + if (queueData) { - LOG.debug("Queue '" + this.name + "' will submit request NOW"); - - this.request = queueData.submit(); - this.request.queue = this; + if (queueData.delayPassed) { + this.queue.shift(); + LOG.debug("Queue '" + this.name + "' will submit request NOW"); + + this.request = queueData.submit(); + this.request.queue = this; + } else { + LOG.debug("Delay for request not passed yet, have to wait"); + } } else { LOG.debug("Queue '" + this.name + "' is empty, nothing to submit"); } @@ -189,6 +212,10 @@ nextQueueData.abortDelay(); } + //barrier element could be removed + //next element can be ready for submit + this.submit(); + return nextQueueData; }; @@ -248,10 +275,7 @@ } } else { LOG.debug("After request: queue not empty, processing next event in queue '" + this.name + "'"); - var queueData = this.queue[0]; - if (queueData.delayPassed) { - this.submit(); - } + this.submit(); } } }

17 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r11091 - in trunk/test-applications/seleniumTest/richfaces/src/main: java/org/ajax4jsf/bean/tree/rich and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: dsvyatobatsko Date: 2008-11-11 14:06:29 -0500 (Tue, 11 Nov 2008) New Revision: 11091 Added: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/Album.java trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/AudioLibrary.java trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/Performer.java trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/Song.java trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/swing/ trunk/test-applications/seleniumTest/richfaces/src/main/resources/audio-library.xml trunk/test-applications/seleniumTest/richfaces/src/main/resources/digester-rules.xml Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeTestBean.java trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/tree/treeTest.xhtml Log: tree tests Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeTestBean.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeTestBean.java 2008-11-11 18:41:36 UTC (rev 11090) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeTestBean.java 2008-11-11 19:06:29 UTC (rev 11091) @@ -23,16 +23,21 @@ import java.io.IOException; import java.io.InputStream; +import java.net.URL; import java.util.Properties; import javax.faces.FacesException; import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; +import org.ajax4jsf.bean.tree.rich.AudioLibrary; +import org.apache.commons.digester.Digester; +import org.apache.commons.digester.xmlrules.DigesterLoader; import org.richfaces.component.UITree; import org.richfaces.event.NodeSelectedEvent; import org.richfaces.model.TreeNode; import org.richfaces.model.TreeNodeImpl; +import org.xml.sax.SAXException; /** * Copied from demo @@ -101,6 +106,29 @@ return rootNode; } + private TreeNode<Object> richRootNode = null; + + public TreeNode<Object> getRichTreeNode() { + if (null == richRootNode) { + URL rulesUrl = TreeBuilder.class.getResource("/digester-rules.xml"); + Digester digester = DigesterLoader.createDigester(rulesUrl); + AudioLibrary library = new AudioLibrary(); + digester.push(library); + try { + digester.parse(TreeBuilder.class.getResourceAsStream("/audio-library.xml")); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (SAXException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + richRootNode = library; + } + + return richRootNode; + } + public String getNodeTitle() { return nodeTitle; } Added: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/Album.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/Album.java (rev 0) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/Album.java 2008-11-11 19:06:29 UTC (rev 11091) @@ -0,0 +1,126 @@ +package org.ajax4jsf.bean.tree.rich; + +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Map.Entry; + +import org.richfaces.model.TreeNode; + +public class Album implements TreeNode<Object> { + + /** + * serial version ID + */ + private static final long serialVersionUID = 443084062111349934L; + + private long id; + private Map<Object, TreeNode<Object>> songs = new LinkedHashMap<Object, TreeNode<Object>>(); + private String title; + private Integer year; + private Performer performer; + + public Album() { + setId(System.currentTimeMillis()); + } + +// +// TreeNode implementation +// + + public void addChild(Object identifier, TreeNode<Object> child) { + songs.put(identifier, child); + } + + public TreeNode<Object> getChild(Object id) { + return songs.get(id); + } + + public Iterator<Entry<Object, TreeNode<Object>>> getChildren() { + return songs.entrySet().iterator(); + } + + public Object getData() { + return this; + } + + public TreeNode<Object> getParent() { + return performer; + } + + public boolean isLeaf() { + return songs.isEmpty(); + } + + public void removeChild(Object id) { + songs.remove(id); + } + + public void setData(Object data) { + } + + public void setParent(TreeNode<Object> parent) { + performer = (Performer) parent; + } + +// +// Album implementation +// + + /** + * Gets value of id field. + * @return value of id field + */ + public long getId() { + return id; + } + + /** + * Set a new value for id field. + * @param id a new value for id field + */ + public void setId(long id) { + this.id = id; + } + + /** + * Gets value of title field. + * @return value of title field + */ + public String getTitle() { + return title; + } + + /** + * Set a new value for title field. + * @param title a new value for title field + */ + public void setTitle(String title) { + this.title = title; + } + + /** + * Gets value of year field. + * @return value of year field + */ + public Integer getYear() { + return year; + } + + /** + * Set a new value for year field. + * @param year a new value for year field + */ + public void setYear(Integer year) { + this.year = year; + } + + public void addSong(Song song) { + addChild(song.getId(), song); + song.setParent(this); + } + + public String getType() { + return "album"; + } +} Property changes on: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/Album.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/AudioLibrary.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/AudioLibrary.java (rev 0) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/AudioLibrary.java 2008-11-11 19:06:29 UTC (rev 11091) @@ -0,0 +1,68 @@ +package org.ajax4jsf.bean.tree.rich; + +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Map.Entry; + +import org.richfaces.model.TreeNode; + +public class AudioLibrary implements TreeNode<Object> { + + /** + * serial version ID + */ + private static final long serialVersionUID = -1429183678508376974L; + + private Map<Object, TreeNode<Object>> performers = new LinkedHashMap<Object, TreeNode<Object>>(); + +// +// TreeNode implementation +// + public void addChild(Object identifier, TreeNode<Object> child) { + performers.put(identifier, child); + } + + public TreeNode<Object> getChild(Object id) { + return performers.get(id); + } + + public Iterator<Entry<Object, TreeNode<Object>>> getChildren() { + return performers.entrySet().iterator(); + } + + public Object getData() { + return this; + } + + public TreeNode<Object> getParent() { + return null; + } + + public boolean isLeaf() { + return performers.isEmpty(); + } + + public void removeChild(Object id) { + performers.remove(id); + } + + public void setData(Object data) { + } + + public void setParent(TreeNode<Object> parent) { + } + +// +// AudioLibrary implementation +// + + public void addPerformer(Performer performer) { + addChild(performer.getId(), performer); + } + + public String getType() { + return "library"; + } + +} Property changes on: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/AudioLibrary.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/Performer.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/Performer.java (rev 0) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/Performer.java 2008-11-11 19:06:29 UTC (rev 11091) @@ -0,0 +1,124 @@ +package org.ajax4jsf.bean.tree.rich; + +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Map.Entry; + +import org.richfaces.model.TreeNode; + +public class Performer implements TreeNode<Object> { + + /** + * serial version ID + */ + private static final long serialVersionUID = -4258414186970822017L; + + private long id; + private Map<Object, TreeNode<Object>> albums = new LinkedHashMap<Object, TreeNode<Object>>(); + private String name; + private AudioLibrary library; + + public Performer() { + setId(System.currentTimeMillis()); + } + +// +// TreeNode implementation +// + public void addChild(Object identifier, TreeNode<Object> child) { + albums.put(identifier, child); + } + + public TreeNode<Object> getChild(Object id) { + return albums.get(id); + } + + public Iterator<Entry<Object, TreeNode<Object>>> getChildren() { + return albums.entrySet().iterator(); + } + + public Object getData() { + return this; + } + + public TreeNode<Object> getParent() { + return library; + } + + public boolean isLeaf() { + return albums.isEmpty(); + } + + public void removeChild(Object id) { + albums.remove(id); + } + + public void setData(Object data) { + } + + public void setParent(TreeNode<Object> parent) { + library = (AudioLibrary) parent; + } + +// +// Band implementation +// + + /** + * Gets value of id field. + * @return value of id field + */ + public long getId() { + return id; + } + + /** + * Set a new value for id field. + * @param id a new value for id field + */ + public void setId(long id) { + this.id = id; + } + + /** + * Gets value of albums field. + * @return value of albums field + */ + public Map<Object, TreeNode<Object>> getAlbums() { + return albums; + } + + /** + * Set a new value for albums field. + * @param albums a new value for albums field + */ + public void setAlbums(Map<Object, TreeNode<Object>> albums) { + this.albums = albums; + } + + /** + * Gets value of name field. + * @return value of name field + */ + public String getName() { + return name; + } + + /** + * Set a new value for name field. + * @param name a new value for name field + */ + public void setName(String name) { + this.name = name; + } + + public void addAlbum(Album album) { + addChild(album.getId(), album); + album.setParent(this); + } + + public String getType() { + return "performer"; + } +} Property changes on: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/Performer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/Song.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/Song.java (rev 0) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/Song.java 2008-11-11 19:06:29 UTC (rev 11091) @@ -0,0 +1,102 @@ +package org.ajax4jsf.bean.tree.rich; + +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.Map.Entry; + +import org.richfaces.model.TreeNode; + +public class Song implements TreeNode<Object> { + + /** + * serial version ID + */ + private static final long serialVersionUID = 3380513023368040508L; + + private long id; + private String title; + private Album album; + + public Song() { + setId(System.currentTimeMillis()); + } + +// +// TreeNode implementation +// + + public void addChild(Object identifier, TreeNode<Object> child) { + throw new UnsupportedOperationException("Songs do not have children"); + } + + public TreeNode<Object> getChild(Object id) { + throw new UnsupportedOperationException("Songs do not have children"); + } + + public Iterator<Entry<Object, TreeNode<Object>>> getChildren() { + return new LinkedHashMap<Object, TreeNode<Object>>().entrySet().iterator(); + } + + public Object getData() { + return this; + } + + public TreeNode<Object> getParent() { + return album; + } + + public boolean isLeaf() { + return true; + } + + public void removeChild(Object id) { + // TODO Auto-generated method stub + + } + + public void setData(Object data) { + } + + public void setParent(TreeNode<Object> parent) { + album = (Album) parent; + } + +// +// Song implementation +// + /** + * Gets value of id field. + * @return value of id field + */ + public long getId() { + return id; + } + + /** + * Set a new value for id field. + * @param id a new value for id field + */ + public void setId(long id) { + this.id = id; + } + + /** + * Gets value of title field. + * @return value of title field + */ + public String getTitle() { + return title; + } + + /** + * Set a new value for title field. + * @param title a new value for title field + */ + public void setTitle(String title) { + this.title = title; + } + + public String getType() { + return "song"; + } +} Property changes on: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/Song.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/test-applications/seleniumTest/richfaces/src/main/resources/audio-library.xml =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/resources/audio-library.xml (rev 0) +++ trunk/test-applications/seleniumTest/richfaces/src/main/resources/audio-library.xml 2008-11-11 19:06:29 UTC (rev 11091) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<audio-library> + <performer> + <name>Performer</name> + <album> + <title>Album</title> + <year>2008</year> + <song> + <title>Song1</title> + </song> + <song> + <title>Song2</title> + </song> + <song> + <title>Song3</title> + </song> + </album> + </performer> +</audio-library> \ No newline at end of file Property changes on: trunk/test-applications/seleniumTest/richfaces/src/main/resources/audio-library.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Added: trunk/test-applications/seleniumTest/richfaces/src/main/resources/digester-rules.xml =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/resources/digester-rules.xml (rev 0) +++ trunk/test-applications/seleniumTest/richfaces/src/main/resources/digester-rules.xml 2008-11-11 19:06:29 UTC (rev 11091) @@ -0,0 +1,53 @@ +<?xml version="1.0"?> + + + +<!DOCTYPE digester-rules + PUBLIC "-//Jakarta Apache //DTD digester-rules XML V1.0//EN" + "http://jakarta.apache.org/commons/digester/dtds/digester-rules.dtd"> +<digester-rules> + <pattern value="audio-library"> + <pattern value="performer"> + <object-create-rule classname="org.ajax4jsf.bean.tree.rich.Performer"/> + <set-properties-rule/> + <set-next-rule methodname="addPerformer"/> + <pattern value="name"> + <call-method-rule methodname="setName" paramcount="0"/> + </pattern> + <pattern value="album"> + <object-create-rule classname="org.ajax4jsf.bean.tree.rich.Album"/> + <set-properties-rule/> + <set-next-rule methodname="addAlbum"/> + <pattern value="title"> + <call-method-rule methodname="setTitle" paramcount="0"/> + </pattern> + <pattern value="year"> + <call-method-rule methodname="setYear" paramcount="1" paramtypes="java.lang.Integer"/> + </pattern> + <pattern value="song"> + <object-create-rule classname="org.ajax4jsf.bean.tree.rich.Song"/> + <set-properties-rule/> + <set-next-rule methodname="addSong"/> + <pattern value="title"> + <call-method-rule methodname="setTitle" paramcount="0"/> + </pattern> + </pattern> + </pattern> + </pattern> + </pattern> +</digester-rules> Property changes on: trunk/test-applications/seleniumTest/richfaces/src/main/resources/digester-rules.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/tree/treeTest.xhtml =================================================================== (Binary files differ)

17 years, 5 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits November 2008