Upgraded Spongy Castle to 1.53, fixed tests. #146

This commit is contained in:
akwizgran
2015-12-03 11:12:16 +00:00
parent 427efdc7d6
commit 8ae3fb3e35
14 changed files with 22 additions and 48 deletions

View File

@@ -7,6 +7,6 @@
<classpathentry kind="lib" path="libs/h2small-1.4.190.jar"/>
<classpathentry kind="lib" path="libs/weupnp-0.1.3-SNAPSHOT-briar.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="lib" path="libs/lcrypto-jdk15on-152.jar" sourcepath="libs/source/lcrypto-jdk15on-152-src.jar"/>
<classpathentry kind="lib" path="libs/spongy-core-1.53.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

View File

@@ -13,7 +13,7 @@
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes/main" />
<output-test url="file://$MODULE_DIR$/build/classes/test" />
<exclude-output />
@@ -29,8 +29,9 @@
<orderEntry type="module" module-name="briar-api" exported="" />
<orderEntry type="library" exported="" name="guice-3.0-no_aop" level="project" />
<orderEntry type="library" exported="" name="javax.inject" level="project" />
<orderEntry type="library" exported="" name="h2small-1.4.190.jar" level="project" />
<orderEntry type="library" exported="" name="lcrypto-jdk15on-152" level="project" />
<orderEntry type="library" exported="" name="_home_someone_workspace_briar_briar_core_libs_h2small_1_3_170_jar" level="project" />
<orderEntry type="library" exported="" name="_home_someone_workspace_briar_briar_core_libs_lcrypto_jdk15on_152_jar" level="project" />
<orderEntry type="library" exported="" name="weupnp-0.1.3-SNAPSHOT-briar" level="project" />
<orderEntry type="library" exported="" name="briar-core.briar-core" level="project" />
</component>
</module>

Binary file not shown.

View File

@@ -33,7 +33,7 @@ class H2Database extends JdbcDatabase {
super(HASH_TYPE, BINARY_TYPE, COUNTER_TYPE, SECRET_TYPE, clock);
this.config = config;
this.fileUtils = fileUtils;
String path = new File(config.getDatabaseDirectory(), "db").getPath();
String path = new File(config.getDatabaseDirectory(), "db").getAbsolutePath();
// FIXME: Remove WRITE_DELAY=0 after implementing BTPv2?
url = "jdbc:h2:split:" + path + ";CIPHER=AES;MULTI_THREADED=1"
+ ";WRITE_DELAY=0;DB_CLOSE_ON_EXIT=false";