[jboss-remoting-commits] JBoss Remoting SVN: r5051 - in remoting-mc-int/trunk: metadata/src/main/java/org/jboss and 3 other directories.
jboss-remoting-commits at lists.jboss.org
jboss-remoting-commits at lists.jboss.org
Wed Apr 15 21:03:32 EDT 2009
Author: david.lloyd at 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
More information about the jboss-remoting-commits
mailing list