Index: trunk/Nebulous/nebclient/.cvsignore =================================================================== --- trunk/Nebulous/nebclient/.cvsignore (revision 23935) +++ trunk/Nebulous/nebclient/.cvsignore (revision 23935) @@ -0,0 +1,21 @@ +Doxyfile +Makefile +Makefile.in +aclocal.m4 +autom4te.cache +compile +config.guess +config.h +config.h.in +config.log +config.status +config.sub +configure +depcomp +docs +install-sh +libtool +ltmain.sh +missing +nebclient.pc +stamp-h1 Index: trunk/Nebulous/nebclient/nebulous.wsdl =================================================================== --- trunk/Nebulous/nebclient/nebulous.wsdl (revision 23934) +++ trunk/Nebulous/nebclient/nebulous.wsdl (revision 23935) @@ -125,4 +125,5 @@ + Index: trunk/Nebulous/nebclient/src/.cvsignore =================================================================== --- trunk/Nebulous/nebclient/src/.cvsignore (revision 23935) +++ trunk/Nebulous/nebclient/src/.cvsignore (revision 23935) @@ -0,0 +1,19 @@ +.deps +.libs +Makefile +Makefile.in +SOAP.nsmap +libnebclient.la +nebclient.lo +nebulous.h +soapC.c +soapC.lo +soapClient.c +soapClient.lo +soapClientLib.c +soapH.h +soapServer.c +soapServerLib.c +soapStub.h +stdsoap2.lo +xmalloc.lo Index: trunk/Nebulous/nebclient/src/nebclient.c =================================================================== --- trunk/Nebulous/nebclient/src/nebclient.c (revision 23934) +++ trunk/Nebulous/nebclient/src/nebclient.c (revision 23935) @@ -253,5 +253,5 @@ } - if (!nebDeleteInstance(server, locations->URI[0])) { + if (!nebDeleteInstance(server, key, locations->URI[0])) { nebObjectInstancesFree(locations); @@ -633,5 +633,5 @@ for (int i = 0; i < locations->n; i++) { - if (!nebDeleteInstance(server, locations->URI[i])) { + if (!nebDeleteInstance(server, key, locations->URI[i])) { nebSetErr(server, "can not delete instance"); nebObjectInstancesFree(locations); @@ -749,5 +749,5 @@ } -bool nebDeleteInstance(nebServer *server, const char *URI) +bool nebDeleteInstance(nebServer *server, const char *key, const char *URI) { int response; @@ -770,5 +770,5 @@ if (soap_call_ns1__delete_USCOREinstance(server->soap, server->endpoint, - NULL, (char *)URI, &response) != SOAP_OK) { + NULL, (char *)key, (char *)URI, &response) != SOAP_OK) { nebFree(filename); Index: trunk/Nebulous/nebclient/src/nebclient.h =================================================================== --- trunk/Nebulous/nebclient/src/nebclient.h (revision 23934) +++ trunk/Nebulous/nebclient/src/nebclient.h (revision 23935) @@ -282,4 +282,5 @@ bool nebDeleteInstance( nebServer *server, ///< nebServer object + const char *key, ///< storage object key (name) const char *URI ///< URL of instance to remove ); Index: trunk/Nebulous/nebclient/src/nebulous.h =================================================================== --- trunk/Nebulous/nebclient/src/nebulous.h (revision 23934) +++ trunk/Nebulous/nebclient/src/nebulous.h (revision 23935) @@ -1,5 +1,5 @@ /* src/nebulous.h Generated by wsdl2h 1.2.12 from nebulous.wsdl and typemap.dat - 2009-04-03 00:34:43 GMT + 2009-04-20 22:15:21 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,4 +808,5 @@ NULL, // char *action = NULL selects default action for this operation // request parameters: + char* key, char* uri, // response parameters: @@ -819,4 +820,5 @@ struct soap *soap, // request parameters: + char* key, char* uri, // response parameters: @@ -831,4 +833,5 @@ //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: trunk/Nebulous/nebclient/src/soapC.c =================================================================== --- trunk/Nebulous/nebclient/src/soapC.c (revision 23934) +++ trunk/Nebulous/nebclient/src/soapC.c (revision 23935) @@ -12,5 +12,5 @@ #endif -SOAP_SOURCE_STAMP("@(#) soapC.c ver 2.7.12 2009-04-03 00:34:43 GMT") +SOAP_SOURCE_STAMP("@(#) soapC.c ver 2.7.12 2009-04-20 22:15:22 GMT") @@ -1344,4 +1344,5 @@ { (void)soap; (void)a; /* appease -Wall -Werror */ + soap_default_string(soap, &a->key); soap_default_string(soap, &a->uri); } @@ -1350,4 +1351,5 @@ { (void)soap; (void)a; /* appease -Wall -Werror */ + soap_serialize_string(soap, &a->key); soap_serialize_string(soap, &a->uri); } @@ -1365,4 +1367,6 @@ 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; @@ -1380,4 +1384,5 @@ 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)) @@ -1391,4 +1396,9 @@ 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")) Index: trunk/Nebulous/nebclient/src/soapClient.c =================================================================== --- trunk/Nebulous/nebclient/src/soapClient.c (revision 23934) +++ trunk/Nebulous/nebclient/src/soapClient.c (revision 23935) @@ -10,5 +10,5 @@ #endif -SOAP_SOURCE_STAMP("@(#) soapClient.c ver 2.7.12 2009-04-03 00:34:43 GMT") +SOAP_SOURCE_STAMP("@(#) soapClient.c ver 2.7.12 2009-04-20 22:15:21 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 *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 *key, char *uri, int *result) { struct ns1__delete_USCOREinstance soap_tmp_ns1__delete_USCOREinstance; struct ns1__delete_USCOREinstanceResponse *soap_tmp_ns1__delete_USCOREinstanceResponse; @@ -708,4 +708,5 @@ 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: trunk/Nebulous/nebclient/src/soapServer.c =================================================================== --- trunk/Nebulous/nebclient/src/soapServer.c (revision 23934) +++ trunk/Nebulous/nebclient/src/soapServer.c (revision 23935) @@ -10,5 +10,5 @@ #endif -SOAP_SOURCE_STAMP("@(#) soapServer.c ver 2.7.12 2009-04-03 00:34:43 GMT") +SOAP_SOURCE_STAMP("@(#) soapServer.c ver 2.7.12 2009-04-20 22:15:21 GMT") @@ -643,5 +643,5 @@ || soap_end_recv(soap)) return soap->error; - soap->error = ns1__delete_USCOREinstance(soap, soap_tmp_ns1__delete_USCOREinstance.uri, &soap_tmp_int); + soap->error = ns1__delete_USCOREinstance(soap, soap_tmp_ns1__delete_USCOREinstance.key, soap_tmp_ns1__delete_USCOREinstance.uri, &soap_tmp_int); if (soap->error) return soap->error; Index: trunk/Nebulous/nebclient/src/soapStub.h =================================================================== --- trunk/Nebulous/nebclient/src/soapStub.h (revision 23934) +++ trunk/Nebulous/nebclient/src/soapStub.h (revision 23935) @@ -283,4 +283,5 @@ struct ns1__delete_USCOREinstance { + char *key; /* optional element of type xsd:string */ char *uri; /* optional element of type xsd:string */ }; @@ -432,5 +433,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 *uri, int *result); +SOAP_FMAC5 int SOAP_FMAC6 ns1__delete_USCOREinstance(struct soap*, char *key, char *uri, int *result); SOAP_FMAC5 int SOAP_FMAC6 ns1__stat_USCOREobject(struct soap*, char *key, struct ns1__stat_USCOREobjectResponse *_param_4); @@ -467,5 +468,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 *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 *key, 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); Index: trunk/Nebulous/nebclient/tests/.cvsignore =================================================================== --- trunk/Nebulous/nebclient/tests/.cvsignore (revision 23935) +++ trunk/Nebulous/nebclient/tests/.cvsignore (revision 23935) @@ -0,0 +1,5 @@ +.deps +Makefile +Makefile.in +.libs +tests Index: trunk/Nebulous/nebclient/tests/tap/bootstrap.sh =================================================================== --- trunk/Nebulous/nebclient/tests/tap/bootstrap.sh (revision 23934) +++ trunk/Nebulous/nebclient/tests/tap/bootstrap.sh (revision 23935) @@ -2,7 +2,7 @@ set -x -aclocal19 -I /usr/local/share/aclocal || aclocal || exit 1 -autoheader259 || autoheader || exit 1 -libtoolize15 -c -f || libtoolize -c -f || glibtoolize -c -f || exit 1 -automake19 -a -c || automake -a -c || exit 1 -autoconf259 || autoconf || exit 1 +aclocal || exit 1 +autoheader || autoheader || exit 1 +libtoolize -c -f || libtoolize -c -f || glibtoolize -c -f || exit 1 +automake -a -c || automake -a -c || exit 1 +autoconf || autoconf || exit 1