You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2012/08/25 02:28:26 UTC
svn commit: r1377164 - in
/activemq/activemq-apollo/trunk/apollo-broker/src/main:
resources/META-INF/services/org.apache.activemq.apollo/
scala/org/apache/activemq/apollo/broker/protocol/
Author: chirino
Date: Sat Aug 25 00:28:26 2012
New Revision: 1377164
URL: http://svn.apache.org/viewvc?rev=1377164&view=rev
Log:
Rename SSL->Ssl to keep naming consistent.
Added:
activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/SslProtocol.scala
- copied, changed from r1377163, activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/SSLProtocol.scala
Removed:
activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/SSLProtocol.scala
Modified:
activemq/activemq-apollo/trunk/apollo-broker/src/main/resources/META-INF/services/org.apache.activemq.apollo/protocol-factory.index
Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/resources/META-INF/services/org.apache.activemq.apollo/protocol-factory.index
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/resources/META-INF/services/org.apache.activemq.apollo/protocol-factory.index?rev=1377164&r1=1377163&r2=1377164&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/resources/META-INF/services/org.apache.activemq.apollo/protocol-factory.index (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/resources/META-INF/services/org.apache.activemq.apollo/protocol-factory.index Sat Aug 25 00:28:26 2012
@@ -16,4 +16,4 @@
## ---------------------------------------------------------------------------
org.apache.activemq.apollo.broker.protocol.AnyProtocol
org.apache.activemq.apollo.broker.protocol.UdpProtocol
-org.apache.activemq.apollo.broker.protocol.SSLProtocol
+org.apache.activemq.apollo.broker.protocol.SslProtocol
Copied: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/SslProtocol.scala (from r1377163, activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/SSLProtocol.scala)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/SslProtocol.scala?p2=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/SslProtocol.scala&p1=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/SSLProtocol.scala&r1=1377163&r2=1377164&rev=1377164&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/SSLProtocol.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/SslProtocol.scala Sat Aug 25 00:28:26 2012
@@ -15,15 +15,15 @@
* limitations under the License.
*/
package org.apache.activemq.apollo.broker.protocol
-import org.fusesource.hawtdispatch.transport.SSLProtocolCodec
+import org.fusesource.hawtdispatch.transport.SslProtocolCodec
import org.fusesource.hawtbuf.Buffer
import org.apache.activemq.apollo.broker.Connector
import org.apache.activemq.apollo.dto.SslDTO
-import org.fusesource.hawtdispatch.transport.SSLProtocolCodec.ClientAuth
+import org.fusesource.hawtdispatch.transport.SslProtocolCodec.ClientAuth
/**
*/
-class SSLProtocol extends Protocol {
+class SslProtocol extends Protocol {
def id(): String = "ssl"
override def isIdentifiable = true
@@ -68,7 +68,7 @@ class SSLProtocol extends Protocol {
"SSL"
}
- val rc = new SSLProtocolCodec()
+ val rc = new SslProtocolCodec()
rc.setSSLContext(connector.broker.ssl_context(version))
rc.server(client_auth);
rc.setNext(new AnyProtocolCodec(connector))