Return-Path: 
 <scm-return-4539-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 75043 invoked from network); 18 Jul 2004 22:19:01 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 18 Jul 2004 22:19:01 -0000
Received: (qmail 45362 invoked by uid 500); 18 Jul 2004 22:19:01 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 45330 invoked by uid 500); 18 Jul 2004 22:19:00 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
list-post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 45316 invoked by uid 500); 18 Jul 2004 22:19:00 -0000
Delivered-To: apmail-incubator-geronimo-cvs@apache.org
Received: (qmail 45312 invoked by uid 99); 18 Jul 2004 22:19:00 -0000
X-ASF-Spam-Status: No, hits=0.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.27.1) with SMTP; Sun, 18 Jul 2004 15:19:00 -0700
Received: (qmail 75022 invoked by uid 1712); 18 Jul 2004 22:18:59 -0000
Date: 18 Jul 2004 22:18:59 -0000
Message-ID: <20040718221859.75021.qmail@minotaur.apache.org>
From: djencks@apache.org
To: incubator-geronimo-cvs@apache.org
Subject: cvs commit: incubator-geronimo/modules/assembly/src/plan
 default-database-plan.xml j2ee-deployer-plan.xml j2ee-server-plan.xml
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

djencks     2004/07/18 15:18:59

  Modified:    modules/assembly maven.xml project.xml
               modules/assembly/src/plan j2ee-deployer-plan.xml
                        j2ee-server-plan.xml
  Added:       modules/assembly/src/plan default-database-plan.xml
  Log:
  use tranql connector.  Deploy timers for use by ejb timers
  
  Revision  Changes    Path
  1.18      +11 -1     incubator-geronimo/modules/assembly/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/assembly/maven.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- maven.xml	16 Jul 2004 06:45:48 -0000	1.17
  +++ maven.xml	18 Jul 2004 22:18:59 -0000	1.18
  @@ -179,6 +179,16 @@
               <ant:arg value="src/plan/j2ee-server-plan.xml"/>
           </ant:java>
   
  +        <ant:echo>Building default database configuration</ant:echo>
  +        <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
  +            <ant:jvmarg value="-ea"/>
  +            <ant:arg value="--install"/>
  +            <ant:arg value="--plan"/>
  +            <ant:arg value="src/plan/default-database-plan.xml"/>
  +            <ant:arg value="--module"/>
  +            <ant:arg value="${maven.repo.local}/tranql/rars/tranql-connector-SNAPSHOT.rar"/>
  +        </ant:java>
  +
           <!-- build the J2EEServer secure configuration -->
           <ant:echo>Building secure server configuration</ant:echo>
           <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
  
  
  
  1.33      +19 -12    incubator-geronimo/modules/assembly/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/assembly/project.xml,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- project.xml	16 Jul 2004 06:45:48 -0000	1.32
  +++ project.xml	18 Jul 2004 22:18:59 -0000	1.33
  @@ -200,6 +200,15 @@
   
           <dependency>
               <groupId>geronimo</groupId>
  +            <artifactId>geronimo-timer</artifactId>
  +            <version>${pom.currentVersion}</version>
  +            <properties>
  +                <repository>true</repository>
  +            </properties>
  +        </dependency>
  +
  +        <dependency>
  +            <groupId>geronimo</groupId>
               <artifactId>geronimo-transaction</artifactId>
               <version>${pom.currentVersion}</version>
               <properties>
  @@ -245,6 +254,13 @@
           </dependency>
   
           <dependency>
  +            <groupId>tranql</groupId>
  +            <artifactId>tranql-connector</artifactId>
  +            <version>SNAPSHOT</version>
  +            <type>rar</type>
  +        </dependency>
  +
  +        <dependency>
               <groupId>ant</groupId>
               <artifactId>ant</artifactId>
               <version>1.5</version>
  @@ -346,15 +362,6 @@
           </dependency>
   
           <dependency>
  -            <groupId>idb</groupId>
  -            <artifactId>idb</artifactId>
  -            <version>3.26</version>
  -            <properties>
  -                <repository>true</repository>
  -            </properties>
  -        </dependency>
  -
  -        <dependency>
               <groupId>jetty</groupId>
               <artifactId>org.mortbay.jetty</artifactId>
               <version>5.0.RC0</version>
  @@ -426,11 +433,11 @@
               </properties>
           </dependency>
   
  -        <dependency>
  +        <!--dependency>
               <groupId>openejb</groupId>
               <artifactId>openejb-jca</artifactId>
               <version>2.0-SNAPSHOT</version>
  -        </dependency>
  +        </dependency-->
   
           <dependency>
               <groupId>openejb</groupId>
  
  
  
  1.22      +6 -3      incubator-geronimo/modules/assembly/src/plan/j2ee-deployer-plan.xml
  
  Index: j2ee-deployer-plan.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/assembly/src/plan/j2ee-deployer-plan.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- j2ee-deployer-plan.xml	11 Jul 2004 21:48:45 -0000	1.21
  +++ j2ee-deployer-plan.xml	18 Jul 2004 22:18:59 -0000	1.22
  @@ -80,13 +80,15 @@
       </gbean>
   
       <gbean name="geronimo.deployer:role=Builder,type=EAR,config=org/apache/geronimo/J2EEDeployer" class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
  -        <reference name="Repository">*:role=Repository,*</reference>
           <attribute name="j2eeServer" type="javax.management.ObjectName">geronimo.server:j2eeType=J2EEServer,name=geronimo</attribute>
  +        <attribute name="transactionContextManagerObjectName" type="javax.management.ObjectName">geronimo.server:type=TransactionContextManager</attribute>
  +        <attribute name="connectionTrackerObjectName" type="javax.management.ObjectName">geronimo.server:type=ConnectionTracker</attribute>
  +        <attribute name="transactionalTimerObjectName" type="javax.management.ObjectName">geronimo.server:type=ThreadPooledTimer,name=JDBCTransactionalThreadPooledTimer</attribute>
  +        <attribute name="nonTransactionalTimerObjectName" type="javax.management.ObjectName">geronimo.server:type=ThreadPooledTimer,name=JDBCNonTransactionalThreadPooledTimer</attribute>
  +        <reference name="Repository">*:role=Repository,*</reference>
           <reference name="EJBConfigBuilder">geronimo.deployer:role=ModuleBuilder,type=EJB,config=org/apache/geronimo/J2EEDeployer</reference>
           <reference name="WebConfigBuilder">geronimo.deployer:role=ModuleBuilder,type=Web,config=org/apache/geronimo/J2EEDeployer</reference>
           <reference name="ConnectorConfigBuilder">geronimo.deployer:role=ModuleBuilder,type=Connector,config=org/apache/geronimo/J2EEDeployer</reference>
  -        <attribute name="transactionManagerObjectName" type="javax.management.ObjectName">geronimo.server:type=TransactionManager</attribute>
  -        <attribute name="connectionTrackerObjectName" type="javax.management.ObjectName">geronimo.server:type=ConnectionTracker</attribute>
       </gbean>
   
       <gbean name="geronimo.deployer:role=ModuleBuilder,type=Web,config=org/apache/geronimo/J2EEDeployer" class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder"/>
  @@ -94,4 +96,5 @@
       <gbean name="geronimo.deployer:role=ModuleBuilder,type=EJB,config=org/apache/geronimo/J2EEDeployer" class="org.openejb.deployment.OpenEJBModuleBuilder"/>
   
       <gbean name="geronimo.deployer:role=ModuleBuilder,type=Connector,config=org/apache/geronimo/J2EEDeployer" class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder"/>
  +
   </configuration>
  
  
  
  1.38      +12 -8     incubator-geronimo/modules/assembly/src/plan/j2ee-server-plan.xml
  
  Index: j2ee-server-plan.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/assembly/src/plan/j2ee-server-plan.xml,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- j2ee-server-plan.xml	15 Jul 2004 20:38:21 -0000	1.37
  +++ j2ee-server-plan.xml	18 Jul 2004 22:18:59 -0000	1.38
  @@ -45,6 +45,9 @@
           <uri>concurrent/jars/concurrent-1.3.4.jar</uri>
       </dependency>
       <dependency>
  +        <uri>geronimo/jars/geronimo-timer-1.0-SNAPSHOT.jar</uri>
  +    </dependency>
  +    <dependency>
           <uri>geronimo/jars/geronimo-transaction-1.0-SNAPSHOT.jar</uri>
       </dependency>
       <dependency>
  @@ -159,10 +162,9 @@
           </references>
       </gbean>
   
  -    <!--gbean name="geronimo.server:type=TransactionContextManager" 
  -class="org.apache.geronimo.transaction.context.TransactionContextManager">
  +    <gbean name="geronimo.server:type=TransactionContextManager" class="org.apache.geronimo.transaction.context.TransactionContextManager">
           <reference name="TransactionManager">geronimo.server:type=TransactionManager</reference>
  -    </gbean-->
  +    </gbean>
   
   
       <!-- default WAR container using Jetty -->
  @@ -222,13 +224,15 @@
       </gbean>
   
       <gbean name="geronimo.deployer:role=Builder,type=EAR,config=org/apache/geronimo/Server" class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
  -        <reference name="Repository">*:role=Repository,*</reference>
           <attribute name="j2eeServer" type="javax.management.ObjectName">geronimo.server:j2eeType=J2EEServer,name=geronimo</attribute>
  -        <reference name="EJBConfigBuilder">geronimo.deployer:role=ModuleBuilder,type=EJB,config=org/apache/geronimo/Server</reference>
  -        <reference name="WebConfigBuilder">geronimo.deployer:role=ModuleBuilder,type=Web,config=org/apache/geronimo/Server</reference>
  -        <reference name="ConnectorConfigBuilder">geronimo.deployer:role=ModuleBuilder,type=Connector,config=org/apache/geronimo/Server</reference>
  -        <attribute name="transactionManagerObjectName" type="javax.management.ObjectName">geronimo.server:type=TransactionManager</attribute>
  +        <attribute name="transactionContextManagerObjectName" type="javax.management.ObjectName">geronimo.server:type=TransactionContextManager</attribute>
           <attribute name="connectionTrackerObjectName" type="javax.management.ObjectName">geronimo.server:type=ConnectionTracker</attribute>
  +        <attribute name="transactionalTimerObjectName" type="javax.management.ObjectName">geronimo.server:type=ThreadPooledTimer,name=TransactionalThreadPooledTimer</attribute>
  +        <attribute name="nonTransactionalTimerObjectName" type="javax.management.ObjectName">geronimo.server:type=ThreadPooledTimer,name=NonTransactionalThreadPooledTimer</attribute>
  +        <reference name="Repository">*:role=Repository,*</reference>
  +        <reference name="EJBConfigBuilder">geronimo.deployer:role=ModuleBuilder,type=EJB,config=org/apache/geronimo/J2EEDeployer</reference>
  +        <reference name="WebConfigBuilder">geronimo.deployer:role=ModuleBuilder,type=Web,config=org/apache/geronimo/J2EEDeployer</reference>
  +        <reference name="ConnectorConfigBuilder">geronimo.deployer:role=ModuleBuilder,type=Connector,config=org/apache/geronimo/J2EEDeployer</reference>
       </gbean>
   
       <gbean name="geronimo.deployer:role=ModuleBuilder,type=Web,config=org/apache/geronimo/Server" class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder"/>
  
  
  
  1.1                  incubator-geronimo/modules/assembly/src/plan/default-database-plan.xml
  
  Index: default-database-plan.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  
  <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee"
      version="1.5"
      configId="org/tranql/connector/axion"
      parentId="org/apache/geronimo/Server">
      <resourceadapter>
          <outbound-resourceadapter>
              <connection-definition>
                  <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
                  <connectiondefinition-instance>
                      <name>DefaultDatasource</name>
                      <config-property-setting name="UserName"></config-property-setting>
                      <config-property-setting name="Password"></config-property-setting>
                      <config-property-setting name="Driver">org.axiondb.jdbc.AxionDriver</config-property-setting>
                      <config-property-setting name="ConnectionURL">jdbc:axiondb:DefaultDatabase</config-property-setting>
                      <config-property-setting name="CommitBeforeAutocommit">true</config-property-setting>
                      <connectionmanager>
                          <local-transaction/>
                          <single-pool>
                              <max-size>10</max-size>
                              <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
                              <match-one/>
                          </single-pool>
                      </connectionmanager>
                      <global-jndi-name>tranql/axion</global-jndi-name>
                      <!--credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface-->
                  </connectiondefinition-instance>
              </connection-definition>
          </outbound-resourceadapter>
      </resourceadapter>
  
      <!--gbean name="geronimo.security:service=RealmBridge,name=TargetRealm" class="org.apache.geronimo.security.bridge.ConfiguredIdentityUserPasswordRealmBridge">
          <attribute name="TargetRealm" type="java.lang.String">TargetRealm</attribute>
          <attribute name="ConfiguredUser" type="java.lang.String">testUser</attribute>
          <attribute name="ConfiguredPassword" type="java.lang.String">testPassword</attribute>
      </gbean-->
  
      <gbean name="geronimo.server:type=ThreadPooledTimer,name=JDBCTransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
          <attribute name="repeatCount" type="int">5</attribute>
          <reference name="TransactionContextManager">geronimo.server:type=TransactionContextManager</reference>
          <reference name="ManagedConnectionFactoryWrapper">geronimo.server:name=DefaultDatasource</reference>
          <reference name="ThreadPool">geronimo.server:type=ThreadPool,name=DefaultThreadPool</reference>
      </gbean>
  
      <gbean name="geronimo.server:type=ThreadPooledTimer,name=JDBCNonTransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
          <reference name="ManagedConnectionFactoryWrapper">geronimo.server:name=DefaultDatasource</reference>
          <reference name="ThreadPool">geronimo.server:type=ThreadPool,name=DefaultThreadPool</reference>
      </gbean>
  
  </connector>