You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2009/12/29 08:56:00 UTC
svn commit: r894322 - in /geronimo/server/trunk/framework:
configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
plugingroups/framework/pom.xml
plugingroups/framework/src/main/history/dependencies.xml
Author: genspring
Date: Tue Dec 29 07:55:53 2009
New Revision: 894322
URL: http://svn.apache.org/viewvc?rev=894322&view=rev
Log:
GERONIMO-4948 To migrate existing geronimo gshell commands to karaf based shell. --- adjust the dependencies and karaf startup bundles list to include the migrated shell bundle.
Modified:
geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
geronimo/server/trunk/framework/plugingroups/framework/pom.xml
geronimo/server/trunk/framework/plugingroups/framework/src/main/history/dependencies.xml
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties?rev=894322&r1=894321&r2=894322&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties Tue Dec 29 07:55:53 2009
@@ -88,3 +88,12 @@
org/apache/geronimo/framework/geronimo-kernel/${pom.version}/geronimo-kernel-${pom.version}.jar=40
org/apache/geronimo/framework/geronimo-transformer/${pom.version}/geronimo-transformer-${pom.version}.jar=40
org/apache/geronimo/framework/geronimo-system/${pom.version}/geronimo-system-${pom.version}.jar=40
+
+org/apache/servicemix/bundles/org.apache.servicemix.bundles.ant/1.7.0_1/org.apache.servicemix.bundles.ant-1.7.0_1.jar=40
+org/apache/geronimo/framework/geronimo-plugin/${pom.version}/geronimo-plugin-${pom.version}.jar=40
+org/apache/geronimo/framework/geronimo-deploy-jsr88/${pom.version}/geronimo-deploy-jsr88-${pom.version}.jar=40
+org/apache/geronimo/specs/geronimo-javaee-deployment_1.1MR3_spec/1.1-SNAPSHOT/geronimo-javaee-deployment_1.1MR3_spec-1.1-SNAPSHOT.jar=40
+org/apache/geronimo/framework/geronimo-deploy-tool/${pom.version}/geronimo-deploy-tool-${pom.version}.jar=40
+org/apache/geronimo/framework/geronimo-deploy-config/${pom.version}/geronimo-deploy-config-${pom.version}.jar=40
+org/apache/geronimo/framework/geronimo-shell-base/${pom.version}/geronimo-shell-base-${pom.version}.jar=40
+
Modified: geronimo/server/trunk/framework/plugingroups/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/plugingroups/framework/pom.xml?rev=894322&r1=894321&r2=894322&view=diff
==============================================================================
--- geronimo/server/trunk/framework/plugingroups/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/plugingroups/framework/pom.xml Tue Dec 29 07:55:53 2009
@@ -41,7 +41,14 @@
<version>${version}</version>
<type>car</type>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-shell-base</artifactId>
+ <version>${version}</version>
+ <type>jar</type>
+ </dependency>
+
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.framework</groupId>-->
<!--<artifactId>gshell-framework</artifactId>-->
Modified: geronimo/server/trunk/framework/plugingroups/framework/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/plugingroups/framework/src/main/history/dependencies.xml?rev=894322&r1=894321&r2=894322&view=diff
==============================================================================
--- geronimo/server/trunk/framework/plugingroups/framework/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/plugingroups/framework/src/main/history/dependencies.xml Tue Dec 29 07:55:53 2009
@@ -7,12 +7,32 @@
<type>car</type>
</module-id>
<dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>asm-commons</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>client-system</artifactId>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-deployment</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-service-builder</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-shell-base</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>j2ee-security</artifactId>
<type>car</type>
</dependency>
@@ -56,4 +76,29 @@
<artifactId>shutdown</artifactId>
<type>car</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.schema</groupId>
+ <artifactId>geronimo-schema-j2ee_1.4</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.schema</groupId>
+ <artifactId>geronimo-schema-jee_5</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
+ <type>jar</type>
+ </dependency>
</plugin-artifact>