You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by da...@apache.org on 2006/07/31 23:08:24 UTC
svn commit: r427273 [4/6] - in /geronimo/branches/dain/notcm:
applications/magicGball/magicGball-ear/src/plan/
applications/magicGball/src/plan/ configs/client-corba/src/plan/
configs/client-deployer/src/plan/ configs/client/src/plan/
configs/j2ee-corb...
Modified: geronimo/branches/dain/notcm/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java (original)
+++ geronimo/branches/dain/notcm/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java Mon Jul 31 14:08:15 2006
@@ -33,6 +33,8 @@
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
import javax.naming.Context;
+import javax.transaction.TransactionManager;
+import javax.transaction.UserTransaction;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -47,7 +49,6 @@
import org.apache.geronimo.jetty.interceptor.RequestWrappingBeforeAfter;
import org.apache.geronimo.jetty.interceptor.SecurityContextBeforeAfter;
import org.apache.geronimo.jetty.interceptor.ThreadClassloaderBeforeAfter;
-import org.apache.geronimo.jetty.interceptor.TransactionContextBeforeAfter;
import org.apache.geronimo.jetty.interceptor.WebApplicationContextBeforeAfter;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.ObjectNameUtil;
@@ -57,13 +58,10 @@
import org.apache.geronimo.management.geronimo.WebContainer;
import org.apache.geronimo.management.geronimo.WebModule;
import org.apache.geronimo.naming.enc.EnterpriseNamingContext;
-import org.apache.geronimo.naming.reference.ClassLoaderAwareReference;
-import org.apache.geronimo.naming.reference.KernelAwareReference;
import org.apache.geronimo.security.deploy.DefaultPrincipal;
import org.apache.geronimo.security.jacc.RoleDesignateSource;
-import org.apache.geronimo.transaction.TrackedConnectionAssociator;
-import org.apache.geronimo.transaction.context.OnlineUserTransaction;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
+import org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
+import org.apache.geronimo.transaction.GeronimoUserTransaction;
import org.mortbay.http.Authenticator;
import org.mortbay.http.HttpException;
import org.mortbay.http.HttpRequest;
@@ -168,48 +166,46 @@
}
public JettyWebAppContext(String objectName,
- String originalSpecDD,
- String sessionManager,
- Map componentContext,
- OnlineUserTransaction userTransaction,
- ClassLoader classLoader,
- URL configurationBaseUrl,
- Set unshareableResources,
- Set applicationManagedSecurityResources,
-
- String displayName,
- Map contextParamMap,
- Collection listenerClassNames,
- boolean distributable,
- Map mimeMap,
- String[] welcomeFiles,
- Map localeEncodingMapping,
- Map errorPages,
- Authenticator authenticator,
- String realmName,
- Map tagLibMap,
- int sessionTimeoutSeconds,
-
- String policyContextID,
- String securityRealmName,
- DefaultPrincipal defaultPrincipal,
- PermissionCollection checkedPermissions,
- PermissionCollection excludedPermissions,
-
- Host host,
- TransactionContextManager transactionContextManager,
- TrackedConnectionAssociator trackedConnectionAssociator,
- JettyContainer jettyContainer,
- RoleDesignateSource roleDesignateSource,
- J2EEServer server,
- J2EEApplication application,
- Kernel kernel) throws Exception, IllegalAccessException, InstantiationException, ClassNotFoundException {
+ String originalSpecDD,
+ String sessionManager,
+ Map componentContext,
+ ClassLoader classLoader,
+ URL configurationBaseUrl,
+ Set unshareableResources,
+ Set applicationManagedSecurityResources,
+
+ String displayName,
+ Map contextParamMap,
+ Collection listenerClassNames,
+ boolean distributable,
+ Map mimeMap,
+ String[] welcomeFiles,
+ Map localeEncodingMapping,
+ Map errorPages,
+ Authenticator authenticator,
+ String realmName,
+ Map tagLibMap,
+ int sessionTimeoutSeconds,
+
+ String policyContextID,
+ String securityRealmName,
+ DefaultPrincipal defaultPrincipal,
+ PermissionCollection checkedPermissions,
+ PermissionCollection excludedPermissions,
+
+ Host host,
+ TransactionManager transactionManager,
+ TrackedConnectionAssociator trackedConnectionAssociator,
+ JettyContainer jettyContainer,
+ RoleDesignateSource roleDesignateSource,
+ J2EEServer server,
+ J2EEApplication application,
+ Kernel kernel) throws Exception, IllegalAccessException, InstantiationException, ClassNotFoundException {
assert componentContext != null;
- assert userTransaction != null;
assert classLoader != null;
assert configurationBaseUrl != null;
- assert transactionContextManager != null;
+ assert transactionManager != null;
assert trackedConnectionAssociator != null;
assert jettyContainer != null;
@@ -241,8 +237,6 @@
handler = new JettyWebApplicationHandler();
addHandler(handler);
- userTransaction.setUp(transactionContextManager, trackedConnectionAssociator);
-
//stuff from spec dd
setDisplayName(displayName);
setContextParamMap(contextParamMap);
@@ -257,21 +251,11 @@
setTagLibMap(tagLibMap);
setSessionTimeoutSeconds(sessionTimeoutSeconds);
- // create ReadOnlyContext
- for (Iterator iterator = componentContext.values().iterator(); iterator.hasNext();) {
- Object value = iterator.next();
- if (value instanceof KernelAwareReference) {
- ((KernelAwareReference) value).setKernel(kernel);
- }
- if (value instanceof ClassLoaderAwareReference) {
- ((ClassLoaderAwareReference) value).setClassLoader(this.webClassLoader);
- }
- }
- Context enc = EnterpriseNamingContext.createEnterpriseNamingContext(componentContext);
+ GeronimoUserTransaction userTransaction = new GeronimoUserTransaction(transactionManager);
+ Context enc = EnterpriseNamingContext.createEnterpriseNamingContext(componentContext, userTransaction, kernel, webClassLoader);
int index = 0;
BeforeAfter interceptor = new InstanceContextBeforeAfter(null, index++, unshareableResources, applicationManagedSecurityResources, trackedConnectionAssociator);
- interceptor = new TransactionContextBeforeAfter(interceptor, index++, index++, transactionContextManager);
interceptor = new ComponentContextBeforeAfter(interceptor, index++, enc);
interceptor = new ThreadClassloaderBeforeAfter(interceptor, index++, index++, this.webClassLoader);
interceptor = new WebApplicationContextBeforeAfter(interceptor, index++, this);
@@ -634,7 +618,6 @@
infoBuilder.addAttribute("sessionManager", String.class, true);
infoBuilder.addAttribute("componentContext", Map.class, true);
- infoBuilder.addAttribute("userTransaction", OnlineUserTransaction.class, true);
infoBuilder.addAttribute("classLoader", ClassLoader.class, false);
infoBuilder.addAttribute("configurationBaseUrl", URL.class, true);
infoBuilder.addAttribute("unshareableResources", Set.class, true);
@@ -643,7 +626,7 @@
infoBuilder.addAttribute("contextPath", String.class, true);
infoBuilder.addReference("Host", Host.class, "Host");
- infoBuilder.addReference("TransactionContextManager", TransactionContextManager.class, NameFactory.TRANSACTION_CONTEXT_MANAGER);
+ infoBuilder.addReference("TransactionManager", TransactionManager.class, NameFactory.TRANSACTION_MANAGER);
infoBuilder.addReference("TrackedConnectionAssociator", TrackedConnectionAssociator.class, NameFactory.JCA_CONNECTION_TRACKER);
infoBuilder.addReference("JettyContainer", JettyContainer.class, NameFactory.GERONIMO_SERVICE);
infoBuilder.addReference("RoleDesignateSource", RoleDesignateSource.class, NameFactory.JACC_MANAGER);
@@ -674,7 +657,6 @@
"deploymentDescriptor",
"sessionManager",
"componentContext",
- "userTransaction",
"classLoader",
"configurationBaseUrl",
"unshareableResources",
@@ -701,7 +683,7 @@
"excludedPermissions",
"Host",
- "TransactionContextManager",
+ "TransactionManager",
"TrackedConnectionAssociator",
"JettyContainer",
"RoleDesignateSource",
Modified: geronimo/branches/dain/notcm/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebApplicationHandler.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebApplicationHandler.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebApplicationHandler.java (original)
+++ geronimo/branches/dain/notcm/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebApplicationHandler.java Mon Jul 31 14:08:15 2006
@@ -30,7 +30,7 @@
import org.apache.geronimo.security.ContextManager;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public class JettyWebApplicationHandler extends WebApplicationHandler {
Modified: geronimo/branches/dain/notcm/modules/jetty/src/java/org/apache/geronimo/jetty/interceptor/InstanceContextBeforeAfter.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/jetty/src/java/org/apache/geronimo/jetty/interceptor/InstanceContextBeforeAfter.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/jetty/src/java/org/apache/geronimo/jetty/interceptor/InstanceContextBeforeAfter.java (original)
+++ geronimo/branches/dain/notcm/modules/jetty/src/java/org/apache/geronimo/jetty/interceptor/InstanceContextBeforeAfter.java Mon Jul 31 14:08:15 2006
@@ -19,9 +19,9 @@
import java.util.Set;
import javax.resource.ResourceException;
-import org.apache.geronimo.transaction.DefaultInstanceContext;
-import org.apache.geronimo.transaction.InstanceContext;
-import org.apache.geronimo.transaction.TrackedConnectionAssociator;
+import org.apache.geronimo.connector.outbound.connectiontracking.ConnectorInstanceContextImpl;
+import org.apache.geronimo.connector.outbound.connectiontracking.ConnectorInstanceContext;
+import org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
import org.mortbay.http.HttpRequest;
import org.mortbay.http.HttpResponse;
@@ -46,7 +46,7 @@
public void before(Object[] context, HttpRequest httpRequest, HttpResponse httpResponse) {
try {
- context[index] = trackedConnectionAssociator.enter(new DefaultInstanceContext(unshareableResources, applicationManagedSecurityResources));
+ context[index] = trackedConnectionAssociator.enter(new ConnectorInstanceContextImpl(unshareableResources, applicationManagedSecurityResources));
} catch (ResourceException e) {
throw new RuntimeException(e);
}
@@ -60,7 +60,7 @@
next.after(context, httpRequest, httpResponse);
}
try {
- trackedConnectionAssociator.exit((InstanceContext) context[index]);
+ trackedConnectionAssociator.exit((ConnectorInstanceContext) context[index]);
} catch (ResourceException e) {
throw new RuntimeException(e);
}
Modified: geronimo/branches/dain/notcm/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java (original)
+++ geronimo/branches/dain/notcm/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java Mon Jul 31 14:08:15 2006
@@ -18,6 +18,7 @@
import junit.framework.TestCase;
import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator;
+import org.apache.geronimo.connector.outbound.connectiontracking.GeronimoTransactionListener;
import org.apache.geronimo.jetty.connector.HTTPConnector;
import org.apache.geronimo.security.SecurityServiceImpl;
import org.apache.geronimo.security.deploy.DefaultPrincipal;
@@ -34,8 +35,6 @@
import org.apache.geronimo.security.realm.GenericSecurityRealm;
import org.apache.geronimo.system.serverinfo.BasicServerInfo;
import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.apache.geronimo.transaction.context.OnlineUserTransaction;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
import org.mortbay.http.Authenticator;
import org.mortbay.jetty.servlet.FormAuthenticator;
@@ -47,6 +46,7 @@
import java.util.Map;
import java.util.Properties;
import java.util.Set;
+import javax.transaction.TransactionManager;
/**
@@ -57,7 +57,7 @@
protected final static String securityRealmName = "demo-properties-realm";
private HTTPConnector connector;
protected JettyContainerImpl container;
- private TransactionContextManager transactionContextManager;
+ private TransactionManager transactionManager;
private ConnectionTrackingCoordinator connectionTrackingCoordinator;
private URL configurationBaseURL;
@@ -91,7 +91,6 @@
null,
null,
Collections.EMPTY_MAP,
- new OnlineUserTransaction(),
cl,
new URL(configurationBaseURL, uriString),
null,
@@ -114,7 +113,7 @@
checkedPermissions,
excludedPermissions,
null,
- transactionContextManager,
+ transactionManager,
connectionTrackingCoordinator,
container,
roleDesignateSource,
@@ -196,10 +195,10 @@
connector.setMinThreads(10);
connector.doStart();
- TransactionManagerImpl tm = new TransactionManagerImpl(10, null, null, Collections.EMPTY_LIST);
- transactionContextManager = new TransactionContextManager(tm, tm);
+ TransactionManagerImpl transactionManager = new TransactionManagerImpl();
+ this.transactionManager = transactionManager;
connectionTrackingCoordinator = new ConnectionTrackingCoordinator();
-
+ transactionManager.addTransactionAssociationListener(new GeronimoTransactionListener(connectionTrackingCoordinator));
}
protected void tearDown() throws Exception {
Modified: geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/AbstractName.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/AbstractName.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/AbstractName.java (original)
+++ geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/AbstractName.java Mon Jul 31 14:08:15 2006
@@ -32,7 +32,7 @@
import org.apache.geronimo.kernel.Jsr77Naming;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public class AbstractName implements Serializable {
private static final long serialVersionUID = 3584199042821734754L;
Modified: geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/AbstractNameQuery.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/AbstractNameQuery.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/AbstractNameQuery.java (original)
+++ geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/AbstractNameQuery.java Mon Jul 31 14:08:15 2006
@@ -33,7 +33,7 @@
import org.apache.geronimo.kernel.repository.Artifact;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public class AbstractNameQuery implements Serializable {
private static final long serialVersionUID = 7444620122607155678L;
Modified: geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanInfo.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanInfo.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanInfo.java (original)
+++ geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanInfo.java Mon Jul 31 14:08:15 2006
@@ -62,7 +62,13 @@
try {
method = clazz.getDeclaredMethod("getGBeanInfo", new Class[]{});
} catch (NoSuchMethodException e) {
- throw new InvalidConfigurationException("Class does not have a getGBeanInfo() method: " + className);
+ try {
+ // try to get the info from ${className}GBean
+ clazz = classLoader.loadClass(className + "GBean");
+ method = clazz.getDeclaredMethod("getGBeanInfo", new Class[]{});
+ } catch (Exception ignored) {
+ throw new InvalidConfigurationException("Class does not have a getGBeanInfo() method: " + className);
+ }
} catch (NoClassDefFoundError e) {
throw new InvalidConfigurationException("Could not find getGBeanInfo method on " + className, e);
}
Modified: geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/ReferencePatterns.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/ReferencePatterns.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/ReferencePatterns.java (original)
+++ geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/ReferencePatterns.java Mon Jul 31 14:08:15 2006
@@ -24,7 +24,7 @@
import java.util.Set;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public class ReferencePatterns implements Serializable {
private static final long serialVersionUID = 1888371271299507818L;
Modified: geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/AbstractGBeanReference.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/AbstractGBeanReference.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/AbstractGBeanReference.java (original)
+++ geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/AbstractGBeanReference.java Mon Jul 31 14:08:15 2006
@@ -36,7 +36,7 @@
/**
* Should we proxy references.
*/
- protected static final boolean NO_PROXY = Boolean.getBoolean("Xorg.apache.geronimo.gbean.NoProxy");
+ protected static final boolean NO_PROXY = true;//Boolean.getBoolean("Xorg.apache.geronimo.gbean.NoProxy");
static {
if (NO_PROXY) {
Log log = LogFactory.getLog(AbstractGBeanReference.class);
Modified: geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanDependency.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanDependency.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanDependency.java (original)
+++ geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanDependency.java Mon Jul 31 14:08:15 2006
@@ -28,7 +28,7 @@
import org.apache.geronimo.kernel.management.State;
/**
- * @version $Rev: 386907 $ $Date$
+ * @version $Rev$ $Date$
*/
public final class GBeanDependency {
Modified: geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java (original)
+++ geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java Mon Jul 31 14:08:15 2006
@@ -28,7 +28,7 @@
import java.util.Set;
/**
- * @version $Rev: 386907 $ $Date$
+ * @version $Rev$ $Date$
*/
public class GBeanInstanceState {
private static final Log log = LogFactory.getLog(GBeanInstanceState.class);
Modified: geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanReference.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanReference.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanReference.java (original)
+++ geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanReference.java Mon Jul 31 14:08:15 2006
@@ -19,7 +19,7 @@
import org.apache.geronimo.gbean.GReferenceInfo;
/**
- * @version $Rev: 384141 $ $Date$
+ * @version $Rev$ $Date$
*/
public interface GBeanReference {
String getName();
Modified: geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanSingleReference.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanSingleReference.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanSingleReference.java (original)
+++ geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanSingleReference.java Mon Jul 31 14:08:15 2006
@@ -27,7 +27,7 @@
import org.apache.geronimo.kernel.GBeanNotFoundException;
/**
- * @version $Rev: 384141 $ $Date$
+ * @version $Rev$ $Date$
*/
public class GBeanSingleReference extends AbstractGBeanReference {
private static final Log log = LogFactory.getLog(GBeanSingleReference.class);
Modified: geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/ProxyCollection.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/ProxyCollection.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/ProxyCollection.java (original)
+++ geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/ProxyCollection.java Mon Jul 31 14:08:15 2006
@@ -36,7 +36,7 @@
import java.util.Set;
/**
- * @version $Rev: 383682 $ $Date$
+ * @version $Rev$ $Date$
*/
class ProxyCollection implements ReferenceCollection {
private static final Log log = LogFactory.getLog(ProxyCollection.class);
Modified: geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicLifecycleMonitor.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicLifecycleMonitor.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicLifecycleMonitor.java (original)
+++ geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicLifecycleMonitor.java Mon Jul 31 14:08:15 2006
@@ -36,7 +36,7 @@
import org.apache.geronimo.gbean.GBeanData;
/**
- * @version $Rev: 386505 $ $Date$
+ * @version $Rev$ $Date$
*/
public class BasicLifecycleMonitor implements LifecycleMonitor {
private static final Log log = LogFactory.getLog(BasicLifecycleMonitor.class);
Modified: geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicRegistry.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicRegistry.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicRegistry.java (original)
+++ geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicRegistry.java Mon Jul 31 14:08:15 2006
@@ -35,7 +35,7 @@
import org.apache.geronimo.kernel.Kernel;
/**
- * @version $Rev: 386505 $ $Date$
+ * @version $Rev$ $Date$
*/
public class BasicRegistry implements InstanceRegistry {
private final Map objectNameRegistry = new HashMap();
Modified: geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/basic/ProxyMethodInterceptor.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/basic/ProxyMethodInterceptor.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/basic/ProxyMethodInterceptor.java (original)
+++ geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/basic/ProxyMethodInterceptor.java Mon Jul 31 14:08:15 2006
@@ -42,7 +42,7 @@
import java.util.Set;
/**
- * @version $Rev: 385487 $ $Date$
+ * @version $Rev$ $Date$
*/
public class ProxyMethodInterceptor implements MethodInterceptor {
/**
Modified: geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/config/EditableConfigurationManager.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/config/EditableConfigurationManager.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/config/EditableConfigurationManager.java (original)
+++ geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/config/EditableConfigurationManager.java Mon Jul 31 14:08:15 2006
@@ -25,7 +25,7 @@
* A specialized ConfigurationManager that can change the set of GBeans
* included in the configuration at runtime.
*
- * @version $Rev: 384351 $ $Date$
+ * @version $Rev$ $Date$
*/
public interface EditableConfigurationManager extends ConfigurationManager {
/**
Modified: geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/proxy/ProxyFactory.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/proxy/ProxyFactory.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/proxy/ProxyFactory.java (original)
+++ geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/proxy/ProxyFactory.java Mon Jul 31 14:08:15 2006
@@ -23,7 +23,7 @@
/**
- * @version $Rev: 383682 $ $Date$
+ * @version $Rev$ $Date$
*/
public interface ProxyFactory {
Object createProxy(AbstractName target);
Modified: geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/repository/Artifact.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/repository/Artifact.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/repository/Artifact.java (original)
+++ geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/repository/Artifact.java Mon Jul 31 14:08:15 2006
@@ -20,7 +20,7 @@
import java.io.Serializable;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public class Artifact implements Comparable, Serializable {
private static final long serialVersionUID = -3459638899709893444L;
Modified: geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/repository/Environment.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/repository/Environment.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/repository/Environment.java (original)
+++ geronimo/branches/dain/notcm/modules/kernel/src/java/org/apache/geronimo/kernel/repository/Environment.java Mon Jul 31 14:08:15 2006
@@ -30,7 +30,7 @@
/**
* holds the data from the EnvironmentType xml while it is being resolved, transitively closed, etc.
*
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public class Environment implements Serializable {
private static final long serialVersionUID = 7075760873629376317L;
Modified: geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/gbean/Speed.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/gbean/Speed.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/gbean/Speed.java (original)
+++ geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/gbean/Speed.java Mon Jul 31 14:08:15 2006
@@ -26,7 +26,7 @@
import org.apache.geronimo.kernel.repository.Artifact;
/**
- * @version $Rev: 384141 $ $Date$
+ * @version $Rev$ $Date$
*/
public class Speed {
private static final Object[] NO_ARGS = new Object[0];
Modified: geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/gbean/runtime/GBeanAttributeTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/gbean/runtime/GBeanAttributeTest.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/gbean/runtime/GBeanAttributeTest.java (original)
+++ geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/gbean/runtime/GBeanAttributeTest.java Mon Jul 31 14:08:15 2006
@@ -27,7 +27,7 @@
import org.apache.geronimo.kernel.repository.Artifact;
/**
- * @version $Rev: 383682 $ $Date$
+ * @version $Rev$ $Date$
*/
public class GBeanAttributeTest extends TestCase {
Modified: geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/gbean/runtime/GBeanDependencyTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/gbean/runtime/GBeanDependencyTest.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/gbean/runtime/GBeanDependencyTest.java (original)
+++ geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/gbean/runtime/GBeanDependencyTest.java Mon Jul 31 14:08:15 2006
@@ -27,7 +27,7 @@
import org.apache.geronimo.kernel.repository.Artifact;
/**
- * @version $Rev: 384351 $ $Date$
+ * @version $Rev$ $Date$
*/
public class GBeanDependencyTest extends TestCase {
private Kernel kernel;
Modified: geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/kernel/ConfigTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/kernel/ConfigTest.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/kernel/ConfigTest.java (original)
+++ geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/kernel/ConfigTest.java Mon Jul 31 14:08:15 2006
@@ -32,7 +32,7 @@
import org.apache.geronimo.kernel.repository.DefaultArtifactResolver;
/**
- * @version $Rev: 386505 $ $Date$
+ * @version $Rev$ $Date$
*/
public class ConfigTest extends TestCase {
private Kernel kernel;
Modified: geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/kernel/classloader/UrlResourceFinderTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/kernel/classloader/UrlResourceFinderTest.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/kernel/classloader/UrlResourceFinderTest.java (original)
+++ geronimo/branches/dain/notcm/modules/kernel/src/test/org/apache/geronimo/kernel/classloader/UrlResourceFinderTest.java Mon Jul 31 14:08:15 2006
@@ -31,7 +31,7 @@
import junit.framework.TestCase;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public class UrlResourceFinderTest extends TestCase {
private File jarFile;
Modified: geronimo/branches/dain/notcm/modules/management/src/java/org/apache/geronimo/management/geronimo/JCAConnectionFactory.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/management/src/java/org/apache/geronimo/management/geronimo/JCAConnectionFactory.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/management/src/java/org/apache/geronimo/management/geronimo/JCAConnectionFactory.java (original)
+++ geronimo/branches/dain/notcm/modules/management/src/java/org/apache/geronimo/management/geronimo/JCAConnectionFactory.java Mon Jul 31 14:08:15 2006
@@ -18,7 +18,7 @@
package org.apache.geronimo.management.geronimo;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public interface JCAConnectionFactory extends org.apache.geronimo.management.JCAConnectionFactory {
JCAManagedConnectionFactory getManagedConnectionFactoryInstance();
Modified: geronimo/branches/dain/notcm/modules/management/src/java/org/apache/geronimo/management/geronimo/ResourceAdapter.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/management/src/java/org/apache/geronimo/management/geronimo/ResourceAdapter.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/management/src/java/org/apache/geronimo/management/geronimo/ResourceAdapter.java (original)
+++ geronimo/branches/dain/notcm/modules/management/src/java/org/apache/geronimo/management/geronimo/ResourceAdapter.java Mon Jul 31 14:08:15 2006
@@ -18,7 +18,7 @@
package org.apache.geronimo.management.geronimo;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public interface ResourceAdapter extends org.apache.geronimo.management.ResourceAdapter {
JCAResource[] getJCAResourceImplementations();
Modified: geronimo/branches/dain/notcm/modules/naming-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/naming-builder/project.xml?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/naming-builder/project.xml (original)
+++ geronimo/branches/dain/notcm/modules/naming-builder/project.xml Mon Jul 31 14:08:15 2006
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<!-- $Rev: 385372 $ $Date$ -->
+<!-- $Rev$ $Date$ -->
<project>
<pomVersion>3</pomVersion>
Modified: geronimo/branches/dain/notcm/modules/naming/src/test/org/apache/geronimo/naming/java/ContextBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/naming/src/test/org/apache/geronimo/naming/java/ContextBuilderTest.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/naming/src/test/org/apache/geronimo/naming/java/ContextBuilderTest.java (original)
+++ geronimo/branches/dain/notcm/modules/naming/src/test/org/apache/geronimo/naming/java/ContextBuilderTest.java Mon Jul 31 14:08:15 2006
@@ -31,7 +31,7 @@
import org.apache.geronimo.naming.enc.EnterpriseNamingContext;
/**
- * @version $Rev: 385372 $ $Date$
+ * @version $Rev$ $Date$
*/
public class ContextBuilderTest extends TestCase {
private ComponentContextBuilder builder;
Modified: geronimo/branches/dain/notcm/modules/security/src/java/org/apache/geronimo/security/jaas/client/JaasLoginCoordinator.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/security/src/java/org/apache/geronimo/security/jaas/client/JaasLoginCoordinator.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/security/src/java/org/apache/geronimo/security/jaas/client/JaasLoginCoordinator.java (original)
+++ geronimo/branches/dain/notcm/modules/security/src/java/org/apache/geronimo/security/jaas/client/JaasLoginCoordinator.java Mon Jul 31 14:08:15 2006
@@ -48,7 +48,7 @@
* case the client/server distinction is somewhat less important, and the
* communication is optimized by avoiding network traffic.
*
- * @version $Rev: 386763 $ $Date$
+ * @version $Rev$ $Date$
*/
public class JaasLoginCoordinator implements LoginModule {
public final static String OPTION_HOST = "host";
Modified: geronimo/branches/dain/notcm/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java (original)
+++ geronimo/branches/dain/notcm/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java Mon Jul 31 14:08:15 2006
@@ -45,7 +45,7 @@
import org.apache.xmlbeans.XmlOptions;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public class EnvironmentBuilder extends PropertyEditorSupport implements XmlAttributeBuilder {
private final static QName QNAME = EnvironmentDocument.type.getDocumentElementName();
Modified: geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/jmx/JMXProxyManager.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/jmx/JMXProxyManager.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/jmx/JMXProxyManager.java (original)
+++ geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/jmx/JMXProxyManager.java Mon Jul 31 14:08:15 2006
@@ -26,7 +26,7 @@
* Pretty much the same as the BasicProxyManager, but it has a different way
* of handling the actual invocations.
*
- * @version $Rev: 383682 $ $Date$
+ * @version $Rev$ $Date$
*/
public class JMXProxyManager extends BasicProxyManager {
public JMXProxyManager(Kernel kernel) {
Modified: geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/jmx/JMXProxyMethodInterceptor.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/jmx/JMXProxyMethodInterceptor.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/jmx/JMXProxyMethodInterceptor.java (original)
+++ geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/jmx/JMXProxyMethodInterceptor.java Mon Jul 31 14:08:15 2006
@@ -35,7 +35,7 @@
import java.lang.reflect.Modifier;
/**
- * @version $Rev: 385487 $ $Date$
+ * @version $Rev$ $Date$
*/
public class JMXProxyMethodInterceptor implements MethodInterceptor {
/**
Modified: geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/jmx/JMXUtil.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/jmx/JMXUtil.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/jmx/JMXUtil.java (original)
+++ geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/jmx/JMXUtil.java Mon Jul 31 14:08:15 2006
@@ -36,7 +36,7 @@
/**
* Helper class for JMX Operations
*
- * @version $Rev: 383682 $ $Date$
+ * @version $Rev$ $Date$
*/
public final class JMXUtil {
private JMXUtil() {
Modified: geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/jmx/MBeanGBeanBridge.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/jmx/MBeanGBeanBridge.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/jmx/MBeanGBeanBridge.java (original)
+++ geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/jmx/MBeanGBeanBridge.java Mon Jul 31 14:08:15 2006
@@ -48,7 +48,7 @@
import org.apache.geronimo.kernel.management.NotificationType;
/**
- * @version $Rev: 383682 $ $Date$
+ * @version $Rev$ $Date$
*/
public final class MBeanGBeanBridge implements MBeanRegistration, DynamicMBean, NotificationEmitter {
private static final Log log = LogFactory.getLog(MBeanGBeanBridge.class);
Modified: geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/jmx/MBeanServerKernelBridge.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/jmx/MBeanServerKernelBridge.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/jmx/MBeanServerKernelBridge.java (original)
+++ geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/jmx/MBeanServerKernelBridge.java Mon Jul 31 14:08:15 2006
@@ -41,7 +41,7 @@
import org.apache.geronimo.kernel.lifecycle.LifecycleAdapter;
/**
- * @version $Rev: 384351 $ $Date$
+ * @version $Rev$ $Date$
*/
public class MBeanServerKernelBridge implements GBeanLifecycle {
private static final Log log = LogFactory.getLog(MBeanServerKernelBridge.class);
Modified: geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/main/LocalServer.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/main/LocalServer.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/main/LocalServer.java (original)
+++ geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/main/LocalServer.java Mon Jul 31 14:08:15 2006
@@ -30,7 +30,7 @@
import org.apache.geronimo.system.serverinfo.ServerInfo;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public class LocalServer extends CommandLine {
Modified: geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java (original)
+++ geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java Mon Jul 31 14:08:15 2006
@@ -37,7 +37,7 @@
import org.apache.geronimo.system.serverinfo.ServerInfo;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public class ExplicitDefaultArtifactResolver extends DefaultArtifactResolver {
Modified: geronimo/branches/dain/notcm/modules/timer/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/timer/project.xml?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/timer/project.xml (original)
+++ geronimo/branches/dain/notcm/modules/timer/project.xml Mon Jul 31 14:08:15 2006
@@ -42,6 +42,13 @@
<dependencies>
<dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>${backport_util_concurrent_version}</version>
+ <type>test</type>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
<version>${geronimo_spec_j2ee_management_version}</version>
Modified: geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/NontransactionalExecutorTask.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/NontransactionalExecutorTask.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/NontransactionalExecutorTask.java (original)
+++ geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/NontransactionalExecutorTask.java Mon Jul 31 14:08:15 2006
@@ -19,8 +19,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.transaction.context.TransactionContext;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
/**
* @version $Rev$ $Date$
@@ -32,40 +30,26 @@
private final Runnable userTask;
private final WorkInfo workInfo;
private final ThreadPooledTimer threadPooledTimer;
- private final TransactionContextManager transactionContextManager;
- public NontransactionalExecutorTask(Runnable userTask, WorkInfo workInfo, ThreadPooledTimer threadPooledTimer, TransactionContextManager transactionContextManager) {
+ public NontransactionalExecutorTask(Runnable userTask, WorkInfo workInfo, ThreadPooledTimer threadPooledTimer) {
this.userTask = userTask;
this.workInfo = workInfo;
this.threadPooledTimer = threadPooledTimer;
- this.transactionContextManager = transactionContextManager;
}
public void run() {
- TransactionContext oldTransactionContext = transactionContextManager.getContext();
- TransactionContext transactionContext = transactionContextManager.newUnspecifiedTransactionContext();
try {
- try {
- userTask.run();
- } catch (Exception e) {
- log.warn("Exception running task", e);
- }
- try {
- threadPooledTimer.workPerformed(workInfo);
- } catch (PersistenceException e) {
- log.warn("Exception completing task", e);
- }
- if (workInfo.isOneTime()) {
- threadPooledTimer.removeWorkInfo(workInfo);
- }
- } finally {
- try {
- transactionContext.commit();
- } catch (Exception e) {
- log.error("Unable to commit transaction context", e);
- }
- transactionContextManager.setContext(oldTransactionContext);
+ userTask.run();
+ } catch (Exception e) {
+ log.warn("Exception running task", e);
+ }
+ try {
+ threadPooledTimer.workPerformed(workInfo);
+ } catch (PersistenceException e) {
+ log.warn("Exception completing task", e);
+ }
+ if (workInfo.isOneTime()) {
+ threadPooledTimer.removeWorkInfo(workInfo);
}
}
-
}
Modified: geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/NontransactionalExecutorTaskFactory.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/NontransactionalExecutorTaskFactory.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/NontransactionalExecutorTaskFactory.java (original)
+++ geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/NontransactionalExecutorTaskFactory.java Mon Jul 31 14:08:15 2006
@@ -17,12 +17,6 @@
package org.apache.geronimo.timer;
-import org.apache.geronimo.timer.ExecutorTask;
-import org.apache.geronimo.timer.ExecutorTaskFactory;
-import org.apache.geronimo.timer.NontransactionalExecutorTask;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
-
-
/**
*
*
@@ -30,14 +24,11 @@
*
* */
public class NontransactionalExecutorTaskFactory implements ExecutorTaskFactory {
- private final TransactionContextManager transactionContextManager;
-
- public NontransactionalExecutorTaskFactory(TransactionContextManager transactionContextManager) {
- this.transactionContextManager = transactionContextManager;
+ public NontransactionalExecutorTaskFactory() {
}
public ExecutorTask createExecutorTask(Runnable userTask, WorkInfo workInfo, ThreadPooledTimer threadPooledTimer) {
- return new NontransactionalExecutorTask(userTask, workInfo, threadPooledTimer, transactionContextManager);
+ return new NontransactionalExecutorTask(userTask, workInfo, threadPooledTimer);
}
}
Modified: geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/ThreadPooledTimer.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/ThreadPooledTimer.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/ThreadPooledTimer.java (original)
+++ geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/ThreadPooledTimer.java Mon Jul 31 14:08:15 2006
@@ -30,13 +30,13 @@
import javax.transaction.Status;
import javax.transaction.Synchronization;
import javax.transaction.SystemException;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
import EDU.oswego.cs.dl.util.concurrent.Executor;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.gbean.GBeanLifecycle;
-import org.apache.geronimo.transaction.context.TransactionContext;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
/**
*
@@ -51,7 +51,7 @@
private final ExecutorTaskFactory executorTaskFactory;
private final WorkerPersistence workerPersistence;
private final Executor executor;
- private final TransactionContextManager transactionContextManager;
+ private final TransactionManager transactionManager;
private Timer delegate;
@@ -62,11 +62,11 @@
this(null, null, null, null);
}
- public ThreadPooledTimer(ExecutorTaskFactory executorTaskFactory, WorkerPersistence workerPersistence, Executor executor, TransactionContextManager transactionContextManager) {
+ public ThreadPooledTimer(ExecutorTaskFactory executorTaskFactory, WorkerPersistence workerPersistence, Executor executor, TransactionManager transactionManager) {
this.executorTaskFactory = executorTaskFactory;
this.workerPersistence = workerPersistence;
this.executor = executor;
- this.transactionContextManager = transactionContextManager;
+ this.transactionManager = transactionManager;
}
public void doStart() throws Exception {
@@ -240,9 +240,11 @@
}
void registerSynchronization(Synchronization sync) throws RollbackException, SystemException {
- TransactionContext transactionContext = transactionContextManager.getContext();
- if (transactionContext != null && transactionContext.isInheritable() && transactionContext.isActive()) {
- transactionContext.registerSynchronization(sync);
+ Transaction transaction = transactionManager.getTransaction();
+ int status = transaction == null ? Status.STATUS_NO_TRANSACTION : transaction.getStatus();
+
+ if (transaction != null && status == Status.STATUS_ACTIVE || status == Status.STATUS_MARKED_ROLLBACK) {
+ transaction.registerSynchronization(sync);
} else {
sync.beforeCompletion();
sync.afterCompletion(Status.STATUS_COMMITTED);
Modified: geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/TransactionalExecutorTask.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/TransactionalExecutorTask.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/TransactionalExecutorTask.java (original)
+++ geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/TransactionalExecutorTask.java Mon Jul 31 14:08:15 2006
@@ -17,10 +17,10 @@
package org.apache.geronimo.timer;
+import javax.transaction.TransactionManager;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
-import org.apache.geronimo.transaction.context.TransactionContext;
/**
* @version $Rev$ $Date$
@@ -32,22 +32,21 @@
private final WorkInfo workInfo;
private final ThreadPooledTimer threadPooledTimer;
- private final TransactionContextManager transactionContextManager;
+ private final TransactionManager transactionManager;
private final int repeatCount;
- public TransactionalExecutorTask(Runnable userTask, WorkInfo workInfo, ThreadPooledTimer threadPooledTimer, TransactionContextManager transactionContextManager, int repeatCount) {
+ public TransactionalExecutorTask(Runnable userTask, WorkInfo workInfo, ThreadPooledTimer threadPooledTimer, TransactionManager transactionManager, int repeatCount) {
this.userTask = userTask;
this.workInfo = workInfo;
this.threadPooledTimer = threadPooledTimer;
- this.transactionContextManager = transactionContextManager;
+ this.transactionManager = transactionManager;
this.repeatCount = repeatCount;
}
-
+
public void run() {
- TransactionContext transactionContext = null;
for (int tries = 0; tries < repeatCount; tries++) {
try {
- transactionContext = transactionContextManager.newContainerTransactionContext();
+ transactionManager.begin();
} catch (Exception e) {
log.warn("Exception occured while starting container transaction", e);
break;
@@ -65,14 +64,12 @@
}
} finally {
try {
- transactionContextManager.setContext(null);
- if (transactionContext.commit()) {
- if (workInfo.isOneTime()) {
- threadPooledTimer.removeWorkInfo(workInfo);
- }
- // todo this is a very weird code structure.... returning from a finally is very confusing
- return;
+ transactionManager.commit();
+ if (workInfo.isOneTime()) {
+ threadPooledTimer.removeWorkInfo(workInfo);
}
+ // todo this is a very weird code structure.... returning from a finally is very confusing
+ return;
} catch (Exception e) {
log.warn("Exception occured while completing container transaction", e);
}
Modified: geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/TransactionalExecutorTaskFactory.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/TransactionalExecutorTaskFactory.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/TransactionalExecutorTaskFactory.java (original)
+++ geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/TransactionalExecutorTaskFactory.java Mon Jul 31 14:08:15 2006
@@ -17,11 +17,7 @@
package org.apache.geronimo.timer;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
-import org.apache.geronimo.timer.ExecutorTask;
-import org.apache.geronimo.timer.ExecutorTaskFactory;
-import org.apache.geronimo.timer.ThreadPooledTimer;
-import org.apache.geronimo.timer.TransactionalExecutorTask;
+import javax.transaction.TransactionManager;
/**
*
@@ -31,24 +27,20 @@
* */
public class TransactionalExecutorTaskFactory implements ExecutorTaskFactory {
- private final TransactionContextManager transactionContextManager;
+ private final TransactionManager transactionManager;
private int repeatCount;
- public TransactionalExecutorTaskFactory(TransactionContextManager transactionContextManager, int repeatCount) {
- this.transactionContextManager = transactionContextManager;
+ public TransactionalExecutorTaskFactory(TransactionManager transactionManager, int repeatCount) {
+ this.transactionManager = transactionManager;
this.repeatCount = repeatCount;
}
- public TransactionContextManager getTransactionContextManager() {
- return transactionContextManager;
- }
-
public int getRepeatCount() {
return repeatCount;
}
public ExecutorTask createExecutorTask(Runnable userTask, WorkInfo workInfo, ThreadPooledTimer threadPooledTimer) {
- return new TransactionalExecutorTask(userTask, workInfo, threadPooledTimer, transactionContextManager, repeatCount);
+ return new TransactionalExecutorTask(userTask, workInfo, threadPooledTimer, transactionManager, repeatCount);
}
}
Modified: geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java (original)
+++ geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java Mon Jul 31 14:08:15 2006
@@ -17,10 +17,9 @@
package org.apache.geronimo.timer.jdbc;
-import java.io.Serializable;
import java.sql.SQLException;
-
import javax.sql.DataSource;
+import javax.transaction.TransactionManager;
import EDU.oswego.cs.dl.util.concurrent.Executor;
import org.apache.geronimo.connector.outbound.ConnectionFactorySource;
@@ -31,7 +30,6 @@
import org.apache.geronimo.timer.NontransactionalExecutorTaskFactory;
import org.apache.geronimo.timer.PersistentTimer;
import org.apache.geronimo.timer.ThreadPooledTimer;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
/**
* @version $Rev$ $Date$
@@ -39,11 +37,11 @@
public class JDBCStoreThreadPooledNonTransactionalTimer extends ThreadPooledTimer {
public JDBCStoreThreadPooledNonTransactionalTimer(ConnectionFactorySource managedConnectionFactoryWrapper,
- TransactionContextManager transactionContextManager,
+ TransactionManager transactionManager,
Executor threadPool,
Kernel kernel) throws SQLException {
- super(new NontransactionalExecutorTaskFactory(transactionContextManager),
- new JDBCWorkerPersistence(kernel.getKernelName(), (DataSource)managedConnectionFactoryWrapper.$getResource(), false), threadPool, transactionContextManager);
+ super(new NontransactionalExecutorTaskFactory(),
+ new JDBCWorkerPersistence(kernel.getKernelName(), (DataSource)managedConnectionFactoryWrapper.$getResource(), false), threadPool, transactionManager);
}
@@ -55,11 +53,11 @@
infoFactory.addReference("ManagedConnectionFactoryWrapper", ConnectionFactorySource.class, NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
infoFactory.addReference("ThreadPool", Executor.class, NameFactory.GERONIMO_SERVICE);
- infoFactory.addReference("TransactionContextManager", TransactionContextManager.class, NameFactory.TRANSACTION_CONTEXT_MANAGER);
+ infoFactory.addReference("TransactionManager", TransactionManager.class, NameFactory.TRANSACTION_MANAGER);
infoFactory.addAttribute("kernel", Kernel.class, false);
- infoFactory.setConstructor(new String[]{"ManagedConnectionFactoryWrapper", "TransactionContextManager", "ThreadPool", "kernel"});
+ infoFactory.setConstructor(new String[]{"ManagedConnectionFactoryWrapper", "TransactionManager", "ThreadPool", "kernel"});
GBEAN_INFO = infoFactory.getBeanInfo();
}
Modified: geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java (original)
+++ geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java Mon Jul 31 14:08:15 2006
@@ -17,10 +17,9 @@
package org.apache.geronimo.timer.jdbc;
-import java.io.Serializable;
import java.sql.SQLException;
-
import javax.sql.DataSource;
+import javax.transaction.TransactionManager;
import EDU.oswego.cs.dl.util.concurrent.Executor;
import org.apache.geronimo.connector.outbound.ConnectionFactorySource;
@@ -31,7 +30,6 @@
import org.apache.geronimo.timer.PersistentTimer;
import org.apache.geronimo.timer.ThreadPooledTimer;
import org.apache.geronimo.timer.TransactionalExecutorTaskFactory;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
/**
*
@@ -42,12 +40,12 @@
public class JDBCStoreThreadPooledTransactionalTimer extends ThreadPooledTimer {
public JDBCStoreThreadPooledTransactionalTimer(int repeatCount,
- TransactionContextManager transactionContextManager,
+ TransactionManager transactionManager,
ConnectionFactorySource managedConnectionFactoryWrapper,
Executor threadPool,
Kernel kernel) throws SQLException {
- super(new TransactionalExecutorTaskFactory(transactionContextManager, repeatCount),
- new JDBCWorkerPersistence(kernel.getKernelName(), (DataSource)managedConnectionFactoryWrapper.$getResource(), false), threadPool, transactionContextManager);
+ super(new TransactionalExecutorTaskFactory(transactionManager, repeatCount),
+ new JDBCWorkerPersistence(kernel.getKernelName(), (DataSource)managedConnectionFactoryWrapper.$getResource(), false), threadPool, transactionManager);
}
@@ -58,12 +56,12 @@
infoFactory.addInterface(PersistentTimer.class);
infoFactory.addAttribute("repeatCount", int.class, true);
- infoFactory.addReference("TransactionContextManager", TransactionContextManager.class, NameFactory.TRANSACTION_CONTEXT_MANAGER);
+ infoFactory.addReference("TransactionManager", TransactionManager.class, NameFactory.TRANSACTION_MANAGER);
infoFactory.addReference("ManagedConnectionFactoryWrapper", ConnectionFactorySource.class, NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
infoFactory.addReference("ThreadPool", Executor.class, NameFactory.GERONIMO_SERVICE);
infoFactory.addAttribute("kernel", Kernel.class, false);
- infoFactory.setConstructor(new String[] {"repeatCount", "TransactionContextManager", "ManagedConnectionFactoryWrapper", "ThreadPool", "kernel"});
+ infoFactory.setConstructor(new String[] {"repeatCount", "TransactionManager", "ManagedConnectionFactoryWrapper", "ThreadPool", "kernel"});
GBEAN_INFO = infoFactory.getBeanInfo();
}
Modified: geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledNonTransactionalTimer.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledNonTransactionalTimer.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledNonTransactionalTimer.java (original)
+++ geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledNonTransactionalTimer.java Mon Jul 31 14:08:15 2006
@@ -17,14 +17,15 @@
package org.apache.geronimo.timer.vm;
+import javax.transaction.TransactionManager;
+
import EDU.oswego.cs.dl.util.concurrent.Executor;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.timer.NontransactionalExecutorTaskFactory;
import org.apache.geronimo.timer.PersistentTimer;
import org.apache.geronimo.timer.ThreadPooledTimer;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
/**
*
@@ -34,9 +35,9 @@
* */
public class VMStoreThreadPooledNonTransactionalTimer extends ThreadPooledTimer {
- public VMStoreThreadPooledNonTransactionalTimer(TransactionContextManager transactionContextManager, Executor threadPool) {
- super(new NontransactionalExecutorTaskFactory(transactionContextManager),
- new VMWorkerPersistence(), threadPool, transactionContextManager);
+ public VMStoreThreadPooledNonTransactionalTimer(TransactionManager transactionManager, Executor threadPool) {
+ super(new NontransactionalExecutorTaskFactory(),
+ new VMWorkerPersistence(), threadPool, transactionManager);
}
@@ -47,9 +48,9 @@
infoFactory.addInterface(PersistentTimer.class);
infoFactory.addReference("ThreadPool", Executor.class, NameFactory.GERONIMO_SERVICE);
- infoFactory.addReference("TransactionContextManager", TransactionContextManager.class, NameFactory.TRANSACTION_CONTEXT_MANAGER);
+ infoFactory.addReference("TransactionManager", TransactionManager.class, NameFactory.TRANSACTION_MANAGER);
- infoFactory.setConstructor(new String[] {"TransactionContextManager", "ThreadPool"});
+ infoFactory.setConstructor(new String[] {"TransactionManager", "ThreadPool"});
GBEAN_INFO = infoFactory.getBeanInfo();
}
Modified: geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledTransactionalTimer.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledTransactionalTimer.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledTransactionalTimer.java (original)
+++ geronimo/branches/dain/notcm/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledTransactionalTimer.java Mon Jul 31 14:08:15 2006
@@ -17,28 +17,26 @@
package org.apache.geronimo.timer.vm;
+import javax.transaction.TransactionManager;
+
import EDU.oswego.cs.dl.util.concurrent.Executor;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.timer.PersistentTimer;
import org.apache.geronimo.timer.ThreadPooledTimer;
import org.apache.geronimo.timer.TransactionalExecutorTaskFactory;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
/**
- *
- *
* @version $Rev$ $Date$
- *
- * */
+ */
public class VMStoreThreadPooledTransactionalTimer extends ThreadPooledTimer {
public VMStoreThreadPooledTransactionalTimer(int repeatCount,
- TransactionContextManager transactionContextManager,
+ TransactionManager transactionManager,
Executor threadPool) {
- super(new TransactionalExecutorTaskFactory(transactionContextManager, repeatCount),
- new VMWorkerPersistence(), threadPool, transactionContextManager);
+ super(new TransactionalExecutorTaskFactory(transactionManager, repeatCount),
+ new VMWorkerPersistence(), threadPool, transactionManager);
}
@@ -49,10 +47,10 @@
infoFactory.addInterface(PersistentTimer.class);
infoFactory.addAttribute("repeatCount", int.class, true);
- infoFactory.addReference("TransactionContextManager", TransactionContextManager.class, NameFactory.TRANSACTION_CONTEXT_MANAGER);
+ infoFactory.addReference("TransactionManager", TransactionManager.class, NameFactory.TRANSACTION_MANAGER);
infoFactory.addReference("ThreadPool", Executor.class, NameFactory.GERONIMO_SERVICE);
- infoFactory.setConstructor(new String[] {"repeatCount", "TransactionContextManager", "ThreadPool"});
+ infoFactory.setConstructor(new String[] {"repeatCount", "TransactionManager", "ThreadPool"});
GBEAN_INFO = infoFactory.getBeanInfo();
}
Modified: geronimo/branches/dain/notcm/modules/timer/src/test/org/apache/geronimo/timer/AbstractThreadPooledTimerTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/timer/src/test/org/apache/geronimo/timer/AbstractThreadPooledTimerTest.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/timer/src/test/org/apache/geronimo/timer/AbstractThreadPooledTimerTest.java (original)
+++ geronimo/branches/dain/notcm/modules/timer/src/test/org/apache/geronimo/timer/AbstractThreadPooledTimerTest.java Mon Jul 31 14:08:15 2006
@@ -17,11 +17,11 @@
package org.apache.geronimo.timer;
+import javax.transaction.TransactionManager;
+
import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
import junit.framework.TestCase;
import org.apache.geronimo.pool.ThreadPool;
-import org.apache.geronimo.transaction.context.TransactionContext;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
import org.apache.geronimo.timer.vm.VMWorkerPersistence;
/**
@@ -42,7 +42,7 @@
private ThreadPooledTimer timer;
private SynchronizedInt counter = new SynchronizedInt(0);
- protected TransactionContextManager transactionContextManager;
+ protected TransactionManager transactionManager;
protected ExecutorTaskFactory executableWorkFactory;
protected UserTaskFactory userTaskFactory;
@@ -52,11 +52,10 @@
userTaskFactory = new MockUserTaskFactory();
threadPool = new ThreadPool(30, "TestPool", 10000, this.getClass().getClassLoader(), "foo:bar=baz");
WorkerPersistence workerPersistence = new VMWorkerPersistence();
- timer = new ThreadPooledTimer(executableWorkFactory, workerPersistence, threadPool, transactionContextManager);
+ timer = new ThreadPooledTimer(executableWorkFactory, workerPersistence, threadPool, transactionManager);
timer.doStart();
counter.set(0);
- transactionContextManager.setContext(null);
}
protected void tearDown() throws Exception {
@@ -98,40 +97,25 @@
}
public void testTasksInUnspecifiedTxContext() throws Exception {
- transactionContextManager.newUnspecifiedTransactionContext();
- try {
- testTasks();
- } finally {
- transactionContextManager.setContext(null);
- }
+ testTasks();
}
public void testCancelInUnspecifiedTxContext() throws Exception {
- transactionContextManager.newUnspecifiedTransactionContext();
- try {
- testCancel();
- } finally {
- transactionContextManager.setContext(null);
- }
+ testCancel();
}
public void testPersistenceInUnspecifiedTxContext() throws Exception {
- transactionContextManager.newUnspecifiedTransactionContext();
- try {
- testPersistence();
- } finally {
- transactionContextManager.setContext(null);
- }
+ testPersistence();
}
public void testTasksInTransaction() throws Exception {
- TransactionContext transactionContext = transactionContextManager.newContainerTransactionContext();
+ transactionManager.begin();
for (long i = 0; i < COUNT; i++) {
timer.schedule(userTaskFactory, key, userId, userKey, i);
}
Thread.sleep(COUNT + SLOP);
assertEquals(0, counter.get());
- transactionContext.commit();
+ transactionManager.commit();
Thread.sleep(COUNT + SLOP);
assertEquals(COUNT, counter.get());
}
@@ -144,13 +128,13 @@
}
Thread.sleep(SLOP + DELAY);
assertEquals(COUNT, counter.get());
- TransactionContext transactionContext = transactionContextManager.newContainerTransactionContext();
+ transactionManager.begin();
for (int i = 0; i < workInfos.length; i++) {
workInfos[i].getExecutorFeedingTimerTask().cancel();
}
Thread.sleep(SLOP + DELAY);
assertEquals(COUNT, counter.get());
- transactionContext.commit();
+ transactionManager.commit();
Thread.sleep(SLOP + DELAY);
assertEquals(COUNT, counter.get());
}
@@ -163,13 +147,13 @@
}
Thread.sleep(SLOP + DELAY);
assertEquals(COUNT, counter.get());
- TransactionContext transactionContext = transactionContextManager.newContainerTransactionContext();
+ transactionManager.begin();
for (int i = 0; i < workInfos.length; i++) {
workInfos[i].getExecutorFeedingTimerTask().cancel();
}
Thread.sleep(SLOP + DELAY);
assertEquals(COUNT, counter.get());
- transactionContext.rollback();
+ transactionManager.rollback();
Thread.sleep(SLOP + DELAY);
// Catches up with two periods.
assertEquals(3 * COUNT, counter.get());
Modified: geronimo/branches/dain/notcm/modules/timer/src/test/org/apache/geronimo/timer/NontransactionalThreadPooledTimerTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/timer/src/test/org/apache/geronimo/timer/NontransactionalThreadPooledTimerTest.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/timer/src/test/org/apache/geronimo/timer/NontransactionalThreadPooledTimerTest.java (original)
+++ geronimo/branches/dain/notcm/modules/timer/src/test/org/apache/geronimo/timer/NontransactionalThreadPooledTimerTest.java Mon Jul 31 14:08:15 2006
@@ -17,23 +17,16 @@
package org.apache.geronimo.timer;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
-import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
-import org.apache.geronimo.transaction.manager.XidFactoryImpl;
+import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
/**
- *
- *
* @version $Rev$ $Date$
- *
- * */
+ */
public class NontransactionalThreadPooledTimerTest extends AbstractThreadPooledTimerTest {
protected void setUp() throws Exception {
- TransactionManagerImpl transactionManager = new TransactionManagerImpl(10 * 1000,
- new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()), null, null);
- transactionContextManager = new TransactionContextManager(transactionManager, transactionManager);
- executableWorkFactory = new NontransactionalExecutorTaskFactory(transactionContextManager);
+ this.transactionManager = new GeronimoTransactionManager();
+ executableWorkFactory = new NontransactionalExecutorTaskFactory();
super.setUp();
}
}
Modified: geronimo/branches/dain/notcm/modules/timer/src/test/org/apache/geronimo/timer/TransactionalThreadPooledTimerTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/timer/src/test/org/apache/geronimo/timer/TransactionalThreadPooledTimerTest.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/timer/src/test/org/apache/geronimo/timer/TransactionalThreadPooledTimerTest.java (original)
+++ geronimo/branches/dain/notcm/modules/timer/src/test/org/apache/geronimo/timer/TransactionalThreadPooledTimerTest.java Mon Jul 31 14:08:15 2006
@@ -17,23 +17,15 @@
package org.apache.geronimo.timer;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
-import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
-import org.apache.geronimo.transaction.manager.XidFactoryImpl;
+import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
/**
- *
- *
* @version $Rev$ $Date$
- *
- * */
+ */
public class TransactionalThreadPooledTimerTest extends AbstractThreadPooledTimerTest {
-
protected void setUp() throws Exception {
- TransactionManagerImpl transactionManager = new TransactionManagerImpl(10 * 1000,
- new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()), null, null);
- transactionContextManager = new TransactionContextManager(transactionManager, transactionManager);
- executableWorkFactory = new TransactionalExecutorTaskFactory(transactionContextManager, 1);
+ this.transactionManager = new GeronimoTransactionManager();
+ executableWorkFactory = new TransactionalExecutorTaskFactory(this.transactionManager, 1);
super.setUp();
}
}
Modified: geronimo/branches/dain/notcm/modules/tomcat-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/tomcat-builder/project.xml?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/tomcat-builder/project.xml (original)
+++ geronimo/branches/dain/notcm/modules/tomcat-builder/project.xml Mon Jul 31 14:08:15 2006
@@ -42,6 +42,13 @@
<dependencies>
<dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>${backport_util_concurrent_version}</version>
+ <type>test</type>
+ </dependency>
+
+ <dependency>
<groupId>xmlbeans</groupId>
<artifactId>xmlbeans-maven-plugin</artifactId>
<version>${xmlbeans_maven_plugin_version}</version>
Modified: geronimo/branches/dain/notcm/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java (original)
+++ geronimo/branches/dain/notcm/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java Mon Jul 31 14:08:15 2006
@@ -34,8 +34,6 @@
import java.util.Collection;
import java.util.jar.JarFile;
-import javax.transaction.UserTransaction;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.common.DeploymentException;
@@ -75,7 +73,6 @@
import org.apache.geronimo.tomcat.ValveGBean;
import org.apache.geronimo.tomcat.cluster.CatalinaClusterGBean;
import org.apache.geronimo.tomcat.util.SecurityHolder;
-import org.apache.geronimo.transaction.context.OnlineUserTransaction;
import org.apache.geronimo.web.deployment.AbstractWebModuleBuilder;
import org.apache.geronimo.web.deployment.GenericToSpecificPlanConverter;
import org.apache.geronimo.xbeans.geronimo.naming.GerMessageDestinationType;
@@ -282,10 +279,9 @@
ServiceConfigBuilder.addGBeans(gbeans, moduleClassLoader, moduleName, moduleContext);
- UserTransaction userTransaction = new OnlineUserTransaction();
//this may add to the web classpath with enhanced classes.
//N.B. we use the ear context which has all the gbeans we could possibly be looking up from this ear.
- Map compContext = buildComponentContext(earContext, webModule, webApp, tomcatWebApp, userTransaction, moduleClassLoader);
+ Map compContext = buildComponentContext(earContext, webModule, webApp, tomcatWebApp, moduleClassLoader);
GBeanData webModuleData = new GBeanData(moduleName, TomcatWebAppContext.GBEAN_INFO);
try {
@@ -307,13 +303,12 @@
webModuleData.addDependencies(dependencies);
webModuleData.setAttribute("componentContext", compContext);
- webModuleData.setAttribute("userTransaction", userTransaction);
// unsharableResources, applicationManagedSecurityResources
GBeanResourceEnvironmentBuilder rebuilder = new GBeanResourceEnvironmentBuilder(webModuleData);
//N.B. use earContext not moduleContext
ENCConfigBuilder.setResourceEnvironment(rebuilder, webApp.getResourceRefArray(), tomcatWebApp.getResourceRefArray());
- webModuleData.setReferencePattern("TransactionContextManager", earContext.getTransactionContextManagerObjectName());
+ webModuleData.setReferencePattern("TransactionManager", earContext.getTransactionManagerObjectName());
webModuleData.setReferencePattern("TrackedConnectionAssociator", earContext.getConnectionTrackerObjectName());
if (tomcatWebApp.isSetWebContainer()) {
@@ -454,11 +449,11 @@
}
- private Map buildComponentContext(EARContext earContext, Module webModule, WebAppType webApp, TomcatWebAppType tomcatWebApp, UserTransaction userTransaction, ClassLoader cl) throws DeploymentException {
+ private Map buildComponentContext(EARContext earContext, Module webModule, WebAppType webApp, TomcatWebAppType tomcatWebApp, ClassLoader cl) throws DeploymentException {
return ENCConfigBuilder.buildComponentContext(earContext,
earContext.getConfiguration(),
webModule,
- userTransaction,
+ null,
webApp.getEnvEntryArray(),
webApp.getEjbRefArray(), tomcatWebApp.getEjbRefArray(),
webApp.getEjbLocalRefArray(), tomcatWebApp.getEjbLocalRefArray(),