geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r803943 - in /geronimo/server/trunk/plugins: activemq/activemq-console-jetty/ activemq/activemq-console-jetty/src/main/history/ activemq/activemq-console-tomcat/ activemq/activemq-console-tomcat/src/main/history/ connector/connector-deploye...
Date Thu, 13 Aug 2009 16:36:10 GMT
Author: djencks
Date: Thu Aug 13 16:36:09 2009
New Revision: 803943

URL: http://svn.apache.org/viewvc?rev=803943&view=rev
Log:
GERONIMO-4780 don't run the jsr88-rar-configurer in the server at all.  Patch from Ivan

Modified:
    geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/connector/connector-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml
    geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml
    geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml

Modified: geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml?rev=803943&r1=803942&r2=803943&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml Thu Aug 13 16:36:09
2009
@@ -125,7 +125,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-rar-configurer</artifactId>
+            <artifactId>connector-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/history/dependencies.xml?rev=803943&r1=803942&r2=803943&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/history/dependencies.xml
Thu Aug 13 16:36:09 2009
@@ -22,11 +22,6 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jsr88-rar-configurer</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-deploy-jsr88</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml?rev=803943&r1=803942&r2=803943&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml Thu Aug 13 16:36:09
2009
@@ -125,7 +125,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-rar-configurer</artifactId>
+            <artifactId>connector-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/src/main/history/dependencies.xml?rev=803943&r1=803942&r2=803943&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/src/main/history/dependencies.xml
Thu Aug 13 16:36:09 2009
@@ -17,11 +17,6 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jsr88-rar-configurer</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-deploy-jsr88</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/connector/connector-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/connector-deployer/src/main/plan/plan.xml?rev=803943&r1=803942&r2=803943&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/connector-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/connector/connector-deployer/src/main/plan/plan.xml Thu
Aug 13 16:36:09 2009
@@ -99,5 +99,6 @@
     <gbean name="ClientAdminObjectRefBuilder" class="org.apache.geronimo.connector.deployment.AdminObjectRefBuilder">
         <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
     </gbean>
-
+    
+    <gbean name="RARConfigurer" class="org.apache.geronimo.connector.deployment.RARConfigurer"/>
 </module>

Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml?rev=803943&r1=803942&r2=803943&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml Thu Aug 13 16:36:09
2009
@@ -83,10 +83,16 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-rar-configurer</artifactId>
+            <artifactId>connector-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>

Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml?rev=803943&r1=803942&r2=803943&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml
Thu Aug 13 16:36:09 2009
@@ -8,7 +8,7 @@
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jsr88-rar-configurer</artifactId>
+        <artifactId>connector-deployer</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
@@ -18,6 +18,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deploy-jsr88</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-gbean-deployer</artifactId>
         <type>car</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml?rev=803943&r1=803942&r2=803943&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml Thu Aug 13
16:36:09 2009
@@ -82,10 +82,16 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-rar-configurer</artifactId>
+            <artifactId>connector-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>

Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml?rev=803943&r1=803942&r2=803943&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml
Thu Aug 13 16:36:09 2009
@@ -8,7 +8,7 @@
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jsr88-rar-configurer</artifactId>
+        <artifactId>connector-deployer</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
@@ -18,6 +18,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deploy-jsr88</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-gbean-deployer</artifactId>
         <type>car</type>
     </dependency>



Mime
View raw message