You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/10/17 19:50:18 UTC
svn commit: r705686 - in /geronimo/gshell/trunk:
gshell-assembly/src/main/underlay/etc/
gshell-support/gshell-ivy/src/main/java/org/apache/geronimo/gshell/ivy/
gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/
Author: jdillon
Date: Fri Oct 17 10:50:18 2008
New Revision: 705686
URL: http://svn.apache.org/viewvc?rev=705686&view=rev
Log:
Hook up some more plugins
Modified:
geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml
geronimo/gshell/trunk/gshell-support/gshell-ivy/src/main/java/org/apache/geronimo/gshell/ivy/IvyFactoryBean.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilderImpl.java
Modified: geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml?rev=705686&r1=705685&r2=705686&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml (original)
+++ geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml Fri Oct 17 10:50:18 2008
@@ -74,6 +74,38 @@
<property name="artifactId" value="gshell-vfs"/>
<property name="version" value="1.0-alpha-2-SNAPSHOT"/>
</bean>
+
+ <bean class="org.apache.geronimo.gshell.application.model.Artifact">
+ <property name="groupId" value="org.apache.geronimo.gshell.commands"/>
+ <property name="artifactId" value="gshell-admin"/>
+ <property name="version" value="1.0-alpha-2-SNAPSHOT"/>
+ </bean>
+
+ <!--
+ <bean class="org.apache.geronimo.gshell.application.model.Artifact">
+ <property name="groupId" value="org.apache.geronimo.gshell.commands"/>
+ <property name="artifactId" value="gshell-optional"/>
+ <property name="version" value="1.0-alpha-2-SNAPSHOT"/>
+ </bean>
+
+ <bean class="org.apache.geronimo.gshell.application.model.Artifact">
+ <property name="groupId" value="org.apache.geronimo.gshell.commands"/>
+ <property name="artifactId" value="gshell-log4j"/>
+ <property name="version" value="1.0-alpha-2-SNAPSHOT"/>
+ </bean>
+
+ <bean class="org.apache.geronimo.gshell.application.model.Artifact">
+ <property name="groupId" value="org.apache.geronimo.gshell.commands"/>
+ <property name="artifactId" value="gshell-bsf"/>
+ <property name="version" value="1.0-alpha-2-SNAPSHOT"/>
+ </bean>
+
+ <bean class="org.apache.geronimo.gshell.application.model.Artifact">
+ <property name="groupId" value="org.apache.geronimo.gshell.commands"/>
+ <property name="artifactId" value="gshell-remote"/>
+ <property name="version" value="1.0-alpha-2-SNAPSHOT"/>
+ </bean>
+ -->
</list>
</property>
</bean>
Modified: geronimo/gshell/trunk/gshell-support/gshell-ivy/src/main/java/org/apache/geronimo/gshell/ivy/IvyFactoryBean.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-ivy/src/main/java/org/apache/geronimo/gshell/ivy/IvyFactoryBean.java?rev=705686&r1=705685&r2=705686&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-ivy/src/main/java/org/apache/geronimo/gshell/ivy/IvyFactoryBean.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-ivy/src/main/java/org/apache/geronimo/gshell/ivy/IvyFactoryBean.java Fri Oct 17 10:50:18 2008
@@ -61,6 +61,10 @@
log.debug("Settings URL: {}", url);
ivy.configure(url);
+ //
+ // TODO: Hook up download monitor
+ //
+
// settings.setVariable("ivy.default.configuration.m2compatible", "true")
return ivy;
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilderImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilderImpl.java?rev=705686&r1=705685&r2=705686&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilderImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilderImpl.java Fri Oct 17 10:50:18 2008
@@ -148,15 +148,6 @@
BeanContainer container = getContainer();
log.debug("Container: {}", container);
- //
- // TODO: Allow someway to configure a non-interactive monitor
- //
-
- // Configure download monitor
- // FIXME:
- // ArtifactManager artifactManager = getContainer().getBean(ArtifactManager.class);
- // artifactManager.setDownloadMonitor(new ProgressSpinnerMonitor(getIo()));
-
applicationConfig.setModel(getApplicationModel());
// Configure application