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/06/01 09:28:54 UTC
svn commit: r662160 - in /geronimo/gshell/trunk:
gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/
gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/
gshell-core/src/main/java/org/apache/geronimo/gshell/ ...
Author: jdillon
Date: Sun Jun 1 00:28:53 2008
New Revision: 662160
URL: http://svn.apache.org/viewvc?rev=662160&view=rev
Log:
Moved builder bits to .builder
Moved Default[Environment|Variables] to .application
Added:
geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultEnvironment.java (contents, props changed)
- copied, changed from r661968, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/DefaultEnvironment.java
geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultVariables.java (contents, props changed)
- copied, changed from r661968, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/DefaultVariables.java
geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/builder/
geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/builder/ShellBuilder.java (contents, props changed)
- copied, changed from r662158, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/ShellBuilder.java
geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/application/
geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/application/DefaultVariablesTest.java (contents, props changed)
- copied, changed from r661968, geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/DefaultVariablesTest.java
geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/builder/
geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/builder/ShellBuilderTest.java (contents, props changed)
- copied, changed from r662158, geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/ShellBuilderTest.java
geronimo/gshell/trunk/gshell-plugin/src/test/resources/org/apache/geronimo/gshell/builder/
geronimo/gshell/trunk/gshell-plugin/src/test/resources/org/apache/geronimo/gshell/builder/application1.xml (props changed)
- copied unchanged from r661968, geronimo/gshell/trunk/gshell-plugin/src/test/resources/org/apache/geronimo/gshell/application1.xml
geronimo/gshell/trunk/gshell-plugin/src/test/resources/org/apache/geronimo/gshell/builder/settings1.xml (props changed)
- copied unchanged from r661968, geronimo/gshell/trunk/gshell-plugin/src/test/resources/org/apache/geronimo/gshell/settings1.xml
Removed:
geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/DefaultEnvironment.java
geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/DefaultVariables.java
geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/ShellBuilder.java
geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/DefaultVariablesTest.java
geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/ShellBuilderTest.java
geronimo/gshell/trunk/gshell-plugin/src/test/resources/org/apache/geronimo/gshell/application1.xml
geronimo/gshell/trunk/gshell-plugin/src/test/resources/org/apache/geronimo/gshell/settings1.xml
Modified:
geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java
geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java
geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultCommandExecutor.java
geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/ApplicationConfiguration.java
geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/OpenShellHandler.java
Modified: geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java?rev=662160&r1=662159&r2=662160&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java (original)
+++ geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java Sun Jun 1 00:28:53 2008
@@ -20,7 +20,7 @@
package org.apache.geronimo.gshell.cli;
import org.apache.geronimo.gshell.ExitNotification;
-import org.apache.geronimo.gshell.ShellBuilder;
+import org.apache.geronimo.gshell.builder.ShellBuilder;
import org.apache.geronimo.gshell.shell.Shell;
import org.apache.geronimo.gshell.ansi.ANSI;
import org.apache.geronimo.gshell.application.ApplicationLocator;
Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java?rev=662160&r1=662159&r2=662160&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java Sun Jun 1 00:28:53 2008
@@ -23,7 +23,7 @@
import java.util.List;
import java.util.Properties;
-import org.apache.geronimo.gshell.DefaultVariables;
+import org.apache.geronimo.gshell.application.DefaultVariables;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java?rev=662160&r1=662159&r2=662160&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java Sun Jun 1 00:28:53 2008
@@ -21,7 +21,7 @@
import java.util.List;
-import org.apache.geronimo.gshell.DefaultVariables;
+import org.apache.geronimo.gshell.application.DefaultVariables;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
Modified: geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultCommandExecutor.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultCommandExecutor.java?rev=662160&r1=662159&r2=662160&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultCommandExecutor.java (original)
+++ geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultCommandExecutor.java Sun Jun 1 00:28:53 2008
@@ -36,6 +36,7 @@
import org.apache.geronimo.gshell.registry.NotRegisteredException;
import org.apache.geronimo.gshell.shell.Environment;
import org.apache.geronimo.gshell.application.ApplicationManager;
+import org.apache.geronimo.gshell.application.DefaultVariables;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.util.IOUtil;
Modified: geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/ApplicationConfiguration.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/ApplicationConfiguration.java?rev=662160&r1=662159&r2=662160&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/ApplicationConfiguration.java (original)
+++ geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/ApplicationConfiguration.java Sun Jun 1 00:28:53 2008
@@ -19,7 +19,7 @@
package org.apache.geronimo.gshell.application;
-import org.apache.geronimo.gshell.DefaultEnvironment;
+import org.apache.geronimo.gshell.application.DefaultEnvironment;
import org.apache.geronimo.gshell.common.tostring.ReflectionToStringBuilder;
import org.apache.geronimo.gshell.common.tostring.ToStringStyle;
import org.apache.geronimo.gshell.io.IO;
Copied: geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultEnvironment.java (from r661968, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/DefaultEnvironment.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultEnvironment.java?p2=geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultEnvironment.java&p1=geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/DefaultEnvironment.java&r1=661968&r2=662160&rev=662160&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/DefaultEnvironment.java (original)
+++ geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultEnvironment.java Sun Jun 1 00:28:53 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell;
+package org.apache.geronimo.gshell.application;
import org.apache.geronimo.gshell.command.Variables;
import org.apache.geronimo.gshell.common.tostring.ReflectionToStringBuilder;
Propchange: geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultEnvironment.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultEnvironment.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultEnvironment.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultVariables.java (from r661968, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/DefaultVariables.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultVariables.java?p2=geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultVariables.java&p1=geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/DefaultVariables.java&r1=661968&r2=662160&rev=662160&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/DefaultVariables.java (original)
+++ geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultVariables.java Sun Jun 1 00:28:53 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell;
+package org.apache.geronimo.gshell.application;
import org.apache.geronimo.gshell.command.Variables;
import org.apache.geronimo.gshell.common.tostring.ReflectionToStringBuilder;
Propchange: geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultVariables.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultVariables.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultVariables.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/builder/ShellBuilder.java (from r662158, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/ShellBuilder.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/builder/ShellBuilder.java?p2=geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/builder/ShellBuilder.java&p1=geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/ShellBuilder.java&r1=662158&r2=662160&rev=662160&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/ShellBuilder.java (original)
+++ geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/builder/ShellBuilder.java Sun Jun 1 00:28:53 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell;
+package org.apache.geronimo.gshell.builder;
import org.apache.geronimo.gshell.application.ApplicationConfiguration;
import org.apache.geronimo.gshell.application.ApplicationManager;
Propchange: geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/builder/ShellBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/builder/ShellBuilder.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/builder/ShellBuilder.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/application/DefaultVariablesTest.java (from r661968, geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/DefaultVariablesTest.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/application/DefaultVariablesTest.java?p2=geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/application/DefaultVariablesTest.java&p1=geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/DefaultVariablesTest.java&r1=661968&r2=662160&rev=662160&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/DefaultVariablesTest.java (original)
+++ geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/application/DefaultVariablesTest.java Sun Jun 1 00:28:53 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell;
+package org.apache.geronimo.gshell.application;
import junit.framework.TestCase;
import org.apache.geronimo.gshell.command.Variables;
Propchange: geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/application/DefaultVariablesTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/application/DefaultVariablesTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/application/DefaultVariablesTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/builder/ShellBuilderTest.java (from r662158, geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/ShellBuilderTest.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/builder/ShellBuilderTest.java?p2=geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/builder/ShellBuilderTest.java&p1=geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/ShellBuilderTest.java&r1=662158&r2=662160&rev=662160&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/ShellBuilderTest.java (original)
+++ geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/builder/ShellBuilderTest.java Sun Jun 1 00:28:53 2008
@@ -17,13 +17,14 @@
* under the License.
*/
-package org.apache.geronimo.gshell;
+package org.apache.geronimo.gshell.builder;
import junit.framework.TestCase;
import org.apache.geronimo.gshell.model.application.Application;
import org.apache.geronimo.gshell.model.application.ApplicationMarshaller;
import org.apache.geronimo.gshell.model.settings.Settings;
import org.apache.geronimo.gshell.model.settings.SettingsMarshaller;
+import org.apache.geronimo.gshell.builder.ShellBuilder;
import java.net.URL;
Propchange: geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/builder/ShellBuilderTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/builder/ShellBuilderTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/builder/ShellBuilderTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/gshell/trunk/gshell-plugin/src/test/resources/org/apache/geronimo/gshell/builder/application1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-plugin/src/test/resources/org/apache/geronimo/gshell/builder/application1.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-plugin/src/test/resources/org/apache/geronimo/gshell/builder/application1.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: geronimo/gshell/trunk/gshell-plugin/src/test/resources/org/apache/geronimo/gshell/builder/settings1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-plugin/src/test/resources/org/apache/geronimo/gshell/builder/settings1.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-plugin/src/test/resources/org/apache/geronimo/gshell/builder/settings1.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/OpenShellHandler.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/OpenShellHandler.java?rev=662160&r1=662159&r2=662160&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/OpenShellHandler.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/OpenShellHandler.java Sun Jun 1 00:28:53 2008
@@ -19,7 +19,7 @@
package org.apache.geronimo.gshell.remote.server.handler;
-import org.apache.geronimo.gshell.DefaultEnvironment;
+import org.apache.geronimo.gshell.application.DefaultEnvironment;
import org.apache.geronimo.gshell.remote.RemoteShell;
import org.apache.geronimo.gshell.remote.message.EchoMessage;
import org.apache.geronimo.gshell.remote.message.OpenShellMessage;