Title: [817] trunk/jopenssl: - Upgrade BC to jdk15 versions
- Revision
- 817
- Author
- nicksieger
- Date
- 2007-11-29 11:24:51 -0500 (Thu, 29 Nov 2007)
Log Message
- Upgrade BC to jdk15 versions
- reconfigure build, discarding 1.4 source compatibility
- Bump version to 0.0.5
Modified Paths
Added Paths
Removed Paths
Diff
Modified: trunk/jopenssl/build.properties.SAMPLE (816 => 817)
--- trunk/jopenssl/build.properties.SAMPLE 2007-11-29 16:04:20 UTC (rev 816)
+++ trunk/jopenssl/build.properties.SAMPLE 2007-11-29 16:24:51 UTC (rev 817)
@@ -1,6 +1,5 @@
-# set these to 1.5 to compile for 1.5
-version.target=1.4
-version.source=1.4
+version.target=1.5
+version.source=1.5
# set this to an alternate location to compile against a different jruby.jar
jruby.jar=lib/jruby.jar
Modified: trunk/jopenssl/build.xml (816 => 817)
--- trunk/jopenssl/build.xml 2007-11-29 16:04:20 UTC (rev 816)
+++ trunk/jopenssl/build.xml 2007-11-29 16:24:51 UTC (rev 817)
@@ -9,6 +9,8 @@
<property name="target.classes.test" value="${target}/test-classes"/>
<property name="lib.dir" value="lib"/>
<property name="jruby.jar" value="${lib.dir}/jruby.jar"/>
+ <property name="version.source" value="1.5"/>
+ <property name="version.target" value="1.5"/>
<path id="build.classpath">
<fileset dir="${lib.dir}" includes="*.jar" excludes="jopenssl.jar,jruby.jar"/>
Modified: trunk/jopenssl/jruby-openssl.gemspec (816 => 817)
--- trunk/jopenssl/jruby-openssl.gemspec 2007-11-29 16:04:20 UTC (rev 816)
+++ trunk/jopenssl/jruby-openssl.gemspec 2007-11-29 16:24:51 UTC (rev 817)
@@ -2,7 +2,7 @@
spec = Gem::Specification.new do |s|
s.name = "jruby-openssl"
- s.version = "0.0.4"
+ s.version = "0.0.5"
s.author = "Ola Bini"
s.email = "[EMAIL PROTECTED]"
s.homepage = "http://jruby-extras.rubyforge.org/"
Deleted: trunk/jopenssl/lib/bcmail-jdk14-135.jar
(Binary files differ)
Added: trunk/jopenssl/lib/bcmail-jdk15-137.jar
(Binary files differ)
Deleted: trunk/jopenssl/lib/bcprov-jdk14-135.jar
(Binary files differ)
Added: trunk/jopenssl/lib/bcprov-jdk15-137.jar
(Binary files differ)
Modified: trunk/jopenssl/src/java/org/jruby/ext/openssl/SSLContext.java (816 => 817)
--- trunk/jopenssl/src/java/org/jruby/ext/openssl/SSLContext.java 2007-11-29 16:04:20 UTC (rev 816)
+++ trunk/jopenssl/src/java/org/jruby/ext/openssl/SSLContext.java 2007-11-29 16:24:51 UTC (rev 817)
@@ -161,11 +161,11 @@
}
}
- public KM getKM() {
+ KM getKM() {
return new KM(this);
}
- public TM getTM() {
+ TM getTM() {
return new TM(this);
}
@@ -176,7 +176,8 @@
this.ctt = ctt;
}
- public String chooseEngineClientAlias(String[] keyType, java.security.Principal[] issuers, javax.net.ssl.SSLEngine engine) {
+ @Override
+ public String chooseEngineClientAlias(String[] keyType, java.security.Principal[] issuers, javax.net.ssl.SSLEngine engine) {
PKey k = null;
if(!ctt.callMethod(ctt.getRuntime().getCurrentContext(),"key").isNil()) {
k = (PKey)ctt.callMethod(ctt.getRuntime().getCurrentContext(),"key");
@@ -193,7 +194,9 @@
}
return null;
}
- public String chooseEngineServerAlias(String keyType, java.security.Principal[] issuers, javax.net.ssl.SSLEngine engine) {
+
+ @Override
+ public String chooseEngineServerAlias(String keyType, java.security.Principal[] issuers, javax.net.ssl.SSLEngine engine) {
PKey k = null;
if(!ctt.callMethod(ctt.getRuntime().getCurrentContext(),"key").isNil()) {
k = (PKey)ctt.callMethod(ctt.getRuntime().getCurrentContext(),"key");
_______________________________________________
Jruby-extras-devel mailing list
[email protected]
http://rubyforge.org/mailman/listinfo/jruby-extras-devel
