Move soap_binding files from lasso/id-wsf to lasso/xml.

6 files changed, 5 insertions, 127 deletions

diff --git a/lasso/id-wsf/Makefile.am b/lasso/id-wsf/Makefile.am
index 82c33d7b..6f365396 100644
--- a/lasso/id-wsf/Makefile.am
+++ b/lasso/id-wsf/Makefile.am
@@ -9,8 +9,7 @@ INCLUDES = \
 
 lasso_private_h_sources = \
 	data_service_private.h \
-	wsf_profile_private.h \
-	soap_binding.h
+	wsf_profile_private.h
 
 if WSF_ENABLED
 noinst_LTLIBRARIES = liblasso-id-wsf.la
@@ -21,8 +20,7 @@ WSF_C_FILES = \
 	personal_profile_service.c \
 	data_service.c \
 	wsf_profile.c \
-	utils.c	\
-	soap_binding.c
+	utils.c
 
 WSF_H_FILES = \
 	authentication.h \
diff --git a/lasso/soap_binding.c b/lasso/soap_binding.c
deleted file mode 100644
index 998e3494..00000000
--- a/lasso/soap_binding.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* $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
- */
-
-#include <lasso/soap_binding.h>
-
-#define find_node_type_in_list(iter, check) \
-	{ 
-		while (iter && ! check(iter->data)) \
-			iter = iter->next;\
-	}
-
-/** 
- * lasso_soap_binding_get_provider:
- * @envelope a LassoSoapEnvelope
- *
- * Look up the sb:Provider header in the SOAP message envelope.
- *
- * Return value: NULL if no Provider element is present in the header of the SOAP envelope. If 
- * found it returns a reference you do not own. 
- */
-LassoSoapBindingProvider*
-lasso_soap_binding_get_provider(LassoSoapEnvelope *envelope) {
-	g_return_val_if_fail(envelope, NULL);
-
-	if (envelope->Header) {
-		GList *iter = envelope->Header->Other;
-		find_node_type_in_list(iter, LASSO_IS_SOAP_BINDING_PROVIDER);
-		if (iter) {
-			return LASSO_SOAP_BINDING_PROVIDER(iter->data);
-		}
-	}	
-	return NULL;
-}
-
-/** 
- * lasso_soap_binding_get_correlation:
- * @envelope a LassoSoapEnvelope
- *
- * Look up the sb:Correlation header in the SOAP message envelope.
- *
- * Returns: NULL if no Correlation element is present in the header of the
- * SOAP envelope. If found it returns a reference you do not own. 
- */
-LassoSoapBindingCorrelation*
-lasso_soap_binding_get_correlation(LassoSoapEnvelope *envelope) {
-	g_return_val_if_fail(envelope, NULL);
-
-	if (envelope->Header) {
-		GList *iter = envelope->Header->Other;
-		find_node_type_in_list(iter, LASSO_IS_SOAP_BINDING_CORRELATION);
-		if (iter) {
-			return LASSO_SOAP_BINDING_CORRELATION(iter->data);
-		}
-	}	
-	return NULL;
-}
diff --git a/lasso/soap_binding.h b/lasso/soap_binding.h
deleted file mode 100644
index cccfa44e..00000000
--- a/lasso/soap_binding.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $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 __LASSO_SOAP_BINDING_H__
-#define __LASSO_SOAP_BINDING_H__
-
-#include <lasso/xml/soap_binding_provider.h>
-#include <lasso/xml/soap_binding_correlation.h>
-#include <lasso/xml/soap_envelope.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */ 
-
-LASSO_EXPORT LassoSoapBindingProvider* lasso_soap_binding_get_provider(
-	LassoSoapEnvelope *envelope);
-
-LASSO_EXPORT LassoSoapBindingCorrelation* lasso_soap_binding_get_correlation(
-	LassoSoapEnvelope *evelope);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */ 
-#endif /* __LASSO_SOAP_BINDING_H__ */
diff --git a/lasso/xml/Makefile.am b/lasso/xml/Makefile.am
index 1fcaab56..bce38549 100644
--- a/lasso/xml/Makefile.am
+++ b/lasso/xml/Makefile.am
@@ -74,6 +74,7 @@ WSF_C_FILES = \
 	soap_fault.c \
 	soap_envelope.c \
 	soap_header.c \
+	soap_binding.c \
 	utility_status.c \
 	wsse_security.c
 
@@ -139,6 +140,7 @@ WSF_H_FILES = \
 	soap_fault.h \
 	soap_envelope.h \
 	soap_header.h \
+	soap_binding.c \
 	utility_status.h \
 	wsse_security.h
 endif
diff --git a/lasso/id-wsf/soap_binding.c b/lasso/xml/soap_binding.c
index 4ff1d76e..3c860e7d 100644
--- a/lasso/id-wsf/soap_binding.c
+++ b/lasso/xml/soap_binding.c
@@ -22,7 +22,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <lasso/id-wsf/soap_binding.h>
+#include <lasso/xml/soap_binding.h>
 
 #define find_node_type_in_list(iter, check) \
 	{\
diff --git a/lasso/id-wsf/soap_binding.h b/lasso/xml/soap_binding.h
index 03d2bb0e..03d2bb0e 100644
--- a/lasso/id-wsf/soap_binding.h
+++ b/lasso/xml/soap_binding.h