geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r684945 - in /geronimo/server/trunk/plugins: client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/ connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ corba/geronimo-corba/...
Date Mon, 11 Aug 2008 21:33:14 GMT
Author: djencks
Date: Mon Aug 11 14:33:13 2008
New Revision: 684945

URL: http://svn.apache.org/viewvc?rev=684945&view=rev
Log:
GERONIMO-4236 remove obsolete geronimo-timer implementation

Removed:
    geronimo/server/trunk/plugins/system-database/geronimo-timer/
Modified:
    geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
    geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
    geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java
    geronimo/server/trunk/plugins/corba/geronimo-corba/pom.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java
    geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilderTest.java
    geronimo/server/trunk/plugins/system-database/pom.xml
    geronimo/server/trunk/plugins/system-database/system-database/pom.xml
    geronimo/server/trunk/plugins/system-database/system-database/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/test/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java

Modified: geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?rev=684945&r1=684944&r2=684945&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
Mon Aug 11 14:33:13 2008
@@ -552,8 +552,6 @@
                     appClientModule.getAppClientName(),
                     transactionManagerObjectName,
                     connectionTrackerObjectName,
-                    null,
-                    null,
                     corbaGBeanObjectName,
                     earContext.getMessageDestinations());
             appClientModule.setEarContext(appClientDeploymentContext);

Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?rev=684945&r1=684944&r2=684945&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
(original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
Mon Aug 11 14:33:13 2008
@@ -24,7 +24,6 @@
 import java.sql.Connection;
 import java.sql.Statement;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -69,7 +68,6 @@
 import org.apache.geronimo.kernel.repository.DefaultArtifactResolver;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.kernel.repository.ImportType;
-import org.apache.geronimo.kernel.repository.ListableRepository;
 import org.apache.geronimo.system.serverinfo.BasicServerInfo;
 import org.apache.geronimo.testsupport.TestSupport;
 import org.apache.geronimo.transaction.manager.GeronimoTransactionManagerGBean;
@@ -125,8 +123,6 @@
                     transactionManagerName,
                     connectionTrackerName,
                     null,
-                    null,
-                    null,
                     new AbstractNameQuery(serverName, J2EEServerImpl.GBEAN_INFO.getInterfaces()),
                     Collections.singleton(repository),
                     null,
@@ -345,8 +341,6 @@
                         module.getModuleName(), //hardcode standalone here.
                         transactionManagerName,
                         connectionTrackerName,
-                        null,
-                        null,
                         null
                 );
 

Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java?rev=684945&r1=684944&r2=684945&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java
(original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java
Mon Aug 11 14:33:13 2008
@@ -17,17 +17,16 @@
 package org.apache.geronimo.connector.deployment;
 
 import java.io.File;
+import java.util.Collection;
 import java.util.Collections;
-import java.util.Map;
 import java.util.HashMap;
-import java.util.Collection;
+import java.util.Map;
 
 import junit.framework.TestCase;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.connector.AdminObjectWrapperGBean;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.j2ee.deployment.ConnectorModule;
 import org.apache.geronimo.j2ee.deployment.EARContext;
 import org.apache.geronimo.j2ee.deployment.Module;
@@ -36,22 +35,11 @@
 import org.apache.geronimo.kernel.Jsr77Naming;
 import org.apache.geronimo.kernel.Naming;
 import org.apache.geronimo.kernel.config.Configuration;
-import org.apache.geronimo.kernel.config.ConfigurationData;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
-import org.apache.geronimo.kernel.config.ConfigurationResolver;
-import org.apache.geronimo.kernel.config.ConfigurationStore;
-import org.apache.geronimo.kernel.config.LifecycleException;
-import org.apache.geronimo.kernel.config.LifecycleMonitor;
-import org.apache.geronimo.kernel.config.LifecycleResults;
-import org.apache.geronimo.kernel.config.NoSuchConfigException;
-import org.apache.geronimo.kernel.config.NoSuchStoreException;
 import org.apache.geronimo.kernel.mock.MockConfigurationManager;
 import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.kernel.repository.ArtifactResolver;
 import org.apache.geronimo.kernel.repository.Environment;
-import org.apache.geronimo.kernel.repository.Version;
-import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.schema.SchemaConversionUtils;
 import org.apache.xmlbeans.XmlCursor;
 import org.apache.xmlbeans.XmlException;
@@ -86,8 +74,6 @@
             null,
             null,
             null,
-            null,
-            null,
             null);
         module.setEarContext(earContext);
         module.setRootEarContext(earContext);

Modified: geronimo/server/trunk/plugins/corba/geronimo-corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba/pom.xml?rev=684945&r1=684944&r2=684945&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba/pom.xml Mon Aug 11 14:33:13 2008
@@ -42,12 +42,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-timer</artifactId>
-            <version>${version}</version>
-        </dependency>
- 
-        <dependency>
             <groupId>org.apache.yoko</groupId>
             <artifactId>yoko-spec-corba</artifactId>
         </dependency>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=684945&r1=684944&r2=684945&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Mon Aug 11 14:33:13 2008
@@ -131,8 +131,6 @@
     private final AbstractNameQuery serverName;
     private final AbstractNameQuery transactionManagerObjectName;
     private final AbstractNameQuery connectionTrackerObjectName;
-    private final AbstractNameQuery transactionalTimerObjectName;
-    private final AbstractNameQuery nonTransactionalTimerObjectName;
     private final AbstractNameQuery corbaGBeanObjectName;
     private final Naming naming;
     private final Collection<? extends ArtifactResolver> artifactResolvers;
@@ -152,28 +150,24 @@
     };
 
     public EARConfigBuilder(Environment defaultEnvironment,
-            AbstractNameQuery transactionManagerAbstractName,
-            AbstractNameQuery connectionTrackerAbstractName,
-            AbstractNameQuery transactionalTimerAbstractName,
-            AbstractNameQuery nonTransactionalTimerAbstractName,
-            AbstractNameQuery corbaGBeanAbstractName,
-            AbstractNameQuery serverName,
-            Collection<? extends Repository> repositories,
-            Collection ejbConfigBuilder,
-            Collection webConfigBuilder,
-            Collection connectorConfigBuilder,
-            Collection resourceReferenceBuilder,
-            Collection appClientConfigBuilder,
-            Collection securityBuilders,
-            Collection serviceBuilders,
-            Collection<ModuleBuilderExtension> persistenceUnitBuilders,
-            Collection<? extends ArtifactResolver> artifactResolvers,
-            Kernel kernel) {
+                            AbstractNameQuery transactionManagerAbstractName,
+                            AbstractNameQuery connectionTrackerAbstractName,
+                            AbstractNameQuery corbaGBeanAbstractName,
+                            AbstractNameQuery serverName,
+                            Collection<? extends Repository> repositories,
+                            Collection ejbConfigBuilder,
+                            Collection webConfigBuilder,
+                            Collection connectorConfigBuilder,
+                            Collection resourceReferenceBuilder,
+                            Collection appClientConfigBuilder,
+                            Collection securityBuilders,
+                            Collection serviceBuilders,
+                            Collection<ModuleBuilderExtension> persistenceUnitBuilders,
+                            Collection<? extends ArtifactResolver> artifactResolvers,
+                            Kernel kernel) {
         this(defaultEnvironment,
                 transactionManagerAbstractName,
                 connectionTrackerAbstractName,
-                transactionalTimerAbstractName,
-                nonTransactionalTimerAbstractName,
                 corbaGBeanAbstractName,
                 serverName,
                 ConfigurationUtil.getConfigurationManager(kernel),
@@ -190,28 +184,24 @@
     }
 
     public EARConfigBuilder(Environment defaultEnvironment,
-            AbstractNameQuery transactionManagerAbstractName,
-            AbstractNameQuery connectionTrackerAbstractName,
-            AbstractNameQuery transactionalTimerAbstractName,
-            AbstractNameQuery nonTransactionalTimerAbstractName,
-            AbstractNameQuery corbaGBeanAbstractName,
-            AbstractNameQuery serverName,
-            Collection<? extends Repository> repositories,
-            ModuleBuilder ejbConfigBuilder,
-            ModuleBuilder webConfigBuilder,
-            ModuleBuilder connectorConfigBuilder,
-            ActivationSpecInfoLocator activationSpecInfoLocator,
-            ModuleBuilder appClientConfigBuilder,
-            NamespaceDrivenBuilder securityBuilder,
-            NamespaceDrivenBuilder serviceBuilder,
-            ModuleBuilderExtension persistenceUnitBuilder,
-            Naming naming,
-            Collection<? extends ArtifactResolver> artifactResolvers) {
+                            AbstractNameQuery transactionManagerAbstractName,
+                            AbstractNameQuery connectionTrackerAbstractName,
+                            AbstractNameQuery corbaGBeanAbstractName,
+                            AbstractNameQuery serverName,
+                            Collection<? extends Repository> repositories,
+                            ModuleBuilder ejbConfigBuilder,
+                            ModuleBuilder webConfigBuilder,
+                            ModuleBuilder connectorConfigBuilder,
+                            ActivationSpecInfoLocator activationSpecInfoLocator,
+                            ModuleBuilder appClientConfigBuilder,
+                            NamespaceDrivenBuilder securityBuilder,
+                            NamespaceDrivenBuilder serviceBuilder,
+                            ModuleBuilderExtension persistenceUnitBuilder,
+                            Naming naming,
+                            Collection<? extends ArtifactResolver> artifactResolvers)
{
         this(defaultEnvironment,
                 transactionManagerAbstractName,
                 connectionTrackerAbstractName,
-                transactionalTimerAbstractName,
-                nonTransactionalTimerAbstractName,
                 corbaGBeanAbstractName,
                 serverName,
                 null,
@@ -229,24 +219,22 @@
     }
 
     private EARConfigBuilder(Environment defaultEnvironment,
-             AbstractNameQuery transactionManagerAbstractName,
-             AbstractNameQuery connectionTrackerAbstractName,
-             AbstractNameQuery transactionalTimerAbstractName,
-             AbstractNameQuery nonTransactionalTimerAbstractName,
-             AbstractNameQuery corbaGBeanAbstractName,
-             AbstractNameQuery serverName,
-             ConfigurationManager configurationManager,
-             Collection<? extends Repository> repositories,
-             SingleElementCollection ejbConfigBuilder,
-             SingleElementCollection webConfigBuilder,
-             SingleElementCollection connectorConfigBuilder,
-             SingleElementCollection resourceReferenceBuilder,
-             SingleElementCollection appClientConfigBuilder,
-             Collection securityBuilders,
-             Collection serviceBuilders,
-             Collection<ModuleBuilderExtension> persistenceUnitBuilders,
-             Naming naming,
-             Collection<? extends ArtifactResolver> artifactResolvers) {
+                             AbstractNameQuery transactionManagerAbstractName,
+                             AbstractNameQuery connectionTrackerAbstractName,
+                             AbstractNameQuery corbaGBeanAbstractName,
+                             AbstractNameQuery serverName,
+                             ConfigurationManager configurationManager,
+                             Collection<? extends Repository> repositories,
+                             SingleElementCollection ejbConfigBuilder,
+                             SingleElementCollection webConfigBuilder,
+                             SingleElementCollection connectorConfigBuilder,
+                             SingleElementCollection resourceReferenceBuilder,
+                             SingleElementCollection appClientConfigBuilder,
+                             Collection securityBuilders,
+                             Collection serviceBuilders,
+                             Collection<ModuleBuilderExtension> persistenceUnitBuilders,
+                             Naming naming,
+                             Collection<? extends ArtifactResolver> artifactResolvers)
{
         this.configurationManager = configurationManager;
         this.repositories = repositories;
         this.defaultEnvironment = defaultEnvironment;
@@ -262,8 +250,6 @@
         
         this.transactionManagerObjectName = transactionManagerAbstractName;
         this.connectionTrackerObjectName = connectionTrackerAbstractName;
-        this.transactionalTimerObjectName = transactionalTimerAbstractName;
-        this.nonTransactionalTimerObjectName = nonTransactionalTimerAbstractName;
         this.corbaGBeanObjectName = corbaGBeanAbstractName;
         this.serverName = serverName;
         this.naming = naming;
@@ -552,8 +538,6 @@
                     applicationInfo.getModuleName(),
                     transactionManagerObjectName,
                     connectionTrackerObjectName,
-                    transactionalTimerObjectName,
-                    nonTransactionalTimerObjectName,
                     corbaGBeanObjectName
             );
             applicationInfo.setEarContext(earContext);
@@ -1136,8 +1120,6 @@
         infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);
         infoBuilder.addAttribute("transactionManagerAbstractName", AbstractNameQuery.class,
true);
         infoBuilder.addAttribute("connectionTrackerAbstractName", AbstractNameQuery.class,
true);
-        infoBuilder.addAttribute("transactionalTimerAbstractName", AbstractNameQuery.class,
true);
-        infoBuilder.addAttribute("nonTransactionalTimerAbstractName", AbstractNameQuery.class,
true);
         infoBuilder.addAttribute("corbaGBeanAbstractName", AbstractNameQuery.class, true);
         infoBuilder.addAttribute("serverName", AbstractNameQuery.class, true);
 
@@ -1158,8 +1140,6 @@
                 "defaultEnvironment",
                 "transactionManagerAbstractName",
                 "connectionTrackerAbstractName",
-                "transactionalTimerAbstractName",
-                "nonTransactionalTimerAbstractName",
                 "corbaGBeanAbstractName",
                 "serverName",
                 "Repositories",

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java?rev=684945&r1=684944&r2=684945&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java
Mon Aug 11 14:33:13 2008
@@ -38,8 +38,6 @@
     private final AbstractNameQuery serverName;
     private final AbstractNameQuery transactionManagerObjectName;
     private final AbstractNameQuery connectionTrackerObjectName;
-    private final AbstractNameQuery transactedTimerName;
-    private final AbstractNameQuery nonTransactedTimerName;
     private final AbstractNameQuery corbaGBeanObjectName;
 
     private final Map contextIDToPermissionsMap = new HashMap();
@@ -51,53 +49,45 @@
     private final Map<Object,Object> generalData = new HashMap<Object,Object>();
 
     public EARContext(File baseDir,
-            File inPlaceConfigurationDir,
-            Environment environment,
-            ConfigurationModuleType moduleType,
-            Naming naming,
-            ConfigurationManager configurationManager, 
-            Collection repositories,
-            AbstractNameQuery serverName,
-            AbstractName baseName,
-            AbstractNameQuery transactionManagerObjectName,
-            AbstractNameQuery connectionTrackerObjectName,
-            AbstractNameQuery transactedTimerName,
-            AbstractNameQuery nonTransactedTimerName,
-            AbstractNameQuery corbaGBeanObjectName
+                      File inPlaceConfigurationDir,
+                      Environment environment,
+                      ConfigurationModuleType moduleType,
+                      Naming naming,
+                      ConfigurationManager configurationManager,
+                      Collection repositories,
+                      AbstractNameQuery serverName,
+                      AbstractName baseName,
+                      AbstractNameQuery transactionManagerObjectName,
+                      AbstractNameQuery connectionTrackerObjectName,
+                      AbstractNameQuery corbaGBeanObjectName
     ) throws DeploymentException {
         super(baseDir, inPlaceConfigurationDir, environment, baseName, moduleType, naming,
configurationManager, repositories);
 
         this.serverName = serverName;
         this.transactionManagerObjectName = transactionManagerObjectName;
         this.connectionTrackerObjectName = connectionTrackerObjectName;
-        this.transactedTimerName = transactedTimerName;
-        this.nonTransactedTimerName = nonTransactedTimerName;
         this.corbaGBeanObjectName = corbaGBeanObjectName;
         this.messageDestinations = new HashMap();
     }
 
     public EARContext(File baseDir,
-            File inPlaceConfigurationDir,
-            Environment environment,
-            ConfigurationModuleType moduleType,
-            Naming naming,
-            ConfigurationManager configurationManager,
-            AbstractNameQuery serverName,
-            AbstractName baseName,
-            AbstractNameQuery transactionManagerObjectName,
-            AbstractNameQuery connectionTrackerObjectName,
-            AbstractNameQuery transactedTimerName,
-            AbstractNameQuery nonTransactedTimerName,
-            AbstractNameQuery corbaGBeanObjectName,
-            Map messageDestinations) throws DeploymentException {
+                      File inPlaceConfigurationDir,
+                      Environment environment,
+                      ConfigurationModuleType moduleType,
+                      Naming naming,
+                      ConfigurationManager configurationManager,
+                      AbstractNameQuery serverName,
+                      AbstractName baseName,
+                      AbstractNameQuery transactionManagerObjectName,
+                      AbstractNameQuery connectionTrackerObjectName,
+                      AbstractNameQuery corbaGBeanObjectName,
+                      Map messageDestinations) throws DeploymentException {
         super(baseDir, inPlaceConfigurationDir, environment, baseName, moduleType, naming,
configurationManager);
 
         this.serverName = serverName;
 
         this.transactionManagerObjectName = transactionManagerObjectName;
         this.connectionTrackerObjectName = connectionTrackerObjectName;
-        this.transactedTimerName = transactedTimerName;
-        this.nonTransactedTimerName = nonTransactedTimerName;
         this.corbaGBeanObjectName = corbaGBeanObjectName;
         this.messageDestinations = messageDestinations;
     }
@@ -108,8 +98,6 @@
 
         this.transactionManagerObjectName = parent.getTransactionManagerName();
         this.connectionTrackerObjectName = parent.getConnectionTrackerName();
-        this.transactedTimerName = parent.getTransactedTimerName();
-        this.nonTransactedTimerName = parent.getNonTransactedTimerName();
         this.corbaGBeanObjectName = parent.getCORBAGBeanName();
         this.messageDestinations  = new HashMap();
     }
@@ -126,14 +114,6 @@
         return connectionTrackerObjectName;
     }
 
-    public AbstractNameQuery getTransactedTimerName() {
-        return transactedTimerName;
-    }
-
-    public AbstractNameQuery getNonTransactedTimerName() {
-        return nonTransactedTimerName;
-    }
-
     public AbstractNameQuery getCORBAGBeanName() {
         return corbaGBeanObjectName;
     }

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java?rev=684945&r1=684944&r2=684945&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java
Mon Aug 11 14:33:13 2008
@@ -113,10 +113,6 @@
     
     protected final AbstractNameQuery connectionTrackerAbstractNameQuery = new AbstractNameQuery(connectionTrackerObjectName,
null);
     
-    protected final AbstractNameQuery transactionalTimerAbstractNameQuery = new AbstractNameQuery(transactionalTimerObjectName,
null);
-    
-    protected final AbstractNameQuery nonTransactionalTimerAbstractNameQuery = new AbstractNameQuery(nonTransactionalTimerObjectName,
null);
-    
     protected final AbstractNameQuery corbaGBeanAbstractNameQuery = new AbstractNameQuery(serverName,
null);
 
     private ListableRepository repository;
@@ -139,8 +135,6 @@
             EARConfigBuilder configBuilder = new EARConfigBuilder(defaultParentId,
                     transactionManagerAbstractNameQuery,
                     connectionTrackerAbstractNameQuery,
-                    transactionalTimerAbstractNameQuery,
-                    nonTransactionalTimerAbstractNameQuery,
                     corbaGBeanAbstractNameQuery,
                     null,
                     Collections.singleton(repository),
@@ -171,8 +165,6 @@
         EARConfigBuilder configBuilder = new EARConfigBuilder(defaultParentId,
                 transactionManagerAbstractNameQuery,
                 connectionTrackerAbstractNameQuery,
-                transactionalTimerAbstractNameQuery,
-                nonTransactionalTimerAbstractNameQuery,
                 corbaGBeanAbstractNameQuery,
                 null,
                 null,
@@ -209,8 +201,6 @@
         EARConfigBuilder configBuilder = new EARConfigBuilder(defaultParentId,
                 transactionManagerAbstractNameQuery,
                 connectionTrackerAbstractNameQuery,
-                transactionalTimerAbstractNameQuery,
-                nonTransactionalTimerAbstractNameQuery,
                 corbaGBeanAbstractNameQuery,
                 null,
                 null,
@@ -247,8 +237,6 @@
         EARConfigBuilder configBuilder = new EARConfigBuilder(defaultParentId,
                 transactionManagerAbstractNameQuery,
                 connectionTrackerAbstractNameQuery,
-                transactionalTimerAbstractNameQuery,
-                nonTransactionalTimerAbstractNameQuery,
                 corbaGBeanAbstractNameQuery,
                 null,
                 null,
@@ -285,8 +273,6 @@
         EARConfigBuilder configBuilder = new EARConfigBuilder(defaultParentId,
                 transactionManagerAbstractNameQuery,
                 connectionTrackerAbstractNameQuery,
-                transactionalTimerAbstractNameQuery,
-                nonTransactionalTimerAbstractNameQuery,
                 corbaGBeanAbstractNameQuery,
                 null,
                 null,
@@ -323,8 +309,6 @@
         EARConfigBuilder configBuilder = new EARConfigBuilder(defaultParentId,
                 transactionManagerAbstractNameQuery,
                 connectionTrackerAbstractNameQuery,
-                transactionalTimerAbstractNameQuery,
-                nonTransactionalTimerAbstractNameQuery,
                 corbaGBeanAbstractNameQuery,
                 null,
                 null,
@@ -362,8 +346,6 @@
         EARConfigBuilder configBuilder = new EARConfigBuilder(defaultParentId,
                 transactionManagerAbstractNameQuery,
                 connectionTrackerAbstractNameQuery,
-                transactionalTimerAbstractNameQuery,
-                nonTransactionalTimerAbstractNameQuery,
                 corbaGBeanAbstractNameQuery,
                 null,
                 null,
@@ -400,8 +382,6 @@
         EARConfigBuilder configBuilder = new EARConfigBuilder(defaultParentId,
                 transactionManagerAbstractNameQuery,
                 connectionTrackerAbstractNameQuery,
-                transactionalTimerAbstractNameQuery,
-                nonTransactionalTimerAbstractNameQuery,
                 corbaGBeanAbstractNameQuery,
                 null,
                 null,

Modified: geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml?rev=684945&r1=684944&r2=684945&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml Mon Aug 11 14:33:13
2008
@@ -23,8 +23,6 @@
     <gbean name="EARBuilder" class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
         <attribute name="transactionManagerAbstractName">?name=TransactionManager</attribute>
         <attribute name="connectionTrackerAbstractName">?name=ConnectionTracker</attribute>
-        <attribute name="transactionalTimerAbstractName">?name=TransactionalThreadPooledTimer</attribute>
-        <attribute name="nonTransactionalTimerAbstractName">?name=NonTransactionalThreadPooledTimer</attribute>
         <attribute name="corbaGBeanAbstractName">?name=Server</attribute>
         <attribute name="serverName">?j2eeType=J2EEServer#org.apache.geronimo.management.geronimo.J2EEServer</attribute>
         <reference name="Repositories">
@@ -92,6 +90,11 @@
         </references>
     </gbean>
 
+    <!--<gbean name="SecurityBuilder" class="org.apache.geronimo.security.deployment.rbac.RbacSecurityBuilder">-->
+        <!--<attribute name="credentialStoreName">?name=CredentialStore#</attribute>-->
+        <!--<attribute name="defaultSystemRbacName">?name=SystemRbac#</attribute>-->
+    <!--</gbean>-->
+
     <gbean name="SecurityBuilder" class="org.apache.geronimo.security.deployment.GeronimoSecurityBuilderImpl">
         <attribute name="credentialStoreName">?name=CredentialStore#</attribute>
     </gbean>

Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilderTest.java?rev=684945&r1=684944&r2=684945&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilderTest.java
(original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilderTest.java
Mon Aug 11 14:33:13 2008
@@ -176,7 +176,6 @@
     private EARContext createEARContext(File outputPath, Environment environment, Repository
repository, ConfigurationStore configStore, AbstractName moduleName) throws DeploymentException
{
         Set repositories = repository == null ? Collections.EMPTY_SET : Collections.singleton(repository);
         ArtifactManager artifactManager = new DefaultArtifactManager();
-        ArtifactResolver artifactResolver = new DefaultArtifactResolver(artifactManager,
repositories, null);
         return new EARContext(outputPath,
                 null,
                 environment,
@@ -188,8 +187,6 @@
                 moduleName,
                 new AbstractNameQuery(tmName),
                 new AbstractNameQuery(ctcName),
-                null,
-                null,
                 null
         );
     }

Modified: geronimo/server/trunk/plugins/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/pom.xml?rev=684945&r1=684944&r2=684945&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/pom.xml Mon Aug 11 14:33:13 2008
@@ -38,7 +38,6 @@
 
     <modules>
         <module>geronimo-derby</module>
-        <module>geronimo-timer</module>
         <module>system-database</module>
         <module>sysdb-portlets</module>
         <module>sysdb-console-jetty</module>

Modified: geronimo/server/trunk/plugins/system-database/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database/pom.xml?rev=684945&r1=684944&r2=684945&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/system-database/pom.xml Mon Aug 11 14:33:13
2008
@@ -83,12 +83,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-timer</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.tranql</groupId>
             <artifactId>tranql-connector-derby-embed-xa</artifactId>
             <type>rar</type>

Modified: geronimo/server/trunk/plugins/system-database/system-database/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database/src/main/plan/plan.xml?rev=684945&r1=684944&r2=684945&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/system-database/system-database/src/main/plan/plan.xml Mon
Aug 11 14:33:13 2008
@@ -83,19 +83,4 @@
         <attribute name="driverClassName">org.apache.derby.jdbc.ClientDriver</attribute>
     </gbean>
 
-    <gbean name="TransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
-        <attribute name="repeatCount">5</attribute>
-        <reference name="TransactionManager"><name>TransactionManager</name></reference>
-        <reference name="ManagedConnectionFactoryWrapper"><name>SystemDatasource</name></reference>
-        <reference name="ThreadPool"><name>DefaultThreadPool</name></reference>
-        <dependency><name>DerbySystem</name></dependency>
-    </gbean>
-
-    <gbean name="NonTransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
-        <reference name="TransactionManager"><name>TransactionManager</name></reference>
-        <reference name="ManagedConnectionFactoryWrapper"><name>SystemDatasource</name></reference>
-        <reference name="ThreadPool"><name>DefaultThreadPool</name></reference>
-        <dependency><name>DerbySystem</name></dependency>
-    </gbean>
-
 </connector>

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/test/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/test/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java?rev=684945&r1=684944&r2=684945&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/test/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/test/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
Mon Aug 11 14:33:13 2008
@@ -18,9 +18,7 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.net.MalformedURLException;
 import java.net.URI;
-import java.net.URL;
 import java.security.PermissionCollection;
 import java.security.Permissions;
 import java.util.Collection;
@@ -39,8 +37,6 @@
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.deployment.EARContext;
 import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.j2ee.deployment.NamingBuilderCollection;
@@ -51,7 +47,6 @@
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelFactory;
 import org.apache.geronimo.kernel.Naming;
-import org.apache.geronimo.kernel.mock.MockConfigStore;
 import org.apache.geronimo.kernel.config.Configuration;
 import org.apache.geronimo.kernel.config.ConfigurationData;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
@@ -59,10 +54,8 @@
 import org.apache.geronimo.kernel.config.ConfigurationStore;
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
 import org.apache.geronimo.kernel.config.EditableKernelConfigurationManager;
-import org.apache.geronimo.kernel.config.InvalidConfigException;
-import org.apache.geronimo.kernel.config.NoSuchConfigException;
-import org.apache.geronimo.kernel.config.NullConfigurationStore;
 import org.apache.geronimo.kernel.management.State;
+import org.apache.geronimo.kernel.mock.MockConfigStore;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.ArtifactManager;
 import org.apache.geronimo.kernel.repository.ArtifactResolver;
@@ -76,8 +69,8 @@
 import org.apache.geronimo.security.deployment.GeronimoSecurityBuilderImpl;
 import org.apache.geronimo.security.jacc.ApplicationPolicyConfigurationManager;
 import org.apache.geronimo.security.jacc.ComponentPermissions;
-import org.apache.geronimo.security.jacc.mappingprovider.GeronimoPolicyConfigurationFactory;
 import org.apache.geronimo.security.jacc.mappingprovider.GeronimoPolicy;
+import org.apache.geronimo.security.jacc.mappingprovider.GeronimoPolicyConfigurationFactory;
 import org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal;
 import org.apache.geronimo.system.serverinfo.BasicServerInfo;
 import org.apache.geronimo.testsupport.TestSupport;
@@ -200,8 +193,6 @@
                 moduleName,
                 new AbstractNameQuery(tmName),
                 new AbstractNameQuery(ctcName),
-                null,
-                null,
                 null
         );
     }
@@ -346,6 +337,8 @@
             new MockResourceEnvironmentSetter(),
             null);
         builder.doStart();
+        GeronimoSecurityBuilderImpl securityBuilder = new GeronimoSecurityBuilderImpl(null);
+        securityBuilder.doStart();
     }
 
     protected void tearDown() throws Exception {



Mime
View raw message