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/11/16 19:56:29 UTC
svn commit: r1770050 - in
/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms:
activemq/ client/
Author: cwiklik
Date: Wed Nov 16 19:56:29 2016
New Revision: 1770050
URL: http://svn.apache.org/viewvc?rev=1770050&view=rev
Log:
UIMA-5184 Modified to support white listing of packages. Added a new call on AMQ Connection Factory.
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/JmsInputChannel.java
uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.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=1770050&r1=1770049&r2=1770050&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 Wed Nov 16 19:56:29 2016
@@ -248,10 +248,7 @@ public class JmsEndpointConnection_impl
try {
ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(brokerUri);
// White list packages for deserialization
- ConnectionFactoryIniter cfIniter =
- new ConnectionFactoryIniter(factory);
- cfIniter.whiteListPackages();
-
+ factory.setTrustAllPackages(true);
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/JmsInputChannel.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsInputChannel.java?rev=1770050&r1=1770049&r2=1770050&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsInputChannel.java (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsInputChannel.java Wed Nov 16 19:56:29 2016
@@ -1109,6 +1109,7 @@ public class JmsInputChannel implements
testIfBrokerRunning(delegate.getEndpoint().getServerURI());
ActiveMQConnectionFactory f = new ActiveMQConnectionFactory(delegate.getEndpoint().getServerURI());
+ f.setTrustAllPackages(true);
newListener.setConnectionFactory(f);
newListener.setMessageListener(this);
newListener.setController(getController());
Modified: uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.java?rev=1770050&r1=1770049&r2=1770050&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.java (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.java Wed Nov 16 19:56:29 2016
@@ -183,7 +183,7 @@ public class JmsOutputChannel implements
*/
public void setConnectionFactory(ActiveMQConnectionFactory connectionFactory) {
this.connectionFactory = connectionFactory;
-// this.connectionFactory.setTrustAllPackages(true);
+ this.connectionFactory.setTrustAllPackages(true);
}
public void setServiceInputEndpoint(String anEnpoint) {
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=1770050&r1=1770049&r2=1770050&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 Wed Nov 16 19:56:29 2016
@@ -942,7 +942,7 @@ public class UimaDefaultMessageListenerC
ConnectionFactoryIniter cfIniter =
new ConnectionFactoryIniter((ActiveMQConnectionFactory)connectionFactory);
cfIniter.whiteListPackages();
-
+ ((ActiveMQConnectionFactory)connectionFactory).setTrustAllPackages(true);
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=1770050&r1=1770049&r2=1770050&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 Wed Nov 16 19:56:29 2016
@@ -424,9 +424,7 @@ public class BaseUIMAAsynchronousEngine_
ActiveMQConnectionValidator connectionValidator = new ActiveMQConnectionValidator();
//Initalize the connection Factory
ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(aBrokerURI);
- ConnectionFactoryIniter cfIniter =
- new ConnectionFactoryIniter(connectionFactory);
- cfIniter.whiteListPackages();
+ connectionFactory.setTrustAllPackages(true);
connectionFactory.setUserName(amqUser);
connectionFactory.setPassword(amqPassword);
// Create a singleton shared connection object