You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by vi...@apache.org on 2011/03/04 09:54:27 UTC
svn commit: r1077852 - in /geronimo/daytrader/trunk: ./ assemblies/ bin/
javaee6/modules/core/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/
javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/
javaee6/mo...
Author: violalu
Date: Fri Mar 4 08:54:26 2011
New Revision: 1077852
URL: http://svn.apache.org/viewvc?rev=1077852&view=rev
Log:
DAYTRADER-91 remove java ee 5 modules,just keep one java ee 6 folder
Removed:
geronimo/daytrader/trunk/assemblies/
geronimo/daytrader/trunk/bin/
geronimo/daytrader/trunk/javaee6/modules/core/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeAction.java
geronimo/daytrader/trunk/modules/
geronimo/daytrader/trunk/plugins/
Modified:
geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/HoldingData.java
geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/OrderDataJSF.java
geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/PortfolioJSF.java
geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/QuoteData.java
geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/QuoteDataJSF.java
geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/TradeAppJSF.java
geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/faces-config.xml
geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/portfolio.xhtml
geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/quote.xhtml
geronimo/daytrader/trunk/pom.xml
Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/HoldingData.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/HoldingData.java?rev=1077852&r1=1077851&r2=1077852&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/HoldingData.java (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/HoldingData.java Fri Mar 4 08:54:26 2011
@@ -112,21 +112,4 @@ public class HoldingData {
public BigDecimal getGain() {
return gain;
}
-
- public void sell(){
- FacesContext facesContext = FacesContext.getCurrentInstance();
- HttpSession session = (HttpSession) facesContext.getExternalContext().getSession(true);
- String userID = (String)session.getAttribute("uidBean");
- TradeAction tAction = new TradeAction();
- OrderDataBean orderData = null;
- try {
- orderData = tAction.sell(userID, holdingID, TradeConfig.orderProcessingMode);
- } catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- session.setAttribute("orderData", orderData);
- }
-
}
Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/OrderDataJSF.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/OrderDataJSF.java?rev=1077852&r1=1077851&r2=1077852&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/OrderDataJSF.java (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/OrderDataJSF.java Fri Mar 4 08:54:26 2011
@@ -78,8 +78,9 @@ public class OrderDataJSF {
FacesContext facesContext = FacesContext.getCurrentInstance();
HttpSession session = (HttpSession) facesContext.getExternalContext().getSession(true);
OrderData order = (OrderData)session.getAttribute("orderData");
- setOrderData(order);
-
+ if(order != null){
+ setOrderData(order);
+ }
}
public void setAllOrders(OrderData[] allOrders) {
Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/PortfolioJSF.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/PortfolioJSF.java?rev=1077852&r1=1077851&r2=1077852&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/PortfolioJSF.java (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/PortfolioJSF.java Fri Mar 4 08:54:26 2011
@@ -20,19 +20,14 @@ import java.math.BigDecimal;
//import java.util.Collection;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
import java.util.Iterator;
-import javax.annotation.PostConstruct;
import javax.faces.bean.ManagedBean;
-//import javax.faces.bean.SessionScoped;
+import javax.faces.component.html.HtmlDataTable;
import javax.faces.context.FacesContext;
import javax.servlet.http.HttpSession;
import org.apache.geronimo.daytrader.javaee6.core.direct.FinancialUtils;
-import org.apache.geronimo.daytrader.javaee6.entities.AccountDataBean;
import org.apache.geronimo.daytrader.javaee6.entities.HoldingDataBean;
import org.apache.geronimo.daytrader.javaee6.entities.OrderDataBean;
import org.apache.geronimo.daytrader.javaee6.entities.QuoteDataBean;
@@ -51,7 +46,10 @@ public class PortfolioJSF {
private BigDecimal totalValue = new BigDecimal(0.0);
private BigDecimal totalBasis = new BigDecimal(0.0);
private BigDecimal totalGainPercent = new BigDecimal(0.0);
- private HoldingData[] holdingDatas;
+ private ArrayList<HoldingData> holdingDatas;
+ private HtmlDataTable dataTable;
+
+
public PortfolioJSF(){
@@ -112,8 +110,8 @@ public class PortfolioJSF {
// Walk through the collection of user holdings and creating a list of quotes
if (holdingDataBeans.size() > 0) {
Iterator it = holdingDataBeans.iterator();
- holdingDatas = new HoldingData[holdingDataBeans.size()];
- int count = 0;
+ holdingDatas = new ArrayList<HoldingData>(holdingDataBeans.size());
+ //int count = 0;
while (it.hasNext()) {
HoldingDataBean holdingData = (HoldingDataBean) it.next();
QuoteDataBean quoteData = tAction.getQuote(holdingData.getQuoteID());
@@ -143,9 +141,10 @@ public class PortfolioJSF {
h.setGain(gain);
h.setMarketValue(marketValue);
h.setPrice(quoteData.getPrice());
- holdingDatas[count] = h;
- count++;
+ holdingDatas.add(h);
+ //count++;
}
+ //dataTable
setTotalGainPercent(FinancialUtils.computeGainPercent(totalValue, totalBasis));
} else {
@@ -181,11 +180,11 @@ public class PortfolioJSF {
return totalBasis;
}
- public void setHoldingDatas(HoldingData[] holdingDatas) {
+ public void setHoldingDatas(ArrayList<HoldingData> holdingDatas) {
this.holdingDatas = holdingDatas;
}
- public HoldingData[] getHoldingDatas() {
+ public ArrayList<HoldingData> getHoldingDatas() {
return holdingDatas;
}
@@ -196,4 +195,35 @@ public class PortfolioJSF {
public BigDecimal getTotalGainPercent() {
return totalGainPercent;
}
+ public String sell(){
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ HttpSession session = (HttpSession) facesContext.getExternalContext().getSession(true);
+ String userID = (String)session.getAttribute("uidBean");
+ TradeAction tAction = new TradeAction();
+ OrderDataBean orderDataBean = null;
+ HoldingData holdingData = (HoldingData)dataTable.getRowData();
+ try {
+ orderDataBean = tAction.sell(userID, holdingData.getHoldingID(), TradeConfig.orderProcessingMode);
+ holdingDatas.remove(holdingData);
+ } catch (Exception e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ OrderData orderData = new OrderData(orderDataBean.getOrderID(),
+ orderDataBean.getOrderStatus(), orderDataBean.getOpenDate(),
+ orderDataBean.getCompletionDate(), orderDataBean.getOrderFee(),
+ orderDataBean.getOrderType(), orderDataBean.getQuantity(),
+ orderDataBean.getSymbol());
+ session.setAttribute("orderData", orderData);
+ return "sell";
+ }
+
+ public void setDataTable(HtmlDataTable dataTable) {
+ this.dataTable = dataTable;
+ }
+
+ public HtmlDataTable getDataTable() {
+ return dataTable;
+ }
}
Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/QuoteData.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/QuoteData.java?rev=1077852&r1=1077851&r2=1077852&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/QuoteData.java (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/QuoteData.java Fri Mar 4 08:54:26 2011
@@ -17,7 +17,6 @@
package org.apache.geronimo.daytrader.javaee6.web.Beans;
import java.math.BigDecimal;
-
import org.apache.geronimo.daytrader.javaee6.core.direct.FinancialUtils;
public class QuoteData {
@@ -31,6 +30,7 @@ public class QuoteData {
private double change;
private String range;
private BigDecimal gainPercent;
+ private BigDecimal gain;
public QuoteData(BigDecimal price, BigDecimal open, String symbol){
this.open = open;
@@ -127,4 +127,13 @@ public class QuoteData {
public BigDecimal getGainPercent() {
return gainPercent;
}
+
+
+ public void setGain(BigDecimal gain) {
+ this.gain = gain;
+ }
+
+ public BigDecimal getGain() {
+ return gain;
+ }
}
Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/QuoteDataJSF.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/QuoteDataJSF.java?rev=1077852&r1=1077851&r2=1077852&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/QuoteDataJSF.java (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/QuoteDataJSF.java Fri Mar 4 08:54:26 2011
@@ -16,14 +16,19 @@
*/
package org.apache.geronimo.daytrader.javaee6.web.Beans;
+
import java.util.ArrayList;
import javax.faces.bean.ManagedBean;
+import javax.faces.component.html.HtmlDataTable;
import javax.faces.context.FacesContext;
import javax.servlet.http.HttpSession;
+
+import org.apache.geronimo.daytrader.javaee6.entities.OrderDataBean;
import org.apache.geronimo.daytrader.javaee6.entities.QuoteDataBean;
import org.apache.geronimo.daytrader.javaee6.utils.Log;
+import org.apache.geronimo.daytrader.javaee6.utils.TradeConfig;
import org.apache.geronimo.daytrader.javaee6.web.TradeAction;
import org.apache.geronimo.daytrader.javaee6.web.Beans.QuoteData;
@@ -31,6 +36,8 @@ import org.apache.geronimo.daytrader.jav
public class QuoteDataJSF {
private QuoteData[] quotes;
private String symbols = "s:0, s:1, s:2, s:3, s:4";
+ private HtmlDataTable dataTable;
+ private Integer quantity = 100;
public QuoteDataJSF(){
getAllQuotes();
@@ -86,6 +93,30 @@ public class QuoteDataJSF {
}
setQuotes(quoteDatas);
return "quotes";
+ }
+
+ public String buy(){
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ HttpSession session = (HttpSession) facesContext.getExternalContext().getSession(true);
+ String userID = (String)session.getAttribute("uidBean");
+ QuoteData quoteData = (QuoteData)dataTable.getRowData();
+ TradeAction tAction=null;
+ tAction = new TradeAction();
+ OrderDataBean orderDataBean;
+ try {
+ orderDataBean = tAction.buy(userID, quoteData.getSymbol(), new Double(this.quantity).doubleValue(), TradeConfig.orderProcessingMode);
+ OrderData orderData = new OrderData(orderDataBean.getOrderID(),
+ orderDataBean.getOrderStatus(), orderDataBean.getOpenDate(),
+ orderDataBean.getCompletionDate(), orderDataBean.getOrderFee(),
+ orderDataBean.getOrderType(), orderDataBean.getQuantity(),
+ orderDataBean.getSymbol());
+ session.setAttribute("orderData", orderData);
+ } catch (Exception e) {
+ // TODO Auto-generated catch block
+ Log.error(e.toString());
+ e.printStackTrace();
+ }
+ return "buy";
}
public void setSymbols(String symbols) {
@@ -95,4 +126,19 @@ public class QuoteDataJSF {
public String getSymbols() {
return symbols;
}
+ public void setDataTable(HtmlDataTable dataTable) {
+ this.dataTable = dataTable;
+ }
+
+ public HtmlDataTable getDataTable() {
+ return dataTable;
+ }
+
+ public void setQuantity(Integer quantity) {
+ this.quantity = quantity;
+ }
+
+ public Integer getQuantity() {
+ return quantity;
+ }
}
Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/TradeAppJSF.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/TradeAppJSF.java?rev=1077852&r1=1077851&r2=1077852&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/TradeAppJSF.java (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/TradeAppJSF.java Fri Mar 4 08:54:26 2011
@@ -248,15 +248,6 @@ public class TradeAppJSF {
session.invalidate();
}
- /*Object o = session.getAttribute("TSS-RecreateSessionInLogout");
- if (o != null && ((Boolean) o).equals(Boolean.TRUE)) {
- // Recreate Session object before writing output to the response
- // Once the response headers are written back to the client the
- // opportunity
- // to create a new session in this request may be lost
- // This is to handle only the TradeScenarioServlet case
- session = (HttpSession)FacesContext.getCurrentInstance().getExternalContext().getSession(true);
- }*/
//Go to welcome page
return "welcome";
}
Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/faces-config.xml?rev=1077852&r1=1077851&r2=1077852&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/faces-config.xml Fri Mar 4 08:54:26 2011
@@ -62,14 +62,22 @@
<navigation-case>
<from-outcome>Go to account</from-outcome>
<to-view-id>/quote.xhtml</to-view-id>
- </navigation-case>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>welcome</from-outcome>
+ <to-view-id>/welcome.xhtml</to-view-id>
+ </navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/portfolio.xhtml</from-view-id>
-<navigation-case>
+ <navigation-case>
<from-outcome>quotes</from-outcome>
<to-view-id>/quote.xhtml</to-view-id>
- </navigation-case>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>sell</from-outcome>
+ <to-view-id>/order.xhtml</to-view-id>
+ </navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/configure.xhtml</from-view-id>
@@ -86,4 +94,18 @@
<to-view-id>/config.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
+ <navigation-rule>
+ <from-view-id>/order.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>quotes</from-outcome>
+ <to-view-id>/quote.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+ <navigation-rule>
+ <from-view-id>/quote.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>buy</from-outcome>
+ <to-view-id>/order.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
</faces-config>
Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/portfolio.xhtml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/portfolio.xhtml?rev=1077852&r1=1077851&r2=1077852&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/portfolio.xhtml (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/portfolio.xhtml Fri Mar 4 08:54:26 2011
@@ -138,8 +138,7 @@
<CAPTION align="bottom"><b>Portfolio </b></CAPTION>
<tbody>
<tr align="center" colspan="10">
- <h:dataTable id="holdings" value="#{portfolio.holdingDatas}"
- var="item">
+ <h:dataTable id="holdings" value="#{portfolio.holdingDatas}" var="item" binding="#{portfolio.dataTable}" bgcolor="#fafcb6" align="center" border="1">
<h:column>
<f:facet name="header">
<h:outputText value="holding ID" />
@@ -207,7 +206,7 @@
<f:facet name="header">
<h:outputText value="trade" />
</f:facet>
- <h:commandButton action="#{item.sell()}"></h:commandButton>
+ <h:commandButton value="sell" action="#{portfolio.sell}"></h:commandButton>
</h:column>
</h:dataTable>
</tr>
Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/quote.xhtml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/quote.xhtml?rev=1077852&r1=1077851&r2=1077852&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/quote.xhtml (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/quote.xhtml Fri Mar 4 08:54:26 2011
@@ -112,7 +112,7 @@
<f:facet name="header">
<h:outputText value="quantity" />
</f:facet>
- <h:outputText value="#{item.quantity}"></h:outputText>
+ <h:outputText value="#{item.quantity}"></h:outputText>
</h:column>
</h:dataTable>
</td>
@@ -134,7 +134,7 @@
</tr>
<tr>
<td align="center">
- <h:dataTable id="quotes" value="#{quotedata.quotes}" var="item">
+ <h:dataTable id="quotes" value="#{quotedata.quotes}" var="item" binding="#{quotedata.dataTable}" bgcolor="#fafcb6" align="center" border="1">
<h:column>
<f:facet name="header">
<h:outputText value="symbol" />
@@ -187,8 +187,10 @@
<h:column>
<f:facet name="header">
<h:outputText value="trade" />
- </f:facet>
- <h:outputText value="#{item.symbol}"></h:outputText>
+ </f:facet>
+ <h:commandLink value="buy" action="#{quotedata.buy}"></h:commandLink>
+ <h:inputText value="#{quotedata.quantity}"></h:inputText>
+
</h:column>
</h:dataTable>
</td>
Modified: geronimo/daytrader/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/pom.xml?rev=1077852&r1=1077851&r2=1077852&view=diff
==============================================================================
--- geronimo/daytrader/trunk/pom.xml (original)
+++ geronimo/daytrader/trunk/pom.xml Fri Mar 4 08:54:26 2011
@@ -197,13 +197,13 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.2.3</version>
+ <version>2.0.2</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.2.3</version>
+ <version>2.0.2</version>
</dependency>
<dependency>
@@ -333,12 +333,8 @@
<jboss.mapping>DB2</jboss.mapping>
</properties>
<modules>
- <!-- Daytrader application -->
- <module>modules</module>
- <!-- Installable assemblies -->
- <module>assemblies</module>
- <!-- Geronimo c-m-p built plugins -->
- <!--<module>plugins</module> -->
+ <!-- Daytrader Java EE 6 -->
+ <module>javaee6</module>
</modules>
</profile>
<profile>
@@ -353,11 +349,7 @@
<properties>
<jboss.mapping>DB2</jboss.mapping>
</properties>
- <modules>
- <!-- Daytrader application -->
- <module>modules</module>
- <!-- Installable assemblies -->
- <module>assemblies</module>
+ <modules>
<!-- Daytrader Java EE 6 -->
<module>javaee6</module>
</modules>