[jboss-cvs] JBossAS SVN: r104943 - in trunk: component-matrix and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue May 18 16:02:49 EDT 2010
Author: stan.silvert at jboss.com
Date: 2010-05-18 16:02:48 -0400 (Tue, 18 May 2010)
New Revision: 104943
Removed:
trunk/tomcat/src/assembly/jboss-faces.xml
trunk/tomcat/src/main/java/org/jboss/web/jsf/
trunk/tomcat/src/main/java/org/jboss/web/validation/
Modified:
trunk/build/build.xml
trunk/component-matrix/pom.xml
trunk/testsuite/pom.xml
trunk/testsuite/src/main/org/jboss/test/web/test/JSFIntegrationUnitTestCase.java
trunk/tomcat/pom.xml
trunk/tomcat/src/resources/jboss-structure-sar.xml
trunk/tomcat/src/resources/war-deployers-jboss-beans.xml
trunk/tomcat/src/resources/web.xml
Log:
JBAS-6638 Move JSF integration into a deployer
JBAS-7760 org.jboss.test.web.test.JSFIntegrationUnitTestCase
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-05-18 18:26:07 UTC (rev 104942)
+++ trunk/build/build.xml 2010-05-18 20:02:48 UTC (rev 104943)
@@ -342,7 +342,6 @@
<include name="thread-pool-jboss-beans.xml"/>
<include name="legacy-conf-service.xml"/>
<exclude name="jbossweb.sar/jstl.jar"/>
- <exclude name="jbossweb.sar/jsf-libs/**"/>
<exclude name="jbossweb.sar/META-INF/jboss-structure.xml"/>
<exclude name="jbossweb.sar/META-INF/jboss-beans.xml"/>
<exclude name="jbossweb.sar/catalina.properties"/>
@@ -411,7 +410,6 @@
<include name="transaction-service.xml"/>
<include name="legacy-conf-service.xml"/>
<exclude name="jbossweb.sar/jstl.jar"/>
- <exclude name="jbossweb.sar/jsf-libs/**"/>
<exclude name="jbossweb.sar/META-INF/jboss-structure.xml"/>
<exclude name="jbossweb.sar/META-INF/jboss-beans.xml"/>
<exclude name="jbossweb.sar/server.xml"/>
@@ -1408,6 +1406,12 @@
<copy todir="${install.server}/all/deployers/jbossweb.deployer">
<fileset dir="${tomcat.module.output}/deploy/jboss-web.deployer"/>
</copy>
+
+ <mkdir dir="${install.server}/all/deployers/jsf.deployer"/>
+ <copy todir="${install.server}/all/deployers/jsf.deployer">
+ <fileset dir="${tomcat.module.output}/deploy/jsf.deployer"/>
+ </copy>
+
<!--
<copy tofile="${install.server}/all/deployers/war-clustering-deployers-jboss-beans.xml"
file="${project.root}/${_module.name}/src/resources/war-clustering-deployers-jboss-beans.xml" overwrite="true"/>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-05-18 18:26:07 UTC (rev 104942)
+++ trunk/component-matrix/pom.xml 2010-05-18 20:02:48 UTC (rev 104943)
@@ -53,6 +53,7 @@
<version.jboss.jbossws-framework>3.3.0.CR2</version.jboss.jbossws-framework>
<version.jboss.jbossws-spi>1.3.0.CR2</version.jboss.jbossws-spi>
<version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
+ <version.jboss.jsf-deployer>1.0.0-SNAPSHOT</version.jboss.jsf-deployer>
<version.jboss.osgi.apache.xerces>2.9.1.SP4</version.jboss.osgi.apache.xerces>
<version.jboss.osgi.blueprint>1.0.0.Beta2</version.jboss.osgi.blueprint>
<version.jboss.osgi.common>1.0.4</version.jboss.osgi.common>
@@ -169,6 +170,12 @@
<dependencies>
<dependency>
+ <groupId>org.jboss.jsf.integration</groupId>
+ <artifactId>jboss-jsf-deployer</artifactId>
+ <version>${version.jboss.jsf-deployer}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.beanvalidation</groupId>
<artifactId>beanvalidation-deployers</artifactId>
<version>${version.beanvalidation.integration}</version>
Modified: trunk/testsuite/pom.xml
===================================================================
--- trunk/testsuite/pom.xml 2010-05-18 18:26:07 UTC (rev 104942)
+++ trunk/testsuite/pom.xml 2010-05-18 20:02:48 UTC (rev 104943)
@@ -85,6 +85,14 @@
<artifactId>jstl</artifactId>
</dependency>
<dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </dependency>
+ <dependency>
<groupId>jboss.web</groupId>
<artifactId>jasper-jdt</artifactId>
</dependency>
Modified: trunk/testsuite/src/main/org/jboss/test/web/test/JSFIntegrationUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/web/test/JSFIntegrationUnitTestCase.java 2010-05-18 18:26:07 UTC (rev 104942)
+++ trunk/testsuite/src/main/org/jboss/test/web/test/JSFIntegrationUnitTestCase.java 2010-05-18 20:02:48 UTC (rev 104943)
@@ -75,7 +75,7 @@
assertTrue(responseBody.contains("JBoss Color selection is PURPLE"));
}
-/* Disabled for now. JBAS-7660
+
public void testJSFAppWithBundledMyFaces() throws Exception
{
String baseURL = HttpUtils.getBaseURL();
@@ -92,7 +92,7 @@
SubmitButton submitButton = form.getSubmitButtonWithID("form1:submit_button");
webResponse = form.submit(submitButton);
assertTrue(webResponse.getText().contains("Hello Stan"));
- } */
+ }
public void testBeanValidationIntegratedWithJSF() throws Exception
{
@@ -148,11 +148,11 @@
{
super.setUp();
deploy("jbosstest-jsf.war");
- // JBAS-7660 deploy("bundled-myfaces-hellojsf.war");
+ deploy("bundled-myfaces-hellojsf.war");
}
protected void tearDown() throws Exception
{
- // JBAS-7660 undeploy("bundled-myfaces-hellojsf.war");
+ undeploy("bundled-myfaces-hellojsf.war");
undeploy("jbosstest-jsf.war");
super.tearDown();
}
Modified: trunk/tomcat/pom.xml
===================================================================
--- trunk/tomcat/pom.xml 2010-05-18 18:26:07 UTC (rev 104942)
+++ trunk/tomcat/pom.xml 2010-05-18 20:02:48 UTC (rev 104943)
@@ -117,16 +117,7 @@
<copy file="${maven.dependency.jboss.web.jbossweb.jar.path}"
tofile="${output.deploy}/jbossweb.sar/jbossweb.jar"/>
<copy file="${maven.dependency.javax.servlet.jstl.jar.path}"
- tofile="${output.deploy}/jbossweb.sar/jstl.jar"/>
- <mkdir dir="${output.deploy}/jbossweb.sar/jsf-libs"/>
- <copy file="${maven.dependency.javax.faces.jsf-api.jar.path}"
- tofile="${output.deploy}/jbossweb.sar/jsf-libs/jsf-api.jar"/>
- <copy file="${maven.dependency.javax.faces.jsf-impl.jar.path}"
- tofile="${output.deploy}/jbossweb.sar/jsf-libs/jsf-impl.jar"/>
-
- <!-- jar for jsf integration classes -->
- <copy file="target/${project.build.finalName}-jboss-faces.jar"
- tofile="${output.deploy}/jbossweb.sar/jsf-libs/jboss-faces.jar"/>
+ tofile="${output.deploy}/jbossweb.sar/jstl.jar"/>
<copy file="target/${project.build.finalName}-jboss-web-service.jar"
tofile="${output.deploy}/jbossweb.sar/jboss-web-service.jar"/>
@@ -153,6 +144,33 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.jsf.integration</groupId>
+ <artifactId>jboss-jsf-deployer</artifactId>
+ <version>${version.jboss.jsf-deployer}</version>
+ <type>jar</type>
+ <outputDirectory>target/deploy/jsf.deployer</outputDirectory>
+ <excludes>META-INF/maven/**</excludes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
@@ -161,16 +179,8 @@
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
- </dependency>
+ </dependency>
<dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
Deleted: trunk/tomcat/src/assembly/jboss-faces.xml
===================================================================
--- trunk/tomcat/src/assembly/jboss-faces.xml 2010-05-18 18:26:07 UTC (rev 104942)
+++ trunk/tomcat/src/assembly/jboss-faces.xml 2010-05-18 20:02:48 UTC (rev 104943)
@@ -1,17 +0,0 @@
-<assembly>
- <id>jboss-faces</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>org/jboss/web/jsf/integration/**</include>
- <include>org/jboss/web/validation/**</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
Modified: trunk/tomcat/src/resources/jboss-structure-sar.xml
===================================================================
--- trunk/tomcat/src/resources/jboss-structure-sar.xml 2010-05-18 18:26:07 UTC (rev 104942)
+++ trunk/tomcat/src/resources/jboss-structure-sar.xml 2010-05-18 20:02:48 UTC (rev 104943)
@@ -8,7 +8,6 @@
<classpath>
<path name=""/>
<path name="" suffixes=".jar" />
- <path name="jsf-libs" suffixes=".jar" />
</classpath>
</context>
</structure>
Modified: trunk/tomcat/src/resources/war-deployers-jboss-beans.xml
===================================================================
--- trunk/tomcat/src/resources/war-deployers-jboss-beans.xml 2010-05-18 18:26:07 UTC (rev 104942)
+++ trunk/tomcat/src/resources/war-deployers-jboss-beans.xml 2010-05-18 20:02:48 UTC (rev 104943)
@@ -34,7 +34,9 @@
<!-- JARs containing SCIs -->
<property name="sciJars">
<list class="java.util.ArrayList" elementClass="java.net.URL">
+ <!-- JSF no longer lives in jbossweb.sar. This will be soon addressed by the JSF deployer
<value>${jboss.server.home.url}/deploy/jbossweb.sar/jsf-libs/jsf-impl.jar</value>
+ -->
</list>
</property>
</bean>
@@ -43,7 +45,6 @@
<!-- JARs containing TLDs -->
<property name="tldJars">
<list class="java.util.ArrayList" elementClass="java.net.URL">
- <value>${jboss.server.home.url}/deploy/jbossweb.sar/jsf-libs/jsf-impl.jar</value>
<value>${jboss.server.home.url}/deploy/jbossweb.sar/jstl.jar</value>
</list>
</property>
Modified: trunk/tomcat/src/resources/web.xml
===================================================================
--- trunk/tomcat/src/resources/web.xml 2010-05-18 18:26:07 UTC (rev 104942)
+++ trunk/tomcat/src/resources/web.xml 2010-05-18 20:02:48 UTC (rev 104943)
@@ -16,39 +16,13 @@
<!-- =========== Common Context Params ================================== -->
- <!-- Regular expression to determine if two different URLs actually point -->
- <!-- to the same jar file. This keeps faces-config files from being -->
- <!-- read twice. -->
- <context-param>
- <param-name>com.sun.faces.duplicateJARPattern</param-name>
- <param-value>^tmp\d+(\S*\.jar)</param-value>
- </context-param>
-
- <!-- JBossInjectionProvider provides resource injection for managed beans. -->
- <!-- See JSF 1.2 spec section 5.4 for details. -->
- <context-param>
- <param-name>com.sun.faces.injectionProvider</param-name>
- <param-value>org.jboss.web.jsf.integration.injection.JBossDelegatingInjectionProvider</param-value>
- </context-param>
-
+
<!-- ================== Common Listener Configuration ==================== -->
<listener>
<listener-class>org.jboss.web.tomcat.security.SecurityFlushSessionListener</listener-class>
</listener>
- <!-- Configures JSF for a web application if the javax.faces.webapp.FacesServlet is declared -->
- <!-- in web.xml. -->
- <listener>
- <listener-class>org.jboss.web.jsf.integration.config.JBossJSFConfigureListener</listener-class>
- </listener>
-
- <!-- Listens to all web app lifecycle events so that @PreDestroy can be called on -->
- <!-- JSF managed beans that go out of scope. You can comment this out if you -->
- <!-- don't use JSF or you don't use annotations on your managed beans. -->
- <listener>
- <listener-class>com.sun.faces.application.WebappLifecycleListener</listener-class>
- </listener>
-
+
<!-- ================== Built In Servlet Definitions ==================== -->
More information about the jboss-cvs-commits
mailing list