You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2010/10/07 06:52:36 UTC
svn commit: r1005331 - in
/geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF:
faces-config.xml web.xml
Author: gawor
Date: Thu Oct 7 04:52:36 2010
New Revision: 1005331
URL: http://svn.apache.org/viewvc?rev=1005331&view=rev
Log:
make the test portable
Modified:
geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/faces-config.xml
geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/web.xml
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/faces-config.xml?rev=1005331&r1=1005330&r2=1005331&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/faces-config.xml Thu Oct 7 04:52:36 2010
@@ -59,10 +59,10 @@ under the License.
</navigation-case>
</navigation-rule>
-
+<!--
<application>
<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
</application>
-
+-->
</faces-config>
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/web.xml?rev=1005331&r1=1005330&r2=1005331&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF/web.xml Thu Oct 7 04:52:36 2010
@@ -1,47 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- 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.
+ 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.
-->
-<web-app 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"
- version="2.5">
+<web-app 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" version="2.5">
- <context-param>
- <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
- <param-value>.xhtml</param-value>
- </context-param>
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
- <listener>
- <listener-class>
- org.apache.webbeans.servlet.WebBeansConfigurationListener
- </listener-class>
- </listener>
- <listener>
- <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
- </listener>
+ <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>*.jsf</url-pattern>
+ </servlet-mapping>
- <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>*.jsf</url-pattern>
- </servlet-mapping>
-
-</web-app>
\ No newline at end of file
+</web-app>