r/m unused SSLTransportFactory.java (CustomTThreadPoolServer uses TSSLTransportFactory directly)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c533b888 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c533b888 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c533b888 Branch: refs/heads/trunk Commit: c533b888510c1e6f78b9f3100e259a7b784bddbb Parents: 46f1c7f Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Dec 5 13:29:04 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Dec 5 13:29:18 2012 -0600 ---------------------------------------------------------------------- .../cli/transport/FramedTransportFactory.java | 1 - .../cassandra/stress/SSLTransportFactory.java | 45 --------------- 2 files changed, 0 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c533b888/src/java/org/apache/cassandra/cli/transport/FramedTransportFactory.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cli/transport/FramedTransportFactory.java b/src/java/org/apache/cassandra/cli/transport/FramedTransportFactory.java index 653d45f..dc7ef81 100644 --- a/src/java/org/apache/cassandra/cli/transport/FramedTransportFactory.java +++ b/src/java/org/apache/cassandra/cli/transport/FramedTransportFactory.java @@ -23,7 +23,6 @@ import org.apache.thrift.transport.TTransportFactory; public class FramedTransportFactory extends TTransportFactory { - public static final int DEFAULT_MAX_FRAME_SIZE = 15 * 1024 * 1024; // 15 MiB public TTransport getTransport(TTransport base) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c533b888/tools/stress/src/org/apache/cassandra/stress/SSLTransportFactory.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/SSLTransportFactory.java b/tools/stress/src/org/apache/cassandra/stress/SSLTransportFactory.java deleted file mode 100644 index 8fd4006..0000000 --- a/tools/stress/src/org/apache/cassandra/stress/SSLTransportFactory.java +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.cassandra.stress; - -import org.apache.cassandra.cli.transport.FramedTransportFactory; -import org.apache.thrift.transport.TSSLTransportFactory; -import org.apache.thrift.transport.TSSLTransportFactory.TSSLTransportParameters; -import org.apache.thrift.transport.TTransport; -import org.apache.thrift.transport.TTransportException; -import org.apache.thrift.transport.TTransportFactory; - -public class SSLTransportFactory extends TTransportFactory -{ - public TTransport getTransport(TTransport trans) - { - final Session session = Stress.session; - try - { - String hostName = session.nodes[Stress.randomizer.nextInt(session.nodes.length)]; - TSSLTransportParameters params = new TSSLTransportParameters(session.encOptions.protocol, session.encOptions.cipher_suites); - params.setTrustStore(session.encOptions.truststore, session.encOptions.truststore_password); - trans = TSSLTransportFactory.getClientSocket(hostName, session.port, 0, params); - return new FramedTransportFactory().getTransport(trans); - } - catch (TTransportException e) - { - throw new RuntimeException("Failed to create a client SSL connection.", e); - } - } -}