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 2007/03/07 05:53:53 UTC
svn commit: r515455 - in /incubator/openejb/trunk/openejb3:
assembly/openejb-standalone/
container/openejb-core/src/main/java/org/apache/openejb/config/
container/openejb-core/src/main/resources/META-INF/org.apache.openejb/
container/openejb-core/src/t...
Author: dblevins
Date: Tue Mar 6 20:53:52 2007
New Revision: 515455
URL: http://svn.apache.org/viewvc?view=rev&rev=515455
Log:
Fixes to get the server to start--works now. For some reason it won't exit, trying to figure it out.
Modified:
incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsProxyTest.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbTest.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/SimpleJmsTest.java
incubator/openejb/trunk/openejb3/server/openejb-activemq/pom.xml
incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
Modified: incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml?view=diff&rev=515455&r1=515454&r2=515455
==============================================================================
--- incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml Tue Mar 6 20:53:52 2007
@@ -155,10 +155,15 @@
<artifactId>openejb-hsql</artifactId>
<version>${version}</version>
</dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.openejb</groupId>-->
+ <!--<artifactId>openejb-activemq</artifactId>-->
+ <!--<version>${version}</version>-->
+ <!--</dependency>-->
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-activemq</artifactId>
- <version>${version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.2.1.6</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?view=diff&rev=515455&r1=515454&r2=515455
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Tue Mar 6 20:53:52 2007
@@ -121,7 +121,9 @@
if (!entry.getKey().matches(".*\\.(jar|war|rar|ear)")) continue;
try {
- Class moduleType = discoverModuleType(entry.getValue(), tmpClassLoader, true);
+ ClassLoader moduleClassLoader = new TemporaryClassLoader(new URL[]{entry.getValue()}, tmpClassLoader);
+
+ Class moduleType = discoverModuleType(entry.getValue(), moduleClassLoader, true);
if (EjbModule.class.equals(moduleType)) {
ejbModules.put(entry.getKey(), entry.getValue());
} else if (ClientModule.class.equals(moduleType)) {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml?view=diff&rev=515455&r1=515454&r2=515455
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml Tue Mar 6 20:53:52 2007
@@ -300,7 +300,7 @@
class-name="org.apache.activemq.ra.ActiveMQResourceAdapter">
# Broker configuration
- BrokerXmlConfig broker:(tcp://localhost:61616)
+ BrokerXmlConfig broker:(tcp://localhost:61616)?useJmx=false
# Broker address
ServerUrl vm://localhost?async=true
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsProxyTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsProxyTest.java?view=diff&rev=515455&r1=515454&r2=515455
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsProxyTest.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsProxyTest.java Tue Mar 6 20:53:52 2007
@@ -53,7 +53,7 @@
// initialize properties
ra.setServerUrl("tcp://localhost:61616");
- ra.setBrokerXmlConfig("broker:(tcp://localhost:61616)");
+ ra.setBrokerXmlConfig("broker:(tcp://localhost:61616)?useJmx=false");
// create a thead pool for ActiveMQ
Executor threadPool = Executors.newFixedThreadPool(30);
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java?view=diff&rev=515455&r1=515454&r2=515455
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java Tue Mar 6 20:53:52 2007
@@ -60,7 +60,7 @@
// initialize properties
ra.setServerUrl("tcp://localhost:61616");
- ra.setBrokerXmlConfig("broker:(tcp://localhost:61616)");
+ ra.setBrokerXmlConfig("broker:(tcp://localhost:61616)?useJmx=false");
// create a thead pool for ActiveMQ
Executor threadPool = Executors.newFixedThreadPool(30);
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbTest.java?view=diff&rev=515455&r1=515454&r2=515455
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbTest.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbTest.java Tue Mar 6 20:53:52 2007
@@ -67,7 +67,7 @@
// initialize properties
ra.setServerUrl("tcp://localhost:61616");
- ra.setBrokerXmlConfig("broker:(tcp://localhost:61616)");
+ ra.setBrokerXmlConfig("broker:(tcp://localhost:61616)?useJmx=false");
// create a thead pool for ActiveMQ
Executor threadPool = Executors.newFixedThreadPool(30);
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/SimpleJmsTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/SimpleJmsTest.java?view=diff&rev=515455&r1=515454&r2=515455
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/SimpleJmsTest.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/SimpleJmsTest.java Tue Mar 6 20:53:52 2007
@@ -53,7 +53,7 @@
// initialize properties
ra.setServerUrl("vm://localhost?async=true");
- ra.setBrokerXmlConfig("broker:(tcp://localhost:61616)");
+ ra.setBrokerXmlConfig("broker:(tcp://localhost:61616)?useJmx=false");
// create a thead pool for ActiveMQ
Executor threadPool = Executors.newFixedThreadPool(30);
Modified: incubator/openejb/trunk/openejb3/server/openejb-activemq/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-activemq/pom.xml?view=diff&rev=515455&r1=515454&r2=515455
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-activemq/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-activemq/pom.xml Tue Mar 6 20:53:52 2007
@@ -42,6 +42,11 @@
<artifactId>activemq-core</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.2.1.6</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
Modified: incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java?view=diff&rev=515455&r1=515454&r2=515455
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java Tue Mar 6 20:53:52 2007
@@ -20,8 +20,13 @@
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.util.Logger;
import org.apache.openejb.util.Messages;
+import org.apache.openejb.spi.ContainerSystem;
import org.apache.xbean.finder.ResourceFinder;
+import javax.naming.NamingException;
+import javax.naming.Binding;
+import javax.naming.NamingEnumeration;
+import javax.resource.spi.ResourceAdapter;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -280,6 +285,24 @@
public synchronized void stop() throws ServiceException {
System.out.println("[] received stop signal");
stop = true;
+
+ try {
+ ContainerSystem containerSystem = SystemInstance.get().getComponent(ContainerSystem.class);
+ NamingEnumeration<Binding> namingEnumeration = containerSystem.getJNDIContext().listBindings("java:openejb/resourceAdapter");
+ while (namingEnumeration.hasMoreElements()) {
+ Binding binding = namingEnumeration.nextElement();
+ Object object = binding.getObject();
+ ResourceAdapter resourceAdapter = (ResourceAdapter) object;
+ try {
+ resourceAdapter.stop();
+ } catch (Exception e) {
+ logger.fatal("ResourceAdapter Shutdown Failed: "+binding.getName(), e);
+ }
+ }
+ } catch (Throwable e) {
+ logger.fatal("Unable to get ResourceAdapters from JNDI. Stop must be called on them for proper vm shutdown.", e);
+ }
+
for (int i = 0; i < daemons.length; i++) {
try {
daemons[i].stop();