[jboss-cvs] JBossAS SVN: r84402 - in trunk: component-matrix and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 18 12:52:05 EST 2009
Author: david.lloyd at jboss.com
Date: 2009-02-18 12:52:05 -0500 (Wed, 18 Feb 2009)
New Revision: 84402
Added:
trunk/varia/src/resources/threads/
trunk/varia/src/resources/threads/threads-deployer-jboss-beans.xml
Removed:
trunk/varia/src/resources/threads/threads-deployer-jboss-beans.xml
Modified:
trunk/build/build-distr.xml
trunk/component-matrix/pom.xml
trunk/thirdparty/pom.xml
Log:
JBAS-6473 - Install jboss-threads 1.0.0.CR1 (merged from 5.x)
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2009-02-18 17:42:05 UTC (rev 84401)
+++ trunk/build/build-distr.xml 2009-02-18 17:52:05 UTC (rev 84402)
@@ -1259,6 +1259,22 @@
</fileset>
</copy>
+ <!-- copy the threads deployer files into their proper places -->
+ <copy todir="${install.common.lib}">
+ <fileset dir="${org.jboss.threads.lib}">
+ <include name="jboss-threads.jar"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${install.server}/all/deployers/jboss-threads.deployer/META-INF"/>
+ <copy todir="${install.server}/all/deployers/jboss-threads.deployer">
+ <fileset dir="${org.jboss.threads.lib}">
+ <include name="jboss-threads-metadata.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${install.server}/all/deployers/jboss-threads.deployer/META-INF">
+ <fileset dir="${_module.output}/resources/threads"/>
+ </copy>
+
</target>
<target name="_module-varia-all" depends="_module-varia-most">
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2009-02-18 17:42:05 UTC (rev 84401)
+++ trunk/component-matrix/pom.xml 2009-02-18 17:52:05 UTC (rev 84402)
@@ -77,6 +77,7 @@
<version.org.jboss.naming>5.0.1.GA</version.org.jboss.naming>
<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.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>
@@ -1823,8 +1824,20 @@
<artifactId>jbosssx</artifactId>
<version>${version.org.jboss.security}</version>
</dependency>
-
+
<dependency>
+ <groupId>org.jboss.threads</groupId>
+ <artifactId>jboss-threads</artifactId>
+ <version>${version.org.jboss.threads}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.threads</groupId>
+ <artifactId>jboss-threads-metadata</artifactId>
+ <version>${version.org.jboss.threads}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.security</groupId>
<artifactId>jbosssx-client</artifactId>
<version>${version.org.jboss.security}</version>
Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml 2009-02-18 17:42:05 UTC (rev 84401)
+++ trunk/thirdparty/pom.xml 2009-02-18 17:52:05 UTC (rev 84402)
@@ -1616,6 +1616,14 @@
<artifactId>jboss-serialization</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.threads</groupId>
+ <artifactId>jboss-threads</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.threads</groupId>
+ <artifactId>jboss-threads-metadata</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
</dependency>
Copied: trunk/varia/src/resources/threads (from rev 84398, branches/Branch_5_x/varia/src/resources/threads)
Deleted: trunk/varia/src/resources/threads/threads-deployer-jboss-beans.xml
===================================================================
--- branches/Branch_5_x/varia/src/resources/threads/threads-deployer-jboss-beans.xml 2009-02-18 17:15:17 UTC (rev 84398)
+++ trunk/varia/src/resources/threads/threads-deployer-jboss-beans.xml 2009-02-18 17:52:05 UTC (rev 84402)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="JBossThreadsMetaDataFactoryDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataFactoryDeployer">
- <constructor>
- <parameter>org.jboss.threads.metadata.ThreadsMetaData</parameter>
- </constructor>
- </bean>
-
- <bean name="JBossThreadsMetaDataSchemaResolverDeployer" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
- <constructor>
- <parameter>org.jboss.threads.metadata.ThreadsMetaData</parameter>
- </constructor>
- <property name="name">jboss-threads.xml</property>
- <property name="registerWithJBossXB">true</property>
- </bean>
-
-</deployment>
Copied: trunk/varia/src/resources/threads/threads-deployer-jboss-beans.xml (from rev 84398, branches/Branch_5_x/varia/src/resources/threads/threads-deployer-jboss-beans.xml)
===================================================================
--- trunk/varia/src/resources/threads/threads-deployer-jboss-beans.xml (rev 0)
+++ trunk/varia/src/resources/threads/threads-deployer-jboss-beans.xml 2009-02-18 17:52:05 UTC (rev 84402)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="JBossThreadsMetaDataFactoryDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataFactoryDeployer">
+ <constructor>
+ <parameter>org.jboss.threads.metadata.ThreadsMetaData</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="JBossThreadsMetaDataSchemaResolverDeployer" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
+ <constructor>
+ <parameter>org.jboss.threads.metadata.ThreadsMetaData</parameter>
+ </constructor>
+ <property name="name">jboss-threads.xml</property>
+ <property name="registerWithJBossXB">true</property>
+ </bean>
+
+</deployment>
More information about the jboss-cvs-commits
mailing list