Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-23 10:54:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 320820 - Integrate webservices into libxul, r=doron

Browse Source
This commit is contained in:
bsmedberg%covad.net 2005-12-20 14:13:01 +00:00
parent f7632288b8
commit bce6d514c6
18 changed files with 815 additions and 752 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.in
View File

@ -184,6 +184,10 @@ ifdef MOZ_XMLEXTRAS
tier_9_dirs += extensions/xmlextras
endif
ifdef MOZ_WEBSERVICES
tier_9_dirs += extensions/webservices
endif
ifdef MOZ_UNIVERSALCHARDET
tier_9_dirs += extensions/universalchardet
endif

39
allmakefiles.sh
View File

@ -1366,6 +1366,27 @@ if [ "$MOZ_XMLEXTRAS" ]; then
"
fi
if [ "$MOZ_WEBSERVICES" ]; then
MAKEFILES_content="$MAKEFILES_content
extensions/webservices/Makefile
extensions/webservices/build/Makefile
extensions/webservices/build/src/Makefile
extensions/webservices/interfaceinfo/Makefile
extensions/webservices/interfaceinfo/src/Makefile
extensions/webservices/proxy/Makefile
extensions/webservices/proxy/src/Makefile
extensions/webservices/public/Makefile
extensions/webservices/security/Makefile
extensions/webservices/security/src/Makefile
extensions/webservices/schema/Makefile
extensions/webservices/schema/src/Makefile
extensions/webservices/soap/Makefile
extensions/webservices/soap/src/Makefile
extensions/webservices/wsdl/Makefile
extensions/webservices/wsdl/src/Makefile
"
fi
if [ "$MOZ_JAVAXPCOM" ]; then
MAKEFILES_javaxpcom="
extensions/java/Makefile
@ -1506,24 +1527,6 @@ for extension in $MOZ_EXTENSIONS; do
extensions/wallet/walletpreview/Makefile
extensions/wallet/build/Makefile
" ;;
webservices ) MAKEFILES_extensions="$MAKEFILES_extensions
extensions/webservices/Makefile
extensions/webservices/build/Makefile
extensions/webservices/build/src/Makefile
extensions/webservices/interfaceinfo/Makefile
extensions/webservices/interfaceinfo/src/Makefile
extensions/webservices/proxy/Makefile
extensions/webservices/proxy/src/Makefile
extensions/webservices/public/Makefile
extensions/webservices/security/Makefile
extensions/webservices/security/src/Makefile
extensions/webservices/schema/Makefile
extensions/webservices/schema/src/Makefile
extensions/webservices/soap/Makefile
extensions/webservices/soap/src/Makefile
extensions/webservices/wsdl/Makefile
extensions/webservices/wsdl/src/Makefile
" ;;
xforms ) MAKEFILES_extensions="$MAKEFILES_extensions
extensions/xforms/Makefile
" ;;

1
config/autoconf.mk.in
View File

@ -193,6 +193,7 @@ MOZ_UPDATE_XTERM = @MOZ_UPDATE_XTERM@
MOZ_MATHML = @MOZ_MATHML@
MOZ_XTF = @MOZ_XTF@
MOZ_XMLEXTRAS = @MOZ_XMLEXTRAS@
MOZ_WEBSERVICES = @MOZ_WEBSERVICES@
MOZ_SVG = @MOZ_SVG@
MOZ_SVG_FOREIGNOBJECT = @MOZ_SVG_FOREIGNOBJECT@
MOZ_SVG_RENDERER_GDIPLUS = @MOZ_SVG_RENDERER_GDIPLUS@

1364
configure vendored
View File

File diff suppressed because it is too large Load Diff

26
configure.in
View File

@ -4115,6 +4115,7 @@ MOZ_UNIVERSALCHARDET=1
MOZ_USE_NATIVE_UCONV=
MOZ_V1_STRING_ABI=1
MOZ_VIEW_SOURCE=1
MOZ_WEBSERVICES=1
MOZ_XMLEXTRAS=1
MOZ_XPFE_COMPONENTS=1
MOZ_XPINSTALL=1
@ -4164,7 +4165,7 @@ suite)
MOZ_SUITE=1
MOZ_PROFILESHARING=
MOZ_APP_VERSION=$SEAMONKEY_VERSION
MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc help p3p venkman inspector irc typeaheadfind webservices spellcheck gnomevfs auth sroaming permissions reporter"
MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc help p3p venkman inspector irc typeaheadfind spellcheck gnomevfs auth sroaming permissions reporter"
AC_DEFINE(MOZ_SUITE)
;;
@ -4175,7 +4176,7 @@ browser)
MOZ_UPDATER=1
MOZ_PHOENIX=1
MOZ_APP_VERSION=$FIREFOX_VERSION
MOZ_EXTENSIONS_DEFAULT=" cookie xml-rpc webservices inspector gnomevfs auth permissions reporter"
MOZ_EXTENSIONS_DEFAULT=" cookie xml-rpc inspector gnomevfs auth permissions reporter"
AC_DEFINE(MOZ_PHOENIX)
;;
@ -4190,7 +4191,7 @@ minimo)
MOZ_APP_VERSION=`cat $topsrcdir/minimo/config/version.txt`
MOZ_COMPOSER=
MOZ_ENABLE_POSTSCRIPT=
MOZ_EXTENSIONS_DEFAULT="xml-rpc webservices permissions spatialnavigation"
MOZ_EXTENSIONS_DEFAULT="xml-rpc permissions spatialnavigation"
MOZ_IMG_DECODERS_DEFAULT="png gif jpeg"
MOZ_IMG_ENCODERS_DEFAULT=
MOZ_IMG_ENCODERS=
@ -4244,7 +4245,7 @@ mail)
MOZ_STATIC_MAIL_BUILD=1
MOZ_COMPOSER=1
MOZ_APP_VERSION=$THUNDERBIRD_VERSION
MOZ_EXTENSIONS_DEFAULT=" wallet spellcheck webservices auth"
MOZ_EXTENSIONS_DEFAULT=" wallet spellcheck auth"
AC_DEFINE(MOZ_THUNDERBIRD)
;;
@ -4281,7 +4282,7 @@ xulrunner)
MOZ_ENABLE_LIBXUL=1
MOZ_APP_VERSION=$MOZILLA_VERSION
MOZ_JAVAXPCOM=1
MOZ_EXTENSIONS_DEFAULT=" xml-rpc webservices gnomevfs auth"
MOZ_EXTENSIONS_DEFAULT=" xml-rpc gnomevfs auth"
AC_DEFINE(MOZ_XULRUNNER)
;;
@ -4291,6 +4292,7 @@ macbrowser)
MOZ_APP_VERSION=$MOZILLA_VERSION
MOZ_EXTENSIONS_DEFAULT=" cookie typeaheadfind permissions"
MOZ_PREF_EXTENSIONS=
MOZ_WEBSERVICES=
AC_DEFINE(MOZ_MACBROWSER)
;;
@ -4925,6 +4927,14 @@ MOZ_ARG_DISABLE_BOOL(xmlextras,
MOZ_XMLEXTRAS=,
MOZ_XMLEXTRAS=1 )
dnl ========================================================
dnl Webservices
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(webservices,
[ --disable-webservices Disable Webservices/SOAP support ],
MOZ_WEBSERVICES=,
MOZ_WEBSERVICES=1 )
dnl ========================================================
dnl Pref extensions (autoconfig and system-pref)
dnl ========================================================
@ -5074,6 +5084,11 @@ if test `echo "$MOZ_EXTENSIONS" | grep -c xmlextras` -ne 0; then
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|xmlextras||g'`
fi
if test `echo "$MOZ_EXTENSIONS" | grep -c webservices` -ne 0; then
AC_MSG_WARN([webservices is no longer an extension, use --disable-webservices to disable.])
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|webservices||g'`
fi
if test `echo "$MOZ_EXTENSIONS" | grep -c pref` -ne 0; then
AC_MSG_WARN([pref is no longer an extension, use --disable-pref-extensions to disable.])
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|pref||g'`
@ -6868,6 +6883,7 @@ AC_SUBST(MINIMO)
AC_SUBST(MOZ_MATHML)
AC_SUBST(MOZ_XTF)
AC_SUBST(MOZ_XMLEXTRAS)
AC_SUBST(MOZ_WEBSERVICES)
AC_SUBST(MOZ_PREF_EXTENSIONS)
AC_SUBST(MOZ_SVG)
AC_SUBST(MOZ_SVG_FOREIGNOBJECT)

2
extensions/webservices/build/src/Makefile.in
View File

@ -47,7 +47,7 @@ LIBRARY_NAME = websrvcs
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsWebServicesModule
MOZILLA_INTERNAL_API = 1
LIBXUL_LIBRARY = 1
PACKAGE_FILE = webservices.pkg

2
extensions/webservices/interfaceinfo/src/Makefile.in
View File

@ -46,7 +46,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = websrvcs
LIBRARY_NAME = websrvcsinterfaceinfo_s
MOZILLA_INTERNAL_API = 1
LIBXUL_LIBRARY = 1
REQUIRES = xpcom \
string \

2
extensions/webservices/proxy/Makefile.in
View File

@ -45,7 +45,7 @@ include $(DEPTH)/config/autoconf.mk
DIRS = src
ifdef ENABLE_TESTS
DIRS += tests
TOOL_DIRS += tests
endif
include $(topsrcdir)/config/rules.mk

2
extensions/webservices/proxy/src/Makefile.in
View File

@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = websrvcs
LIBRARY_NAME = websrvcsproxy_s
MOZILLA_INTERNAL_API = 1
LIBXUL_LIBRARY = 1
REQUIRES = xpcom \
string \

5
extensions/webservices/proxy/tests/Makefile.in
View File

@ -49,7 +49,6 @@ EXPORT_LIBRARY = 1
XPIDL_MODULE = wsproxytest
IS_COMPONENT = 1
MODULE_NAME = WSPProxyTestModule
MOZILLA_INTERNAL_API = 1
REQUIRES = xpcom \
string \
@ -73,9 +72,11 @@ LOCAL_INCLUDES = \
EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \
$(MOZ_COMPONENT_LIBS) \
$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
$(XPCOM_LIBS) \
$(ZLIB_LIBS) \
$(MOZ_JS_LIBS) \
$(NSPR_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

101
extensions/webservices/proxy/tests/wspproxytest.cpp
View File

@ -39,11 +39,14 @@
#include "nsCOMPtr.h"
#include "wspproxytest.h"
#include "nsString.h"
#include "nsStringAPI.h"
#include "nsIInterfaceInfoManager.h"
#include "nsIServiceManager.h"
#include "nsIProperty.h"
#include "nsIVariant.h"
#include "nsMemory.h"
#include "nsComponentManagerUtils.h"
#include "nsServiceManagerUtils.h"
const PRUint8 sInt8Val = 2;
const PRInt16 sInt16Val = 0x1234;
@ -124,13 +127,13 @@ WSPProxyTest::TestComplexTypeWrapper(nsAString& aResult)
nsresult rv = CreateComplexTypeWrapper(getter_AddRefs(wrapper),
getter_AddRefs(info));
if (NS_FAILED(rv)) {
aResult.AssignLiteral("WSPProxyTest: Failed creating complex type wrapper");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Failed creating complex type wrapper"));
return NS_OK;
}
nsCOMPtr<nsIPropertyBag> propBag = do_QueryInterface(wrapper);
if (!propBag) {
aResult.AssignLiteral("WSPProxyTest: Wrapper is not property bag");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Wrapper is not property bag"));
return NS_ERROR_FAILURE;
}
@ -147,7 +150,7 @@ WSPProxyTest::TestComplexTypeWrapperInstance(nsIPropertyBag* propBag,
nsCOMPtr<nsISimpleEnumerator> enumerator;
nsresult rv = propBag->GetEnumerator(getter_AddRefs(enumerator));
if (NS_FAILED(rv)) {
aResult.AssignLiteral("WSPProxyTest: Failed getting property bag enumerator");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Failed getting property bag enumerator"));
return rv;
}
@ -159,7 +162,8 @@ WSPProxyTest::TestComplexTypeWrapperInstance(nsIPropertyBag* propBag,
#define GET_AND_TEST_NAME(_name) \
rv = enumerator->GetNext(getter_AddRefs(sup)); \
if (NS_FAILED(rv)) { \
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Failed getting property ") + NS_LITERAL_STRING(#_name)); \
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Failed getting property ")); \
aResult.Append(NS_LITERAL_STRING(#_name)); \
return rv; \
} \
\
@ -169,8 +173,9 @@ WSPProxyTest::TestComplexTypeWrapperInstance(nsIPropertyBag* propBag,
} \
\
prop->GetName(propName); \
if (!propName.EqualsLiteral(#_name)) { \
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Name doesn't match for property ") + NS_LITERAL_STRING(#_name)); \
if (!propName.Equals(NS_LITERAL_STRING(#_name))) { \
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Name doesn't match for property ")); \
aResult.Append(NS_LITERAL_STRING(#_name)); \
return NS_ERROR_FAILURE; \
} \
prop->GetValue(getter_AddRefs(val)); \
@ -183,11 +188,13 @@ WSPProxyTest::TestComplexTypeWrapperInstance(nsIPropertyBag* propBag,
_t _name; \
rv = val->GetAs##_n(&_name); \
if (NS_FAILED(rv)) { \
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Failed getting value for property ") + NS_LITERAL_STRING(#_name)); \
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Failed getting value for property ")); \
aResult.Append(NS_LITERAL_STRING(#_name)); \
return rv; \
} \
if (_name != _val) { \
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Value doesn't match for property ") + NS_LITERAL_STRING(#_name)); \
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Value doesn't match for property ")); \
aResult.Append(NS_LITERAL_STRING(#_name)); \
return NS_ERROR_FAILURE; \
}
@ -209,12 +216,12 @@ WSPProxyTest::TestComplexTypeWrapperInstance(nsIPropertyBag* propBag,
nsAutoString str;
rv = val->GetAsAString(str);
if (NS_FAILED(rv)) {
aResult.AssignLiteral("WSPProxyTest: Failed getting value for property s");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Failed getting value for property s"));
return rv;
}
if (!str.EqualsLiteral(STRING_VAL)) {
aResult.AssignLiteral("WSPProxyTest: Value doesn't match for property s");
if (!str.Equals(NS_LITERAL_STRING(STRING_VAL))) {
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Value doesn't match for property s"));
return NS_ERROR_FAILURE;
}
@ -222,12 +229,12 @@ WSPProxyTest::TestComplexTypeWrapperInstance(nsIPropertyBag* propBag,
nsCOMPtr<nsISupports> supVal;
rv = val->GetAsISupports(getter_AddRefs(supVal));
if (NS_FAILED(rv)) {
aResult.AssignLiteral("WSPProxyTest: Failed getting value for property p");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Failed getting value for property p"));
return rv;
}
nsCOMPtr<nsIPropertyBag> propBagVal = do_QueryInterface(supVal, &rv);
if (NS_FAILED(rv)) {
aResult.AssignLiteral("WSPProxyTest: Value doesn't match for property p");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Value doesn't match for property p"));
return rv;
}
@ -235,7 +242,7 @@ WSPProxyTest::TestComplexTypeWrapperInstance(nsIPropertyBag* propBag,
PRUint16 dataType;
val->GetDataType(&dataType);
if (dataType != nsIDataType::VTYPE_EMPTY) {
aResult.AssignLiteral("WSPProxyTest: Value doesn't match for property p");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Value doesn't match for property p"));
return NS_ERROR_FAILURE;
}
@ -247,12 +254,12 @@ WSPProxyTest::TestComplexTypeWrapperInstance(nsIPropertyBag* propBag,
nsIID iid;
rv = val->GetAsArray(&type, &iid, &count, (void**)&arrayVal1);
if (NS_FAILED(rv)) {
aResult.AssignLiteral("WSPProxyTest: Failed getting value for property array1");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Failed getting value for property array1"));
return rv;
}
for (index = 0; index < count; index++) {
if (arrayVal1[index] != sArray1[index]) {
aResult.AssignLiteral("WSPProxyTest: Value doesn't match for element of property array1");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Value doesn't match for element of property array1"));
return rv;
}
}
@ -262,12 +269,12 @@ WSPProxyTest::TestComplexTypeWrapperInstance(nsIPropertyBag* propBag,
GET_AND_TEST_NAME(array2)
rv = val->GetAsArray(&type, &iid, &count, (void**)&arrayVal2);
if (NS_FAILED(rv)) {
aResult.AssignLiteral("WSPProxyTest: Failed getting value for property array2");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Failed getting value for property array2"));
return rv;
}
for (index = 0; index < count; index++) {
if (arrayVal2[index] != sArray2[index]) {
aResult.AssignLiteral("WSPProxyTest: Value doesn't match for element of property array2");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Value doesn't match for element of property array2"));
return rv;
}
}
@ -277,16 +284,16 @@ WSPProxyTest::TestComplexTypeWrapperInstance(nsIPropertyBag* propBag,
GET_AND_TEST_NAME(array3)
rv = val->GetAsArray(&type, &iid, &count, (void**)&arrayVal3);
if (NS_FAILED(rv)) {
aResult.AssignLiteral("WSPProxyTest: Failed getting value for property array3");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Failed getting value for property array3"));
return rv;
}
propBagVal = do_QueryInterface(arrayVal3[0], &rv);
if (NS_FAILED(rv)) {
aResult.AssignLiteral("WSPProxyTest: Value doesn't match for element of property array3");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Value doesn't match for element of property array3"));
return rv;
}
if (arrayVal3[1] != nsnull) {
aResult.AssignLiteral("WSPProxyTest: Value doesn't match for element of property array3");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Value doesn't match for element of property array3"));
return NS_ERROR_FAILURE;
}
NS_FREE_XPCOM_ISUPPORTS_POINTER_ARRAY(count, arrayVal3);
@ -294,7 +301,7 @@ WSPProxyTest::TestComplexTypeWrapperInstance(nsIPropertyBag* propBag,
#undef GET_AND_TEST
#undef GET_AND_TEST_NAME
aResult.AssignLiteral("WSPProxyTest: Test Succeeded!");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Test Succeeded!"));
return NS_OK;
}
@ -307,30 +314,30 @@ WSPProxyTest::TestPropertyBagWrapper(nsAString& aResult)
nsresult rv = CreateComplexTypeWrapper(getter_AddRefs(ctwrapper),
getter_AddRefs(info));
if (NS_FAILED(rv)) {
aResult.AssignLiteral("WSPProxyTest: Failed creating complex type wrapper");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Failed creating complex type wrapper"));
return NS_OK;
}
nsCOMPtr<nsIPropertyBag> propBag = do_QueryInterface(ctwrapper);
if (!propBag) {
aResult.AssignLiteral("WSPProxyTest: Wrapper is not property bag");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Wrapper is not property bag"));
return NS_OK;
}
nsCOMPtr<nsIWebServicePropertyBagWrapper> wrapper = do_CreateInstance(NS_WEBSERVICEPROPERTYBAGWRAPPER_CONTRACTID, &rv);
if (NS_FAILED(rv)) {
aResult.AssignLiteral("WSPProxyTest: Failed creating property bag wrapper");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Failed creating property bag wrapper"));
return NS_OK;
}
rv = wrapper->Init(propBag, info);
if (NS_FAILED(rv)) {
aResult.AssignLiteral("WSPProxyTest: Failed initializing property bag wrapper");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Failed initializing property bag wrapper"));
return NS_OK;
}
nsCOMPtr<nsIWSPTestComplexType> ct = do_QueryInterface(wrapper, &rv);
if (NS_FAILED(rv)) {
aResult.AssignLiteral("WSPProxyTest: Property bag wrapper doesn't QI correctly");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Property bag wrapper doesn't QI correctly"));
return NS_OK;
}
@ -338,11 +345,13 @@ WSPProxyTest::TestPropertyBagWrapper(nsAString& aResult)
_t _name; \
rv = ct->Get##_name(&_name); \
if (NS_FAILED(rv)) { \
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Failed to get value for attribute") + NS_LITERAL_STRING(#_name)); \
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Failed to get value for attribute")); \
aResult.Append(NS_LITERAL_STRING(#_name)); \
return NS_OK; \
} \
if (_name != _val) { \
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Value doesn't match for attribute ") + NS_LITERAL_STRING(#_name)); \
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Value doesn't match for attribute ")); \
aResult.Append(NS_LITERAL_STRING(#_name)); \
return NS_OK; \
}
@ -363,28 +372,28 @@ WSPProxyTest::TestPropertyBagWrapper(nsAString& aResult)
nsAutoString str;
rv = ct->GetS(str);
if (NS_FAILED(rv)) {
aResult.AssignLiteral("WSPProxyTest: Failed to get value for attribute s");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Failed to get value for attribute s"));
return NS_OK;
}
if (!str.EqualsLiteral(STRING_VAL)) {
aResult.AssignLiteral("WSPProxyTest: Value doesn't match for attribute s");
if (!str.Equals(NS_LITERAL_STRING(STRING_VAL))) {
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Value doesn't match for attribute s"));
return NS_OK;
}
nsCOMPtr<nsIWSPTestComplexType> p;
rv = ct->GetP(getter_AddRefs(p));
if (NS_FAILED(rv)) {
aResult.AssignLiteral("WSPProxyTest: Failed to get value for attribute p");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Failed to get value for attribute p"));
return NS_OK;
}
rv = ct->GetP2(getter_AddRefs(p));
if (NS_FAILED(rv)) {
aResult.AssignLiteral("WSPProxyTest: Failed to get value for attribute p2");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Failed to get value for attribute p2"));
return NS_OK;
}
if (p) {
aResult.AssignLiteral("WSPProxyTest: Value doesn't match for attribute p2");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Value doesn't match for attribute p2"));
return NS_OK;
}
@ -393,12 +402,12 @@ WSPProxyTest::TestPropertyBagWrapper(nsAString& aResult)
PRUint32* array1;
rv = ct->Array1(&count, &array1);
if (NS_FAILED(rv)) {
aResult.AssignLiteral("WSPProxyTest: Failed to get value for attribute array1");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Failed to get value for attribute array1"));
return NS_OK;
}
for (index = 0; index < count; index++) {
if (array1[index] != sArray1[index]) {
aResult.AssignLiteral("WSPProxyTest: Value doesn't match for element of attribute array1");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Value doesn't match for element of attribute array1"));
return NS_OK;
}
}
@ -407,12 +416,12 @@ WSPProxyTest::TestPropertyBagWrapper(nsAString& aResult)
double* array2;
rv = ct->Array2(&count, &array2);
if (NS_FAILED(rv)) {
aResult.AssignLiteral("WSPProxyTest: Failed to get value for attribute array2");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Failed to get value for attribute array2"));
return NS_OK;
}
for (index = 0; index < count; index++) {
if (array2[index] != sArray2[index]) {
aResult.AssignLiteral("WSPProxyTest: Value doesn't match for element of attribute array2");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Value doesn't match for element of attribute array2"));
return NS_OK;
}
}
@ -421,18 +430,18 @@ WSPProxyTest::TestPropertyBagWrapper(nsAString& aResult)
nsIWSPTestComplexType** array3;
rv = ct->Array3(&count, &array3);
if (NS_FAILED(rv)) {
aResult.AssignLiteral("WSPProxyTest: Failed to get value for attribute array3");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Failed to get value for attribute array3"));
return NS_OK;
}
if (!array3[0] || array3[1]) {
aResult.AssignLiteral("WSPProxyTest: Value doesn't match for element of attribute array3");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Value doesn't match for element of attribute array3"));
return NS_OK;
}
NS_FREE_XPCOM_ISUPPORTS_POINTER_ARRAY(count, array3);
#undef GET_AND_TEST
aResult.AssignLiteral("WSPProxyTest: Test Succeeded!");
aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Test Succeeded!"));
return NS_OK;
}
@ -513,9 +522,9 @@ WSPProxyTest::OnError(nsresult status, const nsAString & statusMessage)
/* void onError (in nsIException error, in nsIWebServiceCallContext cx); */
NS_IMETHODIMP WSPProxyTest::OnError(nsIException *error, nsIWebServiceCallContext *cx)
{
nsXPIDLCString str;
nsCString str;
error->ToString(getter_Copies(str));
mListener->OnIsPrimeProxyTestComplete(NS_ConvertASCIItoUCS2(str.get()));
mListener->OnIsPrimeProxyTestComplete(NS_ConvertASCIItoUTF16(str));
return NS_OK;
}
@ -712,7 +721,7 @@ WSPTestComplexType::GetP2(nsIWSPTestComplexType * *aP2)
NS_IMETHODIMP
WSPTestComplexType::GetS(nsAString & aS)
{
aS.AssignLiteral(STRING_VAL);
aS.Assign(NS_LITERAL_STRING(STRING_VAL));
return NS_OK;
}

7
extensions/webservices/proxy/tests/wspproxytestmodule.cpp
View File

@ -42,8 +42,11 @@
#include "nsIServiceManager.h"
#include "nsICategoryManager.h"
#include "nsIScriptNameSpaceManager.h"
#include "nsXPIDLString.h"
#include "nsStringAPI.h"
#include "wspproxytest.h"
#include "nsXPCOMCID.h"
#include "nsServiceManagerUtils.h"
#include "nsComponentManagerUtils.h"
NS_GENERIC_FACTORY_CONSTRUCTOR(WSPProxyTest)
NS_DECL_CLASSINFO(WSPProxyTest)
@ -63,7 +66,7 @@ RegisterWSPProxyTest(nsIComponentManager *aCompMgr,
if (NS_FAILED(rv))
return rv;
nsXPIDLCString previous;
nsCString previous;
rv = catman->AddCategoryEntry(JAVASCRIPT_GLOBAL_CONSTRUCTOR_CATEGORY,
"WebServiceProxyTest",
NS_WSPPROXYTEST_CONTRACTID,

2
extensions/webservices/schema/src/Makefile.in
View File

@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = websrvcs
LIBRARY_NAME = websrvcsschema_s
MOZILLA_INTERNAL_API = 1
LIBXUL_LIBRARY = 1
REQUIRES = xpcom \
string \

2
extensions/webservices/security/src/Makefile.in
View File

@ -43,7 +43,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = websrvcs
LIBRARY_NAME = websrvcssecurity_s
MOZILLA_INTERNAL_API = 1
LIBXUL_LIBRARY = 1
REQUIRES = xpcom \
string \

4
extensions/webservices/soap/src/Makefile.in
View File

@ -43,7 +43,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = websrvcs
LIBRARY_NAME = websrvcssoap_s
MOZILLA_INTERNAL_API = 1
LIBXUL_LIBRARY = 1
REQUIRES = xpcom \
string \
@ -54,7 +54,7 @@ REQUIRES = xpcom \
necko \
xmlextras \
content \
widget \
widget \
$(NULL)
CPPSRCS = \

2
extensions/webservices/wsdl/src/Makefile.in
View File

@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = websrvcs
LIBRARY_NAME = websrvcswsdl_s
MOZILLA_INTERNAL_API = 1
LIBXUL_LIBRARY = 1
REQUIRES = xpcom \
string \

1
toolkit/library/libxul-config.mk
View File

@ -89,6 +89,7 @@ COMPONENT_LIBS += \
gkplugin \
gklayout \
xmlextras \
websrvcs \
docshell \
embedcomponents \
webbrwsr \

1
toolkit/library/nsStaticXULComponents.cpp
View File

@ -174,6 +174,7 @@
MODULE(nsPluginModule) \
MODULE(nsLayoutModule) \
MODULE(nsXMLExtrasModule) \
MODULE(nsWebServicesModule) \
MODULE(docshell_provider) \
MODULE(embedcomponents) \
MODULE(Browser_Embedding_Module) \