You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jaxme-dev@ws.apache.org by jo...@apache.org on 2004/12/13 12:56:10 UTC
cvs commit: ws-jaxme/src/js/org/apache/ws/jaxme/js JavaSourceFactory.java
jochen 2004/12/13 03:56:10
Modified: src/js/org/apache/ws/jaxme/logging AntProjectLogger.java
AntProjectLoggerFactory.java
src/js/org/apache/ws/jaxme/js JavaSourceFactory.java
Log:
Beautifications of Ant logger output.
Revision Changes Path
1.3 +137 -141 ws-jaxme/src/js/org/apache/ws/jaxme/logging/AntProjectLogger.java
Index: AntProjectLogger.java
===================================================================
RCS file: /home/cvs/ws-jaxme/src/js/org/apache/ws/jaxme/logging/AntProjectLogger.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AntProjectLogger.java 16 Feb 2004 23:39:43 -0000 1.2
+++ AntProjectLogger.java 13 Dec 2004 11:56:10 -0000 1.3
@@ -22,147 +22,143 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
-/**
- * @author <a href="mailto:joe@ispsoft.de">Jochen Wiedmann</a>
+/** A wrapper for the Ant logger.
*/
public class AntProjectLogger implements Logger {
- private final String cName;
- private final Task task;
-
- public AntProjectLogger(String pName, Project pProject) {
- cName = pName;
- task = pProject.createTask("echo");
- }
-
- public AntProjectLogger(String pName, Task pTask) {
- this(pTask.getTaskName() + "." + pName, pTask.getProject());
- }
-
- public boolean isFinestEnabled() { return true; }
- public boolean isFinerEnabled() { return true; }
- public boolean isFineEnabled() { return true; }
- public boolean isInfoEnabled() { return true; }
- public boolean isWarnEnabled() { return true; }
- public boolean isErrorEnabled() { return true; }
-
- protected String asString(Object[] pDetails) {
- if (pDetails == null) {
- return "";
- }
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < pDetails.length; i++) {
- if (i > 0) {
- sb.append(", ");
- }
- sb.append(pDetails[i]);
- }
- return sb.toString();
- }
-
- protected void log(int pLevel, String mName, String pMsg) {
- task.setTaskName(cName + "." + mName);
- task.log(pMsg, pLevel);
- }
-
- public void entering(String mName, Object[] pDetails) {
- log(Project.MSG_VERBOSE, mName, "-> " + asString(pDetails));
- }
-
- public void entering(String mName) {
- log(Project.MSG_VERBOSE, mName, "->");
- }
-
- public void entering(String mName, Object pDetails) {
- log(Project.MSG_VERBOSE, mName, "-> " + pDetails);
- }
-
- public void exiting(String mName, Object[] pDetails) {
- log(Project.MSG_VERBOSE, mName, "<- " + asString(pDetails));
- }
-
- public void exiting(String mName) {
- log(Project.MSG_VERBOSE, mName, "<-");
- }
-
- public void exiting(String mName, Object pDetails) {
- log(Project.MSG_VERBOSE, mName, "<- " + pDetails);
- }
-
- public void throwing(String mName, Throwable pThrowable) {
- StringWriter sw = new StringWriter();
- pThrowable.printStackTrace(new PrintWriter(sw));
- error(mName, sw.toString());
- }
-
- public void finest(String mName, String pMsg, Object[] pDetails) {
- finest(mName, pMsg + ", " + asString(pDetails));
- }
-
- public void finest(String mName, String pMsg) {
- log(Project.MSG_DEBUG, mName, pMsg);
- }
-
- public void finest(String mName, String pMsg, Object pDetails) {
- finest(mName, pMsg + ", " + pDetails);
- }
-
- public void finer(String mName, String pMsg, Object[] pDetails) {
- finer(mName, pMsg + ", " + asString(pDetails));
- }
-
- public void finer(String mName, String pMsg) {
- log(Project.MSG_DEBUG, mName, pMsg);
- }
-
- public void finer(String mName, String pMsg, Object pDetails) {
- finer(mName, pMsg + ", " + pDetails);
- }
-
- public void fine(String mName, String pMsg, Object[] pDetails) {
- fine(mName, pMsg + ", " + asString(pDetails));
- }
-
- public void fine(String mName, String pMsg) {
- log(Project.MSG_VERBOSE, mName, pMsg);
- }
-
- public void fine(String mName, String pMsg, Object pDetails) {
- fine(mName, pMsg + ", " + pDetails);
- }
-
- public void info(String mName, String pMsg, Object[] pDetails) {
- info(mName, pMsg + ", " + asString(pDetails));
- }
-
- public void info(String mName, String pMsg) {
- log(Project.MSG_INFO, mName, pMsg);
- }
-
- public void info(String mName, String pMsg, Object pDetails) {
- info(mName, pMsg + ", " + pDetails);
- }
-
- public void warn(String mName, String pMsg, Object[] pDetails) {
- warn(mName, pMsg + ", " + asString(pDetails));
- }
-
- public void warn(String mName, String pMsg) {
- log(Project.MSG_WARN, mName, pMsg);
- }
-
- public void warn(String mName, String pMsg, Object pDetails) {
- warn(mName, pMsg + ", " + pDetails);
- }
-
- public void error(String mName, String pMsg, Object[] pDetails) {
- error(mName, pMsg + ", " + asString(pDetails));
- }
-
- public void error(String mName, String pMsg) {
- log(Project.MSG_ERR, mName, pMsg);
- }
-
- public void error(String mName, String pMsg, Object pDetails) {
- error(mName, pMsg + ", " + pDetails);
- }
+ private final String cName;
+ private final Task task;
+
+ /** Creates a new instance for the given task.
+ */
+ public AntProjectLogger(String pName, Task pTask) {
+ cName = pName;
+ task = pTask;
+ }
+
+ public boolean isFinestEnabled() { return true; }
+ public boolean isFinerEnabled() { return true; }
+ public boolean isFineEnabled() { return true; }
+ public boolean isInfoEnabled() { return true; }
+ public boolean isWarnEnabled() { return true; }
+ public boolean isErrorEnabled() { return true; }
+
+ protected String asString(Object[] pDetails) {
+ if (pDetails == null) {
+ return "";
+ }
+ StringBuffer sb = new StringBuffer();
+ for (int i = 0; i < pDetails.length; i++) {
+ if (i > 0) {
+ sb.append(", ");
+ }
+ sb.append(pDetails[i]);
+ }
+ return sb.toString();
+ }
+
+ protected void log(int pLevel, String mName, String pMsg) {
+ task.log(cName + "." + mName + ": " + pMsg, pLevel);
+ }
+
+ public void entering(String mName, Object[] pDetails) {
+ log(Project.MSG_VERBOSE, mName, "-> " + asString(pDetails));
+ }
+
+ public void entering(String mName) {
+ log(Project.MSG_VERBOSE, mName, "->");
+ }
+
+ public void entering(String mName, Object pDetails) {
+ log(Project.MSG_VERBOSE, mName, "-> " + pDetails);
+ }
+
+ public void exiting(String mName, Object[] pDetails) {
+ log(Project.MSG_VERBOSE, mName, "<- " + asString(pDetails));
+ }
+
+ public void exiting(String mName) {
+ log(Project.MSG_VERBOSE, mName, "<-");
+ }
+
+ public void exiting(String mName, Object pDetails) {
+ log(Project.MSG_VERBOSE, mName, "<- " + pDetails);
+ }
+
+ public void throwing(String mName, Throwable pThrowable) {
+ StringWriter sw = new StringWriter();
+ pThrowable.printStackTrace(new PrintWriter(sw));
+ error(mName, sw.toString());
+ }
+
+ public void finest(String mName, String pMsg, Object[] pDetails) {
+ finest(mName, pMsg + ", " + asString(pDetails));
+ }
+
+ public void finest(String mName, String pMsg) {
+ log(Project.MSG_DEBUG, mName, pMsg);
+ }
+
+ public void finest(String mName, String pMsg, Object pDetails) {
+ finest(mName, pMsg + ", " + pDetails);
+ }
+
+ public void finer(String mName, String pMsg, Object[] pDetails) {
+ finer(mName, pMsg + ", " + asString(pDetails));
+ }
+
+ public void finer(String mName, String pMsg) {
+ log(Project.MSG_DEBUG, mName, pMsg);
+ }
+
+ public void finer(String mName, String pMsg, Object pDetails) {
+ finer(mName, pMsg + ", " + pDetails);
+ }
+
+ public void fine(String mName, String pMsg, Object[] pDetails) {
+ fine(mName, pMsg + ", " + asString(pDetails));
+ }
+
+ public void fine(String mName, String pMsg) {
+ log(Project.MSG_VERBOSE, mName, pMsg);
+ }
+
+ public void fine(String mName, String pMsg, Object pDetails) {
+ fine(mName, pMsg + ", " + pDetails);
+ }
+
+ public void info(String mName, String pMsg, Object[] pDetails) {
+ info(mName, pMsg + ", " + asString(pDetails));
+ }
+
+ public void info(String mName, String pMsg) {
+ log(Project.MSG_INFO, mName, pMsg);
+ }
+
+ public void info(String mName, String pMsg, Object pDetails) {
+ info(mName, pMsg + ", " + pDetails);
+ }
+
+ public void warn(String mName, String pMsg, Object[] pDetails) {
+ warn(mName, pMsg + ", " + asString(pDetails));
+ }
+
+ public void warn(String mName, String pMsg) {
+ log(Project.MSG_WARN, mName, pMsg);
+ }
+
+ public void warn(String mName, String pMsg, Object pDetails) {
+ warn(mName, pMsg + ", " + pDetails);
+ }
+
+ public void error(String mName, String pMsg, Object[] pDetails) {
+ error(mName, pMsg + ", " + asString(pDetails));
+ }
+
+ public void error(String mName, String pMsg) {
+ log(Project.MSG_ERR, mName, pMsg);
+ }
+
+ public void error(String mName, String pMsg, Object pDetails) {
+ error(mName, pMsg + ", " + pDetails);
+ }
}
1.3 +10 -18 ws-jaxme/src/js/org/apache/ws/jaxme/logging/AntProjectLoggerFactory.java
Index: AntProjectLoggerFactory.java
===================================================================
RCS file: /home/cvs/ws-jaxme/src/js/org/apache/ws/jaxme/logging/AntProjectLoggerFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AntProjectLoggerFactory.java 16 Feb 2004 23:39:43 -0000 1.2
+++ AntProjectLoggerFactory.java 13 Dec 2004 11:56:10 -0000 1.3
@@ -16,29 +16,21 @@
*/
package org.apache.ws.jaxme.logging;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
+
/** <p>A LoggerFactory logging via an Ant project.</p>
- *
- * @author <a href="mailto:joe@ispsoft.de">Jochen Wiedmann</a>
*/
public class AntProjectLoggerFactory extends LoggerFactoryImpl {
- final Project project;
- final Task task;
-
- public AntProjectLoggerFactory(Project pProject) {
- project = pProject;
- task = null;
- }
+ final Task task;
- public AntProjectLoggerFactory(Task pTask) {
- task = pTask;
- project = null;
- }
+ /** Creates a new logger factory for the given task.
+ */
+ public AntProjectLoggerFactory(Task pTask) {
+ task = pTask;
+ }
- public Logger newLogger(String pName) {
- return task == null ?
- new AntProjectLogger(pName, project) : new AntProjectLogger(pName, task);
- }
+ public Logger newLogger(String pName) {
+ return new AntProjectLogger(pName, task);
+ }
}
1.8 +2 -2 ws-jaxme/src/js/org/apache/ws/jaxme/js/JavaSourceFactory.java
Index: JavaSourceFactory.java
===================================================================
RCS file: /home/cvs/ws-jaxme/src/js/org/apache/ws/jaxme/js/JavaSourceFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JavaSourceFactory.java 11 Oct 2004 23:03:48 -0000 1.7
+++ JavaSourceFactory.java 13 Dec 2004 11:56:10 -0000 1.8
@@ -316,7 +316,7 @@
pFile.setReadOnly();
}
} else {
- getLogger().fine(mName, "Uptodate: " + pFile);
+ getLogger().fine(mName, "Uptodate: " + pFile);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jaxme-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: jaxme-dev-help@ws.apache.org