geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r741078 - /geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandResolverImpl.java
Date Thu, 05 Feb 2009 11:39:11 GMT
Author: gnodet
Date: Thu Feb  5 11:39:10 2009
New Revision: 741078

URL: http://svn.apache.org/viewvc?rev=741078&view=rev
Log:
GSHELL-158: The group.name has an incorrect value at the root when using '..' from a subshell

Modified:
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandResolverImpl.java

Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandResolverImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandResolverImpl.java?rev=741078&r1=741077&r2=741078&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandResolverImpl.java
(original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandResolverImpl.java
Thu Feb  5 11:39:10 2009
@@ -330,7 +330,11 @@
         log.trace("Creating command for group: {}", file);
 
         GroupCommand command = container.getBean(GroupCommand.class);
-        command.setPath(file.getName().getBaseName());
+        String path = fileSystemAccess.dereference(commandsRoot).getName().getRelativeName(file.getName());
+        if (".".equals(path)) {
+            path = "/";
+        }
+        command.setPath(path);
         
         return command;
     }



Mime
View raw message