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 11:38:59 UTC
svn commit: r705532 - in
/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder:
ShellBuilder.java ShellBuilderImpl.java
Author: jdillon
Date: Fri Oct 17 02:38:58 2008
New Revision: 705532
URL: http://svn.apache.org/viewvc?rev=705532&view=rev
Log:
weed out the ArtifactManager from the shell builder
Modified:
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilder.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-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilder.java?rev=705532&r1=705531&r2=705532&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilder.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilder.java Fri Oct 17 02:38:58 2008
@@ -20,7 +20,6 @@
package org.apache.geronimo.gshell.wisdom.builder;
import org.apache.geronimo.gshell.application.ApplicationManager;
-import org.apache.geronimo.gshell.artifact.ArtifactManager;
import org.apache.geronimo.gshell.command.Variables;
import org.apache.geronimo.gshell.io.IO;
import org.apache.geronimo.gshell.model.application.ApplicationModel;
@@ -53,8 +52,4 @@
ApplicationManager getApplicationManager();
void setApplicationManager(ApplicationManager applicationManager);
-
- ArtifactManager getArtifactManager();
-
- void setArtifactManager(ArtifactManager artifactManager);
}
\ No newline at end of file
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=705532&r1=705531&r2=705532&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 02:38:58 2008
@@ -52,8 +52,6 @@
private ApplicationConfiguration applicationConfig = new ApplicationConfiguration();
- private ArtifactManager artifactManager;
-
private BeanContainer createContainer() throws Exception {
BeanContainerImpl container = new BeanContainerImpl(getClassLoader());
container.loadBeans(new String[] {
@@ -125,21 +123,6 @@
this.applicationManager = applicationManager;
}
- private ArtifactManager createArtifactManager() {
- return getContainer().getBean(ArtifactManager.class);
- }
-
- public ArtifactManager getArtifactManager() {
- if (artifactManager == null) {
- artifactManager = createArtifactManager();
- }
- return artifactManager;
- }
-
- public void setArtifactManager(final ArtifactManager artifactManager) {
- this.artifactManager = artifactManager;
- }
-
//
// ShellFactory
//
@@ -175,7 +158,8 @@
//
// Configure download monitor
- getArtifactManager().setDownloadMonitor(new ProgressSpinnerMonitor(getIo()));
+ ArtifactManager artifactManager = getContainer().getBean(ArtifactManager.class);
+ artifactManager.setDownloadMonitor(new ProgressSpinnerMonitor(getIo()));
// Configure application
getApplicationManager().configure(applicationConfig);