geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r699589 - in /geronimo/gshell/trunk: gshell-assembly/src/main/underlay/etc/ gshell-commands/ gshell-commands/gshell-remote/ gshell-commands/gshell-remote/src/ gshell-commands/gshell-remote/src/main/ gshell-commands/gshell-remote/src/main/ja...
Date Sat, 27 Sep 2008 07:25:20 GMT
Author: jdillon
Date: Sat Sep 27 00:25:19 2008
New Revision: 699589

URL: http://svn.apache.org/viewvc?rev=699589&view=rev
Log:
Moved rsh and rsh-server actions from o.a.g.g.remote.* to o.a.g.g.commands.remote, fixed action
names

Added:
    geronimo/gshell/trunk/gshell-commands/gshell-remote/
    geronimo/gshell/trunk/gshell-commands/gshell-remote/pom.xml   (with props)
    geronimo/gshell/trunk/gshell-commands/gshell-remote/src/
    geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/
    geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/java/
    geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/java/org/
    geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/java/org/apache/
    geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/java/org/apache/geronimo/
    geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/java/org/apache/geronimo/gshell/
    geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/java/org/apache/geronimo/gshell/commands/
    geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/java/org/apache/geronimo/gshell/commands/remote/
    geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/java/org/apache/geronimo/gshell/commands/remote/RshAction.java
  (contents, props changed)
      - copied, changed from r699454, geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshCommand.java
    geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/java/org/apache/geronimo/gshell/commands/remote/RshServerAction.java
  (contents, props changed)
      - copied, changed from r699454, geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RshServerCommand.java
    geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/
    geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/META-INF/
    geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/META-INF/spring/components.xml
  (with props)
    geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/org/
    geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/org/apache/
    geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/org/apache/geronimo/
    geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/org/apache/geronimo/gshell/
    geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/org/apache/geronimo/gshell/commands/
    geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/org/apache/geronimo/gshell/commands/remote/
    geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/org/apache/geronimo/gshell/commands/remote/RshAction.properties
  (props changed)
      - copied unchanged from r699454, geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/resources/org/apache/geronimo/gshell/remote/client/RshCommand.properties
    geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/org/apache/geronimo/gshell/commands/remote/RshServerAction.properties
  (props changed)
      - copied unchanged from r699454, geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/resources/org/apache/geronimo/gshell/remote/server/RshServerCommand.properties
Removed:
    geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshCommand.java
    geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/resources/org/
    geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RshServerCommand.java
    geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/resources/org/
Modified:
    geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml
    geronimo/gshell/trunk/gshell-commands/pom.xml
    geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/resources/META-INF/spring/components.xml
    geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/resources/META-INF/spring/components.xml

Modified: geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml?rev=699589&r1=699588&r2=699589&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml (original)
+++ geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml Sat Sep 27
00:25:19 2008
@@ -66,6 +66,10 @@
                 <artifactId>gshell-admin</artifactId>
             </plugin>
 
+            <plugin>
+                <artifactId>gshell-remote</artifactId>
+            </plugin>
+
             <!--
             <plugin>
                 <artifactId>gshell-optional</artifactId>
@@ -84,19 +88,6 @@
             </plugin>
             -->
         </pluginGroup>
-        
-        <pluginGroup>
-            <groupId>org.apache.geronimo.gshell.remote</groupId>
-            <version>1.0-alpha-2-SNAPSHOT</version>
-
-            <plugin>
-                <artifactId>gshell-remote-client</artifactId>
-            </plugin>
-            
-            <plugin>
-                <artifactId>gshell-remote-server</artifactId>
-            </plugin>
-        </pluginGroup>
     </pluginGroups>
 
     <branding>

Added: geronimo/gshell/trunk/gshell-commands/gshell-remote/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-remote/pom.xml?rev=699589&view=auto
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-remote/pom.xml (added)
+++ geronimo/gshell/trunk/gshell-commands/gshell-remote/pom.xml Sat Sep 27 00:25:19 2008
@@ -0,0 +1,52 @@
+<?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.commands</groupId>
+        <artifactId>gshell-commands</artifactId>
+        <version>1.0-alpha-2-SNAPSHOT</version>
+    </parent>
+    
+    <artifactId>gshell-remote</artifactId>
+    <name>GShell Commands :: Remote</name>
+    
+    <description>
+        Provides remote-shell commands.
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.gshell.remote</groupId>
+            <artifactId>gshell-remote-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.gshell.remote</groupId>
+            <artifactId>gshell-remote-server</artifactId>
+        </dependency>
+    </dependencies>
+    
+</project>

Propchange: geronimo/gshell/trunk/gshell-commands/gshell-remote/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

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

Propchange: geronimo/gshell/trunk/gshell-commands/gshell-remote/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/java/org/apache/geronimo/gshell/commands/remote/RshAction.java
(from r699454, geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshCommand.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/java/org/apache/geronimo/gshell/commands/remote/RshAction.java?p2=geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/java/org/apache/geronimo/gshell/commands/remote/RshAction.java&p1=geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshCommand.java&r1=699454&r2=699589&rev=699589&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshCommand.java
(original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/java/org/apache/geronimo/gshell/commands/remote/RshAction.java
Sat Sep 27 00:25:19 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.geronimo.gshell.remote.client;
+package org.apache.geronimo.gshell.commands.remote;
 
 import org.apache.geronimo.gshell.clp.Argument;
 import org.apache.geronimo.gshell.clp.Option;
@@ -27,6 +27,7 @@
 import org.apache.geronimo.gshell.io.PromptReader;
 import org.apache.geronimo.gshell.notification.ExitNotification;
 import org.apache.geronimo.gshell.remote.client.proxy.RemoteShellProxy;
+import org.apache.geronimo.gshell.remote.client.RshClient;
 import org.apache.geronimo.gshell.spring.BeanContainer;
 import org.apache.geronimo.gshell.spring.BeanContainerAware;
 import org.apache.geronimo.gshell.i18n.MessageSource;
@@ -38,11 +39,11 @@
 import java.util.List;
 
 /**
- * Command to connect to a remote shell server.
+ * Connect to a remote shell server.
  *
  * @version $Rev$ $Date$
  */
-public class RshCommand
+public class RshAction
     implements CommandAction, BeanContainerAware
 {
     private final Logger log = LoggerFactory.getLogger(getClass());

Propchange: geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/java/org/apache/geronimo/gshell/commands/remote/RshAction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/java/org/apache/geronimo/gshell/commands/remote/RshAction.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/java/org/apache/geronimo/gshell/commands/remote/RshAction.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/java/org/apache/geronimo/gshell/commands/remote/RshServerAction.java
(from r699454, geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RshServerCommand.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/java/org/apache/geronimo/gshell/commands/remote/RshServerAction.java?p2=geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/java/org/apache/geronimo/gshell/commands/remote/RshServerAction.java&p1=geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RshServerCommand.java&r1=699454&r2=699589&rev=699589&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RshServerCommand.java
(original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/java/org/apache/geronimo/gshell/commands/remote/RshServerAction.java
Sat Sep 27 00:25:19 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.geronimo.gshell.remote.server;
+package org.apache.geronimo.gshell.commands.remote;
 
 import org.apache.geronimo.gshell.clp.Argument;
 import org.apache.geronimo.gshell.clp.Option;
@@ -27,17 +27,18 @@
 import org.apache.geronimo.gshell.spring.BeanContainer;
 import org.apache.geronimo.gshell.spring.BeanContainerAware;
 import org.apache.geronimo.gshell.i18n.MessageSource;
+import org.apache.geronimo.gshell.remote.server.RshServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.net.URI;
 
 /**
- * Command to start a remote shell server.
+ * Start a remote shell server.
  *
  * @version $Rev$ $Date$
  */
-public class RshServerCommand
+public class RshServerAction
     implements CommandAction, BeanContainerAware
 {
     private final Logger log = LoggerFactory.getLogger(getClass());

Propchange: geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/java/org/apache/geronimo/gshell/commands/remote/RshServerAction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/java/org/apache/geronimo/gshell/commands/remote/RshServerAction.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/java/org/apache/geronimo/gshell/commands/remote/RshServerAction.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/META-INF/spring/components.xml?rev=699589&view=auto
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/META-INF/spring/components.xml
(added)
+++ geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/META-INF/spring/components.xml
Sat Sep 27 00:25:19 2008
@@ -0,0 +1,44 @@
+<?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$ -->
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:gshell="http://gshell.org/schema/wisdom-gshell"
+       xsi:schemaLocation="
+            http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+            http://gshell.org/schema/wisdom-gshell http://gshell.org/schema/wisdom-gshell/wisdom-gshell.xsd">
+
+    <gshell:plugin name="gshell-remote">
+        <gshell:command-bundle name="default">
+            <gshell:command name="rsh">
+                <gshell:action class="org.apache.geronimo.gshell.commands.remote.RshAction"/>
+            </gshell:command>
+
+            <gshell:command name="rsh-server">
+                <gshell:action class="org.apache.geronimo.gshell.commands.remote.RshServerAction"/>
+            </gshell:command>
+
+            <gshell:alias name="rshd" alias="rsh-server"/>
+        </gshell:command-bundle>
+    </gshell:plugin>
+
+</beans>
\ No newline at end of file

Propchange: geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/META-INF/spring/components.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/META-INF/spring/components.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/META-INF/spring/components.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/org/apache/geronimo/gshell/commands/remote/RshAction.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/org/apache/geronimo/gshell/commands/remote/RshAction.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/org/apache/geronimo/gshell/commands/remote/RshAction.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/org/apache/geronimo/gshell/commands/remote/RshServerAction.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/org/apache/geronimo/gshell/commands/remote/RshServerAction.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/org/apache/geronimo/gshell/commands/remote/RshServerAction.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/gshell/trunk/gshell-commands/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/pom.xml?rev=699589&r1=699588&r2=699589&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-commands/pom.xml Sat Sep 27 00:25:19 2008
@@ -63,6 +63,7 @@
         <module>gshell-repository</module>
         <module>gshell-bsf</module>
         <module>gshell-vfs</module>
+        <module>gshell-remote</module>
     </modules>
 
 </project>
\ No newline at end of file

Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/resources/META-INF/spring/components.xml?rev=699589&r1=699588&r2=699589&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/resources/META-INF/spring/components.xml
(original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/resources/META-INF/spring/components.xml
Sat Sep 27 00:25:19 2008
@@ -22,18 +22,8 @@
 
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:gshell="http://gshell.org/schema/wisdom-gshell"
        xsi:schemaLocation="
-            http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-            http://gshell.org/schema/wisdom-gshell http://gshell.org/schema/wisdom-gshell/wisdom-gshell.xsd">
-
-    <gshell:plugin name="gshell-remote-client">
-        <gshell:command-bundle name="default">
-            <gshell:command name="rsh">
-                <gshell:action class="org.apache.geronimo.gshell.remote.client.RshCommand"/>
-            </gshell:command>
-        </gshell:command-bundle>
-    </gshell:plugin>
+            http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <bean id="jaasConfigurationLoader" class="org.apache.geronimo.gshell.remote.jaas.JaasConfigurationLoader">
         <property name="resourceName" value="client.login.conf"/>

Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/resources/META-INF/spring/components.xml?rev=699589&r1=699588&r2=699589&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/resources/META-INF/spring/components.xml
(original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/resources/META-INF/spring/components.xml
Sat Sep 27 00:25:19 2008
@@ -22,20 +22,8 @@
 
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:gshell="http://gshell.org/schema/wisdom-gshell"
        xsi:schemaLocation="
-            http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-            http://gshell.org/schema/wisdom-gshell http://gshell.org/schema/wisdom-gshell/wisdom-gshell.xsd">
-
-    <gshell:plugin name="gshell-remote-server">
-        <gshell:command-bundle name="default">
-            <gshell:command name="rsh-server">
-                <gshell:action class="org.apache.geronimo.gshell.remote.server.RshServerCommand"/>
-            </gshell:command>
-
-            <gshell:alias name="rshd" alias="rsh-server"/>
-        </gshell:command-bundle>
-    </gshell:plugin>
+            http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <bean id="timeoutManager" class="org.apache.geronimo.gshell.remote.server.timeout.TimeoutManagerImpl"/>
 



Mime
View raw message