You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2014/06/26 15:42:27 UTC
svn commit: r1605783 - in /uima/uima-as/trunk:
uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/
uimaj-as-core/src/main/java/org/apache/uima/aae/controller/
Author: cwiklik
Date: Thu Jun 26 13:42:26 2014
New Revision: 1605783
URL: http://svn.apache.org/r1605783
Log:
UIMA-3919 re-enabled support for vm://localhost protocal which allows deployment with a colocated AMQ broker
Modified:
uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsEndpointConnection_impl.java
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/Endpoint_impl.java
Modified: uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsEndpointConnection_impl.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsEndpointConnection_impl.java?rev=1605783&r1=1605782&r2=1605783&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsEndpointConnection_impl.java (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsEndpointConnection_impl.java Thu Jun 26 13:42:26 2014
@@ -193,7 +193,7 @@ public class JmsEndpointConnection_impl
new Object[] { aComponentName, getEndpoint(),
((JmsOutputChannel) aController.getOutputChannel()).getServerURI() });
}
- } else if ( !brokerUri.startsWith("http") && !brokerUri.startsWith("failover")){
+ } else if ( !brokerUri.startsWith("http") && !brokerUri.startsWith("failover") && !brokerUri.startsWith("vm://localhost?broker.persistent=false")){
String prefix = "";
if ( brokerUri.indexOf("?") > -1) {
prefix = "&";
Modified: uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java?rev=1605783&r1=1605782&r2=1605783&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java (original)
+++ uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java Thu Jun 26 13:42:26 2014
@@ -2862,6 +2862,9 @@ public abstract class BaseAnalysisEngine
try {
if (metadata != null) {
+ if ( anEndpoint.getServerURI().equals("vm://localhost?broker.persistent=false")) {
+ anEndpoint.setRemote(true);
+ }
if (!anEndpoint.isRemote()) {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
try {
Modified: uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/Endpoint_impl.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/Endpoint_impl.java?rev=1605783&r1=1605782&r2=1605783&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/Endpoint_impl.java (original)
+++ uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/Endpoint_impl.java Thu Jun 26 13:42:26 2014
@@ -319,7 +319,7 @@ public class Endpoint_impl implements En
public void setServerURI(String aServerURI) {
this.serverURI = aServerURI;
- if (aServerURI != null && aServerURI.startsWith("vm:") == true) {
+ if ( aServerURI != null && ( aServerURI.startsWith("vm:") == true && !aServerURI.equals("vm://localhost?broker.persistent=false") ) ){
setRemote(false);
} else {
setRemote(true);