1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
|
diff -urpN c-jdbc-1.0.4-src.orig/build.properties c-jdbc-1.0.4-src/build.properties
--- c-jdbc-1.0.4-src.orig/build.properties 2004-12-27 01:22:43.930688624 +0100
+++ c-jdbc-1.0.4-src/build.properties 2004-12-27 01:23:38.851339416 +0100
@@ -35,6 +35,7 @@ javac.deprecation = false
javac.optimize = true
javac.encoding = UTF8
javac.target = 1.3
+javac.source = 1.3
# Javadoc bottom text
javadoc.bottom = Copyright © 2002, 2004 - ObjectWeb Consortium - All Rights Reserved.
@@ -79,4 +80,4 @@ test.timeout=600000
cvs.user.name=modrzyk
cvs.url=cvs.c-jdbc.forge.objectweb.org:/cvsroot/c-jdbc
cvs.noexec=false
-cvs.noexec=true
\ No newline at end of file
+cvs.noexec=true
diff -urpN c-jdbc-1.0.4-src.orig/build.xml c-jdbc-1.0.4-src/build.xml
--- c-jdbc-1.0.4-src.orig/build.xml 2004-12-27 01:22:43.937687560 +0100
+++ c-jdbc-1.0.4-src/build.xml 2004-12-27 01:23:38.852339264 +0100
@@ -217,6 +217,7 @@
destdir="${build.classes}"
includes="org/objectweb/cjdbc/common/util/Constants.java"
target="${javac.target}"
+ source="${javac.source}"
classpathref="classpath"
debug="${javac.debug}"
depend="${javac.depend}"
@@ -238,6 +239,7 @@
destdir="${build.classes}"
includes="org/objectweb/cjdbc/common/**/*"
target="${javac.target}"
+ source="${javac.source}"
classpathref="classpath"
debug="${javac.debug}"
depend="${javac.depend}"
@@ -270,6 +272,7 @@
includes="org/objectweb/cjdbc/driver/**/*"
excludes="${src.jdk1.3}"
target="${javac.target}"
+ source="${javac.source}"
classpathref="classpath"
debug="${javac.debug}"
depend="${javac.depend}"
@@ -287,6 +290,7 @@
destdir="${build.classes}"
includes="org/objectweb/cjdbc/controller/**/*"
target="${javac.target}"
+ source="${javac.source}"
classpathref="classpath"
debug="${javac.debug}"
depend="${javac.depend}"
@@ -305,6 +309,7 @@
destdir="${build.classes}"
includes="org/objectweb/cjdbc/console/**/*"
target="${javac.target}"
+ source="${javac.source}"
classpathref="classpath"
debug="${javac.debug}"
depend="${javac.depend}"
@@ -323,6 +328,7 @@
destdir="${build.test.classes}"
includes="org/objectweb/cjdbc/requestplayer/**/*"
target="${javac.target}"
+ source="${javac.source}"
classpathref="classpath"
debug="${javac.debug}"
depend="${javac.depend}"
@@ -340,7 +346,8 @@
<javac srcdir="${test.src}"
destdir="${build.test.classes}/"
excludes="org/objectweb/cjdbc/requestplayer/**/*"
- target="${javac.target}"
+ target="${javac.target}"
+ source="${javac.source}"
classpathref="classpath-test"
debug="${javac.debug}"
depend="${javac.depend}"
diff -urpN c-jdbc-1.0.4-src.orig/config/log4j.properties c-jdbc-1.0.4-src/config/log4j.properties
--- c-jdbc-1.0.4-src.orig/config/log4j.properties 2004-12-27 01:22:43.931688472 +0100
+++ c-jdbc-1.0.4-src/config/log4j.properties 2004-12-27 01:40:51.594338616 +0100
@@ -11,7 +11,7 @@ log4j.appender.Console.layout.Conversion
# Requests appender is used to log requests received by the controller.
# These log can be automatically replayed using the request player.
log4j.appender.Requests=org.apache.log4j.RollingFileAppender
-log4j.appender.Requests.File=${cjdbc.home}/log/request.log
+log4j.appender.Requests.File=/var/log/c-jdbc/request.log
log4j.appender.Requests.MaxFileSize=100MB
log4j.appender.Requests.MaxBackupIndex=5
log4j.appender.Requests.layout=org.apache.log4j.PatternLayout
@@ -19,7 +19,7 @@ log4j.appender.Requests.layout.Conversio
# Filetrace is used for C-JDBC log files.
log4j.appender.Filetrace=org.apache.log4j.RollingFileAppender
-log4j.appender.Filetrace.File=${cjdbc.home}/log/cjdbc.log
+log4j.appender.Filetrace.File=/var/log/c-jdbc/cjdbc.log
log4j.appender.Filetrace.MaxFileSize=10MB
log4j.appender.Filetrace.MaxBackupIndex=0
log4j.appender.Filetrace.layout=org.apache.log4j.PatternLayout
diff -urpN c-jdbc-1.0.4-src.orig/src/org/objectweb/cjdbc/console/monitoring/MonitoringGraph.java c-jdbc-1.0.4-src/src/org/objectweb/cjdbc/console/monitoring/MonitoringGraph.java
--- c-jdbc-1.0.4-src.orig/src/org/objectweb/cjdbc/console/monitoring/MonitoringGraph.java 2004-12-27 01:22:43.628734528 +0100
+++ c-jdbc-1.0.4-src/src/org/objectweb/cjdbc/console/monitoring/MonitoringGraph.java 2004-12-27 01:23:38.852339264 +0100
@@ -36,8 +36,8 @@ import org.jfree.chart.ChartPanel;
import org.jfree.chart.ChartUtilities;
import org.jfree.chart.JFreeChart;
import org.jfree.chart.plot.PlotOrientation;
-import org.jfree.data.XYSeries;
-import org.jfree.data.XYSeriesCollection;
+import org.jfree.data.xy.XYSeries;
+import org.jfree.data.xy.XYSeriesCollection;
import org.jfree.ui.RefineryUtilities;
import org.objectweb.cjdbc.common.monitor.AbstractDataCollector;
import org.objectweb.cjdbc.console.jmx.DataCollectorJmxClient;
@@ -466,4 +466,4 @@ public class MonitoringGraph extends Thr
{
this.displayFrequency = displayFrequency;
}
-}
\ No newline at end of file
+}
|
GitWeb