Hi all,
Thanks for all the great work on log4j. I hope this
little contribution saves time at some point (as I'm
sure this things will get ironed out eventually), and
apologise in advance if I've sent this to the wrong
list.
I retrieved the log4j CVS tree to try out the CVS
perspective of Eclipse. I'm using the jdk 1.3.1 on
Windows 2000, i.e.
$ java -version
java version "1.3.1_01"
Java(TM) 2 Runtime Environment, Standard Edition
(build 1.3.1_01)
I had to make a few small changes to get log4j to
build, as indicated in the attached patch file. I
checked between the 1.3.1/1.4.1 javadoc and I can
confirm that all the changes are merely cases of new
1.4.1 APIs being used instead of their 1.3.1
alternatives.
Tim
_________________________________________________________
Do You Yahoo!?
Información de Estados Unidos y América Latina, en Yahoo! Noticias.
Visítanos en http://noticias.espanol.yahoo.com
Index: src/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java
===================================================================
RCS file:
/home/cvspublic/jakarta-log4j/src/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java,v
retrieving revision 1.15
diff -u -r1.15 ChainsawToolBarAndMenus.java
--- src/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java 22 Sep 2003
06:58:45 -0000 1.15
+++ src/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java 23 Sep 2003
22:34:27 -0000
@@ -221,7 +221,7 @@
((JCheckBoxMenuItem) panelMenuMap.get(entry.getKey())).getModel()
.setEnabled(newEnabled);
panelEnabledMap.put(
- entry.getKey(), Boolean.valueOf(newEnabled));
+ entry.getKey(), new Boolean(newEnabled));
}
}
}
Index: src/java/org/apache/log4j/chainsaw/LogUI.java
===================================================================
RCS file: /home/cvspublic/jakarta-log4j/src/java/org/apache/log4j/chainsaw/LogUI.java,v
retrieving revision 1.34
diff -u -r1.34 LogUI.java
--- src/java/org/apache/log4j/chainsaw/LogUI.java 23 Sep 2003 04:09:13 -0000
1.34
+++ src/java/org/apache/log4j/chainsaw/LogUI.java 23 Sep 2003 22:34:30 -0000
@@ -867,7 +867,7 @@
Map.Entry entry = (Map.Entry) iter.next();
m.put(
entry.getKey(),
- Boolean.valueOf(((DockablePanel) entry.getValue()).isDocked()));
+ new Boolean(((DockablePanel) entry.getValue()).isDocked()));
}
return m;
Index: src/java/org/apache/log4j/chainsaw/layout/LayoutEditorPane.java
===================================================================
RCS file:
/home/cvspublic/jakarta-log4j/src/java/org/apache/log4j/chainsaw/layout/LayoutEditorPane.java,v
retrieving revision 1.1
diff -u -r1.1 LayoutEditorPane.java
--- src/java/org/apache/log4j/chainsaw/layout/LayoutEditorPane.java 4 Sep 2003
05:45:16 -0000 1.1
+++ src/java/org/apache/log4j/chainsaw/layout/LayoutEditorPane.java 23 Sep 2003
22:34:31 -0000
@@ -286,7 +286,7 @@
JDialog dialog = new JDialog((Frame) null, "Pattern Editor");
dialog.getContentPane().add(new LayoutEditorPane());
dialog.setResizable(true);
- dialog.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE);
+ dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
// dialog.pack();
dialog.setSize(new Dimension(640, 480));
Index: src/java/org/apache/log4j/chainsaw/rule/RuleTest.java
===================================================================
RCS file:
/home/cvspublic/jakarta-log4j/src/java/org/apache/log4j/chainsaw/rule/RuleTest.java,v
retrieving revision 1.5
diff -u -r1.5 RuleTest.java
--- src/java/org/apache/log4j/chainsaw/rule/RuleTest.java 19 Sep 2003 06:53:05
-0000 1.5
+++ src/java/org/apache/log4j/chainsaw/rule/RuleTest.java 23 Sep 2003 22:34:32
-0000
@@ -91,7 +91,7 @@
*
*/
public RuleTest(String booleanPostFixExpression, String inFixExpression) {
- setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+ setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
getContentPane().setLayout(new BorderLayout());
final LoggingEventFieldResolver resolver =
LoggingEventFieldResolver.getInstance();
@@ -272,10 +272,10 @@
if (booleanOperatorMap.containsKey(nextToken)) {
BooleanOperator op = (BooleanOperator) booleanOperatorMap.get(nextToken);
//the operator is responsible for popping the stack
- stack.push(Boolean.valueOf(op.evaluate(stack)));
+ stack.push(new Boolean(op.evaluate(stack)));
} else if (eventOperatorMap.containsKey(nextToken)) {
EventOperator op =
(EventOperator)eventOperatorMap.get(nextToken);
- stack.push(Boolean.valueOf(op.evaluate(stack, event)));
+ stack.push(new Boolean(op.evaluate(stack, event)));
} else {
//variables or constants are pushed onto the stack
stack.push(nextToken);
Index: tests/src/java/org/apache/log4j/rolling/TimeBasedRollingTest.java
===================================================================
RCS file:
/home/cvspublic/jakarta-log4j/tests/src/java/org/apache/log4j/rolling/TimeBasedRollingTest.java,v
retrieving revision 1.3
diff -u -r1.3 TimeBasedRollingTest.java
--- tests/src/java/org/apache/log4j/rolling/TimeBasedRollingTest.java 17 Sep 2003
18:03:16 -0000 1.3
+++ tests/src/java/org/apache/log4j/rolling/TimeBasedRollingTest.java 23 Sep 2003
22:34:36 -0000
@@ -62,6 +62,7 @@
import java.text.SimpleDateFormat;
import java.util.Calendar;
+import java.util.Date;
/**
@@ -359,12 +360,12 @@
void delayUntilNextSecond(int millis) {
long now = System.currentTimeMillis();
Calendar cal = Calendar.getInstance();
- cal.setTimeInMillis(now);
+ cal.setTime(new Date(now));
cal.set(Calendar.MILLISECOND, millis);
cal.add(Calendar.SECOND, 1);
- long next = cal.getTimeInMillis();
+ long next = cal.getTime().getTime();
try {
Thread.sleep(next - now);
@@ -375,12 +376,12 @@
void delayUntilNextMinute(int seconds) {
long now = System.currentTimeMillis();
Calendar cal = Calendar.getInstance();
- cal.setTimeInMillis(now);
+ cal.setTime(new Date(now));
cal.set(Calendar.SECOND, seconds);
cal.add(Calendar.MINUTE, 1);
- long next = cal.getTimeInMillis();
+ long next = cal.getTime().getTime();
try {
Thread.sleep(next - now);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
