[jboss-svn-commits] JBL Code SVN: r12314 - labs/jbossesb/trunk/product/tools/console/distro.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jun 4 01:02:42 EDT 2007
Author: tcunning
Date: 2007-06-04 01:02:41 -0400 (Mon, 04 Jun 2007)
New Revision: 12314
Added:
labs/jbossesb/trunk/product/tools/console/distro/jbossfaces-web.xml
labs/jbossesb/trunk/product/tools/console/distro/myfaces-web.xml
Modified:
labs/jbossesb/trunk/product/tools/console/distro/distro-build.xml
Log:
bug:JBESB-594
The JBoss ESB Console build now asks whether you want to use
myfaces or jbossfaces (4.0.5/4.2.0). It copies the correct build.xml
depending on the answer.
Modified: labs/jbossesb/trunk/product/tools/console/distro/distro-build.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/distro/distro-build.xml 2007-06-04 04:59:03 UTC (rev 12313)
+++ labs/jbossesb/trunk/product/tools/console/distro/distro-build.xml 2007-06-04 05:02:41 UTC (rev 12314)
@@ -33,7 +33,10 @@
<echo message="" />
<input addproperty="db.target" message='Enter the target database type:' validargs="hsqldb,postgres" />
<echo message="" />
-
+ <echo message="JBoss 4.0.5.GA and JBoss 4.2.0.GA use differing implementations of JSF. If you are deploying to JBoss 4.0.5.GA, please select myfaces as JSF provider. If you are using JBoss 4.2.0.GA or higher, select jbossfaces."/>
+ <input addproperty="jsf.provider" message='Enter the JSF provider:' validargs="myfaces,jbossfaces" />
+ <echo message="" />
+
<delete file="console/distro/${db.target}/${dist-props}" />
<ant dir="console/distro/${db.target}" antfile="build.xml" target="capture-config"/>
@@ -43,7 +46,12 @@
</target>
- <target name="filter-files">
+ <target name="jsf-copy" unless="jbossfaces.used">
+ <copy overwrite="true" file="console/distro/${jsf.provider}-web.xml"
+ tofile="console/jboss-esb-console.war/WEB-INF/web.xml"/>
+ </target>
+
+ <target name="filter-files" depends="jsf-copy">
<property file="console/distro/${db.target}/${dist-props}" />
<filterset id="filters" filtersfile="console/distro/${db.target}/${dist-props}"/>
<loadfile property="db.application.modules" srcfile="console/distro/${db.target}/db.application.modules.xml" />
Added: labs/jbossesb/trunk/product/tools/console/distro/jbossfaces-web.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/distro/jbossfaces-web.xml (rev 0)
+++ labs/jbossesb/trunk/product/tools/console/distro/jbossfaces-web.xml 2007-06-04 05:02:41 UTC (rev 12314)
@@ -0,0 +1,92 @@
+<?xml version="1.0" ?>
+<web-app 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"
+ version="2.4">
+
+ <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>
+ </context-param>
+
+ <context-param>
+ <param-name>facelets.DEVELOPMENT</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
+
+
+ <filter>
+ <filter-name>Seam Exception Filter</filter-name>
+ <filter-class>org.jboss.seam.servlet.SeamExceptionFilter</filter-class>
+ </filter>
+
+ <filter>
+ <filter-name>Seam Redirect Filter</filter-name>
+ <filter-class>org.jboss.seam.servlet.SeamRedirectFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>Seam Exception Filter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>Seam Redirect Filter</filter-name>
+ <url-pattern>*.seam</url-pattern>
+ </filter-mapping>
+
+ <servlet>
+ <servlet-name>javax.faces.FacesServlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>javax.faces.FacesServlet</servlet-name>
+ <url-pattern>*.seam</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>javax.faces.FacesServlet</servlet-name>
+ <url-pattern>*.faces</url-pattern>
+ </servlet-mapping>
+
+ <servlet>
+ <servlet-name>Seam Remoting</servlet-name>
+ <servlet-class>org.jboss.seam.remoting.SeamRemotingServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Seam Remoting</servlet-name>
+ <url-pattern>/seam/remoting/*</url-pattern>
+ </servlet-mapping>
+
+ <filter>
+ <filter-name>Seam Multipart Filter</filter-name>
+ <filter-class>org.jboss.seam.servlet.SeamMultipartFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>Seam Multipart Filter</filter-name>
+ <url-pattern>*.seam</url-pattern>
+ </filter-mapping>
+
+ <security-constraint>
+ <display-name>Restrict raw XHTML Documents</display-name>
+ <web-resource-collection>
+ <web-resource-name>XHTML</web-resource-name>
+ <url-pattern>*.xhtml</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>NONE</role-name>
+ </auth-constraint>
+ </security-constraint>
+</web-app>
Added: labs/jbossesb/trunk/product/tools/console/distro/myfaces-web.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/distro/myfaces-web.xml (rev 0)
+++ labs/jbossesb/trunk/product/tools/console/distro/myfaces-web.xml 2007-06-04 05:02:41 UTC (rev 12314)
@@ -0,0 +1,96 @@
+<?xml version="1.0" ?>
+<web-app 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"
+ version="2.4">
+
+ <context-param>
+ <param-name>javax.faces.CONFIG_FILES</param-name>
+ <param-value>/WEB-INF/navigation.xml</param-value>
+ </context-param>
+
+ <listener>
+ <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
+ </listener>
+
+ <context-param>
+ <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+ <param-value>client</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>facelets.DEVELOPMENT</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
+
+
+ <filter>
+ <filter-name>Seam Exception Filter</filter-name>
+ <filter-class>org.jboss.seam.servlet.SeamExceptionFilter</filter-class>
+ </filter>
+
+ <filter>
+ <filter-name>Seam Redirect Filter</filter-name>
+ <filter-class>org.jboss.seam.servlet.SeamRedirectFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>Seam Exception Filter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>Seam Redirect Filter</filter-name>
+ <url-pattern>*.seam</url-pattern>
+ </filter-mapping>
+
+ <servlet>
+ <servlet-name>javax.faces.FacesServlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>javax.faces.FacesServlet</servlet-name>
+ <url-pattern>*.seam</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>javax.faces.FacesServlet</servlet-name>
+ <url-pattern>*.faces</url-pattern>
+ </servlet-mapping>
+
+ <servlet>
+ <servlet-name>Seam Remoting</servlet-name>
+ <servlet-class>org.jboss.seam.remoting.SeamRemotingServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Seam Remoting</servlet-name>
+ <url-pattern>/seam/remoting/*</url-pattern>
+ </servlet-mapping>
+
+ <filter>
+ <filter-name>Seam Multipart Filter</filter-name>
+ <filter-class>org.jboss.seam.servlet.SeamMultipartFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>Seam Multipart Filter</filter-name>
+ <url-pattern>*.seam</url-pattern>
+ </filter-mapping>
+
+ <security-constraint>
+ <display-name>Restrict raw XHTML Documents</display-name>
+ <web-resource-collection>
+ <web-resource-name>XHTML</web-resource-name>
+ <url-pattern>*.xhtml</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>NONE</role-name>
+ </auth-constraint>
+ </security-constraint>
+</web-app>
More information about the jboss-svn-commits
mailing list