JBoss Remoting SVN: r5055 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/configuration.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-04-17 23:44:38 -0400 (Fri, 17 Apr 2009)
New Revision: 5055
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/configuration/SocketRetryConfigTestCase.java
Log:
JBREM-1078: Removed reference to MicroSocketClientInvoker.getNumberOfRetries().
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/configuration/SocketRetryConfigTestCase.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/configuration/SocketRetryConfigTestCase.java 2009-04-16 05:12:21 UTC (rev 5054)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/configuration/SocketRetryConfigTestCase.java 2009-04-18 03:44:38 UTC (rev 5055)
@@ -39,7 +39,7 @@
public void testConfig() throws Throwable
{
InvokerLocator locator = new InvokerLocator("socket://localhost:8888" + "/?" + SocketClientInvoker.SO_TIMEOUT_FLAG + "=" + timeout + "&" +
- "NumberOfRetries=" + socketRetries + "&NumberOfCallRetries=" + callRetries);
+ "&NumberOfCallRetries=" + callRetries);
Connector connector = new Connector("socket://localhost:8888");
Client client = new Client(locator);
@@ -52,7 +52,6 @@
SocketClientInvoker invoker = (SocketClientInvoker)client.getInvoker();
- assertEquals(socketRetries, invoker.getNumberOfRetries());
assertEquals(callRetries, invoker.getNumberOfCallRetries());
assertEquals(timeout, invoker.getTimeout());
assertEquals(Boolean.FALSE.booleanValue(), invoker.checkingConnection());
15 years, 9 months
JBoss Remoting SVN: r5054 - remoting2/branches/2.x.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-04-16 01:12:21 -0400 (Thu, 16 Apr 2009)
New Revision: 5054
Modified:
remoting2/branches/2.x/JBossORG-EULA.txt
Log:
JBREM-1118: Changed copyright date to 2009.
Modified: remoting2/branches/2.x/JBossORG-EULA.txt
===================================================================
--- remoting2/branches/2.x/JBossORG-EULA.txt 2009-04-16 05:08:34 UTC (rev 5053)
+++ remoting2/branches/2.x/JBossORG-EULA.txt 2009-04-16 05:12:21 UTC (rev 5054)
@@ -99,9 +99,9 @@
State of North Carolina and of the United States, without regard to any conflict of laws provisions,
except that the United Nations Convention on the International Sale of Goods shall not apply.
-Copyright 2006 Red Hat, Inc. All rights reserved.
+Copyright 2009 Red Hat, Inc. All rights reserved.
"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc.
All other trademarks are the property of their respective owners.
- Page 1 of 1 18 October 2006
+ Page 1 of 1 15 April 2009
15 years, 9 months
JBoss Remoting SVN: r5053 - remoting2/branches/2.x/docs/guide/en.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-04-16 01:08:34 -0400 (Thu, 16 Apr 2009)
New Revision: 5053
Modified:
remoting2/branches/2.x/docs/guide/en/master.xml
Log:
JBREM-1118: Changed copyright date to 2009.
Modified: remoting2/branches/2.x/docs/guide/en/master.xml
===================================================================
--- remoting2/branches/2.x/docs/guide/en/master.xml 2009-04-16 05:03:17 UTC (rev 5052)
+++ remoting2/branches/2.x/docs/guide/en/master.xml 2009-04-16 05:08:34 UTC (rev 5053)
@@ -35,7 +35,7 @@
</mediaobject>
<copyright>
- <year>2008 JBoss, a division of Red Hat</year>
+ <year>2009 JBoss, a division of Red Hat</year>
<holder>.</holder>
</copyright>
15 years, 9 months
JBoss Remoting SVN: r5052 - remoting2/branches/2.x/docs.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-04-16 01:03:17 -0400 (Thu, 16 Apr 2009)
New Revision: 5052
Modified:
remoting2/branches/2.x/docs/README.txt
Log:
JBREM-1118: Added section for 2.5.1.
Modified: remoting2/branches/2.x/docs/README.txt
===================================================================
--- remoting2/branches/2.x/docs/README.txt 2009-04-16 01:03:32 UTC (rev 5051)
+++ remoting2/branches/2.x/docs/README.txt 2009-04-16 05:03:17 UTC (rev 5052)
@@ -1,5 +1,5 @@
-JBoss Remoting 2.4.0.Beta1
-January 31, 2008
+JBoss Remoting 2.5.1
+April 15, 2009
This distribution of JBoss Remoting contains the following directories:
@@ -41,6 +41,47 @@
==========================================================================================================
==========================================================================================================
+Release Notes - JBoss Remoting - Version 2.5.1 (Flounder) - Text format
+Bug
+
+ * [JBREM-992] - Can't restart a Connector that uses SocketServerInvoker
+ * [JBREM-1069] - Make ConnectorValidator configure ping period correctly
+ * [JBREM-1070] - Fix deadlock in ConnectionValidator
+ * [JBREM-1071] - IllegalStateException in ConnectorValidator.run()
+ * [JBREM-1072] - Synchronize access to static maps in MarshalFactory
+ * [JBREM-1076] - SocketServerInvoker.processInvocation() should return if running == false
+ * [JBREM-1081] - Fix NPE in ServerInvokerCallbackHandler
+ * [JBREM-1083] - Each Client creates a new invokerDestructionTimer
+ * [JBREM-1088] - MicroSocketClientInvoker(InvokerLocator locator, Map configuration) ctor - not propagating exceptions (only message is wrapped)
+ * [JBREM-1099] - Make MulticastDetector detection message send buffer size configurable
+ * [JBREM-1109] - Eliminate race in MicroRemoteClientInvoker.getDataType()
+ * [JBREM-1111] - CLONE [JBREM-851] - In LeasePinger replace Timer if it has shut down
+ * [JBREM-1112] - Potential race between ConnectionValidator and ConnectionListener upon connection failure
+ * [JBREM-1113] - ServerInvokerCallbackHandlers leak when client doesn't shut down
+ * [JBREM-1116] - Remove SecurityUtility
+
+Feature Request
+
+ * [JBREM-1082] - Allow ConnectionValidator to access InvokerLocator parameters
+ * [JBREM-1084] - Allow CallbackPoller to access Client and InvokerLocator parameters
+ * [JBREM-1102] - Make configuration map available to MarshalFactory
+ * [JBREM-1114] - Update servlet transport to support JBossMessaging
+
+Release
+
+ * [JBREM-1118] - Release 2.5.1
+
+Task
+
+ * [JBREM-139] - need automated test for servlet server invoker
+ * [JBREM-1085] - Reduce log level of ServerSocketWrapper.close() log messages
+ * [JBREM-1103] - Correct javadoc for Client.invokeOneway()
+ * [JBREM-1108] - Warn against making ConnectionValidator.validatorPingPeriod shorter than ConnectionValidator.validatorPingTimeout
+ * [JBREM-1110] - InvokerLocator.getParameters() should not return null
+ * [JBREM-1115] - Update jars to match AS 5.1.0.CR1
+ * [JBREM-1117] - Assure version compatibility with earlier versions of Remoting
+
+==========================================================================================================
Release Notes - JBoss Remoting - Version 2.5.0.SP2 (Flounder)
Bug
15 years, 9 months
JBoss Remoting SVN: r5051 - in remoting-mc-int/trunk: metadata/src/main/java/org/jboss and 3 other directories.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2009-04-15 21:03:32 -0400 (Wed, 15 Apr 2009)
New Revision: 5051
Added:
remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting3/
remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting3/metadata/
Removed:
remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting/
remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting3/metadata/
Modified:
remoting-mc-int/trunk/build.xml
remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting3/metadata/ClientMetaData.java
remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting3/metadata/ClientSourceMetaData.java
remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting3/metadata/LocalServiceMetaData.java
remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting3/metadata/LocateServiceMetaData.java
remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting3/metadata/RemoteServiceMetaData.java
remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting3/metadata/RemotingHelper.java
remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting3/metadata/RemotingMetaData.java
remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting3/metadata/ServiceListenerMetaData.java
remoting-mc-int/trunk/metadata/src/main/resources/META-INF/jboss-remoting_3_0.xsd
remoting-mc-int/trunk/metadata/src/main/resources/META-INF/remoting-deployer-beans.xml
Log:
Package rename...
Modified: remoting-mc-int/trunk/build.xml
===================================================================
--- remoting-mc-int/trunk/build.xml 2009-04-16 00:26:11 UTC (rev 5050)
+++ remoting-mc-int/trunk/build.xml 2009-04-16 01:03:32 UTC (rev 5051)
@@ -61,7 +61,7 @@
<target name="lib.remoting-api" depends="jboss.repository">
<mvn:dependencies pathId="lib.remoting-api.classpath">
<mvn:remoteRepository refid="jboss.repository"/>
- <mvn:dependency groupId="org.jboss.remoting" artifactId="remoting-api" version="3.0.0.GA"/>
+ <mvn:dependency groupId="org.jboss.remoting3" artifactId="remoting-api" version="3.0.0.GA"/>
</mvn:dependencies>
</target>
@@ -70,7 +70,7 @@
<target name="lib.remoting-core" depends="jboss.repository">
<mvn:dependencies pathId="lib.remoting-core.classpath">
<mvn:remoteRepository refid="jboss.repository"/>
- <mvn:dependency groupId="org.jboss.remoting" artifactId="remoting-core" version="3.0.0.GA"/>
+ <mvn:dependency groupId="org.jboss.remoting3" artifactId="remoting-core" version="3.0.0.GA"/>
</mvn:dependencies>
</target>
Copied: remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting3 (from rev 4796, remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting)
Copied: remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting3/metadata (from rev 5050, remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting/metadata)
Modified: remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting3/metadata/ClientMetaData.java
===================================================================
--- remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting/metadata/ClientMetaData.java 2009-04-16 00:26:11 UTC (rev 5050)
+++ remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting3/metadata/ClientMetaData.java 2009-04-16 01:03:32 UTC (rev 5051)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.metadata;
+package org.jboss.remoting3.metadata;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlAttribute;
Modified: remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting3/metadata/ClientSourceMetaData.java
===================================================================
--- remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting/metadata/ClientSourceMetaData.java 2009-04-16 00:26:11 UTC (rev 5050)
+++ remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting3/metadata/ClientSourceMetaData.java 2009-04-16 01:03:32 UTC (rev 5051)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.metadata;
+package org.jboss.remoting3.metadata;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
Modified: remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting3/metadata/LocalServiceMetaData.java
===================================================================
--- remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting/metadata/LocalServiceMetaData.java 2009-04-16 00:26:11 UTC (rev 5050)
+++ remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting3/metadata/LocalServiceMetaData.java 2009-04-16 01:03:32 UTC (rev 5051)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.metadata;
+package org.jboss.remoting3.metadata;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlAttribute;
Modified: remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting3/metadata/LocateServiceMetaData.java
===================================================================
--- remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting/metadata/LocateServiceMetaData.java 2009-04-16 00:26:11 UTC (rev 5050)
+++ remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting3/metadata/LocateServiceMetaData.java 2009-04-16 01:03:32 UTC (rev 5051)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.metadata;
+package org.jboss.remoting3.metadata;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlAttribute;
Modified: remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting3/metadata/RemoteServiceMetaData.java
===================================================================
--- remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting/metadata/RemoteServiceMetaData.java 2009-04-16 00:26:11 UTC (rev 5050)
+++ remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting3/metadata/RemoteServiceMetaData.java 2009-04-16 01:03:32 UTC (rev 5051)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.metadata;
+package org.jboss.remoting3.metadata;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlAttribute;
Modified: remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting3/metadata/RemotingHelper.java
===================================================================
--- remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting/metadata/RemotingHelper.java 2009-04-16 00:26:11 UTC (rev 5050)
+++ remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting3/metadata/RemotingHelper.java 2009-04-16 01:03:32 UTC (rev 5051)
@@ -20,17 +20,16 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.metadata;
+package org.jboss.remoting3.metadata;
-import org.jboss.remoting.spi.RequestHandlerSource;
-import org.jboss.remoting.spi.Handle;
-import org.jboss.remoting.spi.RequestHandler;
-import org.jboss.remoting.Endpoint;
-import org.jboss.remoting.RequestListener;
-import org.jboss.remoting.LocalServiceConfiguration;
-import org.jboss.remoting.Client;
-import org.jboss.remoting.SimpleCloseable;
-import org.jboss.remoting.RemoteServiceConfiguration;
+import org.jboss.remoting3.spi.RequestHandlerSource;
+import org.jboss.remoting3.spi.Handle;
+import org.jboss.remoting3.spi.RequestHandler;
+import org.jboss.remoting3.Endpoint;
+import org.jboss.remoting3.RequestListener;
+import org.jboss.remoting3.LocalServiceConfiguration;
+import org.jboss.remoting3.Client;
+import org.jboss.remoting3.SimpleCloseable;
import org.jboss.xnio.IoUtils;
import java.io.IOException;
@@ -47,7 +46,7 @@
config.setGroupName(groupName);
config.setServiceType(serviceType);
config.setMetric(metric);
- return endpoint.registerService(config);
+ return endpoint.bindLocalService(config);
}
public static <I, O> Client<I, O> createClient(final Endpoint endpoint, final RequestHandlerSource handlerSource, final Class<I> requestClass, final Class<O> replyClass) throws IOException {
Modified: remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting3/metadata/RemotingMetaData.java
===================================================================
--- remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting/metadata/RemotingMetaData.java 2009-04-16 00:26:11 UTC (rev 5050)
+++ remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting3/metadata/RemotingMetaData.java 2009-04-16 01:03:32 UTC (rev 5051)
@@ -1,4 +1,4 @@
-package org.jboss.remoting.metadata;
+package org.jboss.remoting3.metadata;
import java.io.Serializable;
import java.util.ArrayList;
@@ -8,10 +8,9 @@
import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
import org.jboss.beans.metadata.api.annotations.Inject;
-import org.jboss.remoting.core.util.CollectionUtil;
-import org.jboss.remoting.Endpoint;
-import org.jboss.remoting.ServiceListener;
-import org.jboss.remoting.spi.RequestHandlerSource;
+import org.jboss.remoting3.Endpoint;
+import org.jboss.remoting3.ServiceRegistrationListener;
+import org.jboss.remoting3.spi.RequestHandlerSource;
import org.jboss.xb.annotations.JBossXmlSchema;
import javax.xml.bind.annotation.XmlElement;
@@ -126,7 +125,7 @@
try {
final ClassLoader classLoader = getClassLoader();
final String endpoint = this.endpoint == null ? "default-remoting-endpoint" : this.endpoint;
- final List<BeanMetaData> metaDataList = CollectionUtil.arrayList();
+ final List<BeanMetaData> metaDataList = new ArrayList<BeanMetaData>();
for (LocalServiceMetaData localService : localServices) {
BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(localService.getName());
builder.setFactoryClass(RemotingHelper.class.getName());
@@ -179,7 +178,7 @@
BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(serviceListener.getName());
builder.setFactory(builder.createInject(endpoint));
builder.setFactoryMethod("addServiceListener");
- builder.addConstructorParameter(ServiceListener.class.getName(), builder.createInject(serviceListener.getListenerBean()));
+ builder.addConstructorParameter(ServiceRegistrationListener.class.getName(), builder.createInject(serviceListener.getListenerBean()));
builder.addConstructorParameter(boolean.class.getName(), Boolean.valueOf(serviceListener.isOnlyNew()));
builder.setStop("close");
metaDataList.add(builder.getBeanMetaData());
Modified: remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting3/metadata/ServiceListenerMetaData.java
===================================================================
--- remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting/metadata/ServiceListenerMetaData.java 2009-04-16 00:26:11 UTC (rev 5050)
+++ remoting-mc-int/trunk/metadata/src/main/java/org/jboss/remoting3/metadata/ServiceListenerMetaData.java 2009-04-16 01:03:32 UTC (rev 5051)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.metadata;
+package org.jboss.remoting3.metadata;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlAttribute;
Modified: remoting-mc-int/trunk/metadata/src/main/resources/META-INF/jboss-remoting_3_0.xsd
===================================================================
--- remoting-mc-int/trunk/metadata/src/main/resources/META-INF/jboss-remoting_3_0.xsd 2009-04-16 00:26:11 UTC (rev 5050)
+++ remoting-mc-int/trunk/metadata/src/main/resources/META-INF/jboss-remoting_3_0.xsd 2009-04-16 01:03:32 UTC (rev 5051)
@@ -59,5 +59,22 @@
<xs:attribute name="only-new" type="xs:boolean" use="optional"/>
</xs:complexType>
+ <xs:complexType name="marshalling-config">
+ <xs:element name="class-externalizer-factory" type="bean-ref"/>
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="class-table" type="bean-ref"/>
+ <xs:element name="chaining-class-table" type="chaining-class-table"/>
+ </xs:choice>
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="object-table" type="bean-ref"/>
+ <xs:element name="chaining-object-table" type="chaining-object-table"/>
+ </xs:choice>
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="stream-header" type="bean-ref"/>
+ <!-- todo - literally -->
+ </xs:choice>
+
+ </xs:complexType>
+
<xs:element name="remoting" type="remoting"/>
</xs:schema>
Modified: remoting-mc-int/trunk/metadata/src/main/resources/META-INF/remoting-deployer-beans.xml
===================================================================
--- remoting-mc-int/trunk/metadata/src/main/resources/META-INF/remoting-deployer-beans.xml 2009-04-16 00:26:11 UTC (rev 5050)
+++ remoting-mc-int/trunk/metadata/src/main/resources/META-INF/remoting-deployer-beans.xml 2009-04-16 01:03:32 UTC (rev 5051)
@@ -6,7 +6,7 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
<bean name="RemotingSchemaResolverDeployer" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
<constructor>
- <parameter>org.jboss.remoting.metadata.RemotingMetaData</parameter>
+ <parameter>org.jboss.remoting3.metadata.RemotingMetaData</parameter>
</constructor>
<property name="name">jboss-remoting.xml</property>
<property name="registerWithJBossXB">true</property>
@@ -15,7 +15,7 @@
<bean name="RemotingBeanMetaDataFactoryDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataFactoryDeployer">
<constructor>
- <parameter>org.jboss.remoting.metadata.RemotingMetaData</parameter>
+ <parameter>org.jboss.remoting3.metadata.RemotingMetaData</parameter>
</constructor>
</bean>
@@ -24,4 +24,27 @@
<module name="jboss-remoting-api"/>
</requirements>
</classloading>
+
+ <bean name="Endpoint" class="org.jboss.remoting3.EndpointImpl">
+
+ </bean>
+
+ <bean name="MultiplexConnectionProvider" class="org.jboss.remoting3.multiplex.MultiplexConnectionProvider">
+
+ </bean>
+
+ <bean name="MultiplexConnectionProviderEndpointConnectionAcceptor" class="org.jboss.remoting3.spi.EndpointConnectionAcceptor">
+ <constructor factoryMethod="addConnectionProvider">
+ <factory bean="Endpoint"/>
+ <parameter class="java.lang.String">multiplex</parameter>
+ <parameter class="org.jboss.remoting3.spi.ConnectionProvider"><inject bean="MultiplexConnectionProvider"/></parameter>
+ </constructor>
+ </bean>
+
+ <bean name="MultiplexHandlerFactory" class="org.jboss.xnio.IoHandlerFactory">
+ <constructor factoryMethod="createHandlerFactory">
+ <factory bean="MultiplexConnectionProvider"/>
+ <parameter class="org.jboss.remoting3.spi.EndpointConnectionAcceptor"><inject bean="MultiplexConnectionProviderEndpointConnectionAcceptor"/></parameter>
+ </constructor>
+ </bean>
</deployment>
\ No newline at end of file
15 years, 9 months
JBoss Remoting SVN: r5050 - in remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3: spi and 1 other directory.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2009-04-15 20:26:11 -0400 (Wed, 15 Apr 2009)
New Revision: 5050
Added:
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/spi/AbstractEndpointConnectionAcceptor.java
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/spi/EndpointConnectionAcceptor.java
Modified:
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/Endpoint.java
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/EndpointImpl.java
Log:
Add a mechanism for an endpoint to receive incoming connections
Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/Endpoint.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/Endpoint.java 2009-04-15 06:12:37 UTC (rev 5049)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/Endpoint.java 2009-04-16 00:26:11 UTC (rev 5050)
@@ -9,6 +9,7 @@
import org.jboss.remoting3.spi.RequestHandler;
import org.jboss.remoting3.spi.RequestHandlerSource;
import org.jboss.remoting3.spi.ConnectionProvider;
+import org.jboss.remoting3.spi.EndpointConnectionAcceptor;
import org.jboss.xnio.IoFuture;
/**
@@ -145,7 +146,7 @@
* @param provider the provider
* @return a handle which may be used to remove the registration
*/
- SimpleCloseable addConnectionProvider(String uriScheme, ConnectionProvider<?> provider);
+ EndpointConnectionAcceptor addConnectionProvider(String uriScheme, ConnectionProvider<?> provider);
/**
* Get the type of resource specified by the given URI. If the type cannot be determined, returns {@link org.jboss.remoting3.ResourceType#UNKNOWN UNKNOWN}.
Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/EndpointImpl.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/EndpointImpl.java 2009-04-15 06:12:37 UTC (rev 5049)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/EndpointImpl.java 2009-04-16 00:26:11 UTC (rev 5050)
@@ -48,6 +48,8 @@
import org.jboss.remoting3.spi.RequestHandlerSource;
import org.jboss.remoting3.spi.Cancellable;
import org.jboss.remoting3.spi.EndpointConnection;
+import org.jboss.remoting3.spi.EndpointConnectionAcceptor;
+import org.jboss.remoting3.spi.AbstractEndpointConnectionAcceptor;
import org.jboss.xnio.IoFuture;
import org.jboss.xnio.IoUtils;
import org.jboss.xnio.WeakCloseable;
@@ -382,7 +384,7 @@
return futureEndpointConn;
}
- public SimpleCloseable addConnectionProvider(final String uriScheme, final ConnectionProvider<?> provider) {
+ public EndpointConnectionAcceptor addConnectionProvider(final String uriScheme, final ConnectionProvider<?> provider) {
final SecurityManager sm = System.getSecurityManager();
if (sm != null) {
sm.checkPermission(ADD_CONNECTION_PROVIDER_PERM);
@@ -391,10 +393,14 @@
if (connectionProviders.putIfAbsent(key, provider) != null) {
throw new IllegalArgumentException("Provider already registered for scheme \"" + uriScheme + "\"");
}
- return new AbstractSimpleCloseable(executor) {
+ return new AbstractEndpointConnectionAcceptor(executor) {
protected void closeAction() throws IOException {
connectionProviders.remove(key, provider);
}
+
+ public void accept(final EndpointConnection connection) {
+ // todo - add the endpoint connection to the endpoint registry; notify listeners; etc.
+ }
};
}
Added: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/spi/AbstractEndpointConnectionAcceptor.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/spi/AbstractEndpointConnectionAcceptor.java (rev 0)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/spi/AbstractEndpointConnectionAcceptor.java 2009-04-16 00:26:11 UTC (rev 5050)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.spi;
+
+import java.util.concurrent.Executor;
+
+public abstract class AbstractEndpointConnectionAcceptor extends AbstractHandleableCloseable<EndpointConnectionAcceptor> implements EndpointConnectionAcceptor {
+
+ /**
+ * Basic constructor.
+ *
+ * @param executor the executor used to execute the close notification handlers
+ */
+ protected AbstractEndpointConnectionAcceptor(final Executor executor) {
+ super(executor);
+ }
+}
Added: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/spi/EndpointConnectionAcceptor.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/spi/EndpointConnectionAcceptor.java (rev 0)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/spi/EndpointConnectionAcceptor.java 2009-04-16 00:26:11 UTC (rev 5050)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.spi;
+
+import org.jboss.remoting3.HandleableCloseable;
+
+/**
+ *
+ */
+public interface EndpointConnectionAcceptor extends HandleableCloseable<EndpointConnectionAcceptor> {
+ void accept(EndpointConnection connection);
+}
15 years, 9 months
JBoss Remoting SVN: r5049 - remoting2/tags.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-04-15 02:12:37 -0400 (Wed, 15 Apr 2009)
New Revision: 5049
Added:
remoting2/tags/2.5.1/
Log:
Copied: remoting2/tags/2.5.1 (from rev 5048, remoting2/branches/2.x)
15 years, 9 months
JBoss Remoting SVN: r5048 - remoting2/branches/2.x.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-04-15 02:08:03 -0400 (Wed, 15 Apr 2009)
New Revision: 5048
Modified:
remoting2/branches/2.x/build.xml
Log:
(1) JBREM-1118: Updated version; (2) JBREM-1117: added 2.5.0.SP2 to versioning tests.
Modified: remoting2/branches/2.x/build.xml
===================================================================
--- remoting2/branches/2.x/build.xml 2009-04-15 06:05:44 UTC (rev 5047)
+++ remoting2/branches/2.x/build.xml 2009-04-15 06:08:03 UTC (rev 5048)
@@ -225,9 +225,9 @@
<!-- Module name(s) & version -->
<property name="module.name" value="remoting"/>
<property name="module.Name" value="JBoss Remoting"/>
- <property name="module.version" value="2.5.0.SP2"/>
+ <property name="module.version" value="2.5.1"/>
<!-- extension is for the file suffix to use for dtribution build -->
- <property name="module.version.extension" value="2_5_0_SP2"/>
+ <property name="module.version.extension" value="2_5_1"/>
<property name="implementation.url" value="http://www.jboss.org/products/remoting"/>
<property name="root.dir" value="${basedir}"/>
@@ -2123,8 +2123,26 @@
<param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
<param name="check_content_type" value="true"/>
</antcall>
-
+
<!-- ******************************************************************************** -->
+ <!-- Current <- -> 2.5.0.SP2 -->
+ <antcall target="download.version">
+ <param name="version" value="2.5.0.SP2"/>
+ </antcall>
+ <antcall target="tests.versioning.all_transports" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="2_5_0_SP2-client"/>
+ <param name="client.classpath" value="${etc.dir}/lib/2.5.0.SP2/jboss-remoting.jar${extended.classpath}"/>
+ <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
+ <param name="check_content_type" value="true"/>
+ </antcall>
+ <antcall target="tests.versioning.all_transports" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="2_5_0_SP2-server"/>
+ <param name="server.classpath" value="${etc.dir}/lib/2.5.0.SP2/jboss-remoting.jar${extended.classpath}"/>
+ <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
+ <param name="check_content_type" value="true"/>
+ </antcall>
+
+ <!-- ******************************************************************************** -->
<!-- Current <- -> 2.5.0.SP1 -->
<antcall target="download.version">
<param name="version" value="2.5.0.SP1"/>
15 years, 9 months
JBoss Remoting SVN: r5047 - remoting2/branches/2.x/src/main/org/jboss/remoting.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-04-15 02:05:44 -0400 (Wed, 15 Apr 2009)
New Revision: 5047
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/Version.java
Log:
JBREM-1118: Updated version.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/Version.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/Version.java 2009-04-15 06:05:08 UTC (rev 5046)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/Version.java 2009-04-15 06:05:44 UTC (rev 5047)
@@ -38,7 +38,7 @@
public static final byte VERSION_2 = 2;
public static final byte VERSION_2_2 = 22;
- public static final String VERSION = "2.5.0.SP2 (Flounder)";
+ public static final String VERSION = "2.5.1 (Flounder)";
private static final byte byteVersion = VERSION_2_2;
private static byte defaultByteVersion = byteVersion;
private static boolean performVersioning = true;
15 years, 9 months
JBoss Remoting SVN: r5046 - remoting2/branches/2.x/src/main/org/jboss/remoting.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-04-15 02:05:08 -0400 (Wed, 15 Apr 2009)
New Revision: 5046
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/ServerConfiguration.java
Log:
JBREM-1118: Updated note about ServerConfiguration example in javadoc.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/ServerConfiguration.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/ServerConfiguration.java 2009-04-15 06:01:51 UTC (rev 5045)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/ServerConfiguration.java 2009-04-15 06:05:08 UTC (rev 5046)
@@ -36,7 +36,7 @@
* Connector.
*
* For an example of the use of ServerConfiguration with the microcontainer,
- * see the org.jboss.test.remoting.configuration package in the testsuite
+ * see the configuration file remoting-jboss-beans.xml in the server/default/deploy
* directory of the JBoss Application Server 5.0.0.
*
* @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
15 years, 9 months