updated SAML2 bindings with all attributes; and added copyright / licence

notice.

48 files changed, 1431 insertions, 112 deletions

diff --git a/swig/saml-2.0/saml2_action.i b/swig/saml-2.0/saml2_action.i
index c34ef68f..4fd55bff 100644
--- a/swig/saml-2.0/saml2_action.i
+++ b/swig/saml-2.0/saml2_action.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Saml2Action) LassoSaml2Action;
diff --git a/swig/saml-2.0/saml2_advice.i b/swig/saml-2.0/saml2_advice.i
index 0bb7419e..c5b3df9b 100644
--- a/swig/saml-2.0/saml2_advice.i
+++ b/swig/saml-2.0/saml2_advice.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Saml2Advice) LassoSaml2Advice;
@@ -6,6 +29,30 @@ typedef struct {
 } LassoSaml2Advice;
 %extend LassoSaml2Advice {
 
+#ifndef SWIG_PHP_RENAMES
+	%rename(assertionIDRef) AssertionIDRef;
+#endif
+	%newobject AssertionIDRef_get;
+	LassoNodeList *AssertionIDRef;
+
+#ifndef SWIG_PHP_RENAMES
+	%rename(assertionURIRef) AssertionURIRef;
+#endif
+	%newobject AssertionURIRef_get;
+	LassoStringList *AssertionURIRef;
+
+#ifndef SWIG_PHP_RENAMES
+	%rename(assertion) Assertion;
+#endif
+	%newobject Assertion_get;
+	LassoNodeList *Assertion;
+
+#ifndef SWIG_PHP_RENAMES
+	%rename(encryptedAssertion) EncryptedAssertion;
+#endif
+	%newobject EncryptedAssertion_get;
+	LassoNodeList *EncryptedAssertion;
+
 
 	/* Constructor, Destructor & Static Methods */
 	LassoSaml2Advice();
@@ -18,6 +65,38 @@ typedef struct {
 
 %{
 
+/* AssertionIDRef */
+
+#define LassoSaml2Advice_get_AssertionIDRef(self) get_node((self)->AssertionIDRef)
+#define LassoSaml2Advice_AssertionIDRef_get(self) get_node((self)->AssertionIDRef)
+#define LassoSaml2Advice_set_AssertionIDRef(self,value) set_node((gpointer*)&(self)->AssertionIDRef, (value))
+#define LassoSaml2Advice_AssertionIDRef_set(self,value) set_node((gpointer*)&(self)->AssertionIDRef, (value))
+                    
+
+/* AssertionURIRef */
+
+#define LassoSaml2Advice_get_AssertionURIRef(self) get_node((self)->AssertionURIRef)
+#define LassoSaml2Advice_AssertionURIRef_get(self) get_node((self)->AssertionURIRef)
+#define LassoSaml2Advice_set_AssertionURIRef(self,value) set_node((gpointer*)&(self)->AssertionURIRef, (value))
+#define LassoSaml2Advice_AssertionURIRef_set(self,value) set_node((gpointer*)&(self)->AssertionURIRef, (value))
+                    
+
+/* Assertion */
+
+#define LassoSaml2Advice_get_Assertion(self) get_node((self)->Assertion)
+#define LassoSaml2Advice_Assertion_get(self) get_node((self)->Assertion)
+#define LassoSaml2Advice_set_Assertion(self,value) set_node((gpointer*)&(self)->Assertion, (value))
+#define LassoSaml2Advice_Assertion_set(self,value) set_node((gpointer*)&(self)->Assertion, (value))
+                    
+
+/* EncryptedAssertion */
+
+#define LassoSaml2Advice_get_EncryptedAssertion(self) get_node((self)->EncryptedAssertion)
+#define LassoSaml2Advice_EncryptedAssertion_get(self) get_node((self)->EncryptedAssertion)
+#define LassoSaml2Advice_set_EncryptedAssertion(self,value) set_node((gpointer*)&(self)->EncryptedAssertion, (value))
+#define LassoSaml2Advice_EncryptedAssertion_set(self,value) set_node((gpointer*)&(self)->EncryptedAssertion, (value))
+                    
+
 
 /* Constructors, destructors & static methods implementations */
 
diff --git a/swig/saml-2.0/saml2_assertion.i b/swig/saml-2.0/saml2_assertion.i
index e503b2f6..00a88936 100644
--- a/swig/saml-2.0/saml2_assertion.i
+++ b/swig/saml-2.0/saml2_assertion.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Saml2Assertion) LassoSaml2Assertion;
@@ -21,28 +44,34 @@ typedef struct {
 #ifndef SWIG_PHP_RENAMES
 	%rename(issuer) Issuer;
 #endif
-	%newobject *Issuer_get;
+	%newobject Issuer_get;
 	LassoSaml2NameID *Issuer;
 
 #ifndef SWIG_PHP_RENAMES
 	%rename(subject) Subject;
 #endif
-	%newobject *Subject_get;
+	%newobject Subject_get;
 	LassoSaml2Subject *Subject;
 
 #ifndef SWIG_PHP_RENAMES
 	%rename(conditions) Conditions;
 #endif
-	%newobject *Conditions_get;
+	%newobject Conditions_get;
 	LassoSaml2Conditions *Conditions;
 
 #ifndef SWIG_PHP_RENAMES
 	%rename(advice) Advice;
 #endif
-	%newobject *Advice_get;
+	%newobject Advice_get;
 	LassoSaml2Advice *Advice;
 
 #ifndef SWIG_PHP_RENAMES
+	%rename(statement) Statement;
+#endif
+	%newobject Statement_get;
+	LassoNodeList *Statement;
+
+#ifndef SWIG_PHP_RENAMES
 	%rename(authnStatement) AuthnStatement;
 #endif
 	%newobject AuthnStatement_get;
@@ -60,6 +89,7 @@ typedef struct {
 	%newobject AttributeStatement_get;
 	LassoNodeList *AttributeStatement;
 
+
 	/* Constructor, Destructor & Static Methods */
 	LassoSaml2Assertion();
 	~LassoSaml2Assertion();
@@ -102,30 +132,38 @@ typedef struct {
 #define LassoSaml2Assertion_set_Advice(self,value) set_node((gpointer*)&(self)->Advice, (value))
 #define LassoSaml2Assertion_Advice_set(self,value) set_node((gpointer*)&(self)->Advice, (value))
                     
-/* AuthnStatement */
-
-#define LassoSaml2Assertion_get_AuthnStatement(self) get_node_list((self)->AuthnStatement)
-#define LassoSaml2Assertion_AuthnStatement_get(self) get_node_list((self)->AuthnStatement)
-#define LassoSaml2Assertion_set_AuthnStatement(self, value) set_node_list(&(self)->AuthnStatement, (value))
-#define LassoSaml2Assertion_AuthnStatement_set(self, value) set_node_list(&(self)->AuthnStatement, (value))
 
+/* Statement */
 
-/* AuthzDecisionStatement */
+#define LassoSaml2Assertion_get_Statement(self) get_node((self)->Statement)
+#define LassoSaml2Assertion_Statement_get(self) get_node((self)->Statement)
+#define LassoSaml2Assertion_set_Statement(self,value) set_node((gpointer*)&(self)->Statement, (value))
+#define LassoSaml2Assertion_Statement_set(self,value) set_node((gpointer*)&(self)->Statement, (value))
+                    
 
-#define LassoSaml2Assertion_get_AuthzDecisionStatement(self) get_node_list((self)->AuthzDecisionStatement)
-#define LassoSaml2Assertion_AuthzDecisionStatement_get(self) get_node_list((self)->AuthzDecisionStatement)
-#define LassoSaml2Assertion_set_AuthzDecisionStatement(self, value) set_node_list(&(self)->AuthzDecisionStatement, (value))
-#define LassoSaml2Assertion_AuthzDecisionStatement_set(self, value) set_node_list(&(self)->AuthzDecisionStatement, (value))
+/* AuthnStatement */
 
+#define LassoSaml2Assertion_get_AuthnStatement(self) get_node((self)->AuthnStatement)
+#define LassoSaml2Assertion_AuthnStatement_get(self) get_node((self)->AuthnStatement)
+#define LassoSaml2Assertion_set_AuthnStatement(self,value) set_node((gpointer*)&(self)->AuthnStatement, (value))
+#define LassoSaml2Assertion_AuthnStatement_set(self,value) set_node((gpointer*)&(self)->AuthnStatement, (value))
+                    
 
-/* AttributeStatement */
+/* AuthzDecisionStatement */
 
-#define LassoSaml2Assertion_get_AttributeStatement(self) get_node_list((self)->AttributeStatement)
-#define LassoSaml2Assertion_AttributeStatement_get(self) get_node_list((self)->AttributeStatement)
-#define LassoSaml2Assertion_set_AttributeStatement(self, value) set_node_list(&(self)->AttributeStatement, (value))
-#define LassoSaml2Assertion_AttributeStatement_set(self, value) set_node_list(&(self)->AttributeStatement, (value))
+#define LassoSaml2Assertion_get_AuthzDecisionStatement(self) get_node((self)->AuthzDecisionStatement)
+#define LassoSaml2Assertion_AuthzDecisionStatement_get(self) get_node((self)->AuthzDecisionStatement)
+#define LassoSaml2Assertion_set_AuthzDecisionStatement(self,value) set_node((gpointer*)&(self)->AuthzDecisionStatement, (value))
+#define LassoSaml2Assertion_AuthzDecisionStatement_set(self,value) set_node((gpointer*)&(self)->AuthzDecisionStatement, (value))
+                    
 
+/* AttributeStatement */
 
+#define LassoSaml2Assertion_get_AttributeStatement(self) get_node((self)->AttributeStatement)
+#define LassoSaml2Assertion_AttributeStatement_get(self) get_node((self)->AttributeStatement)
+#define LassoSaml2Assertion_set_AttributeStatement(self,value) set_node((gpointer*)&(self)->AttributeStatement, (value))
+#define LassoSaml2Assertion_AttributeStatement_set(self,value) set_node((gpointer*)&(self)->AttributeStatement, (value))
+                    
 
 
 /* Constructors, destructors & static methods implementations */
diff --git a/swig/saml-2.0/saml2_attribute.i b/swig/saml-2.0/saml2_attribute.i
index 874180e0..0b3c8268 100644
--- a/swig/saml-2.0/saml2_attribute.i
+++ b/swig/saml-2.0/saml2_attribute.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Saml2Attribute) LassoSaml2Attribute;
diff --git a/swig/saml-2.0/saml2_attribute_statement.i b/swig/saml-2.0/saml2_attribute_statement.i
index 739fb823..c1cdd0da 100644
--- a/swig/saml-2.0/saml2_attribute_statement.i
+++ b/swig/saml-2.0/saml2_attribute_statement.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Saml2AttributeStatement) LassoSaml2AttributeStatement;
@@ -6,6 +29,18 @@ typedef struct {
 } LassoSaml2AttributeStatement;
 %extend LassoSaml2AttributeStatement {
 
+#ifndef SWIG_PHP_RENAMES
+	%rename(attribute) Attribute;
+#endif
+	%newobject Attribute_get;
+	LassoNodeList *Attribute;
+
+#ifndef SWIG_PHP_RENAMES
+	%rename(encryptedAttribute) EncryptedAttribute;
+#endif
+	%newobject EncryptedAttribute_get;
+	LassoNodeList *EncryptedAttribute;
+
 	/* inherited from Saml2StatementAbstract */
 
 	/* Constructor, Destructor & Static Methods */
@@ -19,6 +54,22 @@ typedef struct {
 
 %{
 
+/* Attribute */
+
+#define LassoSaml2AttributeStatement_get_Attribute(self) get_node((self)->Attribute)
+#define LassoSaml2AttributeStatement_Attribute_get(self) get_node((self)->Attribute)
+#define LassoSaml2AttributeStatement_set_Attribute(self,value) set_node((gpointer*)&(self)->Attribute, (value))
+#define LassoSaml2AttributeStatement_Attribute_set(self,value) set_node((gpointer*)&(self)->Attribute, (value))
+                    
+
+/* EncryptedAttribute */
+
+#define LassoSaml2AttributeStatement_get_EncryptedAttribute(self) get_node((self)->EncryptedAttribute)
+#define LassoSaml2AttributeStatement_EncryptedAttribute_get(self) get_node((self)->EncryptedAttribute)
+#define LassoSaml2AttributeStatement_set_EncryptedAttribute(self,value) set_node((gpointer*)&(self)->EncryptedAttribute, (value))
+#define LassoSaml2AttributeStatement_EncryptedAttribute_set(self,value) set_node((gpointer*)&(self)->EncryptedAttribute, (value))
+                    
+
 
 /* Constructors, destructors & static methods implementations */
 
diff --git a/swig/saml-2.0/saml2_audience_restriction.i b/swig/saml-2.0/saml2_audience_restriction.i
index 6eb9d0f5..f0c5856c 100644
--- a/swig/saml-2.0/saml2_audience_restriction.i
+++ b/swig/saml-2.0/saml2_audience_restriction.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Saml2AudienceRestriction) LassoSaml2AudienceRestriction;
diff --git a/swig/saml-2.0/saml2_authn_context.i b/swig/saml-2.0/saml2_authn_context.i
index 1734e3ef..ad0c5ea4 100644
--- a/swig/saml-2.0/saml2_authn_context.i
+++ b/swig/saml-2.0/saml2_authn_context.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Saml2AuthnContext) LassoSaml2AuthnContext;
@@ -12,7 +35,7 @@ typedef struct {
 #endif
 	char *AuthnContextDeclRef;
 #ifndef SWIG_PHP_RENAMES
-	%rename(authenticationAuthority) AuthenticationAuthority;
+	%rename(authenticatingAuthority) AuthenticatingAuthority;
 #endif
 	char *AuthenticatingAuthority;
 } LassoSaml2AuthnContext;
diff --git a/swig/saml-2.0/saml2_authn_statement.i b/swig/saml-2.0/saml2_authn_statement.i
index 10c5f4b0..a4be5b57 100644
--- a/swig/saml-2.0/saml2_authn_statement.i
+++ b/swig/saml-2.0/saml2_authn_statement.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Saml2AuthnStatement) LassoSaml2AuthnStatement;
@@ -21,13 +44,13 @@ typedef struct {
 #ifndef SWIG_PHP_RENAMES
 	%rename(subjectLocality) SubjectLocality;
 #endif
-	%newobject *SubjectLocality_get;
+	%newobject SubjectLocality_get;
 	LassoSaml2SubjectLocality *SubjectLocality;
 
 #ifndef SWIG_PHP_RENAMES
 	%rename(authnContext) AuthnContext;
 #endif
-	%newobject *AuthnContext_get;
+	%newobject AuthnContext_get;
 	LassoSaml2AuthnContext *AuthnContext;
 
 	/* inherited from Saml2StatementAbstract */
diff --git a/swig/saml-2.0/saml2_authz_decision_statement.i b/swig/saml-2.0/saml2_authz_decision_statement.i
index 77e4f8c7..8e3e4efe 100644
--- a/swig/saml-2.0/saml2_authz_decision_statement.i
+++ b/swig/saml-2.0/saml2_authz_decision_statement.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Saml2AuthzDecisionStatement) LassoSaml2AuthzDecisionStatement;
@@ -17,13 +40,13 @@ typedef struct {
 #ifndef SWIG_PHP_RENAMES
 	%rename(action) Action;
 #endif
-	%newobject *Action_get;
+	%newobject Action_get;
 	LassoSaml2Action *Action;
 
 #ifndef SWIG_PHP_RENAMES
 	%rename(evidence) Evidence;
 #endif
-	%newobject *Evidence_get;
+	%newobject Evidence_get;
 	LassoSaml2Evidence *Evidence;
 
 	/* inherited from Saml2StatementAbstract */
diff --git a/swig/saml-2.0/saml2_base_idabstract.i b/swig/saml-2.0/saml2_base_idabstract.i
index 4a0744d5..dc4f30b8 100644
--- a/swig/saml-2.0/saml2_base_idabstract.i
+++ b/swig/saml-2.0/saml2_base_idabstract.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Saml2BaseIDAbstract) LassoSaml2BaseIDAbstract;
diff --git a/swig/saml-2.0/saml2_condition_abstract.i b/swig/saml-2.0/saml2_condition_abstract.i
index 46bb350c..be90b8cd 100644
--- a/swig/saml-2.0/saml2_condition_abstract.i
+++ b/swig/saml-2.0/saml2_condition_abstract.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Saml2ConditionAbstract) LassoSaml2ConditionAbstract;
diff --git a/swig/saml-2.0/saml2_conditions.i b/swig/saml-2.0/saml2_conditions.i
index e3f571fb..3b75baec 100644
--- a/swig/saml-2.0/saml2_conditions.i
+++ b/swig/saml-2.0/saml2_conditions.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Saml2Conditions) LassoSaml2Conditions;
@@ -13,6 +36,7 @@ typedef struct {
 	char *NotOnOrAfter;
 } LassoSaml2Conditions;
 %extend LassoSaml2Conditions {
+
 #ifndef SWIG_PHP_RENAMES
 	%rename(condition) Condition;
 #endif
@@ -25,6 +49,19 @@ typedef struct {
 	%newobject AudienceRestriction_get;
 	LassoNodeList *AudienceRestriction;
 
+#ifndef SWIG_PHP_RENAMES
+	%rename(oneTimeUse) OneTimeUse;
+#endif
+	%newobject OneTimeUse_get;
+	LassoNodeList *OneTimeUse;
+
+#ifndef SWIG_PHP_RENAMES
+	%rename(proxyRestriction) ProxyRestriction;
+#endif
+	%newobject ProxyRestriction_get;
+	LassoNodeList *ProxyRestriction;
+
+
 	/* Constructor, Destructor & Static Methods */
 	LassoSaml2Conditions();
 	~LassoSaml2Conditions();
@@ -38,19 +75,35 @@ typedef struct {
 
 /* Condition */
 
-#define LassoSaml2Conditions_get_Condition(self) get_node_list((self)->Condition)
-#define LassoSaml2Conditions_Condition_get(self) get_node_list((self)->Condition)
-#define LassoSaml2Conditions_set_Condition(self, value) set_node_list(&(self)->Condition, (value))
-#define LassoSaml2Conditions_Condition_set(self, value) set_node_list(&(self)->Condition, (value))
+#define LassoSaml2Conditions_get_Condition(self) get_node((self)->Condition)
+#define LassoSaml2Conditions_Condition_get(self) get_node((self)->Condition)
+#define LassoSaml2Conditions_set_Condition(self,value) set_node((gpointer*)&(self)->Condition, (value))
+#define LassoSaml2Conditions_Condition_set(self,value) set_node((gpointer*)&(self)->Condition, (value))
+                    
 
 /* AudienceRestriction */
 
-#define LassoSaml2Conditions_get_AudienceRestriction(self) get_node_list((self)->AudienceRestriction)
-#define LassoSaml2Conditions_AudienceRestriction_get(self) get_node_list((self)->AudienceRestriction)
-#define LassoSaml2Conditions_set_AudienceRestriction(self, value) set_node_list(&(self)->AudienceRestriction, (value))
-#define LassoSaml2Conditions_AudienceRestriction_set(self, value) set_node_list(&(self)->AudienceRestriction, (value))
+#define LassoSaml2Conditions_get_AudienceRestriction(self) get_node((self)->AudienceRestriction)
+#define LassoSaml2Conditions_AudienceRestriction_get(self) get_node((self)->AudienceRestriction)
+#define LassoSaml2Conditions_set_AudienceRestriction(self,value) set_node((gpointer*)&(self)->AudienceRestriction, (value))
+#define LassoSaml2Conditions_AudienceRestriction_set(self,value) set_node((gpointer*)&(self)->AudienceRestriction, (value))
+                    
+
+/* OneTimeUse */
+
+#define LassoSaml2Conditions_get_OneTimeUse(self) get_node((self)->OneTimeUse)
+#define LassoSaml2Conditions_OneTimeUse_get(self) get_node((self)->OneTimeUse)
+#define LassoSaml2Conditions_set_OneTimeUse(self,value) set_node((gpointer*)&(self)->OneTimeUse, (value))
+#define LassoSaml2Conditions_OneTimeUse_set(self,value) set_node((gpointer*)&(self)->OneTimeUse, (value))
+                    
 
+/* ProxyRestriction */
 
+#define LassoSaml2Conditions_get_ProxyRestriction(self) get_node((self)->ProxyRestriction)
+#define LassoSaml2Conditions_ProxyRestriction_get(self) get_node((self)->ProxyRestriction)
+#define LassoSaml2Conditions_set_ProxyRestriction(self,value) set_node((gpointer*)&(self)->ProxyRestriction, (value))
+#define LassoSaml2Conditions_ProxyRestriction_set(self,value) set_node((gpointer*)&(self)->ProxyRestriction, (value))
+                    
 
 
 /* Constructors, destructors & static methods implementations */
diff --git a/swig/saml-2.0/saml2_encrypted_element.i b/swig/saml-2.0/saml2_encrypted_element.i
index 02334ad2..5144d329 100644
--- a/swig/saml-2.0/saml2_encrypted_element.i
+++ b/swig/saml-2.0/saml2_encrypted_element.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Saml2EncryptedElement) LassoSaml2EncryptedElement;
diff --git a/swig/saml-2.0/saml2_evidence.i b/swig/saml-2.0/saml2_evidence.i
index b320c972..10a26104 100644
--- a/swig/saml-2.0/saml2_evidence.i
+++ b/swig/saml-2.0/saml2_evidence.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Saml2Evidence) LassoSaml2Evidence;
@@ -6,6 +29,30 @@ typedef struct {
 } LassoSaml2Evidence;
 %extend LassoSaml2Evidence {
 
+#ifndef SWIG_PHP_RENAMES
+	%rename(assertionIDRef) AssertionIDRef;
+#endif
+	%newobject AssertionIDRef_get;
+	LassoNodeList *AssertionIDRef;
+
+#ifndef SWIG_PHP_RENAMES
+	%rename(assertionURIRef) AssertionURIRef;
+#endif
+	%newobject AssertionURIRef_get;
+	LassoStringList *AssertionURIRef;
+
+#ifndef SWIG_PHP_RENAMES
+	%rename(assertion) Assertion;
+#endif
+	%newobject Assertion_get;
+	LassoNodeList *Assertion;
+
+#ifndef SWIG_PHP_RENAMES
+	%rename(encryptedAssertion) EncryptedAssertion;
+#endif
+	%newobject EncryptedAssertion_get;
+	LassoNodeList *EncryptedAssertion;
+
 
 	/* Constructor, Destructor & Static Methods */
 	LassoSaml2Evidence();
@@ -18,6 +65,38 @@ typedef struct {
 
 %{
 
+/* AssertionIDRef */
+
+#define LassoSaml2Evidence_get_AssertionIDRef(self) get_node((self)->AssertionIDRef)
+#define LassoSaml2Evidence_AssertionIDRef_get(self) get_node((self)->AssertionIDRef)
+#define LassoSaml2Evidence_set_AssertionIDRef(self,value) set_node((gpointer*)&(self)->AssertionIDRef, (value))
+#define LassoSaml2Evidence_AssertionIDRef_set(self,value) set_node((gpointer*)&(self)->AssertionIDRef, (value))
+                    
+
+/* AssertionURIRef */
+
+#define LassoSaml2Evidence_get_AssertionURIRef(self) get_node((self)->AssertionURIRef)
+#define LassoSaml2Evidence_AssertionURIRef_get(self) get_node((self)->AssertionURIRef)
+#define LassoSaml2Evidence_set_AssertionURIRef(self,value) set_node((gpointer*)&(self)->AssertionURIRef, (value))
+#define LassoSaml2Evidence_AssertionURIRef_set(self,value) set_node((gpointer*)&(self)->AssertionURIRef, (value))
+                    
+
+/* Assertion */
+
+#define LassoSaml2Evidence_get_Assertion(self) get_node((self)->Assertion)
+#define LassoSaml2Evidence_Assertion_get(self) get_node((self)->Assertion)
+#define LassoSaml2Evidence_set_Assertion(self,value) set_node((gpointer*)&(self)->Assertion, (value))
+#define LassoSaml2Evidence_Assertion_set(self,value) set_node((gpointer*)&(self)->Assertion, (value))
+                    
+
+/* EncryptedAssertion */
+
+#define LassoSaml2Evidence_get_EncryptedAssertion(self) get_node((self)->EncryptedAssertion)
+#define LassoSaml2Evidence_EncryptedAssertion_get(self) get_node((self)->EncryptedAssertion)
+#define LassoSaml2Evidence_set_EncryptedAssertion(self,value) set_node((gpointer*)&(self)->EncryptedAssertion, (value))
+#define LassoSaml2Evidence_EncryptedAssertion_set(self,value) set_node((gpointer*)&(self)->EncryptedAssertion, (value))
+                    
+
 
 /* Constructors, destructors & static methods implementations */
 
diff --git a/swig/saml-2.0/saml2_key_info_confirmation_data.i b/swig/saml-2.0/saml2_key_info_confirmation_data.i
index 33393935..8c87614f 100644
--- a/swig/saml-2.0/saml2_key_info_confirmation_data.i
+++ b/swig/saml-2.0/saml2_key_info_confirmation_data.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Saml2KeyInfoConfirmationData) LassoSaml2KeyInfoConfirmationData;
diff --git a/swig/saml-2.0/saml2_name_id.i b/swig/saml-2.0/saml2_name_id.i
index 9f2ab8ca..22a71502 100644
--- a/swig/saml-2.0/saml2_name_id.i
+++ b/swig/saml-2.0/saml2_name_id.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Saml2NameID) LassoSaml2NameID;
@@ -9,7 +32,7 @@ typedef struct {
 #endif
 	char *Format;
 #ifndef SWIG_PHP_RENAMES
-	%rename(spProviderId) SPProviderID;
+	%rename(spProvidedId) SPProvidedID;
 #endif
 	char *SPProvidedID;
 #ifndef SWIG_PHP_RENAMES
diff --git a/swig/saml-2.0/saml2_one_time_use.i b/swig/saml-2.0/saml2_one_time_use.i
index 2b959d44..87fc91f2 100644
--- a/swig/saml-2.0/saml2_one_time_use.i
+++ b/swig/saml-2.0/saml2_one_time_use.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Saml2OneTimeUse) LassoSaml2OneTimeUse;
diff --git a/swig/saml-2.0/saml2_proxy_restriction.i b/swig/saml-2.0/saml2_proxy_restriction.i
index 48fc5589..e24732ac 100644
--- a/swig/saml-2.0/saml2_proxy_restriction.i
+++ b/swig/saml-2.0/saml2_proxy_restriction.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Saml2ProxyRestriction) LassoSaml2ProxyRestriction;
diff --git a/swig/saml-2.0/saml2_statement_abstract.i b/swig/saml-2.0/saml2_statement_abstract.i
index 2a3a39dc..14b1c629 100644
--- a/swig/saml-2.0/saml2_statement_abstract.i
+++ b/swig/saml-2.0/saml2_statement_abstract.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Saml2StatementAbstract) LassoSaml2StatementAbstract;
diff --git a/swig/saml-2.0/saml2_subject.i b/swig/saml-2.0/saml2_subject.i
index b7f99b43..7a3dee8c 100644
--- a/swig/saml-2.0/saml2_subject.i
+++ b/swig/saml-2.0/saml2_subject.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Saml2Subject) LassoSaml2Subject;
@@ -9,25 +32,25 @@ typedef struct {
 #ifndef SWIG_PHP_RENAMES
 	%rename(baseID) BaseID;
 #endif
-	%newobject *BaseID_get;
+	%newobject BaseID_get;
 	LassoSaml2BaseIDAbstract *BaseID;
 
 #ifndef SWIG_PHP_RENAMES
 	%rename(nameID) NameID;
 #endif
-	%newobject *NameID_get;
+	%newobject NameID_get;
 	LassoSaml2NameID *NameID;
 
 #ifndef SWIG_PHP_RENAMES
 	%rename(encryptedID) EncryptedID;
 #endif
-	%newobject *EncryptedID_get;
+	%newobject EncryptedID_get;
 	LassoSaml2EncryptedElement *EncryptedID;
 
 #ifndef SWIG_PHP_RENAMES
 	%rename(subjectConfirmation) SubjectConfirmation;
 #endif
-	%newobject *SubjectConfirmation_get;
+	%newobject SubjectConfirmation_get;
 	LassoSaml2SubjectConfirmation *SubjectConfirmation;
 
 
diff --git a/swig/saml-2.0/saml2_subject_confirmation.i b/swig/saml-2.0/saml2_subject_confirmation.i
index d45e6e22..5dfc8a56 100644
--- a/swig/saml-2.0/saml2_subject_confirmation.i
+++ b/swig/saml-2.0/saml2_subject_confirmation.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Saml2SubjectConfirmation) LassoSaml2SubjectConfirmation;
@@ -13,25 +36,25 @@ typedef struct {
 #ifndef SWIG_PHP_RENAMES
 	%rename(baseID) BaseID;
 #endif
-	%newobject *BaseID_get;
+	%newobject BaseID_get;
 	LassoSaml2BaseIDAbstract *BaseID;
 
 #ifndef SWIG_PHP_RENAMES
 	%rename(nameID) NameID;
 #endif
-	%newobject *NameID_get;
+	%newobject NameID_get;
 	LassoSaml2NameID *NameID;
 
 #ifndef SWIG_PHP_RENAMES
 	%rename(encryptedID) EncryptedID;
 #endif
-	%newobject *EncryptedID_get;
+	%newobject EncryptedID_get;
 	LassoSaml2EncryptedElement *EncryptedID;
 
 #ifndef SWIG_PHP_RENAMES
 	%rename(subjectConfirmationData) SubjectConfirmationData;
 #endif
-	%newobject *SubjectConfirmationData_get;
+	%newobject SubjectConfirmationData_get;
 	LassoSaml2SubjectConfirmationData *SubjectConfirmationData;
 
 
diff --git a/swig/saml-2.0/saml2_subject_confirmation_data.i b/swig/saml-2.0/saml2_subject_confirmation_data.i
index e2e9f6fa..3a4cf221 100644
--- a/swig/saml-2.0/saml2_subject_confirmation_data.i
+++ b/swig/saml-2.0/saml2_subject_confirmation_data.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Saml2SubjectConfirmationData) LassoSaml2SubjectConfirmationData;
diff --git a/swig/saml-2.0/saml2_subject_locality.i b/swig/saml-2.0/saml2_subject_locality.i
index 9326013f..081a3d03 100644
--- a/swig/saml-2.0/saml2_subject_locality.i
+++ b/swig/saml-2.0/saml2_subject_locality.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Saml2SubjectLocality) LassoSaml2SubjectLocality;
@@ -8,7 +31,7 @@ typedef struct {
 #endif
 	char *Address;
 #ifndef SWIG_PHP_RENAMES
-	%rename(dnsName) DNSName;
+	%rename(dNSName) DNSName;
 #endif
 	char *DNSName;
 } LassoSaml2SubjectLocality;
diff --git a/swig/saml-2.0/samlp2_artifact_resolve.i b/swig/saml-2.0/samlp2_artifact_resolve.i
index 83528dc0..a1251597 100644
--- a/swig/saml-2.0/samlp2_artifact_resolve.i
+++ b/swig/saml-2.0/samlp2_artifact_resolve.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Samlp2ArtifactResolve) LassoSamlp2ArtifactResolve;
diff --git a/swig/saml-2.0/samlp2_artifact_response.i b/swig/saml-2.0/samlp2_artifact_response.i
index d33978f8..f556b3f2 100644
--- a/swig/saml-2.0/samlp2_artifact_response.i
+++ b/swig/saml-2.0/samlp2_artifact_response.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Samlp2ArtifactResponse) LassoSamlp2ArtifactResponse;
@@ -6,7 +29,7 @@ typedef struct {
 } LassoSamlp2ArtifactResponse;
 %extend LassoSamlp2ArtifactResponse {
 
-	%newobject *any_get;
+	%newobject any_get;
 	LassoNode *any;
 
 	/* inherited from Samlp2StatusResponse */
diff --git a/swig/saml-2.0/samlp2_assertion_idrequest.i b/swig/saml-2.0/samlp2_assertion_idrequest.i
index e85c9c53..31b5f486 100644
--- a/swig/saml-2.0/samlp2_assertion_idrequest.i
+++ b/swig/saml-2.0/samlp2_assertion_idrequest.i
@@ -1,10 +1,33 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Samlp2AssertionIDRequest) LassoSamlp2AssertionIDRequest;
 #endif
 typedef struct {
 #ifndef SWIG_PHP_RENAMES
-	%rename(assertionIdRef) AssertionIDRef;
+	%rename(assertionIDRef) AssertionIDRef;
 #endif
 	char *AssertionIDRef;
 } LassoSamlp2AssertionIDRequest;
diff --git a/swig/saml-2.0/samlp2_attribute_query.i b/swig/saml-2.0/samlp2_attribute_query.i
index 55adb794..b2c7a907 100644
--- a/swig/saml-2.0/samlp2_attribute_query.i
+++ b/swig/saml-2.0/samlp2_attribute_query.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Samlp2AttributeQuery) LassoSamlp2AttributeQuery;
@@ -9,7 +32,7 @@ typedef struct {
 #ifndef SWIG_PHP_RENAMES
 	%rename(attribute) Attribute;
 #endif
-	%newobject *Attribute_get;
+	%newobject Attribute_get;
 	LassoSaml2Attribute *Attribute;
 
 	/* inherited from Samlp2SubjectQueryAbstract */
diff --git a/swig/saml-2.0/samlp2_authn_query.i b/swig/saml-2.0/samlp2_authn_query.i
index 9ae622ee..290334d2 100644
--- a/swig/saml-2.0/samlp2_authn_query.i
+++ b/swig/saml-2.0/samlp2_authn_query.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Samlp2AuthnQuery) LassoSamlp2AuthnQuery;
@@ -13,7 +36,7 @@ typedef struct {
 #ifndef SWIG_PHP_RENAMES
 	%rename(requestedAuthnContext) RequestedAuthnContext;
 #endif
-	%newobject *RequestedAuthnContext_get;
+	%newobject RequestedAuthnContext_get;
 	LassoSamlp2RequestedAuthnContext *RequestedAuthnContext;
 
 	/* inherited from Samlp2SubjectQueryAbstract */
diff --git a/swig/saml-2.0/samlp2_authn_request.i b/swig/saml-2.0/samlp2_authn_request.i
index 0d5e4313..7c23b403 100644
--- a/swig/saml-2.0/samlp2_authn_request.i
+++ b/swig/saml-2.0/samlp2_authn_request.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Samlp2AuthnRequest) LassoSamlp2AuthnRequest;
@@ -19,11 +42,17 @@ typedef struct {
 	%rename(assertionConsumerServiceIndex) AssertionConsumerServiceIndex;
 #endif
 	int AssertionConsumerServiceIndex;
+#ifndef SWIG_PHP_RENAMES
+	%rename(assertionConsumerServiceURL) AssertionConsumerServiceURL;
+#endif
 	char *AssertionConsumerServiceURL;
 #ifndef SWIG_PHP_RENAMES
 	%rename(attributeConsumingServiceIndex) AttributeConsumingServiceIndex;
 #endif
 	int AttributeConsumingServiceIndex;
+#ifndef SWIG_PHP_RENAMES
+	%rename(providerName) ProviderName;
+#endif
 	char *ProviderName;
 } LassoSamlp2AuthnRequest;
 %extend LassoSamlp2AuthnRequest {
@@ -31,31 +60,31 @@ typedef struct {
 #ifndef SWIG_PHP_RENAMES
 	%rename(subject) Subject;
 #endif
-	%newobject *Subject_get;
+	%newobject Subject_get;
 	LassoSaml2Subject *Subject;
 
 #ifndef SWIG_PHP_RENAMES
 	%rename(nameIDPolicy) NameIDPolicy;
 #endif
-	%newobject *NameIDPolicy_get;
+	%newobject NameIDPolicy_get;
 	LassoSamlp2NameIDPolicy *NameIDPolicy;
 
 #ifndef SWIG_PHP_RENAMES
 	%rename(conditions) Conditions;
 #endif
-	%newobject *Conditions_get;
+	%newobject Conditions_get;
 	LassoSaml2Conditions *Conditions;
 
 #ifndef SWIG_PHP_RENAMES
 	%rename(requestedAuthnContext) RequestedAuthnContext;
 #endif
-	%newobject *RequestedAuthnContext_get;
+	%newobject RequestedAuthnContext_get;
 	LassoSamlp2RequestedAuthnContext *RequestedAuthnContext;
 
 #ifndef SWIG_PHP_RENAMES
 	%rename(scoping) Scoping;
 #endif
-	%newobject *Scoping_get;
+	%newobject Scoping_get;
 	LassoSamlp2Scoping *Scoping;
 
 	/* inherited from Samlp2RequestAbstract */
diff --git a/swig/saml-2.0/samlp2_authz_decision_query.i b/swig/saml-2.0/samlp2_authz_decision_query.i
index 9bbba796..cc675f8d 100644
--- a/swig/saml-2.0/samlp2_authz_decision_query.i
+++ b/swig/saml-2.0/samlp2_authz_decision_query.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Samlp2AuthzDecisionQuery) LassoSamlp2AuthzDecisionQuery;
@@ -13,13 +36,13 @@ typedef struct {
 #ifndef SWIG_PHP_RENAMES
 	%rename(action) Action;
 #endif
-	%newobject *Action_get;
+	%newobject Action_get;
 	LassoSaml2Action *Action;
 
 #ifndef SWIG_PHP_RENAMES
 	%rename(evidence) Evidence;
 #endif
-	%newobject *Evidence_get;
+	%newobject Evidence_get;
 	LassoSaml2Evidence *Evidence;
 
 	/* inherited from Samlp2SubjectQueryAbstract */
diff --git a/swig/saml-2.0/samlp2_extensions.i b/swig/saml-2.0/samlp2_extensions.i
index bfcbf1bb..95384273 100644
--- a/swig/saml-2.0/samlp2_extensions.i
+++ b/swig/saml-2.0/samlp2_extensions.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Samlp2Extensions) LassoSamlp2Extensions;
diff --git a/swig/saml-2.0/samlp2_idp_entry.i b/swig/saml-2.0/samlp2_idp_entry.i
index 98a7b787..3d032f1a 100644
--- a/swig/saml-2.0/samlp2_idp_entry.i
+++ b/swig/saml-2.0/samlp2_idp_entry.i
@@ -1,10 +1,33 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Samlp2IDPEntry) LassoSamlp2IDPEntry;
 #endif
 typedef struct {
 #ifndef SWIG_PHP_RENAMES
-	%rename(providerId) ProviderID;
+	%rename(providerID) ProviderID;
 #endif
 	char *ProviderID;
 #ifndef SWIG_PHP_RENAMES
diff --git a/swig/saml-2.0/samlp2_idp_list.i b/swig/saml-2.0/samlp2_idp_list.i
index 1212aba7..f93fece1 100644
--- a/swig/saml-2.0/samlp2_idp_list.i
+++ b/swig/saml-2.0/samlp2_idp_list.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Samlp2IDPList) LassoSamlp2IDPList;
@@ -13,7 +36,7 @@ typedef struct {
 #ifndef SWIG_PHP_RENAMES
 	%rename(iDPEntry) IDPEntry;
 #endif
-	%newobject *IDPEntry_get;
+	%newobject IDPEntry_get;
 	LassoSamlp2IDPEntry *IDPEntry;
 
 
diff --git a/swig/saml-2.0/samlp2_logout_request.i b/swig/saml-2.0/samlp2_logout_request.i
index 632ea2a8..53c97ecd 100644
--- a/swig/saml-2.0/samlp2_logout_request.i
+++ b/swig/saml-2.0/samlp2_logout_request.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Samlp2LogoutRequest) LassoSamlp2LogoutRequest;
@@ -7,12 +30,10 @@ typedef struct {
 	%rename(sessionIndex) SessionIndex;
 #endif
 	char *SessionIndex;
-
 #ifndef SWIG_PHP_RENAMES
 	%rename(reason) Reason;
 #endif
 	char *Reason;
-
 #ifndef SWIG_PHP_RENAMES
 	%rename(notOnOrAfter) NotOnOrAfter;
 #endif
@@ -23,19 +44,19 @@ typedef struct {
 #ifndef SWIG_PHP_RENAMES
 	%rename(baseID) BaseID;
 #endif
-	%newobject *BaseID_get;
+	%newobject BaseID_get;
 	LassoSaml2BaseIDAbstract *BaseID;
 
 #ifndef SWIG_PHP_RENAMES
 	%rename(nameID) NameID;
 #endif
-	%newobject *NameID_get;
+	%newobject NameID_get;
 	LassoSaml2NameID *NameID;
 
 #ifndef SWIG_PHP_RENAMES
 	%rename(encryptedID) EncryptedID;
 #endif
-	%newobject *EncryptedID_get;
+	%newobject EncryptedID_get;
 	LassoSaml2EncryptedElement *EncryptedID;
 
 	/* inherited from Samlp2RequestAbstract */
diff --git a/swig/saml-2.0/samlp2_manage_name_id_request.i b/swig/saml-2.0/samlp2_manage_name_id_request.i
index 0967e409..3f4c39c2 100644
--- a/swig/saml-2.0/samlp2_manage_name_id_request.i
+++ b/swig/saml-2.0/samlp2_manage_name_id_request.i
@@ -1,10 +1,33 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Samlp2ManageNameIDRequest) LassoSamlp2ManageNameIDRequest;
 #endif
 typedef struct {
 #ifndef SWIG_PHP_RENAMES
-	%rename(newId) NewID;
+	%rename(newID) NewID;
 #endif
 	char *NewID;
 } LassoSamlp2ManageNameIDRequest;
@@ -13,25 +36,25 @@ typedef struct {
 #ifndef SWIG_PHP_RENAMES
 	%rename(nameID) NameID;
 #endif
-	%newobject *NameID_get;
+	%newobject NameID_get;
 	LassoSaml2NameID *NameID;
 
 #ifndef SWIG_PHP_RENAMES
 	%rename(encryptedID) EncryptedID;
 #endif
-	%newobject *EncryptedID_get;
+	%newobject EncryptedID_get;
 	LassoSaml2EncryptedElement *EncryptedID;
 
 #ifndef SWIG_PHP_RENAMES
 	%rename(newEncryptedID) NewEncryptedID;
 #endif
-	%newobject *NewEncryptedID_get;
+	%newobject NewEncryptedID_get;
 	LassoSaml2EncryptedElement *NewEncryptedID;
 
 #ifndef SWIG_PHP_RENAMES
 	%rename(terminate) Terminate;
 #endif
-	%newobject *Terminate_get;
+	%newobject Terminate_get;
 	LassoSamlp2Terminate *Terminate;
 
 	/* inherited from Samlp2RequestAbstract */
diff --git a/swig/saml-2.0/samlp2_name_id_mapping_request.i b/swig/saml-2.0/samlp2_name_id_mapping_request.i
index d673d3a8..1b747b15 100644
--- a/swig/saml-2.0/samlp2_name_id_mapping_request.i
+++ b/swig/saml-2.0/samlp2_name_id_mapping_request.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Samlp2NameIDMappingRequest) LassoSamlp2NameIDMappingRequest;
@@ -9,25 +32,25 @@ typedef struct {
 #ifndef SWIG_PHP_RENAMES
 	%rename(baseID) BaseID;
 #endif
-	%newobject *BaseID_get;
+	%newobject BaseID_get;
 	LassoSaml2BaseIDAbstract *BaseID;
 
 #ifndef SWIG_PHP_RENAMES
 	%rename(nameID) NameID;
 #endif
-	%newobject *NameID_get;
+	%newobject NameID_get;
 	LassoSaml2NameID *NameID;
 
 #ifndef SWIG_PHP_RENAMES
 	%rename(encryptedID) EncryptedID;
 #endif
-	%newobject *EncryptedID_get;
+	%newobject EncryptedID_get;
 	LassoSaml2EncryptedElement *EncryptedID;
 
 #ifndef SWIG_PHP_RENAMES
 	%rename(nameIDPolicy) NameIDPolicy;
 #endif
-	%newobject *NameIDPolicy_get;
+	%newobject NameIDPolicy_get;
 	LassoSamlp2NameIDPolicy *NameIDPolicy;
 
 	/* inherited from Samlp2RequestAbstract */
diff --git a/swig/saml-2.0/samlp2_name_id_mapping_response.i b/swig/saml-2.0/samlp2_name_id_mapping_response.i
index 77f5fbe6..8815121f 100644
--- a/swig/saml-2.0/samlp2_name_id_mapping_response.i
+++ b/swig/saml-2.0/samlp2_name_id_mapping_response.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Samlp2NameIDMappingResponse) LassoSamlp2NameIDMappingResponse;
@@ -9,13 +32,13 @@ typedef struct {
 #ifndef SWIG_PHP_RENAMES
 	%rename(nameID) NameID;
 #endif
-	%newobject *NameID_get;
+	%newobject NameID_get;
 	LassoSaml2NameID *NameID;
 
 #ifndef SWIG_PHP_RENAMES
 	%rename(encryptedID) EncryptedID;
 #endif
-	%newobject *EncryptedID_get;
+	%newobject EncryptedID_get;
 	LassoSaml2EncryptedElement *EncryptedID;
 
 	/* inherited from Samlp2StatusResponse */
diff --git a/swig/saml-2.0/samlp2_name_id_policy.i b/swig/saml-2.0/samlp2_name_id_policy.i
index 4e0c5404..f9f089cd 100644
--- a/swig/saml-2.0/samlp2_name_id_policy.i
+++ b/swig/saml-2.0/samlp2_name_id_policy.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Samlp2NameIDPolicy) LassoSamlp2NameIDPolicy;
diff --git a/swig/saml-2.0/samlp2_request_abstract.i b/swig/saml-2.0/samlp2_request_abstract.i
index 2674ee55..895f7b6c 100644
--- a/swig/saml-2.0/samlp2_request_abstract.i
+++ b/swig/saml-2.0/samlp2_request_abstract.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Samlp2RequestAbstract) LassoSamlp2RequestAbstract;
@@ -29,13 +52,13 @@ typedef struct {
 #ifndef SWIG_PHP_RENAMES
 	%rename(issuer) Issuer;
 #endif
-	%newobject *Issuer_get;
+	%newobject Issuer_get;
 	LassoSaml2NameID *Issuer;
 
 #ifndef SWIG_PHP_RENAMES
 	%rename(extensions) Extensions;
 #endif
-	%newobject *Extensions_get;
+	%newobject Extensions_get;
 	LassoSamlp2Extensions *Extensions;
 
 
diff --git a/swig/saml-2.0/samlp2_requested_authn_context.i b/swig/saml-2.0/samlp2_requested_authn_context.i
index 66fb2f68..d5a4cbe2 100644
--- a/swig/saml-2.0/samlp2_requested_authn_context.i
+++ b/swig/saml-2.0/samlp2_requested_authn_context.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Samlp2RequestedAuthnContext) LassoSamlp2RequestedAuthnContext;
@@ -9,11 +32,19 @@ typedef struct {
 	char *Comparison;
 } LassoSamlp2RequestedAuthnContext;
 %extend LassoSamlp2RequestedAuthnContext {
-	%newobject authnContextClassRef_get;
-	LassoStringList *authnContextClassRef;
 
-	%newobject authnContextDeclRef_get;
-	LassoStringList *authnContextDeclRef;
+#ifndef SWIG_PHP_RENAMES
+	%rename(authnContextClassRef) AuthnContextClassRef;
+#endif
+	%newobject AuthnContextClassRef_get;
+	LassoStringList *AuthnContextClassRef;
+
+#ifndef SWIG_PHP_RENAMES
+	%rename(authnContextDeclRef) AuthnContextDeclRef;
+#endif
+	%newobject AuthnContextDeclRef_get;
+	LassoStringList *AuthnContextDeclRef;
+
 
 	/* Constructor, Destructor & Static Methods */
 	LassoSamlp2RequestedAuthnContext();
@@ -26,17 +57,21 @@ typedef struct {
 
 %{
 
-/* authnContextClassRef */
-#define LassoSamlp2RequestedAuthnContext_get_authnContextClassRef(self) get_string_list((self)->AuthnContextClassRef)
-#define LassoSamlp2RequestedAuthnContext_authnContextClassRef_get(self) get_string_list((self)->AuthnContextClassRef)
-#define LassoSamlp2RequestedAuthnContext_set_authnContextClassRef(self, value) set_string_list(&(self)->AuthnContextClassRef, (value))
-#define LassoSamlp2RequestedAuthnContext_authnContextClassRef_set(self, value) set_string_list(&(self)->AuthnContextClassRef, (value))
-
-/* authnContextDeclRef */
-#define LassoSamlp2RequestedAuthnContext_get_authnContextDeclRef(self) get_string_list((self)->AuthnContextDeclRef)
-#define LassoSamlp2RequestedAuthnContext_authnContextDeclRef_get(self) get_string_list((self)->AuthnContextDeclRef)
-#define LassoSamlp2RequestedAuthnContext_set_authnContextDeclRef(self, value) set_string_list(&(self)->AuthnContextDeclRef, (value))
-#define LassoSamlp2RequestedAuthnContext_authnContextDeclRef_set(self, value) set_string_list(&(self)->AuthnContextDeclRef, (value))
+/* AuthnContextClassRef */
+
+#define LassoSamlp2RequestedAuthnContext_get_AuthnContextClassRef(self) get_node((self)->AuthnContextClassRef)
+#define LassoSamlp2RequestedAuthnContext_AuthnContextClassRef_get(self) get_node((self)->AuthnContextClassRef)
+#define LassoSamlp2RequestedAuthnContext_set_AuthnContextClassRef(self,value) set_node((gpointer*)&(self)->AuthnContextClassRef, (value))
+#define LassoSamlp2RequestedAuthnContext_AuthnContextClassRef_set(self,value) set_node((gpointer*)&(self)->AuthnContextClassRef, (value))
+                    
+
+/* AuthnContextDeclRef */
+
+#define LassoSamlp2RequestedAuthnContext_get_AuthnContextDeclRef(self) get_node((self)->AuthnContextDeclRef)
+#define LassoSamlp2RequestedAuthnContext_AuthnContextDeclRef_get(self) get_node((self)->AuthnContextDeclRef)
+#define LassoSamlp2RequestedAuthnContext_set_AuthnContextDeclRef(self,value) set_node((gpointer*)&(self)->AuthnContextDeclRef, (value))
+#define LassoSamlp2RequestedAuthnContext_AuthnContextDeclRef_set(self,value) set_node((gpointer*)&(self)->AuthnContextDeclRef, (value))
+                    
 
 
 /* Constructors, destructors & static methods implementations */
diff --git a/swig/saml-2.0/samlp2_response.i b/swig/saml-2.0/samlp2_response.i
index c68c6c6f..574f36ff 100644
--- a/swig/saml-2.0/samlp2_response.i
+++ b/swig/saml-2.0/samlp2_response.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Samlp2Response) LassoSamlp2Response;
@@ -6,6 +29,18 @@ typedef struct {
 } LassoSamlp2Response;
 %extend LassoSamlp2Response {
 
+#ifndef SWIG_PHP_RENAMES
+	%rename(assertion) Assertion;
+#endif
+	%newobject Assertion_get;
+	LassoNodeList *Assertion;
+
+#ifndef SWIG_PHP_RENAMES
+	%rename(encryptedAssertion) EncryptedAssertion;
+#endif
+	%newobject EncryptedAssertion_get;
+	LassoNodeList *EncryptedAssertion;
+
 	/* inherited from Samlp2StatusResponse */
 #ifndef SWIG_PHP_RENAMES
 	%rename(issuer) Issuer;
@@ -50,12 +85,6 @@ typedef struct {
 #endif
 	char *Consent;
 
-#ifndef SWIG_PHP_RENAMES
-	%rename(assertion) Assertion;
-#endif
-	%newobject Assertion_get;
-	LassoNodeList *Assertion;
-
 	/* Constructor, Destructor & Static Methods */
 	LassoSamlp2Response();
 	~LassoSamlp2Response();
@@ -67,6 +96,22 @@ typedef struct {
 
 %{
 
+/* Assertion */
+
+#define LassoSamlp2Response_get_Assertion(self) get_node((self)->Assertion)
+#define LassoSamlp2Response_Assertion_get(self) get_node((self)->Assertion)
+#define LassoSamlp2Response_set_Assertion(self,value) set_node((gpointer*)&(self)->Assertion, (value))
+#define LassoSamlp2Response_Assertion_set(self,value) set_node((gpointer*)&(self)->Assertion, (value))
+                    
+
+/* EncryptedAssertion */
+
+#define LassoSamlp2Response_get_EncryptedAssertion(self) get_node((self)->EncryptedAssertion)
+#define LassoSamlp2Response_EncryptedAssertion_get(self) get_node((self)->EncryptedAssertion)
+#define LassoSamlp2Response_set_EncryptedAssertion(self,value) set_node((gpointer*)&(self)->EncryptedAssertion, (value))
+#define LassoSamlp2Response_EncryptedAssertion_set(self,value) set_node((gpointer*)&(self)->EncryptedAssertion, (value))
+                    
+
 /* inherited from StatusResponse */
 
 /* Issuer */
@@ -142,14 +187,6 @@ typedef struct {
 #define LassoSamlp2Response_Consent_set(self,value) set_string(&LASSO_SAMLP2_STATUS_RESPONSE(self)->Consent, (value))
 
 
-/* Assertion */
-
-#define LassoSamlp2Response_get_Assertion(self) get_node_list((self)->Assertion)
-#define LassoSamlp2Response_Assertion_get(self) get_node_list((self)->Assertion)
-#define LassoSamlp2Response_set_Assertion(self, value) set_node_list(&(self)->Assertion, (value))
-#define LassoSamlp2Response_Assertion_set(self, value) set_node_list(&(self)->Assertion, (value))
-
-
 /* Constructors, destructors & static methods implementations */
 
 #define new_LassoSamlp2Response lasso_samlp2_response_new
diff --git a/swig/saml-2.0/samlp2_scoping.i b/swig/saml-2.0/samlp2_scoping.i
index 3859113b..2b3af4ca 100644
--- a/swig/saml-2.0/samlp2_scoping.i
+++ b/swig/saml-2.0/samlp2_scoping.i
@@ -1,10 +1,33 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Samlp2Scoping) LassoSamlp2Scoping;
 #endif
 typedef struct {
 #ifndef SWIG_PHP_RENAMES
-	%rename(requesterId) RequesterID;
+	%rename(requesterID) RequesterID;
 #endif
 	char *RequesterID;
 #ifndef SWIG_PHP_RENAMES
@@ -17,7 +40,7 @@ typedef struct {
 #ifndef SWIG_PHP_RENAMES
 	%rename(iDPList) IDPList;
 #endif
-	%newobject *IDPList_get;
+	%newobject IDPList_get;
 	LassoSamlp2IDPList *IDPList;
 
 
diff --git a/swig/saml-2.0/samlp2_status.i b/swig/saml-2.0/samlp2_status.i
index b273f6ab..a32ab7b3 100644
--- a/swig/saml-2.0/samlp2_status.i
+++ b/swig/saml-2.0/samlp2_status.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Samlp2Status) LassoSamlp2Status;
@@ -13,13 +36,13 @@ typedef struct {
 #ifndef SWIG_PHP_RENAMES
 	%rename(statusCode) StatusCode;
 #endif
-	%newobject *StatusCode_get;
+	%newobject StatusCode_get;
 	LassoSamlp2StatusCode *StatusCode;
 
 #ifndef SWIG_PHP_RENAMES
 	%rename(statusDetail) StatusDetail;
 #endif
-	%newobject *StatusDetail_get;
+	%newobject StatusDetail_get;
 	LassoSamlp2StatusDetail *StatusDetail;
 
 
diff --git a/swig/saml-2.0/samlp2_status_code.i b/swig/saml-2.0/samlp2_status_code.i
index 65decb0b..7b6aed03 100644
--- a/swig/saml-2.0/samlp2_status_code.i
+++ b/swig/saml-2.0/samlp2_status_code.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Samlp2StatusCode) LassoSamlp2StatusCode;
@@ -13,7 +36,7 @@ typedef struct {
 #ifndef SWIG_PHP_RENAMES
 	%rename(statusCode) StatusCode;
 #endif
-	%newobject *StatusCode_get;
+	%newobject StatusCode_get;
 	LassoSamlp2StatusCode *StatusCode;
 
 
diff --git a/swig/saml-2.0/samlp2_status_detail.i b/swig/saml-2.0/samlp2_status_detail.i
index a46e52be..c2f8ba41 100644
--- a/swig/saml-2.0/samlp2_status_detail.i
+++ b/swig/saml-2.0/samlp2_status_detail.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Samlp2StatusDetail) LassoSamlp2StatusDetail;
diff --git a/swig/saml-2.0/samlp2_status_response.i b/swig/saml-2.0/samlp2_status_response.i
index ec01adeb..c376cbd8 100644
--- a/swig/saml-2.0/samlp2_status_response.i
+++ b/swig/saml-2.0/samlp2_status_response.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Samlp2StatusResponse) LassoSamlp2StatusResponse;
@@ -33,19 +56,19 @@ typedef struct {
 #ifndef SWIG_PHP_RENAMES
 	%rename(issuer) Issuer;
 #endif
-	%newobject *Issuer_get;
+	%newobject Issuer_get;
 	LassoSaml2NameID *Issuer;
 
 #ifndef SWIG_PHP_RENAMES
 	%rename(extensions) Extensions;
 #endif
-	%newobject *Extensions_get;
+	%newobject Extensions_get;
 	LassoSamlp2Extensions *Extensions;
 
 #ifndef SWIG_PHP_RENAMES
 	%rename(status) Status;
 #endif
-	%newobject *Status_get;
+	%newobject Status_get;
 	LassoSamlp2Status *Status;
 
 
diff --git a/swig/saml-2.0/samlp2_subject_query_abstract.i b/swig/saml-2.0/samlp2_subject_query_abstract.i
index 39616ea4..2ec76d99 100644
--- a/swig/saml-2.0/samlp2_subject_query_abstract.i
+++ b/swig/saml-2.0/samlp2_subject_query_abstract.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Samlp2SubjectQueryAbstract) LassoSamlp2SubjectQueryAbstract;
@@ -9,7 +32,7 @@ typedef struct {
 #ifndef SWIG_PHP_RENAMES
 	%rename(subject) Subject;
 #endif
-	%newobject *Subject_get;
+	%newobject Subject_get;
 	LassoSaml2Subject *Subject;
 
 	/* inherited from Samlp2RequestAbstract */
diff --git a/swig/saml-2.0/samlp2_terminate.i b/swig/saml-2.0/samlp2_terminate.i
index ea59b88f..2765d508 100644
--- a/swig/saml-2.0/samlp2_terminate.i
+++ b/swig/saml-2.0/samlp2_terminate.i
@@ -1,3 +1,26 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #ifndef SWIG_PHP_RENAMES
 %rename(Samlp2Terminate) LassoSamlp2Terminate;