geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r661575 - in /geronimo/gshell/trunk: gshell-assembly/pom.xml gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/monitor/ProgressSpinnerMonitor.java gshell-support/gshell-expr/pom.xml
Date Fri, 30 May 2008 06:23:05 GMT
Author: jdillon
Date: Thu May 29 23:23:05 2008
New Revision: 661575

URL: http://svn.apache.org/viewvc?rev=661575&view=rev
Log:
Improve the artifact download display, tidy up poms

Modified:
    geronimo/gshell/trunk/gshell-assembly/pom.xml
    geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/monitor/ProgressSpinnerMonitor.java
    geronimo/gshell/trunk/gshell-support/gshell-expr/pom.xml

Modified: geronimo/gshell/trunk/gshell-assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-assembly/pom.xml?rev=661575&r1=661574&r2=661575&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-assembly/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-assembly/pom.xml Thu May 29 23:23:05 2008
@@ -43,18 +43,6 @@
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-bootstrap</artifactId>
         </dependency>
-
-        <!--
-        <dependency>
-            <groupId>org.apache.geronimo.gshell</groupId>
-            <artifactId>gshell-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.gshell.commands</groupId>
-            <artifactId>gshell-builtins</artifactId>
-        </dependency>
-        -->
         
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
@@ -66,51 +54,6 @@
             <artifactId>gshell-loader</artifactId>
         </dependency>
 
-        <!--
-        <dependency>
-            <groupId>org.apache.geronimo.gshell.commands</groupId>
-            <artifactId>gshell-optional</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.gshell.commands</groupId>
-            <artifactId>gshell-repository</artifactId>
-        </dependency>
-        -->
-
-        <!--
-        <dependency>
-            <groupId>org.apache.geronimo.gshell.commands</groupId>
-            <artifactId>gshell-bsf</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.beanshell</groupId>
-            <artifactId>bsh-bsf</artifactId>
-            <version>2.0b4</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.gshell.commands</groupId>
-            <artifactId>gshell-vfs</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.gshell</groupId>
-            <artifactId>gshell-whisper</artifactId>
-        </dependency>
-        
-        <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>
-        -->
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
@@ -160,26 +103,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>full</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.geronimo.gshell.commands</groupId>
-                    <artifactId>gshell-bsf</artifactId>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.beanshell</groupId>
-                    <artifactId>bsh</artifactId>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.geronimo.gshell.commands</groupId>
-                    <artifactId>gshell-vfs</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
 </project>
\ No newline at end of file

Modified: geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/monitor/ProgressSpinnerMonitor.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/monitor/ProgressSpinnerMonitor.java?rev=661575&r1=661574&r2=661575&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/monitor/ProgressSpinnerMonitor.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/monitor/ProgressSpinnerMonitor.java
Thu May 29 23:23:05 2008
@@ -109,4 +109,17 @@
         
         print(spinner.spin(message));
     }
+
+    public void transferCompleted(final TransferEvent event) {
+        assert event != null;
+
+        super.transferCompleted(event);
+
+        long length = event.getResource().getContentLength();
+        String type = event.getRequestType() == REQUEST_PUT ? "Uploaded" : "Downloaded";
+        String bytes = length >= 1024 ? ( length / 1024 ) + "K" : length + "b";
+
+        // pad at end just incase, should really blank the reset of the line
+        print(type + " " + bytes + "          ");
+    }
 }
\ No newline at end of file

Modified: geronimo/gshell/trunk/gshell-support/gshell-expr/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-expr/pom.xml?rev=661575&r1=661574&r2=661575&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-expr/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-expr/pom.xml Thu May 29 23:23:05 2008
@@ -48,7 +48,6 @@
             <artifactId>commons-jexl</artifactId>
         </dependency>
 
-        <!-- Required for commons-jexl usage -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl104-over-slf4j</artifactId>



Mime
View raw message