[jboss-cvs] JBossAS SVN: r95043 - in branches/Branch_5_x: component-matrix and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Oct 16 11:09:44 EDT 2009
Author: stan.silvert at jboss.com
Date: 2009-10-16 11:09:44 -0400 (Fri, 16 Oct 2009)
New Revision: 95043
Added:
branches/Branch_5_x/varia/src/resources/admin-console/
branches/Branch_5_x/varia/src/resources/admin-console/WEB-INF/
branches/Branch_5_x/varia/src/resources/admin-console/WEB-INF/web.xml
Modified:
branches/Branch_5_x/build/build-distr.xml
branches/Branch_5_x/component-matrix/pom.xml
branches/Branch_5_x/testsuite/imports/sections/jsf.xml
branches/Branch_5_x/thirdparty/pom.xml
Log:
JBAS-7380 Make admin console use MyFaces instead of Mojarra
Modified: branches/Branch_5_x/build/build-distr.xml
===================================================================
--- branches/Branch_5_x/build/build-distr.xml 2009-10-16 14:58:09 UTC (rev 95042)
+++ branches/Branch_5_x/build/build-distr.xml 2009-10-16 15:09:44 UTC (rev 95043)
@@ -2306,11 +2306,42 @@
</fileset>
</unzip>
+ <!-- Install Admin Console -->
<mkdir dir="${install.server}/all/deploy/admin-console.war"/>
<unjar src="${org.jboss.jopr.lib}/jopr-embedded-jbas5.war" dest="${install.server}/all/deploy/admin-console.war"/>
+ <copy todir="${install.server}/all/deploy/admin-console.war/WEB-INF/lib" filtering="no">
+ <fileset dir="${apache.myfaces.lib}">
+ <include name="**/myfaces-api*.jar"/>
+ <include name="**/myfaces-impl*.jar"/>
+ </fileset>
+ <fileset dir="${apache.codec.lib}">
+ <include name="**/commons-codec*.jar"/>
+ <exclude name="**/*source*"/>
+ </fileset>
+ <fileset dir="${apache.discovery.lib}">
+ <include name="**/commons-discovery*.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${install.server}/all/deploy/admin-console.war/WEB-INF"
+ file="${project.root}/varia/src/resources/admin-console/WEB-INF/web.xml"/>
+
<mkdir dir="${install.server}/default/deploy/admin-console.war"/>
<unjar src="${org.jboss.jopr.lib}/jopr-embedded-jbas5.war" dest="${install.server}/default/deploy/admin-console.war"/>
-
+ <copy todir="${install.server}/default/deploy/admin-console.war/WEB-INF/lib" filtering="no">
+ <fileset dir="${apache.myfaces.lib}">
+ <include name="**/myfaces-api*.jar"/>
+ <include name="**/myfaces-impl*.jar"/>
+ </fileset>
+ <fileset dir="${apache.codec.lib}">
+ <include name="**/commons-codec*.jar"/>
+ <exclude name="**/*source*"/>
+ </fileset>
+ <fileset dir="${apache.discovery.lib}">
+ <include name="**/commons-discovery*.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${install.server}/default/deploy/admin-console.war/WEB-INF"
+ file="${project.root}/varia/src/resources/admin-console/WEB-INF/web.xml"/>
</target>
</project>
Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml 2009-10-16 14:58:09 UTC (rev 95042)
+++ branches/Branch_5_x/component-matrix/pom.xml 2009-10-16 15:09:44 UTC (rev 95043)
@@ -34,7 +34,7 @@
<version.commons.beanutils>1.8.0</version.commons.beanutils>
<version.jacorb>2.3.1jboss.patch01-brew</version.jacorb>
<version.javassist>3.11.0.GA</version.javassist>
- <version.javax.faces>2.0.0-b21</version.javax.faces>
+ <version.javax.faces>2.0.0-RC2</version.javax.faces>
<version.javax.validation>1.0.CR5</version.javax.validation>
<version.jboss.jaxr>2.0.1</version.jboss.jaxr>
<version.jboss.jbossts>4.6.1.GA</version.jboss.jbossts>
@@ -235,13 +235,13 @@
<dependency>
<groupId>apache-myfaces</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.1.3</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>apache-myfaces</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.1.3</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
Modified: branches/Branch_5_x/testsuite/imports/sections/jsf.xml
===================================================================
--- branches/Branch_5_x/testsuite/imports/sections/jsf.xml 2009-10-16 14:58:09 UTC (rev 95042)
+++ branches/Branch_5_x/testsuite/imports/sections/jsf.xml 2009-10-16 15:09:44 UTC (rev 95043)
@@ -23,10 +23,12 @@
<war destfile="${build.lib}/bundled-myfaces-hellojsf.war"
webxml="${build.resources}/web/WEB-INF/bundled-myfaces-jsf.xml">
<lib dir="${apache.myfaces.lib}">
- <include name="myfaces-api-1.1.3.jar"/>
- <include name="myfaces-impl-1.1.3.jar"/>
- <include name="jstl-1.1.0.jar"/>
+ <include name="**/myfaces-api*.jar"/>
+ <include name="**/myfaces-impl*.jar"/>
</lib>
+ <lib dir="${apache.discovery.lib}">
+ <include name="commons-discovery*.jar"/>
+ </lib>
<lib dir="${apache.beanutils.lib}">
<include name="commons-beanutils.jar"/>
</lib>
Modified: branches/Branch_5_x/thirdparty/pom.xml
===================================================================
--- branches/Branch_5_x/thirdparty/pom.xml 2009-10-16 14:58:09 UTC (rev 95042)
+++ branches/Branch_5_x/thirdparty/pom.xml 2009-10-16 15:09:44 UTC (rev 95043)
@@ -103,16 +103,10 @@
<dependency>
<groupId>apache-myfaces</groupId>
<artifactId>myfaces-impl</artifactId>
- <mapping>
- <artifactId>myfaces-impl-1.1.3</artifactId>
- </mapping>
</dependency>
<dependency>
<groupId>apache-myfaces</groupId>
<artifactId>myfaces-api</artifactId>
- <mapping>
- <artifactId>myfaces-api-1.1.3</artifactId>
- </mapping>
</dependency>
<dependency>
<groupId>org.beanshell</groupId>
Added: branches/Branch_5_x/varia/src/resources/admin-console/WEB-INF/web.xml
===================================================================
--- branches/Branch_5_x/varia/src/resources/admin-console/WEB-INF/web.xml (rev 0)
+++ branches/Branch_5_x/varia/src/resources/admin-console/WEB-INF/web.xml 2009-10-16 15:09:44 UTC (rev 95043)
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Embedded Jopr Project
+ ~ Copyright (C) 2006-2009 Red Hat, Inc.
+ ~ All rights reserved.
+ ~
+ ~ This program is free software; you can redistribute it and/or modify
+ ~ it under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ 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"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+
+ <!-- RichFaces -->
+
+ <!-- From Seam docs: If RichFaces is used in your project, Seam will install
+ the RichFaces Ajax filter for you, making sure to install it before all
+ other built-in filters. You don't need to install the RichFaces Ajax
+ filter in web.xml yourself. -->
+
+ <context-param>
+ <param-name>org.richfaces.SKIN</param-name>
+ <param-value>jboss-console</param-value>
+ </context-param>
+
+ <!-- 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.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>
+ <!-- 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>
+
+ <!-- JSF -->
+
+ <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>*.seam</url-pattern>
+ </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>server</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
+
+ <!-- MyFaces -->
+ <context-param>
+ <param-name>org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
+ <listener>
+ <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+ </listener>
+
+ <!-- Facelets -->
+
+ <!-- load our Facelets taglibs (value must be semicolon-delimited) -->
+ <context-param>
+ <param-name>facelets.LIBRARIES</param-name>
+ <param-value>/WEB-INF/on.component.taglib.xml</param-value>
+ </context-param>
+
+ <!-- enable special debug output for development -->
+ <context-param>
+ <param-name>facelets.DEVELOPMENT</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
+ <!--<security-constraint>-->
+ <!--<web-resource-collection>-->
+ <!--<web-resource-name>HtmlAdaptor</web-resource-name>-->
+ <!--<description> An example security config that only allows users with-->
+ <!--the role JBossAdmin to access the embedded console web-->
+ <!--application </description>-->
+ <!--<url-pattern>/*</url-pattern>-->
+ <!--<http-method>GET</http-method>-->
+ <!--<http-method>POST</http-method>-->
+ <!--</web-resource-collection>-->
+ <!--<auth-constraint>-->
+ <!--<role-name>JBossAdmin</role-name>-->
+ <!--</auth-constraint>-->
+ <!--</security-constraint>-->
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>JBoss embedded Console</realm-name>
+ </login-config>
+ <security-role>
+ <role-name>JBossAdmin</role-name>
+ </security-role>
+
+</web-app>
More information about the jboss-cvs-commits
mailing list