diff options
| author | Emmanuel Raviart <eraviart@entrouvert.com> | 2005-01-25 19:02:43 +0000 |
|---|---|---|
| committer | Emmanuel Raviart <eraviart@entrouvert.com> | 2005-01-25 19:02:43 +0000 |
| commit | 75b8a0e0b6ea419ccf350e4febfc8c08ef95f318 (patch) | |
| tree | 90e77df28d2a1af1f0f90a3148d9cd24e4b4113d /swig | |
| parent | 87f3c2e2b5fd87ac3adc5dfe4c02422603ee0d0f (diff) | |
| download | lasso-75b8a0e0b6ea419ccf350e4febfc8c08ef95f318.tar.gz lasso-75b8a0e0b6ea419ccf350e4febfc8c08ef95f318.tar.xz lasso-75b8a0e0b6ea419ccf350e4febfc8c08ef95f318.zip | |
SWIG: Corrected Java enums. Renamed enum types. Corrected constant name.
Diffstat (limited to 'swig')
| -rw-r--r-- | swig/Lasso.i | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/swig/Lasso.i b/swig/Lasso.i index 2f5b9e9b..8cca7c62 100644 --- a/swig/Lasso.i +++ b/swig/Lasso.i @@ -672,6 +672,13 @@ SET_NODE_INFO(Node, DowncastableNode) ***********************************************************************/ +#ifdef SWIGJAVA +#if SWIG_VERSION >= 0x010322 +%include "enumsimple.swg" +#endif +#endif /* ifdef SWIGJAVA */ + + /* Version Number */ #ifndef SWIGPHP4 %rename(VERSION_MAJOR) LASSO_VERSION_MAJOR; @@ -689,6 +696,7 @@ SET_NODE_INFO(Node, DowncastableNode) %rename(HTTP_METHOD_POST) LASSO_HTTP_METHOD_POST; %rename(HTTP_METHOD_REDIRECT) LASSO_HTTP_METHOD_REDIRECT; %rename(HTTP_METHOD_SOAP) LASSO_HTTP_METHOD_SOAP; +%rename(HttpMethod) LassoHttpMethod; #endif typedef enum { LASSO_HTTP_METHOD_NONE = -1, @@ -703,7 +711,7 @@ typedef enum { /* Consent */ #ifndef SWIGPHP4 %rename(LIB_CONSENT_OBTAINED) LASSO_LIB_CONSENT_OBTAINED; -%rename(LIB_CONSENT_OBTAINEDPrior) LASSO_LIB_CONSENT_OBTAINED_PRIOR; +%rename(LIB_CONSENT_OBTAINED_PRIOR) LASSO_LIB_CONSENT_OBTAINED_PRIOR; %rename(LIB_CONSENT_OBTAINED_CURRENT_IMPLICIT) LASSO_LIB_CONSENT_OBTAINED_CURRENT_IMPLICIT; %rename(LIB_CONSENT_OBTAINED_CURRENT_EXPLICIT) LASSO_LIB_CONSENT_OBTAINED_CURRENT_EXPLICIT; %rename(LIB_CONSENT_UNAVAILABLE) LASSO_LIB_CONSENT_UNAVAILABLE; @@ -764,6 +772,7 @@ typedef enum { #ifndef SWIGPHP4 %rename(LOGIN_PROTOCOL_PROFILE_BRWS_ART) LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_ART; %rename(LOGIN_PROTOCOL_PROFILE_BRWS_POST) LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_POST; +%rename(LoginProtocolProfile) LassoLoginProtocolProfile; #endif typedef enum { LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_ART = 1, @@ -778,6 +787,7 @@ typedef enum { %rename(MESSAGE_TYPE_REQUEST) LASSO_MESSAGE_TYPE_REQUEST; %rename(MESSAGE_TYPE_RESPONSE) LASSO_MESSAGE_TYPE_RESPONSE; %rename(MESSAGE_TYPE_ARTIFACT) LASSO_MESSAGE_TYPE_ARTIFACT; +%rename(MessageType) LassoMessageType; #endif typedef enum { LASSO_MESSAGE_TYPE_NONE = 0, @@ -793,6 +803,7 @@ typedef enum { %rename(PROVIDER_ROLE_NONE) LASSO_PROVIDER_ROLE_NONE; %rename(PROVIDER_ROLE_SP) LASSO_PROVIDER_ROLE_SP; %rename(PROVIDER_ROLE_IDP) LASSO_PROVIDER_ROLE_IDP; +%rename(ProviderRole) LassoProviderRole; #endif typedef enum { LASSO_PROVIDER_ROLE_NONE = 0, @@ -809,6 +820,7 @@ typedef enum { %rename(REQUEST_TYPE_NAME_REGISTRATION) LASSO_REQUEST_TYPE_NAME_REGISTRATION; %rename(REQUEST_TYPE_NAME_IDENTIFIER_MAPPING) LASSO_REQUEST_TYPE_NAME_IDENTIFIER_MAPPING; %rename(REQUEST_TYPE_LECP) LASSO_REQUEST_TYPE_LECP; +%rename(RequestType) LassoRequestType; #endif typedef enum { LASSO_REQUEST_TYPE_INVALID = 0, @@ -850,6 +862,7 @@ typedef enum { #ifndef SWIGPHP4 %rename(SIGNATURE_METHOD_RSA_SHA1) LASSO_SIGNATURE_METHOD_RSA_SHA1; %rename(SIGNATURE_METHOD_DSA_SHA1) LASSO_SIGNATURE_METHOD_DSA_SHA1; +%rename(SignatureMethod) LassoSignatureMethod; #endif typedef enum { LASSO_SIGNATURE_METHOD_RSA_SHA1 = 1, @@ -1208,9 +1221,6 @@ static void set_xml_list(GList **xmlListPointer, GPtrArray *xmlArray) { %} #else /* ifdef SWIGCSHARP */ #ifdef SWIGJAVA -#if SWIG_VERSION >= 0x010322 - %include "enumsimple.swg" -#endif %pragma(java) jniclasscode=%{ static { try { @@ -5393,7 +5403,7 @@ typedef struct { THROW_ERROR int initAuthnRequest(char *remoteProviderId = NULL, - LassoHttpMethod httpMethod = LASSO_HTTP_METHOD_REDIRECT); + LassoHttpMethod httpMethod = LASSO_HTTP_METHOD_REDIRECT); END_THROW_ERROR THROW_ERROR |