Author: mvitenkov Date: 2009-08-04 06:30:01 -0400 (Tue, 04 Aug 2009) New Revision: 15102 Modified: branches/community/3.3.X/test-applications/test-jsp/pom.xml branches/community/3.3.X/test-applications/test-jsp/src/main/java/util/parser/TLDParser.java branches/community/3.3.X/test-applications/test-jsp/src/main/webapp/WEB-INF/web.xml Log: Modified: branches/community/3.3.X/test-applications/test-jsp/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/test-jsp/pom.xml 2009-08-04 10:10:06 UTC (rev 15101) +++ branches/community/3.3.X/test-applications/test-jsp/pom.xml 2009-08-04 10:30:01 UTC (rev 15102) @@ -9,22 +9,20 @@ <groupId>org.richfaces.test-applications</groupId> <artifactId>test-jsp</artifactId> <packaging>war</packaging> - <name>RichFaces Test Application (JSP + MyFaces)</name> + <name>RichFaces Test Application (TEST-JSP)</name> <build> <finalName>richfaces-test-jsp</finalName> </build> <dependencies> <dependency> - <groupId>org.apache.myfaces.tomahawk</groupId> - <artifactId>tomahawk</artifactId> - <version>1.1.7</version> - <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - </exclusion> - </exclusions> - </dependency> + <groupId>apache-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>myfaces</groupId> + <artifactId>myfaces-extensions</artifactId> + <version>1.0.9</version> + </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/test-applications/test-jsp/src/main/java/util/parser/TLDParser.java =================================================================== --- branches/community/3.3.X/test-applications/test-jsp/src/main/java/util/parser/TLDParser.java 2009-08-04 10:10:06 UTC (rev 15101) +++ branches/community/3.3.X/test-applications/test-jsp/src/main/java/util/parser/TLDParser.java 2009-08-04 10:30:01 UTC (rev 15102) @@ -198,7 +198,11 @@ int position; try { if ((position = getExtPath().indexOf('!')) != -1) { - temp = getExtPath().substring("jar:file:\\".length(), position); + if (System.getProperty("os.name").toLowerCase().startsWith("windows")) { + temp = getExtPath().substring("jar:file:\\".length(), position); + } else { + temp = "/" + getExtPath().substring("jar:file:/".length(), position); + } } richfacesUI = new JarFile(temp); } catch (IOException e) { Modified: branches/community/3.3.X/test-applications/test-jsp/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/community/3.3.X/test-applications/test-jsp/src/main/webapp/WEB-INF/web.xml 2009-08-04 10:10:06 UTC (rev 15101) +++ branches/community/3.3.X/test-applications/test-jsp/src/main/webapp/WEB-INF/web.xml 2009-08-04 10:30:01 UTC (rev 15102) @@ -6,11 +6,11 @@ <description>RichFaces JSP Project web.xml</description> - <context-param> - <param-name>org.richfaces.SKIN</param-name> + <context-param> + <param-name>org.ajax4jsf.SKIN</param-name> <param-value>#{pageContent.skin}</param-value> </context-param> - + <context-param> <param-name>org.richfaces.CONTROL_SKINNING_CLASSES</param-name> <param-value>enable</param-value> @@ -25,228 +25,144 @@ <param-name>org.richfaces.CONTROL_SKINNING_LEVEL</param-name> <param-value>extended</param-value> </context-param> + + <context-param> + <param-name>org.ajax4jsf.handleViewExpiredOnClient</param-name> + <param-value>true</param-value> + </context-param> <context-param> <param-name>org.richfaces.LoadScriptStrategy</param-name> <param-value>ALL</param-value> </context-param> + <context-param> - <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> + <param-name>org.ajax4jsf.xmlfilter.forcenotrf</param-name> <param-value>false</param-value> </context-param> <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>server</param-value> + </context-param> + + <context-param> <param-name>javax.faces.CONFIG_FILES</param-name> <param-value> /WEB-INF/auto/auto-config.xml,/WEB-INF/config/pickList.xml,/WEB-INF/config/dropDownMenu.xml,/WEB-INF/config/suggestionBox.xml,/WEB-INF/config/comboBox.xml,/WEB-INF/config/extendedDataTable.xml </param-value> - </context-param> + </context-param> + + <context-param> - <param-name>javax.faces.STATE_SAVING_METHOD</param-name> - <param-value>server</param-value> - </context-param> - <context-param> - <description> - Only applicable if state saving method is "server" (= - default). Defines the amount (default = 20) of the latest - views are stored in session. - </description> - <param-name> - org.apache.myfaces.NUMBER_OF_VIEWS_IN_SESSION - </param-name> - <param-value>20</param-value> - </context-param> - <context-param> - <description> - Only applicable if state saving method is "server" (= - default). If true (default) the state will be serialized to - a byte stream before it is written to the session. If false - the state will not be serialized to a byte stream. - </description> - <param-name> - org.apache.myfaces.SERIALIZE_STATE_IN_SESSION - </param-name> - <param-value>true</param-value> - </context-param> - <context-param> - <description> - Only applicable if state saving method is "server" (= - default) and if - org.apache.myfaces.SERIALIZE_STATE_IN_SESSION is true (= - default) If true (default) the serialized state will be - compressed before it is written to the session. If false the - state will not be compressed. - </description> - <param-name> - org.apache.myfaces.COMPRESS_STATE_IN_SESSION - </param-name> - <param-value>true</param-value> - </context-param> - <context-param> - <description> - This parameter tells MyFaces if javascript code should be - allowed in the rendered HTML output. If javascript is - allowed, command_link anchors will have javascript code that - submits the corresponding form. If javascript is not - allowed, the state saving info and nested parameters will be - added as url parameters. Default: "true" - </description> - <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name> - <param-value>true</param-value> - </context-param> - <context-param> - <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name> + <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> <param-value>false</param-value> </context-param> - <context-param> - <description> - If true, rendered HTML code will be formatted, so that it is - "human readable". i.e. additional line separators and - whitespace will be written, that do not influence the HTML - code. Default: "true" - </description> - <param-name>org.apache.myfaces.PRETTY_HTML</param-name> - <param-value>true</param-value> - </context-param> - <context-param> - <description> - If true, a javascript function will be rendered that is able - to restore the former vertical scroll on every request. - Convenient feature if you have pages with long lists and you - do not want the browser page to always jump to the top if - you trigger a link or button action that stays on the same - page. Default: "false" - </description> - <param-name>org.apache.myfaces.AUTO_SCROLL</param-name> - <param-value>true</param-value> - </context-param> <context-param> - <description> - Used for encrypting view state. Only relevant for client - side state saving. See MyFaces wiki/web site documentation - for instructions on how to configure an application for - diffenent encryption strengths. - </description> - <param-name>org.apache.myfaces.SECRET</param-name> - <param-value>NzY1NDMyMTA=</param-value> + <param-name>org.ajax4jsf.COMPRESS_STYLE</param-name> + <param-value>false</param-value> </context-param> <context-param> - <description> - Validate managed beans, navigation rules and ensure that - forms are not nested. - </description> - <param-name>org.apache.myfaces.VALIDATE</param-name> - <param-value>true</param-value> + <param-name>org.richfaces.queue.global.enabled</param-name> + <param-value>false</param-value> </context-param> + <!-- FOR JBOSS CONTAINER!!! --> <context-param> - <description> - Treat readonly same as if disabled attribute was set for - select elements. - </description> <param-name> - org.apache.myfaces.READONLY_AS_DISABLED_FOR_SELECTS + org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL </param-name> <param-value>true</param-value> </context-param> <context-param> <description> - Use the defined class as the class which will be called when - a resource is added to the ExtensionFilter handling. Using - StreamingAddResource here helps with performance. If you - want to add custom components and want to use the - ExtensionFilter, you need to provide your custom - implementation here. - </description> - <param-name>org.apache.myfaces.ADD_RESOURCE_CLASS</param-name> - <param-value> - org.apache.myfaces.renderkit.html.util.DefaultAddResource - </param-value> - </context-param> - - <context-param> - <description> - Virtual path in the URL which triggers loading of resources - for the MyFaces extended components in the ExtensionFilter. - </description> - <param-name> - org.apache.myfaces.RESOURCE_VIRTUAL_PATH - </param-name> - <param-value>/faces/myFacesExtensionResource</param-value> - </context-param> - - <context-param> - <description> - Check if the extensions-filter has been properly configured. - </description> - <param-name> - org.apache.myfaces.CHECK_EXTENSIONS_FILTER - </param-name> - <param-value>false</param-value> - </context-param> - - <context-param> - <description> Define partial state saving as true/false. </description> <param-name>javax.faces.PARTIAL_STATE_SAVING_METHOD</param-name> <param-value>false</param-value> </context-param> - <!-- RichFaces Filter --> <filter> - <display-name>RichFaces Filter</display-name> - <filter-name>richfaces</filter-name> + <display-name>Ajax4jsf Filter</display-name> + <filter-name>ajax4jsf</filter-name> <filter-class>org.ajax4jsf.Filter</filter-class> + <init-param> + <param-name>createTempFiles</param-name> + <param-value>true</param-value> + </init-param> + <init-param> + <param-name>maxRequestSize</param-name> + <param-value>143482880</param-value> + </init-param> </filter> <!-- Extensions Filter --> <filter> - <filter-name>MyFacesExtensionsFilter</filter-name> + <filter-name>extensionsFilter</filter-name> <filter-class> - org.apache.myfaces.webapp.filter.ExtensionsFilter + org.apache.myfaces.component.html.util.ExtensionsFilter </filter-class> <init-param> - <param-name>uploadMaxFileSize</param-name> - <param-value>20m</param-value> <description> Set the size limit for uploaded files. Format: 10 - 10 bytes 10k - 10 KB 10m - 10 MB 1g - 1 GB </description> + <param-name>uploadMaxFileSize</param-name> + <param-value>100m</param-value> </init-param> + <init-param> + <description> + Set the threshold size - files below this limit are + stored in memory, files above this limit are stored on + disk. Format: 10 - 10 bytes 10k - 10 KB 10m - 10 MB 1g - + 1 GB + </description> + <param-name>uploadThresholdSize</param-name> + <param-value>100k</param-value> + </init-param> + + <init-param> + <param-name>uploadRepositoryPath</param-name> + <param-value>/temp</param-value> + <description> + Set the path where the intermediary files will be + stored. + </description> + </init-param> + </filter> <filter-mapping> - <filter-name>richfaces</filter-name> + <filter-name>ajax4jsf</filter-name> <servlet-name>Faces Servlet</servlet-name> - <dispatcher>REQUEST</dispatcher> <dispatcher>FORWARD</dispatcher> + <dispatcher>REQUEST</dispatcher> <dispatcher>INCLUDE</dispatcher> <dispatcher>ERROR</dispatcher> </filter-mapping> - <!-- extension mapping for adding <script/>, <link/>, and other resource tags to JSF-pages --> <filter-mapping> - <filter-name>MyFacesExtensionsFilter</filter-name> - <!-- servlet-name must match the name of your javax.faces.webapp.FacesServlet entry --> - <servlet-name>Faces Servlet</servlet-name> + <filter-name>extensionsFilter</filter-name> + <url-pattern>*.faces</url-pattern> </filter-mapping> - - <!-- extension mapping for serving page-independent resources (javascript, stylesheets, images, etc.) --> <filter-mapping> - <filter-name>MyFacesExtensionsFilter</filter-name> - <url-pattern>/faces/myFacesExtensionResource/*</url-pattern> + <filter-name>extensionsFilter</filter-name> + <url-pattern>/faces/*</url-pattern> </filter-mapping> + <session-config> + <session-timeout>500</session-timeout> + </session-config> + <!-- Listener, to allow Jetty serving MyFaces apps --> - <listener> + <!--listener> <listener-class> - org.apache.myfaces.webapp.StartupServletContextListener + org.apache.myfaces.webapp.StartupServletContextListener </listener-class> - </listener> + </listener--> <!-- Faces Servlet --> <servlet> @@ -261,6 +177,10 @@ <url-pattern>*.jsf</url-pattern> </servlet-mapping> + <login-config> + <auth-method>BASIC</auth-method> + </login-config> + <!-- Welcome files --> <welcome-file-list> <welcome-file>index.jsp</welcome-file>