You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2009/08/28 20:07:54 UTC
svn commit: r808973 [6/7] - in /geronimo/daytrader/trunk: ./ assemblies/
assemblies/daytrader-web-jdbc/ assemblies/daytrader-web-jdbc/src/
assemblies/daytrader-web-jdbc/src/main/
assemblies/daytrader-web-jdbc/src/main/java/ assemblies/daytrader-web-jdb...
Added: geronimo/daytrader/trunk/modules/ejb3/src/main/resources/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb3/src/main/resources/META-INF/ejb-jar.xml?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb3/src/main/resources/META-INF/ejb-jar.xml (added)
+++ geronimo/daytrader/trunk/modules/ejb3/src/main/resources/META-INF/ejb-jar.xml Fri Aug 28 18:07:49 2009
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<ejb-jar version="3.0"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd">
+ <display-name>DayTrader Enterprise Bean Definitions</display-name>
+
+ <!--
+ All EJB 3.0 properties and attributes have been applied to the various DayTrader
+ entity, session and message driven beans using annotations. The inline annotations
+ can be overriden by modifing this file.
+ -->
+</ejb-jar>
Propchange: geronimo/daytrader/trunk/modules/ejb3/src/main/resources/META-INF/ejb-jar.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/daytrader/trunk/modules/ejb3/src/main/resources/META-INF/jboss.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb3/src/main/resources/META-INF/jboss.xml?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb3/src/main/resources/META-INF/jboss.xml (added)
+++ geronimo/daytrader/trunk/modules/ejb3/src/main/resources/META-INF/jboss.xml Fri Aug 28 18:07:49 2009
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<jboss>
+ <enterprise-beans>
+ <session>
+ <ejb-name>TradeSLSBBean</ejb-name>
+ <jndi-name>ejb/Trade</jndi-name>
+
+ <resource-ref>
+ <res-ref-name>jms/QueueConnectionFactory</res-ref-name>
+ <jndi-name>ConnectionFactory</jndi-name>
+ </resource-ref>
+
+ <resource-ref>
+ <res-ref-name>jms/TopicConnectionFactory</res-ref-name>
+ <jndi-name>ConnectionFactory</jndi-name>
+ </resource-ref>
+
+ <resource-ref>
+ <res-ref-name>jdbc/TradeDataSource</res-ref-name>
+ <!-- If using DB2, comment out this line -->
+ <!--<jndi-name>jdbc/TradeDataSource</jndi-name>-->
+ <!-- If using MySql or Oracle, use this line -->
+ <jndi-name>java:jdbc/TradeDataSource</jndi-name>
+ </resource-ref>
+
+ <message-destination-ref>
+ <message-destination-ref-name>jms/TradeBrokerQueue</message-destination-ref-name>
+ <jndi-name>TradeBrokerQueue</jndi-name>
+ </message-destination-ref>
+ <message-destination-ref>
+ <message-destination-ref-name>jms/TradeStreamerTopic</message-destination-ref-name>
+ <jndi-name>TradeStreamerTopic</jndi-name>
+ </message-destination-ref>
+
+ </session>
+
+ <message-driven>
+ <ejb-name>DTStreamer3MDB</ejb-name>
+ <destination-jndi-name>TradeStreamerTopic</destination-jndi-name>
+ </message-driven>
+
+ <message-driven>
+ <ejb-name>DTBroker3MDB</ejb-name>
+ <destination-jndi-name>TradeBrokerQueue</destination-jndi-name>
+ <ejb-ref>
+ <ejb-ref-name>ejb/Trade</ejb-ref-name>
+ <jndi-name>ejb/Trade</jndi-name>
+ </ejb-ref>
+ </message-driven>
+
+ </enterprise-beans>
+
+ <resource-managers>
+ <resource-manager>
+ <res-name>jms/QueueConnectionFactory</res-name>
+ <res-jndi-name>ConnectionFactory</res-jndi-name>
+ </resource-manager>
+
+ <resource-manager>
+ <res-name>jms/TopicConnectionFactory</res-name>
+ <res-jndi-name>ConnectionFactory</res-jndi-name>
+ </resource-manager>
+
+ <resource-manager>
+ <res-name>jms/TradeStreamerTopic</res-name>
+ <res-jndi-name>TradeStreamerTopic</res-jndi-name>
+ </resource-manager>
+
+ <resource-manager>
+ <res-name>jms/TradeBrokerQueue</res-name>
+ <res-jndi-name>TradeBrokerQueue</res-jndi-name>
+ </resource-manager>
+
+ <resource-manager>
+ <res-name>jdbc/TradeDataSource</res-name>
+ <!-- If using DB2, comment out this line -->
+ <!--<res-jndi-name>jdbc/TradeDataSource</res-jndi-name>-->
+ <!-- If using MySql or Oracle, use this line -->
+ <res-jndi-name>java:jdbc/TradeDataSource</res-jndi-name>
+ </resource-manager>
+ </resource-managers>
+</jboss>
Propchange: geronimo/daytrader/trunk/modules/ejb3/src/main/resources/META-INF/jboss.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/daytrader/trunk/modules/ejb3/src/main/resources/META-INF/jboss.xml.old
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb3/src/main/resources/META-INF/jboss.xml.old?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb3/src/main/resources/META-INF/jboss.xml.old (added)
+++ geronimo/daytrader/trunk/modules/ejb3/src/main/resources/META-INF/jboss.xml.old Fri Aug 28 18:07:49 2009
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<jboss>
+
+ <enterprise-beans>
+
+ <!--
+ To add beans that you have deployment descriptor info for, add
+ a file to your XDoclet merge directory called jboss-beans.xml that contains
+ the <session></session>, <entity></entity> and <message-driven></message-driven>
+ markup for those beans.
+ -->
+ <entity>
+ <ejb-name>QuoteEJB</ejb-name>
+ <jndi-name>Quote</jndi-name>
+ </entity>
+
+ <entity>
+ <ejb-name>AccountEJB</ejb-name>
+ <jndi-name>Account</jndi-name>
+ </entity>
+
+ <entity>
+ <ejb-name>HoldingEJB</ejb-name>
+ <jndi-name>Holding</jndi-name>
+ </entity>
+
+ <entity>
+ <ejb-name>OrderEJB</ejb-name>
+ <jndi-name>Order</jndi-name>
+ </entity>
+
+ <entity>
+ <ejb-name>AccountProfileEJB</ejb-name>
+ <jndi-name>AccountProfile</jndi-name>
+ </entity>
+
+ <entity>
+ <ejb-name>KeyGenEJB</ejb-name>
+ <jndi-name>KeyGen</jndi-name>
+ </entity>
+
+
+
+
+ <session>
+ <ejb-name>TradeEJB</ejb-name>
+ <jndi-name>ejb/Trade</jndi-name>
+
+ <ejb-ref>
+ <ejb-ref-name>ejb/Trade</ejb-ref-name>
+ <jndi-name>Trade</jndi-name>
+ </ejb-ref>
+
+ <ejb-local-ref>
+ <ejb-ref-name>ejb/Quote</ejb-ref-name>
+ <local-jndi-name>Quote</local-jndi-name>
+ </ejb-local-ref>
+
+ <ejb-local-ref>
+ <ejb-ref-name>ejb/Account</ejb-ref-name>
+ <local-jndi-name>Account</local-jndi-name>
+ </ejb-local-ref>
+
+
+ <ejb-local-ref>
+ <ejb-ref-name>ejb/Holding</ejb-ref-name>
+ <local-jndi-name>Holding</local-jndi-name>
+ </ejb-local-ref>
+
+ <ejb-local-ref>
+ <ejb-ref-name>ejb/Order</ejb-ref-name>
+ <local-jndi-name>Order</local-jndi-name>
+ </ejb-local-ref>
+ <ejb-local-ref>
+ <ejb-ref-name>ejb/KeySequence</ejb-ref-name>
+ <local-jndi-name>KeySequence</local-jndi-name>
+ </ejb-local-ref>
+ <ejb-local-ref>
+ <ejb-ref-name>ejb/AccountProfile</ejb-ref-name>
+ <local-jndi-name>AccountProfile</local-jndi-name>
+ </ejb-local-ref>
+
+
+ <resource-ref>
+ <res-ref-name>jms/QueueConnectionFactory</res-ref-name>
+ <jndi-name>ConnectionFactory</jndi-name>
+ </resource-ref>
+
+ <resource-ref>
+ <res-ref-name>jms/TopicConnectionFactory</res-ref-name>
+ <jndi-name>ConnectionFactory</jndi-name>
+ </resource-ref>
+
+ <resource-ref>
+ <res-ref-name>jdbc/TradeDataSource</res-ref-name>
+ <jndi-name>jdbc/TradeDataSource</jndi-name>
+ </resource-ref>
+
+
+ <message-destination-ref>
+ <message-destination-ref-name>jms/TradeBrokerQueue</message-destination-ref-name>
+ <jndi-name>TradeBrokerQueue</jndi-name>
+ </message-destination-ref>
+ <message-destination-ref>
+ <message-destination-ref-name>jms/TradeStreamerTopic</message-destination-ref-name>
+ <jndi-name>TradeStreamerTopic</jndi-name>
+ </message-destination-ref>
+
+ </session>
+
+
+ <session>
+ <ejb-name>KeySequenceEJB</ejb-name>
+ <jndi-name>KeySequence</jndi-name>
+
+ </session>
+
+ <message-driven>
+ <ejb-name>TradeStreamerMDB</ejb-name>
+ <destination-jndi-name>TradeStreamerTopic</destination-jndi-name>
+ </message-driven>
+
+ <message-driven>
+ <ejb-name>TradeBrokerMDB</ejb-name>
+ <destination-jndi-name>TradeBrokerQueue</destination-jndi-name>
+ <ejb-ref>
+ <ejb-ref-name>ejb/Trade</ejb-ref-name>
+ <jndi-name>Trade</jndi-name>
+ </ejb-ref>
+ </message-driven>
+
+
+
+ </enterprise-beans>
+
+ <resource-managers>
+ <resource-manager>
+ <res-name>jms/QueueConnectionFactory</res-name>
+ <res-jndi-name>ConnectionFactory</res-jndi-name>
+ </resource-manager>
+
+ <resource-manager>
+ <res-name>jms/TopicConnectionFactory</res-name>
+ <res-jndi-name>ConnectionFactory</res-jndi-name>
+ </resource-manager>
+
+ <resource-manager>
+ <res-name>jms/TradeStreamerTopic</res-name>
+ <res-jndi-name>TradeStreamerTopic</res-jndi-name>
+ </resource-manager>
+
+ <resource-manager>
+ <res-name>jms/TradeBrokerQueue</res-name>
+ <res-jndi-name>TradeBrokerQueue</res-jndi-name>
+ </resource-manager>
+
+ <resource-manager>
+ <res-name>jdbc/TradeDataSource</res-name>
+ <res-jndi-name>jdbc/TradeDataSource</res-jndi-name>
+ </resource-manager>
+
+ </resource-managers>
+
+ <!--
+ | for container settings, you can merge in jboss-container.xml
+ | this can contain <invoker-proxy-bindings/> and <container-configurations/>
+ -->
+
+</jboss>
Added: geronimo/daytrader/trunk/modules/ejb3/src/main/resources/META-INF/jbosscmp-jdbc.xml.old
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb3/src/main/resources/META-INF/jbosscmp-jdbc.xml.old?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb3/src/main/resources/META-INF/jbosscmp-jdbc.xml.old (added)
+++ geronimo/daytrader/trunk/modules/ejb3/src/main/resources/META-INF/jbosscmp-jdbc.xml.old Fri Aug 28 18:07:49 2009
@@ -0,0 +1,371 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jbosscmp-jdbc PUBLIC "-//JBoss//DTD JBOSSCMP-JDBC 3.0//EN" "http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_4_0.dtd">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<jbosscmp-jdbc>
+ <defaults>
+ <datasource>jdbc/TradeDataSource</datasource>
+ <datasource-mapping>${jboss.mapping}</datasource-mapping>
+ </defaults>
+
+ <enterprise-beans>
+ <entity>
+ <ejb-name>QuoteEJB</ejb-name>
+ <table-name>QuoteEJB</table-name>
+ <cmp-field>
+ <field-name>open</field-name>
+ <column-name>open1</column-name>
+ <jdbc-type>NUMERIC</jdbc-type>
+ <sql-type>NUMERIC(14,2)</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>change</field-name>
+ <column-name>change1</column-name>
+ <jdbc-type>DOUBLE</jdbc-type>
+ <sql-type>DOUBLE</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>low</field-name>
+ <jdbc-type>NUMERIC</jdbc-type>
+ <sql-type>NUMERIC(14,2)</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>price</field-name>
+ <jdbc-type>NUMERIC</jdbc-type>
+ <sql-type>NUMERIC(14,2)</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>high</field-name>
+ <jdbc-type>NUMERIC</jdbc-type>
+ <sql-type>NUMERIC(14,2)</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>volume</field-name>
+ <jdbc-type>DOUBLE</jdbc-type>
+ <sql-type>DOUBLE</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>companyName</field-name>
+ <jdbc-type>VARCHAR</jdbc-type>
+ <sql-type>VARCHAR(250)</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>symbol</field-name>
+ <jdbc-type>VARCHAR</jdbc-type>
+ <sql-type>VARCHAR(250)</sql-type>
+ </cmp-field>
+ </entity>
+ <entity>
+ <ejb-name>OrderEJB</ejb-name>
+ <cmp-field>
+ <field-name>price</field-name>
+ <jdbc-type>NUMERIC</jdbc-type>
+ <sql-type>NUMERIC(10,2)</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>orderFee</field-name>
+ <jdbc-type>NUMERIC</jdbc-type>
+ <sql-type>NUMERIC(14,2)</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>completionDate</field-name>
+ <jdbc-type>TIMESTAMP</jdbc-type>
+ <sql-type>TIMESTAMP</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>orderType</field-name>
+ <jdbc-type>VARCHAR</jdbc-type>
+ <sql-type>VARCHAR(250)</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>orderStatus</field-name>
+ <jdbc-type>VARCHAR</jdbc-type>
+ <sql-type>VARCHAR(250)</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>quantity</field-name>
+ <jdbc-type>DOUBLE</jdbc-type>
+ <sql-type>DOUBLE</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>openDate</field-name>
+ <jdbc-type>TIMESTAMP</jdbc-type>
+ <sql-type>TIMESTAMP</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>orderID</field-name>
+ <jdbc-type>INTEGER</jdbc-type>
+ <sql-type>INTEGER</sql-type>
+ </cmp-field>
+ <!-- cmp-field>
+ <field-name>account_accountid</field-name>
+ <jdbc-type>INTEGER</jdbc-type>
+ <sql-type>INTEGER(4)</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>quote_symbol</field-name>
+ <jdbc-type>VARCHAR</jdbc-type>
+ <sql-type>VARCHAR(250)</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>holding_holdingid</field-name>
+ <jdbc-type>INTEGER</jdbc-type>
+ <sql-type>INTEGER(4)</sql-type>
+ </cmp-field> -->
+ </entity>
+ <entity>
+ <ejb-name>AccountEJB</ejb-name>
+ <cmp-field>
+ <field-name>logoutCount</field-name>
+ <jdbc-type>INTEGER</jdbc-type>
+ <sql-type>INTEGER</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>loginCount</field-name>
+ <jdbc-type>INTEGER</jdbc-type>
+ <sql-type>INTEGER</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>accountID</field-name>
+ <jdbc-type>INTEGER</jdbc-type>
+ <sql-type>INTEGER</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>balance</field-name>
+ <jdbc-type>NUMERIC</jdbc-type>
+ <sql-type>NUMERIC</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>openBalance</field-name>
+ <jdbc-type>NUMERIC</jdbc-type>
+ <sql-type>NUMERIC</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>creationDate</field-name>
+ <jdbc-type>TIMESTAMP</jdbc-type>
+ <sql-type>TIMESTAMP</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>lastLogin</field-name>
+ <jdbc-type>TIMESTAMP</jdbc-type>
+ <sql-type>TIMESTAMP</sql-type>
+ </cmp-field>
+ <!-- cmp-field>
+ <field-name>profile_userid</field-name>
+ <jdbc-type>VARCHAR</jdbc-type>
+ <sql-type>VARCHAR(250)</sql-type>
+ </cmp-field> -->
+ </entity>
+ <entity>
+ <ejb-name>AccountProfileEJB</ejb-name>
+ <cmp-field>
+ <field-name>address</field-name>
+ <jdbc-type>VARCHAR</jdbc-type>
+ <sql-type>VARCHAR(250)</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>passwd</field-name>
+ <jdbc-type>VARCHAR</jdbc-type>
+ <sql-type>VARCHAR(250)</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>userID</field-name>
+ <jdbc-type>VARCHAR</jdbc-type>
+ <sql-type>VARCHAR(250)</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>email</field-name>
+ <jdbc-type>VARCHAR</jdbc-type>
+ <sql-type>VARCHAR(250)</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>creditCard</field-name>
+ <jdbc-type>VARCHAR</jdbc-type>
+ <sql-type>VARCHAR(250)</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>fullName</field-name>
+ <jdbc-type>VARCHAR</jdbc-type>
+ <sql-type>VARCHAR(250)</sql-type>
+ </cmp-field>
+ </entity>
+ <entity>
+ <ejb-name>HoldingEJB</ejb-name>
+ <cmp-field>
+ <field-name>purchasePrice</field-name>
+ <jdbc-type>NUMERIC</jdbc-type>
+ <sql-type>NUMERIC(14,2)</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>holdingID</field-name>
+ <jdbc-type>INTEGER</jdbc-type>
+ <sql-type>INTEGER</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>quantity</field-name>
+ <jdbc-type>DOUBLE</jdbc-type>
+ <sql-type>DOUBLE</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>purchaseDate</field-name>
+ <jdbc-type>TIMESTAMP</jdbc-type>
+ <sql-type>TIMESTAMP</sql-type>
+ </cmp-field>
+ <!-- Xcmp-field>
+ <field-name>account_accountID</field-name>
+ <jdbc-type>INTEGER</jdbc-type>
+ <sql-type>INTEGER</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>quote-symbol</field-name>
+ <jdbc-type>VARCHAR</jdbc-type>
+ <sql-type>VARCHAR(250)</sql-type>
+ </cmp-field> -->
+ </entity>
+ <entity>
+ <ejb-name>KeyGenEJB</ejb-name>
+ <!-- cmp-field>
+ <field-name>keyval</field-name>
+ <jdbc-type>INTEGER</jdbc-type>
+ <sql-type>INTEGER</sql-type>
+ </cmp-field>
+ <cmp-field>
+ <field-name>keyname</field-name>
+ <jdbc-type>VARCHAR</jdbc-type>
+ <sql-type>VARCHAR(250)</sql-type>
+ </cmp-field> -->
+ </entity>
+
+
+ </enterprise-beans>
+ <relationships>
+ <ejb-relation>
+ <ejb-relation-name>Account-Orders</ejb-relation-name>
+ <foreign-key-mapping/>
+ <ejb-relationship-role>
+ <ejb-relationship-role-name>AccountEJB</ejb-relationship-role-name>
+ <key-fields>
+ <key-field>
+ <field-name>accountID</field-name>
+ <column-name>ACCOUNT_ACCOUNTID</column-name>
+ </key-field>
+ </key-fields>
+ </ejb-relationship-role>
+ <ejb-relationship-role>
+ <ejb-relationship-role-name>Order-Has-Account</ejb-relationship-role-name>
+ <key-fields></key-fields>
+ </ejb-relationship-role>
+ </ejb-relation>
+
+ <ejb-relation>
+ <ejb-relation-name>Account-AccountProfile</ejb-relation-name>
+ <foreign-key-mapping/>
+ <ejb-relationship-role>
+ <ejb-relationship-role-name>Account-Has-AccountProfile</ejb-relationship-role-name>
+ <key-fields></key-fields>
+ </ejb-relationship-role>
+ <ejb-relationship-role>
+ <ejb-relationship-role-name>AccountProfileEJB</ejb-relationship-role-name>
+ <key-fields>
+ <key-field>
+ <field-name>userID</field-name>
+ <column-name>PROFILE_USERID</column-name>
+ </key-field>
+ </key-fields>
+ </ejb-relationship-role>
+ </ejb-relation>
+
+ <ejb-relation>
+ <ejb-relation-name>Account-Holdings</ejb-relation-name>
+ <foreign-key-mapping/>
+ <ejb-relationship-role>
+ <ejb-relationship-role-name>AccountEJB</ejb-relationship-role-name>
+ <key-fields>
+ <key-field>
+ <field-name>accountID</field-name>
+ <column-name>ACCOUNT_ACCOUNTID</column-name>
+ </key-field>
+ </key-fields>
+ </ejb-relationship-role>
+ <ejb-relationship-role>
+ <ejb-relationship-role-name>Holding-Has-Account</ejb-relationship-role-name>
+ <key-fields></key-fields>
+ </ejb-relationship-role>
+
+ </ejb-relation>
+
+ <ejb-relation>
+ <ejb-relation-name>Quote-Holdings</ejb-relation-name>
+ <foreign-key-mapping/>
+ <ejb-relationship-role>
+ <ejb-relationship-role-name>Holding-Has-Quote</ejb-relationship-role-name>
+ <key-fields></key-fields>
+ </ejb-relationship-role>
+ <ejb-relationship-role>
+ <ejb-relationship-role-name>QuoteEJB</ejb-relationship-role-name>
+ <key-fields>
+ <key-field>
+ <field-name>symbol</field-name>
+ <column-name>QUOTE_SYMBOL</column-name>
+ </key-field>
+ </key-fields>
+ </ejb-relationship-role>
+ </ejb-relation>
+
+ <ejb-relation>
+ <ejb-relation-name>Quote-Orders</ejb-relation-name>
+ <foreign-key-mapping/>
+ <ejb-relationship-role>
+ <ejb-relationship-role-name>Order-Has-Quote</ejb-relationship-role-name>
+ <key-fields></key-fields>
+ </ejb-relationship-role>
+ <ejb-relationship-role>
+ <ejb-relationship-role-name>QuoteEJB</ejb-relationship-role-name>
+ <key-fields>
+ <key-field>
+ <field-name>symbol</field-name>
+ <column-name>QUOTE_SYMBOL</column-name>
+ </key-field>
+ </key-fields>
+ </ejb-relationship-role>
+ </ejb-relation>
+
+ <ejb-relation>
+ <ejb-relation-name>Order-Holding</ejb-relation-name>
+ <foreign-key-mapping/>
+ <ejb-relationship-role>
+ <ejb-relationship-role-name>Order-Has-Holding</ejb-relationship-role-name>
+ <key-fields/>
+ <!-- key-field><field-name>orderID</field-name><column-name>ORDERID2</column-name></key-field></key-fields>
+ -->
+ </ejb-relationship-role>
+ <ejb-relationship-role>
+ <ejb-relationship-role-name>HoldingEJB</ejb-relationship-role-name>
+ <key-fields>
+ <key-field>
+ <field-name>holdingID</field-name>
+ <column-name>HOLDING_HOLDINGID</column-name>
+ </key-field>
+ </key-fields>
+ </ejb-relationship-role>
+ </ejb-relation>
+
+
+ </relationships>
+
+</jbosscmp-jdbc>
Modified: geronimo/daytrader/trunk/modules/json-proxy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/json-proxy/pom.xml?rev=808973&r1=808972&r2=808973&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/json-proxy/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/json-proxy/pom.xml Fri Aug 28 18:07:49 2009
@@ -16,25 +16,26 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader</artifactId>
+ <artifactId>modules</artifactId>
<version>2.2-SNAPSHOT</version>
</parent>
+
+ <groupId>org.apache.geronimo.daytrader</groupId>
<artifactId>json-proxy</artifactId>
- <name>DayTrader :: JSON Proxy</name>
<packaging>war</packaging>
- <description>DayTrader JSON Proxy</description>
+ <name>DayTrader :: Modules - JSON Proxy</name>
+ <description>DayTrader JSON Proxy Module</description>
+
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/web</connection>
- <developerConnection>
- scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/web</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/web</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/json-proxy</connection>
+ <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/json-proxy</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/json-proxy</url>
</scm>
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -57,6 +58,7 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
Added: geronimo/daytrader/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/pom.xml?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/modules/pom.xml (added)
+++ geronimo/daytrader/trunk/modules/pom.xml Fri Aug 28 18:07:49 2009
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader-parent</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>modules</artifactId>
+ <name>DayTrader :: Modules</name>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>core</module>
+ <module>ejb3</module>
+ <module>wsappclient</module>
+ <module>soap</module>
+ <module>web</module>
+ <module>streamer</module>
+ <module>json-proxy</module>
+ </modules>
+
+</project>
Propchange: geronimo/daytrader/trunk/modules/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/daytrader/trunk/modules/soap/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/soap/pom.xml?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/modules/soap/pom.xml (added)
+++ geronimo/daytrader/trunk/modules/soap/pom.xml Fri Aug 28 18:07:49 2009
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>modules</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.geronimo.daytrader.modules</groupId>
+ <artifactId>soap</artifactId>
+ <name>DayTrader :: Modules - SOAP</name>
+ <packaging>jar</packaging>
+ <description>Daytrader SOAP Module</description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/soap</connection>
+ <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/soap</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/soap</url>
+ </scm>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.daytrader.modules</groupId>
+ <artifactId>core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.daytrader.modules</groupId>
+ <artifactId>wsappclient</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+<!--
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+-->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <plugins>
+<!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ejb-plugin</artifactId>
+ <configuration>
+ <generateClient>true</generateClient>
+ <archive>
+ <manifestEntries>
+ <Class-Path>wsappclient.jar</Class-Path>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+-->
+ </plugins>
+ </build>
+</project>
Propchange: geronimo/daytrader/trunk/modules/soap/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/daytrader/trunk/modules/soap/src/main/java/org/apache/geronimo/samples/daytrader/soap/Convert.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/soap/src/main/java/org/apache/geronimo/samples/daytrader/soap/Convert.java?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/modules/soap/src/main/java/org/apache/geronimo/samples/daytrader/soap/Convert.java (added)
+++ geronimo/daytrader/trunk/modules/soap/src/main/java/org/apache/geronimo/samples/daytrader/soap/Convert.java Fri Aug 28 18:07:49 2009
@@ -0,0 +1,168 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.samples.daytrader.soap;
+
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Date;
+
+import org.apache.geronimo.samples.daytrader.client.ws.AccountDataBean;
+import org.apache.geronimo.samples.daytrader.client.ws.AccountProfileDataBean;
+import org.apache.geronimo.samples.daytrader.client.ws.HoldingDataBean;
+import org.apache.geronimo.samples.daytrader.client.ws.MarketSummaryDataBeanWS;
+import org.apache.geronimo.samples.daytrader.client.ws.OrderDataBean;
+import org.apache.geronimo.samples.daytrader.client.ws.QuoteDataBean;
+import org.apache.geronimo.samples.daytrader.client.ws.RunStatsDataBean;
+
+public class Convert {
+
+ static OrderDataBean[] convertOrderDataBeanCollection(Collection col) {
+ OrderDataBean[] wsBeans = new OrderDataBean[col.size()];
+ int i = 0;
+ for (Object o : col) {
+ wsBeans[i++] = convertOrderDataBean((org.apache.geronimo.samples.daytrader.OrderDataBean)o);
+ }
+ return wsBeans;
+ }
+
+ static OrderDataBean convertOrderDataBean(org.apache.geronimo.samples.daytrader.OrderDataBean bean) {
+ OrderDataBean wsBean = new OrderDataBean();
+ wsBean.setOrderID(bean.getOrderID());
+ wsBean.setOrderType(bean.getOrderType());
+ wsBean.setOrderStatus(bean.getOrderStatus());
+ wsBean.setOpenDate(toCalendar(bean.getOpenDate()));
+ wsBean.setCompletionDate(toCalendar(bean.getCompletionDate()));
+ wsBean.setQuantity(bean.getQuantity());
+ wsBean.setPrice(bean.getPrice());
+ wsBean.setOrderFee(bean.getOrderFee());
+ wsBean.setSymbol(bean.getSymbol());
+ return wsBean;
+ }
+
+ static QuoteDataBean[] convertQuoteDataBeanCollection(Collection col) {
+ QuoteDataBean[] wsBeans = new QuoteDataBean[col.size()];
+ int i = 0;
+ for (Object o : col) {
+ wsBeans[i++] = convertQuoteDataBean((org.apache.geronimo.samples.daytrader.QuoteDataBean)o);
+ }
+ return wsBeans;
+ }
+
+ static QuoteDataBean convertQuoteDataBean(org.apache.geronimo.samples.daytrader.QuoteDataBean bean) {
+ QuoteDataBean wsBean = new QuoteDataBean();
+ wsBean.setSymbol(bean.getSymbol());
+ wsBean.setCompanyName(bean.getCompanyName());
+ wsBean.setVolume(bean.getVolume());
+ wsBean.setPrice(bean.getPrice());
+ wsBean.setOpen(bean.getOpen());
+ wsBean.setLow(bean.getLow());
+ wsBean.setHigh(bean.getHigh());
+ wsBean.setChange(bean.getChange());
+ return wsBean;
+ }
+
+ static RunStatsDataBean convertRunStatsDataBean(org.apache.geronimo.samples.daytrader.RunStatsDataBean bean) {
+ RunStatsDataBean wsBean = new RunStatsDataBean();
+ wsBean.setTradeUserCount(bean.getTradeUserCount());
+ wsBean.setNewUserCount(bean.getNewUserCount());
+ wsBean.setSumLoginCount(bean.getSumLoginCount());
+ wsBean.setSumLogoutCount(bean.getSumLogoutCount());
+ wsBean.setHoldingCount(bean.getHoldingCount());
+ wsBean.setOrderCount(bean.getOrderCount());
+ wsBean.setBuyOrderCount(bean.getBuyOrderCount());
+ wsBean.setSellOrderCount(bean.getSellOrderCount());
+ wsBean.setCancelledOrderCount(bean.getCancelledOrderCount());
+ wsBean.setOpenOrderCount(bean.getOpenOrderCount());
+ wsBean.setDeletedOrderCount(bean.getDeletedOrderCount());
+ return wsBean;
+ }
+
+ static AccountDataBean convertAccountDataBean(org.apache.geronimo.samples.daytrader.AccountDataBean bean) {
+ AccountDataBean wsBean = new AccountDataBean();
+ wsBean.setAccountID(bean.getAccountID());
+ wsBean.setLoginCount(bean.getLoginCount());
+ wsBean.setLogoutCount(bean.getLogoutCount());
+ wsBean.setLastLogin(toCalendar(bean.getLastLogin()));
+ wsBean.setCreationDate(toCalendar(bean.getCreationDate()));
+ wsBean.setBalance(bean.getBalance());
+ wsBean.setOpenBalance(bean.getOpenBalance());
+ wsBean.setProfileID(bean.getProfileID());
+ return wsBean;
+ }
+
+ static AccountProfileDataBean convertAccountProfileDataBean(org.apache.geronimo.samples.daytrader.AccountProfileDataBean bean) {
+ AccountProfileDataBean wsBean = new AccountProfileDataBean();
+ wsBean.setUserID(bean.getUserID());
+ wsBean.setPassword(bean.getPassword());
+ wsBean.setFullName(bean.getFullName());
+ wsBean.setAddress(bean.getAddress());
+ wsBean.setEmail(bean.getEmail());
+ wsBean.setCreditCard(bean.getCreditCard());
+ return wsBean;
+ }
+
+ static org.apache.geronimo.samples.daytrader.AccountProfileDataBean convertAccountProfileDataBean(AccountProfileDataBean wsBean) {
+ org.apache.geronimo.samples.daytrader.AccountProfileDataBean bean = new org.apache.geronimo.samples.daytrader.AccountProfileDataBean();
+ bean.setUserID(wsBean.getUserID());
+ bean.setPassword(wsBean.getPassword());
+ bean.setFullName(wsBean.getFullName());
+ bean.setAddress(wsBean.getAddress());
+ bean.setEmail(wsBean.getEmail());
+ bean.setCreditCard(wsBean.getCreditCard());
+ return bean;
+ }
+
+ static HoldingDataBean[] convertHoldingDataBeanCollection(Collection col) {
+ HoldingDataBean[] wsBeans = new HoldingDataBean[col.size()];
+ int i = 0;
+ for (Object o : col) {
+ wsBeans[i++] = convertHoldingDataBean((org.apache.geronimo.samples.daytrader.HoldingDataBean)o);
+ }
+ return wsBeans;
+ }
+
+ static HoldingDataBean convertHoldingDataBean(org.apache.geronimo.samples.daytrader.HoldingDataBean bean) {
+ HoldingDataBean wsBean = new HoldingDataBean();
+ wsBean.setHoldingID(bean.getHoldingID());
+ wsBean.setQuantity(bean.getQuantity());
+ wsBean.setPurchasePrice(bean.getPurchasePrice());
+ wsBean.setPurchaseDate(toCalendar(bean.getPurchaseDate()));
+ wsBean.setQuoteID(bean.getQuoteID());
+ return wsBean;
+ }
+
+ static MarketSummaryDataBeanWS convertMarketSummaryDataBean(org.apache.geronimo.samples.daytrader.MarketSummaryDataBean bean) {
+ MarketSummaryDataBeanWS wsBean = new MarketSummaryDataBeanWS();
+ wsBean.setTopGainers(convertQuoteDataBeanCollection(bean.getTopGainers()));
+ wsBean.setTopLosers(convertQuoteDataBeanCollection(bean.getTopLosers()));
+ wsBean.setTSIA(bean.getTSIA());
+ wsBean.setOpenTSIA(bean.getOpenTSIA());
+ wsBean.setVolume(bean.getVolume());
+ wsBean.setSummaryDate(toCalendar(bean.getSummaryDate()));
+ return wsBean;
+ }
+
+ static Calendar toCalendar(Date date) {
+ if (date == null) {
+ return null;
+ }
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(date);
+ return cal;
+ }
+}
Propchange: geronimo/daytrader/trunk/modules/soap/src/main/java/org/apache/geronimo/samples/daytrader/soap/Convert.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/daytrader/trunk/modules/soap/src/main/java/org/apache/geronimo/samples/daytrader/soap/TradeWSAction.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/soap/src/main/java/org/apache/geronimo/samples/daytrader/soap/TradeWSAction.java?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/modules/soap/src/main/java/org/apache/geronimo/samples/daytrader/soap/TradeWSAction.java (added)
+++ geronimo/daytrader/trunk/modules/soap/src/main/java/org/apache/geronimo/samples/daytrader/soap/TradeWSAction.java Fri Aug 28 18:07:49 2009
@@ -0,0 +1,207 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.samples.daytrader.soap;
+
+import java.math.BigDecimal;
+import java.rmi.RemoteException;
+
+import org.apache.geronimo.samples.daytrader.TradeAction;
+import org.apache.geronimo.samples.daytrader.client.ws.AccountDataBean;
+import org.apache.geronimo.samples.daytrader.client.ws.AccountProfileDataBean;
+import org.apache.geronimo.samples.daytrader.client.ws.HoldingDataBean;
+import org.apache.geronimo.samples.daytrader.client.ws.MarketSummaryDataBeanWS;
+import org.apache.geronimo.samples.daytrader.client.ws.OrderDataBean;
+import org.apache.geronimo.samples.daytrader.client.ws.QuoteDataBean;
+import org.apache.geronimo.samples.daytrader.client.ws.RunStatsDataBean;
+import org.apache.geronimo.samples.daytrader.client.ws.TradeWSServices;
+
+/**
+ * This is a TradeAction wrapper to handle web service handling
+ * of collections. Instead this class uses typed arrays.
+ */
+public class TradeWSAction implements TradeWSServices {
+ TradeAction trade;
+
+ public TradeWSAction() {
+ trade = new TradeAction();
+ }
+
+ public MarketSummaryDataBeanWS getMarketSummary() throws RemoteException {
+ try {
+ return Convert.convertMarketSummaryDataBean(trade.getMarketSummary());
+ } catch (Exception e) {
+ throw new RemoteException("", e);
+ }
+ }
+
+ public OrderDataBean buy(String userID, String symbol, double quantity, int orderProcessingMode) throws RemoteException {
+ try {
+ return Convert.convertOrderDataBean(trade.buy(userID, symbol, quantity, orderProcessingMode));
+ } catch (Exception e) {
+ throw new RemoteException("", e);
+ }
+ }
+
+ public OrderDataBean sell(String userID, Integer holdingID, int orderProcessingMode) throws RemoteException {
+ try {
+ return Convert.convertOrderDataBean(trade.sell(userID, holdingID, orderProcessingMode));
+ } catch (Exception e) {
+ throw new RemoteException("", e);
+ }
+ }
+
+ public void queueOrder(Integer orderID, boolean twoPhase) throws RemoteException {
+ trade.queueOrder(orderID, twoPhase);
+ }
+
+ public OrderDataBean completeOrder(Integer orderID, boolean twoPhase) throws RemoteException {
+ return Convert.convertOrderDataBean(trade.completeOrder(orderID, twoPhase));
+ }
+
+ public void cancelOrder(Integer orderID, boolean twoPhase) throws RemoteException {
+ trade.cancelOrder(orderID, twoPhase);
+ }
+
+ public void orderCompleted(String userID, Integer orderID) throws RemoteException {
+ try {
+ trade.orderCompleted(userID, orderID);
+ } catch (Exception e) {
+ throw new RemoteException("", e);
+ }
+ }
+
+ public OrderDataBean[] getOrders(String userID) throws RemoteException {
+ try {
+ return Convert.convertOrderDataBeanCollection(trade.getOrders(userID));
+ } catch (Exception e) {
+ throw new RemoteException("", e);
+ }
+ }
+
+ public OrderDataBean[] getClosedOrders(String userID) throws RemoteException {
+ try {
+ return Convert.convertOrderDataBeanCollection(trade.getClosedOrders(userID));
+ } catch (Exception e) {
+ throw new RemoteException("", e);
+ }
+ }
+
+ public QuoteDataBean createQuote(String symbol, String companyName, BigDecimal price) throws RemoteException {
+ try {
+ return Convert.convertQuoteDataBean(trade.createQuote(symbol, companyName, price));
+ } catch (Exception e) {
+ throw new RemoteException("", e);
+ }
+ }
+
+ public QuoteDataBean getQuote(String symbol) throws RemoteException {
+ try {
+ return Convert.convertQuoteDataBean(trade.getQuote(symbol));
+ } catch (Exception e) {
+ throw new RemoteException("", e);
+ }
+ }
+
+ public QuoteDataBean[] getAllQuotes() throws RemoteException {
+ try {
+ return Convert.convertQuoteDataBeanCollection(trade.getAllQuotes());
+ } catch (Exception e) {
+ throw new RemoteException("", e);
+ }
+ }
+
+ public QuoteDataBean updateQuotePriceVolume(String symbol, BigDecimal newPrice, double sharesTraded) throws RemoteException {
+ try {
+ return Convert.convertQuoteDataBean(trade.updateQuotePriceVolume(symbol, newPrice, sharesTraded));
+ } catch (Exception e) {
+ throw new RemoteException("", e);
+ }
+ }
+
+ public HoldingDataBean[] getHoldings(String userID) throws RemoteException {
+ try {
+ return Convert.convertHoldingDataBeanCollection(trade.getHoldings(userID));
+ } catch (Exception e) {
+ throw new RemoteException("", e);
+ }
+ }
+
+ public HoldingDataBean getHolding(Integer holdingID) throws RemoteException {
+ try {
+ return Convert.convertHoldingDataBean(trade.getHolding(holdingID));
+ } catch (Exception e) {
+ throw new RemoteException("", e);
+ }
+ }
+
+ public AccountDataBean getAccountData(String userID) throws RemoteException {
+ try {
+ return Convert.convertAccountDataBean(trade.getAccountData(userID));
+ } catch (Exception e) {
+ throw new RemoteException("", e);
+ }
+ }
+
+ public AccountProfileDataBean getAccountProfileData(String userID) throws RemoteException {
+ try {
+ return Convert.convertAccountProfileDataBean(trade.getAccountProfileData(userID));
+ } catch (Exception e) {
+ throw new RemoteException("", e);
+ }
+ }
+
+ public AccountProfileDataBean updateAccountProfile(AccountProfileDataBean profileData) throws RemoteException {
+ try {
+ return Convert.convertAccountProfileDataBean(trade.updateAccountProfile(Convert.convertAccountProfileDataBean(profileData)));
+ } catch (Exception e) {
+ throw new RemoteException("", e);
+ }
+ }
+
+ public AccountDataBean login(String userID, String password) throws RemoteException {
+ try {
+ return Convert.convertAccountDataBean(trade.login(userID, password));
+ } catch (Exception e) {
+ throw new RemoteException("", e);
+ }
+ }
+
+ public void logout(String userID) throws RemoteException {
+ try {
+ trade.logout(userID);
+ } catch (Exception e) {
+ throw new RemoteException("", e);
+ }
+ }
+
+ public AccountDataBean register(String userID, String password, String fullname, String address, String email, String creditcard, BigDecimal openBalance) throws RemoteException {
+ try {
+ return Convert.convertAccountDataBean(trade.register(userID, password, fullname, address, email, creditcard, openBalance));
+ } catch (Exception e) {
+ throw new RemoteException("", e);
+ }
+ }
+
+ public RunStatsDataBean resetTrade(boolean deleteAll) throws RemoteException {
+ try {
+ return Convert.convertRunStatsDataBean(trade.resetTrade(deleteAll));
+ } catch (Exception e) {
+ throw new RemoteException("", e);
+ }
+ }
+
+}
Propchange: geronimo/daytrader/trunk/modules/soap/src/main/java/org/apache/geronimo/samples/daytrader/soap/TradeWSAction.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/daytrader/trunk/modules/soap/src/main/java/org/apache/geronimo/samples/daytrader/soap/TradeWebSoapProxy.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/soap/src/main/java/org/apache/geronimo/samples/daytrader/soap/TradeWebSoapProxy.java?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/modules/soap/src/main/java/org/apache/geronimo/samples/daytrader/soap/TradeWebSoapProxy.java (added)
+++ geronimo/daytrader/trunk/modules/soap/src/main/java/org/apache/geronimo/samples/daytrader/soap/TradeWebSoapProxy.java Fri Aug 28 18:07:49 2009
@@ -0,0 +1,374 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.samples.daytrader.soap;
+
+import org.apache.geronimo.samples.daytrader.*;
+
+import java.util.*;
+import java.net.*;
+import javax.xml.rpc.*;
+import javax.naming.*;
+import javax.xml.namespace.*;
+
+import java.rmi.RemoteException;
+import java.math.BigDecimal;
+import javax.ejb.FinderException;
+
+import org.apache.geronimo.samples.daytrader.util.*;
+
+public class TradeWebSoapProxy implements org.apache.geronimo.samples.daytrader.TradeServices {
+
+ private static String servicePort;
+ private static org.apache.geronimo.samples.daytrader.client.ws.TradeWSServices trade;
+ private static final String jndiName = "java:comp/env/service/Trade";
+
+ public TradeWebSoapProxy() {
+ if (trade == null) {
+ trade = getTrade();
+ }
+ }
+
+ public static org.apache.geronimo.samples.daytrader.client.ws.TradeWSServices getTrade() {
+ try {
+ trade = getPortFromFactory();
+ ((Stub)trade)._setProperty("javax.xml.rpc.service.endpoint.address", TradeConfig.getSoapURL());
+ }
+ catch (Exception e) {
+ System.out.println("problem getting trade port " + e);
+ e.printStackTrace();
+ }
+ return trade;
+ }
+
+ private static org.apache.geronimo.samples.daytrader.client.ws.TradeWSServices getPortFromFactory() throws ServiceException, MalformedURLException {
+ if (Log.doTrace()) {
+ Log.traceEnter("TradeWebSoapProxt.getPortFromFactory()");
+ }
+ // JSR 109 lookup
+ try {
+ InitialContext context = new InitialContext();
+ if (Log.doTrace()) {
+ Log.trace("attempting JSR109 lookup with jndi of " + jndiName);
+ }
+ org.apache.geronimo.samples.daytrader.client.ws.Trade tradeService1 = (org.apache.geronimo.samples.daytrader.client.ws.Trade)context.lookup(jndiName);
+ return tradeService1.getTradeWSServices();
+ }
+ catch (Exception e) {
+ Log.error(e, "JSR 109 lookup failed .. defaulting to JSR 101");
+ }
+
+ // JSR 101 lookup
+ if (Log.doTrace()) {
+ Log.trace("attempting JSR101 lookup with url of " + TradeConfig.getSoapURL());
+ }
+ URL wsdlLoc = new URL(TradeConfig.getSoapURL());
+ QName serviceName = new QName("http://daytrader.samples.geronimo.apache.org", "Trade");
+ Service tService = ServiceFactory.newInstance().createService(wsdlLoc, serviceName);
+ QName portName = new QName("http://daytrader.samples.geronimo.apache.org", "TradeWSServices");
+ return (org.apache.geronimo.samples.daytrader.client.ws.TradeWSServices)tService.getPort(portName, org.apache.geronimo.samples.daytrader.client.ws.TradeWSServices.class);
+ }
+
+ public static void updateServicePort() {
+ // reconstruct Trade as service port has changed
+ trade = getTrade();
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.samples.daytrader.TradeServices#buy(java.lang.String, java.lang.String, double, int)
+ */
+ public org.apache.geronimo.samples.daytrader.OrderDataBean buy(String userID, String symbol, double quantity, int orderProcessingMode) throws Exception, RemoteException {
+ return convertOrderDataBean(getTrade().buy(userID, symbol, quantity, orderProcessingMode));
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.samples.daytrader.TradeServices#cancelOrder(java.lang.Integer, boolean)
+ */
+ public void cancelOrder(Integer orderID, boolean twoPhase) throws Exception, RemoteException {
+ getTrade().cancelOrder(orderID, twoPhase);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.samples.daytrader.TradeServices#completeOrder(java.lang.Integer, boolean)
+ */
+ public OrderDataBean completeOrder(Integer orderID, boolean twoPhase) throws Exception, RemoteException {
+ return convertOrderDataBean(getTrade().completeOrder(orderID, twoPhase));
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.samples.daytrader.TradeServices#createQuote(java.lang.String, java.lang.String, java.math.BigDecimal)
+ */
+ public QuoteDataBean createQuote(String symbol, String companyName, BigDecimal price) throws Exception, RemoteException {
+ return convertQuoteDataBean(getTrade().createQuote(symbol, companyName, price));
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.samples.daytrader.TradeServices#getAccountData(java.lang.String)
+ */
+ public AccountDataBean getAccountData(String userID) throws FinderException, RemoteException {
+ return convertAccountDataBean(getTrade().getAccountData(userID));
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.samples.daytrader.TradeServices#getAccountProfileData(java.lang.String)
+ */
+ public AccountProfileDataBean getAccountProfileData(String userID) throws Exception, RemoteException {
+ return convertAccountProfileDataBean(getTrade().getAccountProfileData(userID));
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.samples.daytrader.TradeServices#getAllQuotes()
+ */
+ public Collection getAllQuotes() throws Exception, RemoteException {
+ return convertQuoteDataBeanWSArrayToCollectionBase(getTrade().getAllQuotes());
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.samples.daytrader.TradeServices#getClosedOrders(java.lang.String)
+ */
+ public Collection getClosedOrders(String userID) throws Exception, RemoteException {
+ Object[] orders = getTrade().getClosedOrders(userID);
+ ArrayList ordersRet = new ArrayList();
+ if (orders == null || orders.length == 0) {
+ return ordersRet;
+ }
+ for (int ii = 0; ii < orders.length; ii++) {
+ ordersRet.add(convertOrderDataBean((org.apache.geronimo.samples.daytrader.client.ws.OrderDataBean)orders[ii]));
+ }
+ return ordersRet;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.samples.daytrader.TradeServices#getHolding(java.lang.Integer)
+ */
+ public HoldingDataBean getHolding(Integer holdingID) throws Exception, RemoteException {
+ return convertHoldingDataBean(getTrade().getHolding(holdingID));
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.samples.daytrader.TradeServices#getHoldings(java.lang.String)
+ */
+ public Collection getHoldings(String userID) throws Exception, RemoteException {
+ Object[] holdings = getTrade().getHoldings(userID);
+ ArrayList holdingsRet = new ArrayList();
+ if (holdings == null || holdings.length == 0) {
+ return holdingsRet;
+ }
+
+ for (int ii = 0; ii < holdings.length; ii++) {
+ holdingsRet.add(convertHoldingDataBean((org.apache.geronimo.samples.daytrader.client.ws.HoldingDataBean)holdings[ii]));
+ }
+ return holdingsRet;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.samples.daytrader.TradeServices#getMarketSummary()
+ */
+ public MarketSummaryDataBean getMarketSummary() throws Exception, RemoteException {
+ return convertMarketSummaryDataBean(getTrade().getMarketSummary());
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.samples.daytrader.TradeServices#getOrders(java.lang.String)
+ */
+ public Collection getOrders(String userID) throws Exception, RemoteException {
+ Object[] orders = getTrade().getOrders(userID);
+ ArrayList ordersRet = new ArrayList();
+ if (orders == null || orders.length == 0) {
+ return ordersRet;
+ }
+ for (int ii = 0; ii < orders.length; ii++) {
+ ordersRet.add(convertOrderDataBean((org.apache.geronimo.samples.daytrader.client.ws.OrderDataBean)orders[ii]));
+ }
+ return ordersRet;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.samples.daytrader.TradeServices#getQuote(java.lang.String)
+ */
+ public QuoteDataBean getQuote(String symbol) throws Exception, RemoteException {
+ return convertQuoteDataBean(getTrade().getQuote(symbol));
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.samples.daytrader.TradeServices#login(java.lang.String, java.lang.String)
+ */
+ public AccountDataBean login(String userID, String password) throws Exception, RemoteException {
+ return convertAccountDataBean(getTrade().login(userID, password));
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.samples.daytrader.TradeServices#logout(java.lang.String)
+ */
+ public void logout(String userID) throws Exception, RemoteException {
+ getTrade().logout(userID);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.samples.daytrader.TradeServices#orderCompleted(java.lang.String, java.lang.Integer)
+ */
+ public void orderCompleted(String userID, Integer orderID) throws Exception, RemoteException {
+ getTrade().orderCompleted(userID, orderID);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.samples.daytrader.TradeServices#queueOrder(java.lang.Integer, boolean)
+ */
+ public void queueOrder(Integer orderID, boolean twoPhase) throws Exception, RemoteException {
+ getTrade().queueOrder(orderID, twoPhase);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.samples.daytrader.TradeServices#register(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.math.BigDecimal)
+ */
+ public AccountDataBean register(String userID, String password, String fullname, String address, String email, String creditcard, BigDecimal openBalance) throws Exception, RemoteException {
+ return convertAccountDataBean(getTrade().register(userID, password, fullname, address, email, creditcard, openBalance));
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.samples.daytrader.TradeServices#resetTrade(boolean)
+ */
+ public RunStatsDataBean resetTrade(boolean deleteAll) throws Exception, RemoteException {
+ return convertRunStatsDataBean(getTrade().resetTrade(deleteAll));
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.samples.daytrader.TradeServices#sell(java.lang.String, java.lang.Integer, int)
+ */
+ public OrderDataBean sell(String userID, Integer holdingID, int orderProcessingMode) throws Exception, RemoteException {
+ return convertOrderDataBean(getTrade().sell(userID, holdingID, orderProcessingMode));
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.samples.daytrader.TradeServices#updateAccountProfile(org.apache.geronimo.samples.daytrader.AccountProfileDataBean)
+ */
+ public AccountProfileDataBean updateAccountProfile(AccountProfileDataBean profileData) throws Exception, RemoteException {
+ return convertAccountProfileDataBean(getTrade().updateAccountProfile(convertAccountProfileDataBeanToWS(profileData)));
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.samples.daytrader.TradeServices#updateQuotePriceVolume(java.lang.String, java.math.BigDecimal, double)
+ */
+ public QuoteDataBean updateQuotePriceVolume(String symbol, BigDecimal newPrice, double sharesTraded) throws Exception, RemoteException {
+ return convertQuoteDataBean(getTrade().updateQuotePriceVolume(symbol, newPrice, sharesTraded));
+ }
+
+ private org.apache.geronimo.samples.daytrader.OrderDataBean convertOrderDataBean(org.apache.geronimo.samples.daytrader.client.ws.OrderDataBean bean) {
+ return new org.apache.geronimo.samples.daytrader.OrderDataBean(
+ bean.getOrderID(),
+ bean.getOrderType(),
+ bean.getOrderStatus(),
+ bean.getOpenDate() != null ? bean.getOpenDate().getTime() : null,
+ bean.getCompletionDate() != null ? bean.getCompletionDate().getTime() : null,
+ bean.getQuantity(),
+ bean.getPrice(),
+ bean.getOrderFee(),
+ bean.getSymbol());
+ }
+
+ private org.apache.geronimo.samples.daytrader.QuoteDataBean convertQuoteDataBean(org.apache.geronimo.samples.daytrader.client.ws.QuoteDataBean bean) {
+ return new org.apache.geronimo.samples.daytrader.QuoteDataBean(
+ bean.getSymbol(),
+ bean.getCompanyName(),
+ bean.getVolume(),
+ bean.getPrice(),
+ bean.getOpen(),
+ bean.getLow(),
+ bean.getHigh(),
+ bean.getChange());
+ }
+
+ private Collection convertQuoteDataBeanWSArrayToCollectionBase(Object[] quotes) {
+ ArrayList quotesRet = new ArrayList();
+ if (quotes == null || quotes.length == 0) {
+ return quotesRet;
+ }
+ for (int ii = 0; ii < quotes.length; ii++) {
+ quotesRet.add(convertQuoteDataBean((org.apache.geronimo.samples.daytrader.client.ws.QuoteDataBean)quotes[ii]));
+ }
+ return quotesRet;
+ }
+
+ private org.apache.geronimo.samples.daytrader.HoldingDataBean convertHoldingDataBean(org.apache.geronimo.samples.daytrader.client.ws.HoldingDataBean bean) {
+ return new org.apache.geronimo.samples.daytrader.HoldingDataBean(
+ bean.getHoldingID(),
+ bean.getQuantity(),
+ bean.getPurchasePrice(),
+ bean.getPurchaseDate().getTime(),
+ bean.getQuoteID());
+ }
+
+ private org.apache.geronimo.samples.daytrader.AccountDataBean convertAccountDataBean(org.apache.geronimo.samples.daytrader.client.ws.AccountDataBean bean) {
+ return new org.apache.geronimo.samples.daytrader.AccountDataBean(
+ bean.getAccountID(),
+ bean.getLoginCount(),
+ bean.getLogoutCount(),
+ bean.getLastLogin().getTime(),
+ bean.getCreationDate().getTime(),
+ bean.getBalance(),
+ bean.getOpenBalance(),
+ bean.getProfileID());
+ }
+
+ private org.apache.geronimo.samples.daytrader.AccountProfileDataBean convertAccountProfileDataBean(org.apache.geronimo.samples.daytrader.client.ws.AccountProfileDataBean bean) {
+ return new org.apache.geronimo.samples.daytrader.AccountProfileDataBean(
+ bean.getUserID(),
+ bean.getPassword(),
+ bean.getFullName(),
+ bean.getAddress(),
+ bean.getEmail(),
+ bean.getCreditCard());
+ }
+
+ private org.apache.geronimo.samples.daytrader.client.ws.AccountProfileDataBean convertAccountProfileDataBeanToWS(org.apache.geronimo.samples.daytrader.AccountProfileDataBean bean) {
+ org.apache.geronimo.samples.daytrader.client.ws.AccountProfileDataBean beanRet = new org.apache.geronimo.samples.daytrader.client.ws.AccountProfileDataBean();
+ beanRet.setUserID(bean.getUserID());
+ beanRet.setPassword(bean.getPassword());
+ beanRet.setFullName(bean.getFullName());
+ beanRet.setAddress(bean.getAddress());
+ beanRet.setEmail(bean.getEmail());
+ beanRet.setCreditCard(bean.getCreditCard());
+ return beanRet;
+ }
+
+ private org.apache.geronimo.samples.daytrader.MarketSummaryDataBean convertMarketSummaryDataBean(org.apache.geronimo.samples.daytrader.client.ws.MarketSummaryDataBeanWS bean) {
+ org.apache.geronimo.samples.daytrader.MarketSummaryDataBean retBean = new org.apache.geronimo.samples.daytrader.MarketSummaryDataBean();
+ retBean.setTopGainers(convertQuoteDataBeanWSArrayToCollectionBase(bean.getTopGainers()));
+ retBean.setTopLosers(convertQuoteDataBeanWSArrayToCollectionBase(bean.getTopLosers()));
+ retBean.setTSIA(bean.getTSIA());
+ retBean.setOpenTSIA(bean.getOpenTSIA());
+ retBean.setVolume(bean.getVolume());
+ // can't use contructor of MSBean as it sets this to the current time
+ retBean.setSummaryDate(bean.getSummaryDate().getTime());
+ return retBean;
+ }
+
+ private org.apache.geronimo.samples.daytrader.RunStatsDataBean convertRunStatsDataBean(org.apache.geronimo.samples.daytrader.client.ws.RunStatsDataBean bean) {
+ org.apache.geronimo.samples.daytrader.RunStatsDataBean beanRet = new org.apache.geronimo.samples.daytrader.RunStatsDataBean();
+ beanRet.setTradeUserCount(bean.getTradeUserCount());
+ beanRet.setNewUserCount(bean.getNewUserCount());
+ beanRet.setSumLoginCount(bean.getSumLoginCount());
+ beanRet.setSumLogoutCount(bean.getSumLogoutCount());
+ beanRet.setHoldingCount(bean.getHoldingCount());
+ beanRet.setOrderCount(bean.getOrderCount());
+ beanRet.setBuyOrderCount(bean.getBuyOrderCount());
+ beanRet.setSellOrderCount(bean.getSellOrderCount());
+ beanRet.setCancelledOrderCount(bean.getCancelledOrderCount());
+ beanRet.setOpenOrderCount(bean.getOpenOrderCount());
+ beanRet.setDeletedOrderCount(bean.getDeletedOrderCount());
+ return beanRet;
+ }
+}
Propchange: geronimo/daytrader/trunk/modules/soap/src/main/java/org/apache/geronimo/samples/daytrader/soap/TradeWebSoapProxy.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/daytrader/trunk/modules/streamer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/streamer/pom.xml?rev=808973&r1=808972&r2=808973&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/streamer/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/streamer/pom.xml Fri Aug 28 18:07:49 2009
@@ -16,35 +16,35 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader</artifactId>
+ <artifactId>modules</artifactId>
<version>2.2-SNAPSHOT</version>
</parent>
- <artifactId>daytrader-streamer</artifactId>
- <name>DayTrader :: Quote Streamer</name>
+ <groupId>org.apache.geronimo.daytrader.modules</groupId>
+ <artifactId>streamer</artifactId>
<packaging>jar</packaging>
+ <name>DayTrader :: Modules - Quote Streamer</name>
<description>Streamer Application for Day Trader</description>
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/streamer</connection>
<developerConnection>
scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/streamer</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/ear</url>
</scm>
+
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-ejb</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.geronimo.daytrader.modules</groupId>
+ <artifactId>ejb3</artifactId>
<version>${pom.version}</version>
<type>ejb</type>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
@@ -71,9 +71,11 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
Modified: geronimo/daytrader/trunk/modules/web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/pom.xml?rev=808973&r1=808972&r2=808973&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/web/pom.xml Fri Aug 28 18:07:49 2009
@@ -16,73 +16,87 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader</artifactId>
+ <artifactId>modules</artifactId>
<version>2.2-SNAPSHOT</version>
</parent>
- <artifactId>daytrader-web</artifactId>
- <name>DayTrader :: Web Application</name>
- <packaging>war</packaging>
- <description>Daytrader Web</description>
+
+ <groupId>org.apache.geronimo.daytrader.modules</groupId>
+ <artifactId>web</artifactId>
+ <packaging>jar</packaging>
+ <name>DayTrader :: Modules - Web</name>
+ <description>Daytrader Web Module</description>
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/web</connection>
- <developerConnection>
- scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/web</developerConnection>
+ <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/web</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/web</url>
</scm>
+
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-ejb</artifactId>
+ <groupId>org.apache.geronimo.daytrader.modules</groupId>
+ <artifactId>core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.daytrader.modules</groupId>
+ <artifactId>ejb3</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
<type>ejb</type>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.daytrader.modules</groupId>
+ <artifactId>soap</artifactId>
+ <version>${pom.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <artifactId>geronimo-jpa_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
+<!--
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.1_spec</artifactId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
+-->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <artifactId>geronimo-jsp_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Removed per DAYTRADER-7 due to interop issues on commercial AppServers
<dependency>
<groupId>org.codehaus.mojo</groupId>
@@ -110,11 +124,11 @@
</executions>
</plugin>
-->
+<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
- <!-- <webXml>${basedir}/target/jspweb.xml</webXml> Removed per DATRADER-7 due to interop issues on commercial AppServers -->
<archive>
<manifestEntries>
<Class-Path>dt-ejb.jar streamer.jar wsappclient.jar</Class-Path>
@@ -132,12 +146,6 @@
</includes>
</resource>
</resources>
- <!--
- HACK: Include legal files explicity, otherwise they will
- end up in the wrong path
- or in another jar file in the war.
- NOTE: targetPath is broken for webResources (as documented)
- -->
<webResources>
<resource>
<directory>${project.build.outputDirectory}</directory>
@@ -150,6 +158,7 @@
</webResources>
</configuration>
</plugin>
+-->
</plugins>
</build>
</project>
Modified: geronimo/daytrader/trunk/modules/wsappclient/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/wsappclient/pom.xml?rev=808973&r1=808972&r2=808973&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/wsappclient/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/wsappclient/pom.xml Fri Aug 28 18:07:49 2009
@@ -16,35 +16,37 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader</artifactId>
+ <artifactId>modules</artifactId>
<version>2.2-SNAPSHOT</version>
</parent>
- <artifactId>daytrader-wsappclient</artifactId>
- <name>DayTrader :: WS Application Client</name>
+
+ <groupId>org.apache.geronimo.daytrader.modules</groupId>
+ <artifactId>wsappclient</artifactId>
<packaging>jar</packaging>
+ <name>DayTrader :: WS Application Client</name>
<description>Client demonstrating Web Services</description>
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/wsappclient</connection>
- <developerConnection>
- scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/wsappclient</developerConnection>
+ <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/wsappclient</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/wsappclient</url>
</scm>
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<!-- Caveat: The wsappclient module currently has a cyclic dependency on the EJB module. Thus we are forced