diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/broker/broker b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/broker/broker new file mode 100644 index 0000000000..9fd250435f --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/broker/broker @@ -0,0 +1 @@ +class=org.apache.activemq.broker.DefaultBrokerFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/broker/xbean b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/broker/xbean new file mode 100644 index 0000000000..99bca91cff --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/broker/xbean @@ -0,0 +1 @@ +class=org.apache.activemq.xbean.XBeanBrokerFactory \ No newline at end of file diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/apache_derby_embedded_jdbc_driver b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/apache_derby_embedded_jdbc_driver new file mode 100644 index 0000000000..a2d8d40e92 --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/apache_derby_embedded_jdbc_driver @@ -0,0 +1 @@ +class=org.apache.activemq.store.jdbc.adapter.DefaultJDBCAdapter \ No newline at end of file diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/axion_jdbc_driver b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/axion_jdbc_driver new file mode 100644 index 0000000000..f2ff7bde61 --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/axion_jdbc_driver @@ -0,0 +1 @@ +class=org.apache.activemq.store.jdbc.adapter.AxionJDBCAdapter \ No newline at end of file diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/hsql_database_engine_driver b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/hsql_database_engine_driver new file mode 100644 index 0000000000..7ed249d783 --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/hsql_database_engine_driver @@ -0,0 +1 @@ +class=org.apache.activemq.store.jdbc.adapter.HsqldbJDBCAdapter \ No newline at end of file diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/i-net_sprinta_2000 b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/i-net_sprinta_2000 new file mode 100644 index 0000000000..4feace8c4b --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/i-net_sprinta_2000 @@ -0,0 +1 @@ +class=org.apache.activemq.store.jdbc.adapter.ImageBasedJDBCAdaptor \ No newline at end of file diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/ibm_informix_jdbc_driver_for_ibm_informix_dynamic_server b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/ibm_informix_jdbc_driver_for_ibm_informix_dynamic_server new file mode 100644 index 0000000000..2d293883f5 --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/ibm_informix_jdbc_driver_for_ibm_informix_dynamic_server @@ -0,0 +1 @@ +class=org.apache.activemq.store.jdbc.adapter.InformixJDBCAdapter \ No newline at end of file diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/jconnect__tm__for_jdbc__tm_ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/jconnect__tm__for_jdbc__tm_ new file mode 100644 index 0000000000..4feace8c4b --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/jconnect__tm__for_jdbc__tm_ @@ -0,0 +1 @@ +class=org.apache.activemq.store.jdbc.adapter.ImageBasedJDBCAdaptor \ No newline at end of file diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/jtds_type_4_jdbc_driver_for_ms_sql_server_and_sybase b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/jtds_type_4_jdbc_driver_for_ms_sql_server_and_sybase new file mode 100644 index 0000000000..4feace8c4b --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/jtds_type_4_jdbc_driver_for_ms_sql_server_and_sybase @@ -0,0 +1 @@ +class=org.apache.activemq.store.jdbc.adapter.ImageBasedJDBCAdaptor \ No newline at end of file diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/oracle_jdbc_driver b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/oracle_jdbc_driver new file mode 100644 index 0000000000..ec3420b084 --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/oracle_jdbc_driver @@ -0,0 +1 @@ +class=org.apache.activemq.store.jdbc.adapter.OracleJDBCAdapter \ No newline at end of file diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/postgresql_native_driver b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/postgresql_native_driver new file mode 100644 index 0000000000..77b96276fd --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/postgresql_native_driver @@ -0,0 +1 @@ +class=org.apache.activemq.store.jdbc.adapter.PostgresqlJDBCAdapter \ No newline at end of file diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/sqlserver b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/sqlserver new file mode 100644 index 0000000000..4feace8c4b --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc/sqlserver @@ -0,0 +1 @@ +class=org.apache.activemq.store.jdbc.adapter.ImageBasedJDBCAdaptor \ No newline at end of file diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/aio b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/aio new file mode 100644 index 0000000000..4eed7519c9 --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/aio @@ -0,0 +1 @@ +class=org.apache.activemq.transport.activeio.ActiveIOTransportFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discovery b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discovery new file mode 100644 index 0000000000..7db9e2f4c7 --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discovery @@ -0,0 +1 @@ +class=org.apache.activemq.transport.discovery.DiscoveryTransportFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/multicast b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/multicast new file mode 100644 index 0000000000..a90ff8d63b --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/multicast @@ -0,0 +1 @@ +class=org.apache.activemq.transport.discovery.multicast.MulticastDiscoveryAgentFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/rendezvous b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/rendezvous new file mode 100644 index 0000000000..d68e8db016 --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/rendezvous @@ -0,0 +1 @@ +class=org.apache.activemq.transport.discovery.rendezvous.RendezvousDiscoveryAgentFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/simple b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/simple new file mode 100644 index 0000000000..d9ba873cfa --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/simple @@ -0,0 +1 @@ +class=org.apache.activemq.transport.discovery.simple.SimpleDiscoveryAgentFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/static b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/static new file mode 100644 index 0000000000..d9ba873cfa --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/static @@ -0,0 +1 @@ +class=org.apache.activemq.transport.discovery.simple.SimpleDiscoveryAgentFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/failover b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/failover new file mode 100644 index 0000000000..65a4497548 --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/failover @@ -0,0 +1 @@ +class=org.apache.activemq.transport.failover.FailoverTransportFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/fanout b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/fanout new file mode 100644 index 0000000000..c5939d9982 --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/fanout @@ -0,0 +1 @@ +class=org.apache.activemq.transport.fanout.FanoutTransportFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/jxta b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/jxta new file mode 100644 index 0000000000..4eed7519c9 --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/jxta @@ -0,0 +1 @@ +class=org.apache.activemq.transport.activeio.ActiveIOTransportFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/mock b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/mock new file mode 100644 index 0000000000..1fc4caceac --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/mock @@ -0,0 +1 @@ +class=org.apache.activemq.transport.mock.MockTransportFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/nio b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/nio new file mode 100644 index 0000000000..4eed7519c9 --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/nio @@ -0,0 +1 @@ +class=org.apache.activemq.transport.activeio.ActiveIOTransportFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/peer b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/peer new file mode 100644 index 0000000000..f236efdb92 --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/peer @@ -0,0 +1 @@ +class=org.apache.activemq.transport.peer.PeerTransportFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/ssl b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/ssl new file mode 100644 index 0000000000..4eed7519c9 --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/ssl @@ -0,0 +1 @@ +class=org.apache.activemq.transport.activeio.ActiveIOTransportFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/stomp b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/stomp new file mode 100644 index 0000000000..7fea220ed1 --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/stomp @@ -0,0 +1 @@ +class=org.apache.activemq.transport.stomp.StompTransportFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/tcp b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/tcp new file mode 100644 index 0000000000..f2e100d6a3 --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/tcp @@ -0,0 +1 @@ +class=org.apache.activemq.transport.tcp.TcpTransportFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/vm b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/vm new file mode 100644 index 0000000000..9b14f93397 --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/vm @@ -0,0 +1 @@ +class=org.apache.activemq.transport.vm.VMTransportFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/vmpipe b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/vmpipe new file mode 100644 index 0000000000..4eed7519c9 --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/vmpipe @@ -0,0 +1 @@ +class=org.apache.activemq.transport.activeio.ActiveIOTransportFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/wireformat/default b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/wireformat/default new file mode 100644 index 0000000000..cbaaa22ebf --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/wireformat/default @@ -0,0 +1 @@ +class=org.apache.activemq.openwire.OpenWireFormatFactory diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/wireformat/stomp b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/wireformat/stomp new file mode 100644 index 0000000000..841d578fe9 --- /dev/null +++ b/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/wireformat/stomp @@ -0,0 +1 @@ +class=org.apache.activemq.transport.stomp.StompWireFormatFactory \ No newline at end of file diff --git a/activemq-core/src/test/java/org/apache/activemq/security/SimpleSecurityBrokerSystemTest.java b/activemq-core/src/test/java/org/apache/activemq/security/SimpleSecurityBrokerSystemTest.java index 46e583a10d..c86e042ad2 100644 --- a/activemq-core/src/test/java/org/apache/activemq/security/SimpleSecurityBrokerSystemTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/security/SimpleSecurityBrokerSystemTest.java @@ -31,7 +31,6 @@ import javax.jms.TextMessage; import junit.framework.Test; -import org.activemq.jaas.GroupPrincipal; import org.apache.activemq.JmsTestSupport; import org.apache.activemq.broker.Broker; import org.apache.activemq.broker.BrokerService; @@ -39,6 +38,7 @@ import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQQueue; import org.apache.activemq.command.ActiveMQTopic; import org.apache.activemq.filter.DestinationMap; +import org.apache.activemq.jaas.GroupPrincipal; import org.apache.activemq.security.JaasAuthenticationBroker; import org.apache.activemq.security.SimpleAuthenticationBroker; import org.apache.activemq.security.SimpleAuthorizationBroker; diff --git a/activemq-core/src/test/resources/login.config b/activemq-core/src/test/resources/login.config index 116ae03ccf..35f428ac50 100644 --- a/activemq-core/src/test/resources/login.config +++ b/activemq-core/src/test/resources/login.config @@ -1,6 +1,6 @@ activemq-test-domain { - org.activemq.jaas.PropertiesLoginModule required + org.apache.activemq.jaas.PropertiesLoginModule required debug=true - org.activemq.jaas.properties.user="org/apache/activemq/security/users.properties" - org.activemq.jaas.properties.group="org/apache/activemq/security/groups.properties"; + org.apache.activemq.jaas.properties.user="org/apache/activemq/security/users.properties" + org.apache.activemq.jaas.properties.group="org/apache/activemq/security/groups.properties"; }; \ No newline at end of file