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 09:50:59 UTC
svn commit: r705501 - in /geronimo/gshell/trunk:
gshell-application/src/main/java/org/apache/geronimo/gshell/application/settings/
gshell-model/src/main/java/org/apache/geronimo/gshell/model/settings/
gshell-wisdom/gshell-wisdom-bootstrap/src/main/java...
Author: jdillon
Date: Fri Oct 17 00:50:59 2008
New Revision: 705501
URL: http://svn.apache.org/viewvc?rev=705501&view=rev
Log:
Nuke the settings model
Removed:
geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/settings/
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/settings/
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/SettingsConfiguredEvent.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/SettingsFactoryBean.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/SettingsManagerImpl.java
Modified:
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java
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
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/resources/META-INF/spring/components.xml
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java?rev=705501&r1=705500&r2=705501&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java Fri Oct 17 00:50:59 2008
@@ -25,7 +25,6 @@
import org.apache.geronimo.gshell.application.ApplicationSecurityManager;
import org.apache.geronimo.gshell.application.ClassPath;
import org.apache.geronimo.gshell.application.plugin.PluginManager;
-import org.apache.geronimo.gshell.application.settings.SettingsManager;
import org.apache.geronimo.gshell.artifact.ArtifactManager;
import org.apache.geronimo.gshell.chronos.StopWatch;
import org.apache.geronimo.gshell.event.EventPublisher;
@@ -37,7 +36,6 @@
import org.apache.geronimo.gshell.model.common.RemoteRepository;
import org.apache.geronimo.gshell.model.interpolate.Interpolator;
import org.apache.geronimo.gshell.model.interpolate.InterpolatorSupport;
-import org.apache.geronimo.gshell.model.settings.SettingsModel;
import org.apache.geronimo.gshell.shell.Shell;
import org.apache.geronimo.gshell.spring.BeanContainer;
import org.apache.geronimo.gshell.spring.BeanContainerAware;
@@ -74,9 +72,6 @@
private ArtifactManager artifactManager;
@Autowired
- private SettingsManager settingsManager;
-
- @Autowired
private EventPublisher eventPublisher;
private BeanContainer container;
@@ -132,13 +127,6 @@
// Add value sources to resolve muck
interp.addValueSource(new PropertiesBasedValueSource(System.getProperties()));
- // User settings should override the applications
- assert settingsManager != null;
- SettingsModel settingsModel = settingsManager.getSettings().getModel();
- if (settingsModel != null) {
- interp.addValueSource(new PropertiesBasedValueSource(settingsModel.getProperties()));
- }
-
// Add application settings
interp.addValueSource(new PropertiesBasedValueSource(model.getProperties()));
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=705501&r1=705500&r2=705501&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 00:50:59 2008
@@ -20,12 +20,10 @@
package org.apache.geronimo.gshell.wisdom.builder;
import org.apache.geronimo.gshell.application.ApplicationManager;
-import org.apache.geronimo.gshell.application.settings.SettingsManager;
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;
-import org.apache.geronimo.gshell.model.settings.SettingsModel;
import org.apache.geronimo.gshell.shell.ShellFactory;
/**
@@ -48,14 +46,6 @@
void setVariables(Variables variables);
- SettingsModel getSettingsModel();
-
- void setSettingsModel(SettingsModel settingsModel);
-
- SettingsManager getSettingsManager();
-
- void setSettingsManager(SettingsManager settingsManager);
-
ApplicationModel getApplicationModel();
void setApplicationModel(ApplicationModel applicationModel);
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=705501&r1=705500&r2=705501&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 00:50:59 2008
@@ -21,8 +21,6 @@
import org.apache.geronimo.gshell.application.ApplicationConfiguration;
import org.apache.geronimo.gshell.application.ApplicationManager;
-import org.apache.geronimo.gshell.application.settings.SettingsConfiguration;
-import org.apache.geronimo.gshell.application.settings.SettingsManager;
import org.apache.geronimo.gshell.artifact.ArtifactManager;
import org.apache.geronimo.gshell.artifact.monitor.ProgressSpinnerMonitor;
import org.apache.geronimo.gshell.chronos.StopWatch;
@@ -30,7 +28,6 @@
import org.apache.geronimo.gshell.io.IO;
import org.apache.geronimo.gshell.io.SystemOutputHijacker;
import org.apache.geronimo.gshell.model.application.ApplicationModel;
-import org.apache.geronimo.gshell.model.settings.SettingsModel;
import org.apache.geronimo.gshell.shell.Shell;
import org.apache.geronimo.gshell.spring.BeanContainer;
import org.apache.geronimo.gshell.spring.BeanContainerImpl;
@@ -50,10 +47,6 @@
private BeanContainer container;
private ClassLoader classLoader;
-
- private SettingsManager settingsManager;
-
- private SettingsConfiguration settingsConfig = new SettingsConfiguration();
private ApplicationManager applicationManager;
@@ -109,29 +102,6 @@
applicationConfig.setVariables(variables);
}
- public SettingsModel getSettingsModel() {
- return settingsConfig.getModel();
- }
-
- public void setSettingsModel(final SettingsModel settingsModel) {
- settingsConfig.setModel(settingsModel);
- }
-
- private SettingsManager createSettingsManager() {
- return getContainer().getBean(SettingsManager.class);
- }
-
- public SettingsManager getSettingsManager() {
- if (settingsManager == null) {
- settingsManager = createSettingsManager();
- }
- return settingsManager;
- }
-
- public void setSettingsManager(final SettingsManager settingsManager) {
- this.settingsManager = settingsManager;
- }
-
public ApplicationModel getApplicationModel() {
return applicationConfig.getModel();
}
@@ -207,9 +177,6 @@
// Configure download monitor
getArtifactManager().setDownloadMonitor(new ProgressSpinnerMonitor(getIo()));
- // Configure settings
- getSettingsManager().configure(settingsConfig);
-
// Configure application
getApplicationManager().configure(applicationConfig);
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/resources/META-INF/spring/components.xml?rev=705501&r1=705500&r2=705501&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/resources/META-INF/spring/components.xml (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/resources/META-INF/spring/components.xml Fri Oct 17 00:50:59 2008
@@ -25,10 +25,6 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean id="settingsManager" class="org.apache.geronimo.gshell.wisdom.application.SettingsManagerImpl"/>
-
- <bean id="settings" class="org.apache.geronimo.gshell.wisdom.application.SettingsFactoryBean"/>
-
<bean id="applicationManager" class="org.apache.geronimo.gshell.wisdom.application.ApplicationManagerImpl"/>
<bean id="application" class="org.apache.geronimo.gshell.wisdom.application.ApplicationFactoryBean"/>