[jboss-cvs] JBossAS SVN: r80054 - in trunk: connector/src/main/org/jboss/resource/connectionmanager and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Oct 24 12:20:18 EDT 2008
Author: adrian at jboss.org
Date: 2008-10-24 12:20:18 -0400 (Fri, 24 Oct 2008)
New Revision: 80054
Added:
trunk/connector/src/resources/jca-sar/jca-jboss-beans.xml
Removed:
trunk/connector/src/resources/jca-sar/jbossjca-service.xml
Modified:
trunk/build/build-distr.xml
trunk/connector/src/main/org/jboss/resource/connectionmanager/CachedConnectionManager.java
trunk/connector/src/main/org/jboss/resource/connectionmanager/CachedConnectionManagerMBean.java
trunk/connector/src/main/org/jboss/resource/work/JBossWorkManager.java
trunk/connector/src/main/org/jboss/resource/work/JBossWorkManagerMBean.java
trunk/testsuite/build.xml
trunk/testsuite/imports/server-config.xml
trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java
Log:
[JBAS-6136] - Pojoise the jca configuration. jbossjca-service.xml -> jca-jboss-beans.xml
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2008-10-24 16:17:55 UTC (rev 80053)
+++ trunk/build/build-distr.xml 2008-10-24 16:20:18 UTC (rev 80054)
@@ -600,7 +600,7 @@
<include name="quartz-ra.rar"/>
</fileset>
<fileset dir="${_module.output}/resources/jca-sar">
- <include name="jbossjca-service.xml"/>
+ <include name="jca-jboss-beans.xml"/>
</fileset>
</copy>
<copy todir="${install.all.deploy}" filtering="no">
Modified: trunk/connector/src/main/org/jboss/resource/connectionmanager/CachedConnectionManager.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/connectionmanager/CachedConnectionManager.java 2008-10-24 16:17:55 UTC (rev 80053)
+++ trunk/connector/src/main/org/jboss/resource/connectionmanager/CachedConnectionManager.java 2008-10-24 16:20:18 UTC (rev 80054)
@@ -34,7 +34,6 @@
import java.util.Set;
import java.util.WeakHashMap;
-import javax.management.ObjectName;
import javax.resource.ResourceException;
import javax.resource.spi.ConnectionRequestInfo;
import javax.transaction.Synchronization;
@@ -73,7 +72,6 @@
protected boolean error;
- private ObjectName transactionManagerServiceName;
private TransactionManager tm;
/**
@@ -141,14 +139,17 @@
this.error = value;
}
- public ObjectName getTransactionManagerServiceName()
+ public TransactionManager getTransactionManager()
{
- return transactionManagerServiceName;
+ return tm;
}
- public void setTransactionManagerServiceName(ObjectName transactionManagerServiceName)
+ public void setTransactionManager(TransactionManager tm)
{
- this.transactionManagerServiceName = transactionManagerServiceName;
+ this.tm = tm;
+ // FIXME we should be injecting onto the synchronizer directly
+ if (tm != null)
+ TransactionSynchronizer.setTransactionManager(tm);
}
public CachedConnectionManager getInstance()
@@ -185,9 +186,6 @@
protected void startService()
throws Exception
{
- tm = (TransactionManager) getServer().getAttribute(transactionManagerServiceName,
- "TransactionManager");
- TransactionSynchronizer.setTransactionManager(tm);
ServerVMClientUserTransaction.getSingleton().registerTxStartedListener(this);
EnterpriseContext.setUserTransactionStartedListener(this);
}
@@ -549,7 +547,9 @@
{
try
{
- Transaction tx = tm.getTransaction();
+ Transaction tx = null;
+ if (tm != null)
+ tx = tm.getTransaction();
if (tx != null)
{
TransactionSynchronizer.lock(tx);
Modified: trunk/connector/src/main/org/jboss/resource/connectionmanager/CachedConnectionManagerMBean.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/connectionmanager/CachedConnectionManagerMBean.java 2008-10-24 16:17:55 UTC (rev 80053)
+++ trunk/connector/src/main/org/jboss/resource/connectionmanager/CachedConnectionManagerMBean.java 2008-10-24 16:20:18 UTC (rev 80054)
@@ -81,20 +81,6 @@
void setError(boolean value);
/**
- * Get the TransactionManagerServiceName value.
- *
- * @return the TransactionManagerServiceName value.
- */
- ObjectName getTransactionManagerServiceName();
-
- /**
- * Set the TransactionManagerServiceName value.
- *
- * @param transactionManagerServiceName The new TransactionManagerServiceName value.
- */
- void setTransactionManagerServiceName(ObjectName transactionManagerServiceName);
-
- /**
* The Instance attribute simply holds the current instance, which is normally the only instance of CachedConnectionManager.
*
* @return a <code>CachedConnectionManager</code> value
Modified: trunk/connector/src/main/org/jboss/resource/work/JBossWorkManager.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/work/JBossWorkManager.java 2008-10-24 16:17:55 UTC (rev 80053)
+++ trunk/connector/src/main/org/jboss/resource/work/JBossWorkManager.java 2008-10-24 16:20:18 UTC (rev 80054)
@@ -21,7 +21,6 @@
*/
package org.jboss.resource.work;
-import javax.management.ObjectName;
import javax.resource.spi.work.ExecutionContext;
import javax.resource.spi.work.Work;
import javax.resource.spi.work.WorkException;
@@ -48,15 +47,9 @@
/** The thread pool */
private ThreadPool threadPool;
- /** The thread pool name */
- private ObjectName threadPoolName;
-
/** The xa terminator */
private JBossXATerminator xaTerminator;
- /** The xa terminator name */
- private ObjectName xaTerminatorName;
-
/**
* Retrieve the thread pool
*
@@ -77,26 +70,26 @@
this.threadPool = threadPool;
}
- public ObjectName getThreadPoolName()
+ /**
+ * Get the XATerminator
+ *
+ * @return the xa terminator
+ */
+ public JBossXATerminator getXATerminator()
{
- return threadPoolName;
+ return xaTerminator;
}
- public void setThreadPoolName(ObjectName threadPoolName)
+ /**
+ * Set the XATerminator
+ *
+ * @param xaTerminator the xa terminator
+ */
+ public void setXATerminator(JBossXATerminator xaTerminator)
{
- this.threadPoolName = threadPoolName;
+ this.xaTerminator = xaTerminator;
}
- public ObjectName getXATerminatorName()
- {
- return xaTerminatorName;
- }
-
- public void setXATerminatorName(ObjectName xaTerminatorName)
- {
- this.xaTerminatorName = xaTerminatorName;
- }
-
public WorkManager getInstance()
{
return this;
@@ -151,19 +144,6 @@
scheduleWork(work, WorkManager.INDEFINITE, null, null);
}
- protected void startService() throws Exception
- {
- if (threadPoolName == null)
- throw new IllegalStateException("No thread pool name");
-
- threadPool = (ThreadPool) server.getAttribute(threadPoolName, "Instance");
-
- if (xaTerminatorName == null)
- throw new IllegalStateException("No xa terminator name");
-
- xaTerminator = (JBossXATerminator) server.getAttribute(xaTerminatorName, "XATerminator");
- }
-
/**
* Import any work
*
@@ -236,7 +216,6 @@
* End work
*
* @param wrapper the work wrapper
- * @throws WorkException for any error
*/
protected void endWork(WorkWrapper wrapper)
{
@@ -260,7 +239,6 @@
* Cancel work
*
* @param wrapper the work wrapper
- * @throws WorkException for any error
*/
protected void cancelWork(WorkWrapper wrapper)
{
Modified: trunk/connector/src/main/org/jboss/resource/work/JBossWorkManagerMBean.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/work/JBossWorkManagerMBean.java 2008-10-24 16:17:55 UTC (rev 80053)
+++ trunk/connector/src/main/org/jboss/resource/work/JBossWorkManagerMBean.java 2008-10-24 16:20:18 UTC (rev 80054)
@@ -21,7 +21,6 @@
*/
package org.jboss.resource.work;
-import javax.management.ObjectName;
import javax.resource.spi.work.WorkManager;
import org.jboss.system.ServiceMBean;
@@ -35,34 +34,6 @@
public interface JBossWorkManagerMBean extends ServiceMBean
{
/**
- * Get the thread pool name
- *
- * @return the thread pool name
- */
- ObjectName getThreadPoolName();
-
- /**
- * Set the thread pool name
- *
- * @param threadPoolName the thread pool name
- */
- void setThreadPoolName(ObjectName threadPoolName);
-
- /**
- * Get the XATerminator
- *
- * @return the xa terminator
- */
- ObjectName getXATerminatorName();
-
- /**
- * Set the xa terminator
- *
- * @param xaTerminatorName the xa terminator name
- */
- void setXATerminatorName(ObjectName xaTerminatorName);
-
- /**
* Get the reference to this work manager
*
* @return the work manager
Deleted: trunk/connector/src/resources/jca-sar/jbossjca-service.xml
===================================================================
--- trunk/connector/src/resources/jca-sar/jbossjca-service.xml 2008-10-24 16:17:55 UTC (rev 80053)
+++ trunk/connector/src/resources/jca-sar/jbossjca-service.xml 2008-10-24 16:20:18 UTC (rev 80054)
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- JBoss JCA Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
- | This contains configuration for the RARDeployer
- and some xsl based deployers.
- -->
-
-<server>
-
- <!-- ==================================================================== -->
- <!-- JBossCX setup, for J2EE connector architecture support -->
- <!-- The RARDeployer is needed only until xslt based deployment is written.-->
- <!-- ==================================================================== -->
-
- <mbean code="org.jboss.util.threadpool.BasicThreadPool"
- name="jboss.jca:service=WorkManagerThreadPool">
- <!-- The name that appears in thread names -->
- <attribute name="Name">WorkManager</attribute>
- <!-- The maximum amount of work in the queue -->
- <attribute name="MaximumQueueSize">1024</attribute>
- <!-- The maximum number of active threads -->
- <attribute name="MaximumPoolSize">100</attribute>
- <!-- How long to keep threads alive after their last work (default one minute) -->
- <attribute name="KeepAliveTime">60000</attribute>
- </mbean>
-
- <mbean code="org.jboss.resource.work.JBossWorkManager"
- name="jboss.jca:service=WorkManager">
- <depends optional-attribute-name="ThreadPoolName">jboss.jca:service=WorkManagerThreadPool</depends>
- <depends optional-attribute-name="XATerminatorName">jboss:service=TransactionManager</depends>
- </mbean>
-
- <!--mbean code="org.jboss.resource.deployment.RARDeployer"
- name="jboss.jca:service=RARDeployer">
- <depends optional-attribute-name="WorkManagerName">jboss.jca:service=WorkManager</depends>
- <depends optional-attribute-name="XATerminatorName">jboss:service=TransactionManager</depends>
- <depends>jboss.system:service=MainDeployer</depends>
- </mbean-->
-
- <!--mbean code="org.jboss.deployment.XSLSubDeployer" name="jboss.jca:service=ConnectionFactoryDeployer">
- <attribute name="DdSuffix">-ds.xml</attribute>
- <attribute name="EnhancedSuffixes">300:-ds.xml</attribute>
- <attribute name="XslUrl">stylesheets/ConnectionFactoryTemplate.xsl</attribute>
- <attribute name="ValidateDTDs">false</attribute>
- <depends>jboss.system:service=ServiceDeployer</depends>
- </mbean-->
-
- <!-- Experimental for new DsSubDeployer support
- <mbean code="org.jboss.resource.deployment.ds.DsSubDeployer" name="jboss.jca:service=ConnectionFactoryDeployer">
- <attribute name="DdSuffix">-ds.xml</attribute>
- <attribute name="EnhancedSuffixes">300:-ds.xml</attribute>
- <attribute name="ValidateDTDs">false</attribute>
- </mbean>
- -->
-
- <!--
- | The CachedConnectionManager is used partly to relay started UserTransactions to
- | open connections so they may be enrolled in the new tx.
- -->
-
- <mbean code="org.jboss.resource.connectionmanager.CachedConnectionManager"
- name="jboss.jca:service=CachedConnectionManager">
- <depends optional-attribute-name="TransactionManagerServiceName">jboss:service=TransactionManager</depends>
-
- <attribute name="Debug">true</attribute>
-
- </mbean>
-
-
-</server>
Added: trunk/connector/src/resources/jca-sar/jca-jboss-beans.xml
===================================================================
--- trunk/connector/src/resources/jca-sar/jca-jboss-beans.xml (rev 0)
+++ trunk/connector/src/resources/jca-sar/jca-jboss-beans.xml 2008-10-24 16:20:18 UTC (rev 80054)
@@ -0,0 +1,58 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- ==================================================================== -->
+ <!-- JBossCX setup, for J2EE connector architecture support -->
+ <!-- ==================================================================== -->
+
+ <!-- THREAD POOL -->
+ <bean name="WorkManagerThreadPool" class="org.jboss.util.threadpool.BasicThreadPool">
+
+ <!-- Expose via JMX -->
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jca:service=WorkManagerThreadPool", exposedInterface=org.jboss.util.threadpool.BasicThreadPoolMBean.class)</annotation>
+
+ <!-- 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" class="org.jboss.resource.work.JBossWorkManager">
+
+ <!-- Expose via JMX -->
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jca:service=WorkManager", exposedInterface=org.jboss.resource.work.JBossWorkManagerMBean.class)</annotation>
+
+ <!-- The thread pool -->
+ <property name="threadPool"><inject bean="WorkManagerThreadPool"/></property>
+
+ <!-- The xa terminator -->
+ <property name="XATerminator"><inject bean="TransactionManager" property="XATerminator"/></property>
+
+ </bean>
+
+ <!-- CACHED CONNECTION MANAGER -->
+ <bean name="CachedConnectionManager" class="org.jboss.resource.connectionmanager.CachedConnectionManager">
+
+ <!-- Expose via JMX -->
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jca:service=CachedConnectionManager", exposedInterface=org.jboss.resource.connectionmanager.CachedConnectionManagerMBean.class)</annotation>
+
+ <!-- Whether to track unclosed connections and close them -->
+ <property name="debug">true</property>
+
+ <!-- Whether to throw an error for unclosed connections (true) or just log a warning (false) -->
+ <property name="error">false</property>
+
+ <!-- The transaction manager -->
+ <property name="transactionManager"><inject bean="TransactionManager" property="transactionManager"/></property>
+
+ </bean>
+
+</deployment>
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2008-10-24 16:17:55 UTC (rev 80053)
+++ trunk/testsuite/build.xml 2008-10-24 16:20:18 UTC (rev 80054)
@@ -1168,7 +1168,7 @@
<include name="deploy/jmx-console.war/**"/>
<include name="deploy/jmx-invoker-service.xml"/>
<include name="deploy/hsqldb-ds.xml"/>
- <include name="deploy/jbossjca-service.xml"/>
+ <include name="deploy/jca-jboss-beans.xml"/>
<include name="deploy/jboss-local-jdbc.rar"/>
<include name="deploy/jboss-jdbc-metadata.sar"/>
<include name="deploy/security*"/>
@@ -1261,7 +1261,7 @@
<include name="deploy/ROOT.war/**"/>
<include name="deploy/jmx-console.war/**"/>
<include name="deploy/messaging/**"/>
- <include name="deploy/jbossjca-service.xml"/>
+ <include name="deploy/jca-jboss-beans.xml"/>
<include name="deploy/jboss-local-jdbc.rar"/>
<include name="deploy/jmx-invoker-service.xml"/>
<include name="deploy/hsqldb-ds.xml"/>
@@ -1692,7 +1692,7 @@
<include name="deploy/jms-ra.rar"/>
<include name="deploy/jmx-invoker-service.xml"/>
<include name="deploy/jmx-console.war/**"/>
- <include name="deploy/jbossjca-service.xml"/>
+ <include name="deploy/jca-jboss-beans.xml"/>
<include name="deploy/jboss-local-jdbc.rar"/>
<include name="deploy/mail-service.xml"/>
<include name="deploy/messaging/**"/>
@@ -1749,7 +1749,7 @@
<include name="deploy/client-deployer-service.xml"/>
<include name="deploy/jmx-invoker-service.xml"/>
<include name="deploy/jmx-console.war/**"/>
- <include name="deploy/jbossjca-service.xml"/>
+ <include name="deploy/jca-jboss-beans.xml"/>
<include name="deploy/jboss-local-jdbc.rar"/>
<include name="deploy/mail-service.xml"/>
<include name="deploy/messaging/**"/>
@@ -1803,7 +1803,7 @@
<include name="deploy/client-deployer-service.xml"/>
<include name="deploy/jmx-invoker-service.xml"/>
<include name="deploy/jmx-console.war/**"/>
- <include name="deploy/jbossjca-service.xml"/>
+ <include name="deploy/jca-jboss-beans.xml"/>
<include name="deploy/jboss-local-jdbc.rar"/>
<include name="deploy/mail-service.xml"/>
<include name="deploy/messaging/**"/>
@@ -1850,7 +1850,7 @@
<include name="deploy/client-deployer-service.xml"/>
<include name="deploy/jmx-invoker-service.xml"/>
<include name="deploy/jmx-console.war/**"/>
- <include name="deploy/jbossjca-service.xml"/>
+ <include name="deploy/jca-jboss-beans.xml"/>
<include name="deploy/jboss-local-jdbc.rar"/>
<include name="deploy/ejb3-interceptors-aop.xml"/>
<include name="deploy/properties**"/>
Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml 2008-10-24 16:17:55 UTC (rev 80053)
+++ trunk/testsuite/imports/server-config.xml 2008-10-24 16:20:18 UTC (rev 80054)
@@ -1008,7 +1008,7 @@
<patternset>
<include name="conf/**"/>
<include name="deploy/hsqldb-ds.xml"/>
- <include name="deploy/jbossjca-service.xml"/>
+ <include name="deploy/jca-jboss-beans.xml"/>
<include name="deploy/jboss-local-jdbc.rar"/>
<include name="deploy/jbossweb.sar/**"/>
<include name="deploy/jboss-xa-jdbc.rar"/>
Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java 2008-10-24 16:17:55 UTC (rev 80053)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java 2008-10-24 16:20:18 UTC (rev 80054)
@@ -169,7 +169,7 @@
"deploy/hsqldb-ds.xml",
"deploy/jboss-local-jdbc.rar",
"deploy/jboss-xa-jdbc.rar",
- "deploy/jbossjca-service.xml",
+ "deploy/jca-jboss-beans.xml",
"deploy/jbossws.sar/",
"deploy/messaging/connection-factories-service.xml",
"deploy/messaging/destinations-service.xml",
More information about the jboss-cvs-commits
mailing list