geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r931784 - in /geronimo/server/branches/2.2/plugins/activemq: activemq-broker/src/main/history/dependencies.xml activemq-webconsole-jetty/src/main/history/dependencies.xml activemq-webconsole-tomcat/src/main/history/dependencies.xml pom.xml
Date Thu, 08 Apr 2010 05:21:47 GMT
Author: kevan
Date: Thu Apr  8 05:21:46 2010
New Revision: 931784

URL: http://svn.apache.org/viewvc?rev=931784&view=rev
Log:
GERONIMO-5244 This builds for me. selenium is not working on my system. so haven't run all
tests. Note that org.osgi.core is a required dependency, broker won't start without it.

Modified:
    geronimo/server/branches/2.2/plugins/activemq/activemq-broker/src/main/history/dependencies.xml
    geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-jetty/src/main/history/dependencies.xml
    geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-tomcat/src/main/history/dependencies.xml
    geronimo/server/branches/2.2/plugins/activemq/pom.xml

Modified: geronimo/server/branches/2.2/plugins/activemq/activemq-broker/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/activemq/activemq-broker/src/main/history/dependencies.xml?rev=931784&r1=931783&r2=931784&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/activemq/activemq-broker/src/main/history/dependencies.xml
(original)
+++ geronimo/server/branches/2.2/plugins/activemq/activemq-broker/src/main/history/dependencies.xml
Thu Apr  8 05:21:46 2010
@@ -66,4 +66,9 @@
         <artifactId>xbean-spring</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>org.osgi.core</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-jetty/src/main/history/dependencies.xml?rev=931784&r1=931783&r2=931784&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-jetty/src/main/history/dependencies.xml
(original)
+++ geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-jetty/src/main/history/dependencies.xml
Thu Apr  8 05:21:46 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
     <module-id>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>activemq-webconsole-jetty</artifactId>
@@ -12,6 +12,16 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>commons-pool</groupId>
         <artifactId>commons-pool</artifactId>
         <type>jar</type>
@@ -32,6 +42,16 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>net.sf.josql</groupId>
+        <artifactId>gentlyweb-utils</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>net.sf.josql</groupId>
+        <artifactId>josql</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>opensymphony</groupId>
         <artifactId>sitemesh</artifactId>
         <type>jar</type>
@@ -92,6 +112,16 @@
         <type>car</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.velocity</groupId>
+        <artifactId>velocity</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.fusesource.commonman</groupId>
+        <artifactId>commons-management</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-aop</artifactId>
         <type>jar</type>

Modified: geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-tomcat/src/main/history/dependencies.xml?rev=931784&r1=931783&r2=931784&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-tomcat/src/main/history/dependencies.xml
(original)
+++ geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-tomcat/src/main/history/dependencies.xml
Thu Apr  8 05:21:46 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
     <module-id>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>activemq-webconsole-tomcat</artifactId>
@@ -12,6 +12,16 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>commons-pool</groupId>
         <artifactId>commons-pool</artifactId>
         <type>jar</type>
@@ -32,6 +42,16 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>net.sf.josql</groupId>
+        <artifactId>gentlyweb-utils</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>net.sf.josql</groupId>
+        <artifactId>josql</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>opensymphony</groupId>
         <artifactId>sitemesh</artifactId>
         <type>jar</type>
@@ -92,6 +112,16 @@
         <type>car</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.velocity</groupId>
+        <artifactId>velocity</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.fusesource.commonman</groupId>
+        <artifactId>commons-management</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-aop</artifactId>
         <type>jar</type>

Modified: geronimo/server/branches/2.2/plugins/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/activemq/pom.xml?rev=931784&r1=931783&r2=931784&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/activemq/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/activemq/pom.xml Thu Apr  8 05:21:46 2010
@@ -63,7 +63,7 @@
     </profiles>
 
     <properties>
-        <activemqVersion>5.3.0</activemqVersion>
+        <activemqVersion>5.3.1</activemqVersion>
     </properties>
 
     <dependencyManagement>
@@ -85,6 +85,14 @@
                         <groupId>org.apache.geronimo.specs</groupId>
                         <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.springframework.osgi</groupId>
+                        <artifactId>spring-osgi-core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.springframework.osgi</groupId>
+                        <artifactId>spring-osgi-io</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 



Mime
View raw message