You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2003/06/12 15:47:09 UTC
cvs commit: xml-axis/java/test/utils TestSrcContent.java
dims 2003/06/12 06:47:09
Modified: java/src/org/apache/axis/client AdminClient.java
java/test/utils TestSrcContent.java
Log:
Fix for Bug 20655 - AdminClient messages are NOT log messages
Notes:
- Fixed the test case to ignore AdminClient (in test.utils.TestSrcContent:153).
Revision Changes Path
1.77 +6 -5 xml-axis/java/src/org/apache/axis/client/AdminClient.java
Index: AdminClient.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/AdminClient.java,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- AdminClient.java 22 Apr 2003 19:34:04 -0000 1.76
+++ AdminClient.java 12 Jun 2003 13:47:09 -0000 1.77
@@ -288,7 +288,7 @@
}
else {
if(args[i].indexOf(java.io.File.pathSeparatorChar)==-1){
- log.info( Messages.getMessage("processFile00", args[i]) );
+ System.out.println( Messages.getMessage("processFile00", args[i]) );
sb.append( process(opts, args[i] ) );
} else {
java.util.StringTokenizer tokenizer = null ;
@@ -296,7 +296,7 @@
java.io.File.pathSeparator);
while(tokenizer.hasMoreTokens()) {
String file = tokenizer.nextToken();
- log.info( Messages.getMessage("processFile00", file) );
+ System.out.println( Messages.getMessage("processFile00", file) );
sb.append( process(opts, file) );
if(tokenizer.hasMoreTokens())
sb.append("\n");
@@ -375,10 +375,11 @@
AdminClient admin = new AdminClient();
String result = admin.process(args);
- if (result != null)
- log.info(result);
- else
+ if (result != null) {
+ System.out.println(result);
+ } else {
System.exit(1);
+ }
} catch (Exception e) {
log.error(Messages.getMessage("exception00"), e);
System.exit(1);
1.17 +1 -0 xml-axis/java/test/utils/TestSrcContent.java
Index: TestSrcContent.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/utils/TestSrcContent.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TestSrcContent.java 11 Dec 2002 22:40:19 -0000 1.16
+++ TestSrcContent.java 12 Jun 2003 13:47:09 -0000 1.17
@@ -153,6 +153,7 @@
new FileNameContentPattern(".+([\\\\/])"
+ "java\\1src\\1org\\1apache\\1axis\\1"
+ "(?!utils\\1tcpmon\\.java"
+ + "|client\\1AdminClient\\.java"
+ "|providers\\1BSFProvider\\.java"
+ "|ime\\1internal\\1util\\1uuid\\1TestUUID\\.java"
+ "|utils\\1CLArgsParser\\.java"