[project @ fpeters@0d.be-20080310093300-2iv41ihnuify54po]

merging benjamin branch

Original author: Frederic Peters <fpeters@0d.be>
Date: 2008-03-10 10:33:00.592000+01:00

3 files changed, 26 insertions, 25 deletions

diff --git a/bindings/java/LassoException_top.java b/bindings/java/LassoException_top.java
index 8e08f43c..012b91f8 100644
--- a/bindings/java/LassoException_top.java
+++ b/bindings/java/LassoException_top.java
@@ -1,6 +1,7 @@
 package com.entrouvert.lasso;
 
 public class LassoException extends RuntimeException {
+    private static final long serialVersionUID = 6170037639785281128L;
     public int errorCode;
     private static boolean throws_for_recoverable_errors = true;
     /** If set to true, enables throwing of exception for
@@ -18,13 +19,12 @@ public class LassoException extends RuntimeException {
 
     protected LassoException(int errorCode) {
         super(LassoJNI.strError(errorCode));
-        errorCode = errorCode;
+        this.errorCode = errorCode;
     }
     protected LassoException(int errorCode, String message) {
         super(message);
-        errorCode = errorCode;
+        this.errorCode = errorCode;
     }
-    private static final Class[] paramst = { Integer.class };
     protected static int throwError(int errorCode) throws LassoException {
             if (errorCode == 0 || (! throws_for_recoverable_errors && errorCode > 0))
                 return errorCode;
diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
index be5990a4..d3a91e38 100644
--- a/bindings/java/Makefile.am
+++ b/bindings/java/Makefile.am
@@ -3,9 +3,8 @@ INCLUDES = -I$(top_srcdir) \
 	-I$(top_builddir) \
 	$(SASL_CFLAGS)
 
-AM_JAVACFLAGS=-C
-CLASSPATH_ENV= CLASSPATH=.:lasso.jar:/usr/share/java/junit.jar
-JAVAROOT=.
+# CLASSPATH_ENV= CLASSPATH=.:lasso.jar:/usr/share/java/junit.jar
+CLASSPATH=.:tests
 
 java_extension_LTLIBRARIES = libjnilasso.la
 java_extensiondir = ${libdir}/java
@@ -16,10 +15,8 @@ lasso_jardir=$(prefix)/share/java
 lasso_jar_DATA=lasso.jar
 lasso_jar_class_files = $(java_lasso_source_files:.java=.class)
 
-JAVAH=gcjh
-
-$(lasso_jar_class_files): %.class: %.java
-	$(JAVAC) -ftarget=1.4 -C -classpath . -d . $<
+%.class: %.java
+	$(JAVAC) $(CLASSPATH_OPT) $(CLASSPATH) $(JAVAC_FLAGS) $<
 
 all_jar_class_files = $(shell find com/entrouvert/lasso -name '*.class' | sed 's%\$$%\\$$%g')
 
@@ -35,8 +32,8 @@ doc:
 	mv .doc doc
 
 
-com_entrouvert_lasso_LassoJNI.h: $(lasso_jar_class_files)
-	$(JAVAH) -jni -d . --classpath=. com.entrouvert.lasso.LassoJNI
+com_entrouvert_lasso_LassoJNI.h: com/entrouvert/lasso/LassoJNI.class
+	$(JAVAH) $(JAVAH_FLAGS) -classpath . `echo $< | sed 'su/u.ug;su.classuu'`
 
 libjnilasso_la_CFLAGS = -fno-strict-aliasing $(LASSO_CORE_CFLAGS) -I$(top_srcdir) -I$(top_builddir)
 libjnilasso_la_LDFLAGS = -export-dynamic -prefer-pic -module -avoid-version
@@ -61,8 +58,12 @@ clean-local:
 	-rm -rf doc 
 	-rm tests/*.class
 
+check tests/BindingTests.class tests/LoginTest.class : CLASSPATH :=$(CLASSPATH):/usr/share/java/junit.jar
+
+check: tests/BindingTests.class tests/LoginTest.class
+	LD_LIBRARY_PATH=.libs $(JAVA) -cp $(CLASSPATH):/usr/share/java/junit.jar BindingTests
+	LD_LIBRARY_PATH=.libs $(JAVA) -cp $(CLASSPATH):/usr/share/java/junit.jar LoginTest
 
-check_JAVA = tests/BindingTests.java tests/LoginTest.java
 
 endif
 
diff --git a/bindings/java/tests/LoginTest.java b/bindings/java/tests/LoginTest.java
index 5f9286a4..293ad133 100644
--- a/bindings/java/tests/LoginTest.java
+++ b/bindings/java/tests/LoginTest.java
@@ -42,30 +42,30 @@ import com.entrouvert.lasso.*;
 public class LoginTest extends TestCase {
     public String generateIdentityProviderDump() {
         Server server = new Server(
-            "../../../tests/data/idp1-la/metadata.xml",
-            "../../../tests/data/idp1-la/private-key-raw.pem",
+            "../../tests/data/idp1-la/metadata.xml",
+            "../../tests/data/idp1-la/private-key-raw.pem",
             null,
-            "../../../tests/data/idp1-la/certificate.pem");
+            "../../tests/data/idp1-la/certificate.pem");
         server.addProvider(
             LassoConstants.PROVIDER_ROLE_SP,
-            "../../../tests/data/sp1-la/metadata.xml",
-            "../../../tests/data/sp1-la/public-key.pem",
-            "../../../tests/data/ca1-la/certificate.pem");
+            "../../tests/data/sp1-la/metadata.xml",
+            "../../tests/data/sp1-la/public-key.pem",
+            "../../tests/data/ca1-la/certificate.pem");
         String serverDump = server.dump();
         return serverDump;
     }
 
     public String generateServiceProviderDump() {
         Server server = new Server(
-            "../../../tests/data/sp1-la/metadata.xml",
-            "../../../tests/data/sp1-la/private-key-raw.pem",
+            "../../tests/data/sp1-la/metadata.xml",
+            "../../tests/data/sp1-la/private-key-raw.pem",
             null,
-            "../../../tests/data/sp1-la/certificate.pem");
+            "../../tests/data/sp1-la/certificate.pem");
         server.addProvider(
             LassoConstants.PROVIDER_ROLE_IDP,
-            "../../../tests/data/idp1-la/metadata.xml",
-            "../../../tests/data/idp1-la/public-key.pem",
-            "../../../tests/data/ca1-la/certificate.pem");
+            "../../tests/data/idp1-la/metadata.xml",
+            "../../tests/data/idp1-la/public-key.pem",
+            "../../tests/data/ca1-la/certificate.pem");
         String serverDump = server.dump();
         return serverDump;
     }