Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
fda7e2d5
提交
fda7e2d5
authored
2月 28, 2014
作者:
Thomas Mueller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Limit line length to 80 characters
上级
69051adc
隐藏空白字符变更
内嵌
并排
正在显示
29 个修改的文件
包含
204 行增加
和
194 行删除
+204
-194
Build.java
h2/src/tools/org/h2/build/Build.java
+34
-34
BuildBase.java
h2/src/tools/org/h2/build/BuildBase.java
+1
-1
CheckTextFiles.java
h2/src/tools/org/h2/build/code/CheckTextFiles.java
+14
-4
BnfRailroad.java
h2/src/tools/org/h2/build/doc/BnfRailroad.java
+4
-4
GenerateDoc.java
h2/src/tools/org/h2/build/doc/GenerateDoc.java
+22
-22
GenerateHelp.java
h2/src/tools/org/h2/build/doc/GenerateHelp.java
+1
-1
MergeDocs.java
h2/src/tools/org/h2/build/doc/MergeDocs.java
+7
-7
SpellChecker.java
h2/src/tools/org/h2/build/doc/SpellChecker.java
+6
-6
UploadBuild.java
h2/src/tools/org/h2/build/doc/UploadBuild.java
+13
-13
WebSite.java
h2/src/tools/org/h2/build/doc/WebSite.java
+1
-1
Doclet.java
h2/src/tools/org/h2/build/doclet/Doclet.java
+29
-29
HtmlConverter.java
h2/src/tools/org/h2/build/indexer/HtmlConverter.java
+2
-2
FileShell.java
h2/src/tools/org/h2/dev/fs/FileShell.java
+17
-17
FtpServer.java
h2/src/tools/org/h2/dev/ftp/server/FtpServer.java
+1
-1
SecureKeyStoreBuilder.java
h2/src/tools/org/h2/dev/security/SecureKeyStoreBuilder.java
+2
-2
Migrate.java
h2/src/tools/org/h2/dev/util/Migrate.java
+2
-2
Db.java
h2/src/tools/org/h2/jaqu/Db.java
+3
-3
DbInspector.java
h2/src/tools/org/h2/jaqu/DbInspector.java
+5
-5
DbUpgrader.java
h2/src/tools/org/h2/jaqu/DbUpgrader.java
+2
-2
DbVersion.java
h2/src/tools/org/h2/jaqu/DbVersion.java
+2
-2
ModelUtils.java
h2/src/tools/org/h2/jaqu/ModelUtils.java
+2
-2
Query.java
h2/src/tools/org/h2/jaqu/Query.java
+5
-5
SQLDialect.java
h2/src/tools/org/h2/jaqu/SQLDialect.java
+5
-5
SelectTable.java
h2/src/tools/org/h2/jaqu/SelectTable.java
+1
-1
TableInspector.java
h2/src/tools/org/h2/jaqu/TableInspector.java
+4
-4
GenerateModels.java
h2/src/tools/org/h2/jaqu/util/GenerateModels.java
+2
-2
ClassObj.java
h2/src/tools/org/h2/java/ClassObj.java
+4
-4
JavaParser.java
h2/src/tools/org/h2/java/JavaParser.java
+12
-12
Statement.java
h2/src/tools/org/h2/java/Statement.java
+1
-1
没有找到文件。
h2/src/tools/org/h2/build/Build.java
浏览文件 @
fda7e2d5
...
@@ -39,36 +39,36 @@ public class Build extends BuildBase {
...
@@ -39,36 +39,36 @@ public class Build extends BuildBase {
* Run the benchmarks.
* Run the benchmarks.
*/
*/
public
void
benchmark
()
{
public
void
benchmark
()
{
downloadUsingMaven
(
"ext/hsqldb-2.0.0.jar"
,
downloadUsingMaven
(
"ext/hsqldb-2.0.0.jar"
,
"hsqldb"
,
"hsqldb"
,
"2.0.0"
,
"hsqldb"
,
"hsqldb"
,
"2.0.0"
,
"c9d525ce1a464185e6b01c7de872127a06092673"
);
"c9d525ce1a464185e6b01c7de872127a06092673"
);
downloadUsingMaven
(
"ext/derby-10.6.1.0.jar"
,
downloadUsingMaven
(
"ext/derby-10.6.1.0.jar"
,
"org/apache/derby"
,
"derby"
,
"10.6.1.0"
,
"org/apache/derby"
,
"derby"
,
"10.6.1.0"
,
"01137cd636b0e3c22f0d273478adb58aa30e984a"
);
"01137cd636b0e3c22f0d273478adb58aa30e984a"
);
downloadUsingMaven
(
"ext/derbyclient-10.6.1.0.jar"
,
downloadUsingMaven
(
"ext/derbyclient-10.6.1.0.jar"
,
"org/apache/derby"
,
"derbyclient"
,
"10.6.1.0"
,
"org/apache/derby"
,
"derbyclient"
,
"10.6.1.0"
,
"e7c6fbaca2ef4dbcad27fa7d8a9cd1ac0d1e4b00"
);
"e7c6fbaca2ef4dbcad27fa7d8a9cd1ac0d1e4b00"
);
downloadUsingMaven
(
"ext/derbynet-10.6.1.0.jar"
,
downloadUsingMaven
(
"ext/derbynet-10.6.1.0.jar"
,
"org/apache/derby"
,
"derbynet"
,
"10.6.1.0"
,
"org/apache/derby"
,
"derbynet"
,
"10.6.1.0"
,
"d5d9d7b783eeaef016be85c34d5c65d1e7cec764"
);
"d5d9d7b783eeaef016be85c34d5c65d1e7cec764"
);
downloadUsingMaven
(
"ext/postgresql-8.3-603.jdbc3.jar"
,
downloadUsingMaven
(
"ext/postgresql-8.3-603.jdbc3.jar"
,
"postgresql"
,
"postgresql"
,
"8.3-603.jdbc3"
,
"postgresql"
,
"postgresql"
,
"8.3-603.jdbc3"
,
"33d531c3c53055ddcbea3d88bfa093466ffef924"
);
"33d531c3c53055ddcbea3d88bfa093466ffef924"
);
downloadUsingMaven
(
"ext/mysql-connector-java-5.1.6.jar"
,
downloadUsingMaven
(
"ext/mysql-connector-java-5.1.6.jar"
,
"mysql"
,
"mysql-connector-java"
,
"5.1.6"
,
"mysql"
,
"mysql-connector-java"
,
"5.1.6"
,
"380ef5226de2c85ff3b38cbfefeea881c5fce09d"
);
"380ef5226de2c85ff3b38cbfefeea881c5fce09d"
);
compile
();
compile
();
String
cp
=
"temp"
+
String
cp
=
"temp"
+
File
.
pathSeparator
+
"bin/h2"
+
getJarSuffix
()
+
File
.
pathSeparator
+
"bin/h2"
+
getJarSuffix
()
+
File
.
pathSeparator
+
"ext/hsqldb.jar"
+
File
.
pathSeparator
+
"ext/hsqldb.jar"
+
File
.
pathSeparator
+
"ext/hsqldb-2.0.0.jar"
+
File
.
pathSeparator
+
"ext/hsqldb-2.0.0.jar"
+
File
.
pathSeparator
+
"ext/derby-10.6.1.0.jar"
+
File
.
pathSeparator
+
"ext/derby-10.6.1.0.jar"
+
File
.
pathSeparator
+
"ext/derbyclient-10.6.1.0.jar"
+
File
.
pathSeparator
+
"ext/derbyclient-10.6.1.0.jar"
+
File
.
pathSeparator
+
"ext/derbynet-10.6.1.0.jar"
+
File
.
pathSeparator
+
"ext/derbynet-10.6.1.0.jar"
+
File
.
pathSeparator
+
"ext/postgresql-8.3-603.jdbc3.jar"
+
File
.
pathSeparator
+
"ext/postgresql-8.3-603.jdbc3.jar"
+
File
.
pathSeparator
+
"ext/mysql-connector-java-5.1.6.jar"
;
File
.
pathSeparator
+
"ext/mysql-connector-java-5.1.6.jar"
;
StringList
args
=
args
(
"-Xmx128m"
,
StringList
args
=
args
(
"-Xmx128m"
,
"-cp"
,
cp
,
"org.h2.test.bench.TestPerformance"
);
"-cp"
,
cp
,
"org.h2.test.bench.TestPerformance"
);
exec
(
"java"
,
args
.
plus
(
"-init"
,
"-db"
,
"1"
));
exec
(
"java"
,
args
.
plus
(
"-init"
,
"-db"
,
"1"
));
exec
(
"java"
,
args
.
plus
(
"-db"
,
"2"
));
exec
(
"java"
,
args
.
plus
(
"-db"
,
"2"
));
...
@@ -101,7 +101,7 @@ public class Build extends BuildBase {
...
@@ -101,7 +101,7 @@ public class Build extends BuildBase {
private
void
compileTools
()
{
private
void
compileTools
()
{
FileList
files
=
files
(
"src/tools"
).
keep
(
"src/tools/org/h2/build/*"
);
FileList
files
=
files
(
"src/tools"
).
keep
(
"src/tools/org/h2/build/*"
);
StringList
args
=
args
(
"-d"
,
"temp"
,
"-sourcepath"
,
"src/tools"
+
StringList
args
=
args
(
"-d"
,
"temp"
,
"-sourcepath"
,
"src/tools"
+
File
.
pathSeparator
+
"src/test"
+
File
.
pathSeparator
+
"src/test"
+
File
.
pathSeparator
+
"src/main"
);
File
.
pathSeparator
+
"src/main"
);
mkdir
(
"temp"
);
mkdir
(
"temp"
);
javac
(
args
,
files
);
javac
(
args
,
files
);
...
@@ -126,7 +126,7 @@ public class Build extends BuildBase {
...
@@ -126,7 +126,7 @@ public class Build extends BuildBase {
File
.
pathSeparator
+
"ext/jts-1.13.jar"
+
File
.
pathSeparator
+
"ext/jts-1.13.jar"
+
File
.
pathSeparator
+
"ext/slf4j-api-1.6.0.jar"
+
File
.
pathSeparator
+
"ext/slf4j-api-1.6.0.jar"
+
File
.
pathSeparator
+
"ext/slf4j-nop-1.6.0.jar"
+
File
.
pathSeparator
+
"ext/slf4j-nop-1.6.0.jar"
+
File
.
pathSeparator
+
System
.
getProperty
(
"java.home"
)
+
File
.
pathSeparator
+
System
.
getProperty
(
"java.home"
)
+
"/../lib/tools.jar"
;
"/../lib/tools.jar"
;
// -XX:-UseSplitVerifier is for Java 7 compatibility
// -XX:-UseSplitVerifier is for Java 7 compatibility
exec
(
"java"
,
args
(
exec
(
"java"
,
args
(
...
@@ -136,7 +136,7 @@ public class Build extends BuildBase {
...
@@ -136,7 +136,7 @@ public class Build extends BuildBase {
"-cp"
,
"temp"
,
"-cp"
,
"temp"
,
"-sp"
,
"src/main"
,
"-sp"
,
"src/main"
,
"-r"
,
"html,txt"
,
"-r"
,
"html,txt"
,
"-ix"
,
"-org.h2.test.*,-org.h2.dev.*,"
+
"-ix"
,
"-org.h2.test.*,-org.h2.dev.*,"
+
"-org.h2.jaqu.*,-org.h2.mode.*,-org.h2.server.pg.*"
,
"-org.h2.jaqu.*,-org.h2.mode.*,-org.h2.server.pg.*"
,
"org.h2.test.TestAll"
));
"org.h2.test.TestAll"
));
}
}
...
@@ -277,22 +277,22 @@ public class Build extends BuildBase {
...
@@ -277,22 +277,22 @@ public class Build extends BuildBase {
}
}
private
void
downloadOrVerify
(
boolean
offline
)
{
private
void
downloadOrVerify
(
boolean
offline
)
{
downloadOrVerify
(
"ext/servlet-api-2.4.jar"
,
downloadOrVerify
(
"ext/servlet-api-2.4.jar"
,
"javax/servlet"
,
"servlet-api"
,
"2.4"
,
"javax/servlet"
,
"servlet-api"
,
"2.4"
,
"3fc542fe8bb8164e8d3e840fe7403bc0518053c0"
,
offline
);
"3fc542fe8bb8164e8d3e840fe7403bc0518053c0"
,
offline
);
downloadOrVerify
(
"ext/lucene-core-3.0.2.jar"
,
downloadOrVerify
(
"ext/lucene-core-3.0.2.jar"
,
"org/apache/lucene"
,
"lucene-core"
,
"3.0.2"
,
"org/apache/lucene"
,
"lucene-core"
,
"3.0.2"
,
"c2b48995ab855c1b9ea13867a0f976c994e0105d"
,
offline
);
"c2b48995ab855c1b9ea13867a0f976c994e0105d"
,
offline
);
downloadOrVerify
(
"ext/slf4j-api-1.6.0.jar"
,
downloadOrVerify
(
"ext/slf4j-api-1.6.0.jar"
,
"org/slf4j"
,
"slf4j-api"
,
"1.6.0"
,
"org/slf4j"
,
"slf4j-api"
,
"1.6.0"
,
"b353147a7d51fcfcd818d8aa6784839783db0915"
,
offline
);
"b353147a7d51fcfcd818d8aa6784839783db0915"
,
offline
);
downloadOrVerify
(
"ext/org.osgi.core-4.2.0.jar"
,
downloadOrVerify
(
"ext/org.osgi.core-4.2.0.jar"
,
"org/osgi"
,
"org.osgi.core"
,
"4.2.0"
,
"org/osgi"
,
"org.osgi.core"
,
"4.2.0"
,
"66ab449ff3aa5c4adfc82c89025cc983b422eb95"
,
offline
);
"66ab449ff3aa5c4adfc82c89025cc983b422eb95"
,
offline
);
downloadOrVerify
(
"ext/org.osgi.enterprise-4.2.0.jar"
,
downloadOrVerify
(
"ext/org.osgi.enterprise-4.2.0.jar"
,
"org/osgi"
,
"org.osgi.enterprise"
,
"4.2.0"
,
"org/osgi"
,
"org.osgi.enterprise"
,
"4.2.0"
,
"8634dcb0fc62196e820ed0f1062993c377f74972"
,
offline
);
"8634dcb0fc62196e820ed0f1062993c377f74972"
,
offline
);
downloadOrVerify
(
"ext/jts-1.13.jar"
,
downloadOrVerify
(
"ext/jts-1.13.jar"
,
"com/vividsolutions"
,
"jts"
,
"1.13"
,
"com/vividsolutions"
,
"jts"
,
"1.13"
,
"3ccfb9b60f04d71add996a666ceb8902904fd805"
,
offline
);
"3ccfb9b60f04d71add996a666ceb8902904fd805"
,
offline
);
}
}
...
@@ -317,16 +317,16 @@ public class Build extends BuildBase {
...
@@ -317,16 +317,16 @@ public class Build extends BuildBase {
"http://h2database.com/h2mig_pagestore_addon.jar"
,
"http://h2database.com/h2mig_pagestore_addon.jar"
,
"6dfafe1b86959c3ba4f7cf03e99535e8b9719965"
);
"6dfafe1b86959c3ba4f7cf03e99535e8b9719965"
);
// for TestOldVersion
// for TestOldVersion
downloadUsingMaven
(
"ext/h2-1.2.127.jar"
,
downloadUsingMaven
(
"ext/h2-1.2.127.jar"
,
"com/h2database"
,
"h2"
,
"1.2.127"
,
"com/h2database"
,
"h2"
,
"1.2.127"
,
"056e784c7cf009483366ab9cd8d21d02fe47031a"
);
"056e784c7cf009483366ab9cd8d21d02fe47031a"
);
// for TestPgServer
// for TestPgServer
downloadUsingMaven
(
"ext/postgresql-8.3-603.jdbc3.jar"
,
downloadUsingMaven
(
"ext/postgresql-8.3-603.jdbc3.jar"
,
"postgresql"
,
"postgresql"
,
"8.3-603.jdbc3"
,
"postgresql"
,
"postgresql"
,
"8.3-603.jdbc3"
,
"33d531c3c53055ddcbea3d88bfa093466ffef924"
);
"33d531c3c53055ddcbea3d88bfa093466ffef924"
);
// for TestTraceSystem
// for TestTraceSystem
downloadUsingMaven
(
"ext/slf4j-nop-1.6.0.jar"
,
downloadUsingMaven
(
"ext/slf4j-nop-1.6.0.jar"
,
"org/slf4j"
,
"slf4j-nop"
,
"1.6.0"
,
"org/slf4j"
,
"slf4j-nop"
,
"1.6.0"
,
"4da67bb4a6eea5dc273f99c50ad2333eadb46f86"
);
"4da67bb4a6eea5dc273f99c50ad2333eadb46f86"
);
}
}
...
@@ -548,8 +548,8 @@ public class Build extends BuildBase {
...
@@ -548,8 +548,8 @@ public class Build extends BuildBase {
public
void
javadocImpl
()
{
public
void
javadocImpl
()
{
compileTools
();
compileTools
();
mkdir
(
"docs/javadocImpl2"
);
mkdir
(
"docs/javadocImpl2"
);
javadoc
(
"-sourcepath"
,
"src/main"
+
javadoc
(
"-sourcepath"
,
"src/main"
+
File
.
pathSeparator
+
"src/test"
+
File
.
pathSeparator
+
"src/test"
+
File
.
pathSeparator
+
"src/tools"
,
File
.
pathSeparator
+
"src/tools"
,
"-noindex"
,
"-noindex"
,
"-tag"
,
"h2.resource"
,
"-tag"
,
"h2.resource"
,
...
@@ -566,12 +566,12 @@ public class Build extends BuildBase {
...
@@ -566,12 +566,12 @@ public class Build extends BuildBase {
"-exclude"
,
"org.h2.test.jaqu:org.h2.jaqu"
);
"-exclude"
,
"org.h2.test.jaqu:org.h2.jaqu"
);
System
.
setProperty
(
"h2.interfacesOnly"
,
"false"
);
System
.
setProperty
(
"h2.interfacesOnly"
,
"false"
);
System
.
setProperty
(
"h2.javadocDestDir"
,
"docs/javadocImpl"
);
System
.
setProperty
(
"h2.javadocDestDir"
,
"docs/javadocImpl"
);
javadoc
(
"-sourcepath"
,
"src/main"
+
javadoc
(
"-sourcepath"
,
"src/main"
+
File
.
pathSeparator
+
"src/test"
+
File
.
pathSeparator
+
"src/test"
+
File
.
pathSeparator
+
"src/tools"
,
File
.
pathSeparator
+
"src/tools"
,
"-classpath"
,
"-classpath"
,
System
.
getProperty
(
"java.home"
)
+
"/../lib/tools.jar"
+
System
.
getProperty
(
"java.home"
)
+
"/../lib/tools.jar"
+
File
.
pathSeparator
+
"ext/slf4j-api-1.6.0.jar"
+
File
.
pathSeparator
+
"ext/slf4j-api-1.6.0.jar"
+
File
.
pathSeparator
+
"ext/servlet-api-2.4.jar"
+
File
.
pathSeparator
+
"ext/servlet-api-2.4.jar"
+
File
.
pathSeparator
+
"ext/lucene-core-3.0.2.jar"
+
File
.
pathSeparator
+
"ext/lucene-core-3.0.2.jar"
+
File
.
pathSeparator
+
"ext/org.osgi.core-4.2.0.jar"
+
File
.
pathSeparator
+
"ext/org.osgi.core-4.2.0.jar"
+
...
...
h2/src/tools/org/h2/build/BuildBase.java
浏览文件 @
fda7e2d5
...
@@ -213,7 +213,7 @@ public class BuildBase {
...
@@ -213,7 +213,7 @@ public class BuildBase {
private
void
runShell
()
{
private
void
runShell
()
{
BufferedReader
reader
=
new
BufferedReader
(
new
InputStreamReader
(
System
.
in
));
BufferedReader
reader
=
new
BufferedReader
(
new
InputStreamReader
(
System
.
in
));
String
last
=
""
,
line
;
String
last
=
""
,
line
;
System
.
out
.
println
(
"Shell mode. Type the target, then [Enter]. "
+
System
.
out
.
println
(
"Shell mode. Type the target, then [Enter]. "
+
"Just [Enter] repeats the last target."
);
"Just [Enter] repeats the last target."
);
while
(
true
)
{
while
(
true
)
{
System
.
out
.
print
(
"build> "
);
System
.
out
.
print
(
"build> "
);
...
...
h2/src/tools/org/h2/build/code/CheckTextFiles.java
浏览文件 @
fda7e2d5
...
@@ -18,10 +18,12 @@ import java.util.Arrays;
...
@@ -18,10 +18,12 @@ import java.util.Arrays;
*/
*/
public
class
CheckTextFiles
{
public
class
CheckTextFiles
{
private
static
final
int
MAX_SOURCE_LINE_SIZE
=
100
;
// must contain "+" otherwise this here counts as well
// must contain "+" otherwise this here counts as well
private
static
final
String
COPYRIGHT
=
"Copyright 2004-2013 "
+
private
static
final
String
COPYRIGHT
=
"Copyright 2004-2013 "
+
"H2 Group."
;
"H2 Group."
;
private
static
final
String
LICENSE
=
"Multiple-Licensed "
+
private
static
final
String
LICENSE
=
"Multiple-Licensed "
+
"under the H2 License"
;
"under the H2 License"
;
private
static
final
String
[]
SUFFIX_CHECK
=
{
"html"
,
"jsp"
,
"js"
,
"css"
,
private
static
final
String
[]
SUFFIX_CHECK
=
{
"html"
,
"jsp"
,
"js"
,
"css"
,
...
@@ -90,8 +92,8 @@ public class CheckTextFiles {
...
@@ -90,8 +92,8 @@ public class CheckTextFiles {
// check = false;
// check = false;
// ignore = true;
// ignore = true;
// }
// }
if
(
name
.
endsWith
(
".utf8.txt"
)
||
if
(
name
.
endsWith
(
".utf8.txt"
)
||
(
name
.
startsWith
(
"_docs_"
)
&&
(
name
.
startsWith
(
"_docs_"
)
&&
name
.
endsWith
(
".properties"
)))
{
name
.
endsWith
(
".properties"
)))
{
check
=
false
;
check
=
false
;
ignore
=
true
;
ignore
=
true
;
...
@@ -164,6 +166,7 @@ public class CheckTextFiles {
...
@@ -164,6 +166,7 @@ public class CheckTextFiles {
}
}
}
}
int
line
=
1
;
int
line
=
1
;
int
startLinePos
=
0
;
boolean
lastWasWhitespace
=
false
;
boolean
lastWasWhitespace
=
false
;
for
(
int
i
=
0
;
i
<
data
.
length
;
i
++)
{
for
(
int
i
=
0
;
i
<
data
.
length
;
i
++)
{
char
ch
=
(
char
)
(
data
[
i
]
&
0xff
);
char
ch
=
(
char
)
(
data
[
i
]
&
0xff
);
...
@@ -186,6 +189,13 @@ public class CheckTextFiles {
...
@@ -186,6 +189,13 @@ public class CheckTextFiles {
}
}
lastWasWhitespace
=
false
;
lastWasWhitespace
=
false
;
line
++;
line
++;
int
lineLength
=
i
-
startLinePos
;
if
(
lineLength
>
MAX_SOURCE_LINE_SIZE
)
{
if
(
file
.
getName
().
endsWith
(
".java"
))
{
fail
(
file
,
"line too long: "
+
lineLength
,
line
);
}
}
startLinePos
=
i
;
}
else
if
(
ch
==
'\r'
)
{
}
else
if
(
ch
==
'\r'
)
{
if
(!
ALLOW_CR
)
{
if
(!
ALLOW_CR
)
{
fail
(
file
,
"contains CR"
,
line
);
fail
(
file
,
"contains CR"
,
line
);
...
...
h2/src/tools/org/h2/build/doc/BnfRailroad.java
浏览文件 @
fda7e2d5
...
@@ -39,7 +39,7 @@ public class BnfRailroad implements BnfVisitor {
...
@@ -39,7 +39,7 @@ public class BnfRailroad implements BnfVisitor {
StringBuilder
buff
=
new
StringBuilder
();
StringBuilder
buff
=
new
StringBuilder
();
for
(
String
s
:
syntaxList
)
{
for
(
String
s
:
syntaxList
)
{
bnf
.
visit
(
this
,
s
);
bnf
.
visit
(
this
,
s
);
html
=
StringUtils
.
replaceAll
(
html
,
"</code></td>"
+
html
=
StringUtils
.
replaceAll
(
html
,
"</code></td>"
+
"<td class=\"d\"><code class=\"c\">"
,
" "
);
"<td class=\"d\"><code class=\"c\">"
,
" "
);
if
(
buff
.
length
()
>
0
)
{
if
(
buff
.
length
()
>
0
)
{
buff
.
append
(
"<br />"
);
buff
.
append
(
"<br />"
);
...
@@ -138,7 +138,7 @@ public class BnfRailroad implements BnfVisitor {
...
@@ -138,7 +138,7 @@ public class BnfRailroad implements BnfVisitor {
for
(
Rule
r
:
list
)
{
for
(
Rule
r
:
list
)
{
String
a
=
i
==
0
?
"t"
:
i
==
list
.
size
()
-
1
?
"l"
:
"k"
;
String
a
=
i
==
0
?
"t"
:
i
==
list
.
size
()
-
1
?
"l"
:
"k"
;
i
++;
i
++;
buff
.
append
(
"<tr class=\"railroad\"><td class=\""
+
buff
.
append
(
"<tr class=\"railroad\"><td class=\""
+
a
+
"s\"></td><td class=\"d\">"
);
a
+
"s\"></td><td class=\"d\">"
);
r
.
accept
(
this
);
r
.
accept
(
this
);
buff
.
append
(
html
);
buff
.
append
(
html
);
...
@@ -163,9 +163,9 @@ public class BnfRailroad implements BnfVisitor {
...
@@ -163,9 +163,9 @@ public class BnfRailroad implements BnfVisitor {
public
void
visitRuleOptional
(
Rule
rule
)
{
public
void
visitRuleOptional
(
Rule
rule
)
{
StringBuilder
buff
=
new
StringBuilder
();
StringBuilder
buff
=
new
StringBuilder
();
buff
.
append
(
"<table class=\"railroad\">"
);
buff
.
append
(
"<table class=\"railroad\">"
);
buff
.
append
(
"<tr class=\"railroad\"><td class=\"ts\"></td>"
+
buff
.
append
(
"<tr class=\"railroad\"><td class=\"ts\"></td>"
+
"<td class=\"d\"> </td><td class=\"te\"></td></tr>"
);
"<td class=\"d\"> </td><td class=\"te\"></td></tr>"
);
buff
.
append
(
"<tr class=\"railroad\">"
+
buff
.
append
(
"<tr class=\"railroad\">"
+
"<td class=\"ls\"></td><td class=\"d\">"
);
"<td class=\"ls\"></td><td class=\"d\">"
);
rule
.
accept
(
this
);
rule
.
accept
(
this
);
buff
.
append
(
html
);
buff
.
append
(
html
);
...
...
h2/src/tools/org/h2/build/doc/GenerateDoc.java
浏览文件 @
fda7e2d5
...
@@ -36,7 +36,7 @@ public class GenerateDoc {
...
@@ -36,7 +36,7 @@ public class GenerateDoc {
private
String
inDir
=
"src/docsrc/html"
;
private
String
inDir
=
"src/docsrc/html"
;
private
String
outDir
=
"docs/html"
;
private
String
outDir
=
"docs/html"
;
private
Connection
conn
;
private
Connection
conn
;
private
final
HashMap
<
String
,
Object
>
session
=
private
final
HashMap
<
String
,
Object
>
session
=
new
HashMap
<
String
,
Object
>();
new
HashMap
<
String
,
Object
>();
private
Bnf
bnf
;
private
Bnf
bnf
;
...
@@ -69,37 +69,37 @@ public class GenerateDoc {
...
@@ -69,37 +69,37 @@ public class GenerateDoc {
session
.
put
(
"stableVersion"
,
Constants
.
getVersionStable
());
session
.
put
(
"stableVersion"
,
Constants
.
getVersionStable
());
session
.
put
(
"stableVersionDate"
,
Constants
.
BUILD_DATE_STABLE
);
session
.
put
(
"stableVersionDate"
,
Constants
.
BUILD_DATE_STABLE
);
// String help = "SELECT * FROM INFORMATION_SCHEMA.HELP WHERE SECTION";
// String help = "SELECT * FROM INFORMATION_SCHEMA.HELP WHERE SECTION";
String
help
=
"SELECT ROWNUM ID, * FROM CSVREAD('"
+
String
help
=
"SELECT ROWNUM ID, * FROM CSVREAD('"
+
IN_HELP
+
"', NULL, 'lineComment=#') WHERE SECTION "
;
IN_HELP
+
"', NULL, 'lineComment=#') WHERE SECTION "
;
map
(
"commands"
,
map
(
"commands"
,
help
+
"LIKE 'Commands%' ORDER BY ID"
,
true
);
help
+
"LIKE 'Commands%' ORDER BY ID"
,
true
);
map
(
"commandsDML"
,
map
(
"commandsDML"
,
help
+
"= 'Commands (DML)' ORDER BY ID"
,
false
);
help
+
"= 'Commands (DML)' ORDER BY ID"
,
false
);
map
(
"commandsDDL"
,
map
(
"commandsDDL"
,
help
+
"= 'Commands (DDL)' ORDER BY ID"
,
false
);
help
+
"= 'Commands (DDL)' ORDER BY ID"
,
false
);
map
(
"commandsOther"
,
map
(
"commandsOther"
,
help
+
"= 'Commands (Other)' ORDER BY ID"
,
false
);
help
+
"= 'Commands (Other)' ORDER BY ID"
,
false
);
map
(
"otherGrammar"
,
map
(
"otherGrammar"
,
help
+
"= 'Other Grammar' ORDER BY ID"
,
true
);
help
+
"= 'Other Grammar' ORDER BY ID"
,
true
);
map
(
"functionsAggregate"
,
map
(
"functionsAggregate"
,
help
+
"= 'Functions (Aggregate)' ORDER BY ID"
,
false
);
help
+
"= 'Functions (Aggregate)' ORDER BY ID"
,
false
);
map
(
"functionsNumeric"
,
map
(
"functionsNumeric"
,
help
+
"= 'Functions (Numeric)' ORDER BY ID"
,
false
);
help
+
"= 'Functions (Numeric)' ORDER BY ID"
,
false
);
map
(
"functionsString"
,
map
(
"functionsString"
,
help
+
"= 'Functions (String)' ORDER BY ID"
,
false
);
help
+
"= 'Functions (String)' ORDER BY ID"
,
false
);
map
(
"functionsTimeDate"
,
map
(
"functionsTimeDate"
,
help
+
"= 'Functions (Time and Date)' ORDER BY ID"
,
false
);
help
+
"= 'Functions (Time and Date)' ORDER BY ID"
,
false
);
map
(
"functionsSystem"
,
map
(
"functionsSystem"
,
help
+
"= 'Functions (System)' ORDER BY ID"
,
false
);
help
+
"= 'Functions (System)' ORDER BY ID"
,
false
);
map
(
"functionsAll"
,
map
(
"functionsAll"
,
help
+
"LIKE 'Functions%' ORDER BY SECTION, ID"
,
true
);
help
+
"LIKE 'Functions%' ORDER BY SECTION, ID"
,
true
);
map
(
"dataTypes"
,
map
(
"dataTypes"
,
help
+
"LIKE 'Data Types%' ORDER BY SECTION, ID"
,
true
);
help
+
"LIKE 'Data Types%' ORDER BY SECTION, ID"
,
true
);
map
(
"informationSchema"
,
"SELECT TABLE_NAME TOPIC, "
+
map
(
"informationSchema"
,
"SELECT TABLE_NAME TOPIC, "
+
"GROUP_CONCAT(COLUMN_NAME "
+
"GROUP_CONCAT(COLUMN_NAME "
+
"ORDER BY ORDINAL_POSITION SEPARATOR ', ') SYNTAX "
+
"ORDER BY ORDINAL_POSITION SEPARATOR ', ') SYNTAX "
+
"FROM INFORMATION_SCHEMA.COLUMNS "
+
"FROM INFORMATION_SCHEMA.COLUMNS "
+
"WHERE TABLE_SCHEMA='INFORMATION_SCHEMA' "
+
"WHERE TABLE_SCHEMA='INFORMATION_SCHEMA' "
+
"GROUP BY TABLE_NAME ORDER BY TABLE_NAME"
,
false
);
"GROUP BY TABLE_NAME ORDER BY TABLE_NAME"
,
false
);
processAll
(
""
);
processAll
(
""
);
conn
.
close
();
conn
.
close
();
...
@@ -142,7 +142,7 @@ public class GenerateDoc {
...
@@ -142,7 +142,7 @@ public class GenerateDoc {
try
{
try
{
stat
=
conn
.
createStatement
();
stat
=
conn
.
createStatement
();
rs
=
stat
.
executeQuery
(
sql
);
rs
=
stat
.
executeQuery
(
sql
);
ArrayList
<
HashMap
<
String
,
String
>>
list
=
ArrayList
<
HashMap
<
String
,
String
>>
list
=
new
ArrayList
<
HashMap
<
String
,
String
>>();
new
ArrayList
<
HashMap
<
String
,
String
>>();
while
(
rs
.
next
())
{
while
(
rs
.
next
())
{
HashMap
<
String
,
String
>
map
=
new
HashMap
<
String
,
String
>();
HashMap
<
String
,
String
>
map
=
new
HashMap
<
String
,
String
>();
...
@@ -168,9 +168,9 @@ public class GenerateDoc {
...
@@ -168,9 +168,9 @@ public class GenerateDoc {
String
text
=
map
.
get
(
"text"
);
String
text
=
map
.
get
(
"text"
);
if
(
text
!=
null
)
{
if
(
text
!=
null
)
{
// text is enclosed in <p> .. </p> so this works.
// text is enclosed in <p> .. </p> so this works.
text
=
StringUtils
.
replaceAll
(
text
,
text
=
StringUtils
.
replaceAll
(
text
,
"<br /><br />"
,
"</p><p>"
);
"<br /><br />"
,
"</p><p>"
);
text
=
StringUtils
.
replaceAll
(
text
,
text
=
StringUtils
.
replaceAll
(
text
,
"<br />"
,
" "
);
"<br />"
,
" "
);
text
=
addCode
(
text
);
text
=
addCode
(
text
);
map
.
put
(
"text"
,
text
);
map
.
put
(
"text"
,
text
);
...
...
h2/src/tools/org/h2/build/doc/GenerateHelp.java
浏览文件 @
fda7e2d5
...
@@ -52,7 +52,7 @@ public class GenerateHelp {
...
@@ -52,7 +52,7 @@ public class GenerateHelp {
rs2
.
addRow
(
row
);
rs2
.
addRow
(
row
);
}
}
BufferedWriter
writer
=
new
BufferedWriter
(
new
FileWriter
(
out
));
BufferedWriter
writer
=
new
BufferedWriter
(
new
FileWriter
(
out
));
writer
.
write
(
"# Copyright 2004-2013 H2 Group. "
+
writer
.
write
(
"# Copyright 2004-2013 H2 Group. "
+
"Multiple-Licensed under the H2 License,\n"
+
"Multiple-Licensed under the H2 License,\n"
+
"# Version 1.0, and under the Eclipse Public License, Version 1.0\n"
+
"# Version 1.0, and under the Eclipse Public License, Version 1.0\n"
+
"# (http://h2database.com/html/license.html).\n"
+
"# (http://h2database.com/html/license.html).\n"
+
...
...
h2/src/tools/org/h2/build/doc/MergeDocs.java
浏览文件 @
fda7e2d5
...
@@ -47,10 +47,10 @@ public class MergeDocs {
...
@@ -47,10 +47,10 @@ public class MergeDocs {
String
finalText
=
buff
.
toString
();
String
finalText
=
buff
.
toString
();
File
output
=
new
File
(
BASE_DIR
,
"onePage.html"
);
File
output
=
new
File
(
BASE_DIR
,
"onePage.html"
);
PrintWriter
writer
=
new
PrintWriter
(
new
FileWriter
(
output
));
PrintWriter
writer
=
new
PrintWriter
(
new
FileWriter
(
output
));
writer
.
println
(
"<html><head><meta http-equiv=\"Content-Type\" "
+
writer
.
println
(
"<html><head><meta http-equiv=\"Content-Type\" "
+
"content=\"text/html;charset=utf-8\" /><title>"
);
"content=\"text/html;charset=utf-8\" /><title>"
);
writer
.
println
(
"H2 Documentation"
);
writer
.
println
(
"H2 Documentation"
);
writer
.
println
(
"</title><link rel=\"stylesheet\" type=\"text/css\" "
+
writer
.
println
(
"</title><link rel=\"stylesheet\" type=\"text/css\" "
+
"href=\"stylesheetPdf.css\" /></head><body>"
);
"href=\"stylesheetPdf.css\" /></head><body>"
);
writer
.
println
(
"<h1>H2 Database Engine</h1>"
);
writer
.
println
(
"<h1>H2 Database Engine</h1>"
);
writer
.
println
(
"<p>Version "
+
Constants
.
getFullVersion
()
+
"</p>"
);
writer
.
println
(
"<p>Version "
+
Constants
.
getFullVersion
()
+
"</p>"
);
...
@@ -60,16 +60,16 @@ public class MergeDocs {
...
@@ -60,16 +60,16 @@ public class MergeDocs {
}
}
private
static
String
disableRailroads
(
String
text
)
{
private
static
String
disableRailroads
(
String
text
)
{
text
=
StringUtils
.
replaceAll
(
text
,
text
=
StringUtils
.
replaceAll
(
text
,
"<!-- railroad-start -->"
,
"<!-- railroad-start -->"
,
"<!-- railroad-start "
);
"<!-- railroad-start "
);
text
=
StringUtils
.
replaceAll
(
text
,
text
=
StringUtils
.
replaceAll
(
text
,
"<!-- railroad-end -->"
,
"<!-- railroad-end -->"
,
" railroad-end -->"
);
" railroad-end -->"
);
text
=
StringUtils
.
replaceAll
(
text
,
text
=
StringUtils
.
replaceAll
(
text
,
"<!-- syntax-start"
,
"<!-- syntax-start"
,
"<!-- syntax-start -->"
);
"<!-- syntax-start -->"
);
text
=
StringUtils
.
replaceAll
(
text
,
text
=
StringUtils
.
replaceAll
(
text
,
"syntax-end -->"
,
"syntax-end -->"
,
"<!-- syntax-end -->"
);
"<!-- syntax-end -->"
);
return
text
;
return
text
;
...
@@ -80,7 +80,7 @@ public class MergeDocs {
...
@@ -80,7 +80,7 @@ public class MergeDocs {
// String end = "</body>";
// String end = "</body>";
String
start
=
"<!-- } -->"
;
String
start
=
"<!-- } -->"
;
String
end
=
"<!-- [close] { --></div></td></tr></table>"
+
String
end
=
"<!-- [close] { --></div></td></tr></table>"
+
"<!-- } --><!-- analytics --></body></html>"
;
"<!-- } --><!-- analytics --></body></html>"
;
int
idx
=
text
.
indexOf
(
end
);
int
idx
=
text
.
indexOf
(
end
);
...
...
h2/src/tools/org/h2/build/doc/SpellChecker.java
浏览文件 @
fda7e2d5
...
@@ -31,7 +31,7 @@ public class SpellChecker {
...
@@ -31,7 +31,7 @@ public class SpellChecker {
private
static
final
String
[]
IGNORE
=
{
"dev"
,
"nsi"
,
"gif"
,
"png"
,
"odg"
,
private
static
final
String
[]
IGNORE
=
{
"dev"
,
"nsi"
,
"gif"
,
"png"
,
"odg"
,
"ico"
,
"sxd"
,
"zip"
,
"bz2"
,
"rc"
,
"layout"
,
"res"
,
"dll"
,
"jar"
,
"ico"
,
"sxd"
,
"zip"
,
"bz2"
,
"rc"
,
"layout"
,
"res"
,
"dll"
,
"jar"
,
"svg"
,
"prefs"
,
"prop"
,
"iml"
};
"svg"
,
"prefs"
,
"prop"
,
"iml"
};
private
static
final
String
DELIMITERS
=
private
static
final
String
DELIMITERS
=
" \n.();-\"=,*/{}_<>+\r:'@[]&\\!#|?$^%~`\t"
;
" \n.();-\"=,*/{}_<>+\r:'@[]&\\!#|?$^%~`\t"
;
private
static
final
String
PREFIX_IGNORE
=
"abc"
;
private
static
final
String
PREFIX_IGNORE
=
"abc"
;
private
static
final
String
[]
IGNORE_FILES
=
{
"mainWeb.html"
,
private
static
final
String
[]
IGNORE_FILES
=
{
"mainWeb.html"
,
...
@@ -49,11 +49,11 @@ public class SpellChecker {
...
@@ -49,11 +49,11 @@ public class SpellChecker {
*/
*/
public
boolean
printDictionary
;
public
boolean
printDictionary
;
private
final
HashSet
<
String
>
dictionary
=
private
final
HashSet
<
String
>
dictionary
=
new
HashSet
<
String
>();
new
HashSet
<
String
>();
private
final
HashSet
<
String
>
used
=
private
final
HashSet
<
String
>
used
=
new
HashSet
<
String
>();
new
HashSet
<
String
>();
private
final
HashMap
<
String
,
Integer
>
unknown
=
private
final
HashMap
<
String
,
Integer
>
unknown
=
new
HashMap
<
String
,
Integer
>();
new
HashMap
<
String
,
Integer
>();
private
boolean
addToDictionary
;
private
boolean
addToDictionary
;
private
int
errorCount
;
private
int
errorCount
;
...
@@ -147,7 +147,7 @@ public class SpellChecker {
...
@@ -147,7 +147,7 @@ public class SpellChecker {
}
}
}
}
if
(!
ok
)
{
if
(!
ok
)
{
throw
new
IOException
(
"Unsupported suffix: "
+
throw
new
IOException
(
"Unsupported suffix: "
+
suffix
+
" for file: "
+
fileName
);
suffix
+
" for file: "
+
fileName
);
}
}
String
text
=
new
String
(
BuildBase
.
readFile
(
file
));
String
text
=
new
String
(
BuildBase
.
readFile
(
file
));
...
@@ -206,7 +206,7 @@ public class SpellChecker {
...
@@ -206,7 +206,7 @@ public class SpellChecker {
pos
+=
"http://"
.
length
();
pos
+=
"http://"
.
length
();
while
(
true
)
{
while
(
true
)
{
char
c
=
text
.
charAt
(
pos
);
char
c
=
text
.
charAt
(
pos
);
if
(!
Character
.
isJavaIdentifierPart
(
c
)
&&
if
(!
Character
.
isJavaIdentifierPart
(
c
)
&&
".#/?&=%+_-:"
.
indexOf
(
c
)
<
0
)
{
".#/?&=%+_-:"
.
indexOf
(
c
)
<
0
)
{
break
;
break
;
}
}
...
...
h2/src/tools/org/h2/build/doc/UploadBuild.java
浏览文件 @
fda7e2d5
...
@@ -105,7 +105,7 @@ public class UploadBuild {
...
@@ -105,7 +105,7 @@ public class UploadBuild {
if
(
ftp
.
exists
(
"/httpdocs/automated"
,
"history.sql"
))
{
if
(
ftp
.
exists
(
"/httpdocs/automated"
,
"history.sql"
))
{
buildSql
=
new
String
(
ftp
.
retrieve
(
"/httpdocs/automated/history.sql"
));
buildSql
=
new
String
(
ftp
.
retrieve
(
"/httpdocs/automated/history.sql"
));
}
else
{
}
else
{
buildSql
=
"create table item(id identity, title varchar, "
+
buildSql
=
"create table item(id identity, title varchar, "
+
"issued timestamp, desc varchar);\n"
;
"issued timestamp, desc varchar);\n"
;
}
}
String
ts
=
new
java
.
sql
.
Timestamp
(
System
.
currentTimeMillis
()).
toString
();
String
ts
=
new
java
.
sql
.
Timestamp
(
System
.
currentTimeMillis
()).
toString
();
...
@@ -114,21 +114,21 @@ public class UploadBuild {
...
@@ -114,21 +114,21 @@ public class UploadBuild {
if
(
idx
>=
0
)
{
if
(
idx
>=
0
)
{
int
end
=
testOutput
.
indexOf
(
"<br />"
,
idx
);
int
end
=
testOutput
.
indexOf
(
"<br />"
,
idx
);
if
(
end
>=
0
)
{
if
(
end
>=
0
)
{
String
result
=
testOutput
.
substring
(
idx
+
String
result
=
testOutput
.
substring
(
idx
+
"Statements per second: "
.
length
(),
end
);
"Statements per second: "
.
length
(),
end
);
now
+=
" "
+
result
+
" op/s"
;
now
+=
" "
+
result
+
" op/s"
;
}
}
}
}
String
sql
=
"insert into item(title, issued, desc) values('Build "
+
String
sql
=
"insert into item(title, issued, desc) values('Build "
+
now
+
now
+
(
error
?
" FAILED"
:
""
)
+
(
error
?
" FAILED"
:
""
)
+
(
coverageFailed
?
" COVERAGE"
:
""
)
+
(
coverageFailed
?
" COVERAGE"
:
""
)
+
"', '"
+
ts
+
"', '"
+
ts
+
"', '<a href=\"http://www.h2database.com/"
+
"', '<a href=\"http://www.h2database.com/"
+
"html/testOutput.html\">Output</a>"
+
"html/testOutput.html\">Output</a>"
+
" - <a href=\"http://www.h2database.com/"
+
" - <a href=\"http://www.h2database.com/"
+
"coverage/overview.html\">Coverage</a>"
+
"coverage/overview.html\">Coverage</a>"
+
" - <a href=\"http://www.h2database.com/"
+
" - <a href=\"http://www.h2database.com/"
+
"automated/h2-latest.jar\">Jar</a>');\n"
;
"automated/h2-latest.jar\">Jar</a>');\n"
;
buildSql
+=
sql
;
buildSql
+=
sql
;
Connection
conn
;
Connection
conn
;
...
@@ -157,21 +157,21 @@ public class UploadBuild {
...
@@ -157,21 +157,21 @@ public class UploadBuild {
rs
.
next
();
rs
.
next
();
String
content
=
rs
.
getString
(
"content"
);
String
content
=
rs
.
getString
(
"content"
);
conn
.
close
();
conn
.
close
();
ftp
.
store
(
"/httpdocs/automated/history.sql"
,
ftp
.
store
(
"/httpdocs/automated/history.sql"
,
new
ByteArrayInputStream
(
buildSql
.
getBytes
()));
new
ByteArrayInputStream
(
buildSql
.
getBytes
()));
ftp
.
store
(
"/httpdocs/automated/news.xml"
,
ftp
.
store
(
"/httpdocs/automated/news.xml"
,
new
ByteArrayInputStream
(
content
.
getBytes
()));
new
ByteArrayInputStream
(
content
.
getBytes
()));
ftp
.
store
(
"/httpdocs/html/testOutput.html"
,
ftp
.
store
(
"/httpdocs/html/testOutput.html"
,
new
ByteArrayInputStream
(
testOutput
.
getBytes
()));
new
ByteArrayInputStream
(
testOutput
.
getBytes
()));
String
jarFileName
=
"bin/h2-"
+
Constants
.
getVersion
()
+
".jar"
;
String
jarFileName
=
"bin/h2-"
+
Constants
.
getVersion
()
+
".jar"
;
if
(
FileUtils
.
exists
(
jarFileName
))
{
if
(
FileUtils
.
exists
(
jarFileName
))
{
ftp
.
store
(
"/httpdocs/automated/h2-latest.jar"
,
ftp
.
store
(
"/httpdocs/automated/h2-latest.jar"
,
new
FileInputStream
(
jarFileName
));
new
FileInputStream
(
jarFileName
));
}
}
if
(
coverage
)
{
if
(
coverage
)
{
ftp
.
store
(
"/httpdocs/coverage/overview.html"
,
ftp
.
store
(
"/httpdocs/coverage/overview.html"
,
new
FileInputStream
(
"coverage/overview.html"
));
new
FileInputStream
(
"coverage/overview.html"
));
ftp
.
store
(
"/httpdocs/coverage/coverage.zip"
,
ftp
.
store
(
"/httpdocs/coverage/coverage.zip"
,
new
FileInputStream
(
"coverage.zip"
));
new
FileInputStream
(
"coverage.zip"
));
FileUtils
.
delete
(
"coverage.zip"
);
FileUtils
.
delete
(
"coverage.zip"
);
}
}
...
...
h2/src/tools/org/h2/build/doc/WebSite.java
浏览文件 @
fda7e2d5
...
@@ -26,7 +26,7 @@ public class WebSite {
...
@@ -26,7 +26,7 @@ public class WebSite {
private
static
final
String
ANALYTICS_TAG
=
"<!-- analytics -->"
;
private
static
final
String
ANALYTICS_TAG
=
"<!-- analytics -->"
;
private
static
final
String
ANALYTICS_SCRIPT
=
private
static
final
String
ANALYTICS_SCRIPT
=
"<script src=\"http://www.google-analytics.com/ga.js\" "
+
"<script src=\"http://www.google-analytics.com/ga.js\" "
+
"type=\"text/javascript\"></script>\n"
+
"type=\"text/javascript\"></script>\n"
+
"<script type=\"text/javascript\">"
+
"<script type=\"text/javascript\">"
+
"var pageTracker=_gat._getTracker(\"UA-2351060-1\");"
+
"var pageTracker=_gat._getTracker(\"UA-2351060-1\");"
+
...
...
h2/src/tools/org/h2/build/doclet/Doclet.java
浏览文件 @
fda7e2d5
...
@@ -87,25 +87,25 @@ public class Doclet {
...
@@ -87,25 +87,25 @@ public class Doclet {
String
className
=
getClass
(
clazz
);
String
className
=
getClass
(
clazz
);
FileWriter
out
=
new
FileWriter
(
fileName
);
FileWriter
out
=
new
FileWriter
(
fileName
);
PrintWriter
writer
=
new
PrintWriter
(
new
BufferedWriter
(
out
));
PrintWriter
writer
=
new
PrintWriter
(
new
BufferedWriter
(
out
));
writer
.
println
(
"<!DOCTYPE html PUBLIC \"-//W3C//DTD "
+
writer
.
println
(
"<!DOCTYPE html PUBLIC \"-//W3C//DTD "
+
"XHTML 1.0 Strict//EN\" "
+
"XHTML 1.0 Strict//EN\" "
+
"\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">"
);
"\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">"
);
String
language
=
"en"
;
String
language
=
"en"
;
writer
.
println
(
"<html xmlns=\"http://www.w3.org/1999/xhtml\" "
+
writer
.
println
(
"<html xmlns=\"http://www.w3.org/1999/xhtml\" "
+
"lang=\""
+
language
+
"\" xml:lang=\""
+
language
+
"\">"
);
"lang=\""
+
language
+
"\" xml:lang=\""
+
language
+
"\">"
);
writer
.
println
(
"<head>"
+
writer
.
println
(
"<head>"
+
"<meta http-equiv=\"Content-Type\" "
+
"<meta http-equiv=\"Content-Type\" "
+
"content=\"text/html;charset=utf-8\" /><title>"
);
"content=\"text/html;charset=utf-8\" /><title>"
);
writer
.
println
(
className
);
writer
.
println
(
className
);
writer
.
println
(
"</title>"
+
writer
.
println
(
"</title>"
+
"<link rel=\"stylesheet\" type=\"text/css\" "
+
"<link rel=\"stylesheet\" type=\"text/css\" "
+
"href=\"../../../stylesheet.css\" />"
);
"href=\"../../../stylesheet.css\" />"
);
writer
.
println
(
"<script type=\"text/javascript\" "
+
writer
.
println
(
"<script type=\"text/javascript\" "
+
"src=\"../../../animate.js\"></script>"
);
"src=\"../../../animate.js\"></script>"
);
writer
.
println
(
"</head><body onload=\"openLink();\">"
);
writer
.
println
(
"</head><body onload=\"openLink();\">"
);
writer
.
println
(
"<table class=\"content\">"
+
writer
.
println
(
"<table class=\"content\">"
+
"<tr class=\"content\">"
+
"<tr class=\"content\">"
+
"<td class=\"content\">"
+
"<td class=\"content\">"
+
"<div class=\"contentDiv\">"
);
"<div class=\"contentDiv\">"
);
writer
.
println
(
"<h1>"
+
className
+
"</h1>"
);
writer
.
println
(
"<h1>"
+
className
+
"</h1>"
);
writer
.
println
(
formatText
(
clazz
.
commentText
())
+
"<br /><br />"
);
writer
.
println
(
formatText
(
clazz
.
commentText
())
+
"<br /><br />"
);
...
@@ -113,7 +113,7 @@ public class Doclet {
...
@@ -113,7 +113,7 @@ public class Doclet {
// methods
// methods
ConstructorDoc
[]
constructors
=
clazz
.
constructors
();
ConstructorDoc
[]
constructors
=
clazz
.
constructors
();
MethodDoc
[]
methods
=
clazz
.
methods
();
MethodDoc
[]
methods
=
clazz
.
methods
();
ExecutableMemberDoc
[]
constructorsMethods
=
ExecutableMemberDoc
[]
constructorsMethods
=
new
ExecutableMemberDoc
[
constructors
.
length
new
ExecutableMemberDoc
[
constructors
.
length
+
methods
.
length
];
+
methods
.
length
];
System
.
arraycopy
(
constructors
,
0
,
constructorsMethods
,
0
,
System
.
arraycopy
(
constructors
,
0
,
constructorsMethods
,
0
,
...
@@ -151,16 +151,16 @@ public class Doclet {
...
@@ -151,16 +151,16 @@ public class Doclet {
continue
;
continue
;
}
}
if
(!
hasMethods
)
{
if
(!
hasMethods
)
{
writer
.
println
(
"<table class=\"block\">"
+
writer
.
println
(
"<table class=\"block\">"
+
"<tr onclick=\"return allDetails()\">"
+
"<tr onclick=\"return allDetails()\">"
+
"<th colspan=\"2\">Methods</th></tr>"
);
"<th colspan=\"2\">Methods</th></tr>"
);
hasMethods
=
true
;
hasMethods
=
true
;
}
}
String
type
=
getTypeName
(
method
.
isStatic
(),
false
,
String
type
=
getTypeName
(
method
.
isStatic
(),
false
,
getReturnType
(
method
));
getReturnType
(
method
));
writer
.
println
(
"<tr id=\"__"
+
id
+
"\" onclick=\"return on("
+
writer
.
println
(
"<tr id=\"__"
+
id
+
"\" onclick=\"return on("
+
id
+
")\">"
);
id
+
")\">"
);
writer
.
println
(
"<td class=\"return\">"
+
type
+
writer
.
println
(
"<td class=\"return\">"
+
type
+
"</td><td class=\"method\">"
);
"</td><td class=\"method\">"
);
Parameter
[]
params
=
method
.
parameters
();
Parameter
[]
params
=
method
.
parameters
();
StringBuilder
buff
=
new
StringBuilder
();
StringBuilder
buff
=
new
StringBuilder
();
...
@@ -188,18 +188,18 @@ public class Doclet {
...
@@ -188,18 +188,18 @@ public class Doclet {
signatures
.
add
(
null
);
signatures
.
add
(
null
);
}
}
signatures
.
add
(
i
,
signature
);
signatures
.
add
(
i
,
signature
);
writer
.
println
(
"<a id=\""
+
signature
+
writer
.
println
(
"<a id=\""
+
signature
+
"\" href=\"#"
+
signature
+
"\">"
+
"\" href=\"#"
+
signature
+
"\">"
+
name
+
"</a>"
+
buff
.
toString
());
name
+
"</a>"
+
buff
.
toString
());
String
firstSentence
=
getFirstSentence
(
method
.
firstSentenceTags
());
String
firstSentence
=
getFirstSentence
(
method
.
firstSentenceTags
());
if
(
firstSentence
!=
null
)
{
if
(
firstSentence
!=
null
)
{
writer
.
println
(
"<div class=\"methodText\">"
+
writer
.
println
(
"<div class=\"methodText\">"
+
formatText
(
firstSentence
)
+
"</div>"
);
formatText
(
firstSentence
)
+
"</div>"
);
}
}
writer
.
println
(
"</td></tr>"
);
writer
.
println
(
"</td></tr>"
);
writer
.
println
(
"<tr onclick=\"return off("
+
writer
.
println
(
"<tr onclick=\"return off("
+
id
+
")\" class=\"detail\" id=\"_"
+
id
+
"\">"
);
id
+
")\" class=\"detail\" id=\"_"
+
id
+
"\">"
);
writer
.
println
(
"<td class=\"return\">"
+
writer
.
println
(
"<td class=\"return\">"
+
type
+
"</td><td>"
);
type
+
"</td><td>"
);
writeMethodDetails
(
writer
,
clazz
,
method
,
signature
);
writeMethodDetails
(
writer
,
clazz
,
method
,
signature
);
writer
.
println
(
"</td></tr>"
);
writer
.
println
(
"</td></tr>"
);
...
@@ -228,7 +228,7 @@ public class Doclet {
...
@@ -228,7 +228,7 @@ public class Doclet {
String
name
=
field
.
name
();
String
name
=
field
.
name
();
String
text
=
field
.
commentText
();
String
text
=
field
.
commentText
();
if
(
text
==
null
||
text
.
trim
().
length
()
==
0
)
{
if
(
text
==
null
||
text
.
trim
().
length
()
==
0
)
{
addError
(
"Undocumented field ("
+
addError
(
"Undocumented field ("
+
getLink
(
clazz
,
field
.
position
().
line
())
+
") "
+
name
);
getLink
(
clazz
,
field
.
position
().
line
())
+
") "
+
name
);
}
}
if
(
text
!=
null
&&
text
.
startsWith
(
"INTERNAL"
))
{
if
(
text
!=
null
&&
text
.
startsWith
(
"INTERNAL"
))
{
...
@@ -238,7 +238,7 @@ public class Doclet {
...
@@ -238,7 +238,7 @@ public class Doclet {
writer
.
println
(
"<br /><table><tr><th colspan=\"2\">Fields</th></tr>"
);
writer
.
println
(
"<br /><table><tr><th colspan=\"2\">Fields</th></tr>"
);
}
}
String
type
=
getTypeName
(
true
,
false
,
field
.
type
());
String
type
=
getTypeName
(
true
,
false
,
field
.
type
());
writer
.
println
(
"<tr><td class=\"return\">"
+
type
+
writer
.
println
(
"<tr><td class=\"return\">"
+
type
+
"</td><td class=\"method\">"
);
"</td><td class=\"method\">"
);
String
constant
=
field
.
constantValueExpression
();
String
constant
=
field
.
constantValueExpression
();
...
@@ -293,7 +293,7 @@ public class Doclet {
...
@@ -293,7 +293,7 @@ public class Doclet {
String
name
=
field
.
name
();
String
name
=
field
.
name
();
String
constant
=
field
.
constantValueExpression
();
String
constant
=
field
.
constantValueExpression
();
String
link
=
getFieldLink
(
text
,
constant
,
clazz
,
name
);
String
link
=
getFieldLink
(
text
,
constant
,
clazz
,
name
);
writer
.
println
(
"<h4 id=\""
+
link
+
"\"><span class=\"methodName\">"
+
writer
.
println
(
"<h4 id=\""
+
link
+
"\"><span class=\"methodName\">"
+
name
);
name
);
if
(
constant
==
null
)
{
if
(
constant
==
null
)
{
writer
.
println
();
writer
.
println
();
...
@@ -335,11 +335,11 @@ public class Doclet {
...
@@ -335,11 +335,11 @@ public class Doclet {
if
(
isDeprecated
(
method
))
{
if
(
isDeprecated
(
method
))
{
name
=
"<span class=\"deprecated\">"
+
name
+
"</span>"
;
name
=
"<span class=\"deprecated\">"
+
name
+
"</span>"
;
}
}
writer
.
println
(
"<a id=\""
+
signature
+
"\" href=\"#"
+
signature
+
"\">"
+
writer
.
println
(
"<a id=\""
+
signature
+
"\" href=\"#"
+
signature
+
"\">"
+
name
+
"</a>"
+
buff
.
toString
());
name
+
"</a>"
+
buff
.
toString
());
boolean
hasComment
=
method
.
commentText
()
!=
null
&&
boolean
hasComment
=
method
.
commentText
()
!=
null
&&
method
.
commentText
().
trim
().
length
()
!=
0
;
method
.
commentText
().
trim
().
length
()
!=
0
;
writer
.
println
(
"<div class=\"methodText\">"
+
writer
.
println
(
"<div class=\"methodText\">"
+
formatText
(
method
.
commentText
())
+
"</div>"
);
formatText
(
method
.
commentText
())
+
"</div>"
);
ParamTag
[]
paramTags
=
method
.
paramTags
();
ParamTag
[]
paramTags
=
method
.
paramTags
();
ThrowsTag
[]
throwsTags
=
method
.
throwsTags
();
ThrowsTag
[]
throwsTags
=
method
.
throwsTags
();
...
@@ -349,7 +349,7 @@ public class Doclet {
...
@@ -349,7 +349,7 @@ public class Doclet {
// [Not supported] and such are not problematic
// [Not supported] and such are not problematic
addError
(
"Undocumented parameter(s) ("
+
addError
(
"Undocumented parameter(s) ("
+
getLink
(
clazz
,
method
.
position
().
line
())
+
") "
+
getLink
(
clazz
,
method
.
position
().
line
())
+
") "
+
name
+
" documented: "
+
paramTags
.
length
+
name
+
" documented: "
+
paramTags
.
length
+
" params: "
+
params
.
length
);
" params: "
+
params
.
length
);
}
}
}
}
...
@@ -358,7 +358,7 @@ public class Doclet {
...
@@ -358,7 +358,7 @@ public class Doclet {
String
comment
=
paramTags
[
j
].
parameterComment
();
String
comment
=
paramTags
[
j
].
parameterComment
();
if
(
comment
.
trim
().
length
()
==
0
)
{
if
(
comment
.
trim
().
length
()
==
0
)
{
addError
(
"Undocumented parameter ("
+
addError
(
"Undocumented parameter ("
+
getLink
(
clazz
,
method
.
position
().
line
())
+
") "
+
getLink
(
clazz
,
method
.
position
().
line
())
+
") "
+
name
+
" "
+
paramName
);
name
+
" "
+
paramName
);
}
}
String
p
=
paramName
+
" - "
+
comment
;
String
p
=
paramName
+
" - "
+
comment
;
...
@@ -378,7 +378,7 @@ public class Doclet {
...
@@ -378,7 +378,7 @@ public class Doclet {
}
}
writer
.
println
(
"<div class=\"item\">"
+
returnComment
+
"</div>"
);
writer
.
println
(
"<div class=\"item\">"
+
returnComment
+
"</div>"
);
}
else
if
(
returnType
!=
null
&&
!
returnType
.
toString
().
equals
(
"void"
))
{
}
else
if
(
returnType
!=
null
&&
!
returnType
.
toString
().
equals
(
"void"
))
{
if
(
hasComment
&&
!
method
.
commentText
().
startsWith
(
"["
)
&&
if
(
hasComment
&&
!
method
.
commentText
().
startsWith
(
"["
)
&&
!
hasThrowsTag
)
{
!
hasThrowsTag
)
{
// [Not supported] and such are not problematic
// [Not supported] and such are not problematic
// also not problematic are methods that always throw an exception
// also not problematic are methods that always throw an exception
...
@@ -417,7 +417,7 @@ public class Doclet {
...
@@ -417,7 +417,7 @@ public class Doclet {
int
linkEnd
=
text
.
indexOf
(
"</code>"
,
linkStart
);
int
linkEnd
=
text
.
indexOf
(
"</code>"
,
linkStart
);
link
=
text
.
substring
(
linkStart
+
"<code>"
.
length
(),
linkEnd
);
link
=
text
.
substring
(
linkStart
+
"<code>"
.
length
(),
linkEnd
);
if
(
constant
!=
null
&&
!
constant
.
equals
(
link
))
{
if
(
constant
!=
null
&&
!
constant
.
equals
(
link
))
{
System
.
out
.
println
(
"Wrong code tag? "
+
clazz
.
name
()
+
"."
+
System
.
out
.
println
(
"Wrong code tag? "
+
clazz
.
name
()
+
"."
+
name
+
name
+
" code: "
+
link
+
" constant: "
+
constant
);
" code: "
+
link
+
" constant: "
+
constant
);
errorCount
++;
errorCount
++;
...
...
h2/src/tools/org/h2/build/indexer/HtmlConverter.java
浏览文件 @
fda7e2d5
...
@@ -14,9 +14,9 @@ import java.util.HashMap;
...
@@ -14,9 +14,9 @@ import java.util.HashMap;
*/
*/
public
class
HtmlConverter
{
public
class
HtmlConverter
{
private
static
final
HashMap
<
String
,
Character
>
CHAR_MAP
=
private
static
final
HashMap
<
String
,
Character
>
CHAR_MAP
=
new
HashMap
<
String
,
Character
>();
new
HashMap
<
String
,
Character
>();
private
static
final
HashMap
<
Character
,
String
>
CODE_MAP
=
private
static
final
HashMap
<
Character
,
String
>
CODE_MAP
=
new
HashMap
<
Character
,
String
>();
new
HashMap
<
Character
,
String
>();
private
static
final
String
[]
CHARS
=
{
"quot:34"
,
"amp:38"
,
"lt:60"
,
private
static
final
String
[]
CHARS
=
{
"quot:34"
,
"amp:38"
,
"lt:60"
,
...
...
h2/src/tools/org/h2/dev/fs/FileShell.java
浏览文件 @
fda7e2d5
...
@@ -458,39 +458,39 @@ public class FileShell extends Tool {
...
@@ -458,39 +458,39 @@ public class FileShell extends Tool {
private
void
showHelp
()
{
private
void
showHelp
()
{
println
(
"Commands are case sensitive"
);
println
(
"Commands are case sensitive"
);
println
(
"? or help "
+
println
(
"? or help "
+
"Display this help"
);
"Display this help"
);
println
(
"cat <file> "
+
println
(
"cat <file> "
+
"Print the contents of the file"
);
"Print the contents of the file"
);
println
(
"cd <dir> "
+
println
(
"cd <dir> "
+
"Change the directory"
);
"Change the directory"
);
println
(
"chmod -w <file> "
+
println
(
"chmod -w <file> "
+
"Make the file read-only"
);
"Make the file read-only"
);
println
(
"cp <source> <target> "
+
println
(
"cp <source> <target> "
+
"Copy a file"
);
"Copy a file"
);
println
(
"head <file> "
+
println
(
"head <file> "
+
"Print the first few lines of the contents"
);
"Print the first few lines of the contents"
);
println
(
"ls [<dir>] "
+
println
(
"ls [<dir>] "
+
"Print the directory contents"
);
"Print the directory contents"
);
println
(
"mkdir <dir> "
+
println
(
"mkdir <dir> "
+
"Create a directory (including parent directories)"
);
"Create a directory (including parent directories)"
);
println
(
"mv <source> <target> "
+
println
(
"mv <source> <target> "
+
"Rename a file or directory"
);
"Rename a file or directory"
);
println
(
"pwd "
+
println
(
"pwd "
+
"Print the current working directory"
);
"Print the current working directory"
);
println
(
"rm <file> "
+
println
(
"rm <file> "
+
"Remove a file"
);
"Remove a file"
);
println
(
"rm -r <dir> "
+
println
(
"rm -r <dir> "
+
"Remove a directory, recursively"
);
"Remove a directory, recursively"
);
println
(
"rm -rf <dir> "
+
println
(
"rm -rf <dir> "
+
"Remove a directory, recursively; force"
);
"Remove a directory, recursively; force"
);
println
(
"touch <file> "
+
println
(
"touch <file> "
+
"Update the last modified date (creates the file)"
);
"Update the last modified date (creates the file)"
);
println
(
"truncate -s <size> <file> "
+
println
(
"truncate -s <size> <file> "
+
"Set the file length"
);
"Set the file length"
);
println
(
"unzip <zip> "
+
println
(
"unzip <zip> "
+
"Extract all files from the zip file"
);
"Extract all files from the zip file"
);
println
(
"zip [-r] <zip> <files..> "
+
println
(
"zip [-r] <zip> <files..> "
+
"Create a zip file (-r to recurse directories)"
);
"Create a zip file (-r to recurse directories)"
);
println
(
"exit Exit"
);
println
(
"exit Exit"
);
println
(
""
);
println
(
""
);
...
...
h2/src/tools/org/h2/dev/ftp/server/FtpServer.java
浏览文件 @
fda7e2d5
...
@@ -239,7 +239,7 @@ public class FtpServer extends Tool implements Service {
...
@@ -239,7 +239,7 @@ public class FtpServer extends Tool implements Service {
Date
now
=
new
Date
(),
mod
=
new
Date
(
FileUtils
.
lastModified
(
fileName
));
Date
now
=
new
Date
(),
mod
=
new
Date
(
FileUtils
.
lastModified
(
fileName
));
String
date
;
String
date
;
if
(
mod
.
after
(
now
)
if
(
mod
.
after
(
now
)
||
Math
.
abs
((
now
.
getTime
()
-
mod
.
getTime
())
/
||
Math
.
abs
((
now
.
getTime
()
-
mod
.
getTime
())
/
1000
/
60
/
60
/
24
)
>
180
)
{
1000
/
60
/
60
/
24
)
>
180
)
{
synchronized
(
dateFormatOld
)
{
synchronized
(
dateFormatOld
)
{
date
=
dateFormatOld
.
format
(
mod
);
date
=
dateFormatOld
.
format
(
mod
);
...
...
h2/src/tools/org/h2/dev/security/SecureKeyStoreBuilder.java
浏览文件 @
fda7e2d5
...
@@ -58,13 +58,13 @@ public class SecureKeyStoreBuilder {
...
@@ -58,13 +58,13 @@ public class SecureKeyStoreBuilder {
String
alias
=
en
.
nextElement
();
String
alias
=
en
.
nextElement
();
Key
key
=
store
.
getKey
(
alias
,
password
.
toCharArray
());
Key
key
=
store
.
getKey
(
alias
,
password
.
toCharArray
());
System
.
out
.
println
(
System
.
out
.
println
(
"KeyFactory keyFactory = KeyFactory.getInstance(\""
"KeyFactory keyFactory = KeyFactory.getInstance(\""
+
key
.
getAlgorithm
()
+
"\");"
);
+
key
.
getAlgorithm
()
+
"\");"
);
System
.
out
.
println
(
"store.load(null, password.toCharArray());"
);
System
.
out
.
println
(
"store.load(null, password.toCharArray());"
);
String
pkFormat
=
key
.
getFormat
();
String
pkFormat
=
key
.
getFormat
();
String
encoded
=
StringUtils
.
convertBytesToHex
(
key
.
getEncoded
());
String
encoded
=
StringUtils
.
convertBytesToHex
(
key
.
getEncoded
());
System
.
out
.
println
(
System
.
out
.
println
(
pkFormat
+
"EncodedKeySpec keySpec = new "
pkFormat
+
"EncodedKeySpec keySpec = new "
+
pkFormat
+
"EncodedKeySpec(getBytes(\""
+
pkFormat
+
"EncodedKeySpec(getBytes(\""
+
encoded
+
"\"));"
);
+
encoded
+
"\"));"
);
System
.
out
.
println
(
System
.
out
.
println
(
...
...
h2/src/tools/org/h2/dev/util/Migrate.java
浏览文件 @
fda7e2d5
...
@@ -34,9 +34,9 @@ public class Migrate {
...
@@ -34,9 +34,9 @@ public class Migrate {
private
static
final
String
USER
=
"sa"
;
private
static
final
String
USER
=
"sa"
;
private
static
final
String
PASSWORD
=
"sa"
;
private
static
final
String
PASSWORD
=
"sa"
;
private
static
final
File
OLD_H2_FILE
=
new
File
(
"./h2-1.2.127.jar"
);
private
static
final
File
OLD_H2_FILE
=
new
File
(
"./h2-1.2.127.jar"
);
private
static
final
String
DOWNLOAD_URL
=
private
static
final
String
DOWNLOAD_URL
=
"http://repo2.maven.org/maven2/com/h2database/h2/1.2.127/h2-1.2.127.jar"
;
"http://repo2.maven.org/maven2/com/h2database/h2/1.2.127/h2-1.2.127.jar"
;
private
static
final
String
CHECKSUM
=
private
static
final
String
CHECKSUM
=
"056e784c7cf009483366ab9cd8d21d02fe47031a"
;
"056e784c7cf009483366ab9cd8d21d02fe47031a"
;
private
static
final
String
TEMP_SCRIPT
=
"backup.sql"
;
private
static
final
String
TEMP_SCRIPT
=
"backup.sql"
;
private
final
PrintStream
sysOut
=
System
.
out
;
private
final
PrintStream
sysOut
=
System
.
out
;
...
...
h2/src/tools/org/h2/jaqu/Db.java
浏览文件 @
fda7e2d5
...
@@ -86,7 +86,7 @@ public class Db {
...
@@ -86,7 +86,7 @@ public class Db {
/**
/**
* Create a new database instance using a data source. This method is fast,
* Create a new database instance using a data source. This method is fast,
* so that you can always call open() / close() on usage.
* so that you can always call open() / close() on usage.
*
*
* @param ds the data source
* @param ds the data source
* @return the database instance.
* @return the database instance.
*/
*/
...
@@ -315,7 +315,7 @@ public class Db {
...
@@ -315,7 +315,7 @@ public class Db {
/**
/**
* Run a SQL query directly against the database.
* Run a SQL query directly against the database.
*
*
* @param sql the SQL statement
* @param sql the SQL statement
* @return the result set
* @return the result set
*/
*/
...
@@ -329,7 +329,7 @@ public class Db {
...
@@ -329,7 +329,7 @@ public class Db {
/**
/**
* Run a SQL statement directly against the database.
* Run a SQL statement directly against the database.
*
*
* @param sql the SQL statement
* @param sql the SQL statement
* @return the update count
* @return the update count
*/
*/
...
...
h2/src/tools/org/h2/jaqu/DbInspector.java
浏览文件 @
fda7e2d5
...
@@ -35,7 +35,7 @@ public class DbInspector {
...
@@ -35,7 +35,7 @@ public class DbInspector {
/**
/**
* Set the preferred class to store date and time. Possible values are:
* Set the preferred class to store date and time. Possible values are:
* java.util.Date (default) and java.sql.Timestamp.
* java.util.Date (default) and java.sql.Timestamp.
*
*
* @param dateTimeClass the new class
* @param dateTimeClass the new class
*/
*/
public
void
setPreferredDateTimeClass
(
public
void
setPreferredDateTimeClass
(
...
@@ -48,7 +48,7 @@ public class DbInspector {
...
@@ -48,7 +48,7 @@ public class DbInspector {
* name is undefined, models will be generated for every table within the
* name is undefined, models will be generated for every table within the
* specified schema. Additionally, if no schema is defined, models will be
* specified schema. Additionally, if no schema is defined, models will be
* generated for all schemas and all tables.
* generated for all schemas and all tables.
*
*
* @param schema the schema name (optional)
* @param schema the schema name (optional)
* @param table the table name (optional)
* @param table the table name (optional)
* @param packageName the package name (optional)
* @param packageName the package name (optional)
...
@@ -75,7 +75,7 @@ public class DbInspector {
...
@@ -75,7 +75,7 @@ public class DbInspector {
/**
/**
* Validates a model.
* Validates a model.
*
*
* @param <T> the model class
* @param <T> the model class
* @param model an instance of the model class
* @param model an instance of the model class
* @param throwOnError if errors should cause validation to fail
* @param throwOnError if errors should cause validation to fail
...
@@ -104,7 +104,7 @@ public class DbInspector {
...
@@ -104,7 +104,7 @@ public class DbInspector {
/**
/**
* Get the table in the database based on the model definition.
* Get the table in the database based on the model definition.
*
*
* @param <T> the model class
* @param <T> the model class
* @param model an instance of the model class
* @param model an instance of the model class
* @return the table inspector
* @return the table inspector
...
@@ -125,7 +125,7 @@ public class DbInspector {
...
@@ -125,7 +125,7 @@ public class DbInspector {
/**
/**
* Returns a list of tables. This method always returns at least one
* Returns a list of tables. This method always returns at least one
* element. If no table is found, an exception is thrown.
* element. If no table is found, an exception is thrown.
*
*
* @param schema the schema name
* @param schema the schema name
* @param table the table name
* @param table the table name
* @return a list of table inspectors (always contains at least one element)
* @return a list of table inspectors (always contains at least one element)
...
...
h2/src/tools/org/h2/jaqu/DbUpgrader.java
浏览文件 @
fda7e2d5
...
@@ -19,7 +19,7 @@ public interface DbUpgrader {
...
@@ -19,7 +19,7 @@ public interface DbUpgrader {
* Defines method interface to handle database upgrades. This method is only
* Defines method interface to handle database upgrades. This method is only
* called if your <i>DbUpgrader</i> implementation is annotated with
* called if your <i>DbUpgrader</i> implementation is annotated with
* JQDatabase.
* JQDatabase.
*
*
* @param db the database
* @param db the database
* @param fromVersion the old version
* @param fromVersion the old version
* @param toVersion the new version
* @param toVersion the new version
...
@@ -30,7 +30,7 @@ public interface DbUpgrader {
...
@@ -30,7 +30,7 @@ public interface DbUpgrader {
/**
/**
* Defines method interface to handle table upgrades.
* Defines method interface to handle table upgrades.
*
*
* @param db the database
* @param db the database
* @param schema the schema
* @param schema the schema
* @param table the table
* @param table the table
...
...
h2/src/tools/org/h2/jaqu/DbVersion.java
浏览文件 @
fda7e2d5
...
@@ -12,7 +12,7 @@ import org.h2.jaqu.Table.JQTable;
...
@@ -12,7 +12,7 @@ import org.h2.jaqu.Table.JQTable;
/**
/**
* A system table to track database and table versions.
* A system table to track database and table versions.
*/
*/
@JQTable
(
name
=
"_jq_versions"
,
@JQTable
(
name
=
"_jq_versions"
,
primaryKey
=
"schemaName tableName"
,
memoryTable
=
true
)
primaryKey
=
"schemaName tableName"
,
memoryTable
=
true
)
public
class
DbVersion
{
public
class
DbVersion
{
...
@@ -32,7 +32,7 @@ public class DbVersion {
...
@@ -32,7 +32,7 @@ public class DbVersion {
/**
/**
* Constructor for defining a version entry. Both the schema and the table
* Constructor for defining a version entry. Both the schema and the table
* are empty strings, which means this is the row for the 'database'.
* are empty strings, which means this is the row for the 'database'.
*
*
* @param version the database version
* @param version the database version
*/
*/
public
DbVersion
(
int
version
)
{
public
DbVersion
(
int
version
)
{
...
...
h2/src/tools/org/h2/jaqu/ModelUtils.java
浏览文件 @
fda7e2d5
...
@@ -26,7 +26,7 @@ public class ModelUtils {
...
@@ -26,7 +26,7 @@ public class ModelUtils {
* The list of supported data types. It is used by the runtime mapping for
* The list of supported data types. It is used by the runtime mapping for
* CREATE statements.
* CREATE statements.
*/
*/
private
static
final
Map
<
Class
<?>,
String
>
SUPPORTED_TYPES
=
private
static
final
Map
<
Class
<?>,
String
>
SUPPORTED_TYPES
=
new
HashMap
<
Class
<?>,
String
>();
new
HashMap
<
Class
<?>,
String
>();
static
{
static
{
...
@@ -51,7 +51,7 @@ public class ModelUtils {
...
@@ -51,7 +51,7 @@ public class ModelUtils {
* Convert SQL type aliases to the list of supported types.
* Convert SQL type aliases to the list of supported types.
* This map is used by generation and validation.
* This map is used by generation and validation.
*/
*/
private
static
final
Map
<
String
,
String
>
SQL_TYPES
=
private
static
final
Map
<
String
,
String
>
SQL_TYPES
=
new
HashMap
<
String
,
String
>();
new
HashMap
<
String
,
String
>();
static
{
static
{
...
...
h2/src/tools/org/h2/jaqu/Query.java
浏览文件 @
fda7e2d5
...
@@ -23,7 +23,7 @@ import org.h2.util.New;
...
@@ -23,7 +23,7 @@ import org.h2.util.New;
/**
/**
* This class represents a query.
* This class represents a query.
*
*
* @param <T> the return type
* @param <T> the return type
*/
*/
public
class
Query
<
T
>
{
public
class
Query
<
T
>
{
...
@@ -285,7 +285,7 @@ public class Query<T> {
...
@@ -285,7 +285,7 @@ public class Query<T> {
/**
/**
* Sets the Limit and Offset of a query.
* Sets the Limit and Offset of a query.
*
*
* @return the query
* @return the query
*/
*/
public
Query
<
T
>
limit
(
long
limit
)
{
public
Query
<
T
>
limit
(
long
limit
)
{
...
@@ -300,7 +300,7 @@ public class Query<T> {
...
@@ -300,7 +300,7 @@ public class Query<T> {
/**
/**
* Order by a number of columns.
* Order by a number of columns.
*
*
* @param expressions the columns
* @param expressions the columns
* @return the query
* @return the query
*/
*/
...
@@ -327,7 +327,7 @@ public class Query<T> {
...
@@ -327,7 +327,7 @@ public class Query<T> {
/**
/**
* INTERNAL
* INTERNAL
*
*
* @param stat the statement
* @param stat the statement
* @param x the alias object
* @param x the alias object
*/
*/
...
@@ -409,7 +409,7 @@ public class Query<T> {
...
@@ -409,7 +409,7 @@ public class Query<T> {
/**
/**
* Join another table.
* Join another table.
*
*
* @param alias an alias for the table to join
* @param alias an alias for the table to join
* @return the joined query
* @return the joined query
*/
*/
...
...
h2/src/tools/org/h2/jaqu/SQLDialect.java
浏览文件 @
fda7e2d5
...
@@ -18,7 +18,7 @@ public interface SQLDialect {
...
@@ -18,7 +18,7 @@ public interface SQLDialect {
/**
/**
* Get the SQL snippet for the table name.
* Get the SQL snippet for the table name.
*
*
* @param schema the schema name, or null for no schema
* @param schema the schema name, or null for no schema
* @param table the table name
* @param table the table name
* @return the SQL snippet
* @return the SQL snippet
...
@@ -27,7 +27,7 @@ public interface SQLDialect {
...
@@ -27,7 +27,7 @@ public interface SQLDialect {
/**
/**
* Get the CREATE INDEX statement.
* Get the CREATE INDEX statement.
*
*
* @param schema the schema name
* @param schema the schema name
* @param table the table name
* @param table the table name
* @param index the index definition
* @param index the index definition
...
@@ -37,7 +37,7 @@ public interface SQLDialect {
...
@@ -37,7 +37,7 @@ public interface SQLDialect {
/**
/**
* Append "LIMIT limit" to the SQL statement.
* Append "LIMIT limit" to the SQL statement.
*
*
* @param stat the statement
* @param stat the statement
* @param limit the limit
* @param limit the limit
*/
*/
...
@@ -45,7 +45,7 @@ public interface SQLDialect {
...
@@ -45,7 +45,7 @@ public interface SQLDialect {
/**
/**
* Append "OFFSET offset" to the SQL statement.
* Append "OFFSET offset" to the SQL statement.
*
*
* @param stat the statement
* @param stat the statement
* @param offset the offset
* @param offset the offset
*/
*/
...
@@ -53,7 +53,7 @@ public interface SQLDialect {
...
@@ -53,7 +53,7 @@ public interface SQLDialect {
/**
/**
* Whether memory tables are supported.
* Whether memory tables are supported.
*
*
* @return true if they are
* @return true if they are
*/
*/
boolean
supportsMemoryTables
();
boolean
supportsMemoryTables
();
...
...
h2/src/tools/org/h2/jaqu/SelectTable.java
浏览文件 @
fda7e2d5
...
@@ -12,7 +12,7 @@ import org.h2.util.New;
...
@@ -12,7 +12,7 @@ import org.h2.util.New;
/**
/**
* This class represents a table in a query.
* This class represents a table in a query.
*
*
* @param <T> the table class
* @param <T> the table class
*/
*/
class
SelectTable
<
T
>
{
class
SelectTable
<
T
>
{
...
...
h2/src/tools/org/h2/jaqu/TableInspector.java
浏览文件 @
fda7e2d5
...
@@ -62,7 +62,7 @@ public class TableInspector {
...
@@ -62,7 +62,7 @@ public class TableInspector {
/**
/**
* Tests to see if this TableInspector represents schema.table.
* Tests to see if this TableInspector represents schema.table.
* <p>
* <p>
*
*
* @param schema the schema name
* @param schema the schema name
* @param table the table name
* @param table the table name
* @return true if the table matches
* @return true if the table matches
...
@@ -84,7 +84,7 @@ public class TableInspector {
...
@@ -84,7 +84,7 @@ public class TableInspector {
/**
/**
* Reads the DatabaseMetaData for the details of this table including
* Reads the DatabaseMetaData for the details of this table including
* primary keys and indexes.
* primary keys and indexes.
*
*
* @param metaData the database meta data
* @param metaData the database meta data
*/
*/
void
read
(
DatabaseMetaData
metaData
)
throws
SQLException
{
void
read
(
DatabaseMetaData
metaData
)
throws
SQLException
{
...
@@ -154,7 +154,7 @@ public class TableInspector {
...
@@ -154,7 +154,7 @@ public class TableInspector {
* the model between databases), and if to automatically trim strings for
* the model between databases), and if to automatically trim strings for
* those that have a maximum length.
* those that have a maximum length.
* <p>
* <p>
*
*
* @return a complete model (class definition) for this table as a string
* @return a complete model (class definition) for this table as a string
*/
*/
String
generateModel
(
String
packageName
,
boolean
annotateSchema
,
String
generateModel
(
String
packageName
,
boolean
annotateSchema
,
...
@@ -369,7 +369,7 @@ public class TableInspector {
...
@@ -369,7 +369,7 @@ public class TableInspector {
* returned as a list of validation remarks which includes recommendations,
* returned as a list of validation remarks which includes recommendations,
* warnings, and errors about the model. The caller may choose to have
* warnings, and errors about the model. The caller may choose to have
* validate throw an exception on any validation ERROR.
* validate throw an exception on any validation ERROR.
*
*
* @param <T> the table type
* @param <T> the table type
* @param def the table definition
* @param def the table definition
* @param throwError whether or not to throw an exception if an error was
* @param throwError whether or not to throw an exception if an error was
...
...
h2/src/tools/org/h2/jaqu/util/GenerateModels.java
浏览文件 @
fda7e2d5
...
@@ -93,7 +93,7 @@ public class GenerateModels {
...
@@ -93,7 +93,7 @@ public class GenerateModels {
/**
/**
* Generates models from the database.
* Generates models from the database.
*
*
* @param url the database URL
* @param url the database URL
* @param user the user name
* @param user the user name
* @param password the password
* @param password the password
...
@@ -149,7 +149,7 @@ public class GenerateModels {
...
@@ -149,7 +149,7 @@ public class GenerateModels {
/**
/**
* Throw a SQLException saying this command line option is not supported.
* Throw a SQLException saying this command line option is not supported.
*
*
* @param option the unsupported option
* @param option the unsupported option
* @return this method never returns normally
* @return this method never returns normally
*/
*/
...
...
h2/src/tools/org/h2/java/ClassObj.java
浏览文件 @
fda7e2d5
...
@@ -58,19 +58,19 @@ public class ClassObj {
...
@@ -58,19 +58,19 @@ public class ClassObj {
/**
/**
* The per-instance fields.
* The per-instance fields.
*/
*/
LinkedHashMap
<
String
,
FieldObj
>
instanceFields
=
LinkedHashMap
<
String
,
FieldObj
>
instanceFields
=
new
LinkedHashMap
<
String
,
FieldObj
>();
new
LinkedHashMap
<
String
,
FieldObj
>();
/**
/**
* The static fields of this class.
* The static fields of this class.
*/
*/
LinkedHashMap
<
String
,
FieldObj
>
staticFields
=
LinkedHashMap
<
String
,
FieldObj
>
staticFields
=
new
LinkedHashMap
<
String
,
FieldObj
>();
new
LinkedHashMap
<
String
,
FieldObj
>();
/**
/**
* The methods.
* The methods.
*/
*/
LinkedHashMap
<
String
,
ArrayList
<
MethodObj
>>
methods
=
LinkedHashMap
<
String
,
ArrayList
<
MethodObj
>>
methods
=
new
LinkedHashMap
<
String
,
ArrayList
<
MethodObj
>>();
new
LinkedHashMap
<
String
,
ArrayList
<
MethodObj
>>();
/**
/**
...
@@ -246,7 +246,7 @@ class MethodObj {
...
@@ -246,7 +246,7 @@ class MethodObj {
/**
/**
* The parameter list.
* The parameter list.
*/
*/
LinkedHashMap
<
String
,
FieldObj
>
parameters
=
LinkedHashMap
<
String
,
FieldObj
>
parameters
=
new
LinkedHashMap
<
String
,
FieldObj
>();
new
LinkedHashMap
<
String
,
FieldObj
>();
/**
/**
...
...
h2/src/tools/org/h2/java/JavaParser.java
浏览文件 @
fda7e2d5
...
@@ -59,7 +59,7 @@ public class JavaParser {
...
@@ -59,7 +59,7 @@ public class JavaParser {
private
FieldObj
thisPointer
;
private
FieldObj
thisPointer
;
private
final
HashMap
<
String
,
String
>
importMap
=
New
.
hashMap
();
private
final
HashMap
<
String
,
String
>
importMap
=
New
.
hashMap
();
private
final
HashMap
<
String
,
ClassObj
>
classes
=
New
.
hashMap
();
private
final
HashMap
<
String
,
ClassObj
>
classes
=
New
.
hashMap
();
private
final
LinkedHashMap
<
String
,
FieldObj
>
localVars
=
private
final
LinkedHashMap
<
String
,
FieldObj
>
localVars
=
new
LinkedHashMap
<
String
,
FieldObj
>();
new
LinkedHashMap
<
String
,
FieldObj
>();
private
final
HashMap
<
String
,
MethodObj
>
allMethodsMap
=
New
.
hashMap
();
private
final
HashMap
<
String
,
MethodObj
>
allMethodsMap
=
New
.
hashMap
();
private
final
ArrayList
<
Statement
>
nativeHeaders
=
New
.
arrayList
();
private
final
ArrayList
<
Statement
>
nativeHeaders
=
New
.
arrayList
();
...
@@ -109,7 +109,7 @@ public class JavaParser {
...
@@ -109,7 +109,7 @@ public class JavaParser {
/**
/**
* Get the wrapper class for the given primitive class.
* Get the wrapper class for the given primitive class.
*
*
* @param c the class
* @param c the class
* @return the wrapper class
* @return the wrapper class
*/
*/
...
@@ -156,7 +156,7 @@ public class JavaParser {
...
@@ -156,7 +156,7 @@ public class JavaParser {
/**
/**
* Parse the source code.
* Parse the source code.
*
*
* @param baseDir the base directory
* @param baseDir the base directory
* @param className the fully qualified name of the class to parse
* @param className the fully qualified name of the class to parse
*/
*/
...
@@ -268,7 +268,7 @@ public class JavaParser {
...
@@ -268,7 +268,7 @@ public class JavaParser {
/**
/**
* Get the class for a built-in type.
* Get the class for a built-in type.
*
*
* @param type the type
* @param type the type
* @return the class or null if not found
* @return the class or null if not found
*/
*/
...
@@ -1240,7 +1240,7 @@ public class JavaParser {
...
@@ -1240,7 +1240,7 @@ public class JavaParser {
/**
/**
* Replace all Unicode escapes.
* Replace all Unicode escapes.
*
*
* @param s the text
* @param s the text
* @return the cleaned text
* @return the cleaned text
*/
*/
...
@@ -1270,7 +1270,7 @@ public class JavaParser {
...
@@ -1270,7 +1270,7 @@ public class JavaParser {
/**
/**
* Replace all Unicode escapes and remove all remarks.
* Replace all Unicode escapes and remove all remarks.
*
*
* @param s the source code
* @param s the source code
* @return the cleaned source code
* @return the cleaned source code
*/
*/
...
@@ -1475,7 +1475,7 @@ public class JavaParser {
...
@@ -1475,7 +1475,7 @@ public class JavaParser {
/**
/**
* Parse a number literal and returns it.
* Parse a number literal and returns it.
*
*
* @param s the source code
* @param s the source code
* @return the number
* @return the number
*/
*/
...
@@ -1594,7 +1594,7 @@ public class JavaParser {
...
@@ -1594,7 +1594,7 @@ public class JavaParser {
/**
/**
* Write the C++ header.
* Write the C++ header.
*
*
* @param out the output writer
* @param out the output writer
*/
*/
void
writeHeader
(
PrintWriter
out
)
{
void
writeHeader
(
PrintWriter
out
)
{
...
@@ -1705,7 +1705,7 @@ public class JavaParser {
...
@@ -1705,7 +1705,7 @@ public class JavaParser {
/**
/**
* Write the C++ source code.
* Write the C++ source code.
*
*
* @param out the output writer
* @param out the output writer
*/
*/
void
writeSource
(
PrintWriter
out
)
{
void
writeSource
(
PrintWriter
out
)
{
...
@@ -1789,7 +1789,7 @@ public class JavaParser {
...
@@ -1789,7 +1789,7 @@ public class JavaParser {
/**
/**
* Move the source code 4 levels to the right.
* Move the source code 4 levels to the right.
*
*
* @param o the source code
* @param o the source code
* @return the indented code
* @return the indented code
*/
*/
...
@@ -1799,7 +1799,7 @@ public class JavaParser {
...
@@ -1799,7 +1799,7 @@ public class JavaParser {
/**
/**
* Get the C++ representation of this identifier.
* Get the C++ representation of this identifier.
*
*
* @param identifier the identifier
* @param identifier the identifier
* @return the C representation
* @return the C representation
*/
*/
...
@@ -1813,7 +1813,7 @@ public class JavaParser {
...
@@ -1813,7 +1813,7 @@ public class JavaParser {
/**
/**
* Get the class of the given name.
* Get the class of the given name.
*
*
* @param className the name
* @param className the name
* @return the class
* @return the class
*/
*/
...
...
h2/src/tools/org/h2/java/Statement.java
浏览文件 @
fda7e2d5
...
@@ -157,7 +157,7 @@ class SwitchStatement extends StatementBase {
...
@@ -157,7 +157,7 @@ class SwitchStatement extends StatementBase {
private
StatementBlock
defaultBlock
;
private
StatementBlock
defaultBlock
;
private
final
ArrayList
<
Expr
>
cases
=
new
ArrayList
<
Expr
>();
private
final
ArrayList
<
Expr
>
cases
=
new
ArrayList
<
Expr
>();
private
final
ArrayList
<
StatementBlock
>
blocks
=
private
final
ArrayList
<
StatementBlock
>
blocks
=
new
ArrayList
<
StatementBlock
>();
new
ArrayList
<
StatementBlock
>();
private
final
Expr
expr
;
private
final
Expr
expr
;
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论