Author: kmenard
Date: Fri Nov 3 08:35:04 2006
New Revision: 470873
URL: http://svn.apache.org/viewvc?view=rev&rev=470873
Log:
Wrapping up the ILog stuff for the class generator so that there is no
dependency on ant for logging (CAY-591).
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/tools/ILog.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/tools/NamePatternMatcher.java
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/tools/ILog.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/tools/ILog.java?view=diff&rev=470873&r1=470872&r2=470873
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/tools/ILog.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/tools/ILog.java
Fri Nov 3 08:35:04 2006
@@ -26,6 +26,14 @@
* @since 3.0
*/
interface ILog {
+ // These were taken from org.apache.tools.ant.Project and should be used
for the msgLevel
+ // parameter of the logging functions.
+ public static final int MSG_ERR = 0;
+ public static final int MSG_WARN = 1;
+ public static final int MSG_INFO = 2;
+ public static final int MSG_VERBOSE = 3;
+ public static final int MSG_DEBUG = 4;
+
void log(String msg);
void log(String msg, int msgLevel);
}
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/tools/NamePatternMatcher.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/tools/NamePatternMatcher.java?view=diff&rev=470873&r1=470872&r2=470873
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/tools/NamePatternMatcher.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/tools/NamePatternMatcher.java
Fri Nov 3 08:35:04 2006
@@ -26,7 +26,6 @@
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
-import org.apache.tools.ant.Project;
import org.apache.cayenne.util.CayenneMapEntry;
/**
@@ -74,7 +73,7 @@
logger.log("Ignoring invalid pattern ["
+ patternStrings[i]
+ "], reason: "
- + e.getMessage(), Project.MSG_WARN);
+ + e.getMessage(), ILog.MSG_WARN);
}
continue;
}