diff options
| author | Frederic Peters <fpeters@entrouvert.com> | 2008-04-29 12:10:40 +0000 |
|---|---|---|
| committer | Frederic Peters <fpeters@entrouvert.com> | 2008-04-29 12:10:40 +0000 |
| commit | ba3884453b13329b4ff2067d973a29cb13e9a73c (patch) | |
| tree | 7676ff6b5c1e6119c409ceaab4b50067f0265965 | |
| parent | 4fc70143242a9de91ee14a73eb0f7b95958449f2 (diff) | |
[project @ fpeters@0d.be-20080423145930-yekpmusph6oob90d]
merge
Original author: Frederic Peters <fpeters@0d.be>
Date: 2008-04-23 16:59:30.377000+02:00
| -rw-r--r-- | bindings/java/tests/LoginTest.java | 6 | ||||
| -rw-r--r-- | bindings/lang_java_wrapper_top.c | 2 | ||||
| -rw-r--r-- | bindings/php5/Makefile.am | 8 | ||||
| -rw-r--r-- | bindings/php5/lasso.ini | 2 |
4 files changed, 15 insertions, 3 deletions
diff --git a/bindings/java/tests/LoginTest.java b/bindings/java/tests/LoginTest.java index 9f83f42e..dbe4acef 100644 --- a/bindings/java/tests/LoginTest.java +++ b/bindings/java/tests/LoginTest.java @@ -38,6 +38,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import com.entrouvert.lasso.*; +import java.util.*; public class LoginTest extends TestCase { public String generateIdentityProviderDump() { @@ -232,6 +233,11 @@ public class LoginTest extends TestCase { spIdentityDump = spLogout.getIdentity().dump(); assertNotNull(spIdentityDump); } + public void test03_getProviders() { + String identityProviderDump = generateIdentityProviderDump(); + Server server = Server.newFromDump(identityProviderDump); + Map providers = server.getProviders(); + } public static Test suite() { return new TestSuite(LoginTest.class); diff --git a/bindings/lang_java_wrapper_top.c b/bindings/lang_java_wrapper_top.c index daac2b6c..3ddb07a3 100644 --- a/bindings/lang_java_wrapper_top.c +++ b/bindings/lang_java_wrapper_top.c @@ -68,7 +68,7 @@ static int get_hash_by_name(JNIEnv *env, GHashTable *hashtable, jstring jkey, Co // Use jobject_to_gobject_for_list because ref count must be augmented by one when inserted inside a list #define add_to_list_of_objects(env,list,obj) add_to_list(env,list,obj,(OutConverter)jobject_to_gobject_for_list) #define get_hash_of_strings(env,hash,jarr) get_hash(env,"java/lang/String",hash,(Converter)string_to_jstring, jarr) -#define get_hash_of_objects(env,hash,jarr) get_hash(env,"java/lang/String",hash,(Converter)gobject_to_jobject_and_ref, jarr) +#define get_hash_of_objects(env,hash,jarr) get_hash(env,"java/lang/Object",hash,(Converter)gobject_to_jobject_and_ref, jarr) //#define remove_from_hash_of_strings(env,hash,key) remove_from_hash(env,hash,key) //#define remove_from_hash_of_objects(env,hash,key) remove_from_hash(env,hash,key) #define add_to_hash_of_strings(env,hash,key,obj) add_to_hash(env,hash,key,obj,(OutConverter)jstring_to_string,(GFunc)g_free) diff --git a/bindings/php5/Makefile.am b/bindings/php5/Makefile.am index 7115995e..23a19cb3 100644 --- a/bindings/php5/Makefile.am +++ b/bindings/php5/Makefile.am @@ -5,10 +5,14 @@ INCLUDES = -I$(top_srcdir) \ -I$(top_builddir) \ $(SASL_CFLAGS) +php_extensiondir=@PHP5_EXTENSION_DIR@ php_extension_LTLIBRARIES = lasso.la -php_extensiondir = ${prefix}@PHP5_UNPREFIXED_EXTENSION_DIR@ -nodist_php_extension_DATA = lasso.php +php_includedir=@PHP5_INCLUDE_DIR@ +nodist_php_include_DATA = lasso.php + +php_configdir=@PHP5_CONFIG_DIR@ +php_config_DATA=lasso.ini lasso_la_CFLAGS = -fno-strict-aliasing $(LASSO_CORE_CFLAGS) -I$(top_srcdir) -I$(top_builddir) $(PHP5_INCLUDES) lasso_la_LDFLAGS = -export-dynamic -prefer-pic -module -avoid-version diff --git a/bindings/php5/lasso.ini b/bindings/php5/lasso.ini new file mode 100644 index 00000000..28ebac52 --- /dev/null +++ b/bindings/php5/lasso.ini @@ -0,0 +1,2 @@ +# configuration for php PDO module +extension=lasso.so |