Index: /branches/neb_distrib_20081210/Nebulous/nebclient/src/nebulous.h
===================================================================
--- /branches/neb_distrib_20081210/Nebulous/nebclient/src/nebulous.h	(revision 23728)
+++ /branches/neb_distrib_20081210/Nebulous/nebclient/src/nebulous.h	(revision 23729)
@@ -1,5 +1,5 @@
 /* src/nebulous.h
-   Generated by wsdl2h 1.2.11 from nebulous.wsdl and typemap.dat
-   2008-12-11 21:42:13 GMT
+   Generated by wsdl2h 1.2.12 from nebulous.wsdl and typemap.dat
+   2009-04-03 00:34:43 GMT
    Copyright (C) 2001-2008 Robert van Engelen, Genivia Inc. All Rights Reserved.
    This part of the software is released under one of the following licenses:
@@ -808,5 +808,4 @@
     NULL, // char *action = NULL selects default action for this operation
     // request parameters:
-    char*                               key,
     char*                               uri,
     // response parameters:
@@ -820,5 +819,4 @@
     struct soap *soap,
     // request parameters:
-    char*                               key,
     char*                               uri,
     // response parameters:
@@ -833,5 +831,4 @@
 //gsoap ns1  service method-action:	delete_USCOREinstance urn:Nebulous/Server/SOAP#delete_instance
 int ns1__delete_USCOREinstance(
-    char*                               key,	///< Request parameter
     char*                               uri,	///< Request parameter
     int                                *result	///< Response parameter
Index: /branches/neb_distrib_20081210/Nebulous/nebclient/src/soapC.c
===================================================================
--- /branches/neb_distrib_20081210/Nebulous/nebclient/src/soapC.c	(revision 23728)
+++ /branches/neb_distrib_20081210/Nebulous/nebclient/src/soapC.c	(revision 23729)
@@ -1,4 +1,4 @@
 /* soapC.c
-   Generated by gSOAP 2.7.11 from src/nebulous.h
+   Generated by gSOAP 2.7.12 from src/nebulous.h
    Copyright(C) 2000-2008, Robert van Engelen, Genivia Inc. All Rights Reserved.
    This part of the software is released under one of the following licenses:
@@ -12,5 +12,5 @@
 #endif
 
-SOAP_SOURCE_STAMP("@(#) soapC.c ver 2.7.11 2008-12-11 21:42:14 GMT")
+SOAP_SOURCE_STAMP("@(#) soapC.c ver 2.7.12 2009-04-03 00:34:43 GMT")
 
 
@@ -676,6 +676,7 @@
 
 SOAP_FMAC3 char * SOAP_FMAC4 soap_in_byte(struct soap *soap, const char *tag, char *a, const char *type)
-{
-	return soap_inbyte(soap, tag, a, type, SOAP_TYPE_byte);
+{	char *p;
+	p = soap_inbyte(soap, tag, a, type, SOAP_TYPE_byte);
+	return p;
 }
 
@@ -711,6 +712,7 @@
 
 SOAP_FMAC3 int * SOAP_FMAC4 soap_in_int(struct soap *soap, const char *tag, int *a, const char *type)
-{
-	return soap_inint(soap, tag, a, type, SOAP_TYPE_int);
+{	int *p;
+	p = soap_inint(soap, tag, a, type, SOAP_TYPE_int);
+	return p;
 }
 
@@ -1342,5 +1344,4 @@
 {
 	(void)soap; (void)a; /* appease -Wall -Werror */
-	soap_default_string(soap, &a->key);
 	soap_default_string(soap, &a->uri);
 }
@@ -1349,5 +1350,4 @@
 {
 	(void)soap; (void)a; /* appease -Wall -Werror */
-	soap_serialize_string(soap, &a->key);
 	soap_serialize_string(soap, &a->uri);
 }
@@ -1365,6 +1365,4 @@
 	if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__delete_USCOREinstance), type))
 		return soap->error;
-	if (soap_out_string(soap, "key", -1, &a->key, ""))
-		return soap->error;
 	if (soap_out_string(soap, "uri", -1, &a->uri, ""))
 		return soap->error;
@@ -1382,5 +1380,4 @@
 SOAP_FMAC3 struct ns1__delete_USCOREinstance * SOAP_FMAC4 soap_in_ns1__delete_USCOREinstance(struct soap *soap, const char *tag, struct ns1__delete_USCOREinstance *a, const char *type)
 {
-	size_t soap_flag_key = 1;
 	size_t soap_flag_uri = 1;
 	if (soap_element_begin_in(soap, tag, 0, type))
@@ -1394,9 +1391,4 @@
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
-			if (soap_flag_key && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "key", &a->key, "xsd:string"))
-				{	soap_flag_key--;
-					continue;
-				}
 			if (soap_flag_uri && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
 				if (soap_in_string(soap, "uri", &a->uri, "xsd:string"))
@@ -3394,5 +3386,5 @@
 {
 	int i, n = a->__size;
-	char *t = soap_putsize(soap, "xsd:string", a->__size);
+	char *t = a->__ptr ? soap_putsize(soap, "xsd:string", a->__size) : NULL;
 	id = soap_element_id(soap, tag, id, a, (struct soap_array*)&a->__ptr, 1, type, SOAP_TYPE_ArrayOfString);
 	if (id < 0)
@@ -4036,6 +4028,7 @@
 
 SOAP_FMAC3 char * * SOAP_FMAC4 soap_in__QName(struct soap *soap, const char *tag, char **a, const char *type)
-{
-	return soap_instring(soap, tag, a, type, SOAP_TYPE__QName, 2, -1, -1);
+{	char **p;
+	p = soap_instring(soap, tag, a, type, SOAP_TYPE__QName, 2, -1, -1);
+	return p;
 }
 
@@ -4076,6 +4069,7 @@
 
 SOAP_FMAC3 char * * SOAP_FMAC4 soap_in_string(struct soap *soap, const char *tag, char **a, const char *type)
-{
-	return soap_instring(soap, tag, a, type, SOAP_TYPE_string, 1, -1, -1);
+{	char **p;
+	p = soap_instring(soap, tag, a, type, SOAP_TYPE_string, 1, -1, -1);
+	return p;
 }
 
Index: /branches/neb_distrib_20081210/Nebulous/nebclient/src/soapClient.c
===================================================================
--- /branches/neb_distrib_20081210/Nebulous/nebclient/src/soapClient.c	(revision 23728)
+++ /branches/neb_distrib_20081210/Nebulous/nebclient/src/soapClient.c	(revision 23729)
@@ -1,4 +1,4 @@
 /* soapClient.c
-   Generated by gSOAP 2.7.11 from src/nebulous.h
+   Generated by gSOAP 2.7.12 from src/nebulous.h
    Copyright(C) 2000-2008, Robert van Engelen, Genivia Inc. All Rights Reserved.
    This part of the software is released under one of the following licenses:
@@ -10,5 +10,5 @@
 #endif
 
-SOAP_SOURCE_STAMP("@(#) soapClient.c ver 2.7.11 2008-12-11 21:42:13 GMT")
+SOAP_SOURCE_STAMP("@(#) soapClient.c ver 2.7.12 2009-04-03 00:34:43 GMT")
 
 
@@ -700,5 +700,5 @@
 }
 
-SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__delete_USCOREinstance(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key, char *uri, int *result)
+SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__delete_USCOREinstance(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *uri, int *result)
 {	struct ns1__delete_USCOREinstance soap_tmp_ns1__delete_USCOREinstance;
 	struct ns1__delete_USCOREinstanceResponse *soap_tmp_ns1__delete_USCOREinstanceResponse;
@@ -708,5 +708,4 @@
 		soap_action = "urn:Nebulous/Server/SOAP#delete_instance";
 	soap->encodingStyle = "http://schemas.xmlsoap.org/soap/encoding/";
-	soap_tmp_ns1__delete_USCOREinstance.key = key;
 	soap_tmp_ns1__delete_USCOREinstance.uri = uri;
 	soap_begin(soap);
Index: /branches/neb_distrib_20081210/Nebulous/nebclient/src/soapClientLib.c
===================================================================
--- /branches/neb_distrib_20081210/Nebulous/nebclient/src/soapClientLib.c	(revision 23728)
+++ /branches/neb_distrib_20081210/Nebulous/nebclient/src/soapClientLib.c	(revision 23729)
@@ -1,4 +1,4 @@
 /* soapClientLib.c
-   Generated by gSOAP 2.7.11 from src/nebulous.h
+   Generated by gSOAP 2.7.12 from src/nebulous.h
    Copyright(C) 2000-2008, Robert van Engelen, Genivia Inc. All Rights Reserved.
    This part of the software is released under one of the following licenses:
Index: /branches/neb_distrib_20081210/Nebulous/nebclient/src/soapH.h
===================================================================
--- /branches/neb_distrib_20081210/Nebulous/nebclient/src/soapH.h	(revision 23728)
+++ /branches/neb_distrib_20081210/Nebulous/nebclient/src/soapH.h	(revision 23729)
@@ -1,4 +1,4 @@
 /* soapH.h
-   Generated by gSOAP 2.7.11 from src/nebulous.h
+   Generated by gSOAP 2.7.12 from src/nebulous.h
    Copyright(C) 2000-2008, Robert van Engelen, Genivia Inc. All Rights Reserved.
    This part of the software is released under one of the following licenses:
Index: /branches/neb_distrib_20081210/Nebulous/nebclient/src/soapServer.c
===================================================================
--- /branches/neb_distrib_20081210/Nebulous/nebclient/src/soapServer.c	(revision 23728)
+++ /branches/neb_distrib_20081210/Nebulous/nebclient/src/soapServer.c	(revision 23729)
@@ -1,4 +1,4 @@
 /* soapServer.c
-   Generated by gSOAP 2.7.11 from src/nebulous.h
+   Generated by gSOAP 2.7.12 from src/nebulous.h
    Copyright(C) 2000-2008, Robert van Engelen, Genivia Inc. All Rights Reserved.
    This part of the software is released under one of the following licenses:
@@ -10,5 +10,5 @@
 #endif
 
-SOAP_SOURCE_STAMP("@(#) soapServer.c ver 2.7.11 2008-12-11 21:42:13 GMT")
+SOAP_SOURCE_STAMP("@(#) soapServer.c ver 2.7.12 2009-04-03 00:34:43 GMT")
 
 
@@ -643,5 +643,5 @@
 	 || soap_end_recv(soap))
 		return soap->error;
-	soap->error = ns1__delete_USCOREinstance(soap, soap_tmp_ns1__delete_USCOREinstance.key, soap_tmp_ns1__delete_USCOREinstance.uri, &soap_tmp_int);
+	soap->error = ns1__delete_USCOREinstance(soap, soap_tmp_ns1__delete_USCOREinstance.uri, &soap_tmp_int);
 	if (soap->error)
 		return soap->error;
Index: /branches/neb_distrib_20081210/Nebulous/nebclient/src/soapServerLib.c
===================================================================
--- /branches/neb_distrib_20081210/Nebulous/nebclient/src/soapServerLib.c	(revision 23728)
+++ /branches/neb_distrib_20081210/Nebulous/nebclient/src/soapServerLib.c	(revision 23729)
@@ -1,4 +1,4 @@
 /* soapServerLib.c
-   Generated by gSOAP 2.7.11 from src/nebulous.h
+   Generated by gSOAP 2.7.12 from src/nebulous.h
    Copyright(C) 2000-2008, Robert van Engelen, Genivia Inc. All Rights Reserved.
    This part of the software is released under one of the following licenses:
Index: /branches/neb_distrib_20081210/Nebulous/nebclient/src/soapStub.h
===================================================================
--- /branches/neb_distrib_20081210/Nebulous/nebclient/src/soapStub.h	(revision 23728)
+++ /branches/neb_distrib_20081210/Nebulous/nebclient/src/soapStub.h	(revision 23729)
@@ -1,4 +1,4 @@
 /* soapStub.h
-   Generated by gSOAP 2.7.11 from src/nebulous.h
+   Generated by gSOAP 2.7.12 from src/nebulous.h
    Copyright(C) 2000-2008, Robert van Engelen, Genivia Inc. All Rights Reserved.
    This part of the software is released under one of the following licenses:
@@ -283,5 +283,4 @@
 struct ns1__delete_USCOREinstance
 {
-	char *key;	/* optional element of type xsd:string */
 	char *uri;	/* optional element of type xsd:string */
 };
@@ -433,5 +432,5 @@
 SOAP_FMAC5 int SOAP_FMAC6 ns1__find_USCOREinstances(struct soap*, char *key, char *volume, struct ns1__find_USCOREinstancesResponse *_param_3);
 
-SOAP_FMAC5 int SOAP_FMAC6 ns1__delete_USCOREinstance(struct soap*, char *key, char *uri, int *result);
+SOAP_FMAC5 int SOAP_FMAC6 ns1__delete_USCOREinstance(struct soap*, char *uri, int *result);
 
 SOAP_FMAC5 int SOAP_FMAC6 ns1__stat_USCOREobject(struct soap*, char *key, struct ns1__stat_USCOREobjectResponse *_param_4);
@@ -468,5 +467,5 @@
 SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__find_USCOREinstances(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key, char *volume, struct ns1__find_USCOREinstancesResponse *_param_3);
 
-SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__delete_USCOREinstance(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key, char *uri, int *result);
+SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__delete_USCOREinstance(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *uri, int *result);
 
 SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__stat_USCOREobject(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key, struct ns1__stat_USCOREobjectResponse *_param_4);