[jboss-cvs] JBossAS SVN: r84587 - in branches/Branch_5_x: component-matrix and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 20 20:40:38 EST 2009
Author: david.lloyd at jboss.com
Date: 2009-02-20 20:40:38 -0500 (Fri, 20 Feb 2009)
New Revision: 84587
Added:
branches/Branch_5_x/varia/src/resources/xnio/
branches/Branch_5_x/varia/src/resources/xnio/xnio-deployer-jboss-beans.xml
branches/Branch_5_x/varia/src/resources/xnio/xnio-jboss-beans.xml
Removed:
branches/Branch_5_x/varia/src/resources/xnio/xnio-deployer-jboss-beans.xml
branches/Branch_5_x/varia/src/resources/xnio/xnio-jboss-beans.xml
Modified:
branches/Branch_5_x/build/build-distr.xml
branches/Branch_5_x/component-matrix/pom.xml
branches/Branch_5_x/thirdparty/pom.xml
Log:
MFT: JBAS-6474 - Integrate XNIO metadata 1.0.0.CR1 deployer and provider
Modified: branches/Branch_5_x/build/build-distr.xml
===================================================================
--- branches/Branch_5_x/build/build-distr.xml 2009-02-21 01:15:42 UTC (rev 84586)
+++ branches/Branch_5_x/build/build-distr.xml 2009-02-21 01:40:38 UTC (rev 84587)
@@ -1275,6 +1275,37 @@
<fileset dir="${_module.output}/resources/threads"/>
</copy>
+ <!-- copy the xnio deployer files into their proper places -->
+ <copy todir="${install.common.lib}">
+ <fileset dir="${org.jboss.xnio.lib}">
+ <include name="xnio-api.jar"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${install.server}/all/deploy/xnio-provider.jar/META-INF"/>
+ <copy todir="${install.server}/all/deploy/xnio-provider.jar">
+ <fileset dir="${org.jboss.xnio.lib}">
+ <include name="xnio-nio.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${install.server}/all/deploy/xnio-provider.jar/META-INF">
+ <fileset dir="${_module.output}/resources/xnio">
+ <include name="xnio-jboss-beans.xml"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${install.server}/all/deployers/xnio.deployer/META-INF"/>
+ <copy todir="${install.server}/all/deployers/xnio.deployer">
+ <fileset dir="${org.jboss.xnio.lib}">
+ <include name="xnio-metadata.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${install.server}/all/deployers/xnio.deployer/META-INF">
+ <fileset dir="${_module.output}/resources/xnio">
+ <include name="xnio-deployer-jboss-beans.xml"/>
+ </fileset>
+ </copy>
+
</target>
<target name="_module-varia-all" depends="_module-varia-most">
Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml 2009-02-21 01:15:42 UTC (rev 84586)
+++ branches/Branch_5_x/component-matrix/pom.xml 2009-02-21 01:40:38 UTC (rev 84587)
@@ -81,6 +81,8 @@
<version.org.jboss.remoting>2.5.0.SP2</version.org.jboss.remoting>
<version.org.jboss.security>2.0.2.SP3</version.org.jboss.security>
<version.org.jboss.threads>1.0.0.CR1</version.org.jboss.threads>
+ <version.org.jboss.xnio>1.2.0.GA</version.org.jboss.xnio>
+ <version.org.jboss.xnio.metadata>1.0.0.CR1</version.org.jboss.xnio.metadata>
<version.oswego-concurrent.concurrent>1.3.4-jboss-update1</version.oswego-concurrent.concurrent>
<version.suffix.org.jboss.javaee>.GA</version.suffix.org.jboss.javaee>
<version.org.springframework>2.5.5</version.org.springframework>
@@ -1860,6 +1862,24 @@
</dependency>
<dependency>
+ <groupId>org.jboss.xnio</groupId>
+ <artifactId>xnio-api</artifactId>
+ <version>${version.org.jboss.xnio}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.xnio</groupId>
+ <artifactId>xnio-nio</artifactId>
+ <version>${version.org.jboss.xnio}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.xnio</groupId>
+ <artifactId>xnio-metadata</artifactId>
+ <version>${version.org.jboss.xnio.metadata}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.security</groupId>
<artifactId>jbosssx-client</artifactId>
<version>${version.org.jboss.security}</version>
Modified: branches/Branch_5_x/thirdparty/pom.xml
===================================================================
--- branches/Branch_5_x/thirdparty/pom.xml 2009-02-21 01:15:42 UTC (rev 84586)
+++ branches/Branch_5_x/thirdparty/pom.xml 2009-02-21 01:40:38 UTC (rev 84587)
@@ -1640,6 +1640,18 @@
<artifactId>jboss-threads-metadata</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.xnio</groupId>
+ <artifactId>xnio-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.xnio</groupId>
+ <artifactId>xnio-nio</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.xnio</groupId>
+ <artifactId>xnio-metadata</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
</dependency>
Copied: branches/Branch_5_x/varia/src/resources/xnio (from rev 84586, trunk/varia/src/resources/xnio)
Deleted: branches/Branch_5_x/varia/src/resources/xnio/xnio-deployer-jboss-beans.xml
===================================================================
--- trunk/varia/src/resources/xnio/xnio-deployer-jboss-beans.xml 2009-02-21 01:15:42 UTC (rev 84586)
+++ branches/Branch_5_x/varia/src/resources/xnio/xnio-deployer-jboss-beans.xml 2009-02-21 01:40:38 UTC (rev 84587)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <bean name="XnioMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataFactoryDeployer">
- <constructor>
- <parameter>org.jboss.xnio.metadata.XnioMetaData</parameter>
- </constructor>
- </bean>
-
- <bean name="XnioParserDeployer" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
- <constructor>
- <parameter>org.jboss.xnio.metadata.XnioMetaData</parameter>
- </constructor>
- <property name="name">jboss-xnio.xml</property>
- <property name="registerWithJBossXB">true</property>
- </bean>
-
-</deployment>
Copied: branches/Branch_5_x/varia/src/resources/xnio/xnio-deployer-jboss-beans.xml (from rev 84586, trunk/varia/src/resources/xnio/xnio-deployer-jboss-beans.xml)
===================================================================
--- branches/Branch_5_x/varia/src/resources/xnio/xnio-deployer-jboss-beans.xml (rev 0)
+++ branches/Branch_5_x/varia/src/resources/xnio/xnio-deployer-jboss-beans.xml 2009-02-21 01:40:38 UTC (rev 84587)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="XnioMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataFactoryDeployer">
+ <constructor>
+ <parameter>org.jboss.xnio.metadata.XnioMetaData</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="XnioParserDeployer" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
+ <constructor>
+ <parameter>org.jboss.xnio.metadata.XnioMetaData</parameter>
+ </constructor>
+ <property name="name">jboss-xnio.xml</property>
+ <property name="registerWithJBossXB">true</property>
+ </bean>
+
+</deployment>
Deleted: branches/Branch_5_x/varia/src/resources/xnio/xnio-jboss-beans.xml
===================================================================
--- trunk/varia/src/resources/xnio/xnio-jboss-beans.xml 2009-02-21 01:15:42 UTC (rev 84586)
+++ branches/Branch_5_x/varia/src/resources/xnio/xnio-jboss-beans.xml 2009-02-21 01:40:38 UTC (rev 84587)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-<threads xmlns="urn:jboss:threads:1.0">
- <thread-group name="XnioThreadGroup" group-name="xnio"/>
-
- <thread-group name="XnioSelectorThreadGroup" group-name="selector" parent="XnioThreadGroup"/>
-
- <thread-factory name="XnioThreadFactory" group="XnioThreadGroup" thread-name-pattern="xnio-pool%f-%t"/>
-
- <direct-executor name="XnioHandlerExecutor"/>
- </threads>
-
- <bean mode="On Demand" name="XnioProvider" class="org.jboss.xnio.Xnio">
- <constructor factoryClass="org.jboss.xnio.nio.NioXnio" factoryMethod="create">
- <parameter class="java.util.concurrent.Executor">
- <inject bean="XnioHandlerExecutor"/>
- </parameter>
- <parameter class="java.util.concurrent.ThreadFactory">
- <inject bean="XnioThreadFactory"/>
- </parameter>
- <parameter class="int">3</parameter>
- <parameter class="int">1</parameter>
- <parameter class="int">1</parameter>
- </constructor>
- </bean>
-</deployment>
Copied: branches/Branch_5_x/varia/src/resources/xnio/xnio-jboss-beans.xml (from rev 84586, trunk/varia/src/resources/xnio/xnio-jboss-beans.xml)
===================================================================
--- branches/Branch_5_x/varia/src/resources/xnio/xnio-jboss-beans.xml (rev 0)
+++ branches/Branch_5_x/varia/src/resources/xnio/xnio-jboss-beans.xml 2009-02-21 01:40:38 UTC (rev 84587)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+<threads xmlns="urn:jboss:threads:1.0">
+ <thread-group name="XnioThreadGroup" group-name="xnio"/>
+
+ <thread-group name="XnioSelectorThreadGroup" group-name="selector" parent="XnioThreadGroup"/>
+
+ <thread-factory name="XnioThreadFactory" group="XnioThreadGroup" thread-name-pattern="xnio-pool%f-%t"/>
+
+ <direct-executor name="XnioHandlerExecutor"/>
+ </threads>
+
+ <bean mode="On Demand" name="XnioProvider" class="org.jboss.xnio.Xnio">
+ <constructor factoryClass="org.jboss.xnio.nio.NioXnio" factoryMethod="create">
+ <parameter class="java.util.concurrent.Executor">
+ <inject bean="XnioHandlerExecutor"/>
+ </parameter>
+ <parameter class="java.util.concurrent.ThreadFactory">
+ <inject bean="XnioThreadFactory"/>
+ </parameter>
+ <parameter class="int">3</parameter>
+ <parameter class="int">1</parameter>
+ <parameter class="int">1</parameter>
+ </constructor>
+ </bean>
+</deployment>
More information about the jboss-cvs-commits
mailing list