Author: fbricon Date: 2011-08-04 12:53:56 -0400 (Thu, 04 Aug 2011) New Revision: 33592 Added: trunk/maven/plugins/org.jboss.tools.maven.ui/.settings/org.eclipse.m2e.core.prefs trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seam-webxml/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seam-webxml/pom.xml trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seam-webxml/src/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seam-webxml/src/main/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seam-webxml/src/main/webapp/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seam-webxml/src/main/webapp/WEB-INF/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seam-webxml/src/main/webapp/WEB-INF/web.xml trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/pom.xml trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/components.xml trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/faces-config.xml trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/faces-config.xml.l4t trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/web.xml trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/SeamConfiguratorTest.java Modified: trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/ProfileSelectionHandler.java trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/AbstractMavenConfiguratorTest.java trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JSFConfiguratorTest.java Log: JBIDE-9454 : Deactivate adding of Faces servlet for all JSF versions, as it completely overwrites the project web.xml when m2e-wtp 0.13.x is used Modified: trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml 2011-08-04 16:32:42 UTC (rev 33591) +++ trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml 2011-08-04 16:53:56 UTC (rev 33592) @@ -32,13 +32,13 @@ soft="true" version="[1.0"/> <requires - facet="jst.appclient" - soft="true" - version="[1.2"/> + facet="jst.appclient" + soft="true" + version="[1.2"/> <requires - facet="jst.connector" - soft="true" - version="[1.0"/> + facet="jst.connector" + soft="true" + version="[1.0"/> </or> </constraint> </project-facet-version> @@ -235,4 +235,5 @@ </enablement> </provider> </extension> + </plugin> Modified: trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java 2011-08-04 16:32:42 UTC (rev 33591) +++ trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java 2011-08-04 16:53:56 UTC (rev 33592) @@ -189,7 +189,7 @@ && !generatedFacesConfig.exists(); IProjectFacetVersion facetVersion = null; - boolean configureServlet = true; + boolean configureServlet = false;//Fix for JBIDE-9454, where existing web.xml is completely overwritten. if (jsfVersionString.startsWith(JSF_VERSION_1_1)) { facetVersion = JSF_FACET_VERSION_1_1; } @@ -198,7 +198,7 @@ } else if (jsfVersionString.startsWith(JSF_VERSION_2_0)) { facetVersion = JSF_FACET_VERSION_2_0; - configureServlet = configureWebxml(); + //configureServlet = configureWebxml(); } if (facetVersion != null) { Added: trunk/maven/plugins/org.jboss.tools.maven.ui/.settings/org.eclipse.m2e.core.prefs =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.ui/.settings/org.eclipse.m2e.core.prefs (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.ui/.settings/org.eclipse.m2e.core.prefs 2011-08-04 16:53:56 UTC (rev 33592) @@ -0,0 +1,5 @@ +#Tue Jun 28 11:43:06 CEST 2011 +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/ProfileSelectionHandler.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/ProfileSelectionHandler.java 2011-08-04 16:32:42 UTC (rev 33591) +++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/ProfileSelectionHandler.java 2011-08-04 16:53:56 UTC (rev 33592) @@ -83,7 +83,6 @@ final SelectProfilesDialog dialog = new SelectProfilesDialog(window.getShell(), facades, sharedProfiles); - //dialog.setBlockOnOpen(false); doesn't work if(dialog.open() == Window.OK) { WorkspaceJob job = new WorkspaceJob(Messages.ProfileManager_Updating_maven_profiles) { Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties 2011-08-04 16:32:42 UTC (rev 33591) +++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties 2011-08-04 16:53:56 UTC (rev 33592) @@ -26,7 +26,7 @@ ConfiguratorPreferencePage_Configure_JBoss_Portlet_Core_facet=JBoss Portlet Core facet ConfiguratorPreferencePage_Configure_JBoss_Seam_Portlet_facet=JBoss Seam Portlet facet ConfiguratorPreferencePage_Configure_JSF_facet=JSF facet -ConfiguratorPreferencePage_Configure_Webxml_JSF20=web.xml for JSF 2.0 facet +ConfiguratorPreferencePage_Configure_Webxml_JSF20=web.xml for JSF facet ConfiguratorPreferencePage_Configure_CDI_facet=CDI facet ConfiguratorPreferencePage_Configure_Hibernate=Hibernate ConfiguratorPreferencePage_Configure_Seam_Artifacts=Seam Artifacts (view folder, model source folder, package ...) Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seam-webxml/pom.xml =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seam-webxml/pom.xml (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seam-webxml/pom.xml 2011-08-04 16:53:56 UTC (rev 33592) @@ -0,0 +1,46 @@ +<?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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.tools.maven.tests</groupId> + <artifactId>seam-webxml</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>war</packaging> + <dependencies> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <version>2.2.2.Final</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>2.1.1</version> + <configuration> + </configuration> + </plugin> + </plugins> + </build> + <repositories> + <!-- You should seriously consider using a repository manager or declare repositories in your settings.xml. + See http://www.sonatype.com/people/2009/02/why-putting-repositories-in-your-p... --> + <repository> + <!-- The JBoss Public repository is a composite repository of several major repositories. + See http://community.jboss.org/wiki/MavenGettingStarted-Users --> + <id>jboss-public-repository</id> + <url>http://repository.jboss.org/nexus/content/groups/public</url> + <releases> + <enabled>true</enabled> + </releases> + <!-- You can disable snapshot resolution to speed up your builds --> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> +</project> + Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seam-webxml/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seam-webxml/src/main/webapp/WEB-INF/web.xml (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seam-webxml/src/main/webapp/WEB-INF/web.xml 2011-08-04 16:53:56 UTC (rev 33592) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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"> + <display-name>seam-web</display-name> + <welcome-file-list> + <welcome-file>index.html</welcome-file> + <welcome-file>index.htm</welcome-file> + <welcome-file>index.jsp</welcome-file> + <welcome-file>default.html</welcome-file> + <welcome-file>default.htm</welcome-file> + <welcome-file>default.jsp</welcome-file> + </welcome-file-list> +</web-app> Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/pom.xml =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/pom.xml (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/pom.xml 2011-08-04 16:53:56 UTC (rev 33592) @@ -0,0 +1,149 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <parent> + <artifactId>samples</artifactId> + <groupId>org.richfaces</groupId> + <version>3.3.3.Final</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples</groupId> + <artifactId>seamIntegration</artifactId> + <packaging>war</packaging> + <name>seamIntegration Maven Webapp</name> + <properties> + <seam.version>2.1.2</seam.version> + </properties> + <build> + <finalName>seamIntegration</finalName> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <!-- + <webResources> <resource> <directory>${seamHome}</directory> + <targetPath>WEB-INF/lib</targetPath> <includes> + <include>jboss-seam.jar</include> + <include>jboss-seam-ui.jar</include> + <include>jboss-seam-debug.jar</include> <include> + jboss-seam-remoting.jar </include> <include> jboss-seam-pdf.jar + </include> </includes> </resource> <resource> + <directory>${seamHome}/lib</directory> + <targetPath>WEB-INF/lib</targetPath> <includes> + <include>jboss-el.jar</include> </includes> </resource> + </webResources> + --> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>1.8.0.7</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + <version>1.2.2</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>3.4.0.GA</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jcl</artifactId> + <version>1.4.2</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <version>3.1.0.GA</version> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <version>${seam.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.el</groupId> + <artifactId>jboss-el</artifactId> + <version>2.0.2.CR1</version> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-ui</artifactId> + <version>${seam.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-ioc</artifactId> + <version>${seam.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-debug</artifactId> + <version>${seam.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>org.apache.myfaces.trinidad</groupId> + <artifactId>trinidad-api</artifactId> + <version>1.2.10</version> + </dependency> + <dependency> + <groupId>org.apache.myfaces.trinidad</groupId> + <artifactId>trinidad-impl</artifactId> + <version>1.2.10</version> + <scope>runtime</scope> + </dependency> + </dependencies> + <repositories> + <!-- You should seriously consider using a repository manager or declare repositories in your settings.xml. + See http://www.sonatype.com/people/2009/02/why-putting-repositories-in-your-p... --> + <repository> + <!-- The JBoss Public repository is a composite repository of several major repositories. + See http://community.jboss.org/wiki/MavenGettingStarted-Users --> + <id>jboss-public-repository</id> + <url>http://repository.jboss.org/nexus/content/groups/public</url> + <releases> + <enabled>true</enabled> + </releases> + <!-- You can disable snapshot resolution to speed up your builds --> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> +</project> \ No newline at end of file Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/components.xml =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/components.xml (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/components.xml 2011-08-04 16:53:56 UTC (rev 33592) @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="UTF-8"?> +<components xmlns="http://jboss.com/products/seam/components" + xmlns:core="http://jboss.com/products/seam/core" + xmlns:persistence="http://jboss.com/products/seam/persistence" + xmlns:transaction="http://jboss.com/products/seam/transaction" + xmlns:drools="http://jboss.com/products/seam/drools" + xmlns:bpm="http://jboss.com/products/seam/bpm" + xmlns:security="http://jboss.com/products/seam/security" + xmlns:mail="http://jboss.com/products/seam/mail" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd + http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.0.xsd + http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.0.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd + http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.0.xsd + http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.0.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + + <core:init debug="true" /><!-- transaction-management-enabled="false" --> + + <core:manager concurrent-request-timeout="500" + conversation-timeout="120000" conversation-id-parameter="cid" /> + + <transaction:entity-transaction entity-manager="#{entityManager}" /> + + + <persistence:entity-manager-factory name="exampleDatabase" /> + + + + <persistence:managed-persistence-context name="entityManager" + auto-create="true" entity-manager-factory="#{exampleDatabase}" /> + + + <!-- + + <persistence:managed-persistence-context name="entityManager" + auto-create="true" + entity-manager-factory="#{seamIntegrationEntityManagerFactory}"/> + + <persistence:entity-manager-factory name="seamIntegrationEntityManagerFactory" + persistence-unit-name="seamIntegration"/> + + <drools:rule-base name="securityRules"> + <drools:rule-files><value>/security.drl</value></drools:rule-files> + </drools:rule-base> + + <security:identity authenticate-method="#{authenticator.authenticate}" + security-rules="#{securityRules}" + remember-me="true"/> + + <event type="org.jboss.seam.notLoggedIn"> + <action expression="#{redirect.captureCurrentView}"/> + </event> + <event type="org.jboss.seam.postAuthenticate"> + <action expression="#{redirect.returnToCapturedView}"/> + </event> + + <mail:mail-session host="localhost" port="2525" username="test" password="test" /> + + --> + <!-- For use with jBPM pageflow or process management --> + <!-- + <bpm:jbpm> + <bpm:process-definitions></bpm:process-definitions> + <bpm:pageflow-definitions></bpm:pageflow-definitions> + </bpm:jbpm> + --> + +</components> Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/faces-config.xml (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/faces-config.xml 2011-08-04 16:53:56 UTC (rev 33592) @@ -0,0 +1,20 @@ +<?xml version='1.0' encoding='UTF-8'?> +<faces-config version="1.2" + 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-facesconfig_1_2.xsd"> + + <application> + <message-bundle>messages</message-bundle> + <locale-config> + <default-locale>en</default-locale> + </locale-config> + <!-- Disabled when using Ajax4JSF --> + <!-- + <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> + --> + <default-render-kit-id> + org.apache.myfaces.trinidad.core + </default-render-kit-id> + </application> +</faces-config> Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/faces-config.xml.l4t =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/faces-config.xml.l4t (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/faces-config.xml.l4t 2011-08-04 16:53:56 UTC (rev 33592) @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<PROCESS ENTITY="JSFProcess"/> Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/web.xml (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/web.xml 2011-08-04 16:53:56 UTC (rev 33592) @@ -0,0 +1,98 @@ +<?xml version="1.0" ?> +<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"> + + + <!-- Ajax4jsf --> + <!-- + <context-param> <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name> + <param-value>com.sun.facelets.FaceletViewHandler</param-value> + </context-param> + --> + <context-param> + <param-name>org.apache.myfaces.trinidad.ALTERNATE_VIEW_HANDLER</param-name> + <param-value>com.sun.facelets.FaceletViewHandler</param-value> + </context-param> + <context-param> + <param-name>org.ajax4jsf.SKIN</param-name> + <param-value>blueSky</param-value> + </context-param> + <context-param> + <param-name>facelets.VIEW_MAPPINGS</param-name> + <param-value>*.xhtml</param-value> + </context-param> + + <!-- Seam --> + <listener> + <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> + </listener> + <filter> + <filter-name>Seam Filter</filter-name> + <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>Seam Filter</filter-name> + <servlet-name>Faces Servlet</servlet-name> + <dispatcher>REQUEST</dispatcher> + <dispatcher>FORWARD</dispatcher> + <dispatcher>INCLUDE</dispatcher> + <dispatcher>ERROR</dispatcher> + </filter-mapping> + <filter> + <filter-name>trinidad</filter-name> + <filter-class>org.apache.myfaces.trinidad.webapp.TrinidadFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>trinidad</filter-name> + <!-- This assumes that the FacesServlet has been registered --> + <!-- under the name "faces" --> + <servlet-name>Faces Servlet</servlet-name> + <dispatcher>REQUEST</dispatcher> + <dispatcher>FORWARD</dispatcher> + <dispatcher>INCLUDE</dispatcher> + <dispatcher>ERROR</dispatcher> + </filter-mapping> + <servlet> + <servlet-name>Seam Resource Servlet</servlet-name> + <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>Seam Resource Servlet</servlet-name> + <url-pattern>/seam/resource/*</url-pattern> + </servlet-mapping> + + <!-- Facelets development mode (disable in production) --> + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>true</param-value> + </context-param> + + <!-- JSF --> + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + <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> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>/faces/*</url-pattern> + </servlet-mapping> + <servlet> + <servlet-name>resources</servlet-name> + <servlet-class>org.apache.myfaces.trinidad.webapp.ResourceServlet</servlet-class> + </servlet> + <!-- This cannot be configured currently --> + <servlet-mapping> + <servlet-name>resources</servlet-name> + <url-pattern>/adf/*</url-pattern> + </servlet-mapping> +</web-app> \ No newline at end of file Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/AbstractMavenConfiguratorTest.java =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/AbstractMavenConfiguratorTest.java 2011-08-04 16:32:42 UTC (rev 33591) +++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/AbstractMavenConfiguratorTest.java 2011-08-04 16:53:56 UTC (rev 33592) @@ -15,6 +15,8 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IncrementalProjectBuilder; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jst.common.project.facet.core.JavaFacet; import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.project.IProjectConfigurationManager; @@ -71,18 +73,18 @@ if (newPomName != null) { copyContent(project, newPomName, "pom.xml"); } - + IProgressMonitor mon = new NullProgressMonitor(); IProjectConfigurationManager configurationManager = MavenPlugin.getProjectConfigurationManager(); ResolverConfiguration configuration = new ResolverConfiguration(); - configurationManager.enableMavenNature(project, configuration, monitor); - configurationManager.updateProjectConfiguration(project, monitor); - waitForJobsToComplete(); + configurationManager.enableMavenNature(project, configuration, mon); + configurationManager.updateProjectConfiguration(project, mon); + waitForJobsToComplete(mon); - project.build(IncrementalProjectBuilder.FULL_BUILD, monitor); + project.build(IncrementalProjectBuilder.FULL_BUILD, mon); if (waitTime > 0) { Thread.sleep(waitTime); } - waitForJobsToComplete(); + waitForJobsToComplete(mon); } protected void updateProject(IProject project) throws Exception { Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JSFConfiguratorTest.java =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JSFConfiguratorTest.java 2011-08-04 16:32:42 UTC (rev 33591) +++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JSFConfiguratorTest.java 2011-08-04 16:53:56 UTC (rev 33592) @@ -4,6 +4,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.m2e.core.project.ResolverConfiguration; import org.eclipse.m2e.tests.common.WorkspaceHelpers; import org.eclipse.wst.common.project.facet.core.IFacetedProject; @@ -24,7 +25,7 @@ "jsf-myfaces/pom.xml", "jsf-jsfapi-12/pom.xml"}, new ResolverConfiguration()); - waitForJobsToComplete(); + waitForJobsToComplete(new NullProgressMonitor()); IProject mojarra = projects[0]; assertNoErrors(mojarra); assertIsJSFProject(mojarra, JSFProjectConfigurator.JSF_FACET_VERSION_2_0); @@ -54,7 +55,7 @@ String webxmlRelPath = "src/main/webapp/WEB-INF/web.xml"; IProject jsfProject = importProject(projectLocation+"/pom.xml"); - waitForJobsToComplete(); + waitForJobsToComplete(new NullProgressMonitor()); assertIsJSFProject(jsfProject, JSFProjectConfigurator.JSF_FACET_VERSION_2_0); IFile webXml = jsfProject.getFile(webxmlRelPath); @@ -67,7 +68,7 @@ public void testJBIDE9455_errorMarkers() throws Exception { String projectLocation = "projects/jsf/jsf-error"; IProject jsfProject = importProject(projectLocation+"/pom.xml"); - waitForJobsToComplete(); + waitForJobsToComplete(new NullProgressMonitor()); IFacetedProject facetedProject = ProjectFacetsManager.create(jsfProject); assertNotNull(jsfProject.getName() + " is not a faceted project", facetedProject); assertFalse("JSF Facet should be missing", facetedProject.hasProjectFacet(JSFProjectConfigurator.JSF_FACET)); Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/SeamConfiguratorTest.java =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/SeamConfiguratorTest.java (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/SeamConfiguratorTest.java 2011-08-04 16:53:56 UTC (rev 33592) @@ -0,0 +1,40 @@ +package org.jboss.tools.maven.configurators.tests; + +import java.io.File; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.jboss.tools.maven.jsf.configurators.JSFProjectConfigurator; +import org.junit.Test; + +@SuppressWarnings("restriction") +public class SeamConfiguratorTest extends AbstractMavenConfiguratorTest { + + @Test + public void testJBIDE9454_webXml_overwrite() throws Exception { + IProject project = importAndCheckSeamProject("seam-webxml"); + assertIsJSFProject(project, JSFProjectConfigurator.JSF_FACET_VERSION_1_2); + } + + @Test + public void testJBIDE6228_webXml_changed_richfaces() throws Exception { + IProject project = importAndCheckSeamProject("seamIntegration"); + assertIsJSFProject(project, JSFProjectConfigurator.JSF_FACET_VERSION_1_2); + } + + protected IProject importAndCheckSeamProject(String projectName) throws Exception { + String projectLocation = "projects/seam/"+projectName; + String webxmlRelPath = "src/main/webapp/WEB-INF/web.xml"; + + IProject seamProject = importProject(projectLocation+"/pom.xml"); + waitForJobsToComplete(); + assertNoErrors(seamProject); + + IFile webXml = seamProject.getFile(webxmlRelPath); + assertTrue(webXml.exists()); + File originalWebXml = new File(projectLocation, webxmlRelPath); + assertEquals("web.xml content changed ", toString(originalWebXml), toString(webXml)); + return seamProject; + } + +}