geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r389363 - in /geronimo/branches/1.1: assemblies/j2ee-installer/ assemblies/j2ee-jetty-server/ assemblies/j2ee-jetty-server/src/var/config/ assemblies/j2ee-tomcat-server/ assemblies/j2ee-tomcat-server/src/var/config/ configs/activemq-broker/...
Date Tue, 28 Mar 2006 02:30:46 GMT
Author: djencks
Date: Mon Mar 27 18:30:44 2006
New Revision: 389363

URL: http://svn.apache.org/viewcvs?rev=389363&view=rev
Log:
fix activemq, works with amq 3.2.4-SNAPSHOT

Modified:
    geronimo/branches/1.1/assemblies/j2ee-installer/project.xml
    geronimo/branches/1.1/assemblies/j2ee-jetty-server/project.xml
    geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml
    geronimo/branches/1.1/assemblies/j2ee-tomcat-server/project.xml
    geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml
    geronimo/branches/1.1/configs/activemq-broker/project.xml
    geronimo/branches/1.1/configs/activemq-broker/src/plan/plan.xml
    geronimo/branches/1.1/configs/activemq/project.xml
    geronimo/branches/1.1/etc/project.properties
    geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyManagerImpl.java

Modified: geronimo/branches/1.1/assemblies/j2ee-installer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-installer/project.xml?rev=389363&r1=389362&r2=389363&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-installer/project.xml (original)
+++ geronimo/branches/1.1/assemblies/j2ee-installer/project.xml Mon Mar 27 18:30:44 2006
@@ -897,13 +897,13 @@
 
         <dependency>
             <groupId>activemq</groupId>
-            <artifactId>activemq-gbean</artifactId>
+            <artifactId>activemq-gbean-g1_1</artifactId>
             <version>${activemq_version}</version>
         </dependency>
 
         <dependency>
             <groupId>activemq</groupId>
-            <artifactId>activemq-gbean-management</artifactId>
+            <artifactId>activemq-gbean-management-g1_1</artifactId>
             <version>${activemq_version}</version>
         </dependency>
 

Modified: geronimo/branches/1.1/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-jetty-server/project.xml?rev=389363&r1=389362&r2=389363&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/branches/1.1/assemblies/j2ee-jetty-server/project.xml Mon Mar 27 18:30:44 2006
@@ -771,13 +771,13 @@
 
         <dependency>
             <groupId>activemq</groupId>
-            <artifactId>activemq-gbean</artifactId>
+            <artifactId>activemq-gbean-g1_1</artifactId>
             <version>${activemq_version}</version>
         </dependency>
 
         <dependency>
             <groupId>activemq</groupId>
-            <artifactId>activemq-gbean-management</artifactId>
+            <artifactId>activemq-gbean-management-g1_1</artifactId>
             <version>${activemq_version}</version>
         </dependency>
 

Modified: geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml?rev=389363&r1=389362&r2=389363&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml (original)
+++ geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml Mon Mar 27
18:30:44 2006
@@ -49,15 +49,13 @@
             <attribute name="port">${PlanDerbyPort}</attribute>
         </gbean>
     </configuration>
-<!--
     <configuration name="geronimo/activemq-broker/${pom.currentVersion}/car">
         <gbean name="ActiveMQ.tcp.default">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanActiveMQPort}</attribute>
         </gbean>
     </configuration>
--->
-    <!--<configuration name="geronimo/activemq/${pom.currentVersion}/car"/>-->
+    <configuration name="geronimo/activemq/${pom.currentVersion}/car"/>
     <configuration name="geronimo/directory/${pom.currentVersion}/car">
         <gbean name="geronimo.server:name=DirectoryService">
             <attribute name="host">${PlanServerHostname}</attribute>
@@ -101,8 +99,8 @@
     <configuration name="geronimo/webconsole-jetty_geronimo-console-standard-${pom.currentVersion}.war/${pom.currentVersion}/car"/>
     <configuration name="geronimo/uddi-jetty/${pom.currentVersion}/car"/>
     <configuration name="geronimo/jmxdebug-jetty/${pom.currentVersion}/car"/>
-    <!--<configuration name="geronimo/daytrader-derby-jetty/${pom.currentVersion}/car"/>-->
-    <!--<configuration name="geronimo/daytrader-derby-jetty_daytrader-web-${pom.currentVersion}.war/${pom.currentVersion}/car"/>-->
+    <configuration name="geronimo/daytrader-derby-jetty/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/daytrader-derby-jetty_daytrader-web-${pom.currentVersion}.war/${pom.currentVersion}/car"/>
     <configuration name="geronimo/remote-deploy-jetty/${pom.currentVersion}/car"/>
     <configuration name="geronimo/hot-deployer/${pom.currentVersion}/car" />
 </attributes>

Modified: geronimo/branches/1.1/assemblies/j2ee-tomcat-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-tomcat-server/project.xml?rev=389363&r1=389362&r2=389363&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-tomcat-server/project.xml (original)
+++ geronimo/branches/1.1/assemblies/j2ee-tomcat-server/project.xml Mon Mar 27 18:30:44 2006
@@ -771,15 +771,16 @@
 
         <dependency>
             <groupId>activemq</groupId>
-            <artifactId>activemq-gbean</artifactId>
+            <artifactId>activemq-gbean-g1_1</artifactId>
             <version>${activemq_version}</version>
         </dependency>
 
         <dependency>
             <groupId>activemq</groupId>
-            <artifactId>activemq-gbean-management</artifactId>
+            <artifactId>activemq-gbean-management-g1_1</artifactId>
             <version>${activemq_version}</version>
         </dependency>
+
 
         <dependency>
             <groupId>antlr</groupId>

Modified: geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml?rev=389363&r1=389362&r2=389363&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml (original)
+++ geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml Mon Mar
27 18:30:44 2006
@@ -49,15 +49,13 @@
             <attribute name="port">${PlanDerbyPort}</attribute>
         </gbean>
     </configuration>
-<!--
     <configuration name="geronimo/activemq-broker/${pom.currentVersion}/car">
         <gbean name="ActiveMQ.tcp.default">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanActiveMQPort}</attribute>
         </gbean>
     </configuration>
--->
-    <!--<configuration name="geronimo/activemq/${pom.currentVersion}/car"/>-->
+    <configuration name="geronimo/activemq/${pom.currentVersion}/car"/>
     <configuration name="geronimo/directory/${pom.currentVersion}/car">
         <gbean name="geronimo.server:name=DirectoryService">
             <attribute name="host">${PlanServerHostname}</attribute>
@@ -107,8 +105,8 @@
     <configuration name="geronimo/webconsole-tomcat_geronimo-console-standard-${pom.currentVersion}.war/${pom.currentVersion}/car"/>
     <configuration name="geronimo/uddi-tomcat/${pom.currentVersion}/car"/>
     <configuration name="geronimo/jmxdebug-tomcat/${pom.currentVersion}/car"/>
-    <!--<configuration name="geronimo/daytrader-derby-tomcat/${pom.currentVersion}/car"/>-->
-    <!--<configuration name="geronimo/daytrader-derby-tomcat_daytrader-web-${pom.currentVersion}.war/${pom.currentVersion}/car"/>-->
+    <configuration name="geronimo/daytrader-derby-tomcat/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/daytrader-derby-tomcat_daytrader-web-${pom.currentVersion}.war/${pom.currentVersion}/car"/>
     <configuration name="geronimo/remote-deploy-tomcat/${pom.currentVersion}/car"/>
     <configuration name="geronimo/hot-deployer/${pom.currentVersion}/car" />
 </attributes>

Modified: geronimo/branches/1.1/configs/activemq-broker/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/activemq-broker/project.xml?rev=389363&r1=389362&r2=389363&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/activemq-broker/project.xml (original)
+++ geronimo/branches/1.1/configs/activemq-broker/project.xml Mon Mar 27 18:30:44 2006
@@ -198,7 +198,15 @@
         </dependency>
         <dependency>
             <groupId>activemq</groupId>
-            <artifactId>activemq-gbean</artifactId>
+            <artifactId>activemq-gbean-g1_1</artifactId>
+            <version>${activemq_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
+        </dependency>
+        <dependency>
+            <groupId>activemq</groupId>
+            <artifactId>activemq-gbean-management-g1_1</artifactId>
             <version>${activemq_version}</version>
             <properties>
                  <geronimo.dependency>true</geronimo.dependency>

Modified: geronimo/branches/1.1/configs/activemq-broker/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/activemq-broker/src/plan/plan.xml?rev=389363&r1=389362&r2=389363&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/activemq-broker/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/activemq-broker/src/plan/plan.xml Mon Mar 27 18:30:44 2006
@@ -23,8 +23,7 @@
 
 
     <!-- management -->
-    <!-- TODO configid interface change -->
-    <!--<gbean name="ActiveMQ" class="org.activemq.gbean.management.ActiveMQManagerGBean"
/>-->
+    <gbean name="ActiveMQ" class="org.activemq.gbean.management.ActiveMQManagerGBean"
/>
 
     <!-- message broker -->
     <gbean name="ActiveMQ" class="org.activemq.gbean.ActiveMQContainerGBean">

Modified: geronimo/branches/1.1/configs/activemq/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/activemq/project.xml?rev=389363&r1=389362&r2=389363&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/activemq/project.xml (original)
+++ geronimo/branches/1.1/configs/activemq/project.xml Mon Mar 27 18:30:44 2006
@@ -52,8 +52,7 @@
             <version>${geronimo_version}</version>
             <type>car</type>
             <properties>
-                <!--presumably temporary, till broker gbeans are fixed-->
-                 <!--<geronimo.import>true</geronimo.import>-->
+                 <geronimo.import>true</geronimo.import>
             </properties>
         </dependency>
         <dependency>
@@ -68,11 +67,11 @@
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>activemq</groupId>
-            <artifactId>activemq-gbean-management</artifactId>
-            <version>${activemq_version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>activemq</groupId>-->
+            <!--<artifactId>activemq-gbean-management-g1_1</artifactId>-->
+            <!--<version>${activemq_version}</version>-->
+        <!--</dependency>-->
         <dependency>
              <groupId>activemq</groupId>
              <artifactId>activemq-ra</artifactId>

Modified: geronimo/branches/1.1/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/etc/project.properties?rev=389363&r1=389362&r2=389363&view=diff
==============================================================================
--- geronimo/branches/1.1/etc/project.properties (original)
+++ geronimo/branches/1.1/etc/project.properties Mon Mar 27 18:30:44 2006
@@ -18,7 +18,7 @@
 ##
 
 ##
-## $Rev: 378707 $ $Date$
+## $Rev$ $Date$
 ##
 
 #####################################################
@@ -78,7 +78,7 @@
 # Dependency Versions
 #####################################################
 activeio_version=2.0-r118
-activemq_version=3.2.1
+activemq_version=3.2.4-SNAPSHOT
 geronimo_version=1.1-SNAPSHOT
 openejb_version=2.1-SNAPSHOT
 tranql_version=1.2.1

Modified: geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyManagerImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyManagerImpl.java?rev=389363&r1=389362&r2=389363&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyManagerImpl.java
(original)
+++ geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyManagerImpl.java
Mon Mar 27 18:30:44 2006
@@ -166,6 +166,9 @@
      * @param protocol A protocol as returned by getSupportedProtocols
      */
     public AbstractName[] getConnectors(String protocol) {
+        if(protocol == null) {
+            return getConnectors();
+        }
         AbstractNameQuery query = new AbstractNameQuery(JettyWebConnector.class.getName());
         Set names = kernel.listGBeans(query);
         List result = new ArrayList();



Mime
View raw message