diff --git a/Doc/Makefile b/Doc/Makefile
index 67c7dfeec97be6e8f76b8b0628cef38f4ad7454d..72f9b2666e6bf9a1d9e4221cbc40a520ddb25278 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -31,7 +31,7 @@ ${BUILDNAVI}/index.html ${BUILDNAVI}/printversion.pdf:${SCRIPTBASENAME}.xml
/usr/share/xmlmind/bin/convertdoc -p suppress.navigation 1 -p eclipse.plugin.id $(PLUGINID) ${PPARAM} db5.toEclipseHelp ${SCRIPTBASENAME}.convert.answer.xml \
-u $(BUILDNONAVI)
mkdir -p Ref/Fig/Generate;rm -f Ref/Fig/Generate/*.tex;mv resources/Generate/*.tex Ref/Fig/Generate/
- mkdir -p Ref/Fig/Generate;cd Ref/Fig/Generate;make -f ../Makefile all
+ cd Ref/Fig;make all
/usr/share/xmlmind/bin/convertdoc -p eclipse.plugin.id $(PLUGINID) ${PPARAM} db5.toEclipseHelp ${SCRIPTBASENAME}.convert.answer.xml -u $(BUILDNAVI)
perl -i -p -e '$$/=undef;s/\n[ \t]*<!DOCTYPE[^>]+\n[^>]*>$$//m' ${BUILDNAVI}/*.xml ${BUILDNONAVI}/*.xml
cd ../ws/eclipse/Jdbc;javadoc -classpath /usr/share/java/testng.jar -d ${BUILDNAVI}/Ref/api -linksource \
diff --git a/Doc/Ref/Fig/Makefile b/Doc/Ref/Fig/Makefile
index dc47f3c9d7da134e9be3dd60169e0d05f42a97c4..e7f3640f36c9bd2907a06fc68705d7995eb6f3d3 100644
--- a/Doc/Ref/Fig/Makefile
+++ b/Doc/Ref/Fig/Makefile
@@ -5,18 +5,15 @@
FIGFILES=clientserv jdbcarch jdbcurl jdbcread
%-0.pdf:../%.fig
- fig2mpdf -l -m $< #&& touch $*.done
+ /ma/goik/workspace/GoikLectures/bin/fig2mpdf -l -m $< #&& touch $*.done
if [ -e $*.tex ]; then pdflatex $* && rm -f ../$*.pdf && mv $*.pdf ..; fi;
-all:$(foreach figfile, $(FIGFILES), $(figfile)-0.pdf)
+pdf:$(foreach figfile, $(FIGFILES), $(figfile)-0.pdf)
-xhtml.pdf:xhtml.fig
- fig2pdf xhtml.fig
-
-gendir:
- mkdir -p Generate
+all:
+ mkdir -p Generate;cd Generate;$(MAKE) -f ../Makefile pdf
clean:
- rm -f $(foreach figfile, $(FIGFILES), $(figfile)-[0-9]*.pdf $(figfile).fig.bak)
+ rm -rf Generate
#end
diff --git a/Doc/Ref/Fig/clientserv.fig b/Doc/Ref/Fig/clientserv.fig
index 647941511e7d97346c76b9061ce3153d2b38cce9..a88b2abbacae0bd7e008f2385cc2714ee69f6d21 100644
--- a/Doc/Ref/Fig/clientserv.fig
+++ b/Doc/Ref/Fig/clientserv.fig
@@ -1,4 +1,4 @@
-#FIG 3.2
+#FIG 3.2 Produced by xfig version 3.2.5b
Landscape
Center
Metric
@@ -52,274 +52,271 @@ Single
0 74 #ffdf94
0 75 #ffefbd
0 76 #fff7de
-5 1 0 1 0 7 45 0 -1 0.000 0 1 0 0 1586.968 3947.074 1125 3915 1260 4275 1575 4410
-5 1 0 1 0 7 45 0 -1 0.000 0 0 0 0 5478.032 3947.074 5940 3915 5805 4275 5490 4410
-5 1 0 1 0 7 45 0 -1 0.000 0 0 0 0 3678.032 3947.074 4140 3915 4005 4275 3690 4410
-5 1 0 1 0 7 45 0 -1 0.000 0 0 0 0 2103.032 3947.074 2565 3915 2430 4275 2115 4410
+5 1 0 1 0 7 700 0 -1 0.000 0 0 0 0 3678.032 3947.074 4140 3915 4005 4275 3690 4410
+5 1 0 1 0 7 680 0 -1 0.000 0 0 0 0 5478.032 3947.074 5940 3915 5805 4275 5490 4410
+5 1 0 1 0 7 720 -1 -1 0.000 0 0 0 0 2113.125 3956.250 2565 3915 2475 4230 2115 4410
+5 1 0 1 0 7 720 -1 -1 0.000 0 1 0 0 1576.875 3956.250 1125 3915 1215 4230 1575 4410
+# High speed disk
+6 634 1788 1579 3206
+5 1 0 1 -1 -1 800 0 -1 0.000 0 1 0 0 1106.850 1473.307 634 2103 1106 2260 1579 2103
+5 1 0 1 -1 -1 800 0 -1 0.000 0 1 0 0 1106.850 2418.189 634 3048 1106 3205 1579 3048
+1 2 0 1 -1 -1 800 0 -1 0.000 1 0.0000 1106 1945 472 157 634 1788 1579 2103
+2 1 0 1 -1 -1 800 0 -1 0.000 0 0 0 0 0 2
+ 1579 2024 1579 3048
+2 1 0 1 -1 -1 800 0 -1 0.000 0 0 0 0 0 2
+ 634 2024 634 3048
+4 1 -1 800 0 18 12 0.0000 4 150 705 1080 2610 RDBMS\001
+-6
# Desktop computer
-6 3690 1125 4905 2295
-6 4590 2115 4860 2295
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 5
+6 3694 1135 4896 2277
+6 4625 2119 4860 2264
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 5
4717 2147 4815 2154 4840 2128 4755 2126 4717 2147
-2 1 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 2
+2 1 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 2
4687 2157 4820 2168
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 3
+2 1 0 1 -1 7 780 0 -1 0.000 0 0 -1 0 0 3
4628 2235 4791 2246 4857 2134
-2 3 0 1 -1 7 2 0 15 0.000 0 0 -1 0 0 7
+2 3 0 1 -1 7 782 0 15 0.000 0 0 -1 0 0 7
4751 2119 4687 2155 4627 2213 4791 2226 4818 2168 4855 2120
4751 2119
-2 3 0 1 -1 7 2 0 10 0.000 0 0 -1 0 0 9
+2 3 0 1 -1 7 782 0 10 0.000 0 0 -1 0 0 9
4628 2213 4630 2255 4795 2264 4860 2142 4857 2119 4818 2168
4789 2228 4625 2213 4628 2213
-6
-6 3690 2025 4635 2295
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 8
+6 3694 2033 4609 2277
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 8
4315 2186 4314 2155 4333 2149 4360 2149 4359 2176 4344 2187
4319 2187 4315 2186
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 8
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 8
4359 2188 4358 2158 4376 2151 4405 2153 4403 2178 4388 2190
4363 2190 4359 2188
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 8
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 8
4401 2198 4401 2168 4419 2160 4448 2162 4446 2187 4432 2199
4407 2199 4401 2198
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 8
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 8
4271 2186 4269 2155 4289 2149 4317 2149 4315 2176 4300 2187
4274 2187 4271 2186
-2 3 0 1 -1 7 1 0 20 0.000 0 0 -1 0 0 8
+2 3 0 1 -1 7 781 0 20 0.000 0 0 -1 0 0 8
4284 2158 4283 2128 4301 2120 4329 2122 4328 2147 4314 2159
4289 2159 4284 2158
-2 3 0 1 -1 7 1 0 20 0.000 0 0 -1 0 0 8
+2 3 0 1 -1 7 781 0 20 0.000 0 0 -1 0 0 8
4329 2161 4327 2130 4346 2123 4374 2125 4373 2150 4358 2163
4333 2163 4329 2161
-2 3 0 1 -1 7 1 0 20 0.000 0 0 -1 0 0 8
+2 3 0 1 -1 7 781 0 20 0.000 0 0 -1 0 0 8
4373 2164 4371 2133 4391 2127 4419 2128 4417 2153 4402 2165
4377 2165 4373 2164
-2 3 0 1 -1 7 1 0 20 0.000 0 0 -1 0 0 8
+2 3 0 1 -1 7 781 0 20 0.000 0 0 -1 0 0 8
4423 2165 4422 2134 4440 2128 4468 2129 4467 2155 4452 2167
4427 2167 4423 2165
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 9
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 9
4320 2122 4320 2107 4335 2096 4365 2100 4365 2103 4356 2110
4355 2123 4317 2122 4320 2122
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 9
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 9
4355 2123 4355 2107 4370 2096 4401 2100 4401 2104 4391 2110
4391 2123 4353 2123 4355 2123
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 9
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 9
4388 2128 4388 2113 4403 2102 4434 2105 4434 2109 4425 2116
4423 2129 4385 2128 4388 2128
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 9
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 9
4423 2129 4423 2114 4438 2104 4469 2107 4469 2110 4459 2117
4459 2130 4421 2129 4423 2129
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 9
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 9
4457 2133 4457 2118 4472 2107 4502 2110 4502 2114 4496 2135
4481 2143 4454 2133 4457 2133
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 9
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 9
3920 2077 3920 2062 3935 2052 3966 2054 3966 2059 3956 2065
3955 2079 3917 2077 3920 2077
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 9
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 9
3951 2082 3951 2066 3965 2056 3996 2059 3996 2064 3986 2070
3985 2083 3948 2082 3951 2082
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 9
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 9
3989 2083 3989 2068 4002 2057 4033 2060 4033 2065 4024 2070
4022 2084 3985 2083 3989 2083
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 9
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 9
4017 2087 4017 2073 4032 2061 4063 2065 4063 2068 4053 2075
4052 2088 4015 2087 4017 2087
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 9
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 9
4052 2088 4052 2074 4067 2064 4098 2065 4098 2070 4088 2076
4087 2089 4050 2088 4052 2088
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 9
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 9
4087 2091 4087 2076 4101 2065 4132 2068 4132 2073 4123 2079
4122 2092 4084 2091 4087 2091
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 9
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 9
4121 2091 4121 2076 4136 2065 4166 2068 4166 2073 4157 2079
4155 2092 4118 2091 4121 2091
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 9
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 9
4152 2093 4152 2079 4166 2068 4197 2070 4197 2075 4187 2082
4186 2095 4149 2093 4152 2093
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 9
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 9
4190 2093 4190 2079 4204 2068 4235 2070 4235 2075 4226 2082
4224 2095 4186 2093 4190 2093
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 9
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 9
3881 2096 3881 2082 3897 2070 3927 2074 3927 2077 3918 2084
3916 2097 3879 2096 3881 2096
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 9
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 9
3916 2103 3916 2088 3931 2077 3962 2080 3962 2084 3952 2091
3952 2105 3914 2103 3916 2103
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 9
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 9
3952 2105 3952 2091 3966 2080 3997 2083 3997 2087 3989 2093
3986 2107 3948 2105 3952 2105
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 9
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 9
3983 2109 3983 2093 3999 2083 4029 2086 4029 2089 4020 2096
4019 2110 3981 2109 3983 2109
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 9
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 9
4017 2111 4017 2096 4032 2086 4063 2088 4063 2092 4053 2100
4052 2112 4015 2111 4017 2111
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 9
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 9
4051 2112 4051 2097 4065 2087 4096 2089 4096 2093 4087 2101
4085 2114 4047 2112 4051 2112
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 9
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 9
4084 2114 4084 2101 4099 2089 4130 2092 4130 2096 4121 2103
4119 2117 4082 2114 4084 2114
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 9
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 9
4120 2115 4120 2101 4134 2090 4165 2092 4165 2096 4156 2103
4154 2117 4116 2115 4120 2115
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 9
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 9
4154 2118 4154 2103 4169 2092 4200 2096 4200 2100 4190 2106
4190 2119 4152 2118 4154 2118
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 9
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 9
4190 2119 4190 2105 4204 2094 4235 2096 4235 2101 4226 2107
4224 2121 4186 2119 4190 2119
-2 3 0 1 -1 7 1 0 20 0.000 0 0 -1 0 0 8
+2 3 0 1 -1 7 781 0 20 0.000 0 0 -1 0 0 8
3879 2131 3878 2101 3897 2093 3925 2095 3923 2120 3908 2133
3883 2133 3879 2131
-2 3 0 1 -1 7 1 0 20 0.000 0 0 -1 0 0 8
+2 3 0 1 -1 7 781 0 20 0.000 0 0 -1 0 0 8
3912 2134 3912 2103 3930 2096 3957 2097 3957 2123 3942 2135
3916 2135 3912 2134
-2 3 0 1 -1 7 1 0 20 0.000 0 0 -1 0 0 8
+2 3 0 1 -1 7 781 0 20 0.000 0 0 -1 0 0 8
3948 2139 3946 2109 3965 2102 3993 2103 3992 2128 3977 2140
3952 2140 3948 2139
-2 3 0 1 -1 7 1 0 20 0.000 0 0 -1 0 0 8
+2 3 0 1 -1 7 781 0 20 0.000 0 0 -1 0 0 8
3985 2143 3984 2112 4003 2105 4031 2107 4030 2133 4015 2144
3989 2144 3985 2143
-2 3 0 1 -1 7 1 0 20 0.000 0 0 -1 0 0 8
+2 3 0 1 -1 7 781 0 20 0.000 0 0 -1 0 0 8
4017 2145 4015 2114 4035 2107 4063 2110 4062 2134 4047 2147
4021 2147 4017 2145
-2 3 0 1 -1 7 1 0 20 0.000 0 0 -1 0 0 8
+2 3 0 1 -1 7 781 0 20 0.000 0 0 -1 0 0 8
4056 2149 4055 2119 4073 2112 4101 2114 4100 2139 4085 2151
4060 2151 4056 2149
-2 3 0 1 -1 7 1 0 20 0.000 0 0 -1 0 0 8
+2 3 0 1 -1 7 781 0 20 0.000 0 0 -1 0 0 8
4096 2153 4095 2122 4114 2114 4142 2117 4141 2142 4126 2154
4100 2154 4096 2153
-2 3 0 1 -1 7 1 0 20 0.000 0 0 -1 0 0 8
+2 3 0 1 -1 7 781 0 20 0.000 0 0 -1 0 0 8
4137 2154 4136 2123 4154 2117 4182 2118 4181 2143 4166 2155
4141 2155 4137 2154
-2 3 0 1 -1 7 1 0 20 0.000 0 0 -1 0 0 8
+2 3 0 1 -1 7 781 0 20 0.000 0 0 -1 0 0 8
4170 2157 4169 2126 4187 2119 4216 2120 4215 2146 4200 2158
4174 2158 4170 2157
-2 3 0 1 -1 7 1 0 20 0.000 0 0 -1 0 0 8
+2 3 0 1 -1 7 781 0 20 0.000 0 0 -1 0 0 8
3848 2128 3846 2096 3866 2089 3894 2091 3892 2117 3878 2128
3852 2128 3848 2128
-2 3 0 1 -1 7 1 0 20 0.000 0 0 -1 0 0 8
+2 3 0 1 -1 7 781 0 20 0.000 0 0 -1 0 0 8
3813 2149 3810 2118 3829 2111 3857 2112 3857 2138 3841 2149
3816 2149 3813 2149
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 9
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 9
3841 2149 3841 2134 3857 2123 3887 2126 3887 2130 3878 2137
3877 2149 3839 2149 3841 2149
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 7
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 7
3877 2153 4138 2185 4141 2157 3884 2131 3875 2143 3875 2149
3877 2153
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 9
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 9
4139 2183 4139 2168 4154 2158 4184 2160 4184 2164 4175 2171
4174 2184 4137 2183 4139 2183
-2 3 0 1 -1 7 5 0 15 0.000 0 0 -1 0 0 9
+2 3 0 1 -1 7 785 0 15 0.000 0 0 -1 0 0 9
3698 2135 3899 2033 4586 2091 4608 2103 4604 2111 4487 2229
3697 2144 3697 2134 3698 2135
-2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 3
+2 1 0 1 -1 7 780 0 -1 0.000 0 0 -1 0 0 3
3694 2166 4495 2248 4606 2138
-2 3 0 0 -1 7 5 0 10 0.000 0 0 -1 0 0 8
+2 3 0 0 -1 7 785 0 10 0.000 0 0 -1 0 0 8
3698 2146 3698 2181 4492 2277 4609 2154 4608 2103 4486 2229
3696 2143 3698 2146
-6
-6 3690 1125 4905 2070
-6 4590 1170 4770 1710
-2 3 0 1 -1 7 2 0 10 0.000 0 0 -1 0 0 6
+6 3714 1135 4896 2026
+6 4618 1213 4757 1671
+2 3 0 1 -1 7 782 0 10 0.000 0 0 -1 0 0 6
4618 1668 4634 1213 4757 1267 4749 1632 4618 1671 4618 1668
-2 3 0 1 -1 39 1 0 49 0.000 0 0 -1 0 0 5
+2 3 0 1 -1 39 781 0 49 0.000 0 0 -1 0 0 5
4637 1239 4621 1606 4745 1588 4750 1287 4637 1239
-6
-2 3 0 1 -1 7 0 0 15 0.000 0 0 -1 0 0 5
+2 3 0 1 -1 7 780 0 15 0.000 0 0 -1 0 0 5
3718 1901 4590 1964 4590 1807 3715 1752 3718 1901
-2 3 0 1 -1 7 0 0 15 0.000 0 0 -1 0 0 5
+2 3 0 1 -1 7 780 0 15 0.000 0 0 -1 0 0 5
3715 1755 4590 1807 4590 1752 3714 1704 3715 1755
-2 1 0 1 -1 7 0 0 15 0.000 0 0 -1 0 0 2
+2 1 0 1 -1 7 780 0 15 0.000 0 0 -1 0 0 2
3718 1731 4590 1785
-2 3 0 1 -1 7 0 0 10 0.000 0 0 -1 0 0 6
+2 3 0 1 -1 7 780 0 10 0.000 0 0 -1 0 0 6
4592 1964 4590 1752 4896 1636 4896 1785 4588 1964 4592 1964
-2 3 0 1 -1 39 0 0 50 0.000 0 0 -1 0 0 5
+2 3 0 1 -1 39 780 0 50 0.000 0 0 -1 0 0 5
3732 1906 3732 1960 4588 2024 4588 1962 3732 1906
-2 3 0 1 -1 39 0 0 50 0.000 0 0 -1 0 0 5
+2 3 0 1 -1 39 780 0 50 0.000 0 0 -1 0 0 5
4590 1966 4896 1785 4896 1821 4586 2026 4590 1966
-2 3 0 1 -1 7 3 0 10 0.000 0 0 -1 0 0 6
+2 3 0 1 -1 7 783 0 10 0.000 0 0 -1 0 0 6
4507 1723 4536 1157 4618 1176 4600 1695 4510 1726 4507 1723
-2 3 0 1 -1 7 2 0 10 0.000 0 0 -1 0 0 6
+2 3 0 1 -1 7 782 0 10 0.000 0 0 -1 0 0 6
4636 1179 4618 1176 4600 1694 4621 1687 4634 1213 4636 1179
-2 3 0 1 -1 7 2 0 5 0.000 0 0 -1 0 0 7
+2 3 0 1 -1 7 782 0 5 0.000 0 0 -1 0 0 7
4520 1137 4536 1159 4616 1176 4634 1179 4607 1160 4516 1135
4520 1137
-2 3 0 1 -1 7 4 0 5 0.000 0 0 -1 0 0 9
+2 3 0 1 -1 7 784 0 5 0.000 0 0 -1 0 0 9
3968 1241 3944 1615 3957 1627 4437 1651 4454 1631 4475 1238
4457 1203 3984 1217 3968 1241
-2 3 0 1 -1 7 0 0 20 0.000 0 0 -1 0 0 11
+2 3 0 1 -1 7 780 0 20 0.000 0 0 -1 0 0 11
4618 1687 4618 1668 4756 1631 4896 1636 4590 1752 3718 1704
3877 1665 3874 1687 4507 1726 4621 1687 4618 1687
-2 3 0 1 -1 7 5 0 15 0.000 0 0 -1 0 0 7
+2 3 0 1 -1 7 785 0 15 0.000 0 0 -1 0 0 7
3877 1691 3903 1165 3927 1150 4513 1135 4536 1157 4507 1726
3877 1691
-2 3 0 1 -1 7 1 0 20 0.000 0 0 -1 0 0 10
+2 3 0 1 -1 7 781 0 20 0.000 0 0 -1 0 0 10
3999 1230 3982 1247 3963 1599 3971 1617 4423 1636 4446 1620
4465 1247 4444 1217 4004 1230 3999 1230
-6
-6
-# High speed disk
-6 630 1755 1620 3240
-5 1 0 1 -1 -1 0 0 -1 0.000 0 1 0 0 1106.850 1473.307 634 2103 1106 2260 1579 2103
-5 1 0 1 -1 -1 0 0 -1 0.000 0 1 0 0 1106.850 2418.189 634 3048 1106 3205 1579 3048
-1 2 0 1 -1 -1 0 0 -1 0.000 1 0.0000 1106 1945 472 157 634 1788 1579 2103
-2 1 0 1 -1 -1 0 0 -1 0.000 0 0 0 0 0 2
- 1579 2024 1579 3048
-2 1 0 1 -1 -1 0 0 -1 0.000 0 0 0 0 0 2
- 634 2024 634 3048
-4 1 -1 0 0 18 12 0.0000 4 135 705 1080 2610 RDBMS\001
--6
-2 1 0 1 0 7 45 0 -1 0.000 0 0 -1 0 0 2
- 1575 4410 5490 4410
-2 1 1 1 0 7 45 0 -1 4.000 0 0 -1 0 0 2
+2 2 0 1 7 7 800 0 -1 0.000 0 0 -1 0 0 5
+ 450 900 7200 900 7200 5400 450 5400 450 900
+2 1 1 1 0 7 780 0 -1 4.000 0 0 -1 0 0 2
1935 1170 1935 4905
-2 1 0 1 0 7 45 0 -1 0.000 0 0 -1 1 0 2
- 1 1 1.00 60.00 120.00
- 2565 3915 2565 2835
-2 1 0 1 0 7 45 0 -1 0.000 0 0 -1 1 0 2
+2 2 0 1 0 74 761 0 20 0.000 0 0 7 0 0 5
+ 720 4275 6345 4275 6345 4725 720 4725 720 4275
+2 2 0 1 0 75 701 0 20 0.000 0 0 7 0 0 5
+ 3915 3600 4365 3600 4365 4275 3915 4275 3915 3600
+2 2 0 1 0 76 701 0 20 0.000 0 0 7 0 0 5
+ 3915 3150 4365 3150 4365 3600 3915 3600 3915 3150
+2 1 0 1 0 7 700 0 -1 0.000 0 0 -1 1 0 2
1 1 1.00 60.00 120.00
4140 3915 4140 2835
-2 1 0 1 0 7 45 0 -1 0.000 0 0 -1 1 0 2
+2 1 0 1 0 7 700 -1 -1 0.000 0 0 -1 0 0 2
+ 2160 4410 3690 4410
+2 2 0 1 0 76 681 0 20 0.000 0 0 7 0 0 5
+ 5670 3150 6120 3150 6120 3600 5670 3600 5670 3150
+2 2 0 1 0 75 681 0 20 0.000 0 0 7 0 0 5
+ 5670 3600 6120 3600 6120 4275 5670 4275 5670 3600
+2 1 0 1 0 7 680 0 -1 0.000 0 0 -1 1 0 2
1 1 1.00 60.00 120.00
5940 3915 5940 2835
-2 1 0 1 0 7 45 0 -1 0.000 0 0 -1 1 0 2
- 1 1 1.00 60.00 120.00
- 1125 3915 1125 3285
-2 2 0 1 7 7 50 0 -1 0.000 0 0 -1 0 0 5
- 450 900 7200 900 7200 5400 450 5400 450 900
-2 1 0 1 0 7 45 0 -1 0.000 0 0 -1 1 1 2
+2 1 0 1 0 7 680 -1 -1 0.000 0 0 -1 0 0 2
+ 3735 4410 5535 4410
+2 2 0 1 0 76 721 0 20 0.000 0 0 7 0 0 5
+ 2340 3150 2790 3150 2790 3600 2340 3600 2340 3150
+2 2 0 1 0 75 721 0 20 0.000 0 0 7 0 0 5
+ 2340 3600 2790 3600 2790 4275 2340 4275 2340 3600
+2 1 0 1 0 7 720 0 -1 0.000 0 0 -1 1 0 2
1 1 1.00 60.00 120.00
+ 2565 3915 2565 2835
+2 1 0 1 0 7 720 -1 -1 0.000 0 0 -1 0 0 2
+ 1575 4410 2115 4410
+2 1 0 1 0 7 720 0 -1 0.000 0 0 -1 1 0 2
1 1 1.00 60.00 120.00
- 1170 1440 2565 1440
-2 2 0 1 0 75 50 0 20 0.000 0 0 7 0 0 5
+ 1125 3960 1125 3285
+2 2 0 1 0 75 721 0 20 0.000 0 0 7 0 0 5
900 3600 1350 3600 1350 4275 900 4275 900 3600
-2 2 0 1 0 74 50 0 20 0.000 0 0 7 0 0 5
- 720 4275 6345 4275 6345 4725 720 4725 720 4275
-2 2 0 1 0 75 50 0 20 0.000 0 0 7 0 0 5
- 3915 3600 4365 3600 4365 4275 3915 4275 3915 3600
-2 2 0 1 0 75 50 0 20 0.000 0 0 7 0 0 5
- 2340 3600 2790 3600 2790 4275 2340 4275 2340 3600
-2 2 0 1 0 75 50 0 20 0.000 0 0 7 0 0 5
- 5670 3600 6120 3600 6120 4275 5670 4275 5670 3600
-2 2 0 1 0 76 50 0 20 0.000 0 0 7 0 0 5
- 3915 3150 4365 3150 4365 3600 3915 3600 3915 3150
-2 2 0 1 0 76 50 0 20 0.000 0 0 7 0 0 5
- 5670 3150 6120 3150 6120 3600 5670 3600 5670 3150
-2 2 0 1 0 76 50 0 20 0.000 0 0 7 0 0 5
- 2340 3150 2790 3150 2790 3600 2340 3600 2340 3150
-4 0 0 45 0 18 12 0.0000 4 135 540 4410 3420 ODBC\001
-4 0 0 45 0 18 12 0.0000 4 135 495 6210 3420 C-API\001
-4 0 0 45 0 18 12 0.0000 4 180 495 5625 2655 (db2)\001
-4 0 0 45 0 18 12 0.0000 4 135 1215 5580 2430 SQL Terminal\001
-4 0 0 45 0 18 12 0.0000 4 165 1110 3825 2700 Exel, Word...\001
-4 0 0 45 0 18 12 0.0000 4 180 555 2250 2700 Applet\001
-4 0 0 45 0 18 12 0.0000 4 165 900 2250 2475 Java GUI,\001
-4 0 0 45 0 18 12 0.0000 4 135 495 2880 3420 JDBC\001
-4 0 0 45 0 18 12 0.0000 4 135 390 1395 4050 TDS\001
-4 0 0 45 0 18 12 0.0000 4 135 615 990 1350 Server\001
-4 0 0 45 0 18 12 0.0000 4 135 495 2340 1350 Client\001
-4 0 0 45 0 18 12 0.0000 4 135 390 4410 4050 TDS\001
-4 0 0 50 0 18 12 0.0000 4 135 600 2160 4590 TCP/IP\001
-4 0 0 45 0 18 12 0.0000 4 180 3300 2340 4950 Propriet\344res Protokoll, etwa Sockets\001
+4 0 0 800 0 18 12 0.0000 4 150 600 990 1350 Server\001
+4 0 0 780 0 18 12 0.0000 4 150 540 2340 1350 Client\001
+4 0 0 760 0 18 12 0.0000 4 150 645 2160 4590 TCP/IP\001
+4 0 0 740 0 18 12 0.0000 4 180 885 2250 2475 Java GUI,\001
+4 0 0 740 0 18 12 0.0000 4 195 600 2250 2700 Applet\001
+4 0 0 700 0 18 12 0.0000 4 180 1200 3825 2700 Exel, Word...\001
+4 0 0 701 0 18 12 0.0000 4 150 555 4410 3420 ODBC\001
+4 0 0 681 0 18 12 0.0000 4 150 525 6210 3420 C-API\001
+4 0 0 681 0 18 12 0.0000 4 150 1290 5580 2430 SQL Terminal\001
+4 0 0 721 0 18 12 0.0000 4 150 510 2880 3420 JDBC\001
+4 0 0 660 0 18 12 0.0000 4 195 3390 2745 4905 Propriet\344res Protokoll, etwa Sockets\001
diff --git a/Doc/Ref/Fig/pre.tex b/Doc/Ref/Fig/pre.tex
index 66d558aae6994ac4c5108ee3b4a2885f8dcaf66e..73c377e7101dc46546d0a2d08dc6907fe7ae975e 100644
--- a/Doc/Ref/Fig/pre.tex
+++ b/Doc/Ref/Fig/pre.tex
@@ -49,9 +49,10 @@
\usepackage{xmpmulti}
\usepackage{pifont}
\usepackage{listings}
-\usepackage[utf8]{inputenc}
-\usepackage{times}
+%\usepackage[utf8]{inputenc}
\usepackage[T1]{fontenc}
+%\usepackage{textcomp}
+%\usepackage{times}
\hypersetup{colorlinks=true,linkcolor=blue,anchorcolor=blue,citecolor=blue,filecolor=blue,menucolor=blue,runcolor=blue,urlcolor=blue}
@@ -85,8 +86,3 @@ Exercise \arabic{tstep}\stepcounter{tstep}: #1}
\begin{document}
-\begin{mycenterframe}{A JDBC URL}
- \multifigure{../Generate/jdbcparam}
-\end{mycenterframe}
-
-\end{document}
diff --git a/Doc/course.xml b/Doc/course.xml
index a72bf4cb48e0743ed90184fc72592bbd30c91800..1a2e7a142ee86ba990f3ff5228e0ee6eef4432f6 100644
--- a/Doc/course.xml
+++ b/Doc/course.xml
@@ -9,7 +9,6 @@
<info>
<title>Structured Data and Applications</title>
-
<author>
<personname><firstname>Martin</firstname>
<surname>Goik</surname></personname>
@@ -19,9 +18,9 @@
</affiliation>
</author>
-
<legalnotice>
- <para>Public access: https://version.mi.hdm-stuttgart.de/git/GoikLectures</para>
+ <para>Public access:
+ https://version.mi.hdm-stuttgart.de/git/GoikLectures</para>
</legalnotice>
</info>
@@ -351,9 +350,21 @@ lrwxrwxrwx 1 root root 24 Okt 19 2011 <emphasis role="bold">mysql.jar ->
<section xml:id="jdbcWrite">
<title>Write access: A simple Example</title>
- <para>We want to code a very simple program which connects to a
- database server and inserts new datasets. Opening a connection to a
- database server requires the following parameter values:</para>
+ <para>Connecting an application to a database means to establish a
+ connection from a client to a database server:</para>
+
+ <figure xml:id="jdbcClientServer">
+ <title>Networking between clients and database servers</title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="Ref/Fig/clientserv.fig"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para>A client requires the following parameter values to open a
+ connection:</para>
<orderedlist>
<listitem xml:id="ItemJdbcProtocol">
@@ -539,6 +550,22 @@ lrwxrwxrwx 1 root root 24 Okt 19 2011 <emphasis role="bold">mysql.jar ->
'PRIMARY'</emphasis> informs us about a UNIQUE key constraint
violation with respect to our schema definition in <xref
linkend="figSchemaPerson"/>.</para>
+
+ <qandaset role="exercise">
+ <qandadiv>
+ <qandaentry>
+ <question>
+ <para/>
+ </question>
+ </qandaentry>
+ </qandadiv>
+ </qandaset>
+ </section>
+
+ <section xml:id="propertiesFile">
+ <title>Connection properties</title>
+
+ <para/>
</section>
<section xml:id="sectSimpleInsertGui">
@@ -825,7 +852,7 @@ public class InsertPerson extends JFrame {
<chapter xml:id="unitTesting">
<title>Unit testing with <productname>TestNG</productname></title>
- <para> This chapter presents a very short introduction to the basic usage
+ <para>This chapter presents a very short introduction to the basic usage
of unit testing. We start with a simple stack implementation:</para>
<programlisting>package sda.unittesting;
@@ -855,8 +882,8 @@ public class MyStack {
allows us to store a maximum number of five integer values.</para>
<para>The following implementation allows us to functionally test our
- <classname>sda.unittesting.MyStack</classname> implementation with respect to the usual
- stack behaviour:</para>
+ <classname>sda.unittesting.MyStack</classname> implementation with respect
+ to the usual stack behaviour:</para>
<programlisting linenumbering="numbered">package sda.unittesting;
@@ -1025,12 +1052,12 @@ java.lang.AssertionError
===============================================</programlisting>
<para>This unexpected result is due to the execution order of the three
- individual tests. Within our class <classname>sda.unittesting.MyStackTestSimple1</classname> the three
- tests appear in the sequence test 1, test 2 and test 3. This however is
- just the order of source code. The testing framework will not infer any
- order and thus execute our three tests in <emphasis
- role="bold">arbitrary</emphasis> order. The execution log shows the actual
- order:</para>
+ individual tests. Within our class
+ <classname>sda.unittesting.MyStackTestSimple1</classname> the three tests
+ appear in the sequence test 1, test 2 and test 3. This however is just the
+ order of source code. The testing framework will not infer any order and
+ thus execute our three tests in <emphasis role="bold">arbitrary</emphasis>
+ order. The execution log shows the actual order:</para>
<orderedlist>
<listitem>
@@ -1048,7 +1075,7 @@ java.lang.AssertionError
<para>So the second test will raise an exception and leave the stack
filled with the maximum possible five elements. Thus it is not empty and
- the <quote><code>pushPopEmpty</code></quote> test fails as well. </para>
+ the <quote><code>pushPopEmpty</code></quote> test fails as well.</para>
<para>If we want to avoid this type of errors we may:</para>
diff --git a/bin/fig2mpdf b/bin/fig2mpdf
index 0a355dbf0dd09e5ffc4354dec2c3ebf9ad41928a..2822df7a6566feb37d98bacfe6a0eced77dd723b 100755
--- a/bin/fig2mpdf
+++ b/bin/fig2mpdf
@@ -439,7 +439,7 @@ function fnDoTexFig(szFileNameBase, szFigFile, szRangeList, iPdf,
szCommand = sprintf("%s -L pstex_p %s -p %s %s %s", cmdFig2dev, szRangeList, szTexInpPref, szFigFile, szTexInp);
debug("%s\n", szCommand);
system(szCommand);
- createModifierCommand=sprintf("/ma/goik/createTexModifier.sh %s", szTexCreator);
+ createModifierCommand=sprintf("/ma/goik/workspace/GoikLectures/bin/createTexModifier.sh %s", szTexCreator);
debug("%s\n",createModifierCommand);
system(createModifierCommand);
szCommand = sprintf("./%s", szTexCreator);
diff --git a/ws/eclipse/Jdbc/src/sda/jdbc/intro/SimpleInsert.java b/ws/eclipse/Jdbc/src/sda/jdbc/intro/SimpleInsert.java
index 2298b796c517118916c026608c51b5fc58398284..249a4a0efb05658a5c1502edffe9357175cb247a 100644
--- a/ws/eclipse/Jdbc/src/sda/jdbc/intro/SimpleInsert.java
+++ b/ws/eclipse/Jdbc/src/sda/jdbc/intro/SimpleInsert.java
@@ -32,8 +32,10 @@ public class SimpleInsert {
*/
public static void main(String[] args) throws SQLException {
// Step 1: Open a connection to the database server
- final Connection conn = DriverManager.getConnection(
- "jdbc:mysql://localhost:3306/hdm", "hdmuser", "XYZ");
+ final Connection conn = DriverManager.getConnection (
+ "jdbc:mysql://localhost:3306/hdm", //JDBC URL
+ "hdmuser", // Username
+ "XYZ"); // Password
// Step 2: Create a Statement instance
final Statement stmt = conn.createStatement();
// Step 3: Execute the desired INSERT
diff --git a/ws/eclipse/Jdbc/src/sda/jdbc/intro/v1/SimpleInsert.java b/ws/eclipse/Jdbc/src/sda/jdbc/intro/v1/SimpleInsert.java
index 9ed2e98c8dc25daf2fd71b48f685197fda1b520b..9f923fc98805887fb87ac1764e23aa714fd46977 100644
--- a/ws/eclipse/Jdbc/src/sda/jdbc/intro/v1/SimpleInsert.java
+++ b/ws/eclipse/Jdbc/src/sda/jdbc/intro/v1/SimpleInsert.java
@@ -30,14 +30,16 @@ public class SimpleInsert {
*/
public static void main(String[] args) throws SQLException {
// Step 1: Open a connection to the database server
- final Connection conn = DriverManager.getConnection(
- JdbcProperties.getString("SimpleInsert.jdbcUrl"), JdbcProperties.getString("SimpleInsert.username"), JdbcProperties.getString("SimpleInsert.password")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ final Connection conn = DriverManager.getConnection (
+ JdbcProperties.getString("SimpleInsert.jdbcUrl"),
+ JdbcProperties.getString("SimpleInsert.username"),
+ JdbcProperties.getString("SimpleInsert.password"));
// Step 2: Create a Statement instance
final Statement stmt = conn.createStatement();
// Step 3: Execute the desired INSERT
final int updateCount = stmt.executeUpdate(
- "INSERT INTO Person VALUES('Jim', 'jim@foo.org')"); //$NON-NLS-1$
+ "INSERT INTO Person VALUES('Jim', 'jim@foo.org')");
// Step 4: Give feedback to the enduser
- System.out.println("Successfully inserted " + updateCount + " dataset(s)"); //$NON-NLS-1$ //$NON-NLS-2$
+ System.out.println("Successfully inserted " + updateCount + " dataset(s)");
}
}
\ No newline at end of file