Return-Path: 
 <scm-return-4360-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 77777 invoked from network); 6 Jul 2004 17:37:38 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 6 Jul 2004 17:37:38 -0000
Received: (qmail 28067 invoked by uid 500); 6 Jul 2004 17:21:00 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 28026 invoked by uid 500); 6 Jul 2004 17:20:59 -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 27970 invoked by uid 500); 6 Jul 2004 17:20:58 -0000
Delivered-To: apmail-incubator-geronimo-cvs@apache.org
Received: (qmail 27938 invoked by uid 99); 6 Jul 2004 17:20:58 -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; Tue, 06 Jul 2004 10:20:57 -0700
Received: (qmail 70542 invoked by uid 1712); 6 Jul 2004 17:20:47 -0000
Date: 6 Jul 2004 17:20:47 -0000
Message-ID: <20040706172047.70541.qmail@minotaur.apache.org>
From: djencks@apache.org
To: incubator-geronimo-cvs@apache.org
Subject: cvs commit: incubator-geronimo/modules/assembly/src/plan
 j2ee-server-plan.xml
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

djencks     2004/07/06 10:20:47

  Modified:    modules/assembly maven.xml project.xml
               modules/assembly/src/plan j2ee-server-plan.xml
  Log:
  Deploy all of activemq from the rar file
  
  Revision  Changes    Path
  1.16      +6 -5      incubator-geronimo/modules/assembly/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/assembly/maven.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- maven.xml	30 May 2004 19:07:52 -0000	1.15
  +++ maven.xml	6 Jul 2004 17:20:47 -0000	1.16
  @@ -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$ -->
   
   <project default="default"
  @@ -112,7 +112,7 @@
                   </j:forEach>
               </ant:fileset>
           </ant:copy>
  -        
  +
   <!--        <ant:mkdirs dir="${distDir}/repository/jdk/jars"/>-->
   <!--        <ant:copy file="${java.home}/../lib/tools.jar" todir="${distDir}/repository/jdk/jars">-->
   <!---->
  @@ -206,6 +206,7 @@
               <ant:arg value="--module"/>
               <ant:arg value="${maven.repo.local}/geronimo/wars/geronimo-jmxdebug-${pom.currentVersion}.war"/>
           </ant:java>
  +
       </goal>
   
   </project>
  
  
  
  1.29      +11 -19    incubator-geronimo/modules/assembly/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/assembly/project.xml,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- project.xml	25 Jun 2004 21:29:34 -0000	1.28
  +++ project.xml	6 Jul 2004 17:20:47 -0000	1.29
  @@ -206,7 +206,7 @@
           </dependency>
   
           <dependency>
  -             <groupId>howl</groupId>
  +            <groupId>howl</groupId>
               <artifactId>howl-logger</artifactId>
               <version>0.1.3</version>
               <url>http://forge.objectweb.org/projects/howl</url>
  @@ -474,22 +474,14 @@
               </properties>
           </dependency>
   
  -      <dependency>
  -          <groupId>tranql</groupId>
  -          <artifactId>tranql</artifactId>
  -          <version>1.0-SNAPSHOT</version>
  -          <properties>
  -              <repository>true</repository>
  -          </properties>
  -      </dependency>
  -
  -      <dependency>
  -          <groupId>activemq</groupId>
  -          <artifactId>activemq</artifactId>
  -          <version>1.0-SNAPSHOT</version>
  -          <properties>
  -              <repository>true</repository>
  -          </properties>
  -      </dependency>
  +        <dependency>
  +            <groupId>tranql</groupId>
  +            <artifactId>tranql</artifactId>
  +            <version>1.0-SNAPSHOT</version>
  +            <properties>
  +                <repository>true</repository>
  +            </properties>
  +        </dependency>
  +
       </dependencies>
   </project>
  
  
  
  1.33      +1 -17     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.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- j2ee-server-plan.xml	25 Jun 2004 21:29:34 -0000	1.32
  +++ j2ee-server-plan.xml	6 Jul 2004 17:20:47 -0000	1.33
  @@ -66,9 +66,6 @@
           <uri>geronimo/jars/geronimo-jmxremoting-1.0-SNAPSHOT.jar</uri>
       </dependency>
       <dependency>
  -        <uri>activemq/jars/activemq-1.0-SNAPSHOT.jar</uri>
  -    </dependency>
  -    <dependency>
           <uri>howl/jars/howl-logger-0.1.3.jar</uri>
       </dependency>
   
  @@ -126,17 +123,14 @@
       </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.server:type=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="WorkManager">geronimo.server:type=WorkManager</reference>
           <reference name="XATerminator">geronimo.server:type=TransactionManager</reference>
       </gbean>
   
  @@ -175,16 +169,6 @@
           <!--        <attribute name="MaxConnections" type="int">10</attribute>-->
           <!--        <attribute name="MaxIdleTime" type="int">10</attribute>-->
       </gbean>
  -
  -    <!-- JMS Message Broker -->
  -    <gbean name="geronimo.server:type=JMSServer,container=ActiveMQ" class="org.codehaus.activemq.container.ActiveMQContainer">
  -    </gbean>
  -
  -    <gbean name="geronimo.server:type=JMSConnector,container=ActiveMQ,port=61616" class="org.codehaus.activemq.container.ActiveMQConnector">
  -        <attribute name="Url" type="java.lang.String">tcp://localhost:61616</attribute>
  -        <reference name="ActiveMQContainer">geronimo.server:type=JMSServer,container=ActiveMQ</reference>
  -    </gbean>
  -
   
       <!-- EJB container -->
       <!-- pattern domain name must match the domain of the j2eeServer attribute of the EAR builder in the deployer plan -->