Author: dejanb
Date: Tue Aug 4 13:36:39 2009
New Revision: 800776
URL: http://svn.apache.org/viewvc?rev=800776&view=rev
Log:
fixing deprecated methods usage and other compiling warnings
Removed:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/XStreamFactoryBean.java
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSslConnectionFactory.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/RemoveSubscriptionInfoMarshaller.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SubscriptionInfoMarshaller.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoMarshaller.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SubscriptionInfoMarshaller.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v4/RemoveSubscriptionInfoMarshaller.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v4/SubscriptionInfoMarshaller.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v5/RemoveSubscriptionInfoMarshaller.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v5/SubscriptionInfoMarshaller.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/CombinationTestSupport.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/DataStructureTestSupport.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/SubscriptionInfoTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/RemoveSubscriptionInfoTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/SubscriptionInfoTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/SubscriptionInfoTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v4/RemoveSubscriptionInfoTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v4/SubscriptionInfoTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v5/RemoveSubscriptionInfoTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v5/SubscriptionInfoTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslBrokerServiceTest.java
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSslConnectionFactory.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSslConnectionFactory.java?rev=800776&r1=800775&r2=800776&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSslConnectionFactory.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSslConnectionFactory.java
Tue Aug 4 13:36:39 2009
@@ -21,6 +21,8 @@
import javax.jms.JMSException;
import javax.net.ssl.KeyManager;
import javax.net.ssl.TrustManager;
+
+import org.apache.activemq.broker.SslContext;
import org.apache.activemq.transport.Transport;
import org.apache.activemq.transport.tcp.SslTransportFactory;
import org.apache.activemq.util.JMSExceptionSupport;
@@ -69,7 +71,8 @@
try {
SslTransportFactory sslFactory = new SslTransportFactory();
- sslFactory.setKeyAndTrustManagers(keyManager, trustManager,
secureRandom);
+ SslContext ctx = new SslContext(keyManager, trustManager,
secureRandom);
+ SslContext.setCurrentSslContext(ctx);
return sslFactory.doConnect(brokerURL);
} catch (Exception e) {
throw JMSExceptionSupport.create("Could not create Transport.
Reason: " + e, e);
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java?rev=800776&r1=800775&r2=800776&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java
Tue Aug 4 13:36:39 2009
@@ -68,7 +68,7 @@
RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
info.setConnectionId((org.apache.activemq.command.ConnectionId)
tightUnmarsalCachedObject(wireFormat, dataIn, bs));
- info.setSubcriptionName(tightUnmarshalString(dataIn, bs));
+ info.setSubscriptionName(tightUnmarshalString(dataIn, bs));
info.setClientId(tightUnmarshalString(dataIn, bs));
}
@@ -83,7 +83,7 @@
int rc = super.tightMarshal1(wireFormat, o, bs);
rc += tightMarshalCachedObject1(wireFormat,
(DataStructure)info.getConnectionId(), bs);
- rc += tightMarshalString1(info.getSubcriptionName(), bs);
+ rc += tightMarshalString1(info.getSubscriptionName(), bs);
rc += tightMarshalString1(info.getClientId(), bs);
return rc + 0;
@@ -101,7 +101,7 @@
RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
tightMarshalCachedObject2(wireFormat,
(DataStructure)info.getConnectionId(), dataOut, bs);
- tightMarshalString2(info.getSubcriptionName(), dataOut, bs);
+ tightMarshalString2(info.getSubscriptionName(), dataOut, bs);
tightMarshalString2(info.getClientId(), dataOut, bs);
}
@@ -118,7 +118,7 @@
RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
info.setConnectionId((org.apache.activemq.command.ConnectionId)
looseUnmarsalCachedObject(wireFormat, dataIn));
- info.setSubcriptionName(looseUnmarshalString(dataIn));
+ info.setSubscriptionName(looseUnmarshalString(dataIn));
info.setClientId(looseUnmarshalString(dataIn));
}
@@ -133,7 +133,7 @@
super.looseMarshal(wireFormat, o, dataOut);
looseMarshalCachedObject(wireFormat,
(DataStructure)info.getConnectionId(), dataOut);
- looseMarshalString(info.getSubcriptionName(), dataOut);
+ looseMarshalString(info.getSubscriptionName(), dataOut);
looseMarshalString(info.getClientId(), dataOut);
}
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java?rev=800776&r1=800775&r2=800776&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java
Tue Aug 4 13:36:39 2009
@@ -70,7 +70,7 @@
info.setClientId(tightUnmarshalString(dataIn, bs));
info.setDestination((org.apache.activemq.command.ActiveMQDestination)
tightUnmarsalCachedObject(wireFormat, dataIn, bs));
info.setSelector(tightUnmarshalString(dataIn, bs));
- info.setSubcriptionName(tightUnmarshalString(dataIn, bs));
+ info.setSubscriptionName(tightUnmarshalString(dataIn, bs));
}
@@ -86,7 +86,7 @@
rc += tightMarshalString1(info.getClientId(), bs);
rc += tightMarshalCachedObject1(wireFormat,
(DataStructure)info.getDestination(), bs);
rc += tightMarshalString1(info.getSelector(), bs);
- rc += tightMarshalString1(info.getSubcriptionName(), bs);
+ rc += tightMarshalString1(info.getSubscriptionName(), bs);
return rc + 0;
}
@@ -105,7 +105,7 @@
tightMarshalString2(info.getClientId(), dataOut, bs);
tightMarshalCachedObject2(wireFormat,
(DataStructure)info.getDestination(), dataOut, bs);
tightMarshalString2(info.getSelector(), dataOut, bs);
- tightMarshalString2(info.getSubcriptionName(), dataOut, bs);
+ tightMarshalString2(info.getSubscriptionName(), dataOut, bs);
}
@@ -123,7 +123,7 @@
info.setClientId(looseUnmarshalString(dataIn));
info.setDestination((org.apache.activemq.command.ActiveMQDestination)
looseUnmarsalCachedObject(wireFormat, dataIn));
info.setSelector(looseUnmarshalString(dataIn));
- info.setSubcriptionName(looseUnmarshalString(dataIn));
+ info.setSubscriptionName(looseUnmarshalString(dataIn));
}
@@ -139,7 +139,7 @@
looseMarshalString(info.getClientId(), dataOut);
looseMarshalCachedObject(wireFormat,
(DataStructure)info.getDestination(), dataOut);
looseMarshalString(info.getSelector(), dataOut);
- looseMarshalString(info.getSubcriptionName(), dataOut);
+ looseMarshalString(info.getSubscriptionName(), dataOut);
}
}
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/RemoveSubscriptionInfoMarshaller.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/RemoveSubscriptionInfoMarshaller.java?rev=800776&r1=800775&r2=800776&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/RemoveSubscriptionInfoMarshaller.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/RemoveSubscriptionInfoMarshaller.java
Tue Aug 4 13:36:39 2009
@@ -68,7 +68,7 @@
RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
info.setConnectionId((org.apache.activemq.command.ConnectionId)
tightUnmarsalCachedObject(wireFormat, dataIn, bs));
- info.setSubcriptionName(tightUnmarshalString(dataIn, bs));
+ info.setSubscriptionName(tightUnmarshalString(dataIn, bs));
info.setClientId(tightUnmarshalString(dataIn, bs));
}
@@ -83,7 +83,7 @@
int rc = super.tightMarshal1(wireFormat, o, bs);
rc += tightMarshalCachedObject1(wireFormat,
(DataStructure)info.getConnectionId(), bs);
- rc += tightMarshalString1(info.getSubcriptionName(), bs);
+ rc += tightMarshalString1(info.getSubscriptionName(), bs);
rc += tightMarshalString1(info.getClientId(), bs);
return rc + 0;
@@ -101,7 +101,7 @@
RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
tightMarshalCachedObject2(wireFormat,
(DataStructure)info.getConnectionId(), dataOut, bs);
- tightMarshalString2(info.getSubcriptionName(), dataOut, bs);
+ tightMarshalString2(info.getSubscriptionName(), dataOut, bs);
tightMarshalString2(info.getClientId(), dataOut, bs);
}
@@ -118,7 +118,7 @@
RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
info.setConnectionId((org.apache.activemq.command.ConnectionId)
looseUnmarsalCachedObject(wireFormat, dataIn));
- info.setSubcriptionName(looseUnmarshalString(dataIn));
+ info.setSubscriptionName(looseUnmarshalString(dataIn));
info.setClientId(looseUnmarshalString(dataIn));
}
@@ -133,7 +133,7 @@
super.looseMarshal(wireFormat, o, dataOut);
looseMarshalCachedObject(wireFormat,
(DataStructure)info.getConnectionId(), dataOut);
- looseMarshalString(info.getSubcriptionName(), dataOut);
+ looseMarshalString(info.getSubscriptionName(), dataOut);
looseMarshalString(info.getClientId(), dataOut);
}
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SubscriptionInfoMarshaller.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SubscriptionInfoMarshaller.java?rev=800776&r1=800775&r2=800776&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SubscriptionInfoMarshaller.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SubscriptionInfoMarshaller.java
Tue Aug 4 13:36:39 2009
@@ -70,7 +70,7 @@
info.setClientId(tightUnmarshalString(dataIn, bs));
info.setDestination((org.apache.activemq.command.ActiveMQDestination)
tightUnmarsalCachedObject(wireFormat, dataIn, bs));
info.setSelector(tightUnmarshalString(dataIn, bs));
- info.setSubcriptionName(tightUnmarshalString(dataIn, bs));
+ info.setSubscriptionName(tightUnmarshalString(dataIn, bs));
}
@@ -86,7 +86,7 @@
rc += tightMarshalString1(info.getClientId(), bs);
rc += tightMarshalCachedObject1(wireFormat,
(DataStructure)info.getDestination(), bs);
rc += tightMarshalString1(info.getSelector(), bs);
- rc += tightMarshalString1(info.getSubcriptionName(), bs);
+ rc += tightMarshalString1(info.getSubscriptionName(), bs);
return rc + 0;
}
@@ -105,7 +105,7 @@
tightMarshalString2(info.getClientId(), dataOut, bs);
tightMarshalCachedObject2(wireFormat,
(DataStructure)info.getDestination(), dataOut, bs);
tightMarshalString2(info.getSelector(), dataOut, bs);
- tightMarshalString2(info.getSubcriptionName(), dataOut, bs);
+ tightMarshalString2(info.getSubscriptionName(), dataOut, bs);
}
@@ -123,7 +123,7 @@
info.setClientId(looseUnmarshalString(dataIn));
info.setDestination((org.apache.activemq.command.ActiveMQDestination)
looseUnmarsalCachedObject(wireFormat, dataIn));
info.setSelector(looseUnmarshalString(dataIn));
- info.setSubcriptionName(looseUnmarshalString(dataIn));
+ info.setSubscriptionName(looseUnmarshalString(dataIn));
}
@@ -139,7 +139,7 @@
looseMarshalString(info.getClientId(), dataOut);
looseMarshalCachedObject(wireFormat,
(DataStructure)info.getDestination(), dataOut);
looseMarshalString(info.getSelector(), dataOut);
- looseMarshalString(info.getSubcriptionName(), dataOut);
+ looseMarshalString(info.getSubscriptionName(), dataOut);
}
}
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoMarshaller.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoMarshaller.java?rev=800776&r1=800775&r2=800776&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoMarshaller.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoMarshaller.java
Tue Aug 4 13:36:39 2009
@@ -68,7 +68,7 @@
RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
info.setConnectionId((org.apache.activemq.command.ConnectionId)
tightUnmarsalCachedObject(wireFormat, dataIn, bs));
- info.setSubcriptionName(tightUnmarshalString(dataIn, bs));
+ info.setSubscriptionName(tightUnmarshalString(dataIn, bs));
info.setClientId(tightUnmarshalString(dataIn, bs));
}
@@ -83,7 +83,7 @@
int rc = super.tightMarshal1(wireFormat, o, bs);
rc += tightMarshalCachedObject1(wireFormat,
(DataStructure)info.getConnectionId(), bs);
- rc += tightMarshalString1(info.getSubcriptionName(), bs);
+ rc += tightMarshalString1(info.getSubscriptionName(), bs);
rc += tightMarshalString1(info.getClientId(), bs);
return rc + 0;
@@ -101,7 +101,7 @@
RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
tightMarshalCachedObject2(wireFormat,
(DataStructure)info.getConnectionId(), dataOut, bs);
- tightMarshalString2(info.getSubcriptionName(), dataOut, bs);
+ tightMarshalString2(info.getSubscriptionName(), dataOut, bs);
tightMarshalString2(info.getClientId(), dataOut, bs);
}
@@ -118,7 +118,7 @@
RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
info.setConnectionId((org.apache.activemq.command.ConnectionId)
looseUnmarsalCachedObject(wireFormat, dataIn));
- info.setSubcriptionName(looseUnmarshalString(dataIn));
+ info.setSubscriptionName(looseUnmarshalString(dataIn));
info.setClientId(looseUnmarshalString(dataIn));
}
@@ -133,7 +133,7 @@
super.looseMarshal(wireFormat, o, dataOut);
looseMarshalCachedObject(wireFormat,
(DataStructure)info.getConnectionId(), dataOut);
- looseMarshalString(info.getSubcriptionName(), dataOut);
+ looseMarshalString(info.getSubscriptionName(), dataOut);
looseMarshalString(info.getClientId(), dataOut);
}
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SubscriptionInfoMarshaller.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SubscriptionInfoMarshaller.java?rev=800776&r1=800775&r2=800776&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SubscriptionInfoMarshaller.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SubscriptionInfoMarshaller.java
Tue Aug 4 13:36:39 2009
@@ -70,7 +70,7 @@
info.setClientId(tightUnmarshalString(dataIn, bs));
info.setDestination((org.apache.activemq.command.ActiveMQDestination)
tightUnmarsalCachedObject(wireFormat, dataIn, bs));
info.setSelector(tightUnmarshalString(dataIn, bs));
- info.setSubcriptionName(tightUnmarshalString(dataIn, bs));
+ info.setSubscriptionName(tightUnmarshalString(dataIn, bs));
info.setSubscribedDestination((org.apache.activemq.command.ActiveMQDestination)
tightUnmarsalNestedObject(wireFormat, dataIn, bs));
}
@@ -87,7 +87,7 @@
rc += tightMarshalString1(info.getClientId(), bs);
rc += tightMarshalCachedObject1(wireFormat,
(DataStructure)info.getDestination(), bs);
rc += tightMarshalString1(info.getSelector(), bs);
- rc += tightMarshalString1(info.getSubcriptionName(), bs);
+ rc += tightMarshalString1(info.getSubscriptionName(), bs);
rc += tightMarshalNestedObject1(wireFormat,
(DataStructure)info.getSubscribedDestination(), bs);
return rc + 0;
@@ -107,7 +107,7 @@
tightMarshalString2(info.getClientId(), dataOut, bs);
tightMarshalCachedObject2(wireFormat,
(DataStructure)info.getDestination(), dataOut, bs);
tightMarshalString2(info.getSelector(), dataOut, bs);
- tightMarshalString2(info.getSubcriptionName(), dataOut, bs);
+ tightMarshalString2(info.getSubscriptionName(), dataOut, bs);
tightMarshalNestedObject2(wireFormat,
(DataStructure)info.getSubscribedDestination(), dataOut, bs);
}
@@ -126,7 +126,7 @@
info.setClientId(looseUnmarshalString(dataIn));
info.setDestination((org.apache.activemq.command.ActiveMQDestination)
looseUnmarsalCachedObject(wireFormat, dataIn));
info.setSelector(looseUnmarshalString(dataIn));
- info.setSubcriptionName(looseUnmarshalString(dataIn));
+ info.setSubscriptionName(looseUnmarshalString(dataIn));
info.setSubscribedDestination((org.apache.activemq.command.ActiveMQDestination)
looseUnmarsalNestedObject(wireFormat, dataIn));
}
@@ -143,7 +143,7 @@
looseMarshalString(info.getClientId(), dataOut);
looseMarshalCachedObject(wireFormat,
(DataStructure)info.getDestination(), dataOut);
looseMarshalString(info.getSelector(), dataOut);
- looseMarshalString(info.getSubcriptionName(), dataOut);
+ looseMarshalString(info.getSubscriptionName(), dataOut);
looseMarshalNestedObject(wireFormat,
(DataStructure)info.getSubscribedDestination(), dataOut);
}
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v4/RemoveSubscriptionInfoMarshaller.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v4/RemoveSubscriptionInfoMarshaller.java?rev=800776&r1=800775&r2=800776&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v4/RemoveSubscriptionInfoMarshaller.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v4/RemoveSubscriptionInfoMarshaller.java
Tue Aug 4 13:36:39 2009
@@ -67,7 +67,7 @@
RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
info.setConnectionId((org.apache.activemq.command.ConnectionId)
tightUnmarsalCachedObject(wireFormat, dataIn, bs));
- info.setSubcriptionName(tightUnmarshalString(dataIn, bs));
+ info.setSubscriptionName(tightUnmarshalString(dataIn, bs));
info.setClientId(tightUnmarshalString(dataIn, bs));
}
@@ -82,7 +82,7 @@
int rc = super.tightMarshal1(wireFormat, o, bs);
rc += tightMarshalCachedObject1(wireFormat,
(DataStructure)info.getConnectionId(), bs);
- rc += tightMarshalString1(info.getSubcriptionName(), bs);
+ rc += tightMarshalString1(info.getSubscriptionName(), bs);
rc += tightMarshalString1(info.getClientId(), bs);
return rc + 0;
@@ -100,7 +100,7 @@
RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
tightMarshalCachedObject2(wireFormat,
(DataStructure)info.getConnectionId(), dataOut, bs);
- tightMarshalString2(info.getSubcriptionName(), dataOut, bs);
+ tightMarshalString2(info.getSubscriptionName(), dataOut, bs);
tightMarshalString2(info.getClientId(), dataOut, bs);
}
@@ -117,7 +117,7 @@
RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
info.setConnectionId((org.apache.activemq.command.ConnectionId)
looseUnmarsalCachedObject(wireFormat, dataIn));
- info.setSubcriptionName(looseUnmarshalString(dataIn));
+ info.setSubscriptionName(looseUnmarshalString(dataIn));
info.setClientId(looseUnmarshalString(dataIn));
}
@@ -132,7 +132,7 @@
super.looseMarshal(wireFormat, o, dataOut);
looseMarshalCachedObject(wireFormat,
(DataStructure)info.getConnectionId(), dataOut);
- looseMarshalString(info.getSubcriptionName(), dataOut);
+ looseMarshalString(info.getSubscriptionName(), dataOut);
looseMarshalString(info.getClientId(), dataOut);
}
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v4/SubscriptionInfoMarshaller.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v4/SubscriptionInfoMarshaller.java?rev=800776&r1=800775&r2=800776&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v4/SubscriptionInfoMarshaller.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v4/SubscriptionInfoMarshaller.java
Tue Aug 4 13:36:39 2009
@@ -69,7 +69,7 @@
info.setClientId(tightUnmarshalString(dataIn, bs));
info.setDestination((org.apache.activemq.command.ActiveMQDestination)
tightUnmarsalCachedObject(wireFormat, dataIn, bs));
info.setSelector(tightUnmarshalString(dataIn, bs));
- info.setSubcriptionName(tightUnmarshalString(dataIn, bs));
+ info.setSubscriptionName(tightUnmarshalString(dataIn, bs));
info.setSubscribedDestination((org.apache.activemq.command.ActiveMQDestination)
tightUnmarsalNestedObject(wireFormat, dataIn, bs));
}
@@ -86,7 +86,7 @@
rc += tightMarshalString1(info.getClientId(), bs);
rc += tightMarshalCachedObject1(wireFormat,
(DataStructure)info.getDestination(), bs);
rc += tightMarshalString1(info.getSelector(), bs);
- rc += tightMarshalString1(info.getSubcriptionName(), bs);
+ rc += tightMarshalString1(info.getSubscriptionName(), bs);
rc += tightMarshalNestedObject1(wireFormat,
(DataStructure)info.getSubscribedDestination(), bs);
return rc + 0;
@@ -106,7 +106,7 @@
tightMarshalString2(info.getClientId(), dataOut, bs);
tightMarshalCachedObject2(wireFormat,
(DataStructure)info.getDestination(), dataOut, bs);
tightMarshalString2(info.getSelector(), dataOut, bs);
- tightMarshalString2(info.getSubcriptionName(), dataOut, bs);
+ tightMarshalString2(info.getSubscriptionName(), dataOut, bs);
tightMarshalNestedObject2(wireFormat,
(DataStructure)info.getSubscribedDestination(), dataOut, bs);
}
@@ -125,7 +125,7 @@
info.setClientId(looseUnmarshalString(dataIn));
info.setDestination((org.apache.activemq.command.ActiveMQDestination)
looseUnmarsalCachedObject(wireFormat, dataIn));
info.setSelector(looseUnmarshalString(dataIn));
- info.setSubcriptionName(looseUnmarshalString(dataIn));
+ info.setSubscriptionName(looseUnmarshalString(dataIn));
info.setSubscribedDestination((org.apache.activemq.command.ActiveMQDestination)
looseUnmarsalNestedObject(wireFormat, dataIn));
}
@@ -142,7 +142,7 @@
looseMarshalString(info.getClientId(), dataOut);
looseMarshalCachedObject(wireFormat,
(DataStructure)info.getDestination(), dataOut);
looseMarshalString(info.getSelector(), dataOut);
- looseMarshalString(info.getSubcriptionName(), dataOut);
+ looseMarshalString(info.getSubscriptionName(), dataOut);
looseMarshalNestedObject(wireFormat,
(DataStructure)info.getSubscribedDestination(), dataOut);
}
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v5/RemoveSubscriptionInfoMarshaller.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v5/RemoveSubscriptionInfoMarshaller.java?rev=800776&r1=800775&r2=800776&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v5/RemoveSubscriptionInfoMarshaller.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v5/RemoveSubscriptionInfoMarshaller.java
Tue Aug 4 13:36:39 2009
@@ -67,7 +67,7 @@
RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
info.setConnectionId((org.apache.activemq.command.ConnectionId)
tightUnmarsalCachedObject(wireFormat, dataIn, bs));
- info.setSubcriptionName(tightUnmarshalString(dataIn, bs));
+ info.setSubscriptionName(tightUnmarshalString(dataIn, bs));
info.setClientId(tightUnmarshalString(dataIn, bs));
}
@@ -82,7 +82,7 @@
int rc = super.tightMarshal1(wireFormat, o, bs);
rc += tightMarshalCachedObject1(wireFormat,
(DataStructure)info.getConnectionId(), bs);
- rc += tightMarshalString1(info.getSubcriptionName(), bs);
+ rc += tightMarshalString1(info.getSubscriptionName(), bs);
rc += tightMarshalString1(info.getClientId(), bs);
return rc + 0;
@@ -100,7 +100,7 @@
RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
tightMarshalCachedObject2(wireFormat,
(DataStructure)info.getConnectionId(), dataOut, bs);
- tightMarshalString2(info.getSubcriptionName(), dataOut, bs);
+ tightMarshalString2(info.getSubscriptionName(), dataOut, bs);
tightMarshalString2(info.getClientId(), dataOut, bs);
}
@@ -117,7 +117,7 @@
RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
info.setConnectionId((org.apache.activemq.command.ConnectionId)
looseUnmarsalCachedObject(wireFormat, dataIn));
- info.setSubcriptionName(looseUnmarshalString(dataIn));
+ info.setSubscriptionName(looseUnmarshalString(dataIn));
info.setClientId(looseUnmarshalString(dataIn));
}
@@ -132,7 +132,7 @@
super.looseMarshal(wireFormat, o, dataOut);
looseMarshalCachedObject(wireFormat,
(DataStructure)info.getConnectionId(), dataOut);
- looseMarshalString(info.getSubcriptionName(), dataOut);
+ looseMarshalString(info.getSubscriptionName(), dataOut);
looseMarshalString(info.getClientId(), dataOut);
}
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v5/SubscriptionInfoMarshaller.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v5/SubscriptionInfoMarshaller.java?rev=800776&r1=800775&r2=800776&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v5/SubscriptionInfoMarshaller.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v5/SubscriptionInfoMarshaller.java
Tue Aug 4 13:36:39 2009
@@ -69,7 +69,7 @@
info.setClientId(tightUnmarshalString(dataIn, bs));
info.setDestination((org.apache.activemq.command.ActiveMQDestination)
tightUnmarsalCachedObject(wireFormat, dataIn, bs));
info.setSelector(tightUnmarshalString(dataIn, bs));
- info.setSubcriptionName(tightUnmarshalString(dataIn, bs));
+ info.setSubscriptionName(tightUnmarshalString(dataIn, bs));
info.setSubscribedDestination((org.apache.activemq.command.ActiveMQDestination)
tightUnmarsalNestedObject(wireFormat, dataIn, bs));
}
@@ -86,7 +86,7 @@
rc += tightMarshalString1(info.getClientId(), bs);
rc += tightMarshalCachedObject1(wireFormat,
(DataStructure)info.getDestination(), bs);
rc += tightMarshalString1(info.getSelector(), bs);
- rc += tightMarshalString1(info.getSubcriptionName(), bs);
+ rc += tightMarshalString1(info.getSubscriptionName(), bs);
rc += tightMarshalNestedObject1(wireFormat,
(DataStructure)info.getSubscribedDestination(), bs);
return rc + 0;
@@ -106,7 +106,7 @@
tightMarshalString2(info.getClientId(), dataOut, bs);
tightMarshalCachedObject2(wireFormat,
(DataStructure)info.getDestination(), dataOut, bs);
tightMarshalString2(info.getSelector(), dataOut, bs);
- tightMarshalString2(info.getSubcriptionName(), dataOut, bs);
+ tightMarshalString2(info.getSubscriptionName(), dataOut, bs);
tightMarshalNestedObject2(wireFormat,
(DataStructure)info.getSubscribedDestination(), dataOut, bs);
}
@@ -125,7 +125,7 @@
info.setClientId(looseUnmarshalString(dataIn));
info.setDestination((org.apache.activemq.command.ActiveMQDestination)
looseUnmarsalCachedObject(wireFormat, dataIn));
info.setSelector(looseUnmarshalString(dataIn));
- info.setSubcriptionName(looseUnmarshalString(dataIn));
+ info.setSubscriptionName(looseUnmarshalString(dataIn));
info.setSubscribedDestination((org.apache.activemq.command.ActiveMQDestination)
looseUnmarsalNestedObject(wireFormat, dataIn));
}
@@ -142,7 +142,7 @@
looseMarshalString(info.getClientId(), dataOut);
looseMarshalCachedObject(wireFormat,
(DataStructure)info.getDestination(), dataOut);
looseMarshalString(info.getSelector(), dataOut);
- looseMarshalString(info.getSubcriptionName(), dataOut);
+ looseMarshalString(info.getSubscriptionName(), dataOut);
looseMarshalNestedObject(wireFormat,
(DataStructure)info.getSubscribedDestination(), dataOut);
}
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/CombinationTestSupport.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/CombinationTestSupport.java?rev=800776&r1=800775&r2=800776&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/CombinationTestSupport.java
(original)
+++
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/CombinationTestSupport.java
Tue Aug 4 13:36:39 2009
@@ -115,16 +115,16 @@
private CombinationTestSupport[] getCombinations() {
try {
- Method method = getClass().getMethod("initCombos", null);
- method.invoke(this, null);
+ Method method = getClass().getMethod("initCombos", (Class[])null);
+ method.invoke(this, (Object[])null);
} catch (Throwable e) {
}
String name = getName().split(" ")[0];
String comboSetupMethodName = "initCombosFor" +
Character.toUpperCase(name.charAt(0)) + name.substring(1);
try {
- Method method = getClass().getMethod(comboSetupMethodName, null);
- method.invoke(this, null);
+ Method method = getClass().getMethod(comboSetupMethodName,
(Class[])null);
+ method.invoke(this, (Object[])null);
} catch (Throwable e) {
}
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/DataStructureTestSupport.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/DataStructureTestSupport.java?rev=800776&r1=800775&r2=800776&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/DataStructureTestSupport.java
(original)
+++
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/DataStructureTestSupport.java
Tue Aug 4 13:36:39 2009
@@ -127,7 +127,7 @@
}
try {
- assertEquals(method.invoke(expect, null),
method.invoke(was, null));
+ assertEquals(method.invoke(expect, (Object)null),
method.invoke(was, (Object)null));
} catch (IllegalArgumentException e) {
} catch (IllegalAccessException e) {
} catch (InvocationTargetException e) {
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoTest.java?rev=800776&r1=800775&r2=800776&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoTest.java
(original)
+++
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoTest.java
Tue Aug 4 13:36:39 2009
@@ -42,7 +42,7 @@
super.populateObject(object);
RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)object;
info.setConnectionId(createConnectionId("ConnectionId:1"));
- info.setSubcriptionName("SubcriptionName:2");
+ info.setSubscriptionName("SubcriptionName:2");
info.setClientId("ClientId:3");
}
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/SubscriptionInfoTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/SubscriptionInfoTest.java?rev=800776&r1=800775&r2=800776&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/SubscriptionInfoTest.java
(original)
+++
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/SubscriptionInfoTest.java
Tue Aug 4 13:36:39 2009
@@ -45,7 +45,7 @@
info.setClientId("ClientId:1");
info.setDestination(createActiveMQDestination("Destination:2"));
info.setSelector("Selector:3");
- info.setSubcriptionName("SubcriptionName:4");
+ info.setSubscriptionName("SubcriptionName:4");
}
}
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/RemoveSubscriptionInfoTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/RemoveSubscriptionInfoTest.java?rev=800776&r1=800775&r2=800776&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/RemoveSubscriptionInfoTest.java
(original)
+++
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/RemoveSubscriptionInfoTest.java
Tue Aug 4 13:36:39 2009
@@ -46,7 +46,7 @@
RemoveSubscriptionInfo info = (RemoveSubscriptionInfo) object;
info.setConnectionId(createConnectionId("ConnectionId:1"));
- info.setSubcriptionName("SubcriptionName:2");
+ info.setSubscriptionName("SubcriptionName:2");
info.setClientId("ClientId:3");
}
}
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/SubscriptionInfoTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/SubscriptionInfoTest.java?rev=800776&r1=800775&r2=800776&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/SubscriptionInfoTest.java
(original)
+++
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/SubscriptionInfoTest.java
Tue Aug 4 13:36:39 2009
@@ -49,6 +49,6 @@
info.setClientId("ClientId:1");
info.setDestination(createActiveMQDestination("Destination:2"));
info.setSelector("Selector:3");
- info.setSubcriptionName("SubcriptionName:4");
+ info.setSubscriptionName("SubcriptionName:4");
}
}
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoTest.java?rev=800776&r1=800775&r2=800776&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoTest.java
(original)
+++
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoTest.java
Tue Aug 4 13:36:39 2009
@@ -46,7 +46,7 @@
RemoveSubscriptionInfo info = (RemoveSubscriptionInfo) object;
info.setConnectionId(createConnectionId("ConnectionId:1"));
- info.setSubcriptionName("SubcriptionName:2");
+ info.setSubscriptionName("SubcriptionName:2");
info.setClientId("ClientId:3");
}
}
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/SubscriptionInfoTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/SubscriptionInfoTest.java?rev=800776&r1=800775&r2=800776&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/SubscriptionInfoTest.java
(original)
+++
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/SubscriptionInfoTest.java
Tue Aug 4 13:36:39 2009
@@ -49,7 +49,7 @@
info.setClientId("ClientId:1");
info.setDestination(createActiveMQDestination("Destination:2"));
info.setSelector("Selector:3");
- info.setSubcriptionName("SubcriptionName:4");
+ info.setSubscriptionName("SubcriptionName:4");
info.setSubscribedDestination(createActiveMQDestination("SubscribedDestination:5"));
}
}
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v4/RemoveSubscriptionInfoTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v4/RemoveSubscriptionInfoTest.java?rev=800776&r1=800775&r2=800776&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v4/RemoveSubscriptionInfoTest.java
(original)
+++
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v4/RemoveSubscriptionInfoTest.java
Tue Aug 4 13:36:39 2009
@@ -52,7 +52,7 @@
RemoveSubscriptionInfo info = (RemoveSubscriptionInfo) object;
info.setConnectionId(createConnectionId("ConnectionId:1"));
- info.setSubcriptionName("SubcriptionName:2");
+ info.setSubscriptionName("SubcriptionName:2");
info.setClientId("ClientId:3");
}
}
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v4/SubscriptionInfoTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v4/SubscriptionInfoTest.java?rev=800776&r1=800775&r2=800776&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v4/SubscriptionInfoTest.java
(original)
+++
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v4/SubscriptionInfoTest.java
Tue Aug 4 13:36:39 2009
@@ -54,7 +54,7 @@
info.setClientId("ClientId:1");
info.setDestination(createActiveMQDestination("Destination:2"));
info.setSelector("Selector:3");
- info.setSubcriptionName("SubcriptionName:4");
+ info.setSubscriptionName("SubcriptionName:4");
info.setSubscribedDestination(createActiveMQDestination("SubscribedDestination:5"));
}
}
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v5/RemoveSubscriptionInfoTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v5/RemoveSubscriptionInfoTest.java?rev=800776&r1=800775&r2=800776&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v5/RemoveSubscriptionInfoTest.java
(original)
+++
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v5/RemoveSubscriptionInfoTest.java
Tue Aug 4 13:36:39 2009
@@ -52,7 +52,7 @@
RemoveSubscriptionInfo info = (RemoveSubscriptionInfo) object;
info.setConnectionId(createConnectionId("ConnectionId:1"));
- info.setSubcriptionName("SubcriptionName:2");
+ info.setSubscriptionName("SubcriptionName:2");
info.setClientId("ClientId:3");
}
}
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v5/SubscriptionInfoTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v5/SubscriptionInfoTest.java?rev=800776&r1=800775&r2=800776&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v5/SubscriptionInfoTest.java
(original)
+++
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v5/SubscriptionInfoTest.java
Tue Aug 4 13:36:39 2009
@@ -54,7 +54,7 @@
info.setClientId("ClientId:1");
info.setDestination(createActiveMQDestination("Destination:2"));
info.setSelector("Selector:3");
- info.setSubcriptionName("SubcriptionName:4");
+ info.setSubscriptionName("SubcriptionName:4");
info.setSubscribedDestination(createActiveMQDestination("SubscribedDestination:5"));
}
}
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslBrokerServiceTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslBrokerServiceTest.java?rev=800776&r1=800775&r2=800776&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslBrokerServiceTest.java
(original)
+++
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslBrokerServiceTest.java
Tue Aug 4 13:36:39 2009
@@ -32,6 +32,7 @@
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.SslBrokerService;
+import org.apache.activemq.broker.SslContext;
import org.apache.activemq.transport.TransportBrokerTestSupport;
import org.apache.activemq.transport.TransportFactory;
@@ -52,7 +53,8 @@
// for client side
SslTransportFactory sslFactory = new SslTransportFactory();
- sslFactory.setKeyAndTrustManagers(km, tm, null);
+ SslContext ctx = new SslContext(km, tm, null);
+ SslContext.setCurrentSslContext(ctx);
TransportFactory.registerTransportFactory("ssl", sslFactory);
return service;
