openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File namespaces.diff of Package gsoap (Revision 1fbd67c86168863d1f8e09a0202be8c5)

Currently displaying revision 1fbd67c86168863d1f8e09a0202be8c5 , Show latest

--- gsoap-2.7/soapcpp2/wsdl/Makefile.am 2005-07-15 23:04:42.000000000 +0200
+++ gsoap-2.7/soapcpp2/wsdl/Makefile.am	2005-09-11 22:24:37.000000000 +0200
@@ -22,7 +22,7 @@
 bin_PROGRAMS=wsdl2h

wsdl2h_CFLAGS=$(C_DEBUG_FLAGS) $(SOAPCPP2_NONAMESPACES) -D$(platform)
-wsdl2h_CPPFLAGS=$(C_DEBUG_FLAGS) $(SOAPCPP2_NONAMESPACES) -D$(platform)
+wsdl2h_CXXFLAGS=$(C_DEBUG_FLAGS) $(SOAPCPP2_NONAMESPACES) -D$(platform)
 wsdl2h_SOURCES=wsdl2h.cpp wsdl.cpp schema.cpp types.cpp service.cpp soap.cpp mime.cpp
 wsdl2h_LDADD=$(SOAP_CPP_SRC) $(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS)

--- gsoap-2.7/soapcpp2/wsdl/wsdl.cpp	2005-08-21 19:08:31.000000000 +0200
+++ gsoap-2.7/soapcpp2/wsdl/wsdl.cpp	2005-09-09 13:37:54.996271592 +0200
@@ -35,6 +35,10 @@
 
 #include "wsdlH.h"
 
+#ifdef WITH_NONAMESPACES
+extern struct Namespace namespaces[];
+#endif
+
 using namespace std;
 
 const char *qname_token(const char *QName, const char *URI)
--- gsoap-2.7/soapcpp2/wsdl/wsdl2h.cpp	2005-08-04 19:25:21.000000000 +0200
+++ gsoap-2.7/soapcpp2/wsdl/wsdl2h.cpp	2005-09-09 13:34:18.362204976 +0200
@@ -126,6 +126,31 @@
 A commercial use license is available from Genivia, Inc., contact@genivia.com\n\
 --------------------------------------------------------------------------------\n";
 
+////////////////////////////////////////////////////////////////////////////////
+//
+//	Namespaces
+//
+////////////////////////////////////////////////////////////////////////////////
+
+struct Namespace namespaces[] =
+{
+  {"SOAP-ENV", "http://schemas.xmlsoap.org/soap/envelope/", "http://www.w3.org/*/soap-envelope"},
+  {"SOAP-ENC", "http://schemas.xmlsoap.org/soap/encoding/", "http://www.w3.org/*/soap-encoding"},
+  {"xsi", "http://www.w3.org/2001/XMLSchema-instance"},
+  {"xsd", ""}, // http://www.w3.org/2001/XMLSchema"}, // don't use this, it might conflict with xs
+  {"xml", "http://www.w3.org/XML/1998/namespace"},
+  {"xs", "http://www.w3.org/2001/XMLSchema", "http://www.w3.org/*/XMLSchema" },
+  {"http", "http://schemas.xmlsoap.org/wsdl/http/"},
+  {"soap", "http://schemas.xmlsoap.org/wsdl/soap/", "http://schemas.xmlsoap.org/wsdl/soap*/"},
+  {"mime", "http://schemas.xmlsoap.org/wsdl/mime/"},
+  {"dime", "http://schemas.xmlsoap.org/ws/2002/04/dime/wsdl/", "http://schemas.xmlsoap.org/ws/*/dime/wsdl/"},
+  {"wsdl", "http://schemas.xmlsoap.org/wsdl/"},
+  {"gwsdl", "http://www.gridforum.org/namespaces/2003/03/gridWSDLExtensions"},
+  {"sd", "http://www.gridforum.org/namespaces/2003/03/serviceData"},
+  {NULL, NULL}
+};
+
+
 int main(int argc, char **argv)
 { init();
   options(argc, argv);
@@ -368,27 +393,3 @@
     }
   }
 }
-
-////////////////////////////////////////////////////////////////////////////////
-//
-//	Namespaces
-//
-////////////////////////////////////////////////////////////////////////////////
-
-struct Namespace namespaces[] =
-{
-  {"SOAP-ENV", "http://schemas.xmlsoap.org/soap/envelope/", "http://www.w3.org/*/soap-envelope"},
-  {"SOAP-ENC", "http://schemas.xmlsoap.org/soap/encoding/", "http://www.w3.org/*/soap-encoding"},
-  {"xsi", "http://www.w3.org/2001/XMLSchema-instance"},
-  {"xsd", ""}, // http://www.w3.org/2001/XMLSchema"}, // don't use this, it might conflict with xs
-  {"xml", "http://www.w3.org/XML/1998/namespace"},
-  {"xs", "http://www.w3.org/2001/XMLSchema", "http://www.w3.org/*/XMLSchema" },
-  {"http", "http://schemas.xmlsoap.org/wsdl/http/"},
-  {"soap", "http://schemas.xmlsoap.org/wsdl/soap/", "http://schemas.xmlsoap.org/wsdl/soap*/"},
-  {"mime", "http://schemas.xmlsoap.org/wsdl/mime/"},
-  {"dime", "http://schemas.xmlsoap.org/ws/2002/04/dime/wsdl/", "http://schemas.xmlsoap.org/ws/*/dime/wsdl/"},
-  {"wsdl", "http://schemas.xmlsoap.org/wsdl/"},
-  {"gwsdl", "http://www.gridforum.org/namespaces/2003/03/gridWSDLExtensions"},
-  {"sd", "http://www.gridforum.org/namespaces/2003/03/serviceData"},
-  {NULL, NULL}
-};
--- gsoap-2.7/soapcpp2/wsdl/schema.cpp	2005-09-09 13:42:40.354890488 +0200
+++ gsoap-2.7/soapcpp2/wsdl/schema.cpp	2005-09-09 13:42:24.238340576 +0200
@@ -35,6 +35,10 @@
 
 #include "wsdlH.h"		// cannot include "schemaH.h"
 
+#ifdef WITH_NONAMESPACES
+extern struct Namespace namespaces[];
+#endif
+
 using namespace std;
 
 extern int warn_ignore(struct soap*, const char*);

Places

File namespaces.diff of Package gsoap (Revision 1fbd67c86168863d1f8e09a0202be8c5)

Places