Added binding for saml:AttributeValue.

Corrected use of constant LASSO_WSF_ENABLED in binding.

6 files changed, 64 insertions, 3 deletions

diff --git a/csharp/.cvsignore b/csharp/.cvsignore
index 64dfac45..afa34808 100644
--- a/csharp/.cvsignore
+++ b/csharp/.cvsignore
@@ -91,6 +91,7 @@ SamlAuthorityBinding.cs
 SamlAudienceRestrictionCondition.cs
 SamlAttributeDesignator.cs
 SamlAttribute.cs
+SamlAttributeValue.cs
 NodeList.cs
 LibRequestAuthnContext.cs
 DiscoCredentials.cs
diff --git a/csharp/Makefile.am b/csharp/Makefile.am
index 084307fb..890732e1 100644
--- a/csharp/Makefile.am
+++ b/csharp/Makefile.am
@@ -60,7 +60,7 @@ SWIG_FILES = liblassosharpglue_wrap.c \
 	LibStatusResponse.cs Login.cs Logout.cs NameIdentifierMapping.cs \
 	NameRegistration.cs Node.cs NodeList.cs ProfileService.cs Provider.cs \
 	SamlAdvice.cs SamlAssertion.cs SamlAttribute.cs SamlAttributeDesignator.cs \
-	SamlAttributeStatement.cs SamlAudienceRestrictionCondition.cs \
+	SamlAttributeStatement.cs SamlAttributeValue.cs SamlAudienceRestrictionCondition.cs \
 	SamlAuthenticationStatement.cs SamlAuthorityBinding.cs SamlConditionAbstract.cs \
 	SamlConditions.cs SamlNameIdentifier.cs SamlpRequestAbstract.cs SamlpRequest.cs \
 	SamlpResponseAbstract.cs SamlpResponse.cs SamlpStatusCode.cs SamlpStatus.cs \
diff --git a/java/.cvsignore b/java/.cvsignore
index 3027137f..35079320 100644
--- a/java/.cvsignore
+++ b/java/.cvsignore
@@ -57,6 +57,7 @@ SWIGTYPE_p_void.java
 SamlAdvice.java
 SamlAssertion.java
 SamlAttributeStatement.java
+SamlAttributeValue.java
 SamlAuthenticationStatement.java
 SamlConditions.java
 SamlNameIdentifier.java
diff --git a/java/Makefile.am b/java/Makefile.am
index 642a0ed8..16e00835 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -46,7 +46,7 @@ SWIG_OUTPUTS = lasso_wrap.c \
 	LibStatusResponse.java Login.java Logout.java NameIdentifierMapping.java \
 	NameRegistration.java Node.java NodeList.java ProfileService.java Provider.java \
 	SamlAdvice.java SamlAssertion.java SamlAttributeDesignator.java SamlAttribute.java \
-	SamlAttributeStatement.java SamlAudienceRestrictionCondition.java \
+	SamlAttributeStatement.java SamlAttributeValue.java SamlAudienceRestrictionCondition.java \
 	SamlAuthenticationStatement.java SamlAuthorityBinding.java \
 	SamlConditionAbstract.java SamlConditions.java SamlNameIdentifier.java \
 	SamlpRequestAbstract.java SamlpRequest.java SamlpResponseAbstract.java \
diff --git a/swig/Lasso.i b/swig/Lasso.i
index 6ac2c5f6..2d97d0dd 100644
--- a/swig/Lasso.i
+++ b/swig/Lasso.i
@@ -46,6 +46,7 @@
 #include <lasso/lasso_config.h>
 #include <lasso/lasso.h>
 #include <lasso/xml/lib_assertion.h>
+#include <lasso/xml/saml_attribute_value.h>
 
 #include <lasso/xml/disco_resource_id.h>
 #include <lasso/xml/disco_encrypted_resource_id.h>
@@ -691,7 +692,14 @@ SET_NODE_INFO(Node, DowncastableNode)
 %rename(WSF_ENABLED) LASSO_WSF_ENABLED;
 #endif
 %include "../lasso/lasso_config.h"
-#ifndef LASSO_WSF_ENABLED
+#ifdef LASSO_WSF_ENABLED
+%{
+#undef LASSO_WSF_ENABLED
+#define LASSO_WSF_ENABLED 1
+%}
+#undef LASSO_WSF_ENABLED
+#define LASSO_WSF_ENABLED 1
+#else
 %{
 #define LASSO_WSF_ENABLED 0
 %}
@@ -1980,6 +1988,56 @@ typedef struct {
 
 
 /***********************************************************************
+ * saml:AttributeValue
+ ***********************************************************************/
+
+
+#ifndef SWIGPHP4
+%rename(SamlAttributeValue) LassoSamlAttributeValue;
+#endif
+typedef struct {
+} LassoSamlAttributeValue;
+%extend LassoSamlAttributeValue {
+	/* Attributes */
+
+	%newobject any_get;
+	LassoNodeList *any;
+
+	/* Constructor, Destructor & Static Methods */
+
+	LassoSamlAttributeValue();
+
+	~LassoSamlAttributeValue();
+
+	/* Methods inherited from LassoNode */
+
+	%newobject dump;
+	char *dump();
+}
+
+%{
+
+/* Attributes Implementations */
+
+/* any */
+#define LassoSamlAttributeValue_get_any(self) get_node_list((self)->any)
+#define LassoSamlAttributeValue_any_get(self) get_node_list((self)->any)
+#define LassoSamlAttributeValue_set_any(self, value) set_node_list(&(self)->any, (value))
+#define LassoSamlAttributeValue_any_set(self, value) set_node_list(&(self)->any, (value))
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoSamlAttributeValue lasso_saml_attribute_value_new
+#define delete_LassoSamlAttributeValue(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoSamlAttributeValue_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
+
+/***********************************************************************
  * saml:AudienceRestrictionCondition
  ***********************************************************************/
 
diff --git a/swig/inheritance.h b/swig/inheritance.h
index c234c371..1c6cca9a 100644
--- a/swig/inheritance.h
+++ b/swig/inheritance.h
@@ -36,6 +36,7 @@
 SET_NODE_INFO(SamlAdvice, Node)
 SET_NODE_INFO(SamlAssertion, Node)
 SET_NODE_INFO(SamlAttributeDesignator, Node)
+SET_NODE_INFO(SamlAttributeValue, Node)
 SET_NODE_INFO(SamlAuthorityBinding, Node)
 SET_NODE_INFO(SamlConditionAbstract, Node)
 SET_NODE_INFO(SamlConditions, Node)