Return-Path: 
 <scm-return-44197-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 41493 invoked from network); 7 Oct 2010 04:52:58 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 7 Oct 2010 04:52:58 -0000
Received: (qmail 98368 invoked by uid 500); 7 Oct 2010 04:52:58 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 98299 invoked by uid 500); 7 Oct 2010 04:52:58 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 98292 invoked by uid 99); 7 Oct 2010 04:52:57 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Oct 2010 04:52:57 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Oct 2010 04:52:56 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id AF111238890B; Thu,  7 Oct 2010 04:52:36 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1005331 - in
 /geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/webapp/WEB-INF:
 faces-config.xml web.xml
Date: Thu, 07 Oct 2010 04:52:36 -0000
To: scm@geronimo.apache.org
From: gawor@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20101007045236.AF111238890B@eris.apache.org>

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>