You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ri...@apache.org on 2006/10/05 19:44:31 UTC
svn commit: r453296 [1/2] - in /incubator/tuscany/java/sampleapps/bigbank:
account/src/main/java/bigbank/account/services/account/
account/src/main/java/bigbank/account/services/accountdata/
account/src/main/java/bigbank/account/services/accountdb/ acc...
Author: rineholt
Date: Thu Oct 5 10:44:29 2006
New Revision: 453296
URL: http://svn.apache.org/viewvc?view=rev&rev=453296
Log:
conde clean up.
Modified:
incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/account/AccountServiceImpl.java
incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceDASImpl.java
incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdb/AccountDBInit.java
incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerDataServiceImpl.java
incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerService.java
incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerServiceImpl.java
incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuote.java
incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteService.java
incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteServiceImpl.java
incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteWebservicexServiceImpl.java
incubator/tuscany/java/sampleapps/bigbank/account/src/test/java/bigbank/account/client/AccountClient.java
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/account/AccountServiceComponentImpl.java
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/AccountLoginServiceImpl.java
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/LoginService.java
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileService.java
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountLogTag.java
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountStatusTag.java
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockLogTag.java
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockStatusTag.java
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/LoginBarrierTag.java
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/ServiceTag.java
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/ui/FormServlet.java
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/ui/LoginServlet.java
incubator/tuscany/java/sampleapps/bigbank/webclient/src/test/java/bigbank/webclient/client/TestAccountService.java
incubator/tuscany/java/sampleapps/bigbank/webclient/src/test/java/bigbank/webclient/client/TestLoginService.java
Modified: incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/account/AccountServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/account/AccountServiceImpl.java?view=diff&rev=453296&r1=453295&r2=453296
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/account/AccountServiceImpl.java (original)
+++ incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/account/AccountServiceImpl.java Thu Oct 5 10:44:29 2006
@@ -60,32 +60,33 @@
AccountServiceImpl.tsformatXSDDateTime.setTimeZone(TimeZone.getTimeZone("UTC"));
}
- private float currencyConversion = 0.0f;
- private String currency= "USD";
+ private float currencyConversion = 0.0f;
+
+ private String currency = "USD";
@Property
public void setCurrency(final String currency) {
- this.currency= currency;
+ this.currency = currency;
}
- float getCurrencyConversion(){
- if(currencyConversion == 0.0F){
- if ("USD".equals(this.currency))
- currencyConversion= 1.0f;
- else if ("EURO".equals(this.currency))
- currencyConversion= 0.8f;
- else{
+
+ float getCurrencyConversion() {
+ if (currencyConversion == 0.0F) {
+ if ("USD".equals(currency)) {
+ currencyConversion = 1.0f;
+ } else if ("EURO".equals(currency)) {
+ currencyConversion = 0.8f;
+ } else {
try {
- currencyConversion = Float.parseFloat(this.currency);
+ currencyConversion = Float.parseFloat(currency);
} catch (Exception e) {
- currencyConversion= 1.0f;
- }
-
+ currencyConversion = 1.0f;
+ }
+
}
-
}
return currencyConversion;
-
+
}
private AccountDataService accountDataService;
@@ -110,26 +111,28 @@
try {
AccountReport accountReport = accountDataService.getAccountReport(customerID);
- //convert to local currency.
+ // convert to local currency.
List<AccountSummary> accounts = accountReport.getAccountSummaries();
- for(AccountSummary accountSummary : accounts){
+ for (AccountSummary accountSummary : accounts) {
accountSummary.setBalance(fromUSDollarToCurrency(accountSummary.getBalance()));
-
+
}
return updateStockInformation(accountReport);
} catch (Exception e) {
e.printStackTrace();
- if (e instanceof RemoteException)
+ if (e instanceof RemoteException) {
throw (RemoteException) e;
- else
+ } else {
throw new RemoteException(e.getClass() + " " + e.getMessage(), e);
+ }
}
}
private AccountReport updateStockInformation(AccountReport accountReport) throws RemoteException {
List<StockSummary> stocks = accountReport.getStockSummaries();
- if (stocks.size() < 1)
+ if (stocks.size() < 1) {
return accountReport; // nothing todo
+ }
HashSet<String> owned = new HashSet<String>(stocks.size());
for (StockSummary stock : stocks) {
owned.add(stock.getSymbol());
@@ -140,7 +143,7 @@
ownedStr.add(s);
}
- Map<String, StockQuote> stockInfo = stockQuoteService.getQuotes((String[]) ownedStr.toArray(new String[owned.size()]));
+ Map<String, StockQuote> stockInfo = stockQuoteService.getQuotes(ownedStr.toArray(new String[owned.size()]));
for (StockSummary stock : stocks) {
String symbol = stock.getSymbol();
@@ -173,15 +176,14 @@
}
private float fromUSDollarToCurrency(float value) {
- return value * getCurrencyConversion() ;
+ return value * getCurrencyConversion();
-
}
+
private float toUSDollarfromCurrency(float value) {
- return value /getCurrencyConversion() ;
+ return value / getCurrencyConversion();
}
-
public CustomerProfileData getCustomerProfile(String logonID) throws RemoteException {
@@ -189,10 +191,11 @@
return accountDataService.getCustomerProfile(logonID);
} catch (Exception e) {
e.printStackTrace();
- if (e instanceof RemoteException)
+ if (e instanceof RemoteException) {
throw (RemoteException) e;
- else
+ } else {
throw new RemoteException(e.getClass() + " " + e.getMessage(), e);
+ }
}
}
@@ -217,8 +220,9 @@
StockQuote stockQuote = stockInfo.get(symbol);
stock.setPurchasePrice(Float.parseFloat(stockQuote.getStockQuote()));
String purchaseDate = tsformatXSDDateTime.format(new Date());
- if (purchaseDate.endsWith("UTC"))
+ if (purchaseDate.endsWith("UTC")) {
purchaseDate = purchaseDate.substring(0, purchaseDate.length() - 3) + "Z";
+ }
stock.setPurchaseDate(purchaseDate);
return accountDataService.purchaseStock(id, stock);
@@ -267,9 +271,9 @@
throw new RemoteException(e.getClass() + " " + e.getMessage(), e);
}
}
-
+
public AccountLog getAccountLog(final int customerID) throws RemoteException {
return accountDataService.getAccountLog(customerID);
}
-
+
}
Modified: incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataService.java?view=diff&rev=453296&r1=453295&r2=453296
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataService.java (original)
+++ incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataService.java Thu Oct 5 10:44:29 2006
@@ -18,69 +18,70 @@
*/
package bigbank.account.services.accountdata;
+public interface AccountDataService {
-public interface AccountDataService {
-
/**
* Auto generated method signatures
- * @param param0* @param param1* @param param2
+ *
+ * @param param0*
+ * @param param1*
+ * @param param2
*/
- public com.bigbank.account.StockSummary purchaseStock(
- int param0,com.bigbank.account.StockSummary parm1) throws java.rmi.RemoteException;
-
-
+ public com.bigbank.account.StockSummary purchaseStock(int param0, com.bigbank.account.StockSummary parm1) throws java.rmi.RemoteException;
+
/**
* Auto generated method signatures
+ *
* @param param4
*/
- public com.bigbank.account.CustomerProfileData getCustomerProfile(
- java.lang.String param4) throws java.rmi.RemoteException;
-
-
+ public com.bigbank.account.CustomerProfileData getCustomerProfile(java.lang.String param4) throws java.rmi.RemoteException;
+
/**
* Auto generated method signatures
- * @param param6* @param param7
+ *
+ * @param param6*
+ * @param param7
*/
- public float deposit(
- java.lang.String param6,float param7) throws java.rmi.RemoteException;
-
-
+ public float deposit(java.lang.String param6, float param7) throws java.rmi.RemoteException;
+
/**
* Auto generated method signatures
- * @param param9* @param param10* @param param11
+ *
+ * @param param9*
+ * @param param10*
+ * @param param11
*/
- public com.bigbank.account.CustomerProfileData createAccount(
- com.bigbank.account.CustomerProfileData param9,boolean param10,boolean param11) throws java.rmi.RemoteException;
-
-
+ public com.bigbank.account.CustomerProfileData createAccount(com.bigbank.account.CustomerProfileData param9, boolean param10, boolean param11)
+ throws java.rmi.RemoteException;
+
/**
* Auto generated method signatures
- * @param param13* @param param14
+ *
+ * @param param13*
+ * @param param14
*/
- public com.bigbank.account.StockSummary sellStock(
- int param13,int param14) throws java.rmi.RemoteException;
-
-
+ public com.bigbank.account.StockSummary sellStock(int param13, int param14) throws java.rmi.RemoteException;
+
/**
* Auto generated method signatures
- * @param param16* @param param17
+ *
+ * @param param16*
+ * @param param17
*/
- public float withdraw(
- java.lang.String param16,float param17) throws java.rmi.RemoteException;
-
-
+ public float withdraw(java.lang.String param16, float param17) throws java.rmi.RemoteException;
+
/**
* Auto generated method signatures
+ *
* @param param19
*/
- public com.bigbank.account.AccountReport getAccountReport(
- int param19) throws java.rmi.RemoteException;
-
- /**
- * Auto generated method signatures
- * @param param0
- */
- public com.bigbank.account.AccountLog getAccountLog(
- int param0) throws java.rmi.RemoteException;
+ public com.bigbank.account.AccountReport getAccountReport(int param19) throws java.rmi.RemoteException;
+
+ /**
+ * Auto generated method signatures
+ *
+ * @param param0
+ */
+ public com.bigbank.account.AccountLog getAccountLog(int param0) throws java.rmi.RemoteException;
- }
+}
Modified: incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceDASImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceDASImpl.java?view=diff&rev=453296&r1=453295&r2=453296
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceDASImpl.java (original)
+++ incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceDASImpl.java Thu Oct 5 10:44:29 2006
@@ -48,7 +48,7 @@
import commonj.sdo.DataObject;
@Service(CustomerIdService.class)
-public class AccountDataServiceDASImpl implements CustomerIdService { // TODO fix this!
+public class AccountDataServiceDASImpl implements CustomerIdService { // TODO fix this!
static public String dbDirectory = null;
@@ -67,19 +67,17 @@
InputStream mapping = createConfigStream();
Connection conn = getConnection();
DAS das = DAS.FACTORY.createDAS(mapping, conn);
-
- Command select = das.createCommand(
- "SELECT firstName, lastName, loginID, password, id FROM customers where loginID = ?");
-
- select.setParameter(1, logonID);
+
+ Command select = das.createCommand("SELECT firstName, lastName, loginID, password, id FROM customers where loginID = ?");
+
+ select.setParameter(1, logonID);
DataObject root = select.executeQuery();
conn.close();
Collection customers = root.getList("CustomerProfileData");
CustomerProfileData customerProfileData = (CustomerProfileData) customers.iterator().next();
-
-
+
return customerProfileData;
} catch (Exception e) {
@@ -94,36 +92,36 @@
protected static final String protocol = "jdbc:derby:";
-
public CustomerProfileData createAccount(CustomerProfileData customerProfile, boolean createSavings, boolean createCheckings)
throws RemoteException {
try {
- DAS das = DAS.FACTORY.createDAS(getConnection());
+ DAS das = DAS.FACTORY.createDAS(getConnection());
Command insert = das.createCommand("insert into customers (firstName,lastName,address,email, loginID, password ) values ('"
+ customerProfile.getFirstName() + "', '" + customerProfile.getLastName() + "', '" + customerProfile.getAddress() + "', '"
+ customerProfile.getEmail() + "', '" + customerProfile.getLoginID() + "', '" + customerProfile.getPassword() + "')");
-
+
insert.execute();
CustomerProfileData ret = getCustomerProfile(customerProfile.getLoginID());
String cid = ret.getId() + "";
if (createSavings) {
insert = das.createCommand("insert into accounts (id,accountNumber, accountType, balance ) values (" + cid + ", '"
- + AccountServiceImpl.SAVINGS_ACCOUNT_PREFIX + cid + "', '" + AccountServiceImpl.ACCOUNT_TYPE_SAVINGS + "', " + 1.0F + ")");
+ + AccountServiceImpl.SAVINGS_ACCOUNT_PREFIX + cid + "', '" + AccountServiceImpl.ACCOUNT_TYPE_SAVINGS + "', " + 1.0F + ")");
insert.execute();
}
if (createCheckings) {
insert = das.createCommand("insert into accounts (id,accountNumber, accountType, balance ) values (" + cid + ", '"
- + AccountServiceImpl.CHECKING_ACCOUNT_PREFIX + cid + "', '" + AccountServiceImpl.ACCOUNT_TYPE_CHECKINGS + "', " + 1.0F + ")");
+ + AccountServiceImpl.CHECKING_ACCOUNT_PREFIX + cid + "', '" + AccountServiceImpl.ACCOUNT_TYPE_CHECKINGS + "', " + 1.0F + ")");
insert.execute();
}
return ret;
} catch (Exception e) {
- if (e instanceof RemoteException)
+ if (e instanceof RemoteException) {
throw (RemoteException) e;
+ }
throw new RemoteException("createAccount " + e.getClass().getName() + "'. " + e.getMessage(), e);
}
}
@@ -131,10 +129,10 @@
public CustomerProfileData createAccountNOTWORKING(CustomerProfileData customerProfile, boolean createSavings, boolean createCheckings)
throws RemoteException {
try {
- DAS das = DAS.FACTORY.createDAS(createConfigStream(), getConnection());
+ DAS das = DAS.FACTORY.createDAS(createConfigStream(), getConnection());
Command read = das.getCommand("all customers");
- // select.setDataObjectModel();
+ // select.setDataObjectModel();
DataObject root = read.executeQuery();
// Create a new stockPurchase
@@ -152,8 +150,9 @@
return getCustomerProfile(customerProfile.getLoginID());
} catch (Exception e) {
- if (e instanceof RemoteException)
+ if (e instanceof RemoteException) {
throw (RemoteException) e;
+ }
throw new RemoteException("createAccount " + e.getClass().getName() + "'. " + e.getMessage(), e);
}
@@ -167,30 +166,30 @@
Connection conn = getConnection();
DAS das = DAS.FACTORY.createDAS(mapping, conn);
-
- Command select = das.createCommand("SELECT accountNumber, accountType, balance FROM accounts where id = ?");
+
+ Command select = das.createCommand("SELECT accountNumber, accountType, balance FROM accounts where id = ?");
select.setParameter(1, customerID);
-
+
DataObject root = select.executeQuery();
accountReport.getAccountSummaries().addAll(root.getList("AccountSummary"));
// Get Stocks
- select = das.createCommand(
- "SELECT Symbol, quantity, purchasePrice, purchaseDate, purchaseLotNumber FROM stocks where id = ?");
- select.setParameter(1, customerID);
+ select = das.createCommand("SELECT Symbol, quantity, purchasePrice, purchaseDate, purchaseLotNumber FROM stocks where id = ?");
+ select.setParameter(1, customerID);
// select.addConverter("STOCKS.PURCHASEDATE", DateConverter.class.getName());
- root = (DataObject) select.executeQuery();
+ root = select.executeQuery();
accountReport.getStockSummaries().addAll(root.getList("StockSummary"));
conn.close();
return accountReport;
} catch (Exception e) {
- if (e instanceof RemoteException)
+ if (e instanceof RemoteException) {
throw (RemoteException) e;
+ }
throw new RemoteException("getAccountReport failed. customerID ('" + customerID + "')" + e.getClass().getName() + "'. " + e.getMessage(),
e);
}
@@ -204,26 +203,26 @@
public float deposit(String account, float ammount) throws RemoteException {
try {
- Connection conn = getConnection();
- DAS das = DAS.FACTORY.createDAS(createConfigStream(), conn);
+ Connection conn = getConnection();
+ DAS das = DAS.FACTORY.createDAS(createConfigStream(), conn);
- Command select = das.createCommand("SELECT accountNumber, balance FROM accounts where accountNumber = ?");
+ Command select = das.createCommand("SELECT accountNumber, balance FROM accounts where accountNumber = ?");
select.setParameter(1, account);
-
+
DataObject root = select.executeQuery();
Collection accounts = root.getList("AccountSummary");
AccountSummary accountData = (AccountSummary) accounts.iterator().next();
float newbalance = accountData.getBalance() + ammount;
accountData.setBalance(newbalance);
// update department set companyid = ? where department.name = ?
-
- Command update = das.getCommand("update balance");
+
+ Command update = das.getCommand("update balance");
update.setParameter(1, new Float(newbalance));
update.setParameter(2, account);
update.execute();
conn.close();
return newbalance;
- } catch (Exception e) {
+ } catch (Exception e) {
throw new RemoteException(e.getClass().getName(), e);
}
@@ -231,11 +230,11 @@
public StockSummary sellStock(int purchaseLotNumber, int quantity) throws RemoteException {
try {
- DAS das = DAS.FACTORY.createDAS(createConfigStream(), getConnection());
+ DAS das = DAS.FACTORY.createDAS(createConfigStream(), getConnection());
- Command read = das.getCommand("stockbylotSelect");
+ Command read = das.getCommand("stockbylotSelect");
read.setParameter(1, purchaseLotNumber);// autoboxing :-)
- DataObject root = read.executeQuery();
+ DataObject root = read.executeQuery();
List stocks = root.getList("StockSummary");
if (null != stocks && !stocks.isEmpty()) {
StockSummary stock = (StockSummary) stocks.get(0);
@@ -243,7 +242,7 @@
if (newQuatity < 1) {
Command delete = das.createCommand("DELETE FROM STOCKS WHERE PURCHASELOTNUMBER = ?");
- delete.setParameter(1, purchaseLotNumber);
+ delete.setParameter(1, purchaseLotNumber);
delete.execute();
} else {
@@ -268,21 +267,21 @@
public StockSummary purchaseStock(int id, StockSummary stock) throws RemoteException {
try {
- DAS das = DAS.FACTORY.createDAS(getConnection());
- Command insert = das
- .createCommand("insert into stocks (id, symbol, quantity, purchasePrice, purchaseDate) values (?,?,?,?,?)");
+ DAS das = DAS.FACTORY.createDAS(getConnection());
+ Command insert = das.createCommand("insert into stocks (id, symbol, quantity, purchasePrice, purchaseDate) values (?,?,?,?,?)");
insert.setParameter(1, new Integer(id));
insert.setParameter(2, stock.getSymbol());
insert.setParameter(3, stock.getQuantity());
insert.setParameter(4, stock.getPurchasePrice());
insert.setParameter(5, DateConverter.INSTANCE.getColumnValue(stock.getPurchaseDate()));
-
+
insert.execute();
return stock;
} catch (Exception e) {
- if (e instanceof RemoteException)
+ if (e instanceof RemoteException) {
throw (RemoteException) e;
+ }
throw new RemoteException("purchaseStock " + e.getClass().getName() + "'. " + e.getMessage(), e);
}
}
@@ -307,7 +306,7 @@
public static class DateConverter implements Converter {
public final static DateConverter INSTANCE = new DateConverter();
- public DateConverter() { //public empty constructor
+ public DateConverter() { // public empty constructor
}
public Object getPropertyValue(Object columnData) {
@@ -315,8 +314,9 @@
try {
String ret = tsformatXSDDateTime.format(columnData);
- if (ret.endsWith("UTC"))
+ if (ret.endsWith("UTC")) {
ret = ret.substring(0, ret.length() - 3) + "Z";
+ }
return ret;
} catch (Exception e) {
@@ -353,30 +353,31 @@
} catch (ParseException e) {
throw new IllegalArgumentException("'" + propertyData + "' does not parse to date.");
}
- } else
+ } else {
throw new IllegalArgumentException();
+ }
}
}
public int getCustomerIdByPurchaseLotNumber(int purchaseLotNumber) throws RemoteException {
-
+
return queryCustomerId("select id from stocks where purchaseLotNumber = " + purchaseLotNumber);
}
-
+
public int getCustomerIdByAccount(String account) throws RemoteException {
-
+
return queryCustomerId("select id from accounts where accountNumber = '" + account + "'");
}
-
+
private int queryCustomerId(String query) throws RemoteException {
-
+
try {
Connection conn = getConnection();
Statement s = conn.createStatement();
-
+
ResultSet rs = s.executeQuery(query);
int id = -1;
if (rs.next()) {
@@ -393,7 +394,7 @@
} catch (Exception e) {
e.printStackTrace();
- throw new RemoteException(e.getClass().getName() ,e);
- }
+ throw new RemoteException(e.getClass().getName(), e);
+ }
}
}
Modified: incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java?view=diff&rev=453296&r1=453295&r2=453296
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java (original)
+++ incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java Thu Oct 5 10:44:29 2006
@@ -99,7 +99,7 @@
// TODO Auto-generated method stub
return 0;
}
-
+
public AccountLog getAccountLog(final int customerID) throws RemoteException {
throw new RemoteException("This method should not be called");
}
Modified: incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java?view=diff&rev=453296&r1=453295&r2=453296
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java (original)
+++ incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java Thu Oct 5 10:44:29 2006
@@ -24,12 +24,12 @@
* This interface allows access to a customer's id from the data service.
*/
public interface CustomerIdService {
-
+
/*
* Return -1 if purchaseLotNumber not found
*/
public int getCustomerIdByPurchaseLotNumber(int purchaseLotNumber) throws RemoteException;
-
+
/*
* Return -1 if account not found
*/
@@ -37,60 +37,62 @@
// TODO (isilval) Fix this !!!
// Apparently, configuration can't deal with extends so I am adding the contents of AccountDataService here
-
+
/**
* Auto generated method signatures
- * @param param0* @param param1* @param param2
+ *
+ * @param param0*
+ * @param param1*
+ * @param param2
*/
- public com.bigbank.account.StockSummary purchaseStock(
- int param0,com.bigbank.account.StockSummary parm1) throws java.rmi.RemoteException;
-
-
+ public com.bigbank.account.StockSummary purchaseStock(int param0, com.bigbank.account.StockSummary parm1) throws java.rmi.RemoteException;
+
/**
* Auto generated method signatures
+ *
* @param param4
*/
- public com.bigbank.account.CustomerProfileData getCustomerProfile(
- java.lang.String param4) throws java.rmi.RemoteException;
-
-
+ public com.bigbank.account.CustomerProfileData getCustomerProfile(java.lang.String param4) throws java.rmi.RemoteException;
+
/**
* Auto generated method signatures
- * @param param6* @param param7
+ *
+ * @param param6*
+ * @param param7
*/
- public float deposit(
- java.lang.String param6,float param7) throws java.rmi.RemoteException;
-
-
+ public float deposit(java.lang.String param6, float param7) throws java.rmi.RemoteException;
+
/**
* Auto generated method signatures
- * @param param9* @param param10* @param param11
+ *
+ * @param param9*
+ * @param param10*
+ * @param param11
*/
- public com.bigbank.account.CustomerProfileData createAccount(
- com.bigbank.account.CustomerProfileData param9,boolean param10,boolean param11) throws java.rmi.RemoteException;
-
-
+ public com.bigbank.account.CustomerProfileData createAccount(com.bigbank.account.CustomerProfileData param9, boolean param10, boolean param11)
+ throws java.rmi.RemoteException;
+
/**
* Auto generated method signatures
- * @param param13* @param param14
+ *
+ * @param param13*
+ * @param param14
*/
- public com.bigbank.account.StockSummary sellStock(
- int param13,int param14) throws java.rmi.RemoteException;
-
-
+ public com.bigbank.account.StockSummary sellStock(int param13, int param14) throws java.rmi.RemoteException;
+
/**
* Auto generated method signatures
- * @param param16* @param param17
+ *
+ * @param param16*
+ * @param param17
*/
- public float withdraw(
- java.lang.String param16,float param17) throws java.rmi.RemoteException;
-
-
+ public float withdraw(java.lang.String param16, float param17) throws java.rmi.RemoteException;
+
/**
* Auto generated method signatures
+ *
* @param param19
*/
- public com.bigbank.account.AccountReport getAccountReport(
- int param19) throws java.rmi.RemoteException;
-
+ public com.bigbank.account.AccountReport getAccountReport(int param19) throws java.rmi.RemoteException;
+
}
Modified: incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdb/AccountDBInit.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdb/AccountDBInit.java?view=diff&rev=453296&r1=453295&r2=453296
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdb/AccountDBInit.java (original)
+++ incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountdb/AccountDBInit.java Thu Oct 5 10:44:29 2006
@@ -55,9 +55,9 @@
import com.bigbank.account.AccountSummary;
import com.bigbank.account.CustomerProfileData;
import com.bigbank.account.StockSummary;
+import commonj.sdo.DataObject;
import com.bigbank.account.purchaseStock;
import com.bigbank.account.withdraw;
-import commonj.sdo.DataObject;
public class AccountDBInit extends HttpServlet {
@@ -68,13 +68,10 @@
protected static final String protocol = "jdbc:derby:";
protected String dbDirectory = null;
-
+
protected String dasConfigFile = null;
-
- boolean deleteExisting = false;
-
-
+ boolean deleteExisting = false;
@Override
public void init() throws ServletException {
@@ -83,12 +80,11 @@
registerTypes();
ServletConfig servletConfig = getServletConfig();
ServletContext servletContext = servletConfig.getServletContext();
- this.dbDirectory = servletContext.getRealPath("WEB-INF/bigbankdb/accounts");
- this.dasConfigFile = servletContext.getRealPath("WEB-INF/classes/DasAccountConfiguration.xml");
- this.deleteExisting = false;
+ dbDirectory = servletContext.getRealPath("WEB-INF/bigbankdb/accounts");
+ dasConfigFile = servletContext.getRealPath("WEB-INF/classes/DasAccountConfiguration.xml");
+ deleteExisting = false;
createDB(dbDirectory);
-
} catch (Exception e) {
@@ -107,12 +103,12 @@
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println();
out.println("<center><h2>BigBank database initialization servlet !<h2></center>");
- out.println();
+ out.println();
}
-
+
public AccountDBInit() {
}
@@ -121,12 +117,13 @@
this.dasConfigFile = dasConfigFile;
this.deleteExisting = deleteExisting;
}
-
+
private Connection createConnection() throws InstantiationException, IllegalAccessException, ClassNotFoundException, SQLException {
return createConnection(dbDirectory);
}
- private static Connection createConnection(final String location) throws InstantiationException, IllegalAccessException, ClassNotFoundException, SQLException {
+ private static Connection createConnection(final String location) throws InstantiationException, IllegalAccessException, ClassNotFoundException,
+ SQLException {
Connection conn;
Class.forName(driver).newInstance();
Properties props = new Properties();
@@ -136,10 +133,10 @@
return conn;
}
- public static void createDB(final String location) throws Exception {
+ public static void createDB(final String location) throws Exception {
Connection conn = null;
AccountDataServiceDASImpl.dbDirectory = location;
- AccountLoggerServiceImpl.dbDirectory = location; // TODO get rid of this (isilval)
+ AccountLoggerServiceImpl.dbDirectory = location; // TODO get rid of this (isilval)
Exception processessingException = null;
try {
conn = createConnection(location);
@@ -148,26 +145,23 @@
int id = createCustomer(conn, "Test", "User", "304 Fox Trot ln, Apex, NC", "test@das.org", "test", "password");
createAccount(conn, id, AccountServiceImpl.SAVINGS_ACCOUNT_PREFIX + id, AccountServiceImpl.ACCOUNT_TYPE_SAVINGS, 123.43F);
- createAccount(conn, id, AccountServiceImpl.CHECKING_ACCOUNT_PREFIX+id, AccountServiceImpl.ACCOUNT_TYPE_CHECKINGS, 23.12F);
+ createAccount(conn, id, AccountServiceImpl.CHECKING_ACCOUNT_PREFIX + id, AccountServiceImpl.ACCOUNT_TYPE_CHECKINGS, 23.12F);
createStockPurchase(conn, id, "IBM", 33, 66.20F, "2005-11-23 13:22:02");
createStockPurchase(conn, id, "DELL", 13, 12.74F, "2003-01-03 11:04:03");
createStockPurchase(conn, id, "LU", 7, 2.74F, "2003-01-04 16:04:03");
createStockPurchase(conn, id, "IBM", 22, 81.43F, "2004-02-03 13:04:33");
- id = createCustomer(conn, "test2", "demo2", "Pleasant Plains Rd, ViewMount, CO","test2@das.org", "test2", "password");
+ id = createCustomer(conn, "test2", "demo2", "Pleasant Plains Rd, ViewMount, CO", "test2@das.org", "test2", "password");
createAccount(conn, id, AccountServiceImpl.SAVINGS_ACCOUNT_PREFIX + id, AccountServiceImpl.ACCOUNT_TYPE_SAVINGS, 924.40F);
- createAccount(conn, id, AccountServiceImpl.CHECKING_ACCOUNT_PREFIX+id, AccountServiceImpl.ACCOUNT_TYPE_CHECKINGS, 33.26F);
+ createAccount(conn, id, AccountServiceImpl.CHECKING_ACCOUNT_PREFIX + id, AccountServiceImpl.ACCOUNT_TYPE_CHECKINGS, 33.26F);
createStockPurchase(conn, id, "FOO", 3, 6.20F, "2000-09-11 09:11:01");
-
-
conn.commit();
-
-
} catch (org.apache.derby.impl.jdbc.EmbedSQLException e) {
- if (conn != null && !conn.isClosed())
+ if (conn != null && !conn.isClosed()) {
conn.rollback();
+ }
if (e.getErrorCode() == 20000 && "X0Y32".equalsIgnoreCase(e.getSQLState()) && -1 != e.getMessage().indexOf("already exists")) {
// this is ok the database is there.
@@ -194,29 +188,32 @@
}
-
-
protected static void creatTables(Connection conn) throws Exception {
Statement s = conn.createStatement();
- s.execute("create table customers(firstName varchar(80) NOT NULL, lastName varchar(80), address varchar(180),email varchar(40),loginID varchar(80) NOT NULL UNIQUE, password varchar(80), id int NOT NULL PRIMARY KEY GENERATED ALWAYS AS IDENTITY)");
+ s
+ .execute("create table customers(firstName varchar(80) NOT NULL, lastName varchar(80), address varchar(180),email varchar(40),loginID varchar(80) NOT NULL UNIQUE, password varchar(80), id int NOT NULL PRIMARY KEY GENERATED ALWAYS AS IDENTITY)");
s.execute("create table accounts(id int NOT NULL, accountNumber varchar(80) NOT NULL UNIQUE, accountType varchar(80), balance real )");
- s.execute("create table stocks(id int NOT NULL, Symbol varchar(8) NOT NULL, quantity int NOT NULL, purchasePrice real NOT NULL, purchaseDate TIMESTAMP, purchaseLotNumber int NOT NULL PRIMARY KEY GENERATED ALWAYS AS IDENTITY )");
-
- s.execute("create table acctLog (logSeqNo int NOT NULL PRIMARY KEY GENERATED ALWAYS AS IDENTITY, id int NOT NULL, accountNumber varchar(80) NOT NULL, actionType varchar(32) NOT NULL, amount real )");
+ s
+ .execute("create table stocks(id int NOT NULL, Symbol varchar(8) NOT NULL, quantity int NOT NULL, purchasePrice real NOT NULL, purchaseDate TIMESTAMP, purchaseLotNumber int NOT NULL PRIMARY KEY GENERATED ALWAYS AS IDENTITY )");
+
+ s
+ .execute("create table acctLog (logSeqNo int NOT NULL PRIMARY KEY GENERATED ALWAYS AS IDENTITY, id int NOT NULL, accountNumber varchar(80) NOT NULL, actionType varchar(32) NOT NULL, amount real )");
- s.execute("create table stockLog (logSeqNo int NOT NULL PRIMARY KEY GENERATED ALWAYS AS IDENTITY, id int NOT NULL, Symbol varchar(8) NOT NULL, quantity int NOT NULL, actionType varchar(32) NOT NULL, purchaseLotNumber int NOT NULL )");
+ s
+ .execute("create table stockLog (logSeqNo int NOT NULL PRIMARY KEY GENERATED ALWAYS AS IDENTITY, id int NOT NULL, Symbol varchar(8) NOT NULL, quantity int NOT NULL, actionType varchar(32) NOT NULL, purchaseLotNumber int NOT NULL )");
s.close();
}
- protected static int createCustomer(Connection conn, final String firstName, final String lastName, final String address, final String email, final String logonID, final String password) throws SQLException, Exception {
+ protected static int createCustomer(Connection conn, final String firstName, final String lastName, final String address, final String email,
+ final String logonID, final String password) throws SQLException, Exception {
Statement s = conn.createStatement();
- s.execute("insert into customers (firstName,lastName,address,email, loginID, password ) " +
- "values ('" + firstName + "', '" + lastName + "', '"+ address + "', '" + email + "', '" + logonID + "', '" + password + "')");
+ s.execute("insert into customers (firstName,lastName,address,email, loginID, password ) " + "values ('" + firstName + "', '" + lastName
+ + "', '" + address + "', '" + email + "', '" + logonID + "', '" + password + "')");
ResultSet rs = s.executeQuery("SELECT loginID, id FROM customers where loginID='" + logonID + "'");
if (!rs.next()) {
@@ -228,11 +225,12 @@
return id;
}
- protected static void createAccount(Connection conn, int customerID, final String accountNumber, final String accountType, final float balance) throws SQLException, Exception {
+ protected static void createAccount(Connection conn, int customerID, final String accountNumber, final String accountType, final float balance)
+ throws SQLException, Exception {
Statement s = conn.createStatement();
- s.execute("insert into accounts (id,accountNumber, accountType, balance ) " +
- "values (" + customerID + ", '" + accountNumber + "', '" + accountType + "', " + balance + ")");
+ s.execute("insert into accounts (id,accountNumber, accountType, balance ) " + "values (" + customerID + ", '" + accountNumber + "', '"
+ + accountType + "', " + balance + ")");
s.close();
}
@@ -242,15 +240,15 @@
return mapping;
}
- protected static void createStockPurchase(Connection conn, int customerID, final String stockSymbol, final int quantity, final float purchasePrice,
- String purchaseDate) throws SQLException, Exception {
+ protected static void createStockPurchase(Connection conn, int customerID, final String stockSymbol, final int quantity,
+ final float purchasePrice, String purchaseDate) throws SQLException, Exception {
Statement s = conn.createStatement();
s.execute("insert into stocks (id, symbol, quantity, purchasePrice, purchaseDate ) values (" + customerID + ", '" + stockSymbol + "', "
+ quantity + ", " + purchasePrice + ", '" + purchaseDate + "')");
s.close();
-
+
}
protected static void registerTypes() {
@@ -265,8 +263,8 @@
Connection conn = createConnection();
DAS das = DAS.FACTORY.createDAS(createConfigStream(), conn);
Command select = das.getCommand("get account");
-
- select.setParameter(1, wd.getAccountNumber());
+
+ select.setParameter(1, wd.getAccountNumber());
DataObject root = select.executeQuery();
@@ -276,7 +274,6 @@
account.setBalance(newbalance);
// update department set companyid = ? where department.name = ?
-
Command update = das.getCommand("update balance");
update.setParameter(1, new Float(newbalance));
update.setParameter(2, wd.getAccountNumber());
@@ -285,9 +282,10 @@
conn.close();
}
- protected void testStrockPurchaseThroughDAS(purchaseStock sp) throws InstantiationException, IllegalAccessException, ClassNotFoundException, SQLException {
+ protected void testStrockPurchaseThroughDAS(purchaseStock sp) throws InstantiationException, IllegalAccessException, ClassNotFoundException,
+ SQLException {
- DAS das = DAS.FACTORY.createDAS(createConfigStream(), createConnection());
+ DAS das = DAS.FACTORY.createDAS(createConfigStream(), createConnection());
Command read = das.getCommand("all stocks");
DataObject root = read.executeQuery();
@@ -298,7 +296,7 @@
stockPurchase.set("symbol", sp.getStock().getSymbol());
stockPurchase.set("quantity", new Integer(sp.getStock().getQuantity()));
stockPurchase.set("purchasePrice", new Float(11.00));
- //String type = stockPurchase.getType().getProperty("purchaseDate").getType().toString();
+ // String type = stockPurchase.getType().getProperty("purchaseDate").getType().toString();
stockPurchase.setDate("purchaseDate", new Date());
das.applyChanges(root);
@@ -309,8 +307,8 @@
Connection conn = createConnection();
DAS das = DAS.FACTORY.createDAS(mapping, conn);
Command select = das.createCommand("SELECT firstName, lastName, loginID, password, id FROM customers where loginID = ?");
-
- select.setParameter(1, logonID);
+
+ select.setParameter(1, logonID);
DataObject root = select.executeQuery();
conn.close();
@@ -378,8 +376,9 @@
} catch (Exception e) {
e.printStackTrace();
} finally {
- if (conn != null)
+ if (conn != null) {
conn.close();
+ }
conn = null;
}
@@ -387,7 +386,7 @@
public static class MyDateConverter implements Converter {
- private static DateFormat tsformat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+ private static final DateFormat tsformat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
public Object getPropertyValue(Object columnData) {
@@ -405,14 +404,14 @@
if (propertyData instanceof Date) {
return tsformat.format(propertyData);
- } else
+ } else {
throw new IllegalArgumentException();
+ }
}
}
-
/**
* @param args
*/
@@ -425,18 +424,19 @@
if ("-d".equals(x)) {
deleteExisting = true;
}
- if(x.startsWith("-db:")){
+ if (x.startsWith("-db:")) {
dbDirectory = x.substring("-db:".length());
}
- if(x.startsWith("-config:")) {
- dasConfigFile = x.substring("-config:".length());;
+ if (x.startsWith("-config:")) {
+ dasConfigFile = x.substring("-config:".length());
+ ;
}
}
AccountDBInit accountDBInit = new AccountDBInit(dbDirectory, dasConfigFile, deleteExisting);
createDB(dbDirectory);
-
+
accountDBInit.readDBstdout(System.out);
// Test withdrawl
@@ -446,16 +446,16 @@
accountDBInit.testWithdrawThroughDAS(wd);
accountDBInit.readDBstdout(System.out);
-
+
// test stock purchase.
purchaseStock sp = AccountFactory.INSTANCE.createpurchaseStock();
- StockSummary stock= AccountFactory.INSTANCE.createStockSummary();
+ StockSummary stock = AccountFactory.INSTANCE.createStockSummary();
stock.setSymbol("GOOG");
stock.setQuantity(10);
stock.setPurchasePrice(25.00F);
sp.setId(1);
sp.setStock(stock);
-
+
accountDBInit.testStrockPurchaseThroughDAS(sp);
accountDBInit.readDBstdout(System.out);
Modified: incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerDataServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerDataServiceImpl.java?view=diff&rev=453296&r1=453295&r2=453296
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerDataServiceImpl.java (original)
+++ incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerDataServiceImpl.java Thu Oct 5 10:44:29 2006
@@ -23,27 +23,29 @@
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Service;
+import bigbank.account.services.accountdata.AccountDataService;
+import bigbank.account.services.accountdata.CustomerIdService;
+
import com.bigbank.account.AccountLog;
import com.bigbank.account.AccountReport;
import com.bigbank.account.CustomerProfileData;
import com.bigbank.account.StockSummary;
-import bigbank.account.services.accountdata.AccountDataService;
-import bigbank.account.services.accountdata.CustomerIdService;
-
/**
* This class implements the Account Data Logger service component.
*/
@Service(AccountDataService.class)
public class AccountLoggerDataServiceImpl implements AccountDataService {
-
- private CustomerIdService accountDataService; // TODO fix this!
+
+ private CustomerIdService accountDataService; // TODO fix this!
+
@Reference
public void setAccountDataService(CustomerIdService accountDataService) {
this.accountDataService = accountDataService;
}
private AccountLoggerService accountLoggerService;
+
@Reference
public void setAccountLoggerService(AccountLoggerService accountLoggerService) {
this.accountLoggerService = accountLoggerService;
@@ -56,38 +58,38 @@
}
public CustomerProfileData getCustomerProfile(String logonID) throws RemoteException {
-
+
return accountDataService.getCustomerProfile(logonID);
}
public float deposit(String account, float amount) throws RemoteException {
- try{
+ try {
if (!(accountDataService instanceof CustomerIdService)) {
throw new RemoteException("Can't use data service as customer id service");
}
- int id = ((CustomerIdService)accountDataService).getCustomerIdByAccount(account);
+ int id = (accountDataService).getCustomerIdByAccount(account);
// int id = accountDataService.getCustomerIdByAccount(account);
accountLoggerService.logDeposit(id, account, amount);
return accountDataService.deposit(account, amount);
- } catch (RemoteException e){
+ } catch (RemoteException e) {
e.printStackTrace();
throw e;
} catch (Exception e) {
e.printStackTrace();
- throw new RemoteException(e.getClass() + " " +e.getMessage(),e);
- }
+ throw new RemoteException(e.getClass() + " " + e.getMessage(), e);
+ }
}
public CustomerProfileData createAccount(CustomerProfileData customerProfile, boolean createSavings, boolean createChecking)
- throws RemoteException {
-
+ throws RemoteException {
+
return accountDataService.createAccount(customerProfile, createSavings, createChecking);
}
public StockSummary sellStock(int purchaseLotNumber, int quantity) throws RemoteException {
- try{
- int id = ((CustomerIdService)accountDataService).getCustomerIdByPurchaseLotNumber(purchaseLotNumber);
+ try {
+ int id = (accountDataService).getCustomerIdByPurchaseLotNumber(purchaseLotNumber);
StockSummary ss = accountDataService.sellStock(purchaseLotNumber, quantity);
if (ss != null) {
if (!(accountDataService instanceof CustomerIdService)) {
@@ -96,20 +98,20 @@
accountLoggerService.logSellStock(id, ss, quantity);
}
return ss;
- } catch (RemoteException e){
+ } catch (RemoteException e) {
e.printStackTrace();
throw e;
} catch (Exception e) {
e.printStackTrace();
- throw new RemoteException(e.getClass() + " " +e.getMessage(),e);
- }
+ throw new RemoteException(e.getClass() + " " + e.getMessage(), e);
+ }
}
public float withdraw(String account, float amount) throws RemoteException {
if (!(accountDataService instanceof CustomerIdService)) {
throw new RemoteException("Can't use data service as customer id service");
}
- int id = ((CustomerIdService)accountDataService).getCustomerIdByAccount(account);
+ int id = (accountDataService).getCustomerIdByAccount(account);
// int id = accountDataService.getCustomerIdByAccount(account);
accountLoggerService.logWithdrawal(id, account, amount);
@@ -120,7 +122,7 @@
return accountDataService.getAccountReport(customerID);
}
-
+
public AccountLog getAccountLog(final int customerID) throws RemoteException {
return accountLoggerService.getAccountLog(customerID);
}
Modified: incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerService.java?view=diff&rev=453296&r1=453295&r2=453296
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerService.java (original)
+++ incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerService.java Thu Oct 5 10:44:29 2006
@@ -29,19 +29,19 @@
* This is the business interface of the Account Logger service component.
*/
public interface AccountLoggerService {
-
+
@OneWay
public void logDeposit(int id, String account, float amount) throws RemoteException;
-
+
@OneWay
public void logWithdrawal(int id, String account, float amount) throws RemoteException;
-
+
@OneWay
public void logPurchaseStock(int id, StockSummary stock) throws RemoteException;
-
+
@OneWay
public void logSellStock(int id, StockSummary stock, int quantity) throws RemoteException;
-
+
public AccountLog getAccountLog(int id) throws RemoteException;
}
Modified: incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerServiceImpl.java?view=diff&rev=453296&r1=453295&r2=453296
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerServiceImpl.java (original)
+++ incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerServiceImpl.java Thu Oct 5 10:44:29 2006
@@ -40,10 +40,13 @@
*/
@Service(AccountLoggerService.class)
public class AccountLoggerServiceImpl implements AccountLoggerService {
-
+
public static final String ACCT_ACTION_TYPE_DEPOSIT = "deposit";
+
public static final String ACCT_ACTION_TYPE_WITHDRAW = "withdraw";
+
public static final String STOCK_ACTION_TYPE_PURCHASE = "purchase";
+
public static final String STOCK_ACTION_TYPE_SELL = "sell";
static public String dbDirectory = null;
@@ -59,13 +62,14 @@
insert.setParameter(2, account);
insert.setParameter(3, ACCT_ACTION_TYPE_DEPOSIT);
insert.setParameter(4, new Float(amount));
-
+
insert.execute();
-/*
- performLog("insert into acctLog (id, accountNumber, actionType, amount) values (" +
- id + ", '" + account + "', '" + ACCT_ACTION_TYPE_DEPOSIT + "', " + amount + ")"); */
+ /*
+ * performLog("insert into acctLog (id, accountNumber, actionType, amount) values (" + id + ", '" + account + "', '" +
+ * ACCT_ACTION_TYPE_DEPOSIT + "', " + amount + ")");
+ */
}
-
+
public void logWithdrawal(int id, String account, float amount) throws RemoteException {
DAS das = DAS.FACTORY.createDAS(getConnection());
Command insert = das.createCommand("insert into acctLog (id, accountNumber, actionType, amount) values (?,?,?,?)");
@@ -73,13 +77,14 @@
insert.setParameter(2, account);
insert.setParameter(3, ACCT_ACTION_TYPE_WITHDRAW);
insert.setParameter(4, new Float(amount));
-
+
insert.execute();
/*
- performLog("insert into acctLog (id ,accountNumber, actionType, amount) values (" +
- id + ", '" + account + "', '" + ACCT_ACTION_TYPE_WITHDRAW + "', " + amount + ")"); */
+ * performLog("insert into acctLog (id ,accountNumber, actionType, amount) values (" + id + ", '" + account + "', '" +
+ * ACCT_ACTION_TYPE_WITHDRAW + "', " + amount + ")");
+ */
}
-
+
public void logPurchaseStock(int id, StockSummary stock) throws RemoteException {
DAS das = DAS.FACTORY.createDAS(getConnection());
Command insert = das.createCommand("insert into stockLog (id, Symbol, quantity, actionType, purchaseLotNumber) values (?,?,?,?,?)");
@@ -88,17 +93,17 @@
insert.setParameter(3, new Integer(stock.getQuantity()));
insert.setParameter(4, STOCK_ACTION_TYPE_PURCHASE);
insert.setParameter(5, new Integer(stock.getPurchaseLotNumber()));
-
+
insert.execute();
/*
- performLog("insert into stockLog (id, Symbol, quantity, actionType, purchaseLotNumber) values (" +
- id + ", '" + stock.getSymbol() + "', " + stock.getQuantity() +
- ", '" + STOCK_ACTION_TYPE_PURCHASE + ", " + stock.getPurchaseLotNumber() + ")"); */
+ * performLog("insert into stockLog (id, Symbol, quantity, actionType, purchaseLotNumber) values (" + id + ", '" + stock.getSymbol() + "', " +
+ * stock.getQuantity() + ", '" + STOCK_ACTION_TYPE_PURCHASE + ", " + stock.getPurchaseLotNumber() + ")");
+ */
}
-
+
public void logSellStock(int id, StockSummary stock, int quantity) throws RemoteException {
-
- String symbol = ((stock.getSymbol()!=null)?stock.getSymbol():"null");
+
+ String symbol = ((stock.getSymbol() != null) ? stock.getSymbol() : "null");
DAS das = DAS.FACTORY.createDAS(getConnection());
Command insert = das.createCommand("insert into stockLog (id, Symbol, quantity, actionType, purchaseLotNumber) values (?,?,?,?,?)");
insert.setParameter(1, new Integer(id));
@@ -106,41 +111,41 @@
insert.setParameter(3, new Integer(quantity));
insert.setParameter(4, STOCK_ACTION_TYPE_SELL);
insert.setParameter(5, new Integer(stock.getPurchaseLotNumber()));
-
+
insert.execute();
/*
- performLog("insert into stockLog (id, Symbol, quantity, actionType, purchaseLotNumber) values (" +
- id + ", '" + stock.getSymbol() + "', " + quantity +
- ", '" + STOCK_ACTION_TYPE_SELL + ", " + stock.getPurchaseLotNumber() + ")"); */
+ * performLog("insert into stockLog (id, Symbol, quantity, actionType, purchaseLotNumber) values (" + id + ", '" + stock.getSymbol() + "', " +
+ * quantity + ", '" + STOCK_ACTION_TYPE_SELL + ", " + stock.getPurchaseLotNumber() + ")");
+ */
}
-
+
private void performLog(String toLog) throws RemoteException {
-
+
try {
Connection conn = getConnection();
Statement s = conn.createStatement();
s.execute(toLog);
-
+
conn.commit();
-
+
System.out.println("SN id acctNo action amount");
ResultSet rs = s.executeQuery("select * from acctLog");
- while(rs.next()) {
- System.out.println(rs.getInt("logSeqNo") + " " + rs.getInt("id") + " " + rs.getString("accountNumber") +
- " " + rs.getString("actionType") + " " + rs.getFloat("amount"));
+ while (rs.next()) {
+ System.out.println(rs.getInt("logSeqNo") + " " + rs.getInt("id") + " " + rs.getString("accountNumber") + " "
+ + rs.getString("actionType") + " " + rs.getFloat("amount"));
}
-
+
conn.commit();
System.out.println("SN Symbol qty action plot#");
rs = s.executeQuery("select * from stockLog");
- while(rs.next()) {
- System.out.println(rs.getInt("logSeqNo") + " " + rs.getString("Symbol") + " " + rs.getInt("quantity") +
- " " + rs.getString("actionType") + " " + rs.getInt("purchaseLotNumber"));
+ while (rs.next()) {
+ System.out.println(rs.getInt("logSeqNo") + " " + rs.getString("Symbol") + " " + rs.getInt("quantity") + " "
+ + rs.getString("actionType") + " " + rs.getInt("purchaseLotNumber"));
}
-
+
conn.commit();
s.close();
@@ -148,8 +153,8 @@
conn.close();
} catch (Exception e) {
e.printStackTrace();
- throw new RemoteException(e.getClass().getName() ,e);
- }
+ throw new RemoteException(e.getClass().getName(), e);
+ }
System.out.println("Logged " + toLog);
}
@@ -162,13 +167,13 @@
// props.put("user", "tuscany");
// props.put("password", "tuscany");
conn = DriverManager.getConnection(protocol + dbDirectory + ";create=true", props);
-
+
conn.setAutoCommit(false);
return conn;
} catch (Exception e) {
e.printStackTrace();
- throw new RemoteException(e.getClass().getName() ,e);
- }
+ throw new RemoteException(e.getClass().getName(), e);
+ }
}
public AccountLog getAccountLog(final int customerID) throws RemoteException {
@@ -181,26 +186,25 @@
Connection conn = getConnection();
DAS das = DAS.FACTORY.createDAS(mapping, conn);
Command select = das.createCommand("SELECT logSeqNo, accountNumber, actionType, amount FROM acctLog where id = ?");
-
+
select.setParameter(1, customerID);
-
+
DataObject root = select.executeQuery();
accountLog.getAccountLogEntries().addAll(root.getList("AccountLogEntry"));
- select = das.createCommand(
- "SELECT logSeqNo, Symbol, quantity, actionType, purchaseLotNumber FROM stockLog where id = ?");
- select.setParameter(1, customerID);
- root = select.executeQuery();
+ select = das.createCommand("SELECT logSeqNo, Symbol, quantity, actionType, purchaseLotNumber FROM stockLog where id = ?");
+ select.setParameter(1, customerID);
+ root = select.executeQuery();
accountLog.getStockLogEntries().addAll(root.getList("StockLogEntry"));
conn.close();
return accountLog;
} catch (Exception e) {
- if (e instanceof RemoteException)
+ if (e instanceof RemoteException) {
throw (RemoteException) e;
- throw new RemoteException("getAccountLog failed. customerID ('" + customerID + "')" + e.getClass().getName() + "'. " + e.getMessage(),
- e);
+ }
+ throw new RemoteException("getAccountLog failed. customerID ('" + customerID + "')" + e.getClass().getName() + "'. " + e.getMessage(), e);
}
}
Modified: incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuote.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuote.java?view=diff&rev=453296&r1=453295&r2=453296
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuote.java (original)
+++ incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuote.java Thu Oct 5 10:44:29 2006
@@ -169,6 +169,7 @@
dividendPerShare = newDividendPerShare;
}
+ @Override
public String toString() {
StringBuffer result = new StringBuffer(super.toString());
@@ -203,23 +204,25 @@
result.append(')');
return result.toString();
}
- public StockQuote clone(){
+
+ @Override
+ public StockQuote clone() {
StockQuote ret = new StockQuote();
- ret.companyName= companyName;
- ret.symbol= symbol;
- ret.stockQuote= stockQuote;
- ret.lastUpdated= lastUpdated;
- ret.change= change;
- ret.openPrice= openPrice;
- ret.dayHighPrice= dayHighPrice;
- ret.dayLowPrice= dayLowPrice;
- ret.volume= volume;
- ret.marketCap= marketCap;
- ret.yearRange= yearRange;
- ret.exDividendDate= exDividendDate;
- ret.dividendYield= dividendYield;
- ret.dividendPerShare= dividendPerShare;
+ ret.companyName = companyName;
+ ret.symbol = symbol;
+ ret.stockQuote = stockQuote;
+ ret.lastUpdated = lastUpdated;
+ ret.change = change;
+ ret.openPrice = openPrice;
+ ret.dayHighPrice = dayHighPrice;
+ ret.dayLowPrice = dayLowPrice;
+ ret.volume = volume;
+ ret.marketCap = marketCap;
+ ret.yearRange = yearRange;
+ ret.exDividendDate = exDividendDate;
+ ret.dividendYield = dividendYield;
+ ret.dividendPerShare = dividendPerShare;
return ret;
}
-}
+}
Modified: incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteService.java?view=diff&rev=453296&r1=453295&r2=453296
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteService.java (original)
+++ incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteService.java Thu Oct 5 10:44:29 2006
@@ -24,7 +24,7 @@
/**
* This is the business interface of the HelloWorld service component.
*/
-//@DataType(name="commonj.sdo.DataObject")
+// @DataType(name="commonj.sdo.DataObject")
public interface StockQuoteService {
public Map getQuotes(String[] symbols) throws RemoteException;
Modified: incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteServiceImpl.java?view=diff&rev=453296&r1=453295&r2=453296
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteServiceImpl.java (original)
+++ incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteServiceImpl.java Thu Oct 5 10:44:29 2006
@@ -27,7 +27,7 @@
public class StockQuoteServiceImpl implements StockQuoteService {
- static Random rn = new Random();
+ static Random rn = new Random();
static Hashtable<String, StockQuote> stocks = new Hashtable<String, StockQuote>();
@@ -57,7 +57,7 @@
sq.setDayLowPrice(dl + "");
}
- ret.put(sym, (StockQuote) sq.clone());
+ ret.put(sym, sq.clone());
}
}
Modified: incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteWebservicexServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteWebservicexServiceImpl.java?view=diff&rev=453296&r1=453295&r2=453296
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteWebservicexServiceImpl.java (original)
+++ incubator/tuscany/java/sampleapps/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteWebservicexServiceImpl.java Thu Oct 5 10:44:29 2006
@@ -55,8 +55,9 @@
assert null != stockQuoteService : "stockQuoteService was not set by the SCA runtime!";
StringBuilder sb = new StringBuilder(5 * symbols.length);
for (String sym : symbols) {
- if (sb.length() != 0)
+ if (sb.length() != 0) {
sb.append(' ');
+ }
sb.append(sym);
}
String stockdata = stockQuoteService.GetQuote(sb.toString());
Modified: incubator/tuscany/java/sampleapps/bigbank/account/src/test/java/bigbank/account/client/AccountClient.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/account/src/test/java/bigbank/account/client/AccountClient.java?view=diff&rev=453296&r1=453295&r2=453296
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/account/src/test/java/bigbank/account/client/AccountClient.java (original)
+++ incubator/tuscany/java/sampleapps/bigbank/account/src/test/java/bigbank/account/client/AccountClient.java Thu Oct 5 10:44:29 2006
@@ -28,7 +28,6 @@
import com.bigbank.account.AccountSummary;
public class AccountClient {
-
public void start() {
}
@@ -37,11 +36,10 @@
}
public static void main(String[] args) throws Exception {
-
+
CompositeContext context = CurrentCompositeContext.getContext();
AccountService accountService = context.locateService(AccountService.class, "AccountServiceComponent");
-
AccountReport accountReport = accountService.getAccountReport(12345);
Modified: incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/account/AccountServiceComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/account/AccountServiceComponentImpl.java?view=diff&rev=453296&r1=453295&r2=453296
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/account/AccountServiceComponentImpl.java (original)
+++ incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/account/AccountServiceComponentImpl.java Thu Oct 5 10:44:29 2006
@@ -105,7 +105,7 @@
return accountService.createAccount(customerProfile, createSavings, createCheckings);
}
-
+
public AccountLog getAccountLog(int customerID) throws RemoteException {
try {
return accountService.getAccountLog(customerID);
@@ -113,6 +113,5 @@
throw new ServiceUnavailableException(e);
}
}
-
}
Modified: incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/AccountLoginServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/AccountLoginServiceImpl.java?view=diff&rev=453296&r1=453295&r2=453296
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/AccountLoginServiceImpl.java (original)
+++ incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/AccountLoginServiceImpl.java Thu Oct 5 10:44:29 2006
@@ -30,15 +30,16 @@
@Service(LoginService.class)
@Scope("MODULE")
public class AccountLoginServiceImpl implements LoginService {
-
+
public AccountService accountService;
+
@Reference
public void setAccountService(AccountService accountService) {
this.accountService = accountService;
}
-
public ProfileService profileService;
+
@Reference
public void setProfileService(ProfileService profileService) {
this.profileService = profileService;
@@ -59,6 +60,5 @@
return SUCCESS;
}
-
}
Modified: incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/LoginService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/LoginService.java?view=diff&rev=453296&r1=453295&r2=453296
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/LoginService.java (original)
+++ incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/LoginService.java Thu Oct 5 10:44:29 2006
@@ -27,11 +27,11 @@
@DataType(name = "commonj.sdo.DataObject")
public interface LoginService {
- static final int SUCCESS = 1;
+ static final int SUCCESS = 1;
- static final int INVALID_LOGIN = -1;
+ static final int INVALID_LOGIN = -1;
- static final int INVALID_PASSWORD = -2;
+ static final int INVALID_PASSWORD = -2;
- int login(String userName, String password) throws RemoteException;
+ int login(String userName, String password) throws RemoteException;
}
Modified: incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileService.java?view=diff&rev=453296&r1=453295&r2=453296
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileService.java (original)
+++ incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileService.java Thu Oct 5 10:44:29 2006
@@ -25,19 +25,19 @@
@DataType(name = "commonj.sdo.DataObject")
public interface ProfileService {
- String getFirstName();
+ String getFirstName();
- void setFirstName(String pName);
+ void setFirstName(String pName);
- String getLastName();
+ String getLastName();
- void setLastName(String pName);
+ void setLastName(String pName);
- boolean isLoggedIn();
+ boolean isLoggedIn();
- void setLoggedIn(boolean pStatus);
+ void setLoggedIn(boolean pStatus);
- int getId();
+ int getId();
- void setId(int pId);
+ void setId(int pId);
}
Modified: incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountLogTag.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountLogTag.java?view=diff&rev=453296&r1=453295&r2=453296
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountLogTag.java (original)
+++ incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountLogTag.java Thu Oct 5 10:44:29 2006
@@ -33,7 +33,7 @@
import com.bigbank.account.AccountService;
public class AccountLogTag extends TagSupport {
-
+
public AccountLogTag() {
super();
}
@@ -60,32 +60,31 @@
private String mId;
+ @Override
public String getId() {
return mId;
}
+ @Override
public void setId(String pId) {
mId = pId;
}
private Iterator mIterator;
+ @Override
public int doStartTag() throws JspException {
CompositeContext moduleContext = CurrentCompositeContext.getContext();
ProfileService profile = moduleContext.locateService(ProfileService.class, mProfileService);
-
-
if (profile == null) {
- throw new JspException("Profile [" + mProfileService
- + "] not found in current module context");
+ throw new JspException("Profile [" + mProfileService + "] not found in current module context");
}
- AccountService service = (AccountService) moduleContext.locateService(AccountService.class,mAccountService);
+ AccountService service = (AccountService) moduleContext.locateService(AccountService.class, mAccountService);
if (service == null) {
- throw new JspException("Service [" + mAccountService
- + "] not found in current module context");
+ throw new JspException("Service [" + mAccountService + "] not found in current module context");
}
List entries;
try {
@@ -103,7 +102,8 @@
return SKIP_BODY;
}
}
-
+
+ @Override
public int doAfterBody() {
if (mIterator.hasNext()) {
pageContext.setAttribute(mId, mIterator.next());
@@ -113,6 +113,7 @@
}
}
+ @Override
public void release() {
super.release();
}
Modified: incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountStatusTag.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountStatusTag.java?view=diff&rev=453296&r1=453295&r2=453296
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountStatusTag.java (original)
+++ incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountStatusTag.java Thu Oct 5 10:44:29 2006
@@ -72,16 +72,19 @@
private String mId;
+ @Override
public String getId() {
return mId;
}
+ @Override
public void setId(String pId) {
mId = pId;
}
private Iterator mIterator;
+ @Override
public int doStartTag() throws JspException {
CompositeContext moduleContext = CurrentCompositeContext.getContext();
@@ -91,7 +94,7 @@
throw new JspException("Profile [" + mProfileService + "] not found in current module context");
}
- AccountService service = (AccountService) moduleContext.locateService(AccountService.class,mAccountService);
+ AccountService service = (AccountService) moduleContext.locateService(AccountService.class, mAccountService);
if (service == null) {
throw new JspException("Service [" + mAccountService + "] not found in current module context");
@@ -113,6 +116,7 @@
}
}
+ @Override
public int doAfterBody() {
if (mIterator.hasNext()) {
pageContext.setAttribute(mId, mIterator.next());
@@ -122,6 +126,7 @@
}
}
+ @Override
public void release() {
super.release();
mId = null;
Modified: incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockLogTag.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockLogTag.java?view=diff&rev=453296&r1=453295&r2=453296
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockLogTag.java (original)
+++ incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockLogTag.java Thu Oct 5 10:44:29 2006
@@ -25,27 +25,32 @@
import javax.servlet.jsp.tagext.TagSupport;
public class StockLogTag extends TagSupport {
-
+
public StockLogTag() {
super();
}
private String mId;
+ @Override
public String getId() {
return mId;
}
+ @Override
public void setId(String pId) {
mId = pId;
}
private Iterator mIterator;
+ @Override
public int doStartTag() throws JspException {
-
+
List entries = (List) pageContext.getAttribute("StockLogEntries");
- if(null == entries) return SKIP_BODY;
+ if (null == entries) {
+ return SKIP_BODY;
+ }
mIterator = entries.iterator();
if (mIterator.hasNext()) {
pageContext.setAttribute(mId, mIterator.next());
@@ -55,6 +60,7 @@
}
}
+ @Override
public int doAfterBody() {
if (mIterator.hasNext()) {
pageContext.setAttribute(mId, mIterator.next());
@@ -65,6 +71,7 @@
}
}
+ @Override
public void release() {
pageContext.setAttribute("StockLogEntries", null);
super.release();
Modified: incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockStatusTag.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockStatusTag.java?view=diff&rev=453296&r1=453295&r2=453296
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockStatusTag.java (original)
+++ incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockStatusTag.java Thu Oct 5 10:44:29 2006
@@ -30,29 +30,31 @@
public class StockStatusTag extends TagSupport {
-
public StockStatusTag() {
super();
}
-
private String mId;
+ @Override
public String getId() {
return mId;
}
+ @Override
public void setId(String pId) {
mId = pId;
}
private Iterator mIterator;
+ @Override
public int doStartTag() throws JspException {
List summaries = (List) pageContext.getAttribute("StockSummaries");
- if (null == summaries)
+ if (null == summaries) {
return SKIP_BODY;
+ }
mIterator = summaries.iterator();
if (mIterator.hasNext()) {
pageContext.setAttribute(mId, mIterator.next());
@@ -62,6 +64,7 @@
}
}
+ @Override
public int doAfterBody() {
if (mIterator.hasNext()) {
pageContext.setAttribute(mId, mIterator.next());
@@ -72,6 +75,7 @@
}
}
+ @Override
public void release() {
pageContext.setAttribute("StockSummaries", null);
super.release();
Modified: incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/LoginBarrierTag.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/LoginBarrierTag.java?view=diff&rev=453296&r1=453295&r2=453296
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/LoginBarrierTag.java (original)
+++ incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/LoginBarrierTag.java Thu Oct 5 10:44:29 2006
@@ -58,7 +58,7 @@
int doPage = EVAL_PAGE;
-
+ @Override
public int doStartTag() throws JspException {
if (mProfile == null || mProfile.length() < 1) {
throw new JspException("Invalid profile location specified");
@@ -88,10 +88,12 @@
}
}
+ @Override
public int doEndTag() throws JspException {
return doPage;
}
+ @Override
public void release() {
super.release();
}
Modified: incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/ServiceTag.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/ServiceTag.java?view=diff&rev=453296&r1=453295&r2=453296
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/ServiceTag.java (original)
+++ incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/ServiceTag.java Thu Oct 5 10:44:29 2006
@@ -63,6 +63,7 @@
/**
* Returns the id of the service in the page context
*/
+ @Override
public String getId() {
return mId;
}
@@ -71,10 +72,12 @@
* Sets the id of the service for the page context
*/
+ @Override
public void setId(String pId) {
mId = pId;
}
+ @Override
public int doStartTag() throws JspException {
CompositeContext moduleContext = CurrentCompositeContext.getContext();
@@ -92,10 +95,12 @@
return EVAL_BODY_INCLUDE;
}
+ @Override
public int doEndTag() throws JspException {
return EVAL_PAGE;
}
+ @Override
public void release() {
super.release();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org