geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject cvs commit: incubator-geronimo/modules/assembly/src/plan j2ee-server-plan.xml
Date Fri, 12 Mar 2004 17:59:37 GMT
djencks     2004/03/12 09:59:37

  Modified:    modules/assembly project.xml
               modules/assembly/src/plan j2ee-server-plan.xml
  Log:
  add connector related gbeans to server config
  
  Revision  Changes    Path
  1.7       +13 -4     incubator-geronimo/modules/assembly/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/assembly/project.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- project.xml	10 Mar 2004 09:58:19 -0000	1.6
  +++ project.xml	12 Mar 2004 17:59:37 -0000	1.7
  @@ -6,16 +6,16 @@
       Licensed under the Apache License, Version 2.0 (the "License");
       you may not use this file except in compliance with the License.
       You may obtain a copy of the License at
  -  
  +
          http://www.apache.org/licenses/LICENSE-2.0
  -  
  +
       Unless required by applicable law or agreed to in writing, software
       distributed under the License is distributed on an "AS IS" BASIS,
       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
       See the License for the specific language governing permissions and
       limitations under the License.
   -->
  -  
  +
   
   <!-- $Revision$ $Date$ -->
   
  @@ -222,6 +222,15 @@
                   <lib>true</lib>
                   <server>true</server>
                   <deploy>true</deploy>
  +            </properties>
  +        </dependency>
  +
  +        <dependency>
  +            <groupId>concurrent</groupId>
  +            <artifactId>concurrent</artifactId>
  +            <version>1.3.2</version>
  +            <properties>
  +                <repository>true</repository>
               </properties>
           </dependency>
   
  
  
  
  1.4       +24 -3     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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- j2ee-server-plan.xml	10 Mar 2004 09:58:19 -0000	1.3
  +++ j2ee-server-plan.xml	12 Mar 2004 17:59:37 -0000	1.4
  @@ -6,16 +6,16 @@
       Licensed under the Apache License, Version 2.0 (the "License");
       you may not use this file except in compliance with the License.
       You may obtain a copy of the License at
  -  
  +
          http://www.apache.org/licenses/LICENSE-2.0
  -  
  +
       Unless required by applicable law or agreed to in writing, software
       distributed under the License is distributed on an "AS IS" BASIS,
       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
       See the License for the specific language governing permissions and
       limitations under the License.
   -->
  -  
  +
   
   <!--
   Configuration for the main ring of a Geronimo server.
  @@ -42,6 +42,9 @@
           <uri>geronimo/jars/geronimo-connector-DEV.jar</uri>
       </dependency>
       <dependency>
  +        <uri>concurrent/jars/concurrent-1.3.2.jar</uri>
  +    </dependency>
  +    <dependency>
           <uri>geronimo/jars/geronimo-transaction-DEV.jar</uri>
       </dependency>
       <dependency>
  @@ -53,6 +56,24 @@
   
       <gbean name="geronimo.server:type=ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator">
       </gbean>
  +
  +    <gbean name="geronimo.server:type=WorkManager" class="org.apache.geronimo.connector.work.GeronimoWorkManager">
  +        <attribute name="SyncMinimumPoolSize" type="int">0</attribute>
  +        <attribute name="SyncMaximumPoolSize" type="int">10</attribute>
  +        <attribute name="StartMinimumPoolSize" type="int">0</attribute>
  +        <attribute name="StartMaximumPoolSize" type="int">10</attribute>
  +        <attribute name="ScheduledMinimumPoolSize" type="int">0</attribute>
  +        <attribute name="ScheduledMaximumPoolSize" type="int">10</attribute>
  +        <reference name="XAWork">geronimo.transaction:service=TransactionManager</reference>
  +    </gbean>
  +
  +    <gbean name="geronimo.server:type=BootstrapContext" class="org.apache.geronimo.connector.BootstrapContext">
  +        <reference name="WorkManager">geronimo.connector:service=WorkManager</reference>
  +        <reference name="XATerminator">geronimo.transaction:service=TransactionManager</reference>
  +    </gbean>
  +
  +    <gbean name="geronimo.server:type=TransactionManager" class="org.apache.geronimo.transaction.TransactionManagerProxy"/>
  +
   
       <!-- default WAR container using Jetty -->
       <gbean name="geronimo.server:type=WebContainer,container=Jetty" class="org.apache.geronimo.jetty.JettyContainerImpl">
  
  
  

Mime
View raw message