User: oberg
Date: 00/12/07 07:45:18
Modified: src/main/org/jboss/tm TransactionImpl.java
TransactionManagerService.java
TransactionManagerServiceMBean.java TxCapsule.java
TxManager.java XidImpl.java
Log:
Changed configuration scheme (lots of changes to jboss.conf, jboss.jcml,
org.jboss.Main)
Added ServiceControl
Changed jBoss -> JBoss
Changed GPL -> LGPL
Added jaxp/parser
Updated services to have default constructors
Revision Changes Path
1.11 +3 -3 jboss/src/main/org/jboss/tm/TransactionImpl.java
Index: TransactionImpl.java
===================================================================
RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/tm/TransactionImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TransactionImpl.java 2000/10/21 05:20:23 1.10
+++ TransactionImpl.java 2000/12/07 15:45:17 1.11
@@ -1,7 +1,7 @@
/*
- * jBoss, the OpenSource EJB server
+ * JBoss, the OpenSource EJB server
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.tm;
@@ -35,7 +35,7 @@
* @author Rickard �berg ([EMAIL PROTECTED])
* @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Ole Husgaard</a>
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*/
public class TransactionImpl
implements Transaction, Serializable
1.5 +11 -14 jboss/src/main/org/jboss/tm/TransactionManagerService.java
Index: TransactionManagerService.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/tm/TransactionManagerService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TransactionManagerService.java 2000/11/07 12:29:40 1.4
+++ TransactionManagerService.java 2000/12/07 15:45:17 1.5
@@ -1,7 +1,7 @@
/*
- * jBoss, the OpenSource EJB server
+ * JBoss, the OpenSource EJB server
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
@@ -36,7 +36,7 @@
*
* @see TxManager
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class TransactionManagerService
extends ServiceMBeanSupport
@@ -47,6 +47,8 @@
// Attributes ----------------------------------------------------
MBeanServer server;
+
+ int timeout;
// Static --------------------------------------------------------
static TxManager tm;
@@ -64,11 +66,14 @@
return new ObjectName(OBJECT_NAME);
}
- protected void initService()
+ protected void startService()
throws Exception
{
// Create a new TM
tm = new TxManager();
+
+ // Set timeout
+ tm.setTransactionTimeout(timeout);
// Bind reference to TM in JNDI
// TODO: Move this to start when relationships are in place
@@ -76,11 +81,6 @@
new InitialContext().bind(JNDI_NAME, ref);
}
- protected void startService()
- throws Exception
- {
- }
-
protected void stopService()
{
try
@@ -94,14 +94,11 @@
}
public int getTransactionTimeout() {
- return tm.getTransactionTimeout();
+ return timeout;
}
public void setTransactionTimeout(int timeout) {
- try {
- tm.setTransactionTimeout(timeout);
- } catch (Exception ex) {
- }
+ this.timeout = timeout;
}
// ObjectFactory implementation ----------------------------------
1.3 +3 -3 jboss/src/main/org/jboss/tm/TransactionManagerServiceMBean.java
Index: TransactionManagerServiceMBean.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/tm/TransactionManagerServiceMBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TransactionManagerServiceMBean.java 2000/10/11 10:54:26 1.2
+++ TransactionManagerServiceMBean.java 2000/12/07 15:45:17 1.3
@@ -1,7 +1,7 @@
/*
- * jBoss, the OpenSource EJB server
+ * JBoss, the OpenSource EJB server
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
@@ -12,7 +12,7 @@
*
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public interface TransactionManagerServiceMBean
extends org.jboss.util.ServiceMBean
1.21 +3 -3 jboss/src/main/org/jboss/tm/TxCapsule.java
Index: TxCapsule.java
===================================================================
RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/tm/TxCapsule.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- TxCapsule.java 2000/11/08 02:28:36 1.20
+++ TxCapsule.java 2000/12/07 15:45:17 1.21
@@ -1,7 +1,7 @@
/*
- * jBoss, the OpenSource EJB server
+ * JBoss, the OpenSource EJB server
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.tm;
@@ -45,7 +45,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Ole Husgaard</a>
*
- * @version $Revision: 1.20 $
+ * @version $Revision: 1.21 $
*/
class TxCapsule implements TimeoutTarget
{
1.25 +3 -3 jboss/src/main/org/jboss/tm/TxManager.java
Index: TxManager.java
===================================================================
RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/tm/TxManager.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- TxManager.java 2000/11/07 12:29:40 1.24
+++ TxManager.java 2000/12/07 15:45:17 1.25
@@ -1,7 +1,7 @@
/*
-* jBoss, the OpenSource EJB server
+* JBoss, the OpenSource EJB server
*
-* Distributable under GPL license.
+* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.tm;
@@ -38,7 +38,7 @@
* @author Rickard �berg ([EMAIL PROTECTED])
* @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Ole Husgaard</a>
- * @version $Revision: 1.24 $
+ * @version $Revision: 1.25 $
*/
public class TxManager
implements TransactionManager
1.7 +3 -3 jboss/src/main/org/jboss/tm/XidImpl.java
Index: XidImpl.java
===================================================================
RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/tm/XidImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XidImpl.java 2000/10/21 16:24:00 1.6
+++ XidImpl.java 2000/12/07 15:45:18 1.7
@@ -1,7 +1,7 @@
/*
- * jBoss, the OpenSource EJB server
+ * JBoss, the OpenSource EJB server
*
- * Distributable under GPL license.
+ * Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.tm;
@@ -18,7 +18,7 @@
* @see TransactionImpl
* @author Rickard �berg ([EMAIL PROTECTED])
* @author <a href="mailto:[EMAIL PROTECTED]">Ole Husgaard</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
class XidImpl
implements Xid, java.io.Serializable
