Some progress in first non regression test.

6 files changed, 18 insertions, 10 deletions

diff --git a/java/src/c/com_entrouvert_lasso_LassoAuthnRequest.c b/java/src/c/com_entrouvert_lasso_LassoAuthnRequest.c
index a2d4f243..a71af821 100644
--- a/java/src/c/com_entrouvert_lasso_LassoAuthnRequest.c
+++ b/java/src/c/com_entrouvert_lasso_LassoAuthnRequest.c
@@ -67,7 +67,7 @@ JNIEXPORT void JNICALL Java_com_entrouvert_lasso_LassoAuthnRequest_setassertionC
     (*env)->ReleaseStringUTFChars(env, _value, value);
 }
 
-JNIEXPORT void JNICALL Java_com_entrouvert_lasso_LassoAuthnRequest_setContent
+JNIEXPORT void JNICALL Java_com_entrouvert_lasso_LassoAuthnRequest_setConsent
 (JNIEnv * env, jobject this, jstring _value){
     LassoAuthnRequest * request;
     char * value;
diff --git a/java/src/c/helper.c b/java/src/c/helper.c
index 6f19ca70..a4ee15d9 100644
--- a/java/src/c/helper.c
+++ b/java/src/c/helper.c
@@ -1,11 +1,11 @@
-/* $Id$
- *
+/*
  * JLasso -- Java bindings for Lasso library
  *
  * Copyright (C) 2004 Entr'ouvert
- * http://lasso.labs.libre-entreprise.org
+ * http://lasso.entrouvert.com
  *
  * Authors: Benjamin Poussin <poussin@codelutin.com>
+ *          Emmanuel Raviart <eraviart@entrouvert.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/java/src/c/helper.h b/java/src/c/helper.h
index ba8304eb..f9b4d167 100644
--- a/java/src/c/helper.h
+++ b/java/src/c/helper.h
@@ -1,11 +1,11 @@
-/* $Id$
- *
+/*
  * JLasso -- Java bindings for Lasso library
  *
  * Copyright (C) 2004 Entr'ouvert
- * http://lasso.labs.libre-entreprise.org
+ * http://lasso.entrouvert.com
  *
  * Authors: Benjamin Poussin <poussin@codelutin.com>
+ *          Emmanuel Raviart <eraviart@entrouvert.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/java/src/java/com/entrouvert/lasso/Lasso.java b/java/src/java/com/entrouvert/lasso/Lasso.java
index e2618921..a1d5700d 100644
--- a/java/src/java/com/entrouvert/lasso/Lasso.java
+++ b/java/src/java/com/entrouvert/lasso/Lasso.java
@@ -30,6 +30,15 @@ public class Lasso { // Lasso
         System.loadLibrary("jlasso");
     }
 
+    /* NameIDPolicyType */
+    static final public String libNameIdPolicyTypeNone = "none";
+    static final public String libNameIdPolicyTypeOneTime = "onetime";
+    static final public String libNameIdPolicyTypeFederated = "federated";
+    static final public String libNameIdPolicyTypeAny = "any";
+
+    static final public int signatureMethodRsaSha1 = 1;
+    static final public int signatureMethodDsaSha1 = 2;
+
     native static public int init();
     native static public int shutdown();
 
diff --git a/java/src/java/com/entrouvert/lasso/LassoAuthnRequest.java b/java/src/java/com/entrouvert/lasso/LassoAuthnRequest.java
index 9c623932..bde492ed 100644
--- a/java/src/java/com/entrouvert/lasso/LassoAuthnRequest.java
+++ b/java/src/java/com/entrouvert/lasso/LassoAuthnRequest.java
@@ -36,7 +36,7 @@ public class LassoAuthnRequest extends LassoNode { // LassoAuthnRequest
 
     native public void setAffiliationID(String affiliationId);
     native public void setassertionConsumerServiceID(String assertionConsumerServiceID);
-    native public void setContent(String content);
+    native public void setConsent(String consent);
     native public void setForceAuthn(boolean val);
     native public void setPassive(boolean val);
     native public void setNameIdPolicy(String val);
diff --git a/java/src/java/com/entrouvert/lasso/LassoObject.java b/java/src/java/com/entrouvert/lasso/LassoObject.java
index fc87287e..98856d34 100644
--- a/java/src/java/com/entrouvert/lasso/LassoObject.java
+++ b/java/src/java/com/entrouvert/lasso/LassoObject.java
@@ -1,9 +1,8 @@
 /*
- *
  * JLasso -- Java bindings for Lasso library
  *
  * Copyright (C) 2004 Entr'ouvert
- * http://lasso.labs.libre-entreprise.org
+ * http://lasso.entrouvert.com
  *
  * Authors: Benjamin Poussin <poussin@codelutin.com>
  *          Emmanuel Raviart <eraviart@entrouvert.com>