geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1021343 - /geronimo/daytrader/branches/2.1.3/modules/ejb/src/main/resources/META-INF/jboss.xml
Date Mon, 11 Oct 2010 13:36:13 GMT
Author: xiaming
Date: Mon Oct 11 13:36:13 2010
New Revision: 1021343

URL: http://svn.apache.org/viewvc?rev=1021343&view=rev
Log:
DAYTRADER-76 remove unused resource-ref in jboss.xml to avoid an NPE when deploying daytrader
in jboss 5.1.0.GA

Modified:
    geronimo/daytrader/branches/2.1.3/modules/ejb/src/main/resources/META-INF/jboss.xml

Modified: geronimo/daytrader/branches/2.1.3/modules/ejb/src/main/resources/META-INF/jboss.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1.3/modules/ejb/src/main/resources/META-INF/jboss.xml?rev=1021343&r1=1021342&r2=1021343&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1.3/modules/ejb/src/main/resources/META-INF/jboss.xml (original)
+++ geronimo/daytrader/branches/2.1.3/modules/ejb/src/main/resources/META-INF/jboss.xml Mon
Oct 11 13:36:13 2010
@@ -31,15 +31,7 @@
             <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>
+            </resource-ref>             
 
             <message-destination-ref>
                 <message-destination-ref-name>jms/TradeBrokerQueue</message-destination-ref-name>
@@ -87,14 +79,6 @@
             <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-manager>            
    </resource-managers> 
 </jboss>



Mime
View raw message