[jboss-remoting-commits] JBoss Remoting SVN: r5783 - remoting-mc-int/trunk/metadata/src/main/resources/META-INF.
jboss-remoting-commits at lists.jboss.org
jboss-remoting-commits at lists.jboss.org
Tue Mar 2 01:04:37 EST 2010
Author: david.lloyd at jboss.com
Date: 2010-03-02 01:04:36 -0500 (Tue, 02 Mar 2010)
New Revision: 5783
Added:
remoting-mc-int/trunk/metadata/src/main/resources/META-INF/jboss-remoting_3_1.xsd
Removed:
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:
Schema
Deleted: 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 2010-03-01 22:43:28 UTC (rev 5782)
+++ remoting-mc-int/trunk/metadata/src/main/resources/META-INF/jboss-remoting_3_0.xsd 2010-03-02 06:04:36 UTC (rev 5783)
@@ -1,80 +0,0 @@
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns="urn:jboss:remoting:3.0"
- targetNamespace="urn:jboss:remoting:3.0"
- elementFormDefault="qualified"
- attributeFormDefault="unqualified"
- version="1.0"
- >
-
- <xs:complexType name="remoting">
- <xs:sequence minOccurs="0" maxOccurs="unbounded">
- <xs:choice>
- <xs:element name="local-service" type="local-service"/>
- <xs:element name="remote-service" type="remote-service"/>
- <xs:element name="client" type="client"/>
- <xs:element name="client-source" type="client-source"/>
- <xs:element name="service-listener" type="service-listener"/>
- </xs:choice>
- </xs:sequence>
- <xs:attribute name="endpoint" type="xs:string" use="optional"/>
- </xs:complexType>
-
- <xs:complexType name="local-service">
- <xs:attribute name="name" type="xs:string" use="required"/>
- <xs:attribute name="request-listener-class" type="xs:string" use="optional"/>
- <xs:attribute name="request-listener-bean" type="xs:string" use="optional"/>
- <xs:attribute name="request-class-name" type="xs:string" use="optional"/>
- <xs:attribute name="reply-class-name" type="xs:string" use="optional"/>
- <xs:attribute name="service-type" type="xs:string" use="required"/>
- <xs:attribute name="group-name" type="xs:string" use="optional"/>
- <xs:attribute name="metric" type="xs:integer" use="optional"/>
- </xs:complexType>
-
- <xs:complexType name="remote-service">
- <xs:attribute name="name" type="xs:string" use="required"/>
- <xs:attribute name="service-type" type="xs:string" use="required"/>
- <xs:attribute name="group-name" type="xs:string" use="required"/>
- <xs:attribute name="endpoint-name" type="xs:string" use="required"/>
- <xs:attribute name="request-handler-source-bean" type="xs:string" use="required"/>
- <xs:attribute name="metric" type="xs:integer" use="optional"/>
- </xs:complexType>
-
- <xs:complexType name="client">
- <xs:attribute name="name" type="xs:string" use="required"/>
- <xs:attribute name="service-bean" type="xs:string" use="required"/>
- <xs:attribute name="request-class-name" type="xs:string" use="optional"/>
- <xs:attribute name="reply-class-name" type="xs:string" use="optional"/>
- </xs:complexType>
-
- <xs:complexType name="client-source">
- <xs:attribute name="name" type="xs:string" use="required"/>
- <xs:attribute name="service-bean" type="xs:string" use="required"/>
- <xs:attribute name="request-class-name" type="xs:string" use="optional"/>
- <xs:attribute name="reply-class-name" type="xs:string" use="optional"/>
- </xs:complexType>
-
- <xs:complexType name="service-listener">
- <xs:attribute name="name" type="xs:string" use="required"/>
- <xs:attribute name="listener-bean" type="xs:string" use="required"/>
- <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>
Copied: remoting-mc-int/trunk/metadata/src/main/resources/META-INF/jboss-remoting_3_1.xsd (from rev 5051, 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_1.xsd (rev 0)
+++ remoting-mc-int/trunk/metadata/src/main/resources/META-INF/jboss-remoting_3_1.xsd 2010-03-02 06:04:36 UTC (rev 5783)
@@ -0,0 +1,112 @@
+<!--
+ ~ 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.
+ -->
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns="urn:jboss:remoting:3.1"
+ xmlns:xnio="urn:jboss:xnio:2.1"
+ targetNamespace="urn:jboss:remoting:3.1"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="1.0"
+ >
+
+ <xs:complexType name="remoting">
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="service" type="service"/>
+ <xs:element name="local-client" type="local-client"/>
+ <xs:element name="server" type="server"/>
+ <xs:element name="connection" type="connection"/>
+ <xs:element name="endpoint" type="endpoint"/>
+ <xs:element name="protocol-service" type="protocol-service"/>
+ </xs:choice>
+ <xs:attribute name="endpoint" type="xs:string" use="optional"/>
+ </xs:complexType>
+
+ <xs:complexType name="server">
+ <xs:all>
+ <xs:element name="options" type="xnio:optionsType" minOccurs="0"/>
+ </xs:all>
+ <xs:attribute name="protocol" type="xs:string" default="remote" use="optional"/>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ </xs:complexType>
+
+ <xs:complexType name="service">
+ <xs:all>
+ <xs:element name="client-listener" type="ref"/>
+ <xs:element name="request-class" type="ref"/>
+ <xs:element name="reply-class" type="ref"/>
+ <xs:element name="options" type="xnio:optionsType" minOccurs="0"/>
+ </xs:all>
+ <xs:attribute name="type" type="xs:string" use="required"/>
+ <xs:attribute name="group-name" type="xs:string" use="optional"/>
+ </xs:complexType>
+
+ <xs:complexType name="connection">
+ <xs:all>
+ <xs:element name="destination" type="ref"/>
+ <xs:element name="authentication" type="client-authentication" minOccurs="0"/>
+ <xs:element name="options" type="xnio:optionsType" minOccurs="0"/>
+ </xs:all>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ </xs:complexType>
+
+ <xs:complexType name="client-authentication">
+ <xs:choice>
+ <xs:element name="simple" type="user-entry"/>
+ <xs:element name="callback-handler" type="ref"/>
+ </xs:choice>
+ </xs:complexType>
+
+ <xs:complexType name="user-entry">
+ <xs:attribute name="user-name" type="xs:string" use="required"/>
+ <xs:attribute name="realm-name" type="xs:string" use="optional"/>
+ <xs:attribute name="password" type="xs:string" use="optional"/>
+ </xs:complexType>
+
+ <xs:complexType name="local-client">
+ <xs:all>
+ <xs:element name="request-listener" type="ref"/>
+ <xs:element name="request-class" type="ref"/>
+ <xs:element name="reply-class" type="ref"/>
+ </xs:all>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ </xs:complexType>
+
+ <xs:complexType name="endpoint">
+ <xs:all>
+ <xs:element name="executor" type="ref"/>
+ <xs:element name="options" type="xnio:optionsType" minOccurs="0"/>
+ </xs:all>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ </xs:complexType>
+
+ <xs:complexType name="ref">
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ </xs:complexType>
+
+ <xs:complexType name="protocol-service">
+ <xs:attribute name="type" type="xs:string" use="required"/>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:attribute name="register-as" type="xs:string" use="required"/>
+ </xs:complexType>
+
+</xs:schema>
Deleted: 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 2010-03-01 22:43:28 UTC (rev 5782)
+++ remoting-mc-int/trunk/metadata/src/main/resources/META-INF/remoting-deployer-beans.xml 2010-03-02 06:04:36 UTC (rev 5783)
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- JBoss Remoting Deployer
--->
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <bean name="RemotingSchemaResolverDeployer" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
- <constructor>
- <parameter>org.jboss.remoting3.metadata.RemotingMetaData</parameter>
- </constructor>
- <property name="name">jboss-remoting.xml</property>
- <property name="registerWithJBossXB">true</property>
- <!-- TODO - build management info from annotations -->
- </bean>
-
- <bean name="RemotingBeanMetaDataFactoryDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataFactoryDeployer">
- <constructor>
- <parameter>org.jboss.remoting3.metadata.RemotingMetaData</parameter>
- </constructor>
- </bean>
-
- <classloading xmlns="urn:jboss:classloading:1.0">
- <requirements>
- <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