You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/09/11 10:58:26 UTC
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...
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>