db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arm...@apache.org
Subject svn commit: r386237 - /db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/
Date Thu, 16 Mar 2006 01:36:01 GMT
Author: arminw
Date: Wed Mar 15 17:35:59 2006
New Revision: 386237

URL: http://svn.apache.org/viewcvs?rev=386237&view=rev
Log:
merge with 1.x branch

Added:
    db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/JRunTransactionManagerFactory.java
    db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/OC4JTransactionManagerFactory.java
    db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/ResinTransactionManagerFactory.java
Modified:
    db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/AbstractTransactionManagerFactory.java
    db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/JBossTransactionManagerFactory.java
    db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/JOnASTransactionManagerFactory.java
    db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/OrionTransactionManagerFactory.java
    db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/SunOneTransactionManagerFactory.java
    db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/TransactionManagerFactoryException.java
    db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/WebSphereTransactionManagerFactory.java
    db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/WeblogicTransactionManagerFactory.java

Modified: db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/AbstractTransactionManagerFactory.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/AbstractTransactionManagerFactory.java?rev=386237&r1=386236&r2=386237&view=diff
==============================================================================
--- db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/AbstractTransactionManagerFactory.java
(original)
+++ db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/AbstractTransactionManagerFactory.java
Wed Mar 15 17:35:59 2006
@@ -100,16 +100,19 @@
                     {
                         tm = instantiateClass(description, className, methodName);
                     }
-                    msg.append("Successfully requested TM for " + description + EOL);
+                    msg.append("Successfully requested TM for ").append(description).append(EOL);
                 }
                 catch (Exception e)
                 {
                     if (className == null)
-                        msg.append("Error on TM request for " + description +
-                                ", using jndi-lookup '" + methodName + "'" + EOL + e.getMessage()
+ EOL);
+                        msg.append("Error on TM request for ").append(description)
+                                .append(", using jndi-lookup '").append(methodName)
+                                .append("'").append(EOL).append(e.getMessage()).append(EOL);
                     else
-                        msg.append("Error on TM request for " + description + ", using method
'" +
-                                methodName + "' for class '" + className + "'" + EOL + e.getMessage()
+ EOL);
+                        msg.append("Error on TM request for ").append(description)
+                                .append(", using method '").append(methodName).append("'
for class '")
+                                .append(className).append("'").append(EOL).append(e.getMessage())
+                                .append(EOL);
                 }
                 if (tm != null) break;
             }

Modified: db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/JBossTransactionManagerFactory.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/JBossTransactionManagerFactory.java?rev=386237&r1=386236&r2=386237&view=diff
==============================================================================
--- db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/JBossTransactionManagerFactory.java
(original)
+++ db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/JBossTransactionManagerFactory.java
Wed Mar 15 17:35:59 2006
@@ -1,8 +1,6 @@
 package org.apache.ojb.broker.transaction.tm;
 
-import org.apache.ojb.broker.transaction.tm.AbstractTransactionManagerFactory;
-
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2006 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +17,6 @@
 
 /**
  * JBoss {@link javax.transaction.TransactionManager} lookup.
- *
- * @author matthew.baird
  */
 public class JBossTransactionManagerFactory extends AbstractTransactionManagerFactory
 {

Modified: db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/JOnASTransactionManagerFactory.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/JOnASTransactionManagerFactory.java?rev=386237&r1=386236&r2=386237&view=diff
==============================================================================
--- db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/JOnASTransactionManagerFactory.java
(original)
+++ db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/JOnASTransactionManagerFactory.java
Wed Mar 15 17:35:59 2006
@@ -1,8 +1,6 @@
 package org.apache.ojb.broker.transaction.tm;
 
-import org.apache.ojb.broker.transaction.tm.AbstractTransactionManagerFactory;
-
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2006 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+/**
+ * JOnAS {@link javax.transaction.TransactionManager} lookup.
+ */
 public class JOnASTransactionManagerFactory extends AbstractTransactionManagerFactory
 {
-    private static final String[][] config = {{"JOnAS", "javax.transaction.UserTransaction",
null}};
+    private static final String[][] config = {
+            {"JOnAS_Lookup", "javax.transaction.UserTransaction", null},
+            {"JOnAS_TM", TM_DEFAULT_METHOD_NAME, "org.objectweb.jonas_tm.Current"}
+    };
 
     /**
      * @see org.apache.ojb.broker.transaction.tm.AbstractTransactionManagerFactory#getLookupInfo

Added: db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/JRunTransactionManagerFactory.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/JRunTransactionManagerFactory.java?rev=386237&view=auto
==============================================================================
--- db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/JRunTransactionManagerFactory.java
(added)
+++ db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/JRunTransactionManagerFactory.java
Wed Mar 15 17:35:59 2006
@@ -0,0 +1,32 @@
+package org.apache.ojb.broker.transaction.tm;
+
+/* Copyright 2002-2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * JRun {@link javax.transaction.TransactionManager} lookup.
+ */
+public class JRunTransactionManagerFactory extends AbstractTransactionManagerFactory
+{
+    private static final String[][] config = {{"JRun", "java:/TransactionManager", null}};
+
+    /**
+     * @see AbstractTransactionManagerFactory#getLookupInfo
+     */
+    public String[][] getLookupInfo()
+    {
+        return config;
+    }
+}

Added: db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/OC4JTransactionManagerFactory.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/OC4JTransactionManagerFactory.java?rev=386237&view=auto
==============================================================================
--- db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/OC4JTransactionManagerFactory.java
(added)
+++ db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/OC4JTransactionManagerFactory.java
Wed Mar 15 17:35:59 2006
@@ -0,0 +1,32 @@
+package org.apache.ojb.broker.transaction.tm;
+
+/* Copyright 2002-2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * OC4J {@link javax.transaction.TransactionManager} lookup.
+ */
+public class OC4JTransactionManagerFactory extends AbstractTransactionManagerFactory
+{
+    private static final String[][] config = {{"OC4J", "java:comp/pm/TransactionManager",
null}};
+
+    /**
+     * @see AbstractTransactionManagerFactory#getLookupInfo
+     */
+    public String[][] getLookupInfo()
+    {
+        return config;
+    }
+}

Modified: db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/OrionTransactionManagerFactory.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/OrionTransactionManagerFactory.java?rev=386237&r1=386236&r2=386237&view=diff
==============================================================================
--- db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/OrionTransactionManagerFactory.java
(original)
+++ db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/OrionTransactionManagerFactory.java
Wed Mar 15 17:35:59 2006
@@ -1,8 +1,6 @@
 package org.apache.ojb.broker.transaction.tm;
 
-import org.apache.ojb.broker.transaction.tm.AbstractTransactionManagerFactory;
-
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2006 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,12 +15,9 @@
  * limitations under the License.
  */
 
-
-
 /**
  * Orion {@link javax.transaction.TransactionManager} lookup.
  *
- * @author andreas.bayer
  * @version $Id$
  */
 public class OrionTransactionManagerFactory extends AbstractTransactionManagerFactory

Added: db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/ResinTransactionManagerFactory.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/ResinTransactionManagerFactory.java?rev=386237&view=auto
==============================================================================
--- db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/ResinTransactionManagerFactory.java
(added)
+++ db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/ResinTransactionManagerFactory.java
Wed Mar 15 17:35:59 2006
@@ -0,0 +1,32 @@
+package org.apache.ojb.broker.transaction.tm;
+
+/* Copyright 2002-2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Resin {@link javax.transaction.TransactionManager} lookup.
+ */
+public class ResinTransactionManagerFactory extends AbstractTransactionManagerFactory
+{
+    private static final String[][] config = {{"Resin", "java:comp/TransactionManager", null}};
+
+    /**
+     * @see org.apache.ojb.broker.transaction.tm.AbstractTransactionManagerFactory#getLookupInfo
+     */
+    public String[][] getLookupInfo()
+    {
+        return config;
+    }
+}

Modified: db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/SunOneTransactionManagerFactory.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/SunOneTransactionManagerFactory.java?rev=386237&r1=386236&r2=386237&view=diff
==============================================================================
--- db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/SunOneTransactionManagerFactory.java
(original)
+++ db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/SunOneTransactionManagerFactory.java
Wed Mar 15 17:35:59 2006
@@ -1,8 +1,6 @@
 package org.apache.ojb.broker.transaction.tm;
 
-import org.apache.ojb.broker.transaction.tm.AbstractTransactionManagerFactory;
-
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2006 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,18 +15,17 @@
  * limitations under the License.
  */
 
-
-
 /**
  * SunOne {@link javax.transaction.TransactionManager} lookup.
  *
- * @author Rice Yeh
  * @version $Id$
  */
 public class SunOneTransactionManagerFactory extends AbstractTransactionManagerFactory
 {
     private static final String[][] config = {
-        {"SunOne", "getTransactionManagerImpl", "com.sun.jts.jta.TransactionManagerImpl"}};
+        {"SunOne_Lookup", "java:appserver/TransactionManager", null},
+        {"SunOne", "getTransactionManagerImpl", "com.sun.jts.jta.TransactionManagerImpl"}
+    };
 
     /**
      * @see org.apache.ojb.broker.transaction.tm.AbstractTransactionManagerFactory#getLookupInfo

Modified: db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/TransactionManagerFactoryException.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/TransactionManagerFactoryException.java?rev=386237&r1=386236&r2=386237&view=diff
==============================================================================
--- db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/TransactionManagerFactoryException.java
(original)
+++ db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/TransactionManagerFactoryException.java
Wed Mar 15 17:35:59 2006
@@ -1,8 +1,6 @@
 package org.apache.ojb.broker.transaction.tm;
 
-import org.apache.ojb.broker.OJBException;
-
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2006 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+import org.apache.ojb.broker.OJBException;
+
 public class TransactionManagerFactoryException extends OJBException
 {
 	/**

Modified: db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/WebSphereTransactionManagerFactory.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/WebSphereTransactionManagerFactory.java?rev=386237&r1=386236&r2=386237&view=diff
==============================================================================
--- db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/WebSphereTransactionManagerFactory.java
(original)
+++ db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/WebSphereTransactionManagerFactory.java
Wed Mar 15 17:35:59 2006
@@ -1,8 +1,6 @@
 package org.apache.ojb.broker.transaction.tm;
 
-import org.apache.ojb.broker.transaction.tm.AbstractTransactionManagerFactory;
-
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 
 /**
  * Websphere (4 and above) {@link javax.transaction.TransactionManager} lookup.

Modified: db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/WeblogicTransactionManagerFactory.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/WeblogicTransactionManagerFactory.java?rev=386237&r1=386236&r2=386237&view=diff
==============================================================================
--- db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/WeblogicTransactionManagerFactory.java
(original)
+++ db/ojb/trunk/src/java/org/apache/ojb/broker/transaction/tm/WeblogicTransactionManagerFactory.java
Wed Mar 15 17:35:59 2006
@@ -1,8 +1,6 @@
 package org.apache.ojb.broker.transaction.tm;
 
-import org.apache.ojb.broker.transaction.tm.AbstractTransactionManagerFactory;
-
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.



---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org


Mime
View raw message