User: starksm
Date: 01/10/20 14:01:43
Modified: varia/src/main/org/jboss/tm/plugins/tyrex
TransactionManagerService.java
TransactionManagerServiceMBean.java
Log:
Clean up the imports and the handling of the domain config file as
either a URL or classpath resource.
Revision Changes Path
1.4 +32 -19
contrib/varia/src/main/org/jboss/tm/plugins/tyrex/TransactionManagerService.java
Index: TransactionManagerService.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/varia/src/main/org/jboss/tm/plugins/tyrex/TransactionManagerService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TransactionManagerService.java 2001/09/01 19:50:29 1.3
+++ TransactionManagerService.java 2001/10/20 21:01:43 1.4
@@ -7,15 +7,10 @@
package org.jboss.tm.plugins.tyrex;
-import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
import java.net.URL;
-import java.rmi.server.UnicastRemoteObject;
-import java.rmi.RemoteException;
-import java.rmi.ServerException;
-import java.util.ArrayList;
-import java.util.Iterator;
import java.util.Hashtable;
-
import javax.naming.InitialContext;
import javax.naming.Context;
import javax.naming.Reference;
@@ -29,12 +24,9 @@
import javax.transaction.TransactionManager;
import tyrex.tm.TransactionDomain;
-import org.omg.CosTransactions.PropagationContext;
import org.omg.CosTransactions.TransactionFactory;
-import org.omg.CosTSPortability.Sender;
-import org.omg.CosTSPortability.Receiver;
-import org.jboss.system.ServiceMBeanSupport;
+import org.jboss.util.ServiceMBeanSupport;
/**
* This is a JMX service which manages the Tyrex TransactionManager
(tyrex.exolab.org).
@@ -43,7 +35,7 @@
*
* @see TyrexTransactionPropagationContextManager, tyrex.tm.TransactionDomain
* @author <a href="mailto:[EMAIL PROTECTED]";>Anatoly Akkerman</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class TransactionManagerService
extends ServiceMBeanSupport
@@ -60,7 +52,7 @@
MBeanServer server;
- String config_file = "domain.xml";
+ String configFile = "domain.xml";
// Static --------------------------------------------------------
@@ -89,7 +81,7 @@
{
// Create txDomain singleton if we did not do it yet.
if (txDomain == null) {
- txDomain = tyrex.tm.TransactionDomain.createDomain( config_file );
+ txDomain = tyrex.tm.TransactionDomain.createDomain( configFile );
txDomain.recover();
tm = txDomain.getTransactionManager();
txFactory = txDomain.getTransactionFactory();
@@ -128,13 +120,34 @@
}
}
- public String getConfigFileName() {
- return this.config_file;
+ public String getConfigFileName()
+ {
+ return this.configFile;
}
- public void setConfigFileName(String name) {
- this.config_file = name;
- }
+ public void setConfigFileName(String name) throws IOException
+ {
+ // See if the name is a URL
+ try
+ {
+ URL url = new URL(name);
+ configFile = url.toExternalForm();
+ }
+ catch(MalformedURLException e)
+ {
+ // Try to resolve the name as a classpath resource
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ URL url = loader.getResource(name);
+ if( url == null )
+ {
+ String msg = "Failed to find name: "+name+" as either a URL or a
classpath resource";
+ category.error(msg);
+ throw new IOException(msg);
+ }
+ configFile = url.toExternalForm();
+ }
+ category.info("Using configFile: "+configFile);
+ }
// ObjectFactory implementation ----------------------------------
1.3 +4 -2
contrib/varia/src/main/org/jboss/tm/plugins/tyrex/TransactionManagerServiceMBean.java
Index: TransactionManagerServiceMBean.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/varia/src/main/org/jboss/tm/plugins/tyrex/TransactionManagerServiceMBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TransactionManagerServiceMBean.java 2001/08/30 02:42:38 1.2
+++ TransactionManagerServiceMBean.java 2001/10/20 21:01:43 1.3
@@ -7,13 +7,15 @@
package org.jboss.tm.plugins.tyrex;
+import java.io.IOException;
+
/**
* MBean interface for the Tyrex TransactionManager
* (not all calls are implemented)
*
* @see TransactionManagerService
* @author <a href="mailto:[EMAIL PROTECTED]";>Anatoly Akkerman</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public interface TransactionManagerServiceMBean
extends org.jboss.system.ServiceMBean
@@ -24,6 +26,6 @@
// Public --------------------------------------------------------
public String getConfigFileName();
- public void setConfigFileName(String name);
+ public void setConfigFileName(String name) throws IOException;
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
