You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2009/07/17 20:22:04 UTC
svn commit: r795178 - in /myfaces/trinidad/trunk/trinidad-examples: pom.xml
trinidad-demo/src/main/webapp/WEB-INF/web.xml
trinidad-demo/src/main/webapp/index.jsp
Author: bommel
Date: Fri Jul 17 18:22:04 2009
New Revision: 795178
URL: http://svn.apache.org/viewvc?rev=795178&view=rev
Log:
The demo should start without an error
Added:
myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/index.jsp (with props)
Modified:
myfaces/trinidad/trunk/trinidad-examples/pom.xml
myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/web.xml
Modified: myfaces/trinidad/trunk/trinidad-examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/pom.xml?rev=795178&r1=795177&r2=795178&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/pom.xml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/pom.xml Fri Jul 17 18:22:04 2009
@@ -117,7 +117,7 @@
<id>jettyConfig</id>
<dependencyManagement>
<dependencies>
- <dependency>
+ <!--dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
<scope>compile</scope>
@@ -127,7 +127,7 @@
<groupId>javax.faces</groupId>
<artifactId>jsf-impl</artifactId>
<scope>runtime</scope>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.apache.myfaces.core</groupId>
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/web.xml?rev=795178&r1=795177&r2=795178&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/web.xml Fri Jul 17 18:22:04 2009
@@ -204,7 +204,7 @@
<url-pattern>/afr/*</url-pattern>
</servlet-mapping>
<welcome-file-list>
- <welcome-file>index.jspx</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
</welcome-file-list>
<!-- Survey Demo (Custom) Tag Library -->
Added: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/index.jsp?rev=795178&view=auto
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/index.jsp (added)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/index.jsp Fri Jul 17 18:22:04 2009
@@ -0,0 +1,17 @@
+<%--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+--%>
+<jsp:forward page="faces/index.jspx"/>
\ No newline at end of file
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/index.jsp
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL