geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r572500 - in /geronimo/sandbox/gshell/trunk: gshell-core/src/main/java/org/apache/geronimo/gshell/ gshell-core/src/main/resources/META-INF/plexus/ gshell-layout/ gshell-layout/src/main/java/org/apache/geronimo/gshell/layout/ gshell-layout/s...
Date Tue, 04 Sep 2007 03:06:20 GMT
Author: jdillon
Date: Mon Sep  3 20:06:19 2007
New Revision: 572500

URL: http://svn.apache.org/viewvc?rev=572500&view=rev
Log:
Starting to add meat to the layout manager, fixed some component muck too

Added:
    geronimo/sandbox/gshell/trunk/gshell-layout/src/main/java/org/apache/geronimo/gshell/layout/LayoutManager.java
  (with props)
    geronimo/sandbox/gshell/trunk/gshell-layout/src/main/java/org/apache/geronimo/gshell/layout/LayoutManagerImpl.java
  (with props)
    geronimo/sandbox/gshell/trunk/gshell-layout/src/main/resources/META-INF/
    geronimo/sandbox/gshell/trunk/gshell-layout/src/main/resources/META-INF/plexus/
    geronimo/sandbox/gshell/trunk/gshell-layout/src/main/resources/META-INF/plexus/components.xml
  (with props)
    geronimo/sandbox/gshell/trunk/gshell-parser/src/main/resources/META-INF/
    geronimo/sandbox/gshell/trunk/gshell-parser/src/main/resources/META-INF/plexus/
    geronimo/sandbox/gshell/trunk/gshell-parser/src/main/resources/META-INF/plexus/components.xml
  (with props)
Modified:
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Shell.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/plexus/components.xml
    geronimo/sandbox/gshell/trunk/gshell-layout/pom.xml

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Shell.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Shell.java?rev=572500&r1=572499&r2=572500&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Shell.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Shell.java
Mon Sep  3 20:06:19 2007
@@ -27,6 +27,7 @@
 import org.apache.geronimo.gshell.command.Variables;
 import org.apache.geronimo.gshell.common.StopWatch;
 import org.apache.geronimo.gshell.console.IO;
+import org.apache.geronimo.gshell.layout.LayoutManager;
 import org.apache.geronimo.gshell.util.Arguments;
 import org.codehaus.plexus.PlexusContainer;
 import org.slf4j.Logger;
@@ -47,6 +48,9 @@
 
     // @Requirement
     private PlexusContainer container;
+
+    // @Requirement
+    private LayoutManager layoutManager;
 
     // @Requirement
     private CommandManager commandManager;

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/plexus/components.xml?rev=572500&r1=572499&r2=572500&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/plexus/components.xml
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/plexus/components.xml
Mon Sep  3 20:06:19 2007
@@ -34,6 +34,10 @@
                     <field-name>container</field-name>
                 </requirement>
                 <requirement>
+                    <role>org.apache.geronimo.gshell.layout.LayoutManager</role>
+                    <field-name>layoutManager</field-name>
+                </requirement>
+                <requirement>
                     <role>org.apache.geronimo.gshell.command.CommandManager</role>
                     <field-name>commandManager</field-name>
                 </requirement>
@@ -63,14 +67,6 @@
         </component>
 
         <component>
-            <role>org.apache.geronimo.gshell.commandline.parser.CommandLineParser</role>
-            <role-hint>default</role-hint>
-            <implementation>org.apache.geronimo.gshell.commandline.parser.CommandLineParser</implementation>
-            <instantiation-strategy>singleton</instantiation-strategy>
-            <lifecycle-handler>plexus</lifecycle-handler>
-        </component>
-
-        <component>
             <role>org.apache.geronimo.gshell.CommandLineBuilder</role>
             <role-hint>default</role-hint>
             <implementation>org.apache.geronimo.gshell.CommandLineBuilder</implementation>
@@ -82,7 +78,7 @@
                     <field-name>container</field-name>
                 </requirement>
                 <requirement>
-                    <role>org.apache.geronimo.gshell.commandline.parser.CommandLineParser</role>
+                    <role>org.apache.geronimo.gshell.parser.CommandLineParser</role>
                     <field-name>parser</field-name>
                 </requirement>
             </requirements>

Modified: geronimo/sandbox/gshell/trunk/gshell-layout/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-layout/pom.xml?rev=572500&r1=572499&r2=572500&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-layout/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-layout/pom.xml Mon Sep  3 20:06:19 2007
@@ -39,9 +39,19 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.apache.geronimo.gshell</groupId>
+            <artifactId>gshell-api</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-component-api</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>com.thoughtworks.xstream</groupId>
             <artifactId>xstream</artifactId>
-            <version>1.2.2</version>
         </dependency>
         
         <!--
@@ -54,6 +64,12 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

Added: geronimo/sandbox/gshell/trunk/gshell-layout/src/main/java/org/apache/geronimo/gshell/layout/LayoutManager.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-layout/src/main/java/org/apache/geronimo/gshell/layout/LayoutManager.java?rev=572500&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-layout/src/main/java/org/apache/geronimo/gshell/layout/LayoutManager.java
(added)
+++ geronimo/sandbox/gshell/trunk/gshell-layout/src/main/java/org/apache/geronimo/gshell/layout/LayoutManager.java
Mon Sep  3 20:06:19 2007
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.gshell.layout;
+
+/**
+ * ???
+ *
+ * @version $Rev$ $Date$
+ */
+public interface LayoutManager
+{
+}

Propchange: geronimo/sandbox/gshell/trunk/gshell-layout/src/main/java/org/apache/geronimo/gshell/layout/LayoutManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

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

Propchange: geronimo/sandbox/gshell/trunk/gshell-layout/src/main/java/org/apache/geronimo/gshell/layout/LayoutManager.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/gshell/trunk/gshell-layout/src/main/java/org/apache/geronimo/gshell/layout/LayoutManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-layout/src/main/java/org/apache/geronimo/gshell/layout/LayoutManagerImpl.java?rev=572500&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-layout/src/main/java/org/apache/geronimo/gshell/layout/LayoutManagerImpl.java
(added)
+++ geronimo/sandbox/gshell/trunk/gshell-layout/src/main/java/org/apache/geronimo/gshell/layout/LayoutManagerImpl.java
Mon Sep  3 20:06:19 2007
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.gshell.layout;
+
+import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * The default implementation of a {@link LayoutManager}.
+ *
+ * @version $Rev$ $Date$
+ */
+public class LayoutManagerImpl
+    implements LayoutManager, Initializable
+{
+    private final Logger log = LoggerFactory.getLogger(getClass());
+
+    // @Requirement
+    private PlexusContainer container;
+
+    public void initialize() throws InitializationException {
+        //
+        // TODO: Load up the model... from configuration
+        //
+    }
+}
\ No newline at end of file

Propchange: geronimo/sandbox/gshell/trunk/gshell-layout/src/main/java/org/apache/geronimo/gshell/layout/LayoutManagerImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

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

Propchange: geronimo/sandbox/gshell/trunk/gshell-layout/src/main/java/org/apache/geronimo/gshell/layout/LayoutManagerImpl.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/gshell/trunk/gshell-layout/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-layout/src/main/resources/META-INF/plexus/components.xml?rev=572500&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-layout/src/main/resources/META-INF/plexus/components.xml
(added)
+++ geronimo/sandbox/gshell/trunk/gshell-layout/src/main/resources/META-INF/plexus/components.xml
Mon Sep  3 20:06:19 2007
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<component-set>
+    <components>
+        <component>
+            <role>org.apache.geronimo.gshell.layout.LayoutManager</role>
+            <role-hint>default</role-hint>
+            <implementation>org.apache.geronimo.gshell.layout.LayoutManagerImpl</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.command.CommandManager</role>
+                    <field-name>commandManager</field-name>
+                </requirement>
+                -->
+            </requirements>
+        </component>
+    </components>
+</component-set>
\ No newline at end of file

Propchange: geronimo/sandbox/gshell/trunk/gshell-layout/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/gshell-layout/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/gshell-layout/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/gshell/trunk/gshell-parser/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-parser/src/main/resources/META-INF/plexus/components.xml?rev=572500&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-parser/src/main/resources/META-INF/plexus/components.xml
(added)
+++ geronimo/sandbox/gshell/trunk/gshell-parser/src/main/resources/META-INF/plexus/components.xml
Mon Sep  3 20:06:19 2007
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<component-set>
+    <components>
+        <component>
+            <role>org.apache.geronimo.gshell.parser.CommandLineParser</role>
+            <role-hint>default</role-hint>
+            <implementation>org.apache.geronimo.gshell.parser.CommandLineParser</implementation>
+            <instantiation-strategy>singleton</instantiation-strategy>
+            <lifecycle-handler>plexus</lifecycle-handler>
+        </component>
+    </components>
+</component-set>
\ No newline at end of file

Propchange: geronimo/sandbox/gshell/trunk/gshell-parser/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/gshell-parser/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/gshell-parser/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message