Author: andygumbrecht
Date: Wed Oct 2 19:18:23 2013
New Revision: 1528603
URL: http://svn.apache.org/r1528603
Log:
Fix https://issues.apache.org/jira/browse/TOMEE-1052 - Do not try to start a
broker if no BrokerXmlConfig is specified
Add original serialVersionUID
Modified:
tomee/tomee/branches/tomee-1.5.2/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/ClientMetaData.java
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/ClusterMetaData.java
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/DataSourceMetaData.java
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/EJBHomeProxyHandle.java
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/EJBObjectProxyHandle.java
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/InjectionMetaData.java
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/ServerMetaData.java
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/ThrowableArtifact.java
Modified:
tomee/tomee/branches/tomee-1.5.2/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.5.2/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java?rev=1528603&r1=1528602&r2=1528603&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.5.2/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java
(original)
+++
tomee/tomee/branches/tomee-1.5.2/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java
Wed Oct 2 19:18:23 2013
@@ -121,9 +121,11 @@ public class ActiveMQResourceAdapter ext
ActiveMQFactory.setThreadProperties(properties);
try {
- //The returned broker should be started, but calling start is
harmless.
- //We do not need to track the instance as the factory takes care
of this.
-
ActiveMQFactory.createBroker(URLs.uri(getBrokerXmlConfig())).start();
+ if (brokerXmlConfig != null) {
+ //The returned broker should be started, but calling start is
harmless.
+ //We do not need to track the instance as the factory takes
care of this.
+
ActiveMQFactory.createBroker(URLs.uri(getBrokerXmlConfig())).start();
+ }
} catch (Exception e) {
org.apache.openejb.util.Logger.getInstance(LogCategory.OPENEJB_STARTUP,
ActiveMQResourceAdapter.class).getChildLogger("service").fatal("Failed to start
ActiveMQ", e);
} finally {
@@ -153,7 +155,13 @@ public class ActiveMQResourceAdapter ext
try {
stopImpl();
} catch (Throwable t) {
-
org.apache.openejb.util.Logger.getInstance(LogCategory.OPENEJB_STARTUP,
ActiveMQResourceAdapter.class).getChildLogger("service").error("ActiveMQ
shutdown failed", t);
+ org.apache
+ .openejb
+ .util
+ .Logger
+ .getInstance(LogCategory.OPENEJB_STARTUP,
ActiveMQResourceAdapter.class)
+ .getChildLogger("service")
+ .error("ActiveMQ shutdown failed", t);
}
}
};
@@ -173,7 +181,13 @@ public class ActiveMQResourceAdapter ext
//Block for a maximum of timeout milliseconds waiting for this
thread to die.
stopThread.join(timeout);
} catch (InterruptedException ex) {
-
org.apache.openejb.util.Logger.getInstance(LogCategory.OPENEJB_STARTUP,
ActiveMQResourceAdapter.class).getChildLogger("service").warning("Gave up on
ActiveMQ shutdown after " + timeout + "ms", ex);
+ org.apache
+ .openejb
+ .util
+ .Logger
+ .getInstance(LogCategory.OPENEJB_STARTUP,
ActiveMQResourceAdapter.class)
+ .getChildLogger("service")
+ .warning("Gave up on ActiveMQ shutdown after " + timeout +
"ms", ex);
}
}
Modified:
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/ClientMetaData.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/ClientMetaData.java?rev=1528603&r1=1528602&r2=1528603&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/ClientMetaData.java
(original)
+++
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/ClientMetaData.java
Wed Oct 2 19:18:23 2013
@@ -23,6 +23,7 @@ import java.io.ObjectOutput;
public class ClientMetaData implements Externalizable {
+
transient Object clientIdentity;
public ClientMetaData() {
Modified:
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/ClusterMetaData.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/ClusterMetaData.java?rev=1528603&r1=1528602&r2=1528603&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/ClusterMetaData.java
(original)
+++
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/ClusterMetaData.java
Wed Oct 2 19:18:23 2013
@@ -27,6 +27,8 @@ import java.net.URISyntaxException;
* @version $Rev$ $Date$
*/
public class ClusterMetaData implements Externalizable {
+
+
private URI[] locations;
private long version;
private String connectionStrategy;
Modified:
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/DataSourceMetaData.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/DataSourceMetaData.java?rev=1528603&r1=1528602&r2=1528603&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/DataSourceMetaData.java
(original)
+++
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/DataSourceMetaData.java
Wed Oct 2 19:18:23 2013
@@ -25,6 +25,8 @@ import java.io.ObjectOutput;
* @version $Rev$ $Date$
*/
public class DataSourceMetaData implements Externalizable {
+
+
private String jdbcUrl;
private String jdbcDriver;
private String defaultPassword;
Modified:
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/EJBHomeProxyHandle.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/EJBHomeProxyHandle.java?rev=1528603&r1=1528602&r2=1528603&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/EJBHomeProxyHandle.java
(original)
+++
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/EJBHomeProxyHandle.java
Wed Oct 2 19:18:23 2013
@@ -24,6 +24,7 @@ import java.io.ObjectStreamException;
public class EJBHomeProxyHandle implements Externalizable {
+ private static final long serialVersionUID = 1523695567435111622L;
public static ThreadLocal<Resolver> resolver = new
DefaultedThreadLocal<Resolver>(new ClientSideResovler());
EJBHomeHandler handler;
Modified:
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/EJBObjectProxyHandle.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/EJBObjectProxyHandle.java?rev=1528603&r1=1528602&r2=1528603&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/EJBObjectProxyHandle.java
(original)
+++
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/EJBObjectProxyHandle.java
Wed Oct 2 19:18:23 2013
@@ -24,6 +24,7 @@ import java.io.ObjectStreamException;
public class EJBObjectProxyHandle implements Externalizable {
+ private static final long serialVersionUID = -8325446328982364608L;
public static ThreadLocal<Resolver> resolver = new
DefaultedThreadLocal<Resolver>(new ClientSideResovler());
EJBObjectHandler handler;
Modified:
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/InjectionMetaData.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/InjectionMetaData.java?rev=1528603&r1=1528602&r2=1528603&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/InjectionMetaData.java
(original)
+++
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/InjectionMetaData.java
Wed Oct 2 19:18:23 2013
@@ -28,6 +28,7 @@ import java.util.ArrayList;
*/
public class InjectionMetaData implements Externalizable {
+ private static final long serialVersionUID = -4034793010942105791L;
private final List<Injection> injections = new ArrayList<Injection>();
Modified:
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/ServerMetaData.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/ServerMetaData.java?rev=1528603&r1=1528602&r2=1528603&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/ServerMetaData.java
(original)
+++
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/ServerMetaData.java
Wed Oct 2 19:18:23 2013
@@ -25,6 +25,7 @@ import java.util.Arrays;
public class ServerMetaData implements Externalizable {
+
private URI[] locations;
private URI location;
Modified:
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/ThrowableArtifact.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/ThrowableArtifact.java?rev=1528603&r1=1528602&r2=1528603&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/ThrowableArtifact.java
(original)
+++
tomee/tomee/branches/tomee-1.5.2/server/openejb-client/src/main/java/org/apache/openejb/client/ThrowableArtifact.java
Wed Oct 2 19:18:23 2013
@@ -28,6 +28,7 @@ import java.util.Stack;
*/
public class ThrowableArtifact implements Externalizable {
+
private Throwable throwable;
public ThrowableArtifact(Throwable throwable) {
