You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by vi...@apache.org on 2011/02/21 04:02:41 UTC

svn commit: r1072828 - in /geronimo/daytrader/trunk/javaee6: assemblies/daytrader-ear/src/main/resources/ assemblies/daytrader-ear/src/main/resources/META-INF/ modules/core/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/ modules/web/sr...

Author: violalu
Date: Mon Feb 21 03:02:40 2011
New Revision: 1072828

URL: http://svn.apache.org/viewvc?rev=1072828&view=rev
Log:
DAYTRADER-91 portable global JNDI use to access EJBs

Added:
    geronimo/daytrader/trunk/javaee6/assemblies/daytrader-ear/src/main/resources/
    geronimo/daytrader/trunk/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/
    geronimo/daytrader/trunk/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/LICENSE
    geronimo/daytrader/trunk/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/NOTICE
    geronimo/daytrader/trunk/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/application.xml
Modified:
    geronimo/daytrader/trunk/javaee6/modules/core/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeAction.java
    geronimo/daytrader/trunk/javaee6/modules/core/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJDBCDirect.java
    geronimo/daytrader/trunk/javaee6/modules/core/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJEEDirect.java
    geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/ejb3/DirectSLSBBean.java
    geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/ejb3/TradeSLSBBean.java
    geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml

Added: geronimo/daytrader/trunk/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/LICENSE?rev=1072828&view=auto
==============================================================================
--- geronimo/daytrader/trunk/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/LICENSE (added)
+++ geronimo/daytrader/trunk/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/LICENSE Mon Feb 21 03:02:40 2011
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+

Added: geronimo/daytrader/trunk/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/NOTICE?rev=1072828&view=auto
==============================================================================
--- geronimo/daytrader/trunk/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/NOTICE (added)
+++ geronimo/daytrader/trunk/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/NOTICE Mon Feb 21 03:02:40 2011
@@ -0,0 +1,9 @@
+Apache Geronimo 
+Copyright 2003-2010 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of this software were developed at IBM and donated to the 
+ASF under the Apache 2.0 license.  The former work was referred to 
+as Trade 6.

Added: geronimo/daytrader/trunk/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/application.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/application.xml?rev=1072828&view=auto
==============================================================================
--- geronimo/daytrader/trunk/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/application.xml (added)
+++ geronimo/daytrader/trunk/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/application.xml Mon Feb 21 03:02:40 2011
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application 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/application_6.xsd" version="6">
+  <application-name>daytrader</application-name>
+  <description>DayTrader Stock Trading Performance Benchmark Sample</description>  
+  <display-name>DayTrader EAR</display-name> 
+  
+  <module>
+    <web>
+      <web-uri>web.war</web-uri>
+      <context-root>/daytrader</context-root>
+    </web>
+  </module>
+ 
+</application>
\ No newline at end of file

Modified: geronimo/daytrader/trunk/javaee6/modules/core/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeAction.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/core/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeAction.java?rev=1072828&r1=1072827&r2=1072828&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/core/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeAction.java (original)
+++ geronimo/daytrader/trunk/javaee6/modules/core/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeAction.java Mon Feb 21 03:02:40 2011
@@ -72,15 +72,15 @@ public class TradeAction implements Trad
         
         if (TradeConfig.runTimeMode == TradeConfig.EJB3) {
             try {
-                Class c = Class.forName("org.apache.geronimo.daytrader.javaee6.ejb3.TradeSLSBRemote");
+                Class c = Class.forName("org.apache.geronimo.daytrader.javaee6.web.ejb3.TradeSLSBRemote");
                 if ((trade == null) ||
                     (!(trade.getClass().isAssignableFrom(c)))) {
                     InitialContext context = new InitialContext();
                     try {
-                        trade = (TradeServices) context.lookup("java:comp/env/ejb/TradeSLSBBean");                
+                        trade = (TradeServices) context.lookup("java:global/daytrader/web/TradeSLSBBean");                
                     } catch (Exception ex) {
                         Log.error("TradeAction:createTrade - Lookup of TradeSLSBRemote failed!!!");
-                        trade = (TradeServices) context.lookup("TradeSLSBBean");
+                        trade = (TradeServices) context.lookup("java:global/TradeSLSBBean");
                     }
                 }
             }
@@ -90,15 +90,15 @@ public class TradeAction implements Trad
             }
         } else if (TradeConfig.runTimeMode == TradeConfig.SESSION3) {
             try {
-                Class c = Class.forName("org.apache.geronimo.daytrader.javaee6.ejb3.DirectSLSBBean");
+                Class c = Class.forName("org.apache.geronimo.daytrader.javaee6.web.ejb3.DirectSLSBBean");
                 if ((trade == null) ||
                     (!(trade.getClass().isAssignableFrom(c)))) {
                     InitialContext context = new InitialContext();
                     try {
-                        trade = (TradeServices) context.lookup("java:comp/env/ejb/DirectSLSBBean");                
+                        trade = (TradeServices) context.lookup("java:global/daytrader/web/DirectSLSBBean");                
                     } catch (Exception ex) {
                         Log.error("TradeAction:createTrade - Lookup of DirectSLSBRemote failed!!!");
-                        trade = (TradeServices) context.lookup("DirectSLSBBean");
+                        trade = (TradeServices) context.lookup("java:global/DirectSLSBBean");
                     }
                 }
             }

Modified: geronimo/daytrader/trunk/javaee6/modules/core/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJDBCDirect.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/core/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJDBCDirect.java?rev=1072828&r1=1072827&r2=1072828&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/core/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJDBCDirect.java (original)
+++ geronimo/daytrader/trunk/javaee6/modules/core/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJDBCDirect.java Mon Feb 21 03:02:40 2011
@@ -19,6 +19,8 @@ package org.apache.geronimo.daytrader.ja
 import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.ArrayList;
+
+import javax.annotation.Resource;
 import javax.naming.InitialContext;
 
 import javax.sql.DataSource;
@@ -58,7 +60,7 @@ public class TradeJDBCDirect implements 
 
     private static String dsName = TradeConfig.DATASOURCE;
 
-    private static DataSource datasource = null;
+    private static @Resource DataSource datasource = null;
 
     private static BigDecimal ZERO = new BigDecimal(0.0);
 

Modified: geronimo/daytrader/trunk/javaee6/modules/core/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJEEDirect.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/core/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJEEDirect.java?rev=1072828&r1=1072827&r2=1072828&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/core/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJEEDirect.java (original)
+++ geronimo/daytrader/trunk/javaee6/modules/core/src/main/java/org/apache/geronimo/daytrader/javaee6/core/direct/TradeJEEDirect.java Mon Feb 21 03:02:40 2011
@@ -65,8 +65,8 @@ public class TradeJEEDirect implements T
 
     private static String dsName = TradeConfig.DATASOURCE;
     
-    /*@Resource(name="jdbc/TradeDataSource")*/
-    private static DataSource datasource;
+    
+    private static @Resource DataSource datasource;
 
     
 

Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/ejb3/DirectSLSBBean.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/ejb3/DirectSLSBBean.java?rev=1072828&r1=1072827&r2=1072828&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/ejb3/DirectSLSBBean.java (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/ejb3/DirectSLSBBean.java Mon Feb 21 03:02:40 2011
@@ -28,6 +28,7 @@ import javax.ejb.*;
 
 
 @Stateless
+@EJB(name="java:global/DirectSLSBBean", beanInterface=DirectSLSBRemote.class)
 @TransactionAttribute(TransactionAttributeType.REQUIRED)
 @TransactionManagement(TransactionManagementType.CONTAINER)
 public class DirectSLSBBean implements DirectSLSBRemote, DirectSLSBLocal {

Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/ejb3/TradeSLSBBean.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/ejb3/TradeSLSBBean.java?rev=1072828&r1=1072827&r2=1072828&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/ejb3/TradeSLSBBean.java (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/ejb3/TradeSLSBBean.java Mon Feb 21 03:02:40 2011
@@ -51,6 +51,7 @@ import javax.transaction.RollbackExcepti
 
 
 @Stateless
+@EJB(name="java:global/TradeSLSBBean",beanInterface=TradeSLSBRemote.class)
 @TransactionAttribute(TransactionAttributeType.REQUIRED)
 @TransactionManagement(TransactionManagementType.CONTAINER)
 public class TradeSLSBBean implements TradeSLSBRemote, TradeSLSBLocal {

Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml?rev=1072828&r1=1072827&r2=1072828&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml Mon Feb 21 03:02:40 2011
@@ -16,11 +16,11 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5" 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/web-app_2_5.xsd">
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="3.0" 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/web-app_3_0.xsd">
 
     <display-name>DayTrader Web JDBC</display-name>
-   
+   <module-name>web</module-name>
     <servlet>
         <display-name>register</display-name>
         <servlet-name>register</servlet-name>
@@ -57,7 +57,7 @@
         <location>/error.jsp</location>
     </error-page>
     
-    <resource-ref>
+    <!-- <resource-ref>
         <res-ref-name>jdbc/TradeDataSource</res-ref-name>
         <res-type>javax.sql.DataSource</res-type>
         <res-auth>Container</res-auth>
@@ -69,7 +69,6 @@
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
     </resource-ref>
-
     <resource-ref>
         <res-ref-name>jms/QueueConnectionFactory</res-ref-name>
         <res-type>javax.jms.QueueConnectionFactory</res-type>
@@ -81,21 +80,10 @@
         <res-type>javax.jms.TopicConnectionFactory</res-type>
         <res-auth>Application</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
-    </resource-ref>
+    </resource-ref> -->
     
-    <!--  <ejb-ref>
-        <ejb-ref-name>ejb/TradeSLSBBean</ejb-ref-name>
-        <ejb-ref-type>Session</ejb-ref-type>
-        <remote>org.apache.geronimo.samples.daytrader.ejb3.TradeSLSBRemote</remote>
-        <ejb-link>TradeSLSBBean</ejb-link>
-    </ejb-ref>
-    <ejb-ref>
-        <ejb-ref-name>ejb/DirectSLSBBean</ejb-ref-name>
-        <ejb-ref-type>Session</ejb-ref-type>
-        <remote>org.apache.geronimo.samples.daytrader.ejb3.DirectSLSBRemote</remote>
-        <ejb-link>DirectSLSBBean</ejb-link>
-    </ejb-ref>-->
-
+    
+    <!-- 
     <message-destination-ref>
         <message-destination-ref-name>jms/TradeBrokerQueue</message-destination-ref-name>
         <message-destination-type>javax.jms.Queue</message-destination-type>
@@ -107,7 +95,8 @@
         <message-destination-type>javax.jms.Topic</message-destination-type>
         <message-destination-usage>Produces</message-destination-usage>
         <message-destination-link>dt-ejb.jar#jms/TradeStreamerTopic</message-destination-link>
-    </message-destination-ref>
+    </message-destination-ref>-->
+    
     
     <!--  <service-ref>
         <description>WSDL Service Trade</description>