geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r573672 - in /geronimo/sandbox/gshell/trunk: gshell-cli/src/main/resources/META-INF/plexus/plexus.xml gshell-core/src/main/java/org/apache/geronimo/gshell/layout/LayoutManagerImpl.java
Date Fri, 07 Sep 2007 18:54:29 GMT
Author: jdillon
Date: Fri Sep  7 11:54:28 2007
New Revision: 573672

URL: http://svn.apache.org/viewvc?rev=573672&view=rev
Log:
Strip out some old cruft re layout loading for now

Modified:
    geronimo/sandbox/gshell/trunk/gshell-cli/src/main/resources/META-INF/plexus/plexus.xml
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/LayoutManagerImpl.java

Modified: geronimo/sandbox/gshell/trunk/gshell-cli/src/main/resources/META-INF/plexus/plexus.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-cli/src/main/resources/META-INF/plexus/plexus.xml?rev=573672&r1=573671&r2=573672&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-cli/src/main/resources/META-INF/plexus/plexus.xml
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-cli/src/main/resources/META-INF/plexus/plexus.xml
Fri Sep  7 11:54:28 2007
@@ -44,33 +44,6 @@
             <implementation>org.apache.geronimo.gshell.plugin.PluginCollector</implementation>
         </component>
         
-        <component>
-            <role>org.apache.geronimo.gshell.layout.XMLLayoutLoader</role>
-            <role-hint>default</role-hint>
-            <implementation>org.apache.geronimo.gshell.layout.XMLLayoutLoader</implementation>
-            <instantiation-strategy>singleton</instantiation-strategy>
-            <lifecycle-handler>plexus</lifecycle-handler>
-            <requirements>
-                <requirement>
-                    <role>org.codehaus.plexus.PlexusContainer</role>
-                    <field-name>container</field-name>
-                </requirement>
-                <requirement>
-                    <role>org.apache.geronimo.gshell.parser.CommandLineParser</role>
-                    <field-name>parser</field-name>
-                </requirement>
-            </requirements>
-
-            <!--
-            TODO: Really should expose this URL to the user... or maybe have a simple config.xml
(or props even) which
-                  it can be pulled from.
-            -->
-            
-            <configuration>
-                <url>file://${gshell.home}/etc/layout.xml</url>
-            </configuration>
-        </component>
-
         <!--
         HACK: This is a massive hackinstine just to get things moving along... and will be
tossed as soon as a palatable solution crosses my path.
         -->

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/LayoutManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/LayoutManagerImpl.java?rev=573672&r1=573671&r2=573672&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/LayoutManagerImpl.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/LayoutManagerImpl.java
Fri Sep  7 11:54:28 2007
@@ -58,6 +58,10 @@
     public void initialize() throws InitializationException {
         assert info != null;
 
+        //
+        // TODO: Move to a layout loader to abstract how this is loaded and allow for better
configuration
+        //
+        
         URL url = null;
         try {
             url = new File(info.getHomeDir(), "etc/layout.xml").toURI().toURL();



Mime
View raw message