IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 23935


Ignore:
Timestamp:
Apr 20, 2009, 12:50:54 PM (17 years ago)
Author:
jhoblitt
Message:

merge neb_distrib_20081210

Location:
trunk/Nebulous/nebclient
Files:
12 edited
3 copied

Legend:

Unmodified
Added
Removed

  • trunk/Nebulous/nebclient

  • trunk/Nebulous/nebclient/nebulous.wsdl

    r20988 r23935  
    125125
    126126    <message name="delete_instanceRequest">
     127        <part name="key" type="xsd:string" />
    127128        <part name="uri" type="xsd:string" />
    128129    </message>

  • trunk/Nebulous/nebclient/src/nebclient.c

    r21461 r23935  
    253253    }
    254254
    255     if (!nebDeleteInstance(server, locations->URI[0])) {
     255    if (!nebDeleteInstance(server, key, locations->URI[0])) {
    256256        nebObjectInstancesFree(locations);
    257257
    … …  
    633633
    634634    for (int i = 0; i < locations->n; i++) {
    635         if (!nebDeleteInstance(server, locations->URI[i])) {
     635      if (!nebDeleteInstance(server, key, locations->URI[i])) {
    636636            nebSetErr(server, "can not delete instance");
    637637            nebObjectInstancesFree(locations);
    … …  
    749749}
    750750
    751 bool nebDeleteInstance(nebServer *server, const char *URI)
     751bool nebDeleteInstance(nebServer *server, const char *key, const char *URI)
    752752{
    753753    int             response;
    … …  
    770770
    771771    if (soap_call_ns1__delete_USCOREinstance(server->soap, server->endpoint,
    772             NULL, (char *)URI, &response) != SOAP_OK) {
     772        NULL, (char *)key, (char *)URI, &response) != SOAP_OK) {
    773773        nebFree(filename);
    774774

  • trunk/Nebulous/nebclient/src/nebclient.h

    r21462 r23935  
    282282bool nebDeleteInstance(
    283283    nebServer *server,                  ///< nebServer object
     284    const char *key,                    ///< storage object key (name)
    284285    const char *URI                     ///< URL of instance to remove
    285286);

  • trunk/Nebulous/nebclient/src/nebulous.h

    r23688 r23935  
    11/* src/nebulous.h
    22   Generated by wsdl2h 1.2.12 from nebulous.wsdl and typemap.dat
    3    2009-04-03 00:34:43 GMT
     3   2009-04-20 22:15:21 GMT
    44   Copyright (C) 2001-2008 Robert van Engelen, Genivia Inc. All Rights Reserved.
    55   This part of the software is released under one of the following licenses:
    … …  
    808808    NULL, // char *action = NULL selects default action for this operation
    809809    // request parameters:
     810    char*                               key,
    810811    char*                               uri,
    811812    // response parameters:
    … …  
    819820    struct soap *soap,
    820821    // request parameters:
     822    char*                               key,
    821823    char*                               uri,
    822824    // response parameters:
    … …  
    831833//gsoap ns1  service method-action:     delete_USCOREinstance urn:Nebulous/Server/SOAP#delete_instance
    832834int ns1__delete_USCOREinstance(
     835    char*                               key,    ///< Request parameter
    833836    char*                               uri,    ///< Request parameter
    834837    int                                *result  ///< Response parameter

  • trunk/Nebulous/nebclient/src/soapC.c

    r23688 r23935  
    1212#endif
    1313
    14 SOAP_SOURCE_STAMP("@(#) soapC.c ver 2.7.12 2009-04-03 00:34:43 GMT")
     14SOAP_SOURCE_STAMP("@(#) soapC.c ver 2.7.12 2009-04-20 22:15:22 GMT")
    1515
    1616
    … …  
    13441344{
    13451345        (void)soap; (void)a; /* appease -Wall -Werror */
     1346        soap_default_string(soap, &a->key);
    13461347        soap_default_string(soap, &a->uri);
    13471348}
    … …  
    13501351{
    13511352        (void)soap; (void)a; /* appease -Wall -Werror */
     1353        soap_serialize_string(soap, &a->key);
    13521354        soap_serialize_string(soap, &a->uri);
    13531355}
    … …  
    13651367        if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__delete_USCOREinstance), type))
    13661368                return soap->error;
     1369        if (soap_out_string(soap, "key", -1, &a->key, ""))
     1370                return soap->error;
    13671371        if (soap_out_string(soap, "uri", -1, &a->uri, ""))
    13681372                return soap->error;
    … …  
    13801384SOAP_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)
    13811385{
     1386        size_t soap_flag_key = 1;
    13821387        size_t soap_flag_uri = 1;
    13831388        if (soap_element_begin_in(soap, tag, 0, type))
    … …  
    13911396                for (;;)
    13921397                {       soap->error = SOAP_TAG_MISMATCH;
     1398                        if (soap_flag_key && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
     1399                                if (soap_in_string(soap, "key", &a->key, "xsd:string"))
     1400                                {       soap_flag_key--;
     1401                                        continue;
     1402                                }
    13931403                        if (soap_flag_uri && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
    13941404                                if (soap_in_string(soap, "uri", &a->uri, "xsd:string"))

  • trunk/Nebulous/nebclient/src/soapClient.c

    r23688 r23935  
    1010#endif
    1111
    12 SOAP_SOURCE_STAMP("@(#) soapClient.c ver 2.7.12 2009-04-03 00:34:43 GMT")
     12SOAP_SOURCE_STAMP("@(#) soapClient.c ver 2.7.12 2009-04-20 22:15:21 GMT")
    1313
    1414
    … …  
    700700}
    701701
    702 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)
     702SOAP_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)
    703703{       struct ns1__delete_USCOREinstance soap_tmp_ns1__delete_USCOREinstance;
    704704        struct ns1__delete_USCOREinstanceResponse *soap_tmp_ns1__delete_USCOREinstanceResponse;
    … …  
    708708                soap_action = "urn:Nebulous/Server/SOAP#delete_instance";
    709709        soap->encodingStyle = "http://schemas.xmlsoap.org/soap/encoding/";
     710        soap_tmp_ns1__delete_USCOREinstance.key = key;
    710711        soap_tmp_ns1__delete_USCOREinstance.uri = uri;
    711712        soap_begin(soap);

  • trunk/Nebulous/nebclient/src/soapServer.c

    r23688 r23935  
    1010#endif
    1111
    12 SOAP_SOURCE_STAMP("@(#) soapServer.c ver 2.7.12 2009-04-03 00:34:43 GMT")
     12SOAP_SOURCE_STAMP("@(#) soapServer.c ver 2.7.12 2009-04-20 22:15:21 GMT")
    1313
    1414
    … …  
    643643         || soap_end_recv(soap))
    644644                return soap->error;
    645         soap->error = ns1__delete_USCOREinstance(soap, soap_tmp_ns1__delete_USCOREinstance.uri, &soap_tmp_int);
     645        soap->error = ns1__delete_USCOREinstance(soap, soap_tmp_ns1__delete_USCOREinstance.key, soap_tmp_ns1__delete_USCOREinstance.uri, &soap_tmp_int);
    646646        if (soap->error)
    647647                return soap->error;

  • trunk/Nebulous/nebclient/src/soapStub.h

    r23198 r23935  
    283283struct ns1__delete_USCOREinstance
    284284{
     285        char *key;      /* optional element of type xsd:string */
    285286        char *uri;      /* optional element of type xsd:string */
    286287};
    … …  
    432433SOAP_FMAC5 int SOAP_FMAC6 ns1__find_USCOREinstances(struct soap*, char *key, char *volume, struct ns1__find_USCOREinstancesResponse *_param_3);
    433434
    434 SOAP_FMAC5 int SOAP_FMAC6 ns1__delete_USCOREinstance(struct soap*, char *uri, int *result);
     435SOAP_FMAC5 int SOAP_FMAC6 ns1__delete_USCOREinstance(struct soap*, char *key, char *uri, int *result);
    435436
    436437SOAP_FMAC5 int SOAP_FMAC6 ns1__stat_USCOREobject(struct soap*, char *key, struct ns1__stat_USCOREobjectResponse *_param_4);
    … …  
    467468SOAP_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);
    468469
    469 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);
     470SOAP_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);
    470471
    471472SOAP_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);

  • trunk/Nebulous/nebclient/tests/tap

    • Property svn:ignore

      •  

        old new  
        1 .in
         1configure
         2Makefile.in
         3config.log
         4depcomp
         5config.status
         6config.guess
         7ltmain.sh
         8config.sub
         9autom4te.cache
         10libtool
         11missing
         12aclocal.m4
        213Makefile
        3 Makefile.in
        4 aclocal.m4
        5 autom4te.cache
        6 config.log
        7 config.status
        8 configure
        9 libtool
        10 *.bb
        11 *.bbg
        12 *.da
        13 gmon.out
         14install-sh
         15src/Makefile.in
         16src/stamp-h1
         17src/config.h
         18src/config.h.in
         19src/.deps
         20src/Makefile
    • Property svn:mergeinfo changed
      /branches/neb_distrib_20081210/Nebulous/nebclient/tests/tap (added)merged: 20900,​23536,​23729

  • trunk/Nebulous/nebclient/tests/tap/bootstrap.sh

    r23934 r23935  
    22
    33set -x
    4 aclocal19 -I /usr/local/share/aclocal || aclocal || exit 1
    5 autoheader259 || autoheader || exit 1
    6 libtoolize15 -c -f || libtoolize -c -f || glibtoolize -c -f || exit 1
    7 automake19 -a -c || automake -a -c || exit 1
    8 autoconf259 || autoconf || exit 1
     4aclocal || exit 1
     5autoheader || autoheader || exit 1
     6libtoolize -c -f || libtoolize -c -f || glibtoolize -c -f || exit 1
     7automake -a -c || automake -a -c || exit 1
     8autoconf || autoconf || exit 1

  • trunk/Nebulous/nebclient/tests/tap/src

    • Property svn:ignore

      •  

        old new  
        1 .deps
        2 .libs
        3 Makefile
        41Makefile.in
        5 libtap.la
        6 tap.lo
         2ignore
         3stamp-h1
        74config.h
        85config.h.in
        9 stamp-h1
        10 *.bb
        11 *.bbg
        12 *.da
        13 gmon.out
         6.deps
         7Makefile
         8.libs
Note: See TracChangeset for help on using the changeset viewer.