[project @ fpeters@0d.be-20080309152828-pw4gd3lcm7rb7dxd]

merging benjamin branch


Original author: Frederic Peters <fpeters@0d.be>
Date: 2008-03-09 16:28:28.854000+01:00

4 files changed, 24 insertions, 31 deletions

diff --git a/bindings/java/GObject.java b/bindings/java/GObject.java
index a7815a72..8a1664fa 100644
--- a/bindings/java/GObject.java
+++ b/bindings/java/GObject.java
@@ -5,6 +5,9 @@ class GObject {
         private long cptr;
 
         protected GObject(long ptr) {
+                if (ptr == 0) {
+                    throw new RuntimeException("Error creating " + getClass().getName());
+                }
                 cptr = ptr;
         }
         protected Map arrayToMap(Object[] arr) {
diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
index 9f7f613d..be5990a4 100644
--- a/bindings/java/Makefile.am
+++ b/bindings/java/Makefile.am
@@ -19,7 +19,7 @@ lasso_jar_class_files = $(java_lasso_source_files:.java=.class)
 JAVAH=gcjh
 
 $(lasso_jar_class_files): %.class: %.java
-	$(JAVAC) -C -classpath . -d . $<
+	$(JAVAC) -ftarget=1.4 -C -classpath . -d . $<
 
 all_jar_class_files = $(shell find com/entrouvert/lasso -name '*.class' | sed 's%\$$%\\$$%g')
 
@@ -38,7 +38,7 @@ doc:
 com_entrouvert_lasso_LassoJNI.h: $(lasso_jar_class_files)
 	$(JAVAH) -jni -d . --classpath=. com.entrouvert.lasso.LassoJNI
 
-libjnilasso_la_CFLAGS = $(LASSO_CORE_CFLAGS) -I$(top_srcdir) -I$(top_builddir)
+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
 libjnilasso_la_LIBADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS)
 nodist_libjnilasso_la_SOURCES = com_entrouvert_lasso_LassoJNI.c 
@@ -46,7 +46,7 @@ nodist_libjnilasso_la_SOURCES = com_entrouvert_lasso_LassoJNI.c
 BUILT_SOURCES = com_entrouvert_lasso_LassoJNI.c com_entrouvert_lasso_LassoJNI.h
 
 $(java_lasso_source_files)  com_entrouvert_lasso_LassoJNI.c: ../lang_java_wrapper_top.c ../lang_java.py
-	$(PYTHON) $(top_srcdir)/bindings/bindings.py -l java --src-dir=$(top_srcdir)/lasso/
+	$(PYTHON) $(top_srcdir)/bindings/bindings.py --enable-exception-docs -l java --src-dir=$(top_srcdir)/lasso/
 	cp $(srcdir)/GObject.java com/entrouvert/lasso
 
 
diff --git a/bindings/java/tests/BindingTests.java b/bindings/java/tests/BindingTests.java
index 10b08f2b..9d2fcd99 100644
--- a/bindings/java/tests/BindingTests.java
+++ b/bindings/java/tests/BindingTests.java
@@ -4,7 +4,7 @@
  * Java unit tests for Lasso library
  *
  * Copyright (C) 2004-2007 Entr'ouvert
- * http://LassoConstants.LASSO_entrouvert.org
+ * http://lasso.entrouvert.org
  *
  * Authors: See AUTHORS file in top-level directory.
  *
@@ -23,16 +23,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-// To run it:
-// $ export LD_LIBRARY_PATH=../
-// $ javac -classpath /usr/share/java/junit.jar:../LassoConstants.LASSO_jar:. BindingTests.java
-// $ java -classpath /usr/share/java/junit.jar:../LassoConstants.LASSO_jar:. BindingTests
-// or for gcj:
-// $ export LD_LIBRARY_PATH=../
-// $ gcj -C -classpath /usr/share/java/junit.jar:../LassoConstants.LASSO_jar:. BindingTests.java
-// $ gij -classpath /usr/share/java/junit.jar:../LassoConstants.LASSO_jar:. BindingTests
-
-
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
@@ -65,8 +55,8 @@ public class BindingTests extends TestCase {
 
 	// Test a string attribute.
 	assertNull(authnRequest.getConsent());
-	authnRequest.setConsent(LassoConstants.LASSO_LIB_CONSENT_OBTAINED);
-	assertEquals(authnRequest.getConsent(), LassoConstants.LASSO_LIB_CONSENT_OBTAINED);
+	authnRequest.setConsent(LassoConstants.LIB_CONSENT_OBTAINED);
+	assertEquals(authnRequest.getConsent(), LassoConstants.LIB_CONSENT_OBTAINED);
 	authnRequest.setConsent(null);
 	assertNull(authnRequest.getConsent());
 
@@ -249,8 +239,8 @@ public class BindingTests extends TestCase {
 
         assertNull(login.getRequest());
         login.setRequest((SamlpRequestAbstract) new LibAuthnRequest());
-        ((LibAuthnRequest) login.getRequest()).setConsent(LassoConstants.LASSO_LIB_CONSENT_OBTAINED);
-        assertEquals(((LibAuthnRequest) login.getRequest()).getConsent(), LassoConstants.LASSO_LIB_CONSENT_OBTAINED);
+        ((LibAuthnRequest) login.getRequest()).setConsent(LassoConstants.LIB_CONSENT_OBTAINED);
+        assertEquals(((LibAuthnRequest) login.getRequest()).getConsent(), LassoConstants.LIB_CONSENT_OBTAINED);
         login.setRequest(null);
         assertNull(login.getRequest());
 
diff --git a/bindings/java/tests/LoginTest.java b/bindings/java/tests/LoginTest.java
index a961415a..5f9286a4 100644
--- a/bindings/java/tests/LoginTest.java
+++ b/bindings/java/tests/LoginTest.java
@@ -47,7 +47,7 @@ public class LoginTest extends TestCase {
             null,
             "../../../tests/data/idp1-la/certificate.pem");
         server.addProvider(
-            LassoConstants.LASSO_PROVIDER_ROLE_SP,
+            LassoConstants.PROVIDER_ROLE_SP,
             "../../../tests/data/sp1-la/metadata.xml",
             "../../../tests/data/sp1-la/public-key.pem",
             "../../../tests/data/ca1-la/certificate.pem");
@@ -62,7 +62,7 @@ public class LoginTest extends TestCase {
             null,
             "../../../tests/data/sp1-la/certificate.pem");
         server.addProvider(
-            LassoConstants.LASSO_PROVIDER_ROLE_IDP,
+            LassoConstants.PROVIDER_ROLE_IDP,
             "../../../tests/data/idp1-la/metadata.xml",
             "../../../tests/data/idp1-la/public-key.pem",
             "../../../tests/data/ca1-la/certificate.pem");
@@ -97,11 +97,11 @@ public class LoginTest extends TestCase {
         assertNotNull(spDump);
         sp = Server.newFromDump(spDump);
         spLogin = new Login(sp);
-        spLogin.initAuthnRequest("https://idp1/metadata", LassoConstants.LASSO_HTTP_METHOD_REDIRECT);
+        spLogin.initAuthnRequest("https://idp1/metadata", LassoConstants.HTTP_METHOD_REDIRECT);
         authnRequest = (LibAuthnRequest) spLogin.getRequest();
         authnRequest.setIsPassive(false);
-        authnRequest.setNameIdPolicy(LassoConstants.LASSO_LIB_NAMEID_POLICY_TYPE_FEDERATED);
-        authnRequest.setConsent(LassoConstants.LASSO_LIB_CONSENT_OBTAINED);
+        authnRequest.setNameIdPolicy(LassoConstants.LIB_NAMEID_POLICY_TYPE_FEDERATED);
+        authnRequest.setConsent(LassoConstants.LIB_CONSENT_OBTAINED);
         relayState = "fake";
         authnRequest.setRelayState(relayState);
         spLogin.buildAuthnRequestMsg();
@@ -120,15 +120,15 @@ public class LoginTest extends TestCase {
         userAuthenticated = true;
         userConsentObtained = false;
         idpLogin.validateRequestMsg(userAuthenticated, userConsentObtained);
-        authenticationMethod = LassoConstants.LASSO_SAML_AUTHENTICATION_METHOD_PASSWORD;
+        authenticationMethod = LassoConstants.SAML_AUTHENTICATION_METHOD_PASSWORD;
         idpLogin.buildAssertion(
                 authenticationMethod,
                 null, // authenticationInstant
                 null, // reauthenticateOnOrAfter
                 null, // notBefore
                 null);// notOnOrAfter
-        assertEquals(LassoConstants.LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_ART, idpLogin.getProtocolProfile());
-        idpLogin.buildArtifactMsg(LassoConstants.LASSO_HTTP_METHOD_REDIRECT);
+        assertEquals(LassoConstants.LOGIN_PROTOCOL_PROFILE_BRWS_ART, idpLogin.getProtocolProfile());
+        idpLogin.buildArtifactMsg(LassoConstants.HTTP_METHOD_REDIRECT);
         idpIdentityDump = idpLogin.getIdentity().dump();
         assertNotNull(idpIdentityDump);
         idpSessionDump = idpLogin.getSession().dump();
@@ -139,7 +139,7 @@ public class LoginTest extends TestCase {
         nameIdentifier = ((SamlNameIdentifier)idpLogin.getNameIdentifier()).getContent();
         artifact = idpLogin.getAssertionArtifact();
         assertNotNull(artifact);
-        method = LassoConstants.LASSO_HTTP_METHOD_REDIRECT;
+        method = LassoConstants.HTTP_METHOD_REDIRECT;
 
         // Service provider assertion consumer.
         spDump = generateServiceProviderDump();
@@ -156,7 +156,7 @@ public class LoginTest extends TestCase {
 
         // Identity provider SOAP endpoint.
         requestType = LassoJNI.lasso_get_request_type_from_soap_msg(soapRequestMsg);
-        assertEquals(LassoConstants.LASSO_REQUEST_TYPE_LOGIN, requestType);
+        assertEquals(LassoConstants.REQUEST_TYPE_LOGIN, requestType);
         idpDump = generateIdentityProviderDump();
         assertNotNull(idpDump);
         idp = Server.newFromDump(idpDump);
@@ -184,7 +184,7 @@ public class LoginTest extends TestCase {
         assertNotNull(spSessionDump);
         assertion = (SamlAssertion) spSession.getAssertions("https://idp1/metadata").get(0);
         authenticationMethod = assertion.getAuthenticationStatement().getAuthenticationMethod();
-        assertEquals(LassoConstants.LASSO_SAML_AUTHENTICATION_METHOD_PASSWORD, authenticationMethod);
+        assertEquals(LassoConstants.SAML_AUTHENTICATION_METHOD_PASSWORD, authenticationMethod);
 
         // Service provider logout.
         spDump = generateServiceProviderDump();
@@ -196,14 +196,14 @@ public class LoginTest extends TestCase {
         spLogout.setIdentityFromDump(spIdentityDump);
         assertNotNull(spSessionDump);
         spLogout.setSessionFromDump(spSessionDump);
-        spLogout.initRequest(null, LassoConstants.LASSO_HTTP_METHOD_ANY);
+        spLogout.initRequest(null, LassoConstants.HTTP_METHOD_ANY);
         spLogout.buildRequestMsg();
         soapEndpoint = spLogout.getMsgUrl();
         soapRequestMsg = spLogout.getMsgBody();
 
         // Identity provider SOAP endpoint.
         requestType = LassoJNI.lasso_get_request_type_from_soap_msg(soapRequestMsg);
-        assertEquals(LassoConstants.LASSO_REQUEST_TYPE_LOGOUT, requestType);
+        assertEquals(LassoConstants.REQUEST_TYPE_LOGOUT, requestType);
         idpDump = generateIdentityProviderDump();
         assertNotNull(idpDump);
         idp = Server.newFromDump(idpDump);