You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2016/03/31 23:04:12 UTC
svn commit: r1737286 - in /jmeter/trunk: build.xml
src/core/org/apache/jmeter/JMeter.java
src/core/org/apache/jmeter/jmeter_as_ascii_art.txt
Author: pmouawad
Date: Thu Mar 31 21:04:12 2016
New Revision: 1737286
URL: http://svn.apache.org/viewvc?rev=1737286&view=rev
Log:
Add "Apache JMeter 3.0" as Ascii art on startup
Added:
jmeter/trunk/src/core/org/apache/jmeter/jmeter_as_ascii_art.txt (with props)
Modified:
jmeter/trunk/build.xml
jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1737286&r1=1737285&r2=1737286&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Thu Mar 31 21:04:12 2016
@@ -876,7 +876,7 @@
<fileset dir="${res.dir}/META-INF" >
<include name="*.license" />
<include name="*.notice" />
- </fileset>
+ </fileset>
</copy>
<fixcrlf encoding="${encoding}" srcdir="${resources.meta-inf}" eol="crlf" includes="*.license *.notice"/>
</target>
@@ -928,7 +928,7 @@ run JMeter unless all the JMeter jars ar
<!-- JMeter launch jar -->
<jar jarfile="${dest.jar.jmeter}/ApacheJMeter.jar"
- includes="**/NewDriver*,**/DynamicClassLoader*,**/ShutdownClient.class"
+ includes="**/NewDriver*,**/DynamicClassLoader*,**/ShutdownClient.class,**/jmeter_as_ascii_art.txt"
basedir="${build.core}"
manifest="${build.dir}/MANIFEST_BIN.MF">
<manifest>
Modified: jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=1737286&r1=1737285&r2=1737286&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Thu Mar 31 21:04:12 2016
@@ -23,6 +23,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.io.InputStream;
import java.lang.Thread.UncaughtExceptionHandler;
import java.net.Authenticator;
import java.net.DatagramPacket;
@@ -50,6 +51,8 @@ import org.apache.commons.cli.avalon.CLA
import org.apache.commons.cli.avalon.CLOption;
import org.apache.commons.cli.avalon.CLOptionDescriptor;
import org.apache.commons.cli.avalon.CLUtil;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
import org.apache.jmeter.control.ReplaceableController;
import org.apache.jmeter.engine.ClientJMeterEngine;
import org.apache.jmeter.engine.DistributedRunner;
@@ -360,7 +363,13 @@ public class JMeter implements JMeterPlu
* @param args The arguments for JMeter
*/
public void start(String[] args) {
-
+
+ try (InputStream inputStream = getClass().getResourceAsStream("/org/apache/jmeter/jmeter_as_ascii_art.txt")) {
+ String text = IOUtils.toString(inputStream);
+ System.out.println(text);
+ } catch (IOException e1) {
+ // NOP
+ }
CLArgsParser parser = new CLArgsParser(args, options);
String error = parser.getErrorString();
if (error == null){// Check option combinations
Added: jmeter/trunk/src/core/org/apache/jmeter/jmeter_as_ascii_art.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/jmeter_as_ascii_art.txt?rev=1737286&view=auto
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/jmeter_as_ascii_art.txt (added)
+++ jmeter/trunk/src/core/org/apache/jmeter/jmeter_as_ascii_art.txt Thu Mar 31 21:04:12 2016
@@ -0,0 +1,5 @@
+ _ ____ _ ____ _ _ _____ _ __ __ _____ _____ _____ ____ _____ ___
+ / \ | _ \ / \ / ___| | | | ____| | | \/ | ____|_ _| ____| _ \ |___ / / _ \
+ / _ \ | |_) / _ \| | | |_| | _| _ | | |\/| | _| | | | _| | |_) | |_ \| | | |
+ / ___ \| __/ ___ \ |___| _ | |___ | |_| | | | | |___ | | | |___| _ < ___) | |_| |
+/_/ \_\_| /_/ \_\____|_| |_|_____| \___/|_| |_|_____| |_| |_____|_| \_\ |____(_)___/
Propchange: jmeter/trunk/src/core/org/apache/jmeter/jmeter_as_ascii_art.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Re: svn commit: r1737286 - in /jmeter/trunk: build.xml
src/core/org/apache/jmeter/JMeter.java src/core/org/apache/jmeter/jmeter_as_ascii_art.txt
Posted by sebb <se...@gmail.com>.
On 31 March 2016 at 22:04, <pm...@apache.org> wrote:
> Author: pmouawad
> Date: Thu Mar 31 21:04:12 2016
> New Revision: 1737286
>
> URL: http://svn.apache.org/viewvc?rev=1737286&view=rev
> Log:
> Add "Apache JMeter 3.0" as Ascii art on startup
-1
Sorry, but I think this is quickly going to get annoying.
You can put it in the 'jmeter -help' file if you want, but it is out
of place elsewhere.
Also it has to be updated for each new release, and is presumably not
going to be updated for SNAPSHOT releases.
> Added:
> jmeter/trunk/src/core/org/apache/jmeter/jmeter_as_ascii_art.txt (with props)
> Modified:
> jmeter/trunk/build.xml
> jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
>
> Modified: jmeter/trunk/build.xml
> URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1737286&r1=1737285&r2=1737286&view=diff
> ==============================================================================
> --- jmeter/trunk/build.xml (original)
> +++ jmeter/trunk/build.xml Thu Mar 31 21:04:12 2016
> @@ -876,7 +876,7 @@
> <fileset dir="${res.dir}/META-INF" >
> <include name="*.license" />
> <include name="*.notice" />
> - </fileset>
> + </fileset>
> </copy>
> <fixcrlf encoding="${encoding}" srcdir="${resources.meta-inf}" eol="crlf" includes="*.license *.notice"/>
> </target>
> @@ -928,7 +928,7 @@ run JMeter unless all the JMeter jars ar
>
> <!-- JMeter launch jar -->
> <jar jarfile="${dest.jar.jmeter}/ApacheJMeter.jar"
> - includes="**/NewDriver*,**/DynamicClassLoader*,**/ShutdownClient.class"
> + includes="**/NewDriver*,**/DynamicClassLoader*,**/ShutdownClient.class,**/jmeter_as_ascii_art.txt"
> basedir="${build.core}"
> manifest="${build.dir}/MANIFEST_BIN.MF">
> <manifest>
>
> Modified: jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
> URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=1737286&r1=1737285&r2=1737286&view=diff
> ==============================================================================
> --- jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
> +++ jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Thu Mar 31 21:04:12 2016
> @@ -23,6 +23,7 @@ import java.io.File;
> import java.io.FileInputStream;
> import java.io.FileNotFoundException;
> import java.io.IOException;
> +import java.io.InputStream;
> import java.lang.Thread.UncaughtExceptionHandler;
> import java.net.Authenticator;
> import java.net.DatagramPacket;
> @@ -50,6 +51,8 @@ import org.apache.commons.cli.avalon.CLA
> import org.apache.commons.cli.avalon.CLOption;
> import org.apache.commons.cli.avalon.CLOptionDescriptor;
> import org.apache.commons.cli.avalon.CLUtil;
> +import org.apache.commons.io.FileUtils;
> +import org.apache.commons.io.IOUtils;
> import org.apache.jmeter.control.ReplaceableController;
> import org.apache.jmeter.engine.ClientJMeterEngine;
> import org.apache.jmeter.engine.DistributedRunner;
> @@ -360,7 +363,13 @@ public class JMeter implements JMeterPlu
> * @param args The arguments for JMeter
> */
> public void start(String[] args) {
> -
> +
> + try (InputStream inputStream = getClass().getResourceAsStream("/org/apache/jmeter/jmeter_as_ascii_art.txt")) {
> + String text = IOUtils.toString(inputStream);
> + System.out.println(text);
> + } catch (IOException e1) {
> + // NOP
> + }
> CLArgsParser parser = new CLArgsParser(args, options);
> String error = parser.getErrorString();
> if (error == null){// Check option combinations
>
> Added: jmeter/trunk/src/core/org/apache/jmeter/jmeter_as_ascii_art.txt
> URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/jmeter_as_ascii_art.txt?rev=1737286&view=auto
> ==============================================================================
> --- jmeter/trunk/src/core/org/apache/jmeter/jmeter_as_ascii_art.txt (added)
> +++ jmeter/trunk/src/core/org/apache/jmeter/jmeter_as_ascii_art.txt Thu Mar 31 21:04:12 2016
> @@ -0,0 +1,5 @@
> + _ ____ _ ____ _ _ _____ _ __ __ _____ _____ _____ ____ _____ ___
> + / \ | _ \ / \ / ___| | | | ____| | | \/ | ____|_ _| ____| _ \ |___ / / _ \
> + / _ \ | |_) / _ \| | | |_| | _| _ | | |\/| | _| | | | _| | |_) | |_ \| | | |
> + / ___ \| __/ ___ \ |___| _ | |___ | |_| | | | | |___ | | | |___| _ < ___) | |_| |
> +/_/ \_\_| /_/ \_\____|_| |_|_____| \___/|_| |_|_____| |_| |_____|_| \_\ |____(_)___/
>
> Propchange: jmeter/trunk/src/core/org/apache/jmeter/jmeter_as_ascii_art.txt
> ------------------------------------------------------------------------------
> svn:mime-type = text/plain
>
>