diff options
author | Frederic Peters <fpeters@entrouvert.com> | 2008-04-29 12:08:07 +0000 |
---|---|---|
committer | Frederic Peters <fpeters@entrouvert.com> | 2008-04-29 12:08:07 +0000 |
commit | a7a314bed2f9659b8f9ad15d58b33e819ccbc6ed (patch) | |
tree | 0782970cec1ff969bf8ccd61c6c4e27a543d378d /bindings | |
parent | 1ada7e4c22d883c1f9fe135626822bcf124ed05e (diff) | |
download | lasso-a7a314bed2f9659b8f9ad15d58b33e819ccbc6ed.tar.gz lasso-a7a314bed2f9659b8f9ad15d58b33e819ccbc6ed.tar.xz lasso-a7a314bed2f9659b8f9ad15d58b33e819ccbc6ed.zip |
[project @ fpeters@0d.be-20080314231256-hjz1wljuqrcbuce3]
merging benjamin branch
Original author: Frederic Peters <fpeters@0d.be>
Date: 2008-03-15 00:12:56.228000+01:00
Diffstat (limited to 'bindings')
-rw-r--r-- | bindings/Makefile.am | 3 | ||||
-rw-r--r-- | bindings/java/Makefile.am | 48 | ||||
-rw-r--r-- | bindings/java/TODO | 19 | ||||
-rw-r--r-- | bindings/java/tests/BindingTests.java | 1 | ||||
-rw-r--r-- | bindings/java/tests/LoginTest.java | 26 |
5 files changed, 51 insertions, 46 deletions
diff --git a/bindings/Makefile.am b/bindings/Makefile.am index a49f4c4b..a39b82f2 100644 --- a/bindings/Makefile.am +++ b/bindings/Makefile.am @@ -14,4 +14,5 @@ EXTRA_DIST = bindings.py \ lang_php5_helpers/__init__.py \ lang_php5_helpers/php_code.py \ lang_php5_helpers/wrapper_header.py \ - lang_php5_helpers/wrapper_source.py + lang_php5_helpers/wrapper_source.py \ + utility-scripts/error-analyzer.pl diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am index d3a91e38..ce3b0aa1 100644 --- a/bindings/java/Makefile.am +++ b/bindings/java/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir) \ -I$(top_builddir) \ $(SASL_CFLAGS) -# CLASSPATH_ENV= CLASSPATH=.:lasso.jar:/usr/share/java/junit.jar +CLASSPATH_ENV= CLASSPATH=.:$(CLASSPATH_JUNIT) CLASSPATH=.:tests java_extension_LTLIBRARIES = libjnilasso.la @@ -16,11 +16,11 @@ lasso_jar_DATA=lasso.jar lasso_jar_class_files = $(java_lasso_source_files:.java=.class) %.class: %.java - $(JAVAC) $(CLASSPATH_OPT) $(CLASSPATH) $(JAVAC_FLAGS) $< + $(JAVAC) $(CLASSPATH_OPT) $(CLASSPATH) $(JAVAC_FLAGS) -d . $< all_jar_class_files = $(shell find com/entrouvert/lasso -name '*.class' | sed 's%\$$%\\$$%g') -lasso.jar: $(all_jar_class_files) +lasso.jar: $(java_lasso_source_files:.java=.class) $(JAR) -cf $@ $(all_jar_class_files) # Doc @@ -32,7 +32,7 @@ doc: mv .doc doc -com_entrouvert_lasso_LassoJNI.h: com/entrouvert/lasso/LassoJNI.class +com_entrouvert_lasso_LassoJNI.h: com/entrouvert/lasso/LassoJNI.class $(java_lasso_source_files:.java=.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) @@ -42,8 +42,10 @@ nodist_libjnilasso_la_SOURCES = com_entrouvert_lasso_LassoJNI.c BUILT_SOURCES = com_entrouvert_lasso_LassoJNI.c com_entrouvert_lasso_LassoJNI.h +BINDING_OPTION=#--enable-exception-docs + $(java_lasso_source_files) com_entrouvert_lasso_LassoJNI.c: ../lang_java_wrapper_top.c ../lang_java.py - $(PYTHON) $(top_srcdir)/bindings/bindings.py --enable-exception-docs -l java --src-dir=$(top_srcdir)/lasso/ + $(PYTHON) $(top_srcdir)/bindings/bindings.py $(BINDING_OPTION) -l java --src-dir=$(top_srcdir)/lasso/ cp $(srcdir)/GObject.java com/entrouvert/lasso @@ -53,24 +55,32 @@ doc-publish: doc ssh bdauvergne@perso.entrouvert.org tar czf -C public_html/java-binding-doc doc.tgz rm doc.tgz -clean-local: - -rm -f com_entrouvert_lasso_LassoJNI.c com/entrouvert/lasso/*.java com/entrouvert/lasso/*.class com_entrouvert_lasso_LassoJNI.h lasso.jar - -rm -rf doc - -rm tests/*.class +MOSTLYCLEANFILES = com_entrouvert_lasso_LassoJNI.c com_entrouvert_lasso_LassoJNI.h com/entrouvert/lasso/* lasso.jar *.class $(TESTS) + +EXTRA_DIST = \ + GObject.java \ + LassoException_top.java \ + tests/BindingTests.java \ + tests/LoginTest.java + -check tests/BindingTests.class tests/LoginTest.class : CLASSPATH :=$(CLASSPATH):/usr/share/java/junit.jar +# Some of the following classes are built only if junit is available +if JUNIT_ENABLED +test_source_files= tests/BindingTests.java tests/LoginTest.java -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 +$(test_source_files:.java=.class): CLASSPATH=.:$(CLASSPATH_JUNIT) +TESTS = AllJunitTests +AllJunitTests: JAVAFLAGS +="-Dsrcdir=$(srcdir)" + +AllJunitTests: $(test_source_files:.java=.class) + echo "#! /bin/sh" > $@ + echo "OBJDIR=`libtool --config | grep ^objdir | sed s/.*=//`" >> $@ + echo 'LD_LIBRARY_PATH=$$OBJDIR @JUNIT@ BindingTests' >> $@ + echo 'LD_LIBRARY_PATH=$$OBJDIR @JUNIT@ LoginTest' >> $@ + chmod +x $@ endif -EXTRA_DIST = \ - GObject.java \ - LassoException_top.java \ - tests/BindingTests.java \ - tests/LoginTest.java \ - tests/Test.java +endif diff --git a/bindings/java/TODO b/bindings/java/TODO index 09b4a5c6..13b569a0 100644 --- a/bindings/java/TODO +++ b/bindings/java/TODO @@ -1,15 +1,6 @@ -* generate_wrapper_getter_setter DONE -* generate_JNI_functions DONE -* generate_JNI_getter_setter DONE -* get_glist_from_jlist_of_strings DONE -* get_glist_from_jlist_of_xmlnodes DONE -* get_glist_from_jlist_of_objects DONE -* generate_class DOINE - -* Générer la liste des erreurs possibles par fonction - -> Construire callgraph de lasso DONE - -> recencer par fonction les erreurs émises DONE - -> remonter les infos dans le graphe DONE -* doc DONE -* renvoyer des listes et des hashmap au lieu de tableaux DONE * utiliser les numéros de version de lasso dans la doc/noms de fichiers +* créer une hiérarchie object pour différentier les services SAML 2 des + services ID-FF 1.2 ainsi que mutualiser certaines méthodes. +* déplacer les points d'accés saml2 et id-ff dans leurs répertoires res +pectifs. +* supporter plusieurs IdP diff --git a/bindings/java/tests/BindingTests.java b/bindings/java/tests/BindingTests.java index 9d2fcd99..a6b57830 100644 --- a/bindings/java/tests/BindingTests.java +++ b/bindings/java/tests/BindingTests.java @@ -45,6 +45,7 @@ public class BindingTests extends TestCase { // Create and delete nodes. LibAuthnRequest authnRequest = new LibAuthnRequest(); + assertNotNull(authnRequest); authnRequest = null; } diff --git a/bindings/java/tests/LoginTest.java b/bindings/java/tests/LoginTest.java index 293ad133..9f83f42e 100644 --- a/bindings/java/tests/LoginTest.java +++ b/bindings/java/tests/LoginTest.java @@ -41,31 +41,33 @@ import com.entrouvert.lasso.*; public class LoginTest extends TestCase { public String generateIdentityProviderDump() { + String srcdir = System.getProperty("srcdir") + "/"; Server server = new Server( - "../../tests/data/idp1-la/metadata.xml", - "../../tests/data/idp1-la/private-key-raw.pem", + srcdir + "../../tests/data/idp1-la/metadata.xml", + srcdir + "../../tests/data/idp1-la/private-key-raw.pem", null, - "../../tests/data/idp1-la/certificate.pem"); + srcdir + "../../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"); + srcdir + "../../tests/data/sp1-la/metadata.xml", + srcdir + "../../tests/data/sp1-la/public-key.pem", + srcdir + "../../tests/data/ca1-la/certificate.pem"); String serverDump = server.dump(); return serverDump; } public String generateServiceProviderDump() { + String srcdir = System.getProperty("srcdir") + "/"; Server server = new Server( - "../../tests/data/sp1-la/metadata.xml", - "../../tests/data/sp1-la/private-key-raw.pem", + srcdir + "../../tests/data/sp1-la/metadata.xml", + srcdir + "../../tests/data/sp1-la/private-key-raw.pem", null, - "../../tests/data/sp1-la/certificate.pem"); + srcdir + "../../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"); + srcdir + "../../tests/data/idp1-la/metadata.xml", + srcdir + "../../tests/data/idp1-la/public-key.pem", + srcdir + "../../tests/data/ca1-la/certificate.pem"); String serverDump = server.dump(); return serverDump; } |