You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2002/06/28 14:44:41 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory TyrexFactory.java TyrexResourceFactory.java Constants.java ResourceFactory.java TyrexTransactionFactory.java TyrexDataSourceFactory.java
remm 2002/06/28 05:44:41
Modified: catalina/src/share/org/apache/naming/factory Constants.java
ResourceFactory.java TyrexTransactionFactory.java
Added: catalina/src/share/org/apache/naming/factory
TyrexFactory.java TyrexResourceFactory.java
Removed: catalina/src/share/org/apache/naming/factory
TyrexDataSourceFactory.java
Log:
- Upgrade to Tyrex 1.0.
- Patch submitted by David Haraburda <david-tomcat at haraburda.com>
Revision Changes Path
1.6 +9 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/Constants.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Constants.java 17 May 2002 17:39:27 -0000 1.5
+++ Constants.java 28 Jun 2002 12:44:40 -0000 1.6
@@ -91,8 +91,8 @@
public static final String DBCP_DATASOURCE_FACTORY =
"org.apache.commons.dbcp.BasicDataSourceFactory";
- public static final String TYREX_DATASOURCE_FACTORY =
- Package + ".TyrexDataSourceFactory";
+ public static final String TYREX_RESOURCE_FACTORY =
+ Package + ".TyrexResourceFactory";
public static final String TYREX_TRANSACTION_FACTORY =
Package + ".TyrexTransactionFactory";
@@ -100,5 +100,9 @@
public static final String OBJECT_FACTORIES = "";
public static final String FACTORY = "factory";
+
+ public static final String TYREX_DOMAIN_CONFIG = "tyrexDomainConfig";
+
+ public static final String TYREX_DOMAIN_NAME = "tyrexDomainName";
}
1.8 +14 -4 jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/ResourceFactory.java
Index: ResourceFactory.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/ResourceFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ResourceFactory.java 24 Feb 2002 05:09:58 -0000 1.7
+++ ResourceFactory.java 28 Jun 2002 12:44:40 -0000 1.8
@@ -170,6 +170,16 @@
.newInstance();
} catch(Throwable t) {
}
+ } else if (ref.getClassName().equals("tyrex.resource.Resource")) {
+ String tyrexResourceFactoryClassName =
+ System.getProperty("tyrex.resource.Resource.Factory",
+ Constants.TYREX_RESOURCE_FACTORY);
+ try {
+ factory = (ObjectFactory)
+ Class.forName(tyrexResourceFactoryClassName)
+ .newInstance();
+ } catch(Throwable t) {
+ }
}
}
if (factory != null) {
1.4 +14 -11 jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/TyrexTransactionFactory.java
Index: TyrexTransactionFactory.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/TyrexTransactionFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TyrexTransactionFactory.java 22 Feb 2002 08:47:14 -0000 1.3
+++ TyrexTransactionFactory.java 28 Jun 2002 12:44:41 -0000 1.4
@@ -64,6 +64,7 @@
package org.apache.naming.factory;
+import java.net.URL;
import java.util.Hashtable;
import javax.naming.Name;
import javax.naming.Context;
@@ -71,8 +72,11 @@
import javax.naming.Reference;
import javax.naming.RefAddr;
import javax.naming.spi.ObjectFactory;
+import javax.transaction.UserTransaction;
+
import org.apache.naming.TransactionRef;
-import tyrex.tm.Tyrex;
+
+import tyrex.tm.TransactionDomain;
/**
* Object factory for Tyrex User transactions.<br>
@@ -80,12 +84,13 @@
* exolab.org. See the <a href="http://tyrex.exolab.org/">Tyrex homepage</a>
* for more details about Tyrex and downloads.
*
+ * @author David Haraburda
* @author Remy Maucherat
* @version $Revision$ $Date$
*/
public class TyrexTransactionFactory
- implements ObjectFactory {
+ extends TyrexFactory {
// ----------------------------------------------------------- Constructors
@@ -104,9 +109,9 @@
/**
- * Crete a new User transaction instance.
+ * Crete a new UserTransaction.
*
- * @param obj The reference object describing the DataSource
+ * @param obj The reference object
*/
public Object getObjectInstance(Object obj, Name name, Context nameCtx,
Hashtable environment)
@@ -118,9 +123,7 @@
.equals("javax.transaction.UserTransaction")) {
try {
-
- return Tyrex.getUserTransaction();
-
+ return getTransactionDomain().getUserTransaction();
} catch (Throwable t) {
log("Cannot create Transaction, Exception", t);
throw new NamingException
1.1 jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/TyrexFactory.java
Index: TyrexFactory.java
===================================================================
/*
* $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/TyrexFactory.java,v 1.1 2002/06/28 12:44:41 remm Exp $
* $Revision: 1.1 $
* $Date: 2002/06/28 12:44:41 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
* [Additional notices, if required by prior licensing conditions]
*
*/
package org.apache.naming.factory;
import java.net.URL;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.naming.spi.ObjectFactory;
import tyrex.tm.TransactionDomain;
import tyrex.tm.DomainConfigurationException;
import tyrex.tm.RecoveryException;
/**
* Abstract superclass of any factory that creates objects from Tyrex.<br>
*
* Subclasses can use getTransactionDomain() to handle the retrieval and
* creation of the TransactionDomain.
*
* Tyrex is an open-source transaction manager, developed by Assaf Arkin and
* exolab.org. See the <a href="http://tyrex.exolab.org/">Tyrex homepage</a>
* for more details about Tyrex and downloads.
*
* @author David Haraburda
* @version $Revision: 1.1 $ $Date: 2002/06/28 12:44:41 $
*/
public abstract class TyrexFactory implements ObjectFactory {
// ----------------------------------------------------------- Constructors
// -------------------------------------------------------------- Constants
// ----------------------------------------------------- Instance Variables
// ------------------------------------------------------ Protected Methods
/**
* Get (and if necessary, create) the active TransactionDomain
*
* This class checks to see if there is already a TransactionDomain
* setup and instantiated. If so, it is returned, otherwise one is
* created and initialized using properties obtained from JNDI.
*/
protected TransactionDomain getTransactionDomain() throws NamingException {
TransactionDomain domain = null;
InitialContext initCtx = new InitialContext();
String config = initCtx.lookup("java:comp/env/" +
Constants.TYREX_DOMAIN_CONFIG).toString();
String name = initCtx.lookup("java:comp/env/" +
Constants.TYREX_DOMAIN_NAME).toString();
if (config != null && name != null) {
try {
domain = TransactionDomain.getDomain(name);
} catch(Throwable t) {
// Tyrex throws exceptions if required classes aren't found.
log("Error loading Tyrex TransactionDomain", t);
throw new NamingException
("Exception loading TransactionDomain: " + t.getMessage());
}
if ((domain == null)
|| (domain.getState() == TransactionDomain.TERMINATED)) {
URL configURL = Thread.currentThread().getContextClassLoader()
.getResource(config);
if (configURL == null)
throw new NamingException
("Could not load Tyrex domain config file");
try {
domain =
TransactionDomain.createDomain(configURL.toString());
} catch(DomainConfigurationException dce) {
throw new NamingException
("Could not create TransactionDomain: "
+ dce.getMessage());
}
}
} else {
throw new NamingException
("Specified config file or domain name "
+ "parameters are invalid.");
}
if (domain.getState() == TransactionDomain.READY) {
try {
domain.recover();
} catch( RecoveryException re ) {
throw new NamingException
("Could not activate TransactionDomain: "
+ re.getMessage() );
}
}
return domain;
}
// -------------------------------------------------------- Private Methods
private void log(String message) {
System.out.print("TyrexFactory: ");
System.out.println(message);
}
private void log(String message, Throwable exception) {
log(message);
exception.printStackTrace(System.out);
}
}
1.1 jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/TyrexResourceFactory.java
Index: TyrexResourceFactory.java
===================================================================
/*
* $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/TyrexResourceFactory.java,v 1.1 2002/06/28 12:44:41 remm Exp $
* $Revision: 1.1 $
* $Date: 2002/06/28 12:44:41 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
* [Additional notices, if required by prior licensing conditions]
*
*/
package org.apache.naming.factory;
import java.util.Hashtable;
import java.util.Iterator;
import javax.naming.Name;
import javax.naming.Context;
import javax.naming.NamingException;
import javax.naming.Reference;
import javax.naming.RefAddr;
import javax.naming.spi.ObjectFactory;
import java.net.URL;
import org.apache.naming.ResourceRef;
import tyrex.tm.TransactionDomain;
import tyrex.resource.Resources;
import tyrex.resource.ResourceConfig;
/**
* Object factory for Tyrex Resources.<br>
*
* This class retrieves Tyrex resources that are configured in the
* TransactionDomain. The type of Resource returned is specified in
* Tyrex's domain configuration file.
*
* Tyrex is an open-source transaction manager, developed by Assaf Arkin and
* exolab.org. See the <a href="http://tyrex.exolab.org/">Tyrex homepage</a>
* for more details about Tyrex and downloads.
*
* @author David Haraburda
* @version $Revision: 1.1 $ $Date: 2002/06/28 12:44:41 $
*/
public class TyrexResourceFactory
extends TyrexFactory {
// ----------------------------------------------------------- Constructors
// -------------------------------------------------------------- Constants
public static final String RESOURCE_NAME = "name";
public static final String DEFAULT_RESOURCE_NAME = "tomcat";
// ----------------------------------------------------- Instance Variables
// --------------------------------------------------------- Public Methods
// -------------------------------------------------- ObjectFactory Methods
/**
* Create a new Resource instance. The type of Resource is dependant
* upon Tyrex's domain configuration.
*
* @param obj The reference object describing the Resource
*/
public Object getObjectInstance(Object obj, Name name, Context nameCtx,
Hashtable environment)
throws NamingException {
if (obj instanceof ResourceRef) {
Reference ref = (Reference) obj;
if (ref.getClassName().equals("tyrex.resource.Resource")) {
try {
Resources resources =
getTransactionDomain().getResources();
RefAddr nameAddr = ref.get(RESOURCE_NAME);
if (nameAddr != null) {
return resources
.getResource(nameAddr.getContent().toString())
.getClientFactory();
} else {
return resources.getResource(DEFAULT_RESOURCE_NAME)
.getClientFactory();
}
} catch (Throwable t) {
log("Cannot create Tyrex Resource, Exception", t);
throw new NamingException
("Exception creating Tyrex Resource: "
+ t.getMessage());
}
}
}
return null;
}
// -------------------------------------------------------- Private Methods
private void log(String message) {
System.out.print("TyrexResourceFactory: ");
System.out.println(message);
}
private void log(String message, Throwable exception) {
log(message);
exception.printStackTrace(System.out);
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>