geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r694337 - in /geronimo/gshell/trunk: gshell-application/src/main/java/org/apache/geronimo/gshell/application/ gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/ gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/...
Date Thu, 11 Sep 2008 16:23:59 GMT
Author: jdillon
Date: Thu Sep 11 09:23:48 2008
New Revision: 694337

URL: http://svn.apache.org/viewvc?rev=694337&view=rev
Log:
Rename Application to ApplicationModel

Added:
    geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationModelLocator.java
  (contents, props changed)
      - copied, changed from r694319, geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationLocator.java
    geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationModel.java
  (contents, props changed)
      - copied, changed from r694319, geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Application.java
    geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationModelMarshaller.java
  (contents, props changed)
      - copied, changed from r694319, geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationMarshaller.java
Removed:
    geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationLocator.java
    geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Application.java
    geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationMarshaller.java
Modified:
    geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationConfiguration.java
    geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationContext.java
    geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
    geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpCommand.java
    geronimo/gshell/trunk/gshell-model/pom.xml
    geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Branding.java
    geronimo/gshell/trunk/gshell-model/src/test/java/org/apache/geronimo/gshell/model/application/ApplicationMarshallerTest.java
    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-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/HistoryImpl.java
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/LayoutManagerImpl.java
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellImpl.java

Modified: geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationConfiguration.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationConfiguration.java?rev=694337&r1=694336&r2=694337&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationConfiguration.java
(original)
+++ geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationConfiguration.java
Thu Sep 11 09:23:48 2008
@@ -22,7 +22,7 @@
 import org.apache.geronimo.gshell.yarn.ReflectionToStringBuilder;
 import org.apache.geronimo.gshell.yarn.ToStringStyle;
 import org.apache.geronimo.gshell.io.IO;
-import org.apache.geronimo.gshell.model.application.Application;
+import org.apache.geronimo.gshell.model.application.ApplicationModel;
 import org.apache.geronimo.gshell.command.Variables;
 
 /**
@@ -36,7 +36,7 @@
 
     private Variables variables;
 
-    private Application application;
+    private ApplicationModel model;
 
     public IO getIo() {
         return io;
@@ -54,17 +54,17 @@
         this.variables = variables;
     }
 
-    public Application getApplication() {
-        return application;
+    public ApplicationModel getModel() {
+        return model;
     }
 
-    public void setApplication(final Application application) {
-        this.application = application;
+    public void setModel(final ApplicationModel model) {
+        this.model = model;
     }
 
     public void validate() {
-        if (application == null) {
-            throw new IllegalStateException("Missing application configuration");
+        if (model == null) {
+            throw new IllegalStateException("Missing application model");
         }    
     }
 

Modified: geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationContext.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationContext.java?rev=694337&r1=694336&r2=694337&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationContext.java
(original)
+++ geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationContext.java
Thu Sep 11 09:23:48 2008
@@ -20,7 +20,7 @@
 package org.apache.geronimo.gshell.application;
 
 import org.apache.geronimo.gshell.io.IO;
-import org.apache.geronimo.gshell.model.application.Application;
+import org.apache.geronimo.gshell.model.application.ApplicationModel;
 import org.apache.geronimo.gshell.command.Variables;
 
 /**
@@ -35,8 +35,6 @@
     IO getIo();
 
     Variables getVariables();
-
-    // TODO: Rename to ApplicationModel
     
-    Application getApplication();
+    ApplicationModel getModel();
 }
\ No newline at end of file

Copied: geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationModelLocator.java
(from r694319, geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationLocator.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationModelLocator.java?p2=geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationModelLocator.java&p1=geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationLocator.java&r1=694319&r2=694337&rev=694337&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationLocator.java
(original)
+++ geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationModelLocator.java
Thu Sep 11 09:23:48 2008
@@ -19,23 +19,23 @@
 
 package org.apache.geronimo.gshell.application;
 
-import org.apache.geronimo.gshell.model.application.Application;
-import org.apache.geronimo.gshell.model.application.ApplicationMarshaller;
+import org.apache.geronimo.gshell.model.application.ApplicationModel;
+import org.apache.geronimo.gshell.model.application.ApplicationModelMarshaller;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.net.URL;
 
 /**
- * Locates {@link Application} instances.
+ * Locates {@link ApplicationModel} instances.
  *
  * @version $Rev$ $Date$
  */
-public class ApplicationLocator
+public class ApplicationModelLocator
 {
     private final Logger log = LoggerFactory.getLogger(getClass());
 
-    private final ApplicationMarshaller marshaller = new ApplicationMarshaller();
+    private final ApplicationModelMarshaller marshaller = new ApplicationModelMarshaller();
 
     //
     // FIXME: Need to make this more robust, allow a file override/hint look in META-INF/gshell,
etc.
@@ -45,12 +45,12 @@
     // TODO: Use builder pattern to add additonal bits to help location
     //
     
-    public Application locate() throws Exception {
-        log.debug("Locating application descriptor");
+    public ApplicationModel locate() throws Exception {
+        log.debug("Locating application model descriptor");
 
         URL url = getClass().getClassLoader().getResource("application.xml");
 
-        log.debug("Application descriptor URL: {}", url);
+        log.debug("Application model descriptor URL: {}", url);
         
         return marshaller.unmarshal(url);
     }

Propchange: geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationModelLocator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationModelLocator.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationModelLocator.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java?rev=694337&r1=694336&r2=694337&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
(original)
+++ geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
Thu Sep 11 09:23:48 2008
@@ -22,13 +22,13 @@
 import org.apache.geronimo.gshell.notification.ExitNotification;
 import org.apache.geronimo.gshell.shell.Shell;
 import org.apache.geronimo.gshell.ansi.ANSI;
-import org.apache.geronimo.gshell.application.ApplicationLocator;
+import org.apache.geronimo.gshell.application.ApplicationModelLocator;
 import org.apache.geronimo.gshell.clp.Argument;
 import org.apache.geronimo.gshell.clp.CommandLineProcessor;
 import org.apache.geronimo.gshell.clp.Option;
 import org.apache.geronimo.gshell.clp.Printer;
 import org.apache.geronimo.gshell.io.IO;
-import org.apache.geronimo.gshell.model.application.Application;
+import org.apache.geronimo.gshell.model.application.ApplicationModel;
 import org.apache.geronimo.gshell.model.settings.SettingsModel;
 import org.apache.geronimo.gshell.application.settings.SettingsModelLocator;
 import org.apache.geronimo.gshell.wisdom.builder.ShellBuilder;
@@ -204,8 +204,8 @@
             builder.setSettingsModel(settingsModel);
 
             // Find our application descriptor
-            Application application = new ApplicationLocator().locate();
-            builder.setApplication(application);
+            ApplicationModel applicationModel = new ApplicationModelLocator().locate();
+            builder.setApplicationModel(applicationModel);
 
             //
             // HACK: --help and --version need access to the application's information, so
we have to handle these options late
@@ -213,14 +213,14 @@
             
             if (help|version) {
                 if (help) {
-                    io.out.println(application.getBranding().getProgramName() + " [options]
<command> [args]");
+                    io.out.println(applicationModel.getBranding().getProgramName() + " [options]
<command> [args]");
                     io.out.println();
 
                     Printer printer = new Printer(clp);
                     printer.printUsage(io.out);
                 }
                 else if (version) {
-                    io.out.println(application.getVersion());
+                    io.out.println(applicationModel.getVersion());
                 }
 
                 io.out.println();

Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpCommand.java?rev=694337&r1=694336&r2=694337&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpCommand.java
(original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpCommand.java
Thu Sep 11 09:23:48 2008
@@ -93,7 +93,7 @@
         assert context != null;
 
         IO io = context.getIo();
-        String about = applicationManager.getContext().getApplication().getBranding().getAboutMessage();
+        String about = applicationManager.getContext().getModel().getBranding().getAboutMessage();
 
         if (about != null) {
             io.out.print(about);

Modified: geronimo/gshell/trunk/gshell-model/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/pom.xml?rev=694337&r1=694336&r2=694337&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-model/pom.xml Thu Sep 11 09:23:48 2008
@@ -49,13 +49,13 @@
         </dependency>
 
         <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-utils</artifactId>
+            <groupId>org.apache.geronimo.gshell.support</groupId>
+            <artifactId>gshell-interpolation</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-interpolation</artifactId>
+            <artifactId>plexus-utils</artifactId>
         </dependency>
         
         <dependency>

Copied: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationModel.java
(from r694319, geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Application.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationModel.java?p2=geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationModel.java&p1=geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Application.java&r1=694319&r2=694337&rev=694337&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Application.java
(original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationModel.java
Thu Sep 11 09:23:48 2008
@@ -36,7 +36,7 @@
  * @version $Rev$ $Date$
  */
 @XStreamAlias("application")
-public class Application
+public class ApplicationModel
     extends DescriptorSupport
 {
     private LocalRepository localRepository;

Propchange: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationModel.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationModel.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationModel.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationModelMarshaller.java
(from r694319, geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationMarshaller.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationModelMarshaller.java?p2=geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationModelMarshaller.java&p1=geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationMarshaller.java&r1=694319&r2=694337&rev=694337&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationMarshaller.java
(original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationModelMarshaller.java
Thu Sep 11 09:23:48 2008
@@ -25,15 +25,15 @@
 import org.apache.geronimo.gshell.model.marshal.MarshallerSupport;
 
 /**
- * Marshaller for {@link Application} models.
+ * Marshaller for {@link ApplicationModel} models.
  *
  * @version $Rev$ $Date$
  */
-public class ApplicationMarshaller
-    extends MarshallerSupport<Application>
+public class ApplicationModelMarshaller
+    extends MarshallerSupport<ApplicationModel>
 {
-    public ApplicationMarshaller() {
-        super(Application.class);
+    public ApplicationModelMarshaller() {
+        super(ApplicationModel.class);
     }
 
     @Override

Propchange: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationModelMarshaller.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationModelMarshaller.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationModelMarshaller.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Branding.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Branding.java?rev=694337&r1=694336&r2=694337&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Branding.java
(original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Branding.java
Thu Sep 11 09:23:48 2008
@@ -35,7 +35,7 @@
 public class Branding
     extends Element
 {
-    private transient Application parent;
+    private transient ApplicationModel parent;
 
     private Properties properties;
 
@@ -65,7 +65,7 @@
 
     private String goodbyeMessage;
 
-    public Application getParent() {
+    public ApplicationModel getParent() {
         if (parent == null) {
             throw new IllegalStateException("Not attached to parent");
         }
@@ -73,7 +73,7 @@
         return parent;
     }
 
-    public void setParent(final Application parent) {
+    public void setParent(final ApplicationModel parent) {
         this.parent = parent;
     }
 

Modified: geronimo/gshell/trunk/gshell-model/src/test/java/org/apache/geronimo/gshell/model/application/ApplicationMarshallerTest.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/test/java/org/apache/geronimo/gshell/model/application/ApplicationMarshallerTest.java?rev=694337&r1=694336&r2=694337&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/test/java/org/apache/geronimo/gshell/model/application/ApplicationMarshallerTest.java
(original)
+++ geronimo/gshell/trunk/gshell-model/src/test/java/org/apache/geronimo/gshell/model/application/ApplicationMarshallerTest.java
Thu Sep 11 09:23:48 2008
@@ -29,17 +29,17 @@
 import java.util.Properties;
 
 /**
- * Test for the {@link ApplicationMarshaller} class.
+ * Test for the {@link ApplicationModelMarshaller} class.
  *
  * @version $Rev$ $Date$
  */
 public class ApplicationMarshallerTest
     extends TestCase
 {
-    private ApplicationMarshaller marshaller = new ApplicationMarshaller();
+    private ApplicationModelMarshaller marshaller = new ApplicationModelMarshaller();
     
     public void testMarshal1() throws Exception {
-        Application root = new Application();
+        ApplicationModel root = new ApplicationModel();
 
         root.setGroupId("app.test");
         root.setArtifactId("app-test");
@@ -84,7 +84,7 @@
     public void testUnmarshal1_FromStream() throws Exception {
         InputStream input = getClass().getResourceAsStream("application1.xml");
 
-        Application root = marshaller.unmarshal(input);
+        ApplicationModel root = marshaller.unmarshal(input);
 
         root.dependencies(true);
         
@@ -94,7 +94,7 @@
     public void testUnmarshal1_FromURL() throws Exception {
         URL url = getClass().getResource("application1.xml");
 
-        Application root = marshaller.unmarshal(url);
+        ApplicationModel root = marshaller.unmarshal(url);
 
         root.dependencies(true);
 

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=694337&r1=694336&r2=694337&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
Thu Sep 11 09:23:48 2008
@@ -27,7 +27,7 @@
 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.Application;
+import org.apache.geronimo.gshell.model.application.ApplicationModel;
 import org.apache.geronimo.gshell.model.common.Dependency;
 import org.apache.geronimo.gshell.model.common.LocalRepository;
 import org.apache.geronimo.gshell.model.common.RemoteRepository;
@@ -109,7 +109,7 @@
         interpolate(config);
 
         // Configure the application
-        configure(config.getApplication());
+        configure(config.getModel());
 
         // Create a new context
         applicationContext = new ApplicationContext() {
@@ -121,8 +121,8 @@
                 return config.getVariables();
             }
 
-            public Application getApplication() {
-                return config.getApplication();
+            public ApplicationModel getModel() {
+                return config.getModel();
             }
         };
 
@@ -134,8 +134,8 @@
     private void interpolate(final ApplicationConfiguration config) throws Exception {
     	assert config != null;
 
-        Application app = config.getApplication();
-        Interpolator<Application> interp = new InterpolatorSupport<Application>();
+        ApplicationModel model = config.getModel();
+        Interpolator<ApplicationModel> interp = new InterpolatorSupport<ApplicationModel>();
 
         // Add value sources to resolve muck
         interp.addValueSource(new PropertiesBasedValueSource(System.getProperties()));
@@ -148,60 +148,60 @@
         }
 
         // Add application settings
-        interp.addValueSource(new PropertiesBasedValueSource(app.getProperties()));
+        interp.addValueSource(new PropertiesBasedValueSource(model.getProperties()));
 
-        app = interp.interpolate(app);
+        model = interp.interpolate(model);
 
         // Update the configuration with the new model
-        config.setApplication(app);
+        config.setModel(model);
     }
 
-    private void configure(final Application application) throws Exception {
-        assert application != null;
+    private void configure(final ApplicationModel applicationModel) throws Exception {
+        assert applicationModel != null;
 
-        log.debug("Application ID: {}", application.getId());
-        log.trace("Application descriptor: {}", application);
+        log.debug("Application ID: {}", applicationModel.getId());
+        log.trace("Application descriptor: {}", applicationModel);
 
         // Apply artifact manager configuration settings for application
-        configureArtifactManager(application);
+        configureArtifactManager(applicationModel);
 
         // Create the application container
-        applicationContainer = createContainer(application);
+        applicationContainer = createContainer(applicationModel);
     }
 
-    private void configureArtifactManager(final Application application) throws Exception
{
-        assert application != null;
+    private void configureArtifactManager(final ApplicationModel applicationModel) throws
Exception {
+        assert applicationModel != null;
         assert artifactManager != null;
 
         // Setup the local repository
-        LocalRepository localRepository = application.getLocalRepository();
+        LocalRepository localRepository = applicationModel.getLocalRepository();
 
         if (localRepository != null) {
             artifactManager.getRepositoryManager().setLocalRepository(localRepository.getDirectoryFile());
         }
 
         // Setup remote repositories
-        for (RemoteRepository repo : application.remoteRepositories()) {
+        for (RemoteRepository repo : applicationModel.remoteRepositories()) {
             artifactManager.getRepositoryManager().addRemoteRepository(repo.getId(), repo.getLocationUri());
         }
     }
 
-    private BeanContainer createContainer(final Application application) throws Exception
{
-        assert application != null;
+    private BeanContainer createContainer(final ApplicationModel applicationModel) throws
Exception {
+        assert applicationModel != null;
 
         log.debug("Creating application container");
 
-        List<URL> classPath = createClassPath(application);
+        List<URL> classPath = createClassPath(applicationModel);
 
-        BeanContainer child = container.createChild(application.getId(), classPath);
+        BeanContainer child = container.createChild(applicationModel.getId(), classPath);
 
         log.debug("Application container: {}", child);
 
         return child;
     }
 
-    private List<URL> createClassPath(final Application application) throws Exception
{
-        assert application != null;
+    private List<URL> createClassPath(final ApplicationModel applicationModel) throws
Exception {
+        assert applicationModel != null;
 
         ArtifactResolutionRequest request = new ArtifactResolutionRequest();
 
@@ -261,7 +261,7 @@
         request.setFilter(filter);
 
         Set<Artifact> artifacts = new LinkedHashSet<Artifact>();
-        List<Dependency> dependencies = application.dependencies(true); // include
groups
+        List<Dependency> dependencies = applicationModel.dependencies(true); // include
groups
 
         if (!dependencies.isEmpty()) {
             ArtifactFactory factory = artifactManager.getArtifactFactory();

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=694337&r1=694336&r2=694337&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
Thu Sep 11 09:23:48 2008
@@ -24,7 +24,7 @@
 import org.apache.geronimo.gshell.shell.ShellFactory;
 import org.apache.geronimo.gshell.application.settings.SettingsManager;
 import org.apache.geronimo.gshell.application.ApplicationManager;
-import org.apache.geronimo.gshell.model.application.Application;
+import org.apache.geronimo.gshell.model.application.ApplicationModel;
 import org.apache.geronimo.gshell.model.settings.SettingsModel;
 import org.apache.geronimo.gshell.artifact.ArtifactManager;
 
@@ -56,9 +56,9 @@
 
     void setSettingsManager(SettingsManager settingsManager);
 
-    Application getApplication();
+    ApplicationModel getApplicationModel();
 
-    void setApplication(Application application);
+    void setApplicationModel(ApplicationModel applicationModel);
 
     ApplicationManager getApplicationManager();
 

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=694337&r1=694336&r2=694337&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
Thu Sep 11 09:23:48 2008
@@ -28,7 +28,7 @@
 import org.apache.geronimo.gshell.command.Variables;
 import org.apache.geronimo.gshell.io.IO;
 import org.apache.geronimo.gshell.io.SystemOutputHijacker;
-import org.apache.geronimo.gshell.model.application.Application;
+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;
@@ -123,12 +123,12 @@
         this.settingsManager = settingsManager;
     }
 
-    public Application getApplication() {
-        return applicationConfig.getApplication();
+    public ApplicationModel getApplicationModel() {
+        return applicationConfig.getModel();
     }
 
-    public void setApplication(final Application application) {
-        applicationConfig.setApplication(application);
+    public void setApplicationModel(final ApplicationModel applicationModel) {
+        applicationConfig.setModel(applicationModel);
     }
 
     private ApplicationManager createApplicationManager() {

Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/HistoryImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/HistoryImpl.java?rev=694337&r1=694336&r2=694337&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/HistoryImpl.java
(original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/HistoryImpl.java
Thu Sep 11 09:23:48 2008
@@ -54,7 +54,7 @@
             assert applicationManager != null;
 
             try {
-                File file = applicationManager.getContext().getApplication().getBranding().getHistoryFile();
+                File file = applicationManager.getContext().getModel().getBranding().getHistoryFile();
 
                 log.debug("Application configured, setting history file: {}", file);
 

Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/LayoutManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/LayoutManagerImpl.java?rev=694337&r1=694336&r2=694337&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/LayoutManagerImpl.java
(original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/LayoutManagerImpl.java
Thu Sep 11 09:23:48 2008
@@ -49,7 +49,7 @@
     private Layout lookupLayout() {
         assert applicationManager != null;
 
-        Layout layout = applicationManager.getContext().getApplication().getLayout();
+        Layout layout = applicationManager.getContext().getModel().getLayout();
 
         if (layout == null) {
             throw new IllegalStateException("Layout has not been configured for application");

Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellImpl.java?rev=694337&r1=694336&r2=694337&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellImpl.java
(original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellImpl.java
Thu Sep 11 09:23:48 2008
@@ -104,7 +104,7 @@
             ApplicationContext context = applicationManager.getContext();
             io = context.getIo();
             variables = context.getVariables();
-            branding = context.getApplication().getBranding();
+            branding = context.getModel().getBranding();
 
             try {
                 loadProfileScripts();



Mime
View raw message