You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2011/01/13 11:59:05 UTC
svn commit: r1058499 - in
/myfaces/trinidad/trunk/trinidad-examples/trinidad-blank: pom.xml
src/main/webapp/WEB-INF/faces-config.xml
Author: matzew
Date: Thu Jan 13 10:59:04 2011
New Revision: 1058499
URL: http://svn.apache.org/viewvc?rev=1058499&view=rev
Log:
TRINIDAD-1991 - Example's bad faces-config.xml causes NullPointerException in ContentTypeAndCharacterSet
Modified:
myfaces/trinidad/trunk/trinidad-examples/trinidad-blank/pom.xml
myfaces/trinidad/trunk/trinidad-examples/trinidad-blank/src/main/webapp/WEB-INF/faces-config.xml
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-blank/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-blank/pom.xml?rev=1058499&r1=1058498&r2=1058499&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-blank/pom.xml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-blank/pom.xml Thu Jan 13 10:59:04 2011
@@ -35,25 +35,59 @@
<!-- Profile to run jetty, so the tomcat jars are included in the bundle. They are not included by default -->
<profiles>
- <profile>
- <id>jettyConfig</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <configuration>
- <connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
- <port>8181</port>
- <maxIdleTime>60000</maxIdleTime>
- </connector>
- </connectors>
- <scanIntervalSeconds>2</scanIntervalSeconds>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
+ <!-- To Debug using a remote debugger, issue
+ "export MAVEN_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"
+ and then issue
+ "mvn clean -PjettyConfig jetty:run"
+ Then connect the remote debugger to localhost:8000 -->
+ <profile>
+ <id>jettyConfig</id>
+ <dependencyManagement>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${jsf-myfaces.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${jsf-myfaces.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${jsf-ri.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>${jsf-ri.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+
+ <configuration>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
</project>
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-blank/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-blank/src/main/webapp/WEB-INF/faces-config.xml?rev=1058499&r1=1058498&r2=1058499&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-blank/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-blank/src/main/webapp/WEB-INF/faces-config.xml Thu Jan 13 10:59:04 2011
@@ -19,9 +19,12 @@
-->
<!DOCTYPE faces-config PUBLIC
- "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_0.dtd" >
-<faces-config>
+ "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_1.dtd" >
+<faces-config 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_2_0.xsd"
+ version="2.0">
<application>
<!-- Use the Trinidad RenderKit -->
@@ -59,4 +62,4 @@
</navigation-case>
</navigation-rule>
-</faces-config>
\ No newline at end of file
+</faces-config>