Index: trunk/Nebulous/nebclient/src/soapServer.c
===================================================================
--- trunk/Nebulous/nebclient/src/soapServer.c	(revision 19542)
+++ trunk/Nebulous/nebclient/src/soapServer.c	(revision 20110)
@@ -10,5 +10,5 @@
 #endif
 
-SOAP_SOURCE_STAMP("@(#) soapServer.c ver 2.7.11 2008-09-13 01:14:39 GMT")
+SOAP_SOURCE_STAMP("@(#) soapServer.c ver 2.7.11 2008-10-13 22:06:55 GMT")
 
 
@@ -81,6 +81,6 @@
 	if (!soap_match_tag(soap, soap->tag, "ns1:rename_object"))
 		return soap_serve_ns1__rename_USCOREobject(soap);
-	if (!soap_match_tag(soap, soap->tag, "ns1:rename_object"))
-		return soap_serve_ns1__rename_USCOREobject_(soap);
+	if (!soap_match_tag(soap, soap->tag, "ns1:swap_objects"))
+		return soap_serve_ns1__swap_USCOREobjects(soap);
 	if (!soap_match_tag(soap, soap->tag, "ns1:replicate_object"))
 		return soap_serve_ns1__replicate_USCOREobject(soap);
@@ -148,82 +148,82 @@
 {	struct ns1__rename_USCOREobject soap_tmp_ns1__rename_USCOREobject;
 	struct ns1__rename_USCOREobjectResponse soap_tmp_ns1__rename_USCOREobjectResponse;
+	int soap_tmp_int;
+	soap_default_ns1__rename_USCOREobjectResponse(soap, &soap_tmp_ns1__rename_USCOREobjectResponse);
+	soap_default_int(soap, &soap_tmp_int);
+	soap_tmp_ns1__rename_USCOREobjectResponse.result = &soap_tmp_int;
+	soap_default_ns1__rename_USCOREobject(soap, &soap_tmp_ns1__rename_USCOREobject);
+	soap->encodingStyle = "http://schemas.xmlsoap.org/soap/encoding/";
+	if (!soap_get_ns1__rename_USCOREobject(soap, &soap_tmp_ns1__rename_USCOREobject, "ns1:rename_object", NULL))
+		return soap->error;
+	if (soap_body_end_in(soap)
+	 || soap_envelope_end_in(soap)
+	 || soap_end_recv(soap))
+		return soap->error;
+	soap->error = ns1__rename_USCOREobject(soap, soap_tmp_ns1__rename_USCOREobject.key1, soap_tmp_ns1__rename_USCOREobject.key2, &soap_tmp_int);
+	if (soap->error)
+		return soap->error;
+	soap_serializeheader(soap);
+	soap_serialize_ns1__rename_USCOREobjectResponse(soap, &soap_tmp_ns1__rename_USCOREobjectResponse);
+	if (soap_begin_count(soap))
+		return soap->error;
+	if (soap->mode & SOAP_IO_LENGTH)
+	{	if (soap_envelope_begin_out(soap)
+		 || soap_putheader(soap)
+		 || soap_body_begin_out(soap)
+		 || soap_put_ns1__rename_USCOREobjectResponse(soap, &soap_tmp_ns1__rename_USCOREobjectResponse, "ns1:rename_objectResponse", "")
+		 || soap_body_end_out(soap)
+		 || soap_envelope_end_out(soap))
+			 return soap->error;
+	};
+	if (soap_end_count(soap)
+	 || soap_response(soap, SOAP_OK)
+	 || soap_envelope_begin_out(soap)
+	 || soap_putheader(soap)
+	 || soap_body_begin_out(soap)
+	 || soap_put_ns1__rename_USCOREobjectResponse(soap, &soap_tmp_ns1__rename_USCOREobjectResponse, "ns1:rename_objectResponse", "")
+	 || soap_body_end_out(soap)
+	 || soap_envelope_end_out(soap)
+	 || soap_end_send(soap))
+		return soap->error;
+	return soap_closesock(soap);
+}
+
+SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns1__swap_USCOREobjects(struct soap *soap)
+{	struct ns1__swap_USCOREobjects soap_tmp_ns1__swap_USCOREobjects;
+	struct ns1__swap_USCOREobjectsResponse soap_tmp_ns1__swap_USCOREobjectsResponse;
 	char * soap_tmp_string;
-	soap_default_ns1__rename_USCOREobjectResponse(soap, &soap_tmp_ns1__rename_USCOREobjectResponse);
+	soap_default_ns1__swap_USCOREobjectsResponse(soap, &soap_tmp_ns1__swap_USCOREobjectsResponse);
 	soap_tmp_string = NULL;
-	soap_tmp_ns1__rename_USCOREobjectResponse.result = &soap_tmp_string;
-	soap_default_ns1__rename_USCOREobject(soap, &soap_tmp_ns1__rename_USCOREobject);
-	soap->encodingStyle = "http://schemas.xmlsoap.org/soap/encoding/";
-	if (!soap_get_ns1__rename_USCOREobject(soap, &soap_tmp_ns1__rename_USCOREobject, "ns1:rename_object", NULL))
-		return soap->error;
-	if (soap_body_end_in(soap)
-	 || soap_envelope_end_in(soap)
-	 || soap_end_recv(soap))
-		return soap->error;
-	soap->error = ns1__rename_USCOREobject(soap, soap_tmp_ns1__rename_USCOREobject.key, soap_tmp_ns1__rename_USCOREobject.newkey, &soap_tmp_string);
-	if (soap->error)
-		return soap->error;
-	soap_serializeheader(soap);
-	soap_serialize_ns1__rename_USCOREobjectResponse(soap, &soap_tmp_ns1__rename_USCOREobjectResponse);
-	if (soap_begin_count(soap))
-		return soap->error;
-	if (soap->mode & SOAP_IO_LENGTH)
-	{	if (soap_envelope_begin_out(soap)
-		 || soap_putheader(soap)
-		 || soap_body_begin_out(soap)
-		 || soap_put_ns1__rename_USCOREobjectResponse(soap, &soap_tmp_ns1__rename_USCOREobjectResponse, "ns1:rename_objectResponse", "")
-		 || soap_body_end_out(soap)
-		 || soap_envelope_end_out(soap))
-			 return soap->error;
-	};
-	if (soap_end_count(soap)
-	 || soap_response(soap, SOAP_OK)
-	 || soap_envelope_begin_out(soap)
-	 || soap_putheader(soap)
-	 || soap_body_begin_out(soap)
-	 || soap_put_ns1__rename_USCOREobjectResponse(soap, &soap_tmp_ns1__rename_USCOREobjectResponse, "ns1:rename_objectResponse", "")
-	 || soap_body_end_out(soap)
-	 || soap_envelope_end_out(soap)
-	 || soap_end_send(soap))
-		return soap->error;
-	return soap_closesock(soap);
-}
-
-SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns1__rename_USCOREobject_(struct soap *soap)
-{	struct ns1__rename_USCOREobject_ soap_tmp_ns1__rename_USCOREobject_;
-	struct ns1__rename_USCOREobject_Response soap_tmp_ns1__rename_USCOREobject_Response;
-	char * soap_tmp_string;
-	soap_default_ns1__rename_USCOREobject_Response(soap, &soap_tmp_ns1__rename_USCOREobject_Response);
-	soap_tmp_string = NULL;
-	soap_tmp_ns1__rename_USCOREobject_Response.result = &soap_tmp_string;
-	soap_default_ns1__rename_USCOREobject_(soap, &soap_tmp_ns1__rename_USCOREobject_);
-	soap->encodingStyle = "http://schemas.xmlsoap.org/soap/encoding/";
-	if (!soap_get_ns1__rename_USCOREobject_(soap, &soap_tmp_ns1__rename_USCOREobject_, "ns1:rename_object", NULL))
-		return soap->error;
-	if (soap_body_end_in(soap)
-	 || soap_envelope_end_in(soap)
-	 || soap_end_recv(soap))
-		return soap->error;
-	soap->error = ns1__rename_USCOREobject_(soap, soap_tmp_ns1__rename_USCOREobject_.key, soap_tmp_ns1__rename_USCOREobject_.newkey, &soap_tmp_string);
-	if (soap->error)
-		return soap->error;
-	soap_serializeheader(soap);
-	soap_serialize_ns1__rename_USCOREobject_Response(soap, &soap_tmp_ns1__rename_USCOREobject_Response);
-	if (soap_begin_count(soap))
-		return soap->error;
-	if (soap->mode & SOAP_IO_LENGTH)
-	{	if (soap_envelope_begin_out(soap)
-		 || soap_putheader(soap)
-		 || soap_body_begin_out(soap)
-		 || soap_put_ns1__rename_USCOREobject_Response(soap, &soap_tmp_ns1__rename_USCOREobject_Response, "ns1:rename_object-Response", "")
-		 || soap_body_end_out(soap)
-		 || soap_envelope_end_out(soap))
-			 return soap->error;
-	};
-	if (soap_end_count(soap)
-	 || soap_response(soap, SOAP_OK)
-	 || soap_envelope_begin_out(soap)
-	 || soap_putheader(soap)
-	 || soap_body_begin_out(soap)
-	 || soap_put_ns1__rename_USCOREobject_Response(soap, &soap_tmp_ns1__rename_USCOREobject_Response, "ns1:rename_object-Response", "")
+	soap_tmp_ns1__swap_USCOREobjectsResponse.result = &soap_tmp_string;
+	soap_default_ns1__swap_USCOREobjects(soap, &soap_tmp_ns1__swap_USCOREobjects);
+	soap->encodingStyle = "http://schemas.xmlsoap.org/soap/encoding/";
+	if (!soap_get_ns1__swap_USCOREobjects(soap, &soap_tmp_ns1__swap_USCOREobjects, "ns1:swap_objects", NULL))
+		return soap->error;
+	if (soap_body_end_in(soap)
+	 || soap_envelope_end_in(soap)
+	 || soap_end_recv(soap))
+		return soap->error;
+	soap->error = ns1__swap_USCOREobjects(soap, soap_tmp_ns1__swap_USCOREobjects.key1, soap_tmp_ns1__swap_USCOREobjects.key2, &soap_tmp_string);
+	if (soap->error)
+		return soap->error;
+	soap_serializeheader(soap);
+	soap_serialize_ns1__swap_USCOREobjectsResponse(soap, &soap_tmp_ns1__swap_USCOREobjectsResponse);
+	if (soap_begin_count(soap))
+		return soap->error;
+	if (soap->mode & SOAP_IO_LENGTH)
+	{	if (soap_envelope_begin_out(soap)
+		 || soap_putheader(soap)
+		 || soap_body_begin_out(soap)
+		 || soap_put_ns1__swap_USCOREobjectsResponse(soap, &soap_tmp_ns1__swap_USCOREobjectsResponse, "ns1:swap_objectsResponse", "")
+		 || soap_body_end_out(soap)
+		 || soap_envelope_end_out(soap))
+			 return soap->error;
+	};
+	if (soap_end_count(soap)
+	 || soap_response(soap, SOAP_OK)
+	 || soap_envelope_begin_out(soap)
+	 || soap_putheader(soap)
+	 || soap_body_begin_out(soap)
+	 || soap_put_ns1__swap_USCOREobjectsResponse(soap, &soap_tmp_ns1__swap_USCOREobjectsResponse, "ns1:swap_objectsResponse", "")
 	 || soap_body_end_out(soap)
 	 || soap_envelope_end_out(soap)