Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

This, with the one-liner Peter checks in, completely closes bug 107795.

Browse Source 
r=heikki, sr=vidur, sr=jband, a=shaver.

This eliminates the MOZ_SOAP defining and checking from the makefiles,
from one .cpp file for conditional compiles, and from .html documentation
and tests (.html is only significant to human readers).

this enables SOAP in the default build, and has been tested on all
clean builds.
This commit is contained in:
rayw%netscape.com 2002-02-21 23:15:08 +00:00
parent a16063b2cb
commit e9532c1f4e
17 changed files with 12 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/webservices/docs/Soap_Scripts_in_Mozilla.html
View File

@ -1338,9 +1338,7 @@ external access to the functions.  What exists today is mozilla/extensions
configured to talk to a server -- but it genrates interesting messages
anyway.<br>
<br>
To test the services, it is currently required to compile Mozilla with
the environment variable MOZ_SOAP=1 (if you already have a build, you only
need to do a clean rebuild of the xmlextras directory). &nbsp;It is also
To test the services, it is
interesting to turn on MOZ_DEBUG=1, because even if you do not debug the
program, this causes the exchanged SOAP messages to be displayed on the
standard output if you run from a command shell where this is visible.<br>

3
extensions/webservices/soap/tests/soapelements.html
View File

@ -5,8 +5,7 @@
<H1>SOAP Test: Elements</H1>
The entered element will be requested and the info displayed. This service found on
<A href="http://www.xmethods.com">X Methods Website</A>. View the source of this
page for details on how it was called. If you compile mozilla DEBUG (you also need
MOZ_SOAP), the message sent and received will be logged to the console.
page for details on how it was called. If you compile mozilla DEBUG, the message sent and received will be logged to the console.
<p>Experimenters may wish to add other tests which exercize services, with specific
user interfaces such as the one in this test.
<SCRIPT>

3
extensions/webservices/soap/tests/soapheadlinenews.html
View File

@ -5,8 +5,7 @@
<H1>SOAP Test: Headline News</H1>
The entered domain name will be searched, and the result displayed. This service found on
<A href="http://www.xmethods.com">X Methods Website</A>. View the source of this
page for details on how it was called. If you compile mozilla DEBUG (you also need
MOZ_SOAP), the message sent and received will be logged to the console.
page for details on how it was called. If you compile mozilla DEBUG, the message sent and received will be logged to the console.
<p>Experimenters may wish to add other tests which exercize services, with specific
user interfaces such as the one in this test.
<SCRIPT>

3
extensions/webservices/soap/tests/soapisprimenumber.html
View File

@ -7,8 +7,7 @@ The number typed in the text field will change color depending upon whether the
reports <font color="green">prime</font> or <font color="red">nonprime</font>.
<p>This works by calling a SOAP service listed on
<A href="http://www.xmethods.com">X Methods Website</A>. View the source of this
page for details on how it was called. If you compile mozilla DEBUG (you also need
MOZ_SOAP), the message sent and received will be logged to the console.
page for details on how it was called. If you compile mozilla DEBUG, the message sent and received will be logged to the console.
<p>Experimenters may wish to add other tests which exercize services, with specific
user interfaces such as the one in this test.
<SCRIPT>

3
extensions/webservices/soap/tests/soapstatistics.html
View File

@ -6,8 +6,7 @@
This passes an array to request the average and standard deviation.
<p>This works by calling a SOAP service listed on
<A href="http://www.xmethods.com">X Methods Website</A>. View the source of this
page for details on how it was called. If you compile mozilla DEBUG (you also need
MOZ_SOAP), the message sent and received will be logged to the console.
page for details on how it was called. If you compile mozilla DEBUG, the message sent and received will be logged to the console.
<p>Experimenters may wish to add other tests which exercize services, with specific
user interfaces such as the one in this test.
<SCRIPT>

3
extensions/webservices/soap/tests/soapunscramble.html
View File

@ -5,8 +5,7 @@
<H1>SOAP Test: Unscramble</H1>
The entered word will be unscrambled against a dictionary. Other services found on
<A href="http://www.xmethods.com">X Methods Website</A>. View the source of this
page for details on how it was called. If you compile mozilla DEBUG (you also need
MOZ_SOAP), the message sent and received will be logged to the console.
page for details on how it was called. If you compile mozilla DEBUG, the message sent and received will be logged to the console.
<p>Experimenters may wish to add other tests which exercize services, with specific
user interfaces such as the one in this test.
<SCRIPT>

2
extensions/xmlextras/Makefile.in
View File

@ -28,12 +28,10 @@ include $(DEPTH)/config/autoconf.mk
DIRS = base
ifdef MOZ_SOAP
DIRS += schema soap
ifdef MOZ_WSP
DIRS += wsdl proxy
endif
endif
DIRS += build

5
extensions/xmlextras/build/src/Makefile.in
View File

@ -54,12 +54,10 @@ SHARED_LIBRARY_LIBS = \
$(NULL)
ifdef MOZ_SOAP
SHARED_LIBRARY_LIBS += \
$(DIST)/lib/$(LIB_PREFIX)xmlextrasschema_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)xmlextrassoap_s.$(LIB_SUFFIX) \
$(NULL)
DEFINES += -DMOZ_SOAP
ifdef MOZ_WSP
SHARED_LIBRARY_LIBS += \
$(DIST)/lib/$(LIB_PREFIX)xmlextraswsdl_s.$(LIB_SUFFIX) \
@ -67,14 +65,12 @@ SHARED_LIBRARY_LIBS += \
$(NULL)
DEFINES += -DMOZ_WSP
endif
endif
LOCAL_INCLUDES = \
-I$(srcdir)/../../base/src \
$(NULL)
ifdef MOZ_SOAP
LOCAL_INCLUDES += \
-I$(srcdir)/../../soap/src \
-I$(srcdir)/../../schema/src \
@ -85,7 +81,6 @@ LOCAL_INCLUDES += \
-I$(srcdir)/../../proxy/src \
$(NULL)
endif
endif
EXTRA_DSO_LDOPTS = \

7
extensions/xmlextras/build/src/makefile.win
View File

@ -39,13 +39,11 @@ MODULE_NAME=nsXMLExtrasModule
LINCS = \
-I..\..\base\src \
!if defined(MOZ_SOAP)
-I..\..\soap\src \
-I..\..\schema\src \
!if defined(MOZ_WSP)
-I..\..\wsdl\src \
-I..\..\proxy\src \
!endif
!endif
$(NULL)
@ -55,13 +53,11 @@ CPP_OBJS= \
SUB_LIBRARIES= \
$(DIST)\lib\xmlextrasbase_s.lib \
!if defined(MOZ_SOAP)
$(DIST)\lib\xmlextrassoap_s.lib \
$(DIST)\lib\xmlextrasschema_s.lib \
!if defined(MOZ_WSP)
$(DIST)\lib\xmlextraswsdl_s.lib \
$(DIST)\lib\xmlextrasproxy_s.lib \
!endif
!endif
$(NULL)
@ -71,12 +67,9 @@ LLIBS= \
$(LIBNSPR) \
$(NULL)
!if defined(MOZ_SOAP)
DEFINES =$(DEFINES) -DMOZ_SOAP
!if defined(MOZ_WSP)
DEFINES =$(DEFINES) -DMOZ_WSP
!endif
!endif
LCFLAGS = \
$(LCFLAGS) \

10
extensions/xmlextras/build/src/nsXMLExtrasModule.cpp
View File

@ -50,7 +50,6 @@
#include "nsDOMCID.h"
#include "prprf.h"
#ifdef MOZ_SOAP
#include "nsSOAPHeaderBlock.h"
#include "nsSOAPParameter.h"
#include "nsSOAPCall.h"
@ -68,7 +67,6 @@
#include "nsWSDLPrivate.h"
#include "wspprivate.h"
#endif // MOZ_WSP
#endif // MOZ_SOAP
#include "nsString.h"
#include "prprf.h"
@ -83,7 +81,6 @@
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDOMSerializer)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsXMLHttpRequest)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDOMParser)
#ifdef MOZ_SOAP
NS_GENERIC_FACTORY_CONSTRUCTOR(nsSOAPCall)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsSOAPResponse)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsSOAPEncoding)
@ -150,7 +147,6 @@ NS_DECL_CLASSINFO(WSPComplexTypeWrapper)
NS_DECL_CLASSINFO(WSPCallContext)
NS_DECL_CLASSINFO(WSPException)
#endif // MOZ_WSP
#endif // MOZ_SOAP
class nsXMLExtrasNameset : public nsISupports
{
@ -249,7 +245,6 @@ RegisterXMLExtras(nsIComponentManager *aCompMgr,
PR_TRUE, PR_TRUE, getter_Copies(previous));
NS_ENSURE_SUCCESS(rv, rv);
#ifdef MOZ_SOAP
rv = catman->AddCategoryEntry(JAVASCRIPT_GLOBAL_CONSTRUCTOR_CATEGORY,
"SOAPCall",
NS_SOAPCALL_CONTRACTID,
@ -304,7 +299,6 @@ RegisterXMLExtras(nsIComponentManager *aCompMgr,
PR_TRUE, PR_TRUE, getter_Copies(previous));
NS_ENSURE_SUCCESS(rv, rv);
#endif // MOZ_WSP
#endif // MOZ_SOAP
return rv;
}
@ -323,7 +317,6 @@ static const nsModuleComponentInfo components[] = {
nsXMLHttpRequestConstructor },
{ "DOM Parser", NS_DOMPARSER_CID, NS_DOMPARSER_CONTRACTID,
nsDOMParserConstructor },
#ifdef MOZ_SOAP
{ "SOAP Call", NS_SOAPCALL_CID, NS_SOAPCALL_CONTRACTID,
nsSOAPCallConstructor, nsnull, nsnull, nsnull,
NS_CI_INTERFACE_GETTER_NAME(nsSOAPCall),
@ -560,18 +553,15 @@ static const nsModuleComponentInfo components[] = {
NS_CI_INTERFACE_GETTER_NAME(WSPException), nsnull,
&NS_CLASSINFO_NAME(WSPException), nsIClassInfo::DOM_OBJECT },
#endif // MOZ_WSP
#endif // MOZ_SOAP
};
void PR_CALLBACK
XMLExtrasModuleDestructor(nsIModule* self)
{
#ifdef MOZ_SOAP
nsSchemaAtoms::DestroySchemaAtoms();
#ifdef MOZ_WSP
nsWSDLAtoms::DestroyWSDLAtoms();
#endif // MOZ_WSP
#endif // MOZ_SOAP
}
NS_IMPL_NSGETMODULE_WITH_DTOR(nsXMLExtrasModule, components,

4
extensions/xmlextras/docs/Soap_Scripts_in_Mozilla.html
View File

@ -1338,9 +1338,7 @@ external access to the functions. &nbsp;What exists today is mozilla/extensions
configured to talk to a server -- but it genrates interesting messages
anyway.<br>
<br>
To test the services, it is currently required to compile Mozilla with
the environment variable MOZ_SOAP=1 (if you already have a build, you only
need to do a clean rebuild of the xmlextras directory). &nbsp;It is also
To test the services, it is
interesting to turn on MOZ_DEBUG=1, because even if you do not debug the
program, this causes the exchanged SOAP messages to be displayed on the
standard output if you run from a command shell where this is visible.<br>

2
extensions/xmlextras/makefile.win
View File

@ -23,13 +23,11 @@ DEPTH=..\..
DIRS= \
base \
!if defined(MOZ_SOAP)
schema \
soap \
!if defined(MOZ_WSP)
wsdl \
proxy \
!endif
!endif
build \
!if !defined(DISABLE_TESTS)

3
extensions/xmlextras/tests/soapelements.html
View File

@ -5,8 +5,7 @@
<H1>SOAP Test: Elements</H1>
The entered element will be requested and the info displayed. This service found on
<A href="http://www.xmethods.com">X Methods Website</A>. View the source of this
page for details on how it was called. If you compile mozilla DEBUG (you also need
MOZ_SOAP), the message sent and received will be logged to the console.
page for details on how it was called. If you compile mozilla DEBUG, the message sent and received will be logged to the console.
<p>Experimenters may wish to add other tests which exercize services, with specific
user interfaces such as the one in this test.
<SCRIPT>

3
extensions/xmlextras/tests/soapheadlinenews.html
View File

@ -5,8 +5,7 @@
<H1>SOAP Test: Headline News</H1>
The entered domain name will be searched, and the result displayed. This service found on
<A href="http://www.xmethods.com">X Methods Website</A>. View the source of this
page for details on how it was called. If you compile mozilla DEBUG (you also need
MOZ_SOAP), the message sent and received will be logged to the console.
page for details on how it was called. If you compile mozilla DEBUG, the message sent and received will be logged to the console.
<p>Experimenters may wish to add other tests which exercize services, with specific
user interfaces such as the one in this test.
<SCRIPT>

3
extensions/xmlextras/tests/soapisprimenumber.html
View File

@ -7,8 +7,7 @@ The number typed in the text field will change color depending upon whether the
reports <font color="green">prime</font> or <font color="red">nonprime</font>.
<p>This works by calling a SOAP service listed on
<A href="http://www.xmethods.com">X Methods Website</A>. View the source of this
page for details on how it was called. If you compile mozilla DEBUG (you also need
MOZ_SOAP), the message sent and received will be logged to the console.
page for details on how it was called. If you compile mozilla DEBUG, the message sent and received will be logged to the console.
<p>Experimenters may wish to add other tests which exercize services, with specific
user interfaces such as the one in this test.
<SCRIPT>

3
extensions/xmlextras/tests/soapstatistics.html
View File

@ -6,8 +6,7 @@
This passes an array to request the average and standard deviation.
<p>This works by calling a SOAP service listed on
<A href="http://www.xmethods.com">X Methods Website</A>. View the source of this
page for details on how it was called. If you compile mozilla DEBUG (you also need
MOZ_SOAP), the message sent and received will be logged to the console.
page for details on how it was called. If you compile mozilla DEBUG, the message sent and received will be logged to the console.
<p>Experimenters may wish to add other tests which exercize services, with specific
user interfaces such as the one in this test.
<SCRIPT>

3
extensions/xmlextras/tests/soapunscramble.html
View File

@ -5,8 +5,7 @@
<H1>SOAP Test: Unscramble</H1>
The entered word will be unscrambled against a dictionary. Other services found on
<A href="http://www.xmethods.com">X Methods Website</A>. View the source of this
page for details on how it was called. If you compile mozilla DEBUG (you also need
MOZ_SOAP), the message sent and received will be logged to the console.
page for details on how it was called. If you compile mozilla DEBUG, the message sent and received will be logged to the console.
<p>Experimenters may wish to add other tests which exercize services, with specific
user interfaces such as the one in this test.
<SCRIPT>