[richfaces-svn-commits] JBoss Rich Faces SVN: r15132 - in branches/community/3.3.X/test-applications/test-jsp: src/main/webapp/WEB-INF and 1 other directories.

Author: mvitenkov Date: 2009-08-07 10:03:46 -0400 (Fri, 07 Aug 2009) New Revision: 15132 Modified: branches/community/3.3.X/test-applications/test-jsp/pom.xml 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/applicationStructure/combiModalPanel.jsp branches/community/3.3.X/test-applications/test-jsp/src/main/webapp/applicationStructure/main.jsp Log: test-jsp should work under jboss 5.1.0.GA and tomcat 6.0.x 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-07 13:40:41 UTC (rev 15131) +++ branches/community/3.3.X/test-applications/test-jsp/pom.xml 2009-08-07 14:03:46 UTC (rev 15132) @@ -13,16 +13,18 @@ <build> <finalName>richfaces-test-jsp</finalName> </build> -<dependencies> +<dependencies> <dependency> - <groupId>apache-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.0</version> - </dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>1.0.b2</version> + <scope>provided</scope> + </dependency> <dependency> - <groupId>myfaces</groupId> - <artifactId>myfaces-extensions</artifactId> - <version>1.0.9</version> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> </dependency> </dependencies> </project> \ No newline at end of file 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-07 13:40:41 UTC (rev 15131) +++ branches/community/3.3.X/test-applications/test-jsp/src/main/webapp/WEB-INF/web.xml 2009-08-07 14:03:46 UTC (rev 15132) @@ -7,7 +7,7 @@ <description>RichFaces JSP Project web.xml</description> <context-param> - <param-name>org.ajax4jsf.SKIN</param-name> + <param-name>org.richfaces.SKIN</param-name> <param-value>#{pageContent.skin}</param-value> </context-param> @@ -99,42 +99,6 @@ </init-param> </filter> - <!-- Extensions Filter --> - <filter> - <filter-name>extensionsFilter</filter-name> - <filter-class> - org.apache.myfaces.component.html.util.ExtensionsFilter - </filter-class> - <init-param> - <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>ajax4jsf</filter-name> <servlet-name>Faces Servlet</servlet-name> @@ -142,17 +106,8 @@ <dispatcher>REQUEST</dispatcher> <dispatcher>INCLUDE</dispatcher> <dispatcher>ERROR</dispatcher> - </filter-mapping> + </filter-mapping> - <filter-mapping> - <filter-name>extensionsFilter</filter-name> - <url-pattern>*.faces</url-pattern> - </filter-mapping> - <filter-mapping> - <filter-name>extensionsFilter</filter-name> - <url-pattern>/faces/*</url-pattern> - </filter-mapping> - <session-config> <session-timeout>500</session-timeout> </session-config> Modified: branches/community/3.3.X/test-applications/test-jsp/src/main/webapp/applicationStructure/combiModalPanel.jsp =================================================================== --- branches/community/3.3.X/test-applications/test-jsp/src/main/webapp/applicationStructure/combiModalPanel.jsp 2009-08-07 13:40:41 UTC (rev 15131) +++ branches/community/3.3.X/test-applications/test-jsp/src/main/webapp/applicationStructure/combiModalPanel.jsp 2009-08-07 14:03:46 UTC (rev 15132) @@ -29,7 +29,7 @@ startStyle="color: red;"></a4j:status> <a4j:outputPanel id="currentComponentInsideModalPanelID" layout="block"> - <jsp:include page="#{pageContent.currentComponent}" /> + <jsp:include page="${pageContent.currentComponent}" /> </a4j:outputPanel> <a4j:commandButton reRender="currentComponentInsideModalPanelID" value="reRender"></a4j:commandButton> Modified: branches/community/3.3.X/test-applications/test-jsp/src/main/webapp/applicationStructure/main.jsp =================================================================== --- branches/community/3.3.X/test-applications/test-jsp/src/main/webapp/applicationStructure/main.jsp 2009-08-07 13:40:41 UTC (rev 15131) +++ branches/community/3.3.X/test-applications/test-jsp/src/main/webapp/applicationStructure/main.jsp 2009-08-07 14:03:46 UTC (rev 15132) @@ -21,7 +21,7 @@ <rich:messages id="messagesID" showDetail="true" styleClass="error" /> <a4j:outputPanel id="componentID" layout="block"> - <jsp:include page="#{pageContent.currentComponent}" /></a4j:outputPanel> + <jsp:include page="${pageContent.currentComponent}" /></a4j:outputPanel> <h:panelGrid columns="4" border="1"> <a4j:commandLink value="ManualGeneralAttribute" reRender="testPageID" @@ -47,7 +47,7 @@ </h:panelGrid> <a4j:outputPanel id="testPageID" layout="block"><jsp:include - page="#{pageContent.currentTestPage}" /></a4j:outputPanel> + page="${pageContent.currentTestPage}" /></a4j:outputPanel> </h:form> </body> </html>