Index: trunk/Nebulous/nebclient/bootstrap.sh
===================================================================
--- trunk/Nebulous/nebclient/bootstrap.sh	(revision 4121)
+++ trunk/Nebulous/nebclient/bootstrap.sh	(revision 4440)
@@ -3,8 +3,8 @@
 # Copyright (C) 2005  Joshua Hoblitt
 #
-# $Id: bootstrap.sh,v 1.7 2005-01-27 01:08:05 jhoblitt Exp $
+# $Id: bootstrap.sh,v 1.8 2005-06-30 02:35:05 jhoblitt Exp $
 
-wsdl2h -o src/idata.h -c idata.wsdl \
-&& soapcpp2 -d src -c src/idata.h \
+wsdl2h -o src/nebulous.h -c nebulous.wsdl \
+&& soapcpp2 -d src -c src/nebulous.h \
 && rm -f src/*.xml
 
Index: trunk/Nebulous/nebclient/configure.ac
===================================================================
--- trunk/Nebulous/nebclient/configure.ac	(revision 4121)
+++ trunk/Nebulous/nebclient/configure.ac	(revision 4440)
@@ -1,10 +1,10 @@
 dnl Copyright (C) 2005  Joshua Hoblitt
 dnl
-dnl $Id: configure.ac,v 1.2 2005-01-16 10:37:59 jhoblitt Exp $
+dnl $Id: configure.ac,v 1.3 2005-06-30 02:35:05 jhoblitt Exp $
 
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([idataclient], [0.0.1], [jhoblitt@cpan.org])
+AC_INIT([nebulousclient], [0.0.1], [jhoblitt@cpan.org])
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-AC_REVISION([$Revision: 1.2 $])
+AC_REVISION([$Revision: 1.3 $])
 
 dnl generate config.h
Index: trunk/Nebulous/nebclient/nebulous.wsdl
===================================================================
--- trunk/Nebulous/nebclient/nebulous.wsdl	(revision 4121)
+++ trunk/Nebulous/nebclient/nebulous.wsdl	(revision 4440)
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
-<definitions name="IDataServer"
-    targetNamespace="urn:PS/IPP/IData/Server/SOAP"
-    xmlns:tns="urn:PS/IPP/IData/Server/SOAP"
+<definitions name="NebulousServer"
+    targetNamespace="urn:Nebulous/Server/SOAP"
+    xmlns:tns="urn:Nebulous/Server/SOAP"
     xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
     xmlns:enc="http://schemas.xmlsoap.org/soap/encoding/"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:ns="urn:PS/IPP/IData/Server/SOAP">
+    xmlns:ns="urn:Nebulous/Server/SOAP">
 
     <types>
         <schema xmlns="http://www.w3.org/2001/XMLSchema"
-            targetNamespace="urn:PS/IPP/IData/Server/SOAP"
+            targetNamespace="urn:Nebulous/Server/SOAP"
             xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
             xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
@@ -85,5 +85,5 @@
 
 
-    <portType name="PS/IPP/IData/Server/SOAPPort">
+    <portType name="Nebulous/Server/SOAPPort">
         <operation name="create_object">
             <input  message="tns:create_objectRequest" />
@@ -138,80 +138,80 @@
 
 
-    <binding name="SOAP" type="tns:PS/IPP/IData/Server/SOAPPort">
+    <binding name="SOAP" type="tns:Nebulous/Server/SOAPPort">
         <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http" />
         <operation name="create_object">
-            <soap:operation soapAction="urn:PS/IPP/IData/Server/SOAP#create_object" />
-            <input>
-                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
-                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
-            </input>
-            <output>
-                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
+            <soap:operation soapAction="urn:Nebulous/Server/SOAP#create_object" />
+            <input>
+                <soap:body use="encoded" namespace="urn:Nebulous/Server/SOAP"
+                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+            </input>
+            <output>
+                <soap:body use="encoded" namespace="urn:Nebulous/Server/SOAP"
                     encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
             </output>
         </operation>
         <operation name="replicate_object">
-            <soap:operation soapAction="urn:PS/IPP/IData/Server/SOAP#replicate_object" />
-            <input>
-                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
-                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
-            </input>
-            <output>
-                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
+            <soap:operation soapAction="urn:Nebulous/Server/SOAP#replicate_object" />
+            <input>
+                <soap:body use="encoded" namespace="urn:Nebulous/Server/SOAP"
+                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+            </input>
+            <output>
+                <soap:body use="encoded" namespace="urn:Nebulous/Server/SOAP"
                     encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
             </output>
         </operation>
         <operation name="lock_object">
-            <soap:operation soapAction="urn:PS/IPP/IData/Server/SOAP#lock_object" />
-            <input>
-                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
-                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
-            </input>
-            <output>
-                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
+            <soap:operation soapAction="urn:Nebulous/Server/SOAP#lock_object" />
+            <input>
+                <soap:body use="encoded" namespace="urn:Nebulous/Server/SOAP"
+                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+            </input>
+            <output>
+                <soap:body use="encoded" namespace="urn:Nebulous/Server/SOAP"
                     encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
             </output>
         </operation>
         <operation name="unlock_object">
-            <soap:operation soapAction="urn:PS/IPP/IData/Server/SOAP#unlock_object" />
-            <input>
-                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
-                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
-            </input>
-            <output>
-                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
+            <soap:operation soapAction="urn:Nebulous/Server/SOAP#unlock_object" />
+            <input>
+                <soap:body use="encoded" namespace="urn:Nebulous/Server/SOAP"
+                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+            </input>
+            <output>
+                <soap:body use="encoded" namespace="urn:Nebulous/Server/SOAP"
                     encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
             </output>
         </operation>
         <operation name="find_instances">
-            <soap:operation soapAction="urn:PS/IPP/IData/Server/SOAP#find_instances" />
-            <input>
-                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
-                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
-            </input>
-            <output>
-                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
+            <soap:operation soapAction="urn:Nebulous/Server/SOAP#find_instances" />
+            <input>
+                <soap:body use="encoded" namespace="urn:Nebulous/Server/SOAP"
+                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+            </input>
+            <output>
+                <soap:body use="encoded" namespace="urn:Nebulous/Server/SOAP"
                     encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
             </output>
         </operation>
         <operation name="delete_instance">
-            <soap:operation soapAction="urn:PS/IPP/IData/Server/SOAP#delete_instance" />
-            <input>
-                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
-                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
-            </input>
-            <output>
-                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
+            <soap:operation soapAction="urn:Nebulous/Server/SOAP#delete_instance" />
+            <input>
+                <soap:body use="encoded" namespace="urn:Nebulous/Server/SOAP"
+                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+            </input>
+            <output>
+                <soap:body use="encoded" namespace="urn:Nebulous/Server/SOAP"
                     encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
             </output>
         </operation>
         <operation name="stat_object">
-            <soap:operation soapAction="urn:PS/IPP/IData/Server/SOAP#stat_object" />
-            <input>
-                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
-                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
-            </input>
-            <output>
-                <soap:body use="encoded" namespace="urn:PS/IPP/IData/Server/SOAP"
+            <soap:operation soapAction="urn:Nebulous/Server/SOAP#stat_object" />
+            <input>
+                <soap:body use="encoded" namespace="urn:Nebulous/Server/SOAP"
+                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+            </input>
+            <output>
+                <soap:body use="encoded" namespace="urn:Nebulous/Server/SOAP"
                     encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
             </output>
@@ -220,7 +220,7 @@
 
 
-    <service name="PS/IPP/IData/Server/SOAP">
-        <port name="PS/IPP/IData/Server/SOAPPort" binding="tns:SOAP">
-            <soap:address location="http://localhost:80/idata" />
+    <service name="Nebulous/Server/SOAP">
+        <port name="Nebulous/Server/SOAPPort" binding="tns:SOAP">
+            <soap:address location="http://localhost:80/nebulous" />
         </port>
     </service>
Index: trunk/Nebulous/nebclient/src/Makefile.am
===================================================================
--- trunk/Nebulous/nebclient/src/Makefile.am	(revision 4121)
+++ trunk/Nebulous/nebclient/src/Makefile.am	(revision 4440)
@@ -1,12 +1,12 @@
 # Copyright (C) 2005  Joshua Hoblitt
 #
-# $Id: Makefile.am,v 1.3 2005-01-19 00:31:35 jhoblitt Exp $
+# $Id: Makefile.am,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $
 
-include_HEADERS=idataclient.h
-lib_LTLIBRARIES = libidataclient.la
-libidataclient_la_LDFLAGS = -release @PACKAGE_VERSION@
-libidataclient_la_SOURCES =\
-    idataclient.h\
-    idataclient.c\
+include_HEADERS=nebclient.h
+lib_LTLIBRARIES = libnebclient.la
+libnebclient_la_LDFLAGS = -release @PACKAGE_VERSION@
+libnebclient_la_SOURCES =\
+    nebclient.h\
+    nebclient.c\
     xmalloc.h\
     xmalloc.c\
@@ -21,3 +21,3 @@
 bin_PROGRAMS = test
 test_SOURCES = test.c
-test_LDADD = libidataclient.la
+test_LDADD = libnebclient.la
Index: trunk/Nebulous/nebclient/src/nebclient.c
===================================================================
--- trunk/Nebulous/nebclient/src/nebclient.c	(revision 4121)
+++ trunk/Nebulous/nebclient/src/nebclient.c	(revision 4440)
@@ -1,8 +1,8 @@
 /*
- * idataclient.c - idata client
+ * nebclient.c - nebulous client
  *
  * Copyright (C) 2005  Joshua Hoblitt
  *
- * $Id: nebclient.c,v 1.3 2005-06-06 21:21:05 jhoblitt Exp $
+ * $Id: nebclient.c,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $
  */
 
@@ -18,17 +18,17 @@
 #include "soapH.h"
 #include "SOAP.nsmap"
-#include "idataclient.h"
+#include "nebclient.h"
 
 #define ERRBUF_SIZE 255
 
-static off_t idataCopyFile(char *source, char *dest);
-static off_t idataCopyFilehandle(int sourceFH, int destFH);
-
-void idataServerInit(idataServer *server)
+static off_t nebCopyFile(char *source, char *dest);
+static off_t nebCopyFilehandle(int sourceFH, int destFH);
+
+void nebServerInit(nebServer *server)
 {
     soap_init(server);
 }
 
-char *idataServerErr(idataServer *server)
+char *nebServerErr(nebServer *server)
 {
     char            *fault;
@@ -45,5 +45,5 @@
 }
 
-void idataServerCleanup(idataServer *server)
+void nebServerCleanup(nebServer *server)
 {
     soap_end(server); // remove deserialized data and clean up
@@ -51,5 +51,5 @@
 }
 
-int idataCreate(idataServer *server, char *key, unsigned int class, char *volume, char *comment, char **URI)
+int nebCreate(nebServer *server, char *key, unsigned int class, char *volume, char *comment, char **URI)
 {
     struct ns1__create_USCOREobjectResponse response;
@@ -61,5 +61,5 @@
         strcpy(*URI, response.result);
 
-        if (!idataParseURI(*URI, &filename)) {
+        if (!nebParseURI(*URI, &filename)) {
             fprintf(stderr, "can not parse URI\n");
 
@@ -81,5 +81,5 @@
 }
 
-int idataReplicate(idataServer *server, char *key, char *volume, char **URI )
+int nebReplicate(nebServer *server, char *key, char *volume, char **URI )
 {
     struct ns1__replicate_USCOREobjectResponse response;
@@ -91,5 +91,5 @@
         strcpy(*URI, response.result);
 
-        if (!idataParseURI(*URI, &filename)) {
+        if (!nebParseURI(*URI, &filename)) {
             fprintf(stderr, "can not parse URI\n");
 
@@ -97,5 +97,5 @@
         }
 
-        sourceFH = idataOpen(server, key, IDATA_READ);
+        sourceFH = nebOpen(server, key, NEB_READ);
         if (sourceFH == -1) {
             fprintf(stderr, "can not open key %s\n", key );
@@ -111,5 +111,5 @@
         }
 
-        idataCopyFilehandle(sourceFH, destFH);
+        nebCopyFilehandle(sourceFH, destFH);
 
         if (close(sourceFH) == -1) {
@@ -130,23 +130,23 @@
 }
 
-int idataCull( idataServer *server,char *key )
-{
-
-    return 0;
-}
-
-int idataLock(idataServer *server, char *key, rw flag )
-{
-
-    return 0;
-}
-
-int idataUnlock(idataServer *server, char *key, rw flag )
-{
-
-    return 0;
-}
-
-int idataFindInstances(idataServer *server, char *key, char *volume, char ***locations)
+int nebCull( nebServer *server,char *key )
+{
+
+    return 0;
+}
+
+int nebLock(nebServer *server, char *key, rw flag )
+{
+
+    return 0;
+}
+
+int nebUnlock(nebServer *server, char *key, rw flag )
+{
+
+    return 0;
+}
+
+int nebFindInstances(nebServer *server, char *key, char *volume, char ***locations)
 {
     struct ns1__find_USCOREinstancesResponse response;
@@ -179,53 +179,53 @@
 }
 
-int idataFind(idataServer *server, char *key )
-{
-
-    return 0;
-}
-
-int idataOpen(idataServer *server, char *key, rw flag )
-{
-
-    return 0;
-}
-
-int idataDelete(idataServer *server, char *key )
-{
-
-    return 0;
-}
-
-int idataCopy(idataServer *server, char *key, char *newKey )
-{
-
-    return 0;
-}
-
-int idataMove(idataServer *server, char *key, char *newKey )
-{
-
-    return 0;
-}
-
-int idataDelete_instance(idataServer *server, char *URI )
-{
-
-    return 0;
-}
-
-int idataStat(idataServer *server, char *key )
-{
-
-    return 0;
-}
-
-int idataErr(idataServer *server, char *errString )
-{
-
-    return 0;
-}
-
-int idataParseURI(const char *URI, char **filename)
+int nebFind(nebServer *server, char *key )
+{
+
+    return 0;
+}
+
+int nebOpen(nebServer *server, char *key, rw flag )
+{
+
+    return 0;
+}
+
+int nebDelete(nebServer *server, char *key )
+{
+
+    return 0;
+}
+
+int nebCopy(nebServer *server, char *key, char *newKey )
+{
+
+    return 0;
+}
+
+int nebMove(nebServer *server, char *key, char *newKey )
+{
+
+    return 0;
+}
+
+int nebDelete_instance(nebServer *server, char *URI )
+{
+
+    return 0;
+}
+
+int nebStat(nebServer *server, char *key )
+{
+
+    return 0;
+}
+
+int nebErr(nebServer *server, char *errString )
+{
+
+    return 0;
+}
+
+int nebParseURI(const char *URI, char **filename)
 {
     regex_t         myregex;
@@ -270,9 +270,9 @@
 }
 
-void idataFree(void *ptr) {
+void nebFree(void *ptr) {
     xfree(ptr);
 }
 
-static off_t idataCopyFile(char *source, char *dest)
+static off_t nebCopyFile(char *source, char *dest)
 {
     int             sourceFH;
@@ -294,5 +294,5 @@
     }
 
-    bytesCopied = idataCopyFilehandle(sourceFH, destFH);
+    bytesCopied = nebCopyFilehandle(sourceFH, destFH);
     if (bytesCopied < 0) {
         return -1;
@@ -314,5 +314,5 @@
 }
 
-static off_t idataCopyFilehandle(int sourceFH, int destFH)
+static off_t nebCopyFilehandle(int sourceFH, int destFH)
 {
     off_t           bytesTotal;
Index: trunk/Nebulous/nebclient/src/nebclient.h
===================================================================
--- trunk/Nebulous/nebclient/src/nebclient.h	(revision 4121)
+++ trunk/Nebulous/nebclient/src/nebclient.h	(revision 4440)
@@ -1,55 +1,55 @@
 /*
- * idataclient -  idata client
+ * nebclient.h -  nebulous client header
  * 
  * Copyright (C) 2005  Joshua Hoblitt
  *
- * $Id: nebclient.h,v 1.5 2005-06-06 21:21:05 jhoblitt Exp $
+ * $Id: nebclient.h,v 1.6 2005-06-30 02:35:06 jhoblitt Exp $
  */
 
-#ifndef IDATACLIENT_H
-#define IDATACLIENT_H 1
+#ifndef NEBCLIENT_H
+#define NEBCLIENT_H 1
 
 #include "soapH.h"
 
-typedef enum { IDATA_READ, IDATA_WRITE } rw;
-typedef struct soap idataServer;
+typedef enum { NEB_READ, NEB_WRITE } rw;
+typedef struct soap nebServer;
 
-void idataServerInit(idataServer *server);
+void nebServerInit(nebServer *server);
 
-char *idataServerErr(idataServer *server);
+char *nebServerErr(nebServer *server);
 
-void idataServerCleanup(idataServer *server);
+void nebServerCleanup(nebServer *server);
 
-int idataCreate(idataServer *server, char *key, unsigned int class, char *volume, char *comment, char **URI);
+int nebCreate(nebServer *server, char *key, unsigned int class, char *volume, char *comment, char **URI);
 
-int idataReplicate(idataServer *server, char *key, char *volume, char **URI);
+int nebReplicate(nebServer *server, char *key, char *volume, char **URI);
 
-int idataCull(idataServer *server, char *key);
+int nebCull(nebServer *server, char *key);
 
-int idataLock(idataServer *server, char *key, rw flag);
+int nebLock(nebServer *server, char *key, rw flag);
 
-int idataUnlock(idataServer *server, char *key, rw flag);
+int nebUnlock(nebServer *server, char *key, rw flag);
 
-int idataFindInstances(idataServer *server, char *key, char *volume, char ***locations);
+int nebFindInstances(nebServer *server, char *key, char *volume, char ***locations);
 
-int idataFind(idataServer *server, char *key);
+int nebFind(nebServer *server, char *key);
 
-int idataOpen(idataServer *server, char *key, rw flag);
+int nebOpen(nebServer *server, char *key, rw flag);
 
-int idataDelete(idataServer *server, char *key);
+int nebDelete(nebServer *server, char *key);
 
-int idataCopy(idataServer *server, char *key, char *newKey);
+int nebCopy(nebServer *server, char *key, char *newKey);
 
-int idataMove(idataServer *server, char *key, char *newKey);
+int nebMove(nebServer *server, char *key, char *newKey);
 
-int idataDelete_instance(idataServer *server, char *URI);
+int nebDelete_instance(nebServer *server, char *URI);
 
-int idataStat(idataServer *server, char *key);
+int nebStat(nebServer *server, char *key);
 
-int idataErr(idataServer *server, char *errString);
+int nebErr(nebServer *server, char *errString);
 
-int idataParseURI(const char *URI, char **filename);
+int nebParseURI(const char *URI, char **filename);
 
-void idataFree(void *ptr);
+void nebFree(void *ptr);
 
-#endif // IDATACLIENT_H
+#endif // NEBLIENT_H
Index: trunk/Nebulous/nebclient/src/test.c
===================================================================
--- trunk/Nebulous/nebclient/src/test.c	(revision 4121)
+++ trunk/Nebulous/nebclient/src/test.c	(revision 4440)
@@ -1,8 +1,8 @@
 #include <stdio.h>
 #include <unistd.h>
-#include "idataclient.h"
+#include "nebclient.h"
 
 int main (int argc, char **argv) {
-    idataServer     server;
+    nebServer     server;
     char            *URI;
     int             fh;
@@ -10,12 +10,12 @@
     char            **foo;
 
-    idataServerInit(&server);
+    nebServerInit(&server);
 
-    fh = idataCreate(&server, argv[1], 0, NULL, NULL, &URI);
+    fh = nebCreate(&server, argv[1], 0, NULL, NULL, &URI);
 
     if (fh > 0) {
         printf( "uri is %s\n", URI );
 
-        idataFree(URI);
+        nebFree(URI);
 
         if(close(fh) != 0){
@@ -25,11 +25,11 @@
         printf( "local error\n" );
     } else {
-        printf( "server error: %s\n", idataServerErr(&server) );
+        printf( "server error: %s\n", nebServerErr(&server) );
     }
 
-    n = idataFindInstances(&server, argv[1], NULL, &foo);
+    n = nebFindInstances(&server, argv[1], NULL, &foo);
     printf( "found %d instances\n", n );
 
-    idataServerCleanup(&server);
+    nebServerCleanup(&server);
 
     exit(0);