geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r656907 - in /geronimo/server/trunk/assemblies: geronimo-framework/pom.xml geronimo-jetty6-javaee5/pom.xml geronimo-tomcat6-javaee5/pom.xml
Date Fri, 16 May 2008 00:28:14 GMT
Author: jdillon
Date: Thu May 15 17:28:14 2008
New Revision: 656907

URL: http://svn.apache.org/viewvc?rev=656907&view=rev
Log:
Hook up gshell plugins

Modified:
    geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/pom.xml?rev=656907&r1=656906&r2=656907&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/pom.xml Thu May 15 17:28:14 2008
@@ -42,7 +42,36 @@
             <artifactId>geronimo-boilerplate</artifactId>
             <version>${version}</version>
         </dependency>
-
+        
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>gshell-framework</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>gshell-geronimo</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <!--
+        HACK: This should really only be included in the full assemblies, but due
+              to the limited fashion which GShell currently sets up its classloaders
+              (via hard-coded classworlds entries pointing at repository locations)
+              it will add significant complication to the assembly builds to allow
+              the entires to be different for assembly types.
+        -->
+        
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>gshell-remote</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>j2ee-system</artifactId>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml?rev=656907&r1=656906&r2=656907&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml Thu May 15 17:28:14 2008
@@ -46,6 +46,18 @@
             <scope>provided</scope>
         </dependency>
         
+        <!--
+        HACK: This is currently included from geronimo-framework, which is not really
+              desirable, once the problems related to this are fixed, enable this plugin
here.
+        
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>gshell-remote</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        -->
+        
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>j2ee-system</artifactId>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml?rev=656907&r1=656906&r2=656907&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml Thu May 15 17:28:14
2008
@@ -45,7 +45,19 @@
             <classifier>bin</classifier>
             <scope>provided</scope>
         </dependency>
-
+        
+        <!--
+        HACK: This is currently included from geronimo-framework, which is not really
+              desirable, once the problems related to this are fixed, enable this plugin
here.
+        
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>gshell-remote</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        -->
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>farming</artifactId>



Mime
View raw message