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 2007/09/04 08:20:29 UTC
svn commit: r572546 - in /geronimo/sandbox/gshell/trunk:
gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/
gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/util/
gshell...
Author: jdillon
Date: Mon Sep 3 23:20:28 2007
New Revision: 572546
URL: http://svn.apache.org/viewvc?rev=572546&view=rev
Log:
Moving more muck around
Added:
geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/io/
geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/io/PumpStreamHandler.java (contents, props changed)
- copied, changed from r572541, geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/util/PumpStreamHandler.java
geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/io/StreamPumper.java (contents, props changed)
- copied, changed from r572540, geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/util/StreamPumper.java
geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/io/package-info.java (with props)
Removed:
geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/util/
Modified:
geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/ExecuteCommand.java
geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/Notification.java
Modified: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/ExecuteCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/ExecuteCommand.java?rev=572546&r1=572545&r2=572546&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/ExecuteCommand.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/ExecuteCommand.java Mon Sep 3 23:20:28 2007
@@ -23,7 +23,7 @@
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.command.CommandSupport;
-import org.apache.geronimo.gshell.commands.optional.util.PumpStreamHandler;
+import org.apache.geronimo.gshell.common.io.PumpStreamHandler;
import org.apache.geronimo.gshell.IO;
/**
@@ -64,7 +64,7 @@
Process p = builder.start();
- PumpStreamHandler handler = new PumpStreamHandler(io);
+ PumpStreamHandler handler = new PumpStreamHandler(io.inputStream, io.outputStream, io.errorStream);
handler.attach(p);
handler.start();
Modified: geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/Notification.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/Notification.java?rev=572546&r1=572545&r2=572546&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/Notification.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/Notification.java Mon Sep 3 23:20:28 2007
@@ -33,14 +33,6 @@
super(msg);
}
- public Notification(final String msg, final Throwable cause) {
- super(msg, cause);
- }
-
- public Notification(final Throwable cause) {
- super(cause);
- }
-
public Notification() {
super();
}
Copied: geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/io/PumpStreamHandler.java (from r572541, geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/util/PumpStreamHandler.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/io/PumpStreamHandler.java?p2=geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/io/PumpStreamHandler.java&p1=geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/util/PumpStreamHandler.java&r1=572541&r2=572546&rev=572546&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/util/PumpStreamHandler.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/io/PumpStreamHandler.java Mon Sep 3 23:20:28 2007
@@ -17,16 +17,12 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.optional.util;
+package org.apache.geronimo.gshell.common.io;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.geronimo.gshell.IO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
//
// Based on Apache Ant 1.6.5
//
@@ -38,8 +34,6 @@
*/
public class PumpStreamHandler
{
- private static final Logger log = LoggerFactory.getLogger(PumpStreamHandler.class);
-
private InputStream in;
private OutputStream out;
@@ -64,10 +58,6 @@
this.in = in;
this.out = out;
this.err = err;
- }
-
- public PumpStreamHandler(final IO io) {
- this(io.inputStream, io.outputStream, io.errorStream);
}
public PumpStreamHandler(final OutputStream out, final OutputStream err) {
Propchange: geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/io/PumpStreamHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/io/PumpStreamHandler.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/io/PumpStreamHandler.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/io/StreamPumper.java (from r572540, geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/util/StreamPumper.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/io/StreamPumper.java?p2=geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/io/StreamPumper.java&p1=geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/util/StreamPumper.java&r1=572540&r2=572546&rev=572546&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/util/StreamPumper.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/io/StreamPumper.java Mon Sep 3 23:20:28 2007
@@ -17,15 +17,12 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.optional.util;
+package org.apache.geronimo.gshell.common.io;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
//
// Based on Apache Ant 1.6.5
//
@@ -38,8 +35,6 @@
public class StreamPumper
implements Runnable
{
- private static final Logger log = LoggerFactory.getLogger(StreamPumper.class);
-
private InputStream in;
private OutputStream out;
Propchange: geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/io/StreamPumper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/io/StreamPumper.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/io/StreamPumper.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/io/package-info.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/io/package-info.java?rev=572546&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/io/package-info.java (added)
+++ geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/io/package-info.java Mon Sep 3 23:20:28 2007
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+
+/**
+ * Common bits to support IO stuff.
+ *
+ * @version $Rev$ $Date$
+ */
+package org.apache.geronimo.gshell.common.io;
Propchange: geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/io/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/io/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/gshell/trunk/gshell-common/src/main/java/org/apache/geronimo/gshell/common/io/package-info.java
------------------------------------------------------------------------------
svn:mime-type = text/plain