Return-Path: 
 <commits-return-4101-apmail-openwebbeans-commits-archive=openwebbeans.apache.org@openwebbeans.apache.org>
X-Original-To: apmail-openwebbeans-commits-archive@www.apache.org
Delivered-To: apmail-openwebbeans-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 7C1891174B
	for <apmail-openwebbeans-commits-archive@www.apache.org>;
 Sat, 31 May 2014 20:23:02 +0000 (UTC)
Received: (qmail 43458 invoked by uid 500); 31 May 2014 20:23:02 -0000
Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org
Received: (qmail 43437 invoked by uid 500); 31 May 2014 20:23:02 -0000
Mailing-List: contact commits-help@openwebbeans.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@openwebbeans.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@openwebbeans.apache.org>
List-Post: <mailto:commits@openwebbeans.apache.org>
List-Id: <commits.openwebbeans.apache.org>
Reply-To: dev@openwebbeans.apache.org
Delivered-To: mailing list commits@openwebbeans.apache.org
Received: (qmail 43429 invoked by uid 99); 31 May 2014 20:23:02 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 31 May 2014 20:23:02 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Sat, 31 May 2014 20:23:00 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id BACD1238890B;
	Sat, 31 May 2014 20:22:40 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1598920 - in
 /openwebbeans/branches/owb_1.2.x/samples/guess:
 pom.xml src/main/resources/META-INF/openwebbeans/
 src/main/webapp/WEB-INF/faces-config.xml src/main/webapp/WEB-INF/web.xml
Date: Sat, 31 May 2014 20:22:40 -0000
To: commits@openwebbeans.apache.org
From: struberg@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140531202240.BACD1238890B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: struberg
Date: Sat May 31 20:22:39 2014
New Revision: 1598920

URL: http://svn.apache.org/r1598920
Log:
move guess sample to JSF-2.2

Removed:
    openwebbeans/branches/owb_1.2.x/samples/guess/src/main/resources/META-INF/openwebbeans/
Modified:
    openwebbeans/branches/owb_1.2.x/samples/guess/pom.xml
    openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/WEB-INF/faces-config.xml
    openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/WEB-INF/web.xml

Modified: openwebbeans/branches/owb_1.2.x/samples/guess/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/samples/guess/pom.xml?rev=1598920&r1=1598919&r2=1598920&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/samples/guess/pom.xml (original)
+++ openwebbeans/branches/owb_1.2.x/samples/guess/pom.xml Sat May 31 20:22:39 2014
@@ -40,50 +40,25 @@ under the License.
         <finalName>guess</finalName>
         <plugins>
             <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.18</version>
-                <configuration>
-                    <scanIntervalSeconds>10</scanIntervalSeconds>
-                </configuration>
+                <groupId>org.apache.tomcat.maven</groupId>
+                <artifactId>tomcat7-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
 
     <dependencies>
 
-        <!-- JSF Facelet -->
-        <dependency>
-            <groupId>com.sun.facelets</groupId>
-            <artifactId>jsf-facelets</artifactId>
-            <version>1.1.14</version>
-        </dependency>
-
-        <!-- MyFaces API -->
-        <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-api</artifactId>
-            <version>1.2.8</version>
-        </dependency>
-
         <!-- JSF Plugin -->
         <dependency>
             <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-jsf12</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <!-- EL Plugin -->
-        <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-el10</artifactId>
+            <artifactId>openwebbeans-jsf</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <!-- Servlet API -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -127,8 +102,13 @@ under the License.
         <!-- MyFaces IMPL -->
         <dependency>
             <groupId>org.apache.myfaces.core</groupId>
+            <artifactId>myfaces-api</artifactId>
+            <version>${myfaces2.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-impl</artifactId>
-            <version>1.2.8</version>
+            <version>${myfaces2.version}</version>
         </dependency>
 
 

Modified: openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/WEB-INF/faces-config.xml?rev=1598920&r1=1598919&r2=1598920&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/WEB-INF/faces-config.xml Sat May 31 20:22:39 2014
@@ -19,38 +19,35 @@ under the License.
 -->
 
 <faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- 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">
+              xmlns:xi="http://www.w3.org/2001/XInclude"
+              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">
+
 
- 	
     <navigation-rule>
-    	<from-view-id>/home.xhtml</from-view-id>
-    	<navigation-case>
-    		<from-outcome>login</from-outcome>
-    		<to-view-id>/login.xhtml</to-view-id>
-    	</navigation-case>
+        <from-view-id>/home.xhtml</from-view-id>
+        <navigation-case>
+            <from-outcome>login</from-outcome>
+            <to-view-id>/login.xhtml</to-view-id>
+        </navigation-case>
     </navigation-rule>
-	
-   <navigation-rule>
-    	<from-view-id>/login.xhtml</from-view-id>
-    	<navigation-case>
-    		<from-outcome>loginSuccess</from-outcome>
-    		<to-view-id>/home.xhtml</to-view-id>
-    	</navigation-case>
+
+    <navigation-rule>
+        <from-view-id>/login.xhtml</from-view-id>
+        <navigation-case>
+            <from-outcome>loginSuccess</from-outcome>
+            <to-view-id>/home.xhtml</to-view-id>
+        </navigation-case>
     </navigation-rule>
 
-   <navigation-rule>
-    	<from-view-id>/conversation.xhtml</from-view-id>
-    	<navigation-case>
-    		<from-outcome>toRedirect</from-outcome>
-    		<to-view-id>/redirect.jsf?book=alis</to-view-id>
-    		<redirect/>
-    	</navigation-case>
+    <navigation-rule>
+        <from-view-id>/conversation.xhtml</from-view-id>
+        <navigation-case>
+            <from-outcome>toRedirect</from-outcome>
+            <to-view-id>/redirect.jsf?book=alis</to-view-id>
+            <redirect/>
+        </navigation-case>
     </navigation-rule>
-	
-	 <application>
-  <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
- </application>
 
-	
+
 </faces-config>

Modified: openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/WEB-INF/web.xml?rev=1598920&r1=1598919&r2=1598920&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/WEB-INF/web.xml (original)
+++ openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/WEB-INF/web.xml Sat May 31 20:22:39 2014
@@ -18,29 +18,29 @@ specific language governing permissions 
 under the License.
 -->
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
-  <display-name>guess</display-name>
-  
-  <welcome-file-list>
-  	<welcome-file>index.html</welcome-file>
-  </welcome-file-list>
-  
-  <listener>
-    <listener-class>org.apache.webbeans.servlet.WebBeansConfigurationListener</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>
-	
-	<context-param>
-      <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
-      <param-value>.xhtml</param-value>
-   </context-param>
-	  
+    <display-name>guess</display-name>
+
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+
+    <listener>
+        <listener-class>org.apache.webbeans.servlet.WebBeansConfigurationListener</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>
+
+    <context-param>
+        <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+        <param-value>.xhtml</param-value>
+    </context-param>
+
 </web-app>
\ No newline at end of file