Author: smcgowan(a)redhat.com Date: 2009-10-29 18:55:47 -0400 (Thu, 29 Oct 2009) New Revision: 826 Added: branches/EmbJopr_1_3_3_MyFaces/ Modified: branches/EmbJopr_1_3_3_MyFaces/core/pom.xml branches/EmbJopr_1_3_3_MyFaces/core/src/main/webapp/WEB-INF/web.xml branches/EmbJopr_1_3_3_MyFaces/jbas4/pom.xml branches/EmbJopr_1_3_3_MyFaces/jbas5/pom.xml branches/EmbJopr_1_3_3_MyFaces/jsfunit/pom.xml branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/main/webapp/WEB-INF/web.xml branches/EmbJopr_1_3_3_MyFaces/pom.xml Log: creating branch for as 5.2.0.beta1 release Copied: branches/EmbJopr_1_3_3_MyFaces (from rev 825, tags/EmbJopr_1_3_2_GA) Modified: branches/EmbJopr_1_3_3_MyFaces/core/pom.xml =================================================================== --- tags/EmbJopr_1_3_2_GA/core/pom.xml 2009-10-29 19:15:48 UTC (rev 825) +++ branches/EmbJopr_1_3_3_MyFaces/core/pom.xml 2009-10-29 22:55:47 UTC (rev 826) @@ -23,7 +23,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.3.1.GA</version> + <version>1.3.3-SNAPSHOT</version> </parent> <groupId>org.jboss.jopr</groupId> @@ -35,8 +35,8 @@ </description> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr... - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/E... + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/branches/Emb... + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/branch... </scm> <properties> @@ -184,7 +184,7 @@ <scope>runtime</scope> </dependency> - <!-- ===== RichFaces ===== --> + <!-- ===== RichFaces ===== <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> @@ -200,6 +200,27 @@ <artifactId>richfaces-ui</artifactId> <version>${richfaces.version}</version> </dependency> +--> + <dependency> + <groupId>apache-myfaces</groupId> + <artifactId>myfaces-api</artifactId> + <version>1.2.7</version> + </dependency> + <dependency> + <groupId>apache-myfaces</groupId> + <artifactId>myfaces-impl</artifactId> + <version>1.2.7</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.3</version> + </dependency> + <dependency> + <groupId>apache-discovery</groupId> + <artifactId>commons-discovery</artifactId> + <version>0.4-brew</version> + </dependency> <!-- == 3rd Party Provided Dependencies ================ --> <dependency> Modified: branches/EmbJopr_1_3_3_MyFaces/core/src/main/webapp/WEB-INF/web.xml =================================================================== --- tags/EmbJopr_1_3_2_GA/core/src/main/webapp/WEB-INF/web.xml 2009-10-29 19:15:48 UTC (rev 825) +++ branches/EmbJopr_1_3_3_MyFaces/core/src/main/webapp/WEB-INF/web.xml 2009-10-29 22:55:47 UTC (rev 826) @@ -19,6 +19,11 @@ ~ License along with this program; if not, write to the Free Software ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. --> + + <!-- + This special version of web.xml allows Embedded Jopr to use MyFaces instead of + the built-in Mojarra JSF implementaiton. + --> <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -87,9 +92,14 @@ <param-value>.xhtml</param-value> </context-param> - <!-- JSF RI --> + <!-- MyFaces --> + <context-param> + <param-name>org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL</param-name> + <param-value>true</param-value> + </context-param> + <listener> - <listener-class>com.sun.faces.config.ConfigureListener</listener-class> + <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class> </listener> <!-- Facelets --> Modified: branches/EmbJopr_1_3_3_MyFaces/jbas4/pom.xml =================================================================== --- tags/EmbJopr_1_3_2_GA/jbas4/pom.xml 2009-10-29 19:15:48 UTC (rev 825) +++ branches/EmbJopr_1_3_3_MyFaces/jbas4/pom.xml 2009-10-29 22:55:47 UTC (rev 826) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.3.1.GA</version> + <version>1.3.3-SNAPSHOT</version> </parent> <groupId>org.jboss.jopr</groupId> @@ -14,8 +14,8 @@ <name>JBossAS 4.x Administration Console</name> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr... - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/E... + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/branches/Emb... + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/branch... </scm> <properties> @@ -199,4 +199,4 @@ </profile> </profiles> -</project> \ No newline at end of file +</project> Modified: branches/EmbJopr_1_3_3_MyFaces/jbas5/pom.xml =================================================================== --- tags/EmbJopr_1_3_2_GA/jbas5/pom.xml 2009-10-29 19:15:48 UTC (rev 825) +++ branches/EmbJopr_1_3_3_MyFaces/jbas5/pom.xml 2009-10-29 22:55:47 UTC (rev 826) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.3.1.GA</version> + <version>1.3.3-SNAPSHOT</version> </parent> <groupId>org.jboss.jopr</groupId> @@ -14,8 +14,8 @@ <name>JBossAS 5.x Administration Console</name> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr... - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/E... + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/branches/Emb... + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/branch... </scm> <properties> @@ -217,4 +217,4 @@ </profile> </profiles> -</project> \ No newline at end of file +</project> Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/pom.xml =================================================================== --- tags/EmbJopr_1_3_2_GA/jsfunit/pom.xml 2009-10-29 19:15:48 UTC (rev 825) +++ branches/EmbJopr_1_3_3_MyFaces/jsfunit/pom.xml 2009-10-29 22:55:47 UTC (rev 826) @@ -2,7 +2,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"> <modelVersion>4.0.0</modelVersion> <properties> - <jopr.version>1.2.0-SNAPSHOT</jopr.version> + <jopr.version>>2.3.0.EmbJopr.1.3.0-4</jopr.version> <cargo.plugin.version>1.0.1-SNAPSHOT</cargo.plugin.version> <jvm.args.debug></jvm.args.debug> <!-- Used by the -Pdebug profile. --> <jvm.args.profiler></jvm.args.profiler> <!-- Used by the -Pprofile profile. --> @@ -17,7 +17,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.3.1-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> </parent> <groupId>org.jboss.jopr</groupId> @@ -86,13 +86,13 @@ <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> - <version>1.2</version> + <version>1.2_12</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-j2se</artifactId> - <version>5.0.1.GA</version> + <version>5.1.0.GA</version> <scope>provided</scope> </dependency> <dependency> @@ -111,12 +111,12 @@ <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> <scope>provided</scope> - <version>2.8.1</version> + <version>2.9.1</version> </dependency> <dependency> <groupId>jdom</groupId> <artifactId>jdom</artifactId> - <version>1.0</version> + <version>1.1</version> </dependency> <dependency> <groupId>commons-lang</groupId> @@ -132,7 +132,7 @@ <dependency> <groupId>org.jboss.man</groupId> <artifactId>jboss-metatype</artifactId> - <version>2.1.0.SP1</version> + <version>2.1.1.GA</version> <scope>provided</scope> </dependency> <dependency> Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/main/webapp/WEB-INF/web.xml =================================================================== --- tags/EmbJopr_1_3_2_GA/jsfunit/src/main/webapp/WEB-INF/web.xml 2009-10-29 19:15:48 UTC (rev 825) +++ branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/main/webapp/WEB-INF/web.xml 2009-10-29 22:55:47 UTC (rev 826) @@ -19,6 +19,11 @@ ~ License along with this program; if not, write to the Free Software ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. --> + + <!-- + This special version of web.xml allows Embedded Jopr to use MyFaces instead of + the built-in Mojarra JSF implementaiton. + --> <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -36,13 +41,7 @@ <param-value>jboss-console</param-value> </context-param> - <!-- It doesn't allow A4J to reformat JavaScript files (makes it impossible to debug) --> - <context-param> - <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> - <param-value>false</param-value> - </context-param> - - <!-- JSFUnit --> + <!-- JSFUnit --> <filter> <filter-name>JSFUnitFilter</filter-name> <filter-class>org.jboss.jsfunit.framework.JSFUnitFilter</filter-class> @@ -51,74 +50,77 @@ <filter-mapping> <filter-name>JSFUnitFilter</filter-name> <servlet-name>ServletTestRunner</servlet-name> - </filter-mapping> - + </filter-mapping> + <filter-mapping> <filter-name>JSFUnitFilter</filter-name> <servlet-name>ServletRedirector</servlet-name> </filter-mapping> - + <servlet> <servlet-name>ServletRedirector</servlet-name> <servlet-class>org.jboss.jsfunit.framework.JSFUnitServletRedirector</servlet-class> </servlet> - + <servlet> <servlet-name>ServletTestRunner</servlet-name> <servlet-class>org.apache.cactus.server.runner.ServletTestRunner</servlet-class> - </servlet> - + </servlet> + <servlet-mapping> <servlet-name>ServletRedirector</servlet-name> <url-pattern>/ServletRedirector.jsfunit</url-pattern> - </servlet-mapping> - + </servlet-mapping> + <servlet-mapping> <servlet-name>ServletTestRunner</servlet-name> <url-pattern>/ServletTestRunner.jsfunit</url-pattern> - </servlet-mapping> - - - <!-- Seam --> + </servlet-mapping> + <!-- Seam (lazy loaded)--> + <context-param> + <param-name>org.jboss.on.embedded.LazyStartupListener</param-name> + <param-value>org.jboss.seam.servlet.SeamListener</param-value> + </context-param> <listener> - <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> + <listener-class>org.jboss.on.embedded.LazyStartupListener</listener-class> </listener> - - - <!-- From Seam docs: The Seam master filter must be the first filter specified in web.xml. This ensures it is run first. --> <filter> <filter-name>Seam Filter</filter-name> - <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> + <!-- Lazily start up the Seam Filter --> + <filter-class>org.jboss.on.embedded.LazyStartupFilter</filter-class> + <init-param> + <param-name>org.jboss.on.embedded.LazyStartupFilter</param-name> + <param-value>org.jboss.seam.servlet.SeamFilter</param-value> + </init-param> </filter> <filter-mapping> <filter-name>Seam Filter</filter-name> <url-pattern>/*</url-pattern> - </filter-mapping> - + </filter-mapping> + <!-- JSF --> - + <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>*.seam</url-pattern> - </servlet-mapping> + </servlet-mapping> <context-param> <param-name>javax.faces.CONFIG_FILES</param-name> <param-value>/WEB-INF/navigation.xml</param-value> </context-param> - + <context-param> <param-name>javax.faces.STATE_SAVING_METHOD</param-name> - <param-value>client</param-value> + <param-value>server</param-value> </context-param> <context-param> @@ -126,12 +128,16 @@ <param-value>.xhtml</param-value> </context-param> - <!-- JSF RI --> - + <!-- MyFaces --> + <context-param> + <param-name>org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL</param-name> + <param-value>true</param-value> + </context-param> + <listener> - <listener-class>com.sun.faces.config.ConfigureListener</listener-class> + <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class> </listener> - + <!-- Facelets --> <!-- load our Facelets taglibs (value must be semicolon-delimited) --> @@ -167,6 +173,5 @@ <security-role> <role-name>JBossAdmin</role-name> </security-role> - </web-app> Modified: branches/EmbJopr_1_3_3_MyFaces/pom.xml =================================================================== --- tags/EmbJopr_1_3_2_GA/pom.xml 2009-10-29 19:15:48 UTC (rev 825) +++ branches/EmbJopr_1_3_3_MyFaces/pom.xml 2009-10-29 22:55:47 UTC (rev 826) @@ -30,7 +30,7 @@ <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.3.1.GA</version> + <version>1.3.3-SNAPSHOT</version> <packaging>pom</packaging> <name>Embedded Jopr</name> <description>a web application that provides administration and monitoring of the app server instance to which it is deployed</description> @@ -42,8 +42,8 @@ </organization> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr... - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/E... + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/branches/Emb... + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/branch... </scm> <issueManagement>