ID-WSF: remove LassoWsseSecurity in favor of LasoWsSec1SecurityHeader

 * xml/Makefile.am:
   remove the file from the source list
 * xml/wsse_security.c:
 * xml/wsse_security.h:
   remove the files
 * xml/xml.c:
   use LassoWsSec1SecurityHeader for LASSO_WSSE_HREF namespace also.

4 files changed, 3 insertions, 175 deletions

diff --git a/lasso/xml/Makefile.am b/lasso/xml/Makefile.am
index 7f9a6411..f4a6e544 100644
--- a/lasso/xml/Makefile.am
+++ b/lasso/xml/Makefile.am
@@ -73,8 +73,7 @@ WSF_C_FILES = \
 	soap_binding_ext_service_instance_update.c \
 	soap_binding_ext_timeout.c \
 	soap_binding.c \
-	utility_status.c \
-	wsse_security.c
+	utility_status.c
 
 WSF_H_FILES = \
 	disco_authenticate_requester.h \
@@ -134,8 +133,7 @@ WSF_H_FILES = \
 	soap_binding_ext_service_instance_update.h \
 	soap_binding_ext_timeout.h \
 	soap_binding.h \
-	utility_status.h \
-	wsse_security.h
+	utility_status.h
 endif
 
 liblasso_xml_la_SOURCES = \
diff --git a/lasso/xml/wsse_security.c b/lasso/xml/wsse_security.c
deleted file mode 100644
index 41d8d168..00000000
--- a/lasso/xml/wsse_security.c
+++ /dev/null
@@ -1,102 +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 "private.h"
-#include "wsse_security.h"
-
-/*
- *
- */
-
-/*****************************************************************************/
-/* private methods                                                           */
-/*****************************************************************************/
-
-static struct XmlSnippet schema_snippets[] = {
-	{ "", SNIPPET_LIST_XMLNODES, G_STRUCT_OFFSET(LassoWsseSecurity, any), NULL, NULL, NULL},
-	{NULL, 0, 0, NULL, NULL, NULL}
-};
-
-/*****************************************************************************/
-/* instance and class init functions                                         */
-/*****************************************************************************/
-
-
-static void
-class_init(LassoWsseSecurityClass *klass)
-{
-	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
-
-	nclass->node_data = g_new0(LassoNodeClassData, 1);
-	lasso_node_class_set_nodename(nclass, "Security");
-	lasso_node_class_set_ns(nclass, LASSO_WSSE1_HREF, LASSO_WSSE1_PREFIX);
-	lasso_node_class_add_snippets(nclass, schema_snippets);
-}
-
-GType
-lasso_wsse_security_get_type()
-{
-	static GType this_type = 0;
-
-	if (!this_type) {
-		static const GTypeInfo this_info = {
-			sizeof (LassoWsseSecurityClass),
-			NULL,
-			NULL,
-			(GClassInitFunc) class_init,
-			NULL,
-			NULL,
-			sizeof(LassoWsseSecurity),
-			0,
-			NULL,
-			NULL
-		};
-
-		this_type = g_type_register_static(LASSO_TYPE_NODE,
-				"LassoWsseSecurity", &this_info, 0);
-	}
-	return this_type;
-}
-
-LassoWsseSecurity*
-lasso_wsse_security_new()
-{
-	LassoWsseSecurity *node;
-
-	node = g_object_new(LASSO_TYPE_WSSE_SECURITY, NULL);
-
-	return node;
-}
-
-LassoWsseSecurity*
-lasso_wsse_security_new_from_message(const gchar *message)
-{
-	LassoWsseSecurity *node;
-
-	g_return_val_if_fail(message != NULL, NULL);
-
-	node = g_object_new(LASSO_TYPE_WSSE_SECURITY, NULL);
-	lasso_node_init_from_message(LASSO_NODE(node), message);
-
-	return node;
-}
diff --git a/lasso/xml/wsse_security.h b/lasso/xml/wsse_security.h
deleted file mode 100644
index 89f12860..00000000
--- a/lasso/xml/wsse_security.h
+++ /dev/null
@@ -1,68 +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_WSSE_SECURITY_H__
-#define __LASSO_WSSE_SECURITY_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include "xml.h"
-
-#define LASSO_TYPE_WSSE_SECURITY (lasso_wsse_security_get_type())
-#define LASSO_WSSE_SECURITY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-			LASSO_TYPE_WSSE_SECURITY, LassoWsseSecurity))
-#define LASSO_WSSE_SECURITY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \
-			LASSO_TYPE_WSSE_SECURITY, LassoWsseSecurityClass))
-#define LASSO_IS_WSSE_SECURITY(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_WSSE_SECURITY))
-#define LASSO_IS_WSSE_SECURITY_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_TYPE ((klass),LASSO_TYPE_WSSE_SECURITY))
-#define LASSO_WSSE_SECURITY_GET_CLASS(o) \
-	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_WSSE_SECURITY, LassoWsseSecurityClass))
-
-typedef struct _LassoWsseSecurity LassoWsseSecurity;
-typedef struct _LassoWsseSecurityClass LassoWsseSecurityClass;
-
-struct _LassoWsseSecurity {
-	LassoNode parent;
-
-	GList *any; /* of xmlNode */
-};
-
-struct _LassoWsseSecurityClass {
-	LassoNodeClass parent;
-};
-
-LASSO_EXPORT GType lasso_wsse_security_get_type(void);
-
-LASSO_EXPORT LassoWsseSecurity* lasso_wsse_security_new(void);
-
-LASSO_EXPORT LassoWsseSecurity* lasso_wsse_security_new_from_message(const gchar *message);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __LASSO_WSSE_SECURITY_H__ */
diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c
index 0f60fd19..ff9445fc 100644
--- a/lasso/xml/xml.c
+++ b/lasso/xml/xml.c
@@ -1554,7 +1554,7 @@ prefix_from_href_and_nodename(const xmlChar *href, const xmlChar *nodename) {
 	else if (strcmp((char*)href, LASSO_SA_HREF) == 0)
 		prefix = "Sa";
 	else if (strcmp((char*)href, LASSO_WSSE_HREF) == 0)
-		prefix = "Wsse";
+		prefix = "WsSec1";
 	else if (strcmp((char*)href, LASSO_WSSE1_HREF) == 0)
 		prefix = "WsSec1";
 	else if (strcmp((char*)href, LASSO_IDWSF2_DISCO_HREF) == 0)