geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r694383 - in /geronimo/gshell/trunk: gshell-parser/src/test/java/org/apache/geronimo/gshell/parser/ gshell-support/gshell-prefs/src/main/java/org/apache/geronimo/gshell/prefs/ gshell-wisdom/gshell-wisdom-core/ gshell-wisdom/gshell-wisdom-co...
Date Thu, 11 Sep 2008 17:44:52 GMT
Author: jdillon
Date: Thu Sep 11 10:44:49 2008
New Revision: 694383

URL: http://svn.apache.org/viewvc?rev=694383&view=rev
Log:
Start to enable preferences muck

Modified:
    geronimo/gshell/trunk/gshell-parser/src/test/java/org/apache/geronimo/gshell/parser/CommandLineParserVisitorTest.java
    geronimo/gshell/trunk/gshell-support/gshell-prefs/src/main/java/org/apache/geronimo/gshell/prefs/PreferencesProcessor.java
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/pom.xml
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandContainerImpl.java

Modified: geronimo/gshell/trunk/gshell-parser/src/test/java/org/apache/geronimo/gshell/parser/CommandLineParserVisitorTest.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-parser/src/test/java/org/apache/geronimo/gshell/parser/CommandLineParserVisitorTest.java?rev=694383&r1=694382&r2=694383&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-parser/src/test/java/org/apache/geronimo/gshell/parser/CommandLineParserVisitorTest.java
(original)
+++ geronimo/gshell/trunk/gshell-parser/src/test/java/org/apache/geronimo/gshell/parser/CommandLineParserVisitorTest.java
Thu Sep 11 10:44:49 2008
@@ -51,11 +51,12 @@
 
         MockCommandLineVisitor v = new MockCommandLineVisitor();
 
-        Object result = cl.jjtAccept(v, null);
+        cl.jjtAccept(v, null); // ignore result
 
         assertNull(v.simpleNode);
         assertNotNull(v.commandLine);
         assertNotNull(v.expression);
+        assertNotNull(v.process);
         assertNotNull(v.quotedString);
         assertNotNull(v.opaqueString);
         assertNotNull(v.plainString);
@@ -113,6 +114,5 @@
 
             return node.childrenAccept(this, data);
         }
-
     }
 }

Modified: geronimo/gshell/trunk/gshell-support/gshell-prefs/src/main/java/org/apache/geronimo/gshell/prefs/PreferencesProcessor.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-prefs/src/main/java/org/apache/geronimo/gshell/prefs/PreferencesProcessor.java?rev=694383&r1=694382&r2=694383&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-prefs/src/main/java/org/apache/geronimo/gshell/prefs/PreferencesProcessor.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-prefs/src/main/java/org/apache/geronimo/gshell/prefs/PreferencesProcessor.java
Thu Sep 11 10:44:49 2008
@@ -73,7 +73,7 @@
     // Processing
     //
 
-    public void process(final Preferences node) throws ProcessingException {
-        assert node != null;
+    public void process() throws ProcessingException {
+        // TODO:
     }
 }
\ No newline at end of file

Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/pom.xml?rev=694383&r1=694382&r2=694383&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/pom.xml Thu Sep 11 10:44:49 2008
@@ -50,6 +50,11 @@
 
         <dependency>
             <groupId>org.apache.geronimo.gshell.support</groupId>
+            <artifactId>gshell-prefs</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.gshell.support</groupId>
             <artifactId>gshell-console</artifactId>
         </dependency>
 

Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandContainerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandContainerImpl.java?rev=694383&r1=694382&r2=694383&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandContainerImpl.java
(original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandContainerImpl.java
Thu Sep 11 10:44:49 2008
@@ -32,6 +32,7 @@
 import org.apache.geronimo.gshell.command.CommandContainerRegistry;
 import org.apache.geronimo.gshell.command.CommandContainerAware;
 import org.apache.geronimo.gshell.notification.Notification;
+import org.apache.geronimo.gshell.prefs.PreferencesProcessor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
@@ -144,8 +145,14 @@
                 if (processArguments(context, action, context.getArguments())) {
                     return new CommandResult(CommandAction.Result.SUCCESS);
                 }
+
+                /*
+                PreferencesProcessor pp = new PreferencesProcessor();
+                pp.addBean(action);
+                pp.process();
+                */
             }
-            catch (ProcessingException e) {
+            catch (Exception e) {
                 new CommandResult(e);
             }
 
@@ -183,15 +190,11 @@
      *
      * @throws ProcessingException  A failure occured while processing the command-line.
      */
-    private boolean processArguments(final CommandContext context, final CommandAction action,
final Object[] args) throws ProcessingException {
+    private boolean processArguments(final CommandContext context, final CommandAction action,
final Object[] args) throws Exception {
         assert context != null;
         assert action != null;
         assert args != null;
 
-        //
-        // TODO: Add preferences processor
-        //
-        
         CommandLineProcessor clp = new CommandLineProcessor();
         clp.addBean(action);
 



Mime
View raw message