[jboss-svn-commits] JBL Code SVN: r20878 - in labs/jbosstm/trunk/XTS/sar: META-INF and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: jhalliday
Date: 2008-07-02 07:59:30 -0400 (Wed, 02 Jul 2008)
New Revision: 20878

Removed:
   labs/jbosstm/trunk/XTS/sar/META-INF/jboss-service.xml
Modified:
   labs/jbosstm/trunk/XTS/sar/build.xml
   labs/jbosstm/trunk/XTS/sar/src/org/jboss/transactions/XTSService.java
   labs/jbosstm/trunk/XTS/sar/src/org/jboss/transactions/XTSServiceMBean.java
Log:
Converted XTS service from JMX to POJO for better integration with JBossTS 5.0.  JBTM-123


Deleted: labs/jbosstm/trunk/XTS/sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/META-INF/jboss-service.xml	2008-07-02 11:48:19 UTC (rev 20877)
+++ labs/jbosstm/trunk/XTS/sar/META-INF/jboss-service.xml	2008-07-02 11:59:30 UTC (rev 20878)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $Id$ -->
-
-<server>
-
-   <mbean name="jboss.xts:service=XTSService" code="org.jboss.transactions.XTSService">
-       <depends>jboss.web:service=WebServer</depends>
-       <depends>jboss:service=TransactionManager</depends>
-   </mbean>
-
-</server>

Modified: labs/jbosstm/trunk/XTS/sar/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/build.xml	2008-07-02 11:48:19 UTC (rev 20877)
+++ labs/jbosstm/trunk/XTS/sar/build.xml	2008-07-02 11:59:30 UTC (rev 20878)
@@ -141,7 +141,7 @@
             <fileset dir="${build.dir}" includes="config.jar"/>
 
             <!-- include service def (e.g. dependencies) -->
-            <fileset dir="." includes="META-INF/jboss-service.xml"/>
+            <fileset dir="." includes="META-INF/jboss-beans.xml"/>
 
             <!-- include web service config -->
             <fileset dir="${build.dir}" includes="META-INF/application.xml"/>
@@ -200,7 +200,7 @@
             <fileset dir="${build.dir}" includes="config.jar"/>
 
             <!-- include service def (e.g. dependencies) -->
-            <fileset dir="." includes="META-INF/jboss-service.xml"/>
+            <fileset dir="." includes="META-INF/jboss-beans.xml"/>
 
             <!-- include web service config -->
             <fileset dir="${build.dir}" includes="META-INF/application.xml"/>
@@ -259,7 +259,7 @@
             <fileset dir="${build.dir}" includes="config.jar"/>
 
             <!-- include service def (e.g. dependencies) -->
-            <fileset dir="." includes="META-INF/jboss-service.xml"/>
+            <fileset dir="." includes="META-INF/jboss-beans.xml"/>
 
             <!-- include web service config -->
             <fileset dir="${build.dir}" includes="META-INF/application.xml"/>

Modified: labs/jbosstm/trunk/XTS/sar/src/org/jboss/transactions/XTSService.java
===================================================================
--- labs/jbosstm/trunk/XTS/sar/src/org/jboss/transactions/XTSService.java	2008-07-02 11:48:19 UTC (rev 20877)
+++ labs/jbosstm/trunk/XTS/sar/src/org/jboss/transactions/XTSService.java	2008-07-02 11:59:30 UTC (rev 20878)
@@ -20,7 +20,6 @@
  */
 package org.jboss.transactions;
 
-import org.jboss.system.ServiceMBeanSupport;
 import org.jboss.logging.Logger;
 import org.jboss.transactions.xts.recovery.ACCoordinatorRecoveryModule;
 
@@ -80,12 +79,29 @@
 /**
  * $Id$
  */
-public class XTSService extends ServiceMBeanSupport implements XTSServiceMBean {
+public class XTSService implements XTSServiceMBean {
 
+/*
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+    <bean name="XTSService" class="org.jboss.transactions.XTSService">
+        <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.xts:service=XTSService", exposedInterface=org.jboss.transactions.XTSServiceMBean.class, registerDirectly=true)</annotation>
+
+       <depends>jboss.web:service=WebServer</depends>
+       <depends>jboss:service=TransactionManager</depends>
+   </bean>
+
+</deployment>
+
+ */
+
     // TODO expose as bean properties
     private int taskManagerMinWorkerCount = 0;
     private int taskManagerMaxWorkerCount = 10;
 
+    private final Logger log = org.jboss.logging.Logger.getLogger(XTSService.class);
+
     private ACCoordinatorRecoveryModule acCoordinatorRecoveryModule = null;
 
     // TODO: how to use a (per application) remote coordinator?
@@ -104,8 +120,9 @@
 
     public XTSService() {}
 
-    protected void startService() throws Exception
+    public void start() throws Exception
     {
+        log.info("JBossTS XTS Transaction Service - starting");
 
         // read unified properties file (replaces wscf.xml and wstx.xml)
         // Configuration.initialise("/jbossxts.xml");
@@ -166,9 +183,9 @@
 
     }
 
-    protected void stopService() throws Exception
+    public void stop() throws Exception
     {
-        getLog().info("JBossTS XTS Transaction Service - stopping");
+        log.info("JBossTS XTS Transaction Service - stopping");
 
         if (acCoordinatorRecoveryModule != null) {
             // remove the module, making sure no any scan which might be using it has completed

Modified: labs/jbosstm/trunk/XTS/sar/src/org/jboss/transactions/XTSServiceMBean.java
===================================================================
--- labs/jbosstm/trunk/XTS/sar/src/org/jboss/transactions/XTSServiceMBean.java	2008-07-02 11:48:19 UTC (rev 20877)
+++ labs/jbosstm/trunk/XTS/sar/src/org/jboss/transactions/XTSServiceMBean.java	2008-07-02 11:59:30 UTC (rev 20878)
@@ -23,5 +23,5 @@
 /**
  * $Id$
  */
-public interface XTSServiceMBean  extends org.jboss.system.ServiceMBean {
+public interface XTSServiceMBean {
 }