You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2008/05/21 01:58:26 UTC

svn commit: r658497 - in /openejb/trunk/openejb3/container/openejb-core/src/main: java/org/apache/openejb/config/AutoConfig.java resources/META-INF/org.apache.openejb.embedded/service-jar.xml

Author: dblevins
Date: Tue May 20 16:58:26 2008
New Revision: 658497

URL: http://svn.apache.org/viewvc?rev=658497&view=rev
Log:
OPENEJB-804: JMS ConnectionFactory autocreation fails

Modified:
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
    openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java?rev=658497&r1=658496&r2=658497&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java Tue May 20 16:58:26 2008
@@ -1373,7 +1373,7 @@
             }
         }
         String dataSourceId = resourceInfo.properties.getProperty("DataSource");
-        if (dataSourceId != null) {
+        if (dataSourceId != null && dataSourceId.length() > 0) {
             String newResourceId = getResourceId(beanName, dataSourceId, null, null);
             if (dataSourceId != newResourceId) {
                 resourceInfo.properties.setProperty("DataSource", newResourceId);

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml?rev=658497&r1=658496&r2=658497&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml Tue May 20 16:58:26 2008
@@ -653,7 +653,7 @@
           class-name="org.apache.openejb.resource.activemq.ActiveMQResourceAdapter">
 
     # Broker configuration
-    BrokerXmlConfig broker:(tcp://localhost:61616)?useJmx=false
+    BrokerXmlConfig broker:()/localhost?persistent=false
 
     # Broker address (vm transport may not work with TxRecovery on)
     ServerUrl vm://localhost?async=true