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 2009/09/15 18:47:20 UTC

svn commit: r815391 - /incubator/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.java

Author: cwiklik
Date: Tue Sep 15 16:47:20 2009
New Revision: 815391

URL: http://svn.apache.org/viewvc?rev=815391&view=rev
Log:
UIMA-1322 Modified how broker URL is set and fetched

Modified:
    incubator/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.java

Modified: incubator/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.java
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.java?rev=815391&r1=815390&r2=815391&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.java (original)
+++ incubator/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.java Tue Sep 15 16:47:20 2009
@@ -143,7 +143,7 @@
   }
 
   public String getServerURI() {
-    return System.getProperty("BrokerURI");
+    return serverURI; 
   }
 
   public String getName() {
@@ -178,22 +178,8 @@
                 new Object[] { System.getProperty("ActiveMQConnectors") });
       }
       // Aggregate controller set this System property at startup in
-      // org.apache.uima.adapter.jms.service.UIMA_Service.startInternalBroker()
       serviceProtocolList = System.getProperty("ActiveMQConnectors");
     }
-
-    try {
-      String uri = System.getProperty("BrokerURI");
-      setServerURI(uri);
-    } catch (Exception e) {
-      e.printStackTrace();
-      if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.WARNING)) {
-        UIMAFramework.getLogger(CLASS_NAME).logrb(Level.WARNING, CLASS_NAME.getName(),
-                "initialize", JmsConstants.JMS_LOG_RESOURCE_BUNDLE, "UIMAJMS_exception__WARNING",
-                new Object[] { JmsConstants.threadName(), e });
-      }
-    }
-
   }
 
   /**
@@ -424,6 +410,7 @@
        * Open connection to a broker, create JMS session and MessageProducer
        */
       endpointConnection.open();
+
       brokerConnectionEntry.getConnectionTimer().setConnectionCreationTimestamp(
               endpointConnection.connectionCreationTimestamp);
 
@@ -1059,6 +1046,7 @@
       return;
     }
     long msgSize = 0;
+    
     ByteArrayOutputStream bos = new ByteArrayOutputStream();
     try {
       anEndpoint.setReplyEndpoint(true);