Return-Path: 
 <scm-return-31626-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 32800 invoked from network); 11 Sep 2008 08:58:49 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 11 Sep 2008 08:58:49 -0000
Received: (qmail 44882 invoked by uid 500); 11 Sep 2008 08:58:46 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 44746 invoked by uid 500); 11 Sep 2008 08:58:46 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 44737 invoked by uid 99); 11 Sep 2008 08:58:46 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Sep 2008 01:58:46 -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, 11 Sep 2008 08:57:56 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 056722388986; Thu, 11 Sep 2008 01:58:28 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r694184 - in /geronimo/gshell/trunk: ./ gshell-support/
 gshell-support/gshell-interpolation/ gshell-support/gshell-interpolation/src/
 gshell-support/gshell-interpolation/src/main/
 gshell-support/gshell-interpolation/src/main/java/ gshell-su...
Date: Thu, 11 Sep 2008 08:58:26 -0000
To: scm@geronimo.apache.org
From: jdillon@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080911085828.056722388986@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jdillon
Date: Thu Sep 11 01:58:25 2008
New Revision: 694184

URL: http://svn.apache.org/viewvc?rev=694184&view=rev
Log:
Add gshell-interpolation

Added:
    geronimo/gshell/trunk/gshell-support/gshell-interpolation/
    geronimo/gshell/trunk/gshell-support/gshell-interpolation/pom.xml   (with props)
    geronimo/gshell/trunk/gshell-support/gshell-interpolation/src/
    geronimo/gshell/trunk/gshell-support/gshell-interpolation/src/main/
    geronimo/gshell/trunk/gshell-support/gshell-interpolation/src/main/java/
    geronimo/gshell/trunk/gshell-support/gshell-interpolation/src/main/java/org/
    geronimo/gshell/trunk/gshell-support/gshell-interpolation/src/main/java/org/apache/
    geronimo/gshell/trunk/gshell-support/gshell-interpolation/src/main/java/org/apache/geronimo/
    geronimo/gshell/trunk/gshell-support/gshell-interpolation/src/main/java/org/apache/geronimo/gshell/
    geronimo/gshell/trunk/gshell-support/gshell-interpolation/src/main/java/org/apache/geronimo/gshell/interpolation/
    geronimo/gshell/trunk/gshell-support/gshell-interpolation/src/main/java/org/apache/geronimo/gshell/interpolation/VariableInterpolator.java   (contents, props changed)
      - copied, changed from r694177, geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/VariableInterpolator.java
Removed:
    geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/VariableInterpolator.java
Modified:
    geronimo/gshell/trunk/gshell-support/pom.xml
    geronimo/gshell/trunk/gshell-wisdom/pom.xml
    geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java
    geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ExecutingVisitor.java
    geronimo/gshell/trunk/pom.xml

Added: geronimo/gshell/trunk/gshell-support/gshell-interpolation/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-interpolation/pom.xml?rev=694184&view=auto
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-interpolation/pom.xml (added)
+++ geronimo/gshell/trunk/gshell-support/gshell-interpolation/pom.xml Thu Sep 11 01:58:25 2008
@@ -0,0 +1,62 @@
+<?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$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.apache.geronimo.gshell.support</groupId>
+        <artifactId>gshell-support</artifactId>
+        <version>1.0-alpha-2-SNAPSHOT</version>
+    </parent>
+    
+    <artifactId>gshell-interpolation</artifactId>
+    <name>GShell Support :: Interpolation</name>
+    
+    <description>
+        Provides interpolation support.
+    </description>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.gshell</groupId>
+            <artifactId>gshell-api</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-interpolation</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>commons-jexl</groupId>
+            <artifactId>commons-jexl</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl104-over-slf4j</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file

Propchange: geronimo/gshell/trunk/gshell-support/gshell-interpolation/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-support/gshell-interpolation/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-support/gshell-interpolation/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: geronimo/gshell/trunk/gshell-support/gshell-interpolation/src/main/java/org/apache/geronimo/gshell/interpolation/VariableInterpolator.java (from r694177, geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/VariableInterpolator.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-interpolation/src/main/java/org/apache/geronimo/gshell/interpolation/VariableInterpolator.java?p2=geronimo/gshell/trunk/gshell-support/gshell-interpolation/src/main/java/org/apache/geronimo/gshell/interpolation/VariableInterpolator.java&p1=geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/VariableInterpolator.java&r1=694177&r2=694184&rev=694184&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/VariableInterpolator.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-interpolation/src/main/java/org/apache/geronimo/gshell/interpolation/VariableInterpolator.java Thu Sep 11 01:58:25 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.geronimo.gshell.wisdom.shell;
+package org.apache.geronimo.gshell.interpolation;
 
 import org.apache.commons.jexl.Expression;
 import org.apache.commons.jexl.ExpressionFactory;
@@ -37,10 +37,6 @@
 import java.util.Set;
 import java.util.List;
 
-//
-// TODO: Move to gshell-interpolation
-//
-
 /**
  * Provides interpolation for shell variables using Jexl.
  *

Propchange: geronimo/gshell/trunk/gshell-support/gshell-interpolation/src/main/java/org/apache/geronimo/gshell/interpolation/VariableInterpolator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-support/gshell-interpolation/src/main/java/org/apache/geronimo/gshell/interpolation/VariableInterpolator.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/gshell/trunk/gshell-support/gshell-interpolation/src/main/java/org/apache/geronimo/gshell/interpolation/VariableInterpolator.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-support/gshell-interpolation/src/main/java/org/apache/geronimo/gshell/interpolation/VariableInterpolator.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/gshell/trunk/gshell-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/pom.xml?rev=694184&r1=694183&r2=694184&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-support/pom.xml Thu Sep 11 01:58:25 2008
@@ -52,6 +52,7 @@
         <!--
         <module>gshell-plexus</module>
         -->
+        <module>gshell-interpolation</module>
         <module>gshell-url</module>
         <module>gshell-console</module>
     </modules>

Modified: geronimo/gshell/trunk/gshell-wisdom/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/pom.xml?rev=694184&r1=694183&r2=694184&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-wisdom/pom.xml Thu Sep 11 01:58:25 2008
@@ -46,6 +46,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl104-over-slf4j</artifactId>
+            <scope>test</scope>
         </dependency>
         
         <dependency>
@@ -75,6 +76,16 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.geronimo.gshell.support</groupId>
+            <artifactId>gshell-interpolation</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.gshell.support</groupId>
+            <artifactId>gshell-artifact</artifactId>
+        </dependency>
+        
+        <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-api</artifactId>
         </dependency>
@@ -93,21 +104,6 @@
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-layout</artifactId>
         </dependency>
-        
-        <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-interpolation</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>commons-jexl</groupId>
-            <artifactId>commons-jexl</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.gshell.support</groupId>
-            <artifactId>gshell-artifact</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>

Modified: geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java?rev=694184&r1=694183&r2=694184&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java Thu Sep 11 01:58:25 2008
@@ -245,8 +245,6 @@
             "gshell-i18n",
             "gshell-io",
             "gshell-model",
-            // "gshell-plexus",
-            // "gshell-rapture-bootstrap",
             "gshell-spring",
             "gshell-wisdom",
             "gshell-yarn",

Modified: geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ExecutingVisitor.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ExecutingVisitor.java?rev=694184&r1=694183&r2=694184&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ExecutingVisitor.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ExecutingVisitor.java Thu Sep 11 01:58:25 2008
@@ -31,6 +31,7 @@
 import org.apache.geronimo.gshell.parser.SimpleNode;
 import org.apache.geronimo.gshell.command.Arguments;
 import org.apache.geronimo.gshell.command.Variables;
+import org.apache.geronimo.gshell.interpolation.VariableInterpolator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: geronimo/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/pom.xml?rev=694184&r1=694183&r2=694184&view=diff
==============================================================================
--- geronimo/gshell/trunk/pom.xml (original)
+++ geronimo/gshell/trunk/pom.xml Thu Sep 11 01:58:25 2008
@@ -481,6 +481,12 @@
             </dependency>
 
             <dependency>
+                <groupId>org.apache.geronimo.gshell.support</groupId>
+                <artifactId>gshell-interpolation</artifactId>
+                <version>1.0-alpha-2-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
                 <groupId>org.apache.geronimo.gshell</groupId>
                 <artifactId>gshell-api</artifactId>
                 <version>1.0-alpha-2-SNAPSHOT</version>