geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r125660 - /geronimo/trunk/etc/project.properties /geronimo/trunk/modules/assembly/project.xml /geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml /geronimo/trunk/modules/axis-builder/project.properties
Date Wed, 19 Jan 2005 20:57:31 GMT
Author: chirino
Date: Wed Jan 19 12:57:29 2005
New Revision: 125660

URL: http://svn.apache.org/viewcvs?view=rev&rev=125660
Log:
Reving up to ActiveMQ 2.0

Modified:
   geronimo/trunk/etc/project.properties
   geronimo/trunk/modules/assembly/project.xml
   geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml
   geronimo/trunk/modules/axis-builder/project.properties

Modified: geronimo/trunk/etc/project.properties
Url: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.properties?view=diff&rev=125660&p1=geronimo/trunk/etc/project.properties&r1=125659&p2=geronimo/trunk/etc/project.properties&r2=125660
==============================================================================
--- geronimo/trunk/etc/project.properties	(original)
+++ geronimo/trunk/etc/project.properties	Wed Jan 19 12:57:29 2005
@@ -69,7 +69,7 @@
 
 # actual dependencies
 activeio_version=1.0-SNAPSHOT
-activemq_version=1.3-SNAPSHOT
+activemq_version=2.0-SNAPSHOT
 geronimo_version=1.0-SNAPSHOT
 openejb_version=2.0-SNAPSHOT
 tranql_version=1.0-SNAPSHOT

Modified: geronimo/trunk/modules/assembly/project.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/project.xml?view=diff&rev=125660&p1=geronimo/trunk/modules/assembly/project.xml&r1=125659&p2=geronimo/trunk/modules/assembly/project.xml&r2=125660
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml	(original)
+++ geronimo/trunk/modules/assembly/project.xml	Wed Jan 19 12:57:29 2005
@@ -447,6 +447,14 @@
         </dependency>
         <dependency>
             <groupId>activemq</groupId>
+            <artifactId>activemq-store-jdbc</artifactId>
+            <version>${activemq_version}</version>
+            <properties>
+                <repository>true</repository>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>activemq</groupId>
             <artifactId>activemq-ra</artifactId>
             <version>${activemq_version}</version>
             <type>rar</type>

Modified: geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml?view=diff&rev=125660&p1=geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml&r1=125659&p2=geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml&r2=125660
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml	(original)
+++ geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml	Wed Jan 19 12:57:29
2005
@@ -21,7 +21,7 @@
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment"
     configId="org/apache/geronimo/ActiveMQServer"
-    parentId="org/apache/geronimo/Server">    
+    parentId="org/apache/geronimo/SystemDatabase">    
 
     <dependency>
         <uri>activemq/jars/activemq-core-${activemq_version}.jar</uri>
@@ -29,34 +29,39 @@
     <dependency>
         <uri>activemq/jars/activemq-gbean-${activemq_version}.jar</uri>
     </dependency>
+    <!--
     <dependency>
         <uri>activemq/jars/activemq-store-jdbm-${activemq_version}.jar</uri>
     </dependency>
     <dependency>
         <uri>jdbm/jars/jdbm-0.20-dev.jar</uri>
     </dependency>
-    <!--
-    <dependency>
-        <uri>emberio/jars/emberio-0.3-alpha.jar</uri>
-    </dependency>
+    -->
     <dependency>
-        <uri>jgroups/jars/jgroups-2.2.5.jar</uri>
+        <uri>activemq/jars/activemq-store-jdbc-${activemq_version}.jar</uri>
     </dependency>
-    -->
 
     <!-- message broker -->
-    <gbean namePart="ActiveMQJMSServer" class="org.codehaus.activemq.gbean.ActiveMQContainerGBean">
-        <reference name="serverInfo">geronimo.server:name=ServerInfo,*</reference>
-        <attribute name="brokerName" type="java.lang.String">possibly-unique-broker</attribute>
-        <attribute name="dataDirectory" type="java.lang.String">var/activemq</attribute>
   
+    <!--
+    <gbean namePart="ActiveMQ" type="JMSPersistence" class="org.codehaus.activemq.store.jdbm.JdbmPersistenceAdapterGBean">
+        <reference name="ServerInfo">geronimo.system:name=ServerInfo,*</reference>
+        <attribute name="DataDirectory">var/activemq</attribute>    
     </gbean>
-    <gbean namePart='"tcp://localhost:61616"' type="JMSConnector" class="org.codehaus.activemq.gbean.ActiveMQConnectorGBean">
-        <attribute name="Url" type="java.lang.String">tcp://localhost:61616</attribute>
-        <reference name="ActiveMQContainer">geronimo.server:name=ActiveMQJMSServer,*</reference>
+    -->
+    <gbean namePart="ActiveMQ" type="JMSPersistence" class="org.codehaus.activemq.store.jdbc.JDBCPersistenceAdapterGBean">
+        <reference name="DataSource">geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=org/apache/geronimo/SystemDatabase,j2eeType=JCAManagedConnectionFactory,name=SystemDatasource</reference>
     </gbean>
-    <gbean namePart='"vm://localhost"' type="JMSConnector" class="org.codehaus.activemq.gbean.ActiveMQConnectorGBean">
-        <attribute name="Url" type="java.lang.String">vm://localhost</attribute>
-        <reference name="ActiveMQContainer">geronimo.server:name=ActiveMQJMSServer,*</reference>
+    <gbean namePart="ActiveMQ" type="JMSServer" class="org.codehaus.activemq.gbean.ActiveMQContainerGBean">
+        <attribute name="BrokerName">possibly-unique-broker</attribute>
+        <reference name="PersistenceAdapter">geronimo.server:j2eeType=JMSPersistence,name=ActiveMQ,*</reference>
     </gbean>
-  
+    <gbean namePart="ActiveMQ.tcp.localhost.61616" type="JMSConnector" class="org.codehaus.activemq.gbean.ActiveMQConnectorGBean">
+        <attribute name="Url">tcp://localhost:61616</attribute>
+        <reference name="ActiveMQContainer">geronimo.server:j2eeType=JMSServer,name=ActiveMQ,*</reference>
+    </gbean>
+    <gbean namePart="ActiveMQ.vm.localhost" type="JMSConnector" class="org.codehaus.activemq.gbean.ActiveMQConnectorGBean">
+        <attribute name="Url">vm://localhost</attribute>
+        <reference name="ActiveMQContainer">geronimo.server:j2eeType=JMSServer,name=ActiveMQ,*</reference>
+    </gbean>    
+
 </configuration>

Modified: geronimo/trunk/modules/axis-builder/project.properties
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/project.properties?view=diff&rev=125660&p1=geronimo/trunk/modules/axis-builder/project.properties&r1=125659&p2=geronimo/trunk/modules/axis-builder/project.properties&r2=125660
==============================================================================
--- geronimo/trunk/modules/axis-builder/project.properties	(original)
+++ geronimo/trunk/modules/axis-builder/project.properties	Wed Jan 19 12:57:29 2005
@@ -4,8 +4,8 @@
 
 maven.repo.remote=http://www.openejb.org/maven, http://www.ibiblio.org/maven
 
-maven.eclipse.classpath.include=target/xmlbeans
-maven.idea.generated.source=xmlbeans
+#maven.eclipse.classpath.include=target/xmlbeans
+#maven.idea.generated.source=xmlbeans
 
 maven.junit.sysproperties=geronimo.run.external.webservicetest
 #Set to true to run test against bea's web service interop server.

Mime
View raw message