Author: alexsmirnov Date: 2007-08-30 19:48:36 -0400 (Thu, 30 Aug 2007) New Revision: 2632 Added: trunk/samples/richfaces-ear-demo/ trunk/samples/richfaces-ear-demo/ejb/ trunk/samples/richfaces-ear-demo/ejb/pom.xml trunk/samples/richfaces-ear-demo/ejb/src/ trunk/samples/richfaces-ear-demo/ejb/src/main/ trunk/samples/richfaces-ear-demo/ejb/src/main/java/ trunk/samples/richfaces-ear-demo/ejb/src/main/java/org/ trunk/samples/richfaces-ear-demo/ejb/src/main/java/org/richfaces/ trunk/samples/richfaces-ear-demo/ejb/src/main/java/org/richfaces/samples/ trunk/samples/richfaces-ear-demo/ejb/src/test/ trunk/samples/richfaces-ear-demo/ejb/src/test/java/ trunk/samples/richfaces-ear-demo/ejb/src/test/java/org/ trunk/samples/richfaces-ear-demo/ejb/src/test/java/org/richfaces/ trunk/samples/richfaces-ear-demo/ejb/src/test/java/org/richfaces/samples/ trunk/samples/richfaces-ear-demo/ejb/src/test/java/org/richfaces/samples/AppTest.java trunk/samples/richfaces-ear-demo/pom.xml trunk/samples/richfaces-ear-demo/richfacesEAR/ trunk/samples/richfaces-ear-demo/richfacesEAR/pom.xml trunk/samples/richfaces-ear-demo/richfacesEAR/src/ trunk/samples/richfaces-ear-demo/richfacesEAR/src/main/ trunk/samples/richfaces-ear-demo/richfacesEAR/src/main/application/ trunk/samples/richfaces-ear-demo/webapp/ trunk/samples/richfaces-ear-demo/webapp/pom.xml trunk/samples/richfaces-ear-demo/webapp/src/ trunk/samples/richfaces-ear-demo/webapp/src/main/ trunk/samples/richfaces-ear-demo/webapp/src/main/resources/ trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/ trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/WEB-INF/ trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/WEB-INF/faces-config.xml trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/WEB-INF/web.xml trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/index.jsp Modified: trunk/framework/api/pom.xml trunk/framework/impl/pom.xml trunk/framework/pom.xml trunk/samples/pom.xml trunk/ui/assembly/pom.xml trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPageRenderer.java Log: set maven-javadoc-plugin version to 2.2 , due to http://jira.codehaus.org/browse/MJAVADOC-141 . auto detect contrnt-type in the a4j:page component create reference JEE5 example. Modified: trunk/framework/api/pom.xml =================================================================== --- trunk/framework/api/pom.xml 2007-08-30 20:05:36 UTC (rev 2631) +++ trunk/framework/api/pom.xml 2007-08-30 23:48:36 UTC (rev 2632) @@ -1,12 +1,7 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <!-- - <parent> - <artifactId>api-parent</artifactId> - <groupId>org.richfaces.framework</groupId> - <version>3.1.0-SNAPSHOT</version> - <relativePath>../api-parent/pom.xml</relativePath> - </parent> - --> +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <artifactId>framework</artifactId> <groupId>org.richfaces</groupId> @@ -15,11 +10,25 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> + <name>Java Server Faces AJAX framework API</name> <version>3.1.0-SNAPSHOT</version> - <name>Java Server Faces AJAX framework API</name> - <properties> - <jsfVersion>1.1</jsfVersion> - </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.2</version> + <executions> + <execution> + <id>attach-javadoc</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> <dependencies> <dependency> <groupId>junit</groupId> @@ -43,18 +52,9 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>1.0.4</version> + <scope>provided</scope> </dependency> <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.7.0</version> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2</version> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.5</version> @@ -70,6 +70,21 @@ <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> <version>1.2_03</version> + <scope>provided</scope> </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2</version> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.7.0</version> + </dependency> </dependencies> -</project> \ No newline at end of file + <properties> + <jsfVersion>1.1</jsfVersion> + </properties> +</project> + Modified: trunk/framework/impl/pom.xml =================================================================== --- trunk/framework/impl/pom.xml 2007-08-30 20:05:36 UTC (rev 2631) +++ trunk/framework/impl/pom.xml 2007-08-30 23:48:36 UTC (rev 2632) @@ -70,6 +70,19 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.2</version> + <executions> + <execution> + <id>attach-javadoc</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> <profiles> Modified: trunk/framework/pom.xml =================================================================== --- trunk/framework/pom.xml 2007-08-30 20:05:36 UTC (rev 2631) +++ trunk/framework/pom.xml 2007-08-30 23:48:36 UTC (rev 2632) @@ -16,17 +16,6 @@ <build> <plugins> <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <id>attach-javadoc</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <artifactId>maven-source-plugin</artifactId> <executions> <execution> Modified: trunk/samples/pom.xml =================================================================== --- trunk/samples/pom.xml 2007-08-30 20:05:36 UTC (rev 2631) +++ trunk/samples/pom.xml 2007-08-30 23:48:36 UTC (rev 2632) @@ -1,6 +1,5 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> @@ -28,8 +27,7 @@ <configuration> <scanIntervalSeconds>10</scanIntervalSeconds> <connectors> - <connector - implementation="org.mortbay.jetty.nio.SelectChannelConnector"> + <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> <port>8080</port> <maxIdleTime>60000</maxIdleTime> </connector> @@ -357,7 +355,7 @@ <tomahawk>1.1.5</tomahawk> </properties> <build> - <plugins /> + <plugins/> </build> <dependencies> <dependency> @@ -433,5 +431,6 @@ <module>panelmenu-sample</module> <module>rich-message-demo</module> <module>scrollableDataTableDemo</module> - </modules> + <module>richfaces-ear-demo</module> + </modules> </project> \ No newline at end of file Added: trunk/samples/richfaces-ear-demo/ejb/pom.xml =================================================================== --- trunk/samples/richfaces-ear-demo/ejb/pom.xml (rev 0) +++ trunk/samples/richfaces-ear-demo/ejb/pom.xml 2007-08-30 23:48:36 UTC (rev 2632) @@ -0,0 +1,57 @@ +<?xml version="1.0"?><project> + <parent> + <artifactId>richfaces-ear-demo</artifactId> + <groupId>org.richfaces.samples</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> + <artifactId>ejb</artifactId> + <packaging>ejb</packaging> + <name>ejb</name> + <version>3.1.0-SNAPSHOT</version> + <url>http://maven.apache.org</url> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + <version>3.1.0-SNAPSHOT</version> + <exclusions> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>javax.ejb</groupId> + <artifactId>ejb-api</artifactId> + <version>3.0</version> + <scope>provided</scope> + <optional>true</optional> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-ejb-plugin</artifactId> + <configuration> + <!-- this is false by default --> + <generateClient>true</generateClient> + <ejbVersion>3.0</ejbVersion> + <archive> + <manifest> + <addClasspath>true</addClasspath> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Property changes on: trunk/samples/richfaces-ear-demo/ejb/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/samples/richfaces-ear-demo/ejb/src/test/java/org/richfaces/samples/AppTest.java =================================================================== --- trunk/samples/richfaces-ear-demo/ejb/src/test/java/org/richfaces/samples/AppTest.java (rev 0) +++ trunk/samples/richfaces-ear-demo/ejb/src/test/java/org/richfaces/samples/AppTest.java 2007-08-30 23:48:36 UTC (rev 2632) @@ -0,0 +1,38 @@ +package org.richfaces.samples; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +} Property changes on: trunk/samples/richfaces-ear-demo/ejb/src/test/java/org/richfaces/samples/AppTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/samples/richfaces-ear-demo/pom.xml =================================================================== --- trunk/samples/richfaces-ear-demo/pom.xml (rev 0) +++ trunk/samples/richfaces-ear-demo/pom.xml 2007-08-30 23:48:36 UTC (rev 2632) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project> + <parent> + <artifactId>root</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples</groupId> + <artifactId>richfaces-ear-demo</artifactId> + <name>JSF 1.2/Jee5 enterprise application demo</name> + <packaging>pom</packaging> + <version>3.1.0-SNAPSHOT</version> + <build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + <modules> + <module>ejb</module> + <module>webapp</module> + <module>richfacesEAR</module> + </modules> +</project> \ No newline at end of file Property changes on: trunk/samples/richfaces-ear-demo/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/samples/richfaces-ear-demo/richfacesEAR/pom.xml =================================================================== --- trunk/samples/richfaces-ear-demo/richfacesEAR/pom.xml (rev 0) +++ trunk/samples/richfaces-ear-demo/richfacesEAR/pom.xml 2007-08-30 23:48:36 UTC (rev 2632) @@ -0,0 +1,54 @@ +<?xml version="1.0"?><project> + <parent> + <artifactId>richfaces-ear-demo</artifactId> + <groupId>org.richfaces.samples</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> + <artifactId>richfacesEAR</artifactId> + <name>richfacesEAR</name> + <packaging>ear</packaging> + <version>3.1.0-SNAPSHOT</version> + <url>http://maven.apache.org</url> + <dependencies> + <dependency> + <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> + <artifactId>ejb</artifactId> + <version>3.1.0-SNAPSHOT</version> + <type>ejb</type> + </dependency> + <dependency> + <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> + <artifactId>webapp</artifactId> + <version>3.1.0-SNAPSHOT</version> + <type>war</type> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-ear-plugin</artifactId> + <configuration> + <defaultLibBundleDir>lib</defaultLibBundleDir> + <modules> + <ejbModule> + <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> + <artifactId>ejb</artifactId> + <bundleDir>/</bundleDir> + </ejbModule> + <jarModule> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + <includeInApplicationXml> + true + </includeInApplicationXml> + <bundleDir>/</bundleDir> + </jarModule> + </modules> + <version>5</version> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Property changes on: trunk/samples/richfaces-ear-demo/richfacesEAR/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/samples/richfaces-ear-demo/webapp/pom.xml =================================================================== --- trunk/samples/richfaces-ear-demo/webapp/pom.xml (rev 0) +++ trunk/samples/richfaces-ear-demo/webapp/pom.xml 2007-08-30 23:48:36 UTC (rev 2632) @@ -0,0 +1,76 @@ +<?xml version="1.0"?><project> + <parent> + <artifactId>richfaces-ear-demo</artifactId> + <groupId>org.richfaces.samples</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> + <artifactId>webapp</artifactId> + <packaging>war</packaging> + <name>webapp Maven Webapp</name> + <version>3.1.0-SNAPSHOT</version> + <url>http://maven.apache.org</url> + <build> + <finalName>webapp</finalName> + </build> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + <version>3.1.0-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> + <artifactId>ejb</artifactId> + <version>3.1.0-SNAPSHOT</version> + <type>ejb-client</type> + </dependency> + <dependency> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + <version>1.1.12</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>1.2_04</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>1.2_04</version> + <scope>provided</scope> + </dependency> + </dependencies> +</project> \ No newline at end of file Property changes on: trunk/samples/richfaces-ear-demo/webapp/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/WEB-INF/faces-config.xml (rev 0) +++ trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/WEB-INF/faces-config.xml 2007-08-30 23:48:36 UTC (rev 2632) @@ -0,0 +1,53 @@ +<?xml version="1.0"?> +<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN" + "http://java.sun.com/dtd/web-facesconfig_1_1.dtd"> +<faces-config> + <managed-bean> + <managed-bean-name>bean</managed-bean-name> + <managed-bean-class>org.ajax4jsf.Bean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + <managed-property> + <property-name>text</property-name> + <property-class>java.lang.String</property-class> + <null-value/> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>repeatData</managed-bean-name> + <managed-bean-class>org.ajax4jsf.RepeatData</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>enclosedData</managed-bean-name> + <managed-bean-class>org.ajax4jsf.EnclosedData</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>a4jTestBean</managed-bean-name> + <managed-bean-class>org.ajax4jsf.A4jTestBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>messageBean</managed-bean-name> + <managed-bean-class>org.ajax4jsf.MessageBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>dataManager</managed-bean-name> + <managed-bean-class>control.test.ControlBackingBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>delme</managed-bean-name> + <managed-bean-class>org.ajax4jsf.TestBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + + <navigation-rule> + <navigation-case> + <from-outcome>verify_cookie</from-outcome> + <to-view-id>/pages/testCookie.xhtml</to-view-id> + <redirect/> + </navigation-case> + </navigation-rule> +</faces-config> Property changes on: trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/WEB-INF/faces-config.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/WEB-INF/web.xml (rev 0) +++ trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/WEB-INF/web.xml 2007-08-30 23:48:36 UTC (rev 2632) @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + <display-name>Archetype Created Web Application</display-name> + <context-param> + <param-name>facelets.REFRESH_PERIOD</param-name> + <param-value>2</param-value> + </context-param> + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>com.sun.faces.validateXml</param-name> + <param-value>false</param-value> + </context-param> + <context-param> + <param-name>com.sun.faces.verifyObjects</param-name> + <param-value>true</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>org.ajax4jsf.VIEW_HANDLERS</param-name> + <param-value>com.sun.facelets.FaceletViewHandler</param-value> + </context-param> + <context-param> + <param-name>facelets.VIEW_MAPPINGS</param-name> + <param-value>*.xhtml</param-value> + </context-param> + <context-param> + <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> + <param-value>false</param-value> + </context-param> + <!-- + --> + <filter> + <display-name>Ajax4jsf Filter</display-name> + <filter-name>ajax4jsf</filter-name> + <filter-class>org.ajax4jsf.FastFilter</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> + </filter-mapping> + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>/faces/*</url-pattern> + </servlet-mapping> + <login-config> + <auth-method>BASIC</auth-method> + </login-config> +</web-app> Property changes on: trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/WEB-INF/web.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/index.jsp =================================================================== --- trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/index.jsp (rev 0) +++ trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/index.jsp 2007-08-30 23:48:36 UTC (rev 2632) @@ -0,0 +1,5 @@ +<html> +<body> +<h2>Hello World!</h2> +</body> +</html> Property changes on: trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/index.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/ui/assembly/pom.xml =================================================================== --- trunk/ui/assembly/pom.xml 2007-08-30 20:05:36 UTC (rev 2631) +++ trunk/ui/assembly/pom.xml 2007-08-30 23:48:36 UTC (rev 2632) @@ -1,193 +1,202 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>ui</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui</artifactId> - <name>RichFaces JSF components library</name> - <packaging>jar</packaging> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <description>RichFaces components</description> - <taglibs> - <taglib> - <shortName>richfaces</shortName> - <taglib>richfaces</taglib> - <uri> - http://richfaces.ajax4jsf.org/rich - </uri> - <displayName>RichFaces ( Legacy URL )</displayName> - <excludeModules>core</excludeModules> - </taglib> - <taglib> - <shortName>rich</shortName> - <taglib>rich</taglib> - <uri> - http://richfaces.org/rich - </uri> - <displayName>RichFaces</displayName> - <excludeModules>core</excludeModules> - </taglib> - <taglib> - <shortName>a4j</shortName> - <taglib>ajax4jsf</taglib> - <uri> - http://richfaces.org/a4j - </uri> - <displayName>Ajax4Jsf</displayName> - <includeModules>core</includeModules> - </taglib> - <taglib> - <shortName>ajax</shortName> - <taglib>a4j</taglib> - <uri> - https://ajax4jsf.dev.java.net/ajax - </uri> - <displayName>Ajax4jsf ( Legacy URL )</displayName> - <includeModules>core</includeModules> - </taglib> - </taglibs> - </library> - </configuration> - <executions> - <execution> - <goals> - <goal>assembly</goal> - </goals> - </execution> - </executions> - </plugin> - <!-- append extracted sources , for pack with library --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-source</id> - <phase>process-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source> - ${project.build.directory}/src - </source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>net.sourceforge.maven-taglib</groupId> - <artifactId>maven-taglib-plugin</artifactId> - <configuration> - <taglib.src.dir> - ${project.build.outputDirectory}/META-INF - </taglib.src.dir> - <tldDocDir> - ${project.build.directory}/tlddoc - </tldDocDir> - </configuration> - - <executions> - <execution> - <id>attach-javadoc</id> - <phase>process-resources</phase> - <goals> - <goal>taglibdocjar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <id>attach-javadoc</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack</id> - <phase>generate-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.richfaces.docs.userguide</groupId> - <artifactId> - en - </artifactId> - <version> - ${project.version} - </version> - <type>war</type> - <classifier>pdf</classifier> - <outputDirectory> - ${project.build.directory}/docs/userguide/en - </outputDirectory> - </artifactItem> - </artifactItems> - <outputDirectory> - ${project.build.directory}/docs - </outputDirectory> - <overWriteReleases> - false - </overWriteReleases> - <overWriteSnapshots> - true - </overWriteSnapshots> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <outputDirectory>${project.build.directory}/dist</outputDirectory> - <descriptors> - <descriptor>${basedir}/src/main/assembly/richfaces.xml</descriptor> - <descriptor>${basedir}/src/main/assembly/src.xml</descriptor> - </descriptors> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>attached</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <outputDirectory>${project.build.directory}/dist</outputDirectory> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - </dependencies> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>ui</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui</artifactId> + <name>RichFaces JSF components library</name> + <packaging>jar</packaging> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <description>RichFaces components</description> + <taglibs> + <taglib> + <shortName>richfaces</shortName> + <taglib>richfaces</taglib> + <uri> + http://richfaces.ajax4jsf.org/rich + </uri> + <displayName> + RichFaces ( Legacy URL ) + </displayName> + <excludeModules>core</excludeModules> + </taglib> + <taglib> + <shortName>rich</shortName> + <taglib>rich</taglib> + <uri>http://richfaces.org/rich</uri> + <displayName>RichFaces</displayName> + <excludeModules>core</excludeModules> + </taglib> + <taglib> + <shortName>a4j</shortName> + <taglib>ajax4jsf</taglib> + <uri>http://richfaces.org/a4j</uri> + <displayName>Ajax4Jsf</displayName> + <includeModules>core</includeModules> + </taglib> + <taglib> + <shortName>ajax</shortName> + <taglib>a4j</taglib> + <uri> + https://ajax4jsf.dev.java.net/ajax + </uri> + <displayName> + Ajax4jsf ( Legacy URL ) + </displayName> + <includeModules>core</includeModules> + </taglib> + </taglibs> + </library> + </configuration> + <executions> + <execution> + <goals> + <goal>assembly</goal> + </goals> + </execution> + </executions> + </plugin> + <!-- append extracted sources , for pack with library --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-source</id> + <phase>process-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source> + ${project.build.directory}/src + </source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>net.sourceforge.maven-taglib</groupId> + <artifactId>maven-taglib-plugin</artifactId> + <configuration> + <taglib.src.dir> + ${project.build.outputDirectory}/META-INF + </taglib.src.dir> + <tldDocDir> + ${project.build.directory}/tlddoc + </tldDocDir> + </configuration> + + <executions> + <execution> + <id>attach-javadoc</id> + <phase>process-resources</phase> + <goals> + <goal>taglibdocjar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.2</version> + <executions> + <execution> + <id>attach-javadoc</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack</id> + <phase>generate-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId> + org.richfaces.docs.userguide + </groupId> + <artifactId>en</artifactId> + <version> + ${project.version} + </version> + <type>war</type> + <classifier>pdf</classifier> + <outputDirectory> + ${project.build.directory}/docs/userguide/en + </outputDirectory> + </artifactItem> + </artifactItems> + <outputDirectory> + ${project.build.directory}/docs + </outputDirectory> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots> + true + </overWriteSnapshots> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <outputDirectory> + ${project.build.directory}/dist + </outputDirectory> + <descriptors> + <descriptor> + ${basedir}/src/main/assembly/richfaces.xml + </descriptor> + <descriptor> + ${basedir}/src/main/assembly/src.xml + </descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>attached</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <outputDirectory> + ${project.build.directory}/dist + </outputDirectory> + </configuration> + </plugin> + </plugins> + </build> + <dependencies></dependencies> </project> \ No newline at end of file Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPageRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPageRenderer.java 2007-08-30 20:05:36 UTC (rev 2631) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPageRenderer.java 2007-08-30 23:48:36 UTC (rev 2632) @@ -23,6 +23,7 @@ import java.io.IOException; import java.util.HashMap; +import java.util.Iterator; import java.util.Locale; import java.util.Map; @@ -117,14 +118,24 @@ String contentType = null; String namespace = null; // String characterEncoding = out.getCharacterEncoding(); + String[] docType = null; if (null != format) { - String[] docType = (String[]) doctypes.get(format); - if (null != docType) { - contentType = docType[1]; - namespace = docType[2]; - out.write(docType[0]); + docType = (String[]) doctypes.get(format); + } else { + contentType = out.getContentType(); + for (Iterator iterator = doctypes.values().iterator(); iterator.hasNext();) { + String[] types = (String[]) iterator.next(); + if(types[1].equals(contentType)){ + docType = types; + break; + } } } + if (null != docType) { + contentType = docType[1]; + namespace = docType[2]; + out.write(docType[0]); + } if (null == contentType) { contentType = (String) attributes.get("contentType"); }