You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2009/09/09 15:57:27 UTC
svn commit: r812965 [1/3] - in /geronimo/daytrader/trunk:
assemblies/javaee/daytrader-war/src/main/webapp/
assemblies/web/daytrader-web-jdbc/
assemblies/web/daytrader-web-jdbc/src/main/webapp/
assemblies/web/daytrader-web-jdbc/src/main/webapp/WEB-INF/ ...
Author: jbohn
Date: Wed Sep 9 13:57:23 2009
New Revision: 812965
URL: http://svn.apache.org/viewvc?rev=812965&view=rev
Log:
Qualify package names for modules, reflect package name updates in source structure, and bundlize the jars needed for the web jdbc assembly
Added:
geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/WEB-INF/ibm-web-bnd.xml (with props)
geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/
geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/AccountDataBean.java
- copied, changed from r810906, geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/AccountDataBean.java
geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/AccountProfileDataBean.java
- copied, changed from r810906, geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/AccountProfileDataBean.java
geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/HoldingDataBean.java
- copied, changed from r810906, geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/HoldingDataBean.java
geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/OrderDataBean.java
- copied, changed from r810906, geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/OrderDataBean.java
geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/QuoteDataBean.java
- copied, changed from r810906, geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/QuoteDataBean.java
geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/
geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/FinancialUtils.java
- copied, changed from r810906, geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/FinancialUtils.java
geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/MarketSummaryDataBean.java
- copied, changed from r810906, geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/MarketSummaryDataBean.java
geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/MarketSummaryDataBeanWS.java
- copied, changed from r810906, geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/MarketSummaryDataBeanWS.java
geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/RunStatsDataBean.java
- copied, changed from r810906, geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/RunStatsDataBean.java
geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeAction.java
- copied, changed from r810906, geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/TradeAction.java
geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeDBServices.java
- copied, changed from r810906, geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/TradeDBServices.java
geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeServices.java
- copied, changed from r810906, geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/TradeServices.java
geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeWSAction.java
- copied, changed from r810906, geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/TradeWSAction.java
geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeWSServices.java
- copied, changed from r810906, geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/TradeWSServices.java
geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/direct/
- copied from r810906, geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/direct/
geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/
geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/AccountDataBean.java
- copied, changed from r810906, geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/AccountDataBean.java
geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/AccountProfileDataBean.java
- copied, changed from r810906, geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/AccountProfileDataBean.java
geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/HoldingDataBean.java
- copied, changed from r810906, geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/HoldingDataBean.java
geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/OrderDataBean.java
- copied, changed from r810906, geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/OrderDataBean.java
geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/beans/QuoteDataBean.java
- copied, changed from r810906, geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/QuoteDataBean.java
geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/beans/
geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/beans/AccountDataBean.java
- copied, changed from r810906, geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/AccountDataBean.java
geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/beans/AccountProfileDataBean.java
- copied, changed from r810906, geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/AccountProfileDataBean.java
geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/beans/HoldingDataBean.java
- copied, changed from r810906, geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/HoldingDataBean.java
geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/beans/OrderDataBean.java
- copied, changed from r810906, geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/OrderDataBean.java
geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/beans/QuoteDataBean.java
- copied, changed from r810906, geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/QuoteDataBean.java
geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/core/
geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/core/MarketSummaryDataBeanWS.java
- copied, changed from r810906, geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/MarketSummaryDataBeanWS.java
geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/core/RunStatsDataBean.java
- copied, changed from r810906, geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/RunStatsDataBean.java
geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/core/Trade.java
- copied, changed from r810906, geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/Trade.java
geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeWSServices.java
- copied, changed from r810906, geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/TradeWSServices.java
geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeWSServicesProxy.java
- copied, changed from r810906, geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/TradeWSServicesProxy.java
Removed:
geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/AccountDataBean.java
geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/AccountProfileDataBean.java
geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/HoldingDataBean.java
geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/OrderDataBean.java
geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/QuoteDataBean.java
geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/FinancialUtils.java
geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/MarketSummaryDataBean.java
geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/MarketSummaryDataBeanWS.java
geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/RunStatsDataBean.java
geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/TradeAction.java
geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/TradeDBServices.java
geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/TradeServices.java
geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/TradeWSAction.java
geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/TradeWSServices.java
geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/direct/
geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/AccountDataBean.java
geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/AccountProfileDataBean.java
geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/HoldingDataBean.java
geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/OrderDataBean.java
geronimo/daytrader/trunk/modules/entities/src/main/java/org/apache/geronimo/samples/daytrader/QuoteDataBean.java
geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/AccountDataBean.java
geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/AccountProfileDataBean.java
geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/HoldingDataBean.java
geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/MarketSummaryDataBeanWS.java
geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/OrderDataBean.java
geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/QuoteDataBean.java
geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/RunStatsDataBean.java
geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/Trade.java
geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/TradeWSServices.java
geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/TradeWSServicesProxy.java
Modified:
geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/PingJspEL.jsp
geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/account.jsp
geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/accountImg.jsp
geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/displayQuote.jsp
geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/marketSummary.jsp
geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/order.jsp
geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/orderImg.jsp
geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/portfolio.jsp
geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/portfolioImg.jsp
geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/quote.jsp
geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/quoteImg.jsp
geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/runStats.jsp
geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/tradehome.jsp
geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/tradehomeImg.jsp
geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/pom.xml
geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/PingJspEL.jsp
geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/account.jsp
geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/accountImg.jsp
geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/displayQuote.jsp
geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/marketSummary.jsp
geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/order.jsp
geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/orderImg.jsp
geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/portfolio.jsp
geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/portfolioImg.jsp
geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/quote.jsp
geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/quoteImg.jsp
geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/runStats.jsp
geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/tradehome.jsp
geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/tradehomeImg.jsp
geronimo/daytrader/trunk/modules/beans/pom.xml
geronimo/daytrader/trunk/modules/core/pom.xml
geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/direct/KeySequenceDirect.java
geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/direct/TradeJDBCDirect.java
geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/direct/TradeJEEDirect.java
geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/direct/TradeJPADirect.java
geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/DTBroker3MDB.java
geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/DirectSLSBBean.java
geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/DirectSLSBLocal.java
geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/DirectSLSBRemote.java
geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/TradeSLSBBean.java
geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/TradeSLSBLocal.java
geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/TradeSLSBRemote.java
geronimo/daytrader/trunk/modules/entities/pom.xml
geronimo/daytrader/trunk/modules/entities/src/main/resources/META-INF/persistence.xml
geronimo/daytrader/trunk/modules/json-proxy/src/main/java/org/apache/geronimo/samples/daytrader/ajax/SoapProxy.java
geronimo/daytrader/trunk/modules/json-proxy/src/main/webapp/WEB-INF/TradeServicesClient_mapping.xml
geronimo/daytrader/trunk/modules/soap/src/main/java/org/apache/geronimo/samples/daytrader/soap/Convert.java
geronimo/daytrader/trunk/modules/soap/src/main/java/org/apache/geronimo/samples/daytrader/soap/TradeWSAction.java
geronimo/daytrader/trunk/modules/soap/src/main/java/org/apache/geronimo/samples/daytrader/soap/TradeWebSoapProxy.java
geronimo/daytrader/trunk/modules/streamer/src/main/java/org/apache/geronimo/samples/daytrader/client/TradeClient.java
geronimo/daytrader/trunk/modules/streamer/src/main/java/org/apache/geronimo/samples/daytrader/client/TradeStreamerQuoteDataBean.java
geronimo/daytrader/trunk/modules/util/pom.xml
geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/OrdersAlertFilter.java
geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TestServlet.java
geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeAppServlet.java
geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeBuildDB.java
geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeConfigServlet.java
geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeDirectContextListener.java
geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeJDBCContextListener.java
geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeJPAContextListener.java
geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeScenarioServlet.java
geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/TradeServletAction.java
geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingJDBCRead.java
geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/PingJDBCWrite.java
geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/ejb3/PingServlet2Entity.java
geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/ejb3/PingServlet2Session2CMROne2Many.java
geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/ejb3/PingServlet2Session2CMROne2One.java
geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/ejb3/PingServlet2Session2Entity.java
geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/ejb3/PingServlet2Session2EntityCollection.java
geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/ejb3/PingServlet2Session2JDBC.java
geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/ejb3/PingServlet2Session2JDBCCollection.java
geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/prims/ejb3/PingServlet2TwoPhase.java
Modified: geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/PingJspEL.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/PingJspEL.jsp?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/PingJspEL.jsp (original)
+++ geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/PingJspEL.jsp Wed Sep 9 13:57:23 2009
@@ -20,7 +20,7 @@
<title>PingJspEL</title>
</head>
<body>
-<%@ page import="org.apache.geronimo.samples.daytrader.*" session="false" %>
+<%@ page import="org.apache.geronimo.samples.daytrader.core.*,org.apache.geronimo.samples.daytrader.beans.*" session="false" %>
<%!
int hitCount = 0;
Modified: geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/account.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/account.jsp?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/account.jsp (original)
+++ geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/account.jsp Wed Sep 9 13:57:23 2009
@@ -23,14 +23,14 @@
</HEAD>
<BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
<%@ page
- import="java.util.Collection,java.util.Iterator,java.math.BigDecimal,org.apache.geronimo.samples.daytrader.*,org.apache.geronimo.samples.daytrader.util.*"
+ import="java.util.Collection,java.util.Iterator,java.math.BigDecimal,org.apache.geronimo.samples.daytrader.core.*,org.apache.geronimo.samples.daytrader.beans.*,org.apache.geronimo.samples.daytrader.util.*"
session="true" isThreadSafe="true" isErrorPage="false"%>
<jsp:useBean id="results" scope="request" type="java.lang.String" />
<jsp:useBean id="accountData"
- type="org.apache.geronimo.samples.daytrader.AccountDataBean"
+ type="org.apache.geronimo.samples.daytrader.beans.AccountDataBean"
scope="request" />
<jsp:useBean id="accountProfileData"
- type="org.apache.geronimo.samples.daytrader.AccountProfileDataBean"
+ type="org.apache.geronimo.samples.daytrader.beans.AccountProfileDataBean"
scope="request" />
<jsp:useBean id="orderDataBeans" type="java.util.Collection"
scope="request" />
Modified: geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/accountImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/accountImg.jsp?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/accountImg.jsp (original)
+++ geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/accountImg.jsp Wed Sep 9 13:57:23 2009
@@ -23,14 +23,14 @@
</HEAD>
<BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
<%@ page
- import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.*, org.apache.geronimo.samples.daytrader.util.*"
+ import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
session="true" isThreadSafe="true" isErrorPage="false"%>
<jsp:useBean id="results" scope="request" type="java.lang.String" />
<jsp:useBean id="accountData"
- type="org.apache.geronimo.samples.daytrader.AccountDataBean"
+ type="org.apache.geronimo.samples.daytrader.beans.AccountDataBean"
scope="request" />
<jsp:useBean id="accountProfileData"
- type="org.apache.geronimo.samples.daytrader.AccountProfileDataBean"
+ type="org.apache.geronimo.samples.daytrader.beans.AccountProfileDataBean"
scope="request" />
<jsp:useBean id="orderDataBeans" type="java.util.Collection"
scope="request" />
Modified: geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/displayQuote.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/displayQuote.jsp?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/displayQuote.jsp (original)
+++ geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/displayQuote.jsp Wed Sep 9 13:57:23 2009
@@ -15,7 +15,7 @@
limitations under the License.
-->
<%@ page
- import="java.math.BigDecimal, org.apache.geronimo.samples.daytrader.*, org.apache.geronimo.samples.daytrader.util.*, org.apache.geronimo.samples.daytrader.soap.*"
+ import="java.math.BigDecimal, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*, org.apache.geronimo.samples.daytrader.soap.*"
session="true" isThreadSafe="true" isErrorPage="false"%>
<%
String symbol = request.getParameter("symbol");
Modified: geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/marketSummary.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/marketSummary.jsp?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/marketSummary.jsp (original)
+++ geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/marketSummary.jsp Wed Sep 9 13:57:23 2009
@@ -15,7 +15,7 @@
limitations under the License.
-->
<%@ page
- import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.*, org.apache.geronimo.samples.daytrader.util.*, org.apache.geronimo.samples.daytrader.soap.*"
+ import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*, org.apache.geronimo.samples.daytrader.soap.*"
session="true" isThreadSafe="true" isErrorPage="false"%>
<%
Modified: geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/order.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/order.jsp?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/order.jsp (original)
+++ geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/order.jsp Wed Sep 9 13:57:23 2009
@@ -22,7 +22,7 @@
</HEAD>
<BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
-<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
+<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
<jsp:useBean id="results" scope="request" type="java.lang.String" />
<TABLE height="54">
Modified: geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/orderImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/orderImg.jsp?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/orderImg.jsp (original)
+++ geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/orderImg.jsp Wed Sep 9 13:57:23 2009
@@ -22,7 +22,7 @@
</HEAD>
<BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
-<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
+<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
<jsp:useBean id="results" scope="request" type="java.lang.String" />
<TABLE height="54">
Modified: geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/portfolio.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/portfolio.jsp?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/portfolio.jsp (original)
+++ geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/portfolio.jsp Wed Sep 9 13:57:23 2009
@@ -22,7 +22,7 @@
<LINK rel="stylesheet" href="style.css" type="text/css" />
</HEAD>
<BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
-<%@ page import="java.util.Collection, java.util.Iterator, java.util.HashMap, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
+<%@ page import="java.util.Collection, java.util.Iterator, java.util.HashMap, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
<jsp:useBean id="results" scope="request" type="java.lang.String" />
<jsp:useBean id="holdingDataBeans" type="java.util.Collection" scope="request" />
<jsp:useBean id="quoteDataBeans" type="java.util.Collection" scope="request"/>
Modified: geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/portfolioImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/portfolioImg.jsp?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/portfolioImg.jsp (original)
+++ geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/portfolioImg.jsp Wed Sep 9 13:57:23 2009
@@ -23,7 +23,7 @@
</HEAD>
<BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
<%@ page
- import="java.util.Collection, java.util.Iterator, java.util.HashMap, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.*, org.apache.geronimo.samples.daytrader.util.*"
+ import="java.util.Collection, java.util.Iterator, java.util.HashMap, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
session="true" isThreadSafe="true" isErrorPage="false"%>
<jsp:useBean id="results" scope="request" type="java.lang.String" />
<jsp:useBean id="holdingDataBeans" type="java.util.Collection"
Modified: geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/quote.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/quote.jsp?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/quote.jsp (original)
+++ geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/quote.jsp Wed Sep 9 13:57:23 2009
@@ -23,7 +23,7 @@
</HEAD>
<BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
-<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
+<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
<TABLE height="54">
<TBODY>
Modified: geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/quoteImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/quoteImg.jsp?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/quoteImg.jsp (original)
+++ geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/quoteImg.jsp Wed Sep 9 13:57:23 2009
@@ -24,7 +24,7 @@
<BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
<%@ page
- import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.*, org.apache.geronimo.samples.daytrader.util.*"
+ import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
session="true" isThreadSafe="true" isErrorPage="false"%>
<TABLE height="54">
Modified: geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/runStats.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/runStats.jsp?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/runStats.jsp (original)
+++ geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/runStats.jsp Wed Sep 9 13:57:23 2009
@@ -21,7 +21,7 @@
<TITLE>Welcome to Trade</TITLE>
</HEAD>
<BODY bgcolor="#ffffff" link="#000099">
-<%@ page import="org.apache.geronimo.samples.daytrader.*"
+<%@ page import="org.apache.geronimo.samples.daytrader.core.*"
session="false" isThreadSafe="true" isErrorPage="false"%>
<jsp:useBean
Modified: geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/tradehome.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/tradehome.jsp?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/tradehome.jsp (original)
+++ geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/tradehome.jsp Wed Sep 9 13:57:23 2009
@@ -23,11 +23,11 @@
</HEAD>
<BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
<%@ page
- import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.*, org.apache.geronimo.samples.daytrader.util.*"
+ import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
session="true" isThreadSafe="true" isErrorPage="false"%>
<jsp:useBean id="results" scope="request" type="java.lang.String" />
<jsp:useBean id="accountData"
- type="org.apache.geronimo.samples.daytrader.AccountDataBean"
+ type="org.apache.geronimo.samples.daytrader.beans.AccountDataBean"
scope="request" />
<jsp:useBean id="holdingDataBeans" type="java.util.Collection"
scope="request" />
Modified: geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/tradehomeImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/tradehomeImg.jsp?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/tradehomeImg.jsp (original)
+++ geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/src/main/webapp/tradehomeImg.jsp Wed Sep 9 13:57:23 2009
@@ -23,11 +23,11 @@
</HEAD>
<BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
<%@ page
- import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.*, org.apache.geronimo.samples.daytrader.util.*"
+ import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
session="true" isThreadSafe="true" isErrorPage="false"%>
<jsp:useBean id="results" scope="request" type="java.lang.String" />
<jsp:useBean id="accountData"
- type="org.apache.geronimo.samples.daytrader.AccountDataBean"
+ type="org.apache.geronimo.samples.daytrader.beans.AccountDataBean"
scope="request" />
<jsp:useBean id="holdingDataBeans" type="java.util.Collection"
scope="request" />
Modified: geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/pom.xml?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/pom.xml (original)
+++ geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/pom.xml Wed Sep 9 13:57:23 2009
@@ -131,8 +131,50 @@
</includes>
</resource>
</resources>
+
+ <archive>
+ <!-- add the generated manifest to the war -->
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <supportedProjectTypes>
+ <supportedProjectType>jar</supportedProjectType>
+ <supportedProjectType>bundle</supportedProjectType>
+ <supportedProjectType>war</supportedProjectType>
+ </supportedProjectTypes>
+ <instructions>
+ <Bundle-ClassPath>.,WEB-INF/classes</Bundle-ClassPath>
+ <Embed-Directory>WEB-INF/lib</Embed-Directory>
+ <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+ <Embed-Transitive>true</Embed-Transitive>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${pom.version}</Bundle-Version>
+ <Web-ContextPath>/daytrader</Web-ContextPath>
+ <Web-JSPExtractLocation>/</Web-JSPExtractLocation>
+ <Import-Package>
+ *
+ </Import-Package>
+ </instructions>
+ <unpackBundle>true</unpackBundle>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
</project>
Modified: geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/PingJspEL.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/PingJspEL.jsp?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/PingJspEL.jsp (original)
+++ geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/PingJspEL.jsp Wed Sep 9 13:57:23 2009
@@ -20,7 +20,7 @@
<title>PingJspEL</title>
</head>
<body>
-<%@ page import="org.apache.geronimo.samples.daytrader.*" session="false" %>
+<%@ page import="org.apache.geronimo.samples.daytrader.core.*,org.apache.geronimo.samples.daytrader.beans.*" session="false" %>
<%!
int hitCount = 0;
Added: geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/WEB-INF/ibm-web-bnd.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/WEB-INF/ibm-web-bnd.xml?rev=812965&view=auto
==============================================================================
--- geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/WEB-INF/ibm-web-bnd.xml (added)
+++ geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/WEB-INF/ibm-web-bnd.xml Wed Sep 9 13:57:23 2009
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-bnd
+ xmlns="http://websphere.ibm.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://websphere.ibm.com/xml/ns/javaee http://websphere.ibm.com/xml/ns/javaee/ibm-web-bnd_1_0.xsd"
+ version="1.0">
+
+ <virtual-host name="default_host" />
+
+ <resource-ref name="jdbc/TradeDataSource" binding-name="jdbc/TradeDataSource"></resource-ref>
+
+</web-bnd>
Propchange: geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/WEB-INF/ibm-web-bnd.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/WEB-INF/ibm-web-bnd.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/WEB-INF/ibm-web-bnd.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/account.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/account.jsp?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/account.jsp (original)
+++ geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/account.jsp Wed Sep 9 13:57:23 2009
@@ -23,14 +23,14 @@
</HEAD>
<BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
<%@ page
- import="java.util.Collection,java.util.Iterator,java.math.BigDecimal,org.apache.geronimo.samples.daytrader.*,org.apache.geronimo.samples.daytrader.util.*"
+ import="java.util.Collection,java.util.Iterator,java.math.BigDecimal,org.apache.geronimo.samples.daytrader.core.*,org.apache.geronimo.samples.daytrader.beans.*,org.apache.geronimo.samples.daytrader.util.*"
session="true" isThreadSafe="true" isErrorPage="false"%>
<jsp:useBean id="results" scope="request" type="java.lang.String" />
<jsp:useBean id="accountData"
- type="org.apache.geronimo.samples.daytrader.AccountDataBean"
+ type="org.apache.geronimo.samples.daytrader.beans.AccountDataBean"
scope="request" />
<jsp:useBean id="accountProfileData"
- type="org.apache.geronimo.samples.daytrader.AccountProfileDataBean"
+ type="org.apache.geronimo.samples.daytrader.beans.AccountProfileDataBean"
scope="request" />
<jsp:useBean id="orderDataBeans" type="java.util.Collection"
scope="request" />
Modified: geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/accountImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/accountImg.jsp?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/accountImg.jsp (original)
+++ geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/accountImg.jsp Wed Sep 9 13:57:23 2009
@@ -23,14 +23,14 @@
</HEAD>
<BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
<%@ page
- import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.*, org.apache.geronimo.samples.daytrader.util.*"
+ import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
session="true" isThreadSafe="true" isErrorPage="false"%>
<jsp:useBean id="results" scope="request" type="java.lang.String" />
<jsp:useBean id="accountData"
- type="org.apache.geronimo.samples.daytrader.AccountDataBean"
+ type="org.apache.geronimo.samples.daytrader.beans.AccountDataBean"
scope="request" />
<jsp:useBean id="accountProfileData"
- type="org.apache.geronimo.samples.daytrader.AccountProfileDataBean"
+ type="org.apache.geronimo.samples.daytrader.beans.AccountProfileDataBean"
scope="request" />
<jsp:useBean id="orderDataBeans" type="java.util.Collection"
scope="request" />
Modified: geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/displayQuote.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/displayQuote.jsp?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/displayQuote.jsp (original)
+++ geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/displayQuote.jsp Wed Sep 9 13:57:23 2009
@@ -15,7 +15,7 @@
limitations under the License.
-->
<%@ page
- import="java.math.BigDecimal, org.apache.geronimo.samples.daytrader.*, org.apache.geronimo.samples.daytrader.util.*"
+ import="java.math.BigDecimal, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
session="true" isThreadSafe="true" isErrorPage="false"%>
<%
String symbol = request.getParameter("symbol");
Modified: geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/marketSummary.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/marketSummary.jsp?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/marketSummary.jsp (original)
+++ geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/marketSummary.jsp Wed Sep 9 13:57:23 2009
@@ -15,7 +15,7 @@
limitations under the License.
-->
<%@ page
- import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.*, org.apache.geronimo.samples.daytrader.util.*"
+ import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
session="true" isThreadSafe="true" isErrorPage="false"%>
<%
Modified: geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/order.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/order.jsp?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/order.jsp (original)
+++ geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/order.jsp Wed Sep 9 13:57:23 2009
@@ -22,7 +22,7 @@
</HEAD>
<BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
-<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
+<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
<jsp:useBean id="results" scope="request" type="java.lang.String" />
<TABLE height="54">
Modified: geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/orderImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/orderImg.jsp?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/orderImg.jsp (original)
+++ geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/orderImg.jsp Wed Sep 9 13:57:23 2009
@@ -22,7 +22,7 @@
</HEAD>
<BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
-<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
+<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
<jsp:useBean id="results" scope="request" type="java.lang.String" />
<TABLE height="54">
Modified: geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/portfolio.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/portfolio.jsp?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/portfolio.jsp (original)
+++ geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/portfolio.jsp Wed Sep 9 13:57:23 2009
@@ -22,7 +22,7 @@
<LINK rel="stylesheet" href="style.css" type="text/css" />
</HEAD>
<BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
-<%@ page import="java.util.Collection, java.util.Iterator, java.util.HashMap, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
+<%@ page import="java.util.Collection, java.util.Iterator, java.util.HashMap, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
<jsp:useBean id="results" scope="request" type="java.lang.String" />
<jsp:useBean id="holdingDataBeans" type="java.util.Collection" scope="request" />
<jsp:useBean id="quoteDataBeans" type="java.util.Collection" scope="request"/>
Modified: geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/portfolioImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/portfolioImg.jsp?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/portfolioImg.jsp (original)
+++ geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/portfolioImg.jsp Wed Sep 9 13:57:23 2009
@@ -23,7 +23,7 @@
</HEAD>
<BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
<%@ page
- import="java.util.Collection, java.util.Iterator, java.util.HashMap, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.*, org.apache.geronimo.samples.daytrader.util.*"
+ import="java.util.Collection, java.util.Iterator, java.util.HashMap, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
session="true" isThreadSafe="true" isErrorPage="false"%>
<jsp:useBean id="results" scope="request" type="java.lang.String" />
<jsp:useBean id="holdingDataBeans" type="java.util.Collection"
Modified: geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/quote.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/quote.jsp?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/quote.jsp (original)
+++ geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/quote.jsp Wed Sep 9 13:57:23 2009
@@ -23,7 +23,7 @@
</HEAD>
<BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
-<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
+<%@ page import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*" session="true" isThreadSafe="true" isErrorPage="false"%>
<TABLE height="54">
<TBODY>
Modified: geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/quoteImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/quoteImg.jsp?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/quoteImg.jsp (original)
+++ geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/quoteImg.jsp Wed Sep 9 13:57:23 2009
@@ -24,7 +24,7 @@
<BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
<%@ page
- import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.*, org.apache.geronimo.samples.daytrader.util.*"
+ import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
session="true" isThreadSafe="true" isErrorPage="false"%>
<TABLE height="54">
Modified: geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/runStats.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/runStats.jsp?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/runStats.jsp (original)
+++ geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/runStats.jsp Wed Sep 9 13:57:23 2009
@@ -21,11 +21,11 @@
<TITLE>Welcome to Trade</TITLE>
</HEAD>
<BODY bgcolor="#ffffff" link="#000099">
-<%@ page import="org.apache.geronimo.samples.daytrader.*"
+<%@ page import="org.apache.geronimo.samples.daytrader.core.*"
session="false" isThreadSafe="true" isErrorPage="false"%>
<jsp:useBean
- class="org.apache.geronimo.samples.daytrader.RunStatsDataBean"
+ class="org.apache.geronimo.samples.daytrader.core.RunStatsDataBean"
id="runStatsData" scope="request" />
<%
double loginPercentage = (double) ((TradeConfig.getScenarioMixes())[TradeConfig.workloadMix][TradeConfig.LOGOUT_OP]) / 100.0;
Modified: geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/tradehome.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/tradehome.jsp?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/tradehome.jsp (original)
+++ geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/tradehome.jsp Wed Sep 9 13:57:23 2009
@@ -23,11 +23,11 @@
</HEAD>
<BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
<%@ page
- import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.*, org.apache.geronimo.samples.daytrader.util.*"
+ import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
session="true" isThreadSafe="true" isErrorPage="false"%>
<jsp:useBean id="results" scope="request" type="java.lang.String" />
<jsp:useBean id="accountData"
- type="org.apache.geronimo.samples.daytrader.AccountDataBean"
+ type="org.apache.geronimo.samples.daytrader.beans.AccountDataBean"
scope="request" />
<jsp:useBean id="holdingDataBeans" type="java.util.Collection"
scope="request" />
Modified: geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/tradehomeImg.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/tradehomeImg.jsp?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/tradehomeImg.jsp (original)
+++ geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/tradehomeImg.jsp Wed Sep 9 13:57:23 2009
@@ -23,11 +23,11 @@
</HEAD>
<BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
<%@ page
- import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.*, org.apache.geronimo.samples.daytrader.util.*"
+ import="java.util.Collection, java.util.Iterator, java.math.BigDecimal, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
session="true" isThreadSafe="true" isErrorPage="false"%>
<jsp:useBean id="results" scope="request" type="java.lang.String" />
<jsp:useBean id="accountData"
- type="org.apache.geronimo.samples.daytrader.AccountDataBean"
+ type="org.apache.geronimo.samples.daytrader.beans.AccountDataBean"
scope="request" />
<jsp:useBean id="holdingDataBeans" type="java.util.Collection"
scope="request" />
Modified: geronimo/daytrader/trunk/modules/beans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/beans/pom.xml?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/beans/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/beans/pom.xml Wed Sep 9 13:57:23 2009
@@ -26,7 +26,7 @@
<groupId>org.apache.geronimo.daytrader.modules</groupId>
<artifactId>daytrader-beans</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>DayTrader :: Modules - Beans</name>
<description>Daytrader UnEnhanced Enttities Module</description>
@@ -41,6 +41,7 @@
<groupId>org.apache.geronimo.daytrader.modules</groupId>
<artifactId>daytrader-util</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
<!--
<dependency>
@@ -149,5 +150,16 @@
</plugin>
</plugins>
-->
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.geronimo.samples.daytrader.beans*;version=2.2-SNAPSHOT</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
Copied: geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/AccountDataBean.java (from r810906, geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/AccountDataBean.java)
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/AccountDataBean.java?p2=geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/AccountDataBean.java&p1=geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/AccountDataBean.java&r1=810906&r2=812965&rev=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/AccountDataBean.java (original)
+++ geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/AccountDataBean.java Wed Sep 9 13:57:23 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.samples.daytrader;
+package org.apache.geronimo.samples.daytrader.beans;
import java.io.Serializable;
import java.math.BigDecimal;
Copied: geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/AccountProfileDataBean.java (from r810906, geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/AccountProfileDataBean.java)
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/AccountProfileDataBean.java?p2=geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/AccountProfileDataBean.java&p1=geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/AccountProfileDataBean.java&r1=810906&r2=812965&rev=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/AccountProfileDataBean.java (original)
+++ geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/AccountProfileDataBean.java Wed Sep 9 13:57:23 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.samples.daytrader;
+package org.apache.geronimo.samples.daytrader.beans;
import org.apache.geronimo.samples.daytrader.util.Log;
import org.apache.geronimo.samples.daytrader.util.TradeConfig;
Copied: geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/HoldingDataBean.java (from r810906, geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/HoldingDataBean.java)
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/HoldingDataBean.java?p2=geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/HoldingDataBean.java&p1=geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/HoldingDataBean.java&r1=810906&r2=812965&rev=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/HoldingDataBean.java (original)
+++ geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/HoldingDataBean.java Wed Sep 9 13:57:23 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.samples.daytrader;
+package org.apache.geronimo.samples.daytrader.beans;
import java.io.Serializable;
import java.math.BigDecimal;
Copied: geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/OrderDataBean.java (from r810906, geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/OrderDataBean.java)
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/OrderDataBean.java?p2=geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/OrderDataBean.java&p1=geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/OrderDataBean.java&r1=810906&r2=812965&rev=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/OrderDataBean.java (original)
+++ geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/OrderDataBean.java Wed Sep 9 13:57:23 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.samples.daytrader;
+package org.apache.geronimo.samples.daytrader.beans;
import java.io.Serializable;
import java.math.BigDecimal;
Copied: geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/QuoteDataBean.java (from r810906, geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/QuoteDataBean.java)
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/QuoteDataBean.java?p2=geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/QuoteDataBean.java&p1=geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/QuoteDataBean.java&r1=810906&r2=812965&rev=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/QuoteDataBean.java (original)
+++ geronimo/daytrader/trunk/modules/beans/src/main/java/org/apache/geronimo/samples/daytrader/beans/QuoteDataBean.java Wed Sep 9 13:57:23 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.samples.daytrader;
+package org.apache.geronimo.samples.daytrader.beans;
import java.io.Serializable;
import java.math.BigDecimal;
Modified: geronimo/daytrader/trunk/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/core/pom.xml?rev=812965&r1=812964&r2=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/core/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/core/pom.xml Wed Sep 9 13:57:23 2009
@@ -26,7 +26,7 @@
<groupId>org.apache.geronimo.daytrader.modules</groupId>
<artifactId>daytrader-core</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>DayTrader :: Modules - Core</name>
<description>Daytrader Core Module</description>
@@ -41,6 +41,13 @@
<groupId>org.apache.geronimo.daytrader.modules</groupId>
<artifactId>daytrader-util</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.daytrader.modules</groupId>
+ <artifactId>daytrader-beans</artifactId>
+ <version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.daytrader.modules</groupId>
@@ -178,5 +185,16 @@
</plugin>
</plugins>
-->
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.geronimo.samples.daytrader.core*;version=2.2-SNAPSHOT</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
Copied: geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/FinancialUtils.java (from r810906, geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/FinancialUtils.java)
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/FinancialUtils.java?p2=geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/FinancialUtils.java&p1=geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/FinancialUtils.java&r1=810906&r2=812965&rev=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/FinancialUtils.java (original)
+++ geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/FinancialUtils.java Wed Sep 9 13:57:23 2009
@@ -14,12 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.samples.daytrader;
+package org.apache.geronimo.samples.daytrader.core;
import java.util.Collection;
import java.util.Iterator;
import java.math.BigDecimal;
+import org.apache.geronimo.samples.daytrader.beans.HoldingDataBean;
+
public class FinancialUtils {
//TODO -- FinancialUtils should have parts reimplemented as JSPTaglibs
Copied: geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/MarketSummaryDataBean.java (from r810906, geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/MarketSummaryDataBean.java)
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/MarketSummaryDataBean.java?p2=geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/MarketSummaryDataBean.java&p1=geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/MarketSummaryDataBean.java&r1=810906&r2=812965&rev=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/MarketSummaryDataBean.java (original)
+++ geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/MarketSummaryDataBean.java Wed Sep 9 13:57:23 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.samples.daytrader;
+package org.apache.geronimo.samples.daytrader.core;
import java.io.Serializable;
import java.math.BigDecimal;
@@ -23,6 +23,7 @@
import java.util.Date;
import java.util.Iterator;
+import org.apache.geronimo.samples.daytrader.beans.QuoteDataBean;
import org.apache.geronimo.samples.daytrader.util.Log;
import org.apache.geronimo.samples.daytrader.util.TradeConfig;
Copied: geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/MarketSummaryDataBeanWS.java (from r810906, geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/MarketSummaryDataBeanWS.java)
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/MarketSummaryDataBeanWS.java?p2=geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/MarketSummaryDataBeanWS.java&p1=geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/MarketSummaryDataBeanWS.java&r1=810906&r2=812965&rev=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/MarketSummaryDataBeanWS.java (original)
+++ geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/MarketSummaryDataBeanWS.java Wed Sep 9 13:57:23 2009
@@ -14,13 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.samples.daytrader;
+package org.apache.geronimo.samples.daytrader.core;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Collection;
import java.util.Date;
+import org.apache.geronimo.samples.daytrader.beans.QuoteDataBean;
import org.apache.geronimo.samples.daytrader.util.Log;
/**
@@ -211,7 +212,7 @@
this.summaryDate = summaryDate;
}
- public static MarketSummaryDataBeanWS convertBean(org.apache.geronimo.samples.daytrader.MarketSummaryDataBean origBean) {
+ public static MarketSummaryDataBeanWS convertBean(org.apache.geronimo.samples.daytrader.core.MarketSummaryDataBean origBean) {
Collection gainCol = origBean.getTopGainers();
QuoteDataBean gain[] = (QuoteDataBean[])gainCol.toArray(new QuoteDataBean[0]);
Collection loseCol = origBean.getTopLosers();
Copied: geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/RunStatsDataBean.java (from r810906, geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/RunStatsDataBean.java)
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/RunStatsDataBean.java?p2=geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/RunStatsDataBean.java&p1=geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/RunStatsDataBean.java&r1=810906&r2=812965&rev=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/RunStatsDataBean.java (original)
+++ geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/RunStatsDataBean.java Wed Sep 9 13:57:23 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.samples.daytrader;
+package org.apache.geronimo.samples.daytrader.core;
import java.io.Serializable;
Copied: geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeAction.java (from r810906, geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/TradeAction.java)
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeAction.java?p2=geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeAction.java&p1=geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/TradeAction.java&r1=810906&r2=812965&rev=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/TradeAction.java (original)
+++ geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeAction.java Wed Sep 9 13:57:23 2009
@@ -14,16 +14,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.samples.daytrader;
+package org.apache.geronimo.samples.daytrader.core;
import java.math.BigDecimal;
import java.util.Collection;
import javax.naming.InitialContext;
-import org.apache.geronimo.samples.daytrader.direct.TradeJDBCDirect;
-import org.apache.geronimo.samples.daytrader.direct.TradeJEEDirect;
-import org.apache.geronimo.samples.daytrader.direct.TradeJPADirect;
+import org.apache.geronimo.samples.daytrader.beans.AccountDataBean;
+import org.apache.geronimo.samples.daytrader.beans.AccountProfileDataBean;
+import org.apache.geronimo.samples.daytrader.beans.HoldingDataBean;
+import org.apache.geronimo.samples.daytrader.beans.OrderDataBean;
+import org.apache.geronimo.samples.daytrader.beans.QuoteDataBean;
+import org.apache.geronimo.samples.daytrader.core.direct.TradeJDBCDirect;
+import org.apache.geronimo.samples.daytrader.core.direct.TradeJEEDirect;
+import org.apache.geronimo.samples.daytrader.core.direct.TradeJPADirect;
+import org.apache.geronimo.samples.daytrader.core.MarketSummaryDataBean;
+import org.apache.geronimo.samples.daytrader.core.RunStatsDataBean;
//import org.apache.geronimo.samples.daytrader.ejb3.TradeSLSBRemote;
//import org.apache.geronimo.samples.daytrader.ejb3.DirectSLSBRemote;
import org.apache.geronimo.samples.daytrader.util.Log;
Copied: geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeDBServices.java (from r810906, geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/TradeDBServices.java)
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeDBServices.java?p2=geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeDBServices.java&p1=geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/TradeDBServices.java&r1=810906&r2=812965&rev=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/TradeDBServices.java (original)
+++ geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeDBServices.java Wed Sep 9 13:57:23 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.samples.daytrader;
+package org.apache.geronimo.samples.daytrader.core;
/**
Copied: geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeServices.java (from r810906, geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/TradeServices.java)
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeServices.java?p2=geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeServices.java&p1=geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/TradeServices.java&r1=810906&r2=812965&rev=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/TradeServices.java (original)
+++ geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeServices.java Wed Sep 9 13:57:23 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.samples.daytrader;
+package org.apache.geronimo.samples.daytrader.core;
import java.math.BigDecimal;
@@ -22,6 +22,13 @@
import java.rmi.RemoteException;
import java.util.Collection;
+import org.apache.geronimo.samples.daytrader.beans.AccountDataBean;
+import org.apache.geronimo.samples.daytrader.beans.AccountProfileDataBean;
+import org.apache.geronimo.samples.daytrader.beans.HoldingDataBean;
+import org.apache.geronimo.samples.daytrader.beans.OrderDataBean;
+import org.apache.geronimo.samples.daytrader.beans.QuoteDataBean;
+import org.apache.geronimo.samples.daytrader.core.RunStatsDataBean;
+
/**
* TradeServices interface specifies the business methods provided by the Trade online broker application.
* These business methods represent the features and operations that can be performed by customers of
Copied: geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeWSAction.java (from r810906, geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/TradeWSAction.java)
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeWSAction.java?p2=geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeWSAction.java&p1=geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/TradeWSAction.java&r1=810906&r2=812965&rev=812965&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/TradeWSAction.java (original)
+++ geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeWSAction.java Wed Sep 9 13:57:23 2009
@@ -14,11 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.samples.daytrader;
+package org.apache.geronimo.samples.daytrader.core;
import java.math.BigDecimal;
import java.rmi.RemoteException;
+import org.apache.geronimo.samples.daytrader.beans.AccountDataBean;
+import org.apache.geronimo.samples.daytrader.beans.AccountProfileDataBean;
+import org.apache.geronimo.samples.daytrader.beans.HoldingDataBean;
+import org.apache.geronimo.samples.daytrader.beans.OrderDataBean;
+import org.apache.geronimo.samples.daytrader.beans.QuoteDataBean;
+
/**
*
* This is a TradeAction wrapper to handle web service handling
@@ -32,7 +38,7 @@
}
public MarketSummaryDataBeanWS getMarketSummary() throws Exception, RemoteException {
- org.apache.geronimo.samples.daytrader.MarketSummaryDataBean marketSummary = trade.getMarketSummary();
+ org.apache.geronimo.samples.daytrader.core.MarketSummaryDataBean marketSummary = trade.getMarketSummary();
return MarketSummaryDataBeanWS.convertBean(marketSummary);
}
Re: svn commit: r812965 [1/3] - in /geronimo/daytrader/trunk
Posted by Joe Bohn <jo...@earthlink.net>.
The bean/entity package names is still an open issue. What I just
checked in continues uses a common package name for both ... I just
changed the package name from "org.apache.geronimo.samples.daytrader" to
"org.apache.geronimo.samples.daytrader.beans". By doing this we avoid
the package name conflict with other jars such as core.
So, there is still a conflict between the daytrader-beans and
daytrader-entities jars. As you pointed out we avoid the conflict in the
web-jdbc assembly by only including the daytrader-beans.jar.
When just working with jars this isn't an issue (and effectively changes
nothing for the javaee assemblies). However we need to resolve this if
we want to compose an assembly via bundles. What I checked in is still
incomplete but begins to make progress on this for the web-jdbc assembly.
Joe
Donald Woods wrote:
> Is there some bundle packaging problem that still required package name
> unique bean vs. entities? Thought you were going to combine the
> daytrader/beans files back into daytrader/entities and just pickup the
> daytrader-beans.jar?
>
>
> -Donald
>
>
> jbohn@apache.org wrote:
>> Author: jbohn
>> Date: Wed Sep 9 13:57:23 2009
>> New Revision: 812965
>>
>> URL: http://svn.apache.org/viewvc?rev=812965&view=rev
>> Log:
>> Qualify package names for modules, reflect package name updates in
>> source structure, and bundlize the jars needed for the web jdbc assembly
>>
>
Re: svn commit: r812965 [1/3] - in /geronimo/daytrader/trunk
Posted by Donald Woods <dw...@apache.org>.
Is there some bundle packaging problem that still required package name
unique bean vs. entities? Thought you were going to combine the
daytrader/beans files back into daytrader/entities and just pickup the
daytrader-beans.jar?
-Donald
jbohn@apache.org wrote:
> Author: jbohn
> Date: Wed Sep 9 13:57:23 2009
> New Revision: 812965
>
> URL: http://svn.apache.org/viewvc?rev=812965&view=rev
> Log:
> Qualify package names for modules, reflect package name updates in source structure, and bundlize the jars needed for the web jdbc assembly
>