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 2016/03/03 17:16:15 UTC
svn commit: r1733492 - in
/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms:
activemq/JmsEndpointConnection_impl.java
activemq/UimaDefaultMessageListenerContainer.java
client/BaseUIMAAsynchronousEngine_impl.java
Author: cwiklik
Date: Thu Mar 3 16:16:14 2016
New Revision: 1733492
URL: http://svn.apache.org/viewvc?rev=1733492&view=rev
Log:
UIMA-4813 modified to use ConnectionFactoryIniter for whitelisting packages in ObjectMessages
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-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaDefaultMessageListenerContainer.java
uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_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=1733492&r1=1733491&r2=1733492&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 Mar 3 16:16:14 2016
@@ -21,6 +21,8 @@ package org.apache.uima.adapter.jms.acti
import java.io.IOException;
import java.io.InterruptedIOException;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -239,6 +241,11 @@ public class JmsEndpointConnection_impl
try {
ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(brokerUri);
+ // White list packages for deserialization
+ ConnectionFactoryIniter cfIniter =
+ new ConnectionFactoryIniter(factory);
+ cfIniter.whiteListPackages();
+
factory.setWatchTopicAdvisories(false);
// Create shared jms connection to a broker
conn = factory.createConnection();
Modified: uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaDefaultMessageListenerContainer.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaDefaultMessageListenerContainer.java?rev=1733492&r1=1733491&r2=1733492&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaDefaultMessageListenerContainer.java (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaDefaultMessageListenerContainer.java Thu Mar 3 16:16:14 2016
@@ -850,15 +850,9 @@ public class UimaDefaultMessageListenerC
public void setConnectionFactory(ConnectionFactory aConnectionFactory) {
connectionFactory = aConnectionFactory;
- ((ActiveMQConnectionFactory)connectionFactory).
- setTrustedPackages(new ArrayList<String>(
- Arrays.asList("org.apache.uima.aae.error",
- "org.apache.uima.analysis_engine",
- "org.apache.activemq",
- "org.fusesource.hawtbuf",
- "com.thoughtworks.xstream.mapper",
- "java.lang",
- "java.util")));
+ ConnectionFactoryIniter cfIniter =
+ new ConnectionFactoryIniter((ActiveMQConnectionFactory)connectionFactory);
+ cfIniter.whiteListPackages();
super.setConnectionFactory(connectionFactory);
}
Modified: uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java?rev=1733492&r1=1733491&r2=1733492&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java Thu Mar 3 16:16:14 2016
@@ -67,6 +67,7 @@ import org.apache.uima.aae.jmx.JmxManage
import org.apache.uima.aae.message.AsynchAEMessage;
import org.apache.uima.aae.message.UIMAMessage;
import org.apache.uima.adapter.jms.JmsConstants;
+import org.apache.uima.adapter.jms.activemq.ConnectionFactoryIniter;
import org.apache.uima.adapter.jms.activemq.SpringContainerDeployer;
import org.apache.uima.adapter.jms.activemq.UimaEEAdminSpringContext;
import org.apache.uima.adapter.jms.service.Dd2spring;
@@ -380,11 +381,15 @@ public class BaseUIMAAsynchronousEngine_
ActiveMQConnectionValidator connectionValidator = new ActiveMQConnectionValidator();
//Initalize the connection Factory
ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(aBrokerURI);
+ ConnectionFactoryIniter cfIniter =
+ new ConnectionFactoryIniter(connectionFactory);
+ cfIniter.whiteListPackages();
connectionFactory.setUserName(amqUser);
connectionFactory.setPassword(amqPassword);
// Create a singleton shared connection object
sharedConnection = new SharedConnection(
- new ActiveMQConnectionFactory(aBrokerURI),
+ connectionFactory,
+ //new ActiveMQConnectionFactory(aBrokerURI),
aBrokerURI);
sharedConnections.put( aBrokerURI, sharedConnection);