Author: chirino
Date: Wed Dec 28 18:57:53 2005
New Revision: 359688
URL: http://svn.apache.org/viewcvs?rev=359688&view=rev
Log:
Changed the META-INF location searched so that it follows the META-INF/services
pattern that activemq uses.
Added:
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/datagram
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/multicast
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/nio
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/nio-async
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/nio-sync
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/socket
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/ssl
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/vmpipe
Removed:
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/org.apache.activeio.ChannelFactory/
Modified:
incubator/activemq/trunk/activeio/activeio-core/src/main/java/org/apache/activeio/ChannelFactory.java
Modified:
incubator/activemq/trunk/activeio/activeio-core/src/main/java/org/apache/activeio/ChannelFactory.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/main/java/org/apache/activeio/ChannelFactory.java?rev=359688&r1=359687&r2=359688&view=diff
==============================================================================
---
incubator/activemq/trunk/activeio/activeio-core/src/main/java/org/apache/activeio/ChannelFactory.java
(original)
+++
incubator/activemq/trunk/activeio/activeio-core/src/main/java/org/apache/activeio/ChannelFactory.java
Wed Dec 28 18:57:53 2005
@@ -43,7 +43,7 @@
* [EMAIL PROTECTED] org.apache.activeio.Channel}s and [EMAIL PROTECTED]
org.apache.activeio.ChannelServer}s.
*
* Each URI scheme that [EMAIL PROTECTED] ChannelFactory}object handles will
have a
- * properties file located at:
"META-INF/org.apache.activeio.ChannelFactory/{scheme}".
+ * properties file located at:
"META-INF/services/org/apache/activeio/channel/{scheme}".
*
*/
public class ChannelFactory implements SyncChannelFactory, AsyncChannelFactory
{
@@ -63,7 +63,7 @@
});
}
- private static FactoryFinder finder = new
FactoryFinder("META-INF/org.apache.activeio.ChannelFactory/");
+ private static FactoryFinder finder = new
FactoryFinder("META-INF/services/org/apache/activeio/channel/");
public SyncChannel openSyncChannel(URI location) throws IOException {
SyncChannelFactory factory =
getSynchChannelFactory(location.getScheme());
Added:
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/datagram
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/datagram?rev=359688&view=auto
==============================================================================
---
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/datagram
(added)
+++
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/datagram
Wed Dec 28 18:57:53 2005
@@ -0,0 +1 @@
+SyncChannelFactory.class=org.apache.activeio.packet.sync.datagram.DatagramSocketSyncChannelFactory
\ No newline at end of file
Added:
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/multicast
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/multicast?rev=359688&view=auto
==============================================================================
---
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/multicast
(added)
+++
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/multicast
Wed Dec 28 18:57:53 2005
@@ -0,0 +1 @@
+SyncChannelFactory.class=org.apache.activeio.packet.sync.multicast.MulticastSocketSyncChannelFactory
\ No newline at end of file
Added:
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/nio
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/nio?rev=359688&view=auto
==============================================================================
---
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/nio
(added)
+++
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/nio
Wed Dec 28 18:57:53 2005
@@ -0,0 +1,2 @@
+SyncChannelFactory.class=org.apache.activeio.packet.sync.nio.NIOSyncChannelFactory
+AsyncChannelFactory.class=org.apache.activeio.packet.async.nio.NIOAsyncChannelFactory
\ No newline at end of file
Added:
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/nio-async
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/nio-async?rev=359688&view=auto
==============================================================================
---
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/nio-async
(added)
+++
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/nio-async
Wed Dec 28 18:57:53 2005
@@ -0,0 +1 @@
+AsyncChannelFactory.class=org.apache.activeio.packet.async.nio.NIOAsyncChannelFactory
\ No newline at end of file
Added:
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/nio-sync
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/nio-sync?rev=359688&view=auto
==============================================================================
---
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/nio-sync
(added)
+++
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/nio-sync
Wed Dec 28 18:57:53 2005
@@ -0,0 +1 @@
+SyncChannelFactory.class=org.apache.activeio.packet.sync.nio.NIOSyncChannelFactory
\ No newline at end of file
Added:
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/socket
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/socket?rev=359688&view=auto
==============================================================================
---
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/socket
(added)
+++
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/socket
Wed Dec 28 18:57:53 2005
@@ -0,0 +1 @@
+SyncChannelFactory.class=org.apache.activeio.packet.sync.socket.SocketSyncChannelFactory
\ No newline at end of file
Added:
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/ssl
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/ssl?rev=359688&view=auto
==============================================================================
---
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/ssl
(added)
+++
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/ssl
Wed Dec 28 18:57:53 2005
@@ -0,0 +1 @@
+SyncChannelFactory.class=org.apache.activeio.packet.sync.ssl.SslSocketSyncChannelFactory
\ No newline at end of file
Added:
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/vmpipe
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/vmpipe?rev=359688&view=auto
==============================================================================
---
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/vmpipe
(added)
+++
incubator/activemq/trunk/activeio/activeio-core/src/main/resources/META-INF/services/org/apache/activeio/channel/vmpipe
Wed Dec 28 18:57:53 2005
@@ -0,0 +1 @@
+AsyncChannelFactory.class=org.apache.activeio.packet.async.vmpipe.VMPipeAsyncChannelFactory
