rsitze 02/02/22 12:32:11
Modified: java/src/org/apache/axis/client Call.java
java/src/org/apache/axis/handlers JWSProcessor.java
SimpleAuthorizationHandler.java
java/src/org/apache/axis/server AxisServer.java
java/src/org/apache/axis/transport/http
SimpleAxisServer.java
java/src/org/apache/axis/utils Admin.java NSStack.java
Log:
Changed debug info logged w/ log.info to log.debug.
Revision Changes Path
1.78 +2 -2 xml-axis/java/src/org/apache/axis/client/Call.java
Index: Call.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/Call.java,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- Call.java 22 Feb 2002 16:15:55 -0000 1.77
+++ Call.java 22 Feb 2002 20:32:10 -0000 1.78
@@ -1189,8 +1189,8 @@
*/
public void setTransport(Transport trans) {
transport = trans;
- if (log.isInfoEnabled())
- log.info(JavaUtils.getMessage("transport00", "" + transport));
+ if (log.isDebugEnabled())
+ log.debug(JavaUtils.getMessage("transport00", "" + transport));
}
/** Get the Transport registered for the given protocol.
1.39 +10 -9 xml-axis/java/src/org/apache/axis/handlers/JWSProcessor.java
Index: JWSProcessor.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/JWSProcessor.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- JWSProcessor.java 20 Feb 2002 18:59:21 -0000 1.38
+++ JWSProcessor.java 22 Feb 2002 20:32:10 -0000 1.39
@@ -152,17 +152,18 @@
outDirectory.mkdirs();
}
- if (log.isInfoEnabled())
- log.info("jwsFile: " + jwsFile );
+ if (log.isDebugEnabled())
+ log.debug("jwsFile: " + jwsFile );
+
String jFile = outdir + File.separator + file.substring(0,
file.length()-3) +
"java" ;
String cFile = outdir + File.separator + file.substring(0,
file.length()-3) +
"class" ;
- if (log.isInfoEnabled()) {
- log.info("jFile: " + jFile );
- log.info("cFile: " + cFile );
- log.info("outdir: " + outdir);
+ if (log.isDebugEnabled()) {
+ log.debug("jFile: " + jFile );
+ log.debug("cFile: " + cFile );
+ log.debug("outdir: " + outdir);
}
File f1 = new File( cFile );
@@ -179,8 +180,8 @@
clsName = clsName.substring( 0, clsName.length()-4 );
clsName = clsName.replace('/', '.');
- if (log.isInfoEnabled())
- log.info("ClsName: " + clsName );
+ if (log.isDebugEnabled())
+ log.debug("ClsName: " + clsName );
/* Check to see if we need to recompile */
/****************************************/
@@ -189,7 +190,7 @@
/* java file then recompile the java file. */
/* Start by copying the *.jws file to *.java */
/***********************************************************/
- log.info(JavaUtils.getMessage("compiling00", jwsFile) );
+ log.debug(JavaUtils.getMessage("compiling00", jwsFile) );
log.debug(JavaUtils.getMessage("copy00", jwsFile, jFile) );
FileReader fr = new FileReader( jwsFile );
FileWriter fw = new FileWriter( jFile );
1.27 +6 -6
xml-axis/java/src/org/apache/axis/handlers/SimpleAuthorizationHandler.java
Index: SimpleAuthorizationHandler.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/handlers/SimpleAuthorizationHandler.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- SimpleAuthorizationHandler.java 20 Feb 2002 18:59:21 -0000 1.26
+++ SimpleAuthorizationHandler.java 22 Feb 2002 20:32:10 -0000 1.27
@@ -116,13 +116,13 @@
String allowedRoles = (String)serviceHandler.getOption("allowedRoles");
if (allowedRoles == null) {
if (allowByDefault) {
- if (log.isInfoEnabled()) {
- log.info(JavaUtils.getMessage( "noRoles00"));
+ if (log.isDebugEnabled()) {
+ log.debug(JavaUtils.getMessage( "noRoles00"));
}
}
else {
- if (log.isInfoEnabled()) {
- log.info(JavaUtils.getMessage( "noRoles01"));
+ if (log.isDebugEnabled()) {
+ log.debug(JavaUtils.getMessage( "noRoles01"));
}
throw new AxisFault( "Server.Unauthorized",
@@ -146,8 +146,8 @@
String thisRole = st.nextToken();
if (provider.userMatches(user, thisRole)) {
- if (log.isInfoEnabled()) {
- log.info(JavaUtils.getMessage("auth01",
+ if (log.isDebugEnabled()) {
+ log.debug(JavaUtils.getMessage("auth01",
userID, serviceName));
}
1.61 +4 -4 xml-axis/java/src/org/apache/axis/server/AxisServer.java
Index: AxisServer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/server/AxisServer.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- AxisServer.java 22 Feb 2002 15:37:47 -0000 1.60
+++ AxisServer.java 22 Feb 2002 20:32:10 -0000 1.61
@@ -245,8 +245,8 @@
hName = msgContext.getTransportName();
SimpleTargetedChain transportChain = null;
- if (log.isInfoEnabled())
- log.info(JavaUtils.getMessage("transport01",
"AxisServer.invoke", hName));
+ if (log.isDebugEnabled())
+ log.debug(JavaUtils.getMessage("transport01",
"AxisServer.invoke", hName));
if ( hName != null && (h = getTransport( hName )) != null ) {
if (h instanceof SimpleTargetedChain) {
@@ -394,8 +394,8 @@
hName = msgContext.getTransportName();
SimpleTargetedChain transportChain = null;
- if (log.isInfoEnabled())
- log.info(JavaUtils.getMessage("transport01",
"AxisServer.invoke", hName));
+ if (log.isDebugEnabled())
+ log.debug(JavaUtils.getMessage("transport01",
"AxisServer.invoke", hName));
if ( hName != null && (h = getTransport( hName )) != null ) {
if (h instanceof SimpleTargetedChain) {
transportChain = (SimpleTargetedChain)h;
1.50 +14 -5
xml-axis/java/src/org/apache/axis/transport/http/SimpleAxisServer.java
Index: SimpleAxisServer.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/transport/http/SimpleAxisServer.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- SimpleAxisServer.java 22 Feb 2002 15:37:48 -0000 1.49
+++ SimpleAxisServer.java 22 Feb 2002 20:32:11 -0000 1.50
@@ -169,7 +169,7 @@
* Axis engine for processing.
*/
public void run() {
- log.debug(JavaUtils.getMessage("start00", "SimpleAxisServer"));
+ log.info(JavaUtils.getMessage("start00", "SimpleAxisServer"));
// create an Axis server
AxisServer engine = getAxisServer();
@@ -251,8 +251,12 @@
// Got params
String params = fileName.substring(paramIdx + 1);
fileName.setLength(paramIdx);
- log.debug(JavaUtils.getMessage("filename00", "" +
fileName.toString()));
- log.debug(JavaUtils.getMessage("params00", params));
+
+ log.debug(JavaUtils.getMessage("filename00",
+ fileName.toString()));
+ log.debug(JavaUtils.getMessage("params00",
+ params));
+
if ("wsdl".equalsIgnoreCase(params))
doWsdl = true;
}
@@ -291,8 +295,12 @@
}
authBuf.append((char)(decoded[i] & 0x7f));
}
- log.info(JavaUtils.getMessage("user00",
userBuf.toString()));
- log.info(JavaUtils.getMessage("password00",
pwBuf.toString()));
+
+ if (log.isDebugEnabled()) {
+ log.debug(JavaUtils.getMessage("user00",
+ userBuf.toString()));
+ }
+
msgContext.setUsername(userBuf.toString());
msgContext.setPassword(pwBuf.toString());
}
@@ -458,6 +466,7 @@
}
}
}
+
log.info(JavaUtils.getMessage("quit00", "SimpleAxisServer"));
}
1.103 +23 -7 xml-axis/java/src/org/apache/axis/utils/Admin.java
Index: Admin.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/Admin.java,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- Admin.java 22 Feb 2002 15:37:48 -0000 1.102
+++ Admin.java 22 Feb 2002 20:32:11 -0000 1.103
@@ -338,11 +338,17 @@
if ( action.equals( "undeploy" ) ) {
if ( type.equals("service") ) {
- log.info( JavaUtils.getMessage("undeploy00", type + ": " +
name) );
+
+ if (log.isDebugEnabled())
+ log.debug( JavaUtils.getMessage("undeploy00",
+ type + ": " + name) );
+
dep.undeployService( new QName(null,name) );
}
else if ( type.equals("handler") || type.equals("chain") ) {
- log.info( JavaUtils.getMessage("undeploy00", type + ": " +
name) );
+ if (log.isDebugEnabled())
+ log.debug( JavaUtils.getMessage("undeploy00",
+ type + ": " + name) );
dep.undeployHandler( new QName(null,name) );
}
else
@@ -452,7 +458,9 @@
if ("".equals(name)) name = null;
if (flow != null) {
- log.info( JavaUtils.getMessage("deployChain00", name) );
+ if (log.isDebugEnabled())
+ log.debug( JavaUtils.getMessage("deployChain00", name) );
+
Vector names = new Vector();
getOptions( elem, options );
@@ -495,7 +503,9 @@
if ( pivot != null && pivot.equals("") ) pivot = null ;
if ( name != null && name.equals("") ) name = null ;
- log.info( JavaUtils.getMessage("deployService01", name) );
+ if (log.isDebugEnabled())
+ log.debug( JavaUtils.getMessage("deployService01", name) );
+
String hName = null ;
Handler tmpH = null ;
StringTokenizer st = null ;
@@ -582,7 +592,9 @@
String cls = elem.getAttribute( "class" );
if ( cls != null && cls.equals("") ) cls = null ;
- log.info( JavaUtils.getMessage("deployHandler00", name) );
+
+ if (log.isDebugEnabled())
+ log.debug( JavaUtils.getMessage("deployHandler00", name) );
handler = new WSDDHandler();
@@ -612,7 +624,9 @@
if ( sender != null && sender.equals("") ) sender = null ;
if ( name != null && name.equals("") ) name = null ;
- log.info( JavaUtils.getMessage("deployTransport00", name) );
+ if (log.isDebugEnabled())
+ log.debug( JavaUtils.getMessage("deployTransport00", name) );
+
StringTokenizer st = null ;
Vector reqNames = new Vector();
Vector respNames = new Vector();
@@ -777,7 +791,9 @@
try {
for ( i = 1 ; i < args.length ; i++ ) {
- log.info( JavaUtils.getMessage("process00", args[i]) );
+ if (log.isDebugEnabled())
+ log.debug( JavaUtils.getMessage("process00", args[i]) );
+
Document doc = XMLUtils.newDocument( new FileInputStream( args[i] )
);
admin.process(msgContext, doc.getDocumentElement());
}
1.18 +14 -5 xml-axis/java/src/org/apache/axis/utils/NSStack.java
Index: NSStack.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/NSStack.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- NSStack.java 22 Feb 2002 15:37:48 -0000 1.17
+++ NSStack.java 22 Feb 2002 20:32:11 -0000 1.18
@@ -87,15 +87,19 @@
public void push() {
if (stack == null) stack = new Stack();
+
if (log.isDebugEnabled())
log.debug("NSPush (" + stack.size() + ")");
+
stack.push(EMPTY);
}
public void push(ArrayList table) {
if (stack == null) stack = new Stack();
+
if (log.isDebugEnabled())
log.debug("NSPush (" + stack.size() + ")");
+
if (table.size() == 0)
stack.push(EMPTY);
else
@@ -117,8 +121,10 @@
if (stack.isEmpty()) {
if (log.isDebugEnabled())
log.debug("NSPop (" + JavaUtils.getMessage("empty00") + ")");
+
if (parent != null)
return parent.pop();
+
return null;
}
@@ -201,6 +207,7 @@
if (log.isDebugEnabled()){
log.debug(JavaUtils.getMessage("noPrefix00", "" + this, prefix));
+
dump();
}
@@ -232,22 +239,24 @@
Enumeration e = stack.elements();
while (e.hasMoreElements()) {
ArrayList list = (ArrayList)e.nextElement();
- log.info("----");
+ log.debug("----");
+
if (list == null) {
- log.info(JavaUtils.getMessage("nullTable00"));
+ log.debug(JavaUtils.getMessage("nullTable00"));
continue;
}
+
for (int i = 0; i < list.size(); i++) {
Mapping map = (Mapping)list.get(i);
- log.info(map.getNamespaceURI() + " -> " + map.getPrefix());
+ log.debug(map.getNamespaceURI() + " -> " + map.getPrefix());
}
}
if (parent != null) {
- log.info("----" + JavaUtils.getMessage("parent00"));
+ log.debug("----" + JavaUtils.getMessage("parent00"));
parent.dump();
}
- log.info("----" + JavaUtils.getMessage("end00"));
+ log.debug("----" + JavaUtils.getMessage("end00"));
}
}
