dims 2003/07/16 19:48:17
Modified: java/src/org/apache/axis/transport/http
AutoRegisterServlet.java
java/src/org/apache/axis/i18n resource.properties
java/test/utils TestSrcContent.java
Log:
Fix for gump failure. (Steve - if i messed something up, please feel free to change
it right back)
Revision Changes Path
1.2 +5 -13
xml-axis/java/src/org/apache/axis/transport/http/AutoRegisterServlet.java
Index: AutoRegisterServlet.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/transport/http/AutoRegisterServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AutoRegisterServlet.java 15 Jul 2003 05:03:44 -0000 1.1
+++ AutoRegisterServlet.java 17 Jul 2003 02:48:16 -0000 1.2
@@ -65,6 +65,7 @@
import org.apache.axis.ConfigurationException;
import org.apache.axis.EngineConfiguration;
import org.apache.axis.WSDDEngineConfiguration;
+import org.apache.axis.i18n.Messages;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
@@ -91,7 +92,7 @@
* init by registering
*/
public void init() {
- log.debug("Auto registering WSDD files");
+ log.debug(Messages.getMessage("autoRegServletInit00"));
autoRegister();
}
@@ -172,21 +173,12 @@
}
/**
- * handler for logging trouble, defaults to handing off to logging
- * @param item what were we loading?
- * @param throwable
- */
- protected void logException(String item,Throwable throwable) {
- log.error(item,throwable);
- }
-
- /**
* handler for logging success, defaults to handing off to logging
* at debug level
* @param item what were we loading?
*/
protected void logSuccess(String item) {
- log.debug("Loaded "+item);
+ log.debug(Messages.getMessage("autoRegServletLoaded01",item));
}
/**
@@ -205,7 +197,7 @@
try {
applyAndSaveSettings();
} catch (Exception e) {
- logException("applyAndSaveSettings()", e);
+ log.error(Messages.getMessage("autoRegServletApplyAndSaveSettings00"),
e);
}
}
@@ -224,7 +216,7 @@
registerResource(resource);
logSuccess(resource);
} catch (Exception e) {
- logException(resource,e);
+ log.error(Messages.getMessage("autoRegServletLoadFailed01",resource),e);
}
}
1.64 +5 -0 xml-axis/java/src/org/apache/axis/i18n/resource.properties
Index: resource.properties
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/i18n/resource.properties,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- resource.properties 13 Jul 2003 06:30:32 -0000 1.63
+++ resource.properties 17 Jul 2003 02:48:16 -0000 1.64
@@ -1156,3 +1156,8 @@
seqHashMapArrayIndexOutOfBoundsException02={0} >= {1}
duplicateSchemaElement=Attempted to write duplicate schema element : {0}
+
+autoRegServletInit00=Auto registering WSDD files
+autoRegServletLoaded01=Loaded {0}
+autoRegServletApplyAndSaveSettings00=applyAndSaveSettings()
+autoRegServletLoadFailed01=Failed to load {0}
\ No newline at end of file
1.18 +9 -2 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- TestSrcContent.java 12 Jun 2003 13:47:09 -0000 1.17
+++ TestSrcContent.java 17 Jul 2003 02:48:17 -0000 1.18
@@ -11,6 +11,7 @@
import org.apache.oro.text.regex.Perl5Compiler;
import org.apache.oro.text.regex.Perl5Matcher;
+
import java.io.File;
import java.io.FileInputStream;
@@ -139,9 +140,15 @@
// Verify that java files do not use Log4j
//
- new FileNameContentPattern(".+\\.java",
+ //new FileNameContentPattern(".+\\.java",
+ // "org\\.apache\\.log4j", false),
+ new FileNameContentPattern(".+([\\\\/])"
+ + "java\\1"
+ +
"(?!src\\1org\\1apache\\1axis\\1client\\1HappyClient\\.java)"
+ + "([a-zA-Z0-9_]+\\1)*"
+ + "[^\\\\/]+\\.java",
"org\\.apache\\.log4j", false),
-
+
// Verify that axis java files do not use System.out.println
// or System.err.println, except:
// - utils/tcpmon.java
