Fix btraceio#89 : messages.properties cleanup

Jaroslav Bachorik · Jaroslav Bachorik · commit f3c2604bec8a · 2014-10-07T00:02:56.000+02:00
diff --git a/src/share/classes/com/sun/btrace/resources/messages.properties b/src/share/classes/com/sun/btrace/resources/messages.properties
@@ -1,6 +1,5 @@
 # BTrace "compile time" and runtime error messages.
 
-no.string.concatenation = + operator on strings is not allowed, use 'strcat' instead
 return.type.should.be.void = btrace probe methods must return void
 btrace.program.should.be.class = btrace program must be a class (not interface or enum)
 no.complex.unsafe.value = @BTrace.unsafe value should be only a plain boolean
@@ -42,7 +41,7 @@ duration.desc.invalid = @Duration annotation applicable only for Kind.RETURN and
 called-method.desc.invalid = @CalledMethod annotation applicable only for Kind.CALL
 called-instance.desc.invalid = @CalledInstance annotation applicable only for Kind.CALL
 onexit.invalid = @OnExit annotation applicable only to methods with signature (int)void
-onexit.invalid = @OnError annotation applicable only to methods with signature (java.lang.Throwable)void
+onerror.invalid = @OnError annotation applicable only to methods with signature (java.lang.Throwable)void
 
 agent.no.instance.variables=instance variables are not allowed
 agent.unsafe.not.allowed=Unsafe mode, requested by the script, not allowed
@@ -68,13 +67,18 @@ btrace.usage =\
 btrace.agent.usage =\
   Usage: java -javaagent:java-agent.jar=<arguments> <main class> <application arguments>\n\
   where arguments is comma separated name=value pairs. Argument names include:\n  \
-    debug         boolean flag to specify debug mode\n  \
-    dumpClasses   boolean flag to specify whether to dump .classes for instrumented classes\n  \
-    dumpDir       directory where instrumented .class files are saved\n  \
-    help          print this help message\n  \
-    noServer      boolean flag to specify whether to start btrace server or not\n  \
-    port          btrace agent server port\n  \
-    probeDescPath directories where @OnProbe mapping descriptor XML files are searched\n  \
-    script        pre-compiled btrace .class file as initial script\n  \
+    bootClassPath    boot classpath to be used\n \
+    systemClassPath  system classpath to be used\n \
+    debug            boolean flag to specify debug mode\n  \
+    dumpClasses      boolean flag to specify whether to dump .classes for instrumented classes\n  \
+    dumpDir          directory where instrumented .class files are saved\n  \
+    help             print this help message\n  \
+    noServer         boolean flag to specify whether to start btrace server or not\n  \
+    port             btrace agent server port\n  \
+    probeDescPath    directories where @OnProbe mapping descriptor XML files are searched\n  \
+    stdout           redirect the btrace output to stdout instead of writing it to an arbitrary file (true/false)\n \
+    scriptdir        the path to a directory containing scripts to be run at the agent startup\n \
+    scriptOutputFile the path to a file the btrace agent will store its output\n \
+    script           comma separated list of compiled tracing scripts to be run at the agent startup; *MUST* be the last argument in the list\n  \
 
 
