[jboss-cvs] JBossAS SVN: r88378 - in projects/jboss-jca/trunk: core/src/main/resources/deployment and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu May 7 13:38:04 EDT 2009
Author: jesper.pedersen
Date: 2009-05-07 13:38:04 -0400 (Thu, 07 May 2009)
New Revision: 88378
Added:
projects/jboss-jca/trunk/core/src/main/resources/deployment/jca.xml
projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/naming.xml
projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/transaction.xml
Removed:
projects/jboss-jca/trunk/core/src/main/resources/deployment/jca-jboss-beans.xml
projects/jboss-jca/trunk/standalone/src/main/resources/deployment/naming-jboss-beans.xml
projects/jboss-jca/trunk/standalone/src/main/resources/deployment/transaction-jboss-beans.xml
Modified:
projects/jboss-jca/trunk/core/build.xml
projects/jboss-jca/trunk/standalone/build.xml
projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap.xml
Log:
[JBJCA-89] Standalone profile - moving stuff around
Modified: projects/jboss-jca/trunk/core/build.xml
===================================================================
--- projects/jboss-jca/trunk/core/build.xml 2009-05-07 17:37:48 UTC (rev 88377)
+++ projects/jboss-jca/trunk/core/build.xml 2009-05-07 17:38:04 UTC (rev 88378)
@@ -59,8 +59,8 @@
basedir="${build.core.dir}/impl"
excludes="**/*.java, **/api/**"/>
- <mkdir dir="${target.dir}/deploy"/>
- <copy todir="${target.dir}/deploy">
+ <mkdir dir="${target.dir}/bootstrap"/>
+ <copy todir="${target.dir}/bootstrap">
<fileset dir="src/main/resources/deployment">
<include name="**/*.xml"/>
</fileset>
Deleted: projects/jboss-jca/trunk/core/src/main/resources/deployment/jca-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/main/resources/deployment/jca-jboss-beans.xml 2009-05-07 17:37:48 UTC (rev 88377)
+++ projects/jboss-jca/trunk/core/src/main/resources/deployment/jca-jboss-beans.xml 2009-05-07 17:38:04 UTC (rev 88378)
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- JBoss JCA
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- Work Manager thread pool -->
- <bean name="WorkManagerThreadPool" interface="org.jboss.jca.common.threadpool.ThreadPool" class="org.jboss.jca.common.threadpool.ThreadPoolImpl">
- <!-- The name that appears in thread names -->
- <property name="name">WorkManager</property>
-
- <!-- The maximum amount of work in the queue -->
- <property name="maximumQueueSize">1024</property>
-
- <!-- The maximum number of active threads -->
- <property name="maximumPoolSize">100</property>
-
- <!-- How long to keep threads alive after their last work (default one minute) -->
- <property name="keepAliveTime">60000</property>
- </bean>
-
- <!-- Work Manager -->
- <bean name="WorkManager" interface="org.jboss.jca.core.api.WorkManager" class="org.jboss.jca.core.workmanager.WorkManagerImpl">
- <!-- The thread pool -->
- <property name="threadPool"><inject bean="WorkManagerThreadPool"/></property>
-
- <!-- The XA terminator -->
- <property name="XATerminator"><inject bean="TransactionManager" property="XATerminator"/></property>
- </bean>
-
- <!-- Connection Manager -->
- <bean name="ConnectionManager" interface="org.jboss.jca.core.api.ConnectionManager" class="org.jboss.jca.core.connectionmanager.ConnectionManagerImpl">
- </bean>
-
-</deployment>
Copied: projects/jboss-jca/trunk/core/src/main/resources/deployment/jca.xml (from rev 88298, projects/jboss-jca/trunk/core/src/main/resources/deployment/jca-jboss-beans.xml)
===================================================================
--- projects/jboss-jca/trunk/core/src/main/resources/deployment/jca.xml (rev 0)
+++ projects/jboss-jca/trunk/core/src/main/resources/deployment/jca.xml 2009-05-07 17:38:04 UTC (rev 88378)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ JBoss JCA
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- Work Manager thread pool -->
+ <bean name="WorkManagerThreadPool" interface="org.jboss.jca.common.threadpool.ThreadPool" class="org.jboss.jca.common.threadpool.ThreadPoolImpl">
+ <!-- The name that appears in thread names -->
+ <property name="name">WorkManager</property>
+
+ <!-- The maximum amount of work in the queue -->
+ <property name="maximumQueueSize">1024</property>
+
+ <!-- The maximum number of active threads -->
+ <property name="maximumPoolSize">100</property>
+
+ <!-- How long to keep threads alive after their last work (default one minute) -->
+ <property name="keepAliveTime">60000</property>
+ </bean>
+
+ <!-- Work Manager -->
+ <bean name="WorkManager" interface="org.jboss.jca.core.api.WorkManager" class="org.jboss.jca.core.workmanager.WorkManagerImpl">
+ <!-- The thread pool -->
+ <property name="threadPool"><inject bean="WorkManagerThreadPool"/></property>
+
+ <!-- The XA terminator -->
+ <property name="XATerminator"><inject bean="TransactionManager" property="XATerminator"/></property>
+ </bean>
+
+ <!-- Connection Manager -->
+ <bean name="ConnectionManager" interface="org.jboss.jca.core.api.ConnectionManager" class="org.jboss.jca.core.connectionmanager.ConnectionManagerImpl">
+ </bean>
+
+</deployment>
Property changes on: projects/jboss-jca/trunk/core/src/main/resources/deployment/jca.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
Modified: projects/jboss-jca/trunk/standalone/build.xml
===================================================================
--- projects/jboss-jca/trunk/standalone/build.xml 2009-05-07 17:37:48 UTC (rev 88377)
+++ projects/jboss-jca/trunk/standalone/build.xml 2009-05-07 17:38:04 UTC (rev 88378)
@@ -112,6 +112,12 @@
</fileset>
</copy>
+ <copy todir="${target.dir}/standalone/server/jca/conf/bootstrap">
+ <fileset dir="${target.dir}/bootstrap">
+ <include name="**/*.xml"/>
+ </fileset>
+ </copy>
+
<copy todir="${target.dir}/standalone/server/jca/conf">
<fileset dir="src/main/resources/">
<include name="*.properties"/>
@@ -119,12 +125,6 @@
</copy>
<copy todir="${target.dir}/standalone/server/jca/deploy">
- <fileset dir="${target.dir}/deploy">
- <include name="**/*.xml"/>
- </fileset>
- </copy>
-
- <copy todir="${target.dir}/standalone/server/jca/deploy">
<fileset dir="src/main/resources/deployment">
<include name="**/*.xml"/>
</fileset>
Copied: projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/naming.xml (from rev 88298, projects/jboss-jca/trunk/standalone/src/main/resources/deployment/naming-jboss-beans.xml)
===================================================================
--- projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/naming.xml (rev 0)
+++ projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/naming.xml 2009-05-07 17:38:04 UTC (rev 88378)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ JBoss JCA
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <classloader><inject bean="naming-classloader:0.0.0"/></classloader>
+
+ <classloader name="naming-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
+ <root>${jboss.lib.url}jnpserver.jar</root>
+ </classloader>
+
+ <!-- Naming -->
+ <bean name="NamingServer" class="org.jnp.server.SingletonNamingServer"/>
+
+</deployment>
Property changes on: projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/naming.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/transaction.xml (from rev 88298, projects/jboss-jca/trunk/standalone/src/main/resources/deployment/transaction-jboss-beans.xml)
===================================================================
--- projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/transaction.xml (rev 0)
+++ projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/transaction.xml 2009-05-07 17:38:04 UTC (rev 88378)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ JBoss JCA
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- JMX -->
+ <bean name="JMX" class="org.jboss.jca.standalone.hack.JMX"/>
+
+ <!-- Transaction manager -->
+ <bean name="TransactionManager" class="com.arjuna.ats.jbossatx.jta.TransactionManagerService">
+<!-- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=TransactionManager", exposedInterface=com.arjuna.ats.jbossatx.jta.TransactionManagerServiceMBean.class, registerDirectly=true)</annotation> -->
+ <property name="transactionTimeout">300</property>
+ <property name="objectStoreDir">tx-object-store</property>
+ <property name="mbeanServer"><inject bean="JMX" property="mbeanServer"/></property>
+ <property name="transactionStatusManagerInetAddress">localhost</property>
+ <property name="transactionStatusManagerPort">4713</property>
+ <property name="recoveryInetAddress">localhost</property>
+ <property name="recoveryPort">4712</property>
+ <property name="socketProcessIdPort">0</property>
+
+ <depends>JMX</depends>
+ <depends>NamingServer</depends>
+ </bean>
+
+</deployment>
Property changes on: projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/transaction.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap.xml
===================================================================
--- projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap.xml 2009-05-07 17:37:48 UTC (rev 88377)
+++ projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap.xml 2009-05-07 17:38:04 UTC (rev 88378)
@@ -7,6 +7,9 @@
<url>bootstrap/classloader.xml</url>
<url>bootstrap/aop.xml</url>
<url>bootstrap/deployers.xml</url>
+ <url>bootstrap/naming.xml</url>
+ <url>bootstrap/transaction.xml</url>
+ <url>bootstrap/jca.xml</url>
<url>bootstrap/hdscanner.xml</url>
</bootstrap>
Deleted: projects/jboss-jca/trunk/standalone/src/main/resources/deployment/naming-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/standalone/src/main/resources/deployment/naming-jboss-beans.xml 2009-05-07 17:37:48 UTC (rev 88377)
+++ projects/jboss-jca/trunk/standalone/src/main/resources/deployment/naming-jboss-beans.xml 2009-05-07 17:38:04 UTC (rev 88378)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- JBoss JCA
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <classloader><inject bean="naming-classloader:0.0.0"/></classloader>
-
- <classloader name="naming-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
- <root>${jboss.lib.url}jnpserver.jar</root>
- </classloader>
-
- <!-- Naming -->
- <bean name="NamingServer" class="org.jnp.server.SingletonNamingServer"/>
-
-</deployment>
Deleted: projects/jboss-jca/trunk/standalone/src/main/resources/deployment/transaction-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/standalone/src/main/resources/deployment/transaction-jboss-beans.xml 2009-05-07 17:37:48 UTC (rev 88377)
+++ projects/jboss-jca/trunk/standalone/src/main/resources/deployment/transaction-jboss-beans.xml 2009-05-07 17:38:04 UTC (rev 88378)
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- JBoss JCA
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- JMX -->
- <bean name="JMX" class="org.jboss.jca.standalone.hack.JMX"/>
-
- <!-- Transaction manager -->
- <bean name="TransactionManager" class="com.arjuna.ats.jbossatx.jta.TransactionManagerService">
-<!-- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=TransactionManager", exposedInterface=com.arjuna.ats.jbossatx.jta.TransactionManagerServiceMBean.class, registerDirectly=true)</annotation> -->
- <property name="transactionTimeout">300</property>
- <property name="objectStoreDir">tx-object-store</property>
- <property name="mbeanServer"><inject bean="JMX" property="mbeanServer"/></property>
- <property name="transactionStatusManagerInetAddress">localhost</property>
- <property name="transactionStatusManagerPort">4713</property>
- <property name="recoveryInetAddress">localhost</property>
- <property name="recoveryPort">4712</property>
- <property name="socketProcessIdPort">0</property>
-
- <depends>JMX</depends>
- <depends>NamingServer</depends>
- </bean>
-
-</deployment>
More information about the jboss-cvs-commits
mailing list