dirkv 01/08/08 16:36:52
Modified: src/webdav/client/src/org/apache/webdav/cmd Slide.java
Log:
use the log constants
Revision Changes Path
1.37 +26 -16
jakarta-slide/src/webdav/client/src/org/apache/webdav/cmd/Slide.java
Index: Slide.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/cmd/Slide.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Slide.java 2001/08/08 21:57:09 1.36
+++ Slide.java 2001/08/08 23:36:52 1.37
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/cmd/Slide.java,v 1.36
2001/08/08 21:57:09 dirkv Exp $
- * $Revision: 1.36 $
- * $Date: 2001/08/08 21:57:09 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/cmd/Slide.java,v 1.37
2001/08/08 23:36:52 dirkv Exp $
+ * $Revision: 1.37 $
+ * $Date: 2001/08/08 23:36:52 $
*
* ====================================================================
*
@@ -82,6 +82,7 @@
import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.HttpException;
import org.apache.commons.httpclient.log.Log;
+import org.apache.commons.httpclient.log.LogSource;
import org.apache.util.HttpURL;
@@ -106,6 +107,8 @@
*/
public class Slide {
+ static private final Log log = LogSource.getInstance(Slide.class.getName());
+
/**
* The version information for the Slide client.
*/
@@ -147,6 +150,13 @@
*/
private int debugLevel = Log.WARN;
+ /**
+ * Ste debug level
+ */
+ private void setDebug(int level) {
+ this.debugLevel=level;
+ log.setLevel(debugLevel);
+ }
/**
* A space mark.
@@ -189,7 +199,7 @@
System.out.println(version);
break;
case 'd':
- slide.debugLevel = Integer.MAX_VALUE;
+ slide.setDebug(Log.DEBUG);
break;
default:
System.exit(-1);
@@ -1369,11 +1379,11 @@
}
} else if (key.equalsIgnoreCase("debug")) {
if (value.equalsIgnoreCase("on")) {
- debugLevel = Log.DEBUG;
+ setDebug(Log.DEBUG);
webdavResource.setDebug(debugLevel);
System.out.println("The debug flag is on.");
} else if (value.equalsIgnoreCase("off")) {
- debugLevel = Log.WARN;
+ setDebug(Log.WARN);
webdavResource.setDebug(debugLevel);
System.out.println("The debug flag is off.");
} else {
@@ -1724,7 +1734,7 @@
}
Ace[] aces=acl.getAces();
- if (debugLevel>5) {
+ if (log.isDebugEnabled()) {
System.out.println();
System.out.println("ACL from server");
showAces(path, aces);
@@ -1736,7 +1746,7 @@
if ((aces[i].isNegative()==negative) && !aces[i].isProtected()
&& !aces[i].isInherited() &&
aces[i].getPrincipal().equals(principal))
{
- if (debugLevel>5)
+ if (log.isDebugEnabled())
System.out.println("found ace");
ace=aces[i];
}
@@ -1753,7 +1763,7 @@
Privilege privilege=new Privilege(namespace, permission, null);
ace.addPrivilege(privilege);
- if (debugLevel>5) {
+ if (log.isDebugEnabled()) {
System.out.println();
System.out.println("ACL with updated privileges");
showAces(path, aces);
@@ -1764,7 +1774,7 @@
if (!success)
System.err.println(webdavResource.getStatusMessage());
- if (debugLevel>5) {
+ if (log.isDebugEnabled()) {
acl = webdavResource.aclfindMethod(path);
if (acl==null)
System.out.println("Error: PropFind didn't return an
AclProperty!");
@@ -1790,7 +1800,7 @@
}
Ace[] aces=acl.getAces();
- if (debugLevel>5) {
+ if (log.isDebugEnabled()) {
System.out.println();
System.out.println("ACL from server");
showAces(path, aces);
@@ -1802,12 +1812,12 @@
{
if (!aces[i].isProtected() && !aces[i].isInherited() &&
aces[i].getPrincipal().equals(principal))
{
- if (debugLevel>5)
+ if (log.isDebugEnabled())
System.out.println("found ace");
boolean removed = aces[i].removePrivilege(privilege);
found = found || removed;
- if ((debugLevel>5) || removed)
- System.out.println("privilege removed");
+ if (removed)
+ log.debug("privilege removed");
}
}
@@ -1817,7 +1827,7 @@
return false;
}
- if (debugLevel>5) {
+ if (log.isDebugEnabled()) {
System.out.println();
System.out.println("ACL with updated privileges");
showAces(path, aces);
@@ -1828,7 +1838,7 @@
if (!success)
System.err.println(webdavResource.getStatusMessage());
- if (debugLevel>5) {
+ if (log.isDebugEnabled()) {
acl = webdavResource.aclfindMethod(path);
if (acl==null)
System.out.println("Error: PropFind didn't return an
AclProperty!");
