Return-Path: 
 <commits-return-5213-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 E254C1012B
	for <apmail-openwebbeans-commits-archive@www.apache.org>;
 Wed, 26 Aug 2015 13:34:39 +0000 (UTC)
Received: (qmail 41624 invoked by uid 500); 26 Aug 2015 13:34:17 -0000
Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org
Received: (qmail 41598 invoked by uid 500); 26 Aug 2015 13:34:17 -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 41587 invoked by uid 99); 26 Aug 2015 13:34:17 -0000
Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Aug 2015 13:34:17 +0000
Received: from hades.apache.org (localhost [127.0.0.1])
	by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id
 A891BAC0479
	for <commits@openwebbeans.apache.org>; Wed, 26 Aug 2015 13:34:17 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1697929 - in
 /openwebbeans/branches/cdi-2.0/samples/conversation-sample: pom.xml
 src/main/webapp/WEB-INF/faces-config.xml src/main/webapp/WEB-INF/web.xml
Date: Wed, 26 Aug 2015 13:34:17 -0000
To: commits@openwebbeans.apache.org
From: rsandtner@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20150826133417.A891BAC0479@hades.apache.org>

Author: rsandtner
Date: Wed Aug 26 13:34:17 2015
New Revision: 1697929

URL: http://svn.apache.org/r1697929
Log:
OWB-1088 fixed conversation-sample

replaced tomcat6 with tomcat7

Modified:
    openwebbeans/branches/cdi-2.0/samples/conversation-sample/pom.xml
    openwebbeans/branches/cdi-2.0/samples/conversation-sample/src/main/webapp/WEB-INF/faces-config.xml
    openwebbeans/branches/cdi-2.0/samples/conversation-sample/src/main/webapp/WEB-INF/web.xml

Modified: openwebbeans/branches/cdi-2.0/samples/conversation-sample/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/samples/conversation-sample/pom.xml?rev=1697929&r1=1697928&r2=1697929&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/samples/conversation-sample/pom.xml (original)
+++ openwebbeans/branches/cdi-2.0/samples/conversation-sample/pom.xml Wed Aug 26 13:34:17 2015
@@ -17,12 +17,14 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
-    <description>Sample JSF2 Application</description>
+
     <parent>
-        <artifactId>samples</artifactId>
         <groupId>org.apache.openwebbeans</groupId>
+        <artifactId>samples</artifactId>
         <version>2.0.0-alpha-1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -30,14 +32,34 @@ under the License.
     <groupId>org.apache.openwebbeans.samples</groupId>
     <artifactId>conversation-sample</artifactId>
     <packaging>war</packaging>
-    <name>JSF Conversation Sample</name>
+
+    <name>Sample JSF2 Conversation</name>
+    <description>Sample JSF2 Application</description>
 
     <properties>
         <deploy.skip>true</deploy.skip>
+        <tomcat.version>7.0.61</tomcat.version>
     </properties>
 
     <dependencies>
 
+        <!-- JSR-330 API -->
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.2_spec</artifactId>
+        </dependency>
+
+        <!-- JSR-299 API -->
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jcdi_2.0_spec</artifactId>
+        </dependency>
+
         <!-- JSR-299 Impl -->
         <dependency>
             <groupId>org.apache.openwebbeans</groupId>
@@ -53,14 +75,7 @@ under the License.
         <!-- 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>
 
@@ -69,12 +84,6 @@ under the License.
             <groupId>org.apache.openwebbeans</groupId>
             <artifactId>openwebbeans-web</artifactId>
             <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-el22</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <!-- MyFaces API -->
@@ -89,31 +98,7 @@ under the License.
             <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-impl</artifactId>
             <version>${myfaces.version}</version>
-        </dependency>
-
-        <!-- JSF Facelet -->
-        <dependency>
-            <groupId>com.sun.facelets</groupId>
-            <artifactId>jsf-facelets</artifactId>
-            <version>1.1.14</version>
-        </dependency>
-
-        <!-- JSR-299 API -->
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jcdi_2.0_spec</artifactId>
-        </dependency>
-
-        <!-- JSR-330 API -->
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-atinject_1.0_spec</artifactId>
-        </dependency>
-
-        <!-- SPI API -->
-        <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-spi</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
     </dependencies>
@@ -123,7 +108,7 @@ under the License.
         <plugins>
             <plugin>
                 <groupId>org.apache.tomcat.maven</groupId>
-                <artifactId>tomcat6-maven-plugin</artifactId>
+                <artifactId>tomcat7-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>

Modified: openwebbeans/branches/cdi-2.0/samples/conversation-sample/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/samples/conversation-sample/src/main/webapp/WEB-INF/faces-config.xml?rev=1697929&r1=1697928&r2=1697929&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/samples/conversation-sample/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ openwebbeans/branches/cdi-2.0/samples/conversation-sample/src/main/webapp/WEB-INF/faces-config.xml Wed Aug 26 13:34:17 2015
@@ -19,9 +19,7 @@ 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: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>/buy.xhtml</from-view-id>
@@ -31,10 +29,5 @@ under the License.
             <redirect/>
         </navigation-case>
     </navigation-rule>
-    
-         <application>
-  <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
- </application>
-    
 
 </faces-config>

Modified: openwebbeans/branches/cdi-2.0/samples/conversation-sample/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/samples/conversation-sample/src/main/webapp/WEB-INF/web.xml?rev=1697929&r1=1697928&r2=1697929&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/samples/conversation-sample/src/main/webapp/WEB-INF/web.xml (original)
+++ openwebbeans/branches/cdi-2.0/samples/conversation-sample/src/main/webapp/WEB-INF/web.xml Wed Aug 26 13:34:17 2015
@@ -25,8 +25,7 @@
     </context-param>
 
     <listener>
-        <listener-class>
-            org.apache.webbeans.servlet.WebBeansConfigurationListener</listener-class>
+        <listener-class>org.apache.webbeans.servlet.WebBeansConfigurationListener</listener-class>
     </listener>
 
     <servlet>