Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 89866 invoked from network); 25 Sep 2008 15:54:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Sep 2008 15:54:35 -0000 Received: (qmail 50547 invoked by uid 500); 25 Sep 2008 15:54:32 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 50505 invoked by uid 500); 25 Sep 2008 15:54:32 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 50496 invoked by uid 99); 25 Sep 2008 15:54:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Sep 2008 08:54:32 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Sep 2008 15:53:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 38A6D23889B7; Thu, 25 Sep 2008 08:54:14 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r699008 - in /geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom: alias/AliasCommand.java alias/AliasManagerImpl.java config/PluginParser.java Date: Thu, 25 Sep 2008 15:54:14 -0000 To: scm@geronimo.apache.org From: jdillon@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080925155414.38A6D23889B7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jdillon Date: Thu Sep 25 08:54:13 2008 New Revision: 699008 URL: http://svn.apache.org/viewvc?rev=699008&view=rev Log: Go back to constructor args for AliasCommand Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/alias/AliasCommand.java geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/alias/AliasManagerImpl.java geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/config/PluginParser.java Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/alias/AliasCommand.java URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/alias/AliasCommand.java?rev=699008&r1=699007&r2=699008&view=diff ============================================================================== --- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/alias/AliasCommand.java (original) +++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/alias/AliasCommand.java Thu Sep 25 08:54:13 2008 @@ -35,26 +35,14 @@ private String target; - public String getName() { - return name; - } - - public void setName(final String name) { + public AliasCommand(final String name, final String target) { assert name != null; + assert target != null; this.name = name; - } - - public String getTarget() { - return target; - } - - public void setTarget(final String target) { - assert target != null; - this.target = target; } - + @Override public CommandResult execute(final ShellContext context, final Object[] args) { assert context != null; Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/alias/AliasManagerImpl.java URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/alias/AliasManagerImpl.java?rev=699008&r1=699007&r2=699008&view=diff ============================================================================== --- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/alias/AliasManagerImpl.java (original) +++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/alias/AliasManagerImpl.java Thu Sep 25 08:54:13 2008 @@ -65,6 +65,8 @@ log.debug("Defining alias: {} -> {}", name, target); + final AliasCommand command = new AliasCommand(name, target); + Alias alias = new Alias() { public String getName() { return name; @@ -73,6 +75,8 @@ public String getTarget() { return target; } + + // TODO: Track the command }; aliases.put(name, alias); Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/config/PluginParser.java URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/config/PluginParser.java?rev=699008&r1=699007&r2=699008&view=diff ============================================================================== --- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/config/PluginParser.java (original) +++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/config/PluginParser.java Thu Sep 25 08:54:13 2008 @@ -376,8 +376,8 @@ log.trace("Parse alias; element; {}", element); BeanDefinitionBuilder alias = BeanDefinitionBuilder.rootBeanDefinition(AliasCommand.class); - alias.addPropertyValue("name", element.getAttribute("name")); - alias.addPropertyValue("target", element.getAttribute("target")); + alias.addConstructorArgValue(element.getAttribute("name")); + alias.addConstructorArgValue(element.getAttribute("target")); return alias; }