openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1598917 - in /openwebbeans/branches/owb_1.2.x: ./ samples/conversation-sample/ samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/ samples/conversation-sample/src/main/resources/META-INF/openwebbeans/ sample...
Date Sat, 31 May 2014 20:14:35 GMT
Author: struberg
Date: Sat May 31 20:14:34 2014
New Revision: 1598917

URL: http://svn.apache.org/r1598917
Log:
OWB-962 updated conversation sample

Removed:
    openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/resources/META-INF/openwebbeans/
Modified:
    openwebbeans/branches/owb_1.2.x/pom.xml
    openwebbeans/branches/owb_1.2.x/samples/conversation-sample/pom.xml
    openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/ShoppingBean.java
    openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/webapp/buy.xhtml

Modified: openwebbeans/branches/owb_1.2.x/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/pom.xml?rev=1598917&r1=1598916&r2=1598917&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/pom.xml (original)
+++ openwebbeans/branches/owb_1.2.x/pom.xml Sat May 31 20:14:34 2014
@@ -78,7 +78,8 @@
         <geronimo_interceptor.version>1.0</geronimo_interceptor.version>
         <geronimo_validation.version>1.1</geronimo_validation.version>
         <openejb.version>3.1.4</openejb.version>
-        <myfaces.version>2.0.7</myfaces.version>
+        <myfaces.version>1.2.9</myfaces.version>
+        <myfaces2.version>2.2.3</myfaces2.version>
         <xbean.version>3.17</xbean.version>
     </properties>
     
@@ -119,7 +120,6 @@
             <email>gerdogdu at apache dot org</email>
             <roles>
                 <role>PMC</role>
-                <role>Chair</role>
             </roles>
         </developer>
         <developer>
@@ -225,7 +225,7 @@
             <email>arne at apache dot org</email>
             <timezone>+1</timezone>
             <roles>
-                <role>committer</role>
+                <role>PMC</role>
             </roles>
         </developer>
         <developer>
@@ -234,7 +234,7 @@
             <email>tandraschko at apache dot org</email>
             <timezone>+1</timezone>
             <roles>
-                <role>committer</role>
+                <role>PMC</role>
             </roles>
         </developer>
     </developers>
@@ -532,6 +532,11 @@
                 <artifactId>geronimo-servlet_2.5_spec</artifactId>
                 <version>${geronimo_servlet.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-servlet_3.0_spec</artifactId>
+                <version>1.0</version>
+            </dependency>
 
             <dependency>
                 <groupId>dom4j</groupId>
@@ -561,13 +566,13 @@
             <dependency>
                 <groupId>org.apache.myfaces.core</groupId>
                 <artifactId>myfaces-api</artifactId>
-                <version>${myfaces.version}</version>
+                <version>${myfaces2.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.myfaces.core</groupId>
                 <artifactId>myfaces-impl</artifactId>
-                <version>${myfaces.version}</version>
+                <version>${myfaces2.version}</version>
             </dependency>
 
             <dependency>

Modified: openwebbeans/branches/owb_1.2.x/samples/conversation-sample/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/samples/conversation-sample/pom.xml?rev=1598917&r1=1598916&r2=1598917&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/samples/conversation-sample/pom.xml (original)
+++ openwebbeans/branches/owb_1.2.x/samples/conversation-sample/pom.xml Sat May 31 20:14:34
2014
@@ -37,6 +37,23 @@ under the License.
     </properties>
 
     <dependencies>
+        <!-- JSR-299 API -->
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jcdi_1.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>
+        </dependency>
 
         <!-- JSR-299 Impl -->
         <dependency>
@@ -69,20 +86,26 @@ 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 -->
         <dependency>
             <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-api</artifactId>
-            <version>1.2.8</version>
+            <version>${myfaces.version}</version>
         </dependency>
 
         <!-- MyFaces IMPL -->
         <dependency>
             <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-impl</artifactId>
-            <version>1.2.8</version>
+            <version>${myfaces.version}</version>
         </dependency>
 
         <!-- JSF Facelet -->
@@ -91,38 +114,14 @@ under the License.
             <artifactId>jsf-facelets</artifactId>
             <version>1.1.14</version>
         </dependency>
-
-        <!-- JSR-299 API -->
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jcdi_1.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>
-        </dependency>
-
     </dependencies>
 
     <build>
         <finalName>conversation-sample</finalName>
         <plugins>
             <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.18</version>
-                <configuration>
-                    <contextPath>${project.build.finalName}</contextPath>
-                    <scanIntervalSeconds>3</scanIntervalSeconds>
-                </configuration>
+                <groupId>org.apache.tomcat.maven</groupId>
+                <artifactId>tomcat6-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>

Modified: openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/ShoppingBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/ShoppingBean.java?rev=1598917&r1=1598916&r2=1598917&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/ShoppingBean.java
(original)
+++ openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/ShoppingBean.java
Sat May 31 20:14:34 2014
@@ -32,7 +32,8 @@ import javax.inject.Named;
 
 @Named
 @ConversationScoped
-public class ShoppingBean implements Serializable
+public class
+        ShoppingBean implements Serializable
 {
     private static final long serialVersionUID = 1L;
 

Modified: openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/webapp/buy.xhtml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/webapp/buy.xhtml?rev=1598917&r1=1598916&r2=1598917&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/webapp/buy.xhtml
(original)
+++ openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/webapp/buy.xhtml
Sat May 31 20:14:34 2014
@@ -1,109 +1,108 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
 <!--
-	
-	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.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" 
-xmlns:h="http://java.sun.com/jsf/html"
-xmlns:f="http://java.sun.com/jsf/core">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:f="http://java.sun.com/jsf/core">
 <head>
-  <title>OpenWebBeans :: Examples</title>
+    <title>OpenWebBeans :: Examples</title>
 </head>
 <body>
-	
-	<div>
-		<h3>Shopping Card Example</h3>
-		<ul>
-			<li>When user clicks <b style="color:red;">"Starts Shopping"</b> button,
new conversation is started. When user clicks <b style="color:red;">"Checkout"</b>
button, conversation ends.</li>
-			<li>When user clicks <b style="color:red;">"Add Item"</b> link in the
table, it adds new item to the buyer's shopping card.</li>
- 			<li>When user clicks <b style="color:red;">"Show Items"</b> button,
it shows contents of buyer shopping card.</li>
-			<li>When user clicks <b style="color:red;">"To Listing Page"</b> button,
it shows content of buyer shopping card in a new page.</li>
-		</ul>
-	</div>
-	
-	<h:form id="form">
-		
-		<div>		
-			<h:outputText value="Current Conversation Id  : " style="color:red;"/>
-			<h:outputText value="#{shoppingBean.conversation.id}" id="conversation" style="font-weight:bold;"
/>
-		</div>
-			
-		<div style="margin-top: 10px;">
-			<h:commandButton id="button1" value="Starts Shopping" action="#{shoppingBean.startShopping}">
-			</h:commandButton>
-			
-			<h:commandButton id="button3" value="To Listing Page" action="toListingPage">		
    
-			</h:commandButton>			
-			
-			<h:commandButton id="button4" value="Checkout" action="#{shoppingBean.checkout}">
		    
-			</h:commandButton>			
-							
-		</div>
-		
-		<div style="margin-top: 10px;">
-			<h3>Products Details</h3>
-			<h:dataTable cellpadding="1" cellspacing="5" value="#{allProducts}" var="item" binding="#{shoppingBean.uiTable}">
-				
-				<h:column>
-					<f:facet name="header">
-						<h:outputText value="Product Name" />
-					</f:facet>
-					<h:outputText value="#{item.name}" />
-				</h:column>
-				
-				<h:column>
-					<f:facet name="header">
-						<h:outputText value="Product Price" />
-					</f:facet>
-					<h:outputText value="#{item.price}" />
-				</h:column>
-				
-				<h:column>
-					<f:facet name="header">
-						<h:outputText value="" />
-					</f:facet>
-					<h:commandLink action="#{shoppingBean.buy}" value="Add Item to Card" />
-				</h:column>
-				
-			</h:dataTable>
-		</div>
-		
-		<div style="margin-top: 10px;">
-			<h3>Current Shopping Card Content</h3>
-			<h:dataTable cellpadding="1" cellspacing="5" value="#{selectedItems}" var="item">
-				
-				<h:column>
-					<f:facet name="header">
-						<h:outputText value="Product Name" />
-					</f:facet>
-					<h:outputText value="#{item.name}" />
-				</h:column>
-				
-				<h:column>
-					<f:facet name="header">
-						<h:outputText value="Product Price" />
-					</f:facet>
-					<h:outputText value="#{item.price}" />
-				</h:column>
-				
-			</h:dataTable>
-		</div>
-		
-				
-	</h:form>
+
+<div>
+    <h3>Shopping Card Example</h3>
+    <ul>
+        <li>When user clicks <b style="color:red;">"Starts Shopping"</b>
button, new conversation is started. When user clicks <b style="color:red;">"Checkout"</b>
button, conversation ends.</li>
+        <li>When user clicks <b style="color:red;">"Add Item"</b> link
in the table, it adds new item to the buyer's shopping card.</li>
+        <li>When user clicks <b style="color:red;">"To Listing Page"</b>
button, it shows content of buyer shopping card in a new page.</li>
+    </ul>
+</div>
+
+<h:form id="form">
+
+    <div>
+        <h:outputText value="Current Conversation Id  : " style="color:red;"/>
+        <h:outputText value="#{shoppingBean.conversation.id}" id="conversation" style="font-weight:bold;"
/>
+    </div>
+
+    <div style="margin-top: 10px;">
+        <h:commandButton id="button1" value="Starts Shopping" action="#{shoppingBean.startShopping}">
+        </h:commandButton>
+
+        <h:commandButton id="button3" value="To Listing Page" action="toListingPage">
+        </h:commandButton>
+
+        <h:commandButton id="button4" value="Checkout" action="#{shoppingBean.checkout}">
+        </h:commandButton>
+
+    </div>
+
+    <div style="margin-top: 10px;">
+        <h3>Products Details</h3>
+        <h:dataTable cellpadding="1" cellspacing="5" value="#{allProducts}" var="item"
binding="#{shoppingBean.uiTable}">
+
+            <h:column>
+                <f:facet name="header">
+                    <h:outputText value="Product Name" />
+                </f:facet>
+                <h:outputText value="#{item.name}" />
+            </h:column>
+
+            <h:column>
+                <f:facet name="header">
+                    <h:outputText value="Product Price" />
+                </f:facet>
+                <h:outputText value="#{item.price}" />
+            </h:column>
+
+            <h:column>
+                <f:facet name="header">
+                    <h:outputText value="" />
+                </f:facet>
+                <h:commandLink action="#{shoppingBean.buy}" value="Add Item to Card" />
+            </h:column>
+
+        </h:dataTable>
+    </div>
+
+    <div style="margin-top: 10px;">
+        <h3>Current Shopping Card Content</h3>
+        <h:dataTable cellpadding="1" cellspacing="5" value="#{selectedItems}" var="item">
+
+            <h:column>
+                <f:facet name="header">
+                    <h:outputText value="Product Name" />
+                </f:facet>
+                <h:outputText value="#{item.name}" />
+            </h:column>
+
+            <h:column>
+                <f:facet name="header">
+                    <h:outputText value="Product Price" />
+                </f:facet>
+                <h:outputText value="#{item.price}" />
+            </h:column>
+
+        </h:dataTable>
+    </div>
+
+
+</h:form>
 
 </body>
 </html>
\ No newline at end of file



Mime
View raw message