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/12 14:17:13 UTC

svn commit: r703803 - /geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/SettingsManagerImpl.java

Author: jdillon
Date: Sun Oct 12 05:17:12 2008
New Revision: 703803

URL: http://svn.apache.org/viewvc?rev=703803&view=rev
Log:
Flip on|offline flag

Modified:
    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/SettingsManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/SettingsManagerImpl.java?rev=703803&r1=703802&r2=703803&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/SettingsManagerImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/SettingsManagerImpl.java Sun Oct 12 05:17:12 2008
@@ -69,16 +69,19 @@
         // Validate the configuration
         config.validate();
 
-        if (config.getModel() != null) {
+        SettingsModel model = config.getModel();
+        if (model != null) {
+            log.debug("Settings model: {}", model);
+            
 	        // Interpolate the model
-	        interpolate(config);
+	        // interpolate(config);
 
 	        // Configure settings
-            configure(config.getModel());
+            configure(model);
         }
 
         // TODO: Merge in some default settings or something?
-
+        
         settingsConfiguration = config;
 
         settings = new Settings()
@@ -114,6 +117,8 @@
 
         // TODO: Add settings interpolation here
 
+        artifactManager.setOnline(model.isOnline());
+
         // Setup remote repositories
         for (RemoteRepository repo : model.remoteRepositories()) {
             artifactManager.getRepositoryManager().addRemoteRepository(repo.getId(), repo.getLocationUri());