geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r693750 - in /geronimo/gshell/trunk: ./ gshell-assembly/ gshell-support/gshell-io/ gshell-support/gshell-spring/ gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/ gshell-wisdom/src/main/java/org/apache/geronimo/g...
Date Wed, 10 Sep 2008 09:11:59 GMT
Author: jdillon
Date: Wed Sep 10 02:11:57 2008
New Revision: 693750

URL: http://svn.apache.org/viewvc?rev=693750&view=rev
Log:
Remove more plexus references where they are not needed
Setup ClassWorlds in the BeanContainerImpl
Disable gshell-remote for now, since its heavily Plexus-oriented
Copy over missing components from rapture to wisdom

Added:
    geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ExecutingVisitor.java
  (with props)
    geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/VariableInterpolator.java
  (with props)
Removed:
    geronimo/gshell/trunk/gshell-wisdom/src/main/resources/META-INF/gshell/
    geronimo/gshell/trunk/gshell-wisdom/src/main/resources/META-INF/spring/plexus.xml
Modified:
    geronimo/gshell/trunk/gshell-assembly/pom.xml
    geronimo/gshell/trunk/gshell-support/gshell-io/pom.xml
    geronimo/gshell/trunk/gshell-support/gshell-spring/pom.xml
    geronimo/gshell/trunk/gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/BeanContainerImpl.java
    geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/CommandLineBuilderImpl.java
    geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/LayoutManagerImpl.java
    geronimo/gshell/trunk/gshell-wisdom/src/main/resources/META-INF/spring/components.xml
    geronimo/gshell/trunk/pom.xml

Modified: geronimo/gshell/trunk/gshell-assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-assembly/pom.xml?rev=693750&r1=693749&r2=693750&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-assembly/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-assembly/pom.xml Wed Sep 10 02:11:57 2008
@@ -49,10 +49,17 @@
             <artifactId>gshell-cli</artifactId>
         </dependency>
 
+        <!--
         <dependency>
             <groupId>org.apache.geronimo.gshell.rapture</groupId>
             <artifactId>gshell-rapture-bootstrap</artifactId>
         </dependency>
+        -->
+
+         <dependency>
+            <groupId>org.apache.geronimo.gshell</groupId>
+            <artifactId>gshell-wisdom</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>

Modified: geronimo/gshell/trunk/gshell-support/gshell-io/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-io/pom.xml?rev=693750&r1=693749&r2=693750&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-io/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-io/pom.xml Wed Sep 10 02:11:57 2008
@@ -58,21 +58,6 @@
             <groupId>org.apache.geronimo.gshell.support</groupId>
             <artifactId>gshell-ansi</artifactId>
         </dependency>
-        
-        <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-container-default</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-utils</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-component-annotations</artifactId>
-        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

Modified: geronimo/gshell/trunk/gshell-support/gshell-spring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-spring/pom.xml?rev=693750&r1=693749&r2=693750&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-spring/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-spring/pom.xml Wed Sep 10 02:11:57 2008
@@ -74,10 +74,12 @@
             <artifactId>spring-beans</artifactId>
         </dependency>
 
+        <!--
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
         </dependency>
+        -->
         
         <dependency>
             <groupId>org.springframework</groupId>
@@ -92,21 +94,17 @@
         </dependency>
         
         <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-classworlds</artifactId>
         </dependency>
 
+        <!--
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-spring</artifactId>
             <version>1.0.1</version>
         </dependency>
+        -->
     </dependencies>
 
 </project>
\ No newline at end of file

Modified: geronimo/gshell/trunk/gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/BeanContainerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/BeanContainerImpl.java?rev=693750&r1=693749&r2=693750&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/BeanContainerImpl.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/BeanContainerImpl.java
Wed Sep 10 02:11:57 2008
@@ -25,7 +25,11 @@
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.codehaus.classworlds.ClassWorld;
+import org.codehaus.plexus.classworlds.ClassWorld;
+import org.codehaus.plexus.classworlds.realm.ClassRealm;
+import org.codehaus.plexus.classworlds.realm.DuplicateRealmException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Default {@link BeanContainer} implementation.
@@ -35,25 +39,40 @@
 public class BeanContainerImpl
     implements BeanContainer
 {
+    private static final String REALM_ID = "gshell";
+
     private static final String[] CONFIG_LOCATIONS = {
         "classpath*:META-INF/spring/components.xml",
         "classpath*:META-INF/gshell/commands.xml"
     };
 
+    private final Logger log = LoggerFactory.getLogger(getClass());
+
     private ClassPathXmlApplicationContext context;
 
     private ClassWorld classWorld;
+
+    private ClassRealm classRealm;
     
     public BeanContainerImpl(final ClassLoader classLoader) {
         assert classLoader != null;
 
+        // Setup classworlds
+        classWorld = new ClassWorld();
+        try {
+            classRealm = classWorld.newRealm(REALM_ID, classLoader);
+        } catch (DuplicateRealmException e) {
+            // Should never happen
+            throw new Error(e);
+        }
+
+        // Construct the container and add customizations
         context = new ClassPathXmlApplicationContext(CONFIG_LOCATIONS, false);
         context.registerShutdownHook();
+        context.setClassLoader(classRealm);
+        addBeanPostProcessor(new BeanContainerAwareProcessor(this));
 
-        addBeanPostProcessor(new BeanContainerAwareProcessor(BeanContainerImpl.this));
-
-        // TODO: Set classloader
-
+        // Refresh to load things up
         context.refresh();
     }
 

Modified: geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/CommandLineBuilderImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/CommandLineBuilderImpl.java?rev=693750&r1=693749&r2=693750&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/CommandLineBuilderImpl.java
(original)
+++ geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/CommandLineBuilderImpl.java
Wed Sep 10 02:11:57 2008
@@ -22,10 +22,12 @@
 import org.apache.geronimo.gshell.application.ApplicationManager;
 import org.apache.geronimo.gshell.commandline.CommandLine;
 import org.apache.geronimo.gshell.commandline.CommandLineBuilder;
+import org.apache.geronimo.gshell.commandline.CommandLineExecutor;
 import org.apache.geronimo.gshell.notification.ErrorNotification;
 import org.apache.geronimo.gshell.parser.ASTCommandLine;
 import org.apache.geronimo.gshell.parser.CommandLineParser;
 import org.apache.geronimo.gshell.parser.ParseException;
+import org.apache.geronimo.gshell.command.Variables;
 import org.codehaus.plexus.util.IOUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -47,6 +49,9 @@
     @Autowired
     private ApplicationManager applicationManager;
 
+    @Autowired
+    private CommandLineExecutor executor;
+
     private final CommandLineParser parser = new CommandLineParser();
 
     public CommandLineBuilderImpl() {}
@@ -80,15 +85,10 @@
         }
 
         try {
-            /*
-            FIXME:
-            assert container != null;
-            CommandLineExecutor executor = (CommandLineExecutor) container.lookup(CommandLineExecutor.class);
-
             assert applicationManager != null;
             Variables vars = applicationManager.getContext().getVariables();
 
-
+            assert executor != null;
             final ExecutingVisitor visitor = new ExecutingVisitor(executor, vars);
             final ASTCommandLine root = parse(commandLine);
 
@@ -97,9 +97,6 @@
                     return root.jjtAccept(visitor, null);
                 }
             };
-            */
-
-            return null;
         }
         catch (Exception e) {
             throw new ErrorNotification(e);

Added: 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=693750&view=auto
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ExecutingVisitor.java
(added)
+++ geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ExecutingVisitor.java
Wed Sep 10 02:11:57 2008
@@ -0,0 +1,140 @@
+/*
+ * 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.
+ */
+
+package org.apache.geronimo.gshell.wisdom.shell;
+
+import org.apache.geronimo.gshell.commandline.CommandLineExecutor;
+import org.apache.geronimo.gshell.notification.ErrorNotification;
+import org.apache.geronimo.gshell.parser.ASTCommandLine;
+import org.apache.geronimo.gshell.parser.ASTExpression;
+import org.apache.geronimo.gshell.parser.ASTOpaqueString;
+import org.apache.geronimo.gshell.parser.ASTPlainString;
+import org.apache.geronimo.gshell.parser.ASTProcess;
+import org.apache.geronimo.gshell.parser.ASTQuotedString;
+import org.apache.geronimo.gshell.parser.CommandLineParserVisitor;
+import org.apache.geronimo.gshell.parser.SimpleNode;
+import org.apache.geronimo.gshell.command.Arguments;
+import org.apache.geronimo.gshell.command.Variables;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Visitor which will execute command-lines as parsed.
+ *
+ * @version $Rev$ $Date$
+ */
+public class ExecutingVisitor
+    implements CommandLineParserVisitor
+{
+    private final Logger log = LoggerFactory.getLogger(getClass());
+
+    private final Variables variables;
+
+    private final CommandLineExecutor executor;
+
+    private final VariableInterpolator interp = new VariableInterpolator();
+
+    public ExecutingVisitor(final CommandLineExecutor executor, final Variables variables)
{
+        assert executor != null;
+        assert variables != null;
+
+        this.executor = executor;
+        this.variables = variables;
+    }
+
+    public Object visit(final SimpleNode node, final Object data) {
+        assert node != null;
+
+        // It is an error if we forgot to implement a node handler
+        throw new Error("Unhandled node type: " + node.getClass().getName());
+    }
+
+    public Object visit(final ASTCommandLine node, final Object data) {
+        assert node != null;
+
+        //
+        // NOTE: Visiting children will execute seperate commands in serial
+        //
+
+        return node.childrenAccept(this, data);
+    }
+
+    public Object visit(final ASTExpression node, final Object data) {
+        assert node != null;
+
+        Object[][] commands = new Object[node.jjtGetNumChildren()][];
+        for (int i = 0; i < node.jjtGetNumChildren(); i++) {
+            ASTProcess proc = (ASTProcess) node.jjtGetChild(i);
+            List<Object> list = new ArrayList<Object>(proc.jjtGetNumChildren());
+            proc.childrenAccept(this, list);
+            commands[i] = list.toArray(new Object[list.size()]);
+            assert list.size() >= 1;
+        }
+        try {
+            return executor.execute(commands);
+        }
+        catch (Exception e) {
+            String s = Arguments.asString(commands[0]);
+            for (int i = 1; i < commands.length; i++) {
+                s += " | " + Arguments.asString(commands[i]);
+            }
+            throw new ErrorNotification("Shell execution failed; commands=" + s, e);
+        }
+    }
+
+    public Object visit(ASTProcess node, Object data) {
+        return null;
+    }
+
+    @SuppressWarnings({"unchecked"})
+    private Object appendString(final String value, final Object data) {
+        assert data != null;
+        assert data instanceof List;
+
+        List<Object> args = (List<Object>)data;
+        args.add(value);
+
+        return value;
+    }
+
+    public Object visit(final ASTQuotedString node, final Object data) {
+        assert node != null;
+
+        String value = interp.interpolate(node.getValue(), variables);
+
+        return appendString(value, data);
+    }
+
+    public Object visit(final ASTPlainString node, final Object data) {
+        assert node != null;
+
+        String value = interp.interpolate(node.getValue(), variables);
+
+        return appendString(value, data);
+    }
+
+    public Object visit(final ASTOpaqueString node, final Object data) {
+        assert node != null;
+
+        return appendString(node.getValue(), data);
+    }
+}

Propchange: geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ExecutingVisitor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ExecutingVisitor.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ExecutingVisitor.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ExecutingVisitor.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/LayoutManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/LayoutManagerImpl.java?rev=693750&r1=693749&r2=693750&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/LayoutManagerImpl.java
(original)
+++ geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/LayoutManagerImpl.java
Wed Sep 10 02:11:57 2008
@@ -29,8 +29,6 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import javax.annotation.Resource;
-
 /**
  * The default implementation of the {@link LayoutManager} component.
  *

Added: 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-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/VariableInterpolator.java?rev=693750&view=auto
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/VariableInterpolator.java
(added)
+++ geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/VariableInterpolator.java
Wed Sep 10 02:11:57 2008
@@ -0,0 +1,186 @@
+/*
+ * 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.
+ */
+
+package org.apache.geronimo.gshell.wisdom.shell;
+
+import org.apache.commons.jexl.Expression;
+import org.apache.commons.jexl.ExpressionFactory;
+import org.apache.commons.jexl.JexlContext;
+import org.apache.commons.jexl.resolver.FlatResolver;
+import org.apache.geronimo.gshell.command.Variables;
+import org.apache.geronimo.gshell.notification.ErrorNotification;
+import org.codehaus.plexus.interpolation.InterpolationException;
+import org.codehaus.plexus.interpolation.Interpolator;
+import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
+import org.codehaus.plexus.interpolation.ValueSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+import java.util.List;
+
+/**
+ * Provides interpolation for shell variables using Jexl.
+ *
+ * Still using Jexl here for now, since it can handle expression like <tt>${env.TERM}</tt>
+ * (where <tt>env</tt> is a variable bound to a map, ...).
+ *
+ * @version $Rev$ $Date$
+ */
+public class VariableInterpolator
+{
+    private final Logger log = LoggerFactory.getLogger(getClass());
+
+    private final FlatResolver resolver = new FlatResolver(true);
+
+    public String interpolate(final String input, final Variables vars) {
+        assert input != null;
+        assert vars != null;
+
+        // If there is no $ in the expression, then skip the interpolation muck to speed
things up
+        if (input.indexOf('$') == -1) {
+            return input;
+        }
+
+        Interpolator interp = createInterpolator(vars);
+
+        log.trace("Interpolating: {}", input);
+
+        String result;
+        try {
+            result = interp.interpolate(input);
+        }
+        catch (InterpolationException e) {
+            throw new ErrorNotification("Failed to interpolate expression: " + input, e);
+        }
+
+        log.trace("Iterpolated result: {}", result);
+
+        return result;
+    }
+
+    private Interpolator createInterpolator(final Variables vars) {
+        Interpolator interp = new RegexBasedInterpolator();
+
+        // This complex crap here is to adapt our Variables to a JexlContext w/the least
overhead
+        interp.addValueSource(new ValueSource()
+        {
+            final Map map = new Map() {
+                private String key(final Object key) {
+                    return String.valueOf(key);
+                }
+
+                public Object get(final Object key) {
+                    return vars.get(key(key));
+                }
+
+                public Object put(final Object key, final Object value) {
+                    Object prev = vars.get(key(key));
+
+                    vars.set(key(key), value);
+
+                    return prev;
+                }
+
+                // Jexl does not use any of these Map methods
+
+                public int size() {
+                    throw new UnsupportedOperationException();
+                }
+
+                public boolean isEmpty() {
+                    throw new UnsupportedOperationException();
+                }
+
+                public boolean containsKey(Object key) {
+                    throw new UnsupportedOperationException();
+                }
+
+                public boolean containsValue(Object value) {
+                    throw new UnsupportedOperationException();
+                }
+
+                public Object remove(Object key) {
+                    throw new UnsupportedOperationException();
+                }
+
+                public void putAll(Map t) {
+                    throw new UnsupportedOperationException();
+                }
+
+                public void clear() {
+                    throw new UnsupportedOperationException();
+                }
+
+                public Set keySet() {
+                    throw new UnsupportedOperationException();
+                }
+
+                public Collection values() {
+                    throw new UnsupportedOperationException();
+                }
+
+                public Set entrySet() {
+                    throw new UnsupportedOperationException();
+                }
+            };
+
+            final JexlContext jc = new JexlContext()
+            {
+                public Map getVars() {
+                    return map;
+                }
+
+                // Jexl never calls setVars
+
+                public void setVars(Map map) {
+                    throw new UnsupportedOperationException();
+                }
+            };
+
+            public Object getValue(final String s) {
+                try {
+                    Expression expr = ExpressionFactory.createExpression(s);
+                    expr.addPreResolver(resolver);
+
+                    return expr.evaluate(jc);
+                }
+                catch (Exception e) {
+                    throw new ErrorNotification("Failed to evaluate expression: " + s, e);
+                }
+            }
+
+            //
+            // TODO: See what this is supposed to return...
+            //
+
+            public List getFeedback() {
+                return null;
+            }
+
+            public void clearFeedback() {
+                // ???
+            }
+        });
+
+        return interp;
+    }
+}
\ No newline at end of file

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

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

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

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

Modified: geronimo/gshell/trunk/gshell-wisdom/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/src/main/resources/META-INF/spring/components.xml?rev=693750&r1=693749&r2=693750&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/src/main/resources/META-INF/spring/components.xml
(original)
+++ geronimo/gshell/trunk/gshell-wisdom/src/main/resources/META-INF/spring/components.xml
Wed Sep 10 02:11:57 2008
@@ -31,10 +31,6 @@
 
     <context:annotation-config/>
     
-    <!--
-    default-init-method="init", or use annos @PostConstruct @PreDestroy
-    -->
-
     <!-- Application -->
 
     <bean id="applicationManager" class="org.apache.geronimo.gshell.wisdom.application.ApplicationManagerImpl">
@@ -70,5 +66,10 @@
 
     <bean id="shellInfo" class="org.apache.geronimo.gshell.wisdom.shell.ShellInfoImpl">
     </bean>
+
+    <!-- Plexus -->
+
+    <bean id="artifactManager" class="org.apache.geronimo.gshell.artifact.DefaultArtifactManager">
+    </bean>
     
 </beans>
\ No newline at end of file

Modified: geronimo/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/pom.xml?rev=693750&r1=693749&r2=693750&view=diff
==============================================================================
--- geronimo/gshell/trunk/pom.xml (original)
+++ geronimo/gshell/trunk/pom.xml Wed Sep 10 02:11:57 2008
@@ -615,7 +615,9 @@
         <module>gshell-wisdom</module>
         <module>gshell-cli</module>
         <module>gshell-commands</module>
+        <!--
         <module>gshell-remote</module>
+        -->
         <module>gshell-assembly</module>
     </modules>
     
@@ -650,6 +652,7 @@
             </plugins>
         </pluginManagement>
 
+        <!--
         <plugins>
             <plugin>
                 <groupId>org.codehaus.plexus</groupId>
@@ -686,6 +689,7 @@
                 </dependencies>
             </plugin>
         </plugins>
+        -->
     </build>
 
     <profiles>



Mime
View raw message