[jboss-cvs] JBossAS SVN: r102215 - in trunk: component-matrix and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 10 01:37:56 EST 2010
Author: david.lloyd at jboss.com
Date: 2010-03-10 01:37:55 -0500 (Wed, 10 Mar 2010)
New Revision: 102215
Added:
trunk/varia/src/resources/remoting/
trunk/varia/src/resources/remoting/remoting3-deployer-jboss-beans.xml
trunk/varia/src/resources/remoting/remoting3-jboss-beans.xml
Modified:
trunk/build/build.xml
trunk/build/pom.xml
trunk/component-matrix/pom.xml
Log:
JBAS-7794: integrate remoting 3, JBAS-7795: integrate remoting 3 metadata, JBAS-7796: integrate marshalling
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-03-10 06:06:45 UTC (rev 102214)
+++ trunk/build/build.xml 2010-03-10 06:37:55 UTC (rev 102215)
@@ -1449,6 +1449,18 @@
</fileset>
</copy>
+ <copy todir="${install.server}/all/deploy">
+ <fileset dir="${varia.module.output}/resources/remoting">
+ <include name="remoting3-jboss-beans.xml"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${install.server}/all/deployers/jboss-remoting.deployer/META-INF">
+ <fileset dir="${varia.module.output}/resources/remoting">
+ <include name="remoting3-deployer-jboss-beans.xml"/>
+ </fileset>
+ </copy>
+
<unjar src="${project.root}/varia/target/jboss-as-varia-http-invoker.sar"
dest="${install.default}/deploy/http-invoker.sar"/>
@@ -1944,6 +1956,8 @@
<fileset refid="jboss.jbossts:jbossjts:jar"/>
<fileset refid="jboss.jbossts:jbossjts-integration:jar"/>
<fileset refid="org.jboss.remoting:jboss-remoting:jar"/>
+ <fileset refid="org.jboss.marshalling:jboss-marshalling:jar"/>
+ <fileset refid="org.jboss.marshalling:jboss-marshalling-river:jar"/>
<fileset refid="jboss:jboss-serialization:jar"/>
<fileset refid="org.jboss.javaee:jboss-ejb-api_3.1:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-cache:jar"/>
@@ -2005,6 +2019,14 @@
<fileset refid="org.jboss.weld:weld-api:jar"/>
<mapper refid="remove-versions" />
</copy>
+ <!-- Install jboss-remoting 3.x as jboss-remoting-3.jar -->
+ <copy todir="${install.common.lib}" filtering="no">
+ <fileset refid="org.jboss.remoting3:jboss-remoting:jar"/>
+ <chainedmapper>
+ <mapper refid="remove-versions" />
+ <globmapper from="*.jar" to="*-3.jar"/>
+ </chainedmapper>
+ </copy>
<!-- Install JBossWS ASIL to common/lib directory -->
<copy file="${webservices.module.output}/jboss-as-webservices.jar"
@@ -2139,6 +2161,8 @@
<fileset refid="org.jboss.deployers:jboss-deployers-vfs:jar"/>
<fileset refid="org.jboss.deployers:jboss-deployers-vfs-spi:jar"/>
<fileset refid="org.jboss.remoting:jboss-remoting:jar"/>
+ <fileset refid="org.jboss.marshalling:jboss-marshalling:jar"/>
+ <fileset refid="org.jboss.marshalling:jboss-marshalling-river:jar"/>
<fileset refid="javax.xml.ws:jaxws-api:jar"/>
<fileset refid="javax.jws:jsr181-api:jar"/>
<fileset refid="org.jboss.ws.native:jbossws-native-client:jar"/>
@@ -2197,6 +2221,14 @@
<fileset refid="org.jboss:jbossxb:jar"/>
<mapper refid="remove-versions" />
</copy>
+ <!-- Install jboss-remoting 3.x as jboss-remoting-3.jar -->
+ <copy todir="${install.client}" filtering="no">
+ <fileset refid="org.jboss.remoting3:jboss-remoting:jar"/>
+ <chainedmapper>
+ <mapper refid="remove-versions" />
+ <globmapper from="*.jar" to="*-3.jar"/>
+ </chainedmapper>
+ </copy>
<!-- Copy thirdparty code to lib/endorsed -->
<mkdir dir="${install.lib}/endorsed"/>
@@ -2311,6 +2343,13 @@
<mapper refid="remove-versions" />
</copy>
+ <!-- copy the remoting deployer files into their proper places -->
+ <mkdir dir="${install.server}/all/deployers/jboss-remoting.deployer/META-INF"/>
+ <copy todir="${install.server}/all/deployers/jboss-remoting.deployer">
+ <fileset refid="org.jboss.remoting3:jboss-remoting-metadata:jar"/>
+ <mapper refid="remove-versions" />
+ </copy>
+
<!-- copy the xnio deployer files into their proper places -->
<mkdir dir="${install.server}/all/deploy/xnio-provider.jar/META-INF"/>
<copy todir="${install.server}/all/deploy/xnio-provider.jar">
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2010-03-10 06:06:45 UTC (rev 102214)
+++ trunk/build/pom.xml 2010-03-10 06:37:55 UTC (rev 102215)
@@ -529,6 +529,16 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>org.jboss.marshalling</groupId>
+ <artifactId>jboss-marshalling</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.marshalling</groupId>
+ <artifactId>jboss-marshalling-river</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>org.jboss.mx</groupId>
<artifactId>jboss-mbeanserver</artifactId>
<optional>true</optional>
@@ -550,6 +560,16 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.jboss.remoting3</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.remoting3</groupId>
+ <artifactId>jboss-remoting-metadata</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>org.jboss.security</groupId>
<artifactId>jboss-negotiation</artifactId>
<optional>true</optional>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-03-10 06:06:45 UTC (rev 102214)
+++ trunk/component-matrix/pom.xml 2010-03-10 06:37:55 UTC (rev 102215)
@@ -101,6 +101,7 @@
<version.org.jboss.logging-service-metadata>1.0.0.CR7</version.org.jboss.logging-service-metadata>
<version.org.jboss.logmanager>1.1.1.GA</version.org.jboss.logmanager>
<version.org.jboss.man>2.1.1.SP1</version.org.jboss.man>
+ <version.org.jboss.marshalling>1.3.0.CR2</version.org.jboss.marshalling>
<version.org.jboss.mcann>1.0.0.Alpha2</version.org.jboss.mcann>
<version.org.jboss.mc-int>2.2.0.Alpha2</version.org.jboss.mc-int>
<version.org.jboss.mdr>2.2.0.Alpha2</version.org.jboss.mdr>
@@ -118,6 +119,8 @@
<version.org.jboss.reloaded.naming.deployers>0.1.0-alpha-2</version.org.jboss.reloaded.naming.deployers>
<version.org.jboss.resteasy>2.0-beta-1</version.org.jboss.resteasy>
<version.org.jboss.remoting>2.5.2.SP2</version.org.jboss.remoting>
+ <version.org.jboss.remoting3>3.1.0.Beta2</version.org.jboss.remoting3>
+ <version.org.jboss.remoting3.metadata>1.0.0.Beta1</version.org.jboss.remoting3.metadata>
<version.org.jboss.security>2.1.0.20091223</version.org.jboss.security>
<version.org.jboss.security.negotiation>2.0.3.SP1</version.org.jboss.security.negotiation>
<version.org.jboss.service.binding>1.0.0.GA</version.org.jboss.service.binding>
@@ -125,8 +128,8 @@
<version.org.jboss.stdio>1.0.0.CR3</version.org.jboss.stdio>
<version.org.jboss.threads>2.0.0.CR3</version.org.jboss.threads>
<version.org.jboss.vfs>3.0.0.CR3</version.org.jboss.vfs>
- <version.org.jboss.xnio>2.1.0.CR1</version.org.jboss.xnio>
- <version.org.jboss.xnio.metadata>2.1.0.CR1</version.org.jboss.xnio.metadata>
+ <version.org.jboss.xnio>2.1.0.CR2</version.org.jboss.xnio>
+ <version.org.jboss.xnio.metadata>2.1.0.CR2</version.org.jboss.xnio.metadata>
<version.org.slf4j>1.5.6</version.org.slf4j>
<version.org.springframework>2.5.6</version.org.springframework>
<version.oswego-concurrent.concurrent>1.3.4-jboss-update1</version.oswego-concurrent.concurrent>
@@ -1089,6 +1092,18 @@
</dependency>
<dependency>
+ <groupId>org.jboss.remoting3</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ <version>${version.org.jboss.remoting3}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.remoting3</groupId>
+ <artifactId>jboss-remoting-metadata</artifactId>
+ <version>${version.org.jboss.remoting3.metadata}</version>
+ </dependency>
+
+ <dependency>
<groupId>jboss.web</groupId>
<artifactId>el-api</artifactId>
<version>${version.jboss.web}</version>
@@ -2321,6 +2336,18 @@
</dependency>
<dependency>
+ <groupId>org.jboss.marshalling</groupId>
+ <artifactId>jboss-marshalling</artifactId>
+ <version>${version.org.jboss.marshalling}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.marshalling</groupId>
+ <artifactId>jboss-marshalling-river</artifactId>
+ <version>${version.org.jboss.marshalling}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.kernel</groupId>
<artifactId>jboss-jmx-mc-int</artifactId>
<version>${version.org.jboss.kernel}</version>
Copied: trunk/varia/src/resources/remoting/remoting3-deployer-jboss-beans.xml (from rev 102101, trunk/varia/src/resources/xnio/xnio-deployer-jboss-beans.xml)
===================================================================
--- trunk/varia/src/resources/remoting/remoting3-deployer-jboss-beans.xml (rev 0)
+++ trunk/varia/src/resources/remoting/remoting3-deployer-jboss-beans.xml 2010-03-10 06:37:55 UTC (rev 102215)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file 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.
+ -->
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="RemotingMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataFactoryDeployer">
+ <constructor>
+ <parameter>org.jboss.remoting3.metadata.RemotingMetaData</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="RemotingParserDeployer" 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>
+ </bean>
+
+</deployment>
Property changes on: trunk/varia/src/resources/remoting/remoting3-deployer-jboss-beans.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Copied: trunk/varia/src/resources/remoting/remoting3-jboss-beans.xml (from rev 102101, trunk/varia/src/resources/xnio/xnio-jboss-beans.xml)
===================================================================
--- trunk/varia/src/resources/remoting/remoting3-jboss-beans.xml (rev 0)
+++ trunk/varia/src/resources/remoting/remoting3-jboss-beans.xml 2010-03-10 06:37:55 UTC (rev 102215)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file 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.
+ -->
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <remoting xmlns="urn:jboss:remoting:3.1" endpoint="${jboss.node.name}">
+
+ <endpoint name="${jboss.node.name}" default="true">
+ <executor name="ThreadPool"/>
+ <options/>
+ <ssl-connector name="RemotingSslConnector"/>
+ <tcp-connector name="RemotingTcpConnector"/>
+ </endpoint>
+
+ <!-- Listening servers -->
+
+ <server name="RemotingTcpServerListener" protocol="remote">
+ <authentication-handler name="simple"/>
+ <options>
+ </options>
+ </server>
+
+ <server name="RemotingSslTcpServerListener" protocol="remote+ssl">
+ <authentication-handler name="simple"/>
+ <options>
+ </options>
+ </server>
+
+ <!-- Simple authentication -->
+
+ <simple-server-authentication name="simple">
+ <entry user-name="testUser" realm-name="${jboss.node.name}" password="password"/>
+ </simple-server-authentication>
+
+ <!-- System-wide services -->
+
+ </remoting>
+
+ <xnio xmlns="urn:jboss:xnio:2.1">
+ <tcp-connector name="RemotingTcpConnector"/>
+
+ <ssl-tcp-connector name="RemotingSslConnector"/>
+
+ <tcp-server name="RemotingTcpServer">
+ <accept-listener name="RemotingTcpServerListener"/>
+ <bind>
+ <bind-address address="${jboss.bind.address}" port="5500"/>
+ </bind>
+ </tcp-server>
+
+ <ssl-tcp-server name="RemotingSslTcpServer">
+ <accept-listener name="RemotingSslTcpServerListener"/>
+ <bind>
+ <bind-address address="${jboss.bind.address}" port="5501"/>
+ </bind>
+ </ssl-tcp-server>
+ </xnio>
+
+</deployment>
Property changes on: trunk/varia/src/resources/remoting/remoting3-jboss-beans.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
More information about the jboss-cvs-commits
mailing list