geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: rev 54221 - in geronimo/trunk/modules/assembly: . src/plan
Date Sun, 10 Oct 2004 06:55:38 GMT
Author: chirino
Date: Sat Oct  9 23:55:38 2004
New Revision: 54221

Added:
   geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml
Modified:
   geronimo/trunk/modules/assembly/maven.xml
   geronimo/trunk/modules/assembly/project.xml
   geronimo/trunk/modules/assembly/src/plan/system-jms-plan.xml
Log:
Split the SystemJMS configuraion so that there is now a plan that starts the JMS broker and
a plan the deploys a resource adapter that connects to the broker.  

Also changed to using tcp to talk to the broker since the vm transport was causing problems.

Modified: geronimo/trunk/modules/assembly/maven.xml
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml	(original)
+++ geronimo/trunk/modules/assembly/maven.xml	Sat Oct  9 23:55:38 2004
@@ -251,6 +251,15 @@
             <ant:arg value="${maven.repo.local}/tranql/rars/tranql-connector-${tranql_connector_version}.rar"/>
         </ant:java>
 
+        <!-- building system activemq configuration-->
+        <ant:echo>Building system activemq 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="target/plan/system-activemq-plan.xml"/>
+        </ant:java>
+
         <!-- building system jms configuration-->
         <ant:echo>Building system jms configuration</ant:echo>
         <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">

Modified: geronimo/trunk/modules/assembly/project.xml
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml	(original)
+++ geronimo/trunk/modules/assembly/project.xml	Sat Oct  9 23:55:38 2004
@@ -328,6 +328,7 @@
             </properties>
         </dependency>
 
+        <!-- dependencies due to activemq -->
         <dependency>
             <groupId>activemq</groupId>
             <artifactId>activemq</artifactId>
@@ -342,6 +343,30 @@
             <artifactId>activemq-ra</artifactId>
             <version>&activemq-version;</version>
             <type>rar</type>
+            <properties>
+                <repository>true</repository>
+            </properties>
+        </dependency>
+
+        <dependency>
+          <id>emberio</id>
+          <version>0.3-alpha</version>
+          <properties>
+                <repository>true</repository>
+          </properties>
+        </dependency>       
+    
+        <dependency>
+          <id>jgroups</id>
+          <version>2.2.5</version>
+          <properties>
+                <repository>true</repository>
+          </properties>
+        </dependency>
+    
+        <dependency>
+            <id>jdbm</id>
+            <version>0.20-dev</version>
             <properties>
                 <repository>true</repository>
             </properties>

Added: geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml	Sat Oct  9 23:55:38
2004
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2004 The Apache Software Foundation
+
+    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.
+-->
+
+<!-- $Rev: 47568 $ $Date: 2004-09-30 01:21:54 -0700 (Thu, 30 Sep 2004) $ -->
+
+<configuration
+    xmlns="http://geronimo.apache.org/xml/ns/deployment"
+    configId="org/apache/geronimo/ActiveMQServer"
+    parentId="org/apache/geronimo/Server">    
+
+    <dependency>
+        <uri>activemq/jars/activemq-${activemq_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>emberio/jars/emberio-0.3-alpha.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>jgroups/jars/jgroups-2.2.5.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>jdbm/jars/jdbm-0.20-dev.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>concurrent/jars/concurrent-${concurrent_version}.jar</uri>
+    </dependency>    
+
+    <!-- message broker -->
+    <gbean name="geronimo.server:type=JMSServer,container=ActiveMQ" class="org.codehaus.activemq.gbean.ActiveMQContainerGBean">
+        <reference name="serverInfo">geronimo.system:role=ServerInfo</reference>
+        <attribute name="brokerName" type="java.lang.String">possibly-unique-broker</attribute>
+        <attribute name="dataDirectory" type="java.lang.String">var/activemq</attribute>
   
+    </gbean>
+    <gbean name='geronimo.server:type=JMSConnector,container=ActiveMQ,url="tcp://localhost:61616"'
class="org.codehaus.activemq.gbean.ActiveMQConnectorGBean">
+        <attribute name="Url" type="java.lang.String">tcp://localhost:61616</attribute>
+        <reference name="ActiveMQContainer">geronimo.server:type=JMSServer,container=ActiveMQ</reference>
+    </gbean>
+    <gbean name='geronimo.server:type=JMSConnector,container=ActiveMQ,url="vm://localhost"'
class="org.codehaus.activemq.gbean.ActiveMQConnectorGBean">
+        <attribute name="Url" type="java.lang.String">vm://localhost</attribute>
+        <reference name="ActiveMQContainer">geronimo.server:type=JMSServer,container=ActiveMQ</reference>
+    </gbean>
+  
+</configuration>

Modified: geronimo/trunk/modules/assembly/src/plan/system-jms-plan.xml
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-jms-plan.xml	(original)
+++ geronimo/trunk/modules/assembly/src/plan/system-jms-plan.xml	Sat Oct  9 23:55:38 2004
@@ -21,11 +21,11 @@
 <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
     version="1.5"
     configId="org/apache/geronimo/SystemJMS"
-    parentId="org/apache/geronimo/Server">
+    parentId="org/apache/geronimo/ActiveMQServer">
   <resourceadapter>
     <resourceadapter-instance>
       <resourceadapter-name>ActiveMQ RA</resourceadapter-name>
-      <config-property-setting name="ServerUrl">vm://localhost</config-property-setting>
+      <config-property-setting name="ServerUrl">tcp://localhost:61616</config-property-setting>
       <config-property-setting name="UserName">geronimo</config-property-setting>
       <config-property-setting name="Password">geronimo</config-property-setting>
       <workmanager-name>DefaultWorkManager</workmanager-name>
@@ -70,18 +70,4 @@
     </adminobject>
   </resourceadapter>
 
-  <!-- message broker -->
-  <gbean name="geronimo.server:type=JMSServer,container=ActiveMQ" class="org.codehaus.activemq.gbean.ActiveMQContainerGBean">
-    <reference name="serverInfo">geronimo.system:role=ServerInfo</reference>
-    <attribute name="brokerName" type="java.lang.String">possibly-unique-broker</attribute>
-    <attribute name="dataDirectory" type="java.lang.String">var/activemq</attribute>
   
-  </gbean>
-  <gbean name='geronimo.server:type=JMSConnector,container=ActiveMQ,url="tcp://localhost:61616"'
class="org.codehaus.activemq.gbean.ActiveMQConnectorGBean">
-    <attribute name="Url" type="java.lang.String">tcp://localhost:61616</attribute>
-    <reference name="ActiveMQContainer">geronimo.server:type=JMSServer,container=ActiveMQ</reference>
-  </gbean>
-  <gbean name='geronimo.server:type=JMSConnector,container=ActiveMQ,url="vm://localhost"'
class="org.codehaus.activemq.gbean.ActiveMQConnectorGBean">
-    <attribute name="Url" type="java.lang.String">vm://localhost</attribute>
-    <reference name="ActiveMQContainer">geronimo.server:type=JMSServer,container=ActiveMQ</reference>
-  </gbean>
 </connector>

Mime
View raw message