Skip to content

H
h2database
提交 a49fa5aa authored 作者: Thomas Mueller's avatar Thomas Mueller
浏览文件
操作

--no commit message 

--no commit message
上级 7f003899
隐藏空白字符变更
内嵌 并排
正在显示 包含 3370 行增加 和 2774 行删除
h2/ant-build.properties
浏览文件 @ a49fa5aa
#Tue Dec 25 18:57:49 CET 2007 #Thu Jan 10 23:24:36 CET 2008
javac=javac javac=javac
benchmark.drivers.dir=C\:/data/java benchmark.drivers.dir=C\:/data/java
path.servlet.jar=C\:/data/classpath/servlet-api.jar path.servlet.jar=C\:/data/classpath/servlet-api.jar
......
h2/build.xml
浏览文件 @ a49fa5aa
...@@ -24,15 +24,15 @@ ...@@ -24,15 +24,15 @@
</target> </target>
<target name="benchmark" depends="compile"> <target name="benchmark" depends="compile">
<java fork="true" classname="org.h2.test.bench.TestPerformance" classpathref="benchmark.drivers.path" dir="." maxmemory="128m"><arg line="-init -db 1"/></java> <java fork="true" classname="org.h2.test.bench.TestPerformance" classpathref="benchmark.drivers.path" maxmemory="128m"><arg line="-init -db 1"/></java>
<java fork="true" classname="org.h2.test.bench.TestPerformance" classpathref="benchmark.drivers.path" dir="." maxmemory="128m"><arg line="-db 2"/></java> <java fork="true" classname="org.h2.test.bench.TestPerformance" classpathref="benchmark.drivers.path" maxmemory="128m"><arg line="-db 2"/></java>
<java fork="true" classname="org.h2.test.bench.TestPerformance" classpathref="benchmark.drivers.path" dir="." maxmemory="128m"><arg line="-db 3 -out pe.html"/></java> <java fork="true" classname="org.h2.test.bench.TestPerformance" classpathref="benchmark.drivers.path" maxmemory="128m"><arg line="-db 3 -out pe.html"/></java>
<java fork="true" classname="org.h2.test.bench.TestPerformance" classpathref="benchmark.drivers.path" dir="." maxmemory="128m"><arg line="-init -db 4"/></java> <java fork="true" classname="org.h2.test.bench.TestPerformance" classpathref="benchmark.drivers.path" maxmemory="128m"><arg line="-init -db 4"/></java>
<java fork="true" classname="org.h2.test.bench.TestPerformance" classpathref="benchmark.drivers.path" dir="." maxmemory="128m"><arg line="-db 5"/></java> <java fork="true" classname="org.h2.test.bench.TestPerformance" classpathref="benchmark.drivers.path" maxmemory="128m"><arg line="-db 5"/></java>
<java fork="true" classname="org.h2.test.bench.TestPerformance" classpathref="benchmark.drivers.path" dir="." maxmemory="128m"><arg line="-db 6"/></java> <java fork="true" classname="org.h2.test.bench.TestPerformance" classpathref="benchmark.drivers.path" maxmemory="128m"><arg line="-db 6"/></java>
<java fork="true" classname="org.h2.test.bench.TestPerformance" classpathref="benchmark.drivers.path" dir="." maxmemory="128m"><arg line="-db 7"/></java> <java fork="true" classname="org.h2.test.bench.TestPerformance" classpathref="benchmark.drivers.path" maxmemory="128m"><arg line="-db 7"/></java>
<java fork="true" classname="org.h2.test.bench.TestPerformance" classpathref="benchmark.drivers.path" dir="." maxmemory="128m"><arg line="-db 8"/></java> <java fork="true" classname="org.h2.test.bench.TestPerformance" classpathref="benchmark.drivers.path" maxmemory="128m"><arg line="-db 8"/></java>
<java fork="true" classname="org.h2.test.bench.TestPerformance" classpathref="benchmark.drivers.path" dir="." maxmemory="128m"><arg line="-db 9 -out ps.html"/></java> <java fork="true" classname="org.h2.test.bench.TestPerformance" classpathref="benchmark.drivers.path" maxmemory="128m"><arg line="-db 9 -out ps.html"/></java>
</target> </target>
<target name="clean" depends="init"> <target name="clean" depends="init">
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
<fileset dir="bin" includes="**/*" excludes="**/*.bat,**/*.sh"/> <fileset dir="bin" includes="**/*" excludes="**/*.bat,**/*.sh"/>
<fileset dir="docs" includes="**/*"/> <fileset dir="docs" includes="**/*"/>
</delete> </delete>
<delete file="src/tools/org/h2/tools/code/CodeSwitch.class"/>
</target> </target>
<target name="codeswitchPrepare" depends="clean"> <target name="codeswitchPrepare" depends="clean">
...@@ -54,8 +53,8 @@ ...@@ -54,8 +53,8 @@
<propertyfile file="ant-build.properties"> <propertyfile file="ant-build.properties">
<entry key="jdk" value="1.3" /> <entry key="jdk" value="1.3" />
</propertyfile> </propertyfile>
<java classname="org.h2.tools.code.CodeSwitch" fork="true" dir="bin"> <java classname="org.h2.tools.code.CodeSwitch" classpath="bin">
<arg line="+JDK13 -JDK14 -JDK16 -AWT ../src/main/org/h2"/> <arg line="+JDK13 -JDK14 -JDK16 -AWT src/main/org/h2"/>
</java> </java>
</target> </target>
...@@ -63,8 +62,8 @@ ...@@ -63,8 +62,8 @@
<propertyfile file="ant-build.properties"> <propertyfile file="ant-build.properties">
<entry key="jdk" value="1.3" /> <entry key="jdk" value="1.3" />
</propertyfile> </propertyfile>
<java classname="org.h2.tools.code.CodeSwitch" fork="true" dir="bin"> <java classname="org.h2.tools.code.CodeSwitch" classpath="bin">
<arg line="+JDK13 -JDK14 -JDK16 +AWT ../src/main/org/h2"/> <arg line="+JDK13 -JDK14 -JDK16 +AWT src/main/org/h2"/>
</java> </java>
</target> </target>
...@@ -72,8 +71,8 @@ ...@@ -72,8 +71,8 @@
<propertyfile file="ant-build.properties"> <propertyfile file="ant-build.properties">
<entry key="jdk" value="1.4" /> <entry key="jdk" value="1.4" />
</propertyfile> </propertyfile>
<java classname="org.h2.tools.code.CodeSwitch" fork="true" dir="bin"> <java classname="org.h2.tools.code.CodeSwitch" classpath="bin">
<arg line="-JDK13 +JDK14 -JDK16 +AWT ../src/main/org/h2"/> <arg line="-JDK13 +JDK14 -JDK16 +AWT src/main/org/h2"/>
</java> </java>
</target> </target>
...@@ -81,14 +80,14 @@ ...@@ -81,14 +80,14 @@
<propertyfile file="ant-build.properties"> <propertyfile file="ant-build.properties">
<entry key="jdk" value="1.6" /> <entry key="jdk" value="1.6" />
</propertyfile> </propertyfile>
<java classname="org.h2.tools.code.CodeSwitch" fork="true" dir="bin"> <java classname="org.h2.tools.code.CodeSwitch" classpath="bin">
<arg line="-JDK13 +JDK14 +JDK16 +AWT ../src/main/org/h2"/> <arg line="-JDK13 +JDK14 +JDK16 +AWT src/main/org/h2"/>
</java> </java>
</target> </target>
<target name="compileResources" depends="clean, compileTest"> <target name="compileResources" depends="clean, compileTest">
<javac target="${jdk}" source="${jdk}" executable="${javac}" srcdir="src/main" destdir="bin" debug="true" includes="org/h2/util/Resources.java"/> <javac target="${jdk}" source="${jdk}" executable="${javac}" srcdir="src/main" destdir="bin" debug="true" includes="org/h2/util/Resources.java"/>
<java fork="true" classname="org.h2.util.Resources" classpath="bin" dir="."/> <java classname="org.h2.util.Resources" classpath="bin"/>
<delete> <delete>
<fileset dir="bin" includes="org/h2/util/ResourceData.class"/> <fileset dir="bin" includes="org/h2/util/ResourceData.class"/>
</delete> </delete>
...@@ -124,13 +123,14 @@ ...@@ -124,13 +123,14 @@
</target> </target>
<target name="compile" depends="compileResources, compileTest"> <target name="compile" depends="compileResources, compileTest">
<javac target="${jdk}" source="${jdk}" executable="${javac}" srcdir="src/main" destdir="bin" debug="true"> <javac target="${jdk}" source="${jdk}" executable="${javac}" destdir="bin" debug="true">
<src path="src/main"/>
<src path="src/test"/>
<src path="src/tools"/>
<exclude name="org/h2/fulltext/FullTextLucene.java"/> <exclude name="org/h2/fulltext/FullTextLucene.java"/>
<exclude name="org/h2/server/web/WebServlet.java"/> <exclude name="org/h2/server/web/WebServlet.java"/>
<exclude name="org/h2/server/web/DbStarter.java"/> <exclude name="org/h2/server/web/DbStarter.java"/>
</javac> </javac>
<javac target="${jdk}" source="${jdk}" executable="${javac}" srcdir="src/test" destdir="bin" debug="true"/>
<javac target="${jdk}" source="${jdk}" executable="${javac}" srcdir="src/tools" destdir="bin" debug="true"/>
<copy todir="bin" overwrite="true"> <copy todir="bin" overwrite="true">
<fileset dir="src/main" includes="META-INF/**/*"/> <fileset dir="src/main" includes="META-INF/**/*"/>
<fileset dir="src/main" includes="**/*.png"/> <fileset dir="src/main" includes="**/*.png"/>
...@@ -145,15 +145,15 @@ ...@@ -145,15 +145,15 @@
<copy todir="bin" overwrite="true"> <copy todir="bin" overwrite="true">
<fileset dir="src/main"/> <fileset dir="src/main"/>
</copy> </copy>
<java classname="org.h2.test.coverage.Coverage" classpath="bin" dir="bin" fork="true"> <java classname="org.h2.test.coverage.Coverage" classpath="." dir="bin" fork="true">
<arg line="-r org/h2"/> <arg line="-r org/h2"/>
</java> </java>
<javac target="${jdk}" source="${jdk}" executable="${javac}" srcdir="bin" destdir="bin" debug="true" includes="org/h2/**"/> <javac target="${jdk}" source="${jdk}" executable="${javac}" srcdir="bin" destdir="bin" debug="true" includes="org/h2/**"/>
</target> </target>
<target name="compileTest" unless="java.version.ok"> <target name="compileTest" unless="java.version.ok">
<echo message="Java version is ${java.specification.version} but source code is switched to ${jdk}."/> <echo message="WARNING: Java version is ${java.specification.version}, but source code is switched to ${jdk}."/>
<echo message="Run ant codeswitchJdk... first."/> <echo message="WARNING: Run ant codeswitchJdk... first."/>
</target> </target>
<target name="docs" depends="clean,javadoc,compile"> <target name="docs" depends="clean,javadoc,compile">
...@@ -338,18 +338,11 @@ ...@@ -338,18 +338,11 @@
</target> </target>
<target name="testCoverage" depends="compileCoverage"> <target name="testCoverage" depends="compileCoverage">
<java classname="org.h2.test.TestAll" fork="true" classpath="bin" dir="bin"> <java classname="org.h2.test.TestAll" fork="true" classpath="." dir="bin">
<arg line="codeCoverage"/> <arg line="codeCoverage"/>
</java> </java>
</target> </target>
<target name="testProf" depends="compile">
<java classname="org.h2.test.TestAll" fork="true" classpath="bin">
<jvmarg value="-Xrunhprof:cpu=samples,depth=8"/>
<!-- <jvmarg value="-agentlib:hprof=help"/> -->
</java>
</target>
<target name="warConsole" depends="compileServlet, jar"> <target name="warConsole" depends="compileServlet, jar">
<fail unless="servlet.jar.present" message="Servlet API jar not found"/> <fail unless="servlet.jar.present" message="Servlet API jar not found"/>
<war destfile="bin/h2console.war" webxml="src/tools/WEB-INF/web.xml" basedir="src/tools/WEB-INF" includes="console.html"> <war destfile="bin/h2console.war" webxml="src/tools/WEB-INF/web.xml" basedir="src/tools/WEB-INF" includes="console.html">
......
h2/src/docsrc/text/_docs_en.utf8.txt
浏览文件 @ a49fa5aa
This source diff could not be displayed because it is too large. You can view the blob instead.
h2/src/docsrc/text/_docs_ja.utf8.txt
浏览文件 @ a49fa5aa
This source diff could not be displayed because it is too large. You can view the blob instead.
h2/src/docsrc/textbase/_docs_en.properties
浏览文件 @ a49fa5aa
This source diff could not be displayed because it is too large. You can view the blob instead.
h2/src/main/org/h2/constant/SysProperties.java
浏览文件 @ a49fa5aa
...@@ -57,6 +57,10 @@ public class SysProperties { ...@@ -57,6 +57,10 @@ public class SysProperties {
*/ */
public static final String ALLOWED_CLASSES = getStringSetting("h2.allowedClasses", "*"); public static final String ALLOWED_CLASSES = getStringSetting("h2.allowedClasses", "*");
/**
* System property <code>h2.bindAddress</code> (default: *).<br />
* Comma separated list of class names or prefixes.
*/
public static final String BIND_ADDRESS = getStringSetting("h2.bindAddress", null); public static final String BIND_ADDRESS = getStringSetting("h2.bindAddress", null);
public static final int CACHE_SIZE_DEFAULT = getIntSetting("h2.cacheSizeDefault", 16 * 1024); public static final int CACHE_SIZE_DEFAULT = getIntSetting("h2.cacheSizeDefault", 16 * 1024);
public static final int CACHE_SIZE_INDEX_SHIFT = getIntSetting("h2.cacheSizeIndexShift", 3); public static final int CACHE_SIZE_INDEX_SHIFT = getIntSetting("h2.cacheSizeIndexShift", 3);
......
h2/src/test/org/h2/test/TestAll.java
浏览文件 @ a49fa5aa
...@@ -154,13 +154,6 @@ h2CallableStatementBatchTest.zip ...@@ -154,13 +154,6 @@ h2CallableStatementBatchTest.zip
h2-2007-12-27_test.zip h2-2007-12-27_test.zip
History: History:
The H2 Console now calls DataSource.getConnection() instead of DataSource.getConnection(user, password)
when user name and password are not specified.
The bind IP address can now be set when using multi-homed host (if multiple network adapters are available)
using the system property h2.bindAddress.
Batch update: Calling BatchUpdateException.printStackTrace() could result in out of memory. Fixed.
Indexes of unique or foreign constraints where not dropped when the constraint was dropped after
altering the table (for example dropping a column). Fixed.
Roadmap: Roadmap:
Automatically switch source code before compiling Automatically switch source code before compiling
......
h2/src/tools/org/apache/openjpa/jdbc/sql/H2Dictionary.java.txt
浏览文件 @ a49fa5aa
...@@ -45,7 +45,6 @@ public class H2Dictionary extends DBDictionary { ...@@ -45,7 +45,6 @@ public class H2Dictionary extends DBDictionary {
rangePosition = RANGE_POST_LOCK; rangePosition = RANGE_POST_LOCK;
supportsDeferredConstraints = false; supportsDeferredConstraints = false;
useGetObjectForBlobs = true;
blobTypeName = "BLOB"; blobTypeName = "BLOB";
doubleTypeName = "DOUBLE"; doubleTypeName = "DOUBLE";
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论