activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1207933 - in /activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker: Broker.scala jaxb/XmlBrokerFactory.scala
Date Tue, 29 Nov 2011 15:56:25 GMT
Author: chirino
Date: Tue Nov 29 15:56:24 2011
New Revision: 1207933

URL: http://svn.apache.org/viewvc?rev=1207933&view=rev
Log:
Avoid naming the BrokerFactory interface the same as the object class so that the object class
can still be used by java code.

Modified:
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jaxb/XmlBrokerFactory.scala

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala?rev=1207933&r1=1207932&r2=1207933&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala
Tue Nov 29 15:56:24 2011
@@ -42,7 +42,7 @@ import security.SecuredResource.BrokerKi
  *
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-trait BrokerFactory {
+trait BrokerFactoryTrait {
   def createBroker(brokerURI:String):Broker
 }
 
@@ -55,7 +55,7 @@ trait BrokerFactory {
  */
 object BrokerFactory {
 
-  val finder = new ClassFinder[BrokerFactory]("META-INF/services/org.apache.activemq.apollo/broker-factory.index",classOf[BrokerFactory])
+  val finder = new ClassFinder[BrokerFactoryTrait]("META-INF/services/org.apache.activemq.apollo/broker-factory.index",classOf[BrokerFactoryTrait])
 
   def createBroker(uri:String):Broker = {
     if( uri == null ) {

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jaxb/XmlBrokerFactory.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jaxb/XmlBrokerFactory.scala?rev=1207933&r1=1207932&r2=1207933&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jaxb/XmlBrokerFactory.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jaxb/XmlBrokerFactory.scala
Tue Nov 29 15:56:24 2011
@@ -25,7 +25,7 @@ import java.lang.String
 import XmlCodec._
 import org.apache.activemq.apollo.util._
 
-class XmlBrokerFactory extends BrokerFactory {
+class XmlBrokerFactory extends BrokerFactoryTrait {
 
   def createBroker(value: String): Broker = {
     try {



Mime
View raw message