You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2007/03/01 06:58:08 UTC
svn commit: r513155 [1/5] - in /webservices/axis2/scratch/c/dinesh/532/c: ./
axiom/ axiom/src/attachments/ axiom/test/om/ axiom/test/soap/ build/win32/
ides/studio/ ides/vc/axis2c/ ides/vc/axis2c/axis2_engine/
ides/vc/axis2c/axis2_http_common/ ides/vc/...
Author: dinesh
Date: Wed Feb 28 21:58:03 2007
New Revision: 513155
URL: http://svn.apache.org/viewvc?view=rev&rev=513155
Log:
make branch sync with trunk
Added:
webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/mod_rampart/
- copied from r512194, webservices/axis2/trunk/c/ides/vc/axis2c/mod_rampart/
webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/mod_rampart/mod_rampart.vcproj
- copied unchanged from r512194, webservices/axis2/trunk/c/ides/vc/axis2c/mod_rampart/mod_rampart.vcproj
webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/mod_savan/
- copied from r512194, webservices/axis2/trunk/c/ides/vc/axis2c/mod_savan/
webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/mod_savan/mod_savan.vcproj
- copied unchanged from r512194, webservices/axis2/trunk/c/ides/vc/axis2c/mod_savan/mod_savan.vcproj
webservices/axis2/scratch/c/dinesh/532/c/rampart/include/axis2_key_type.h
- copied unchanged from r512194, webservices/axis2/trunk/c/rampart/include/axis2_key_type.h
webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_transform.h
- copied unchanged from r512194, webservices/axis2/trunk/c/rampart/include/oxs_transform.h
webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_transforms_factory.h
- copied unchanged from r512194, webservices/axis2/trunk/c/rampart/include/oxs_transforms_factory.h
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/omxmlsec/transform.c
- copied unchanged from r512194, webservices/axis2/trunk/c/rampart/src/omxmlsec/transform.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/omxmlsec/transforms_factory.c
- copied unchanged from r512194, webservices/axis2/trunk/c/rampart/src/omxmlsec/transforms_factory.c
Removed:
webservices/axis2/scratch/c/dinesh/532/c/ides/studio/
webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/axis2_http_common/
webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rp_encryption_crypto.h
webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rp_encryption_crypto_builder.h
webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rp_signature_crypto.h
webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rp_signature_crypto_builder.h
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/secpolicy/builder/encryption_crypto_builder.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/secpolicy/builder/signature_crypto_builder.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/secpolicy/model/encryption_crypto.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/secpolicy/model/signature_crypto.c
Modified:
webservices/axis2/scratch/c/dinesh/532/c/ (props changed)
webservices/axis2/scratch/c/dinesh/532/c/axiom/configure.ac
webservices/axis2/scratch/c/dinesh/532/c/axiom/src/attachments/mime_body_part.c
webservices/axis2/scratch/c/dinesh/532/c/axiom/test/om/Makefile.am
webservices/axis2/scratch/c/dinesh/532/c/axiom/test/soap/Makefile.am
webservices/axis2/scratch/c/dinesh/532/c/build/win32/makefile
webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/axis2_engine/axis2_engine.vcproj
webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/axis2_http_receiver/axis2_http_receiver.vcproj
webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/axis2_http_sender/axis2_http_sender.vcproj
webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/axis2c.sln
webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/clients/clients.sln
webservices/axis2/scratch/c/dinesh/532/c/include/axis2_const.h
webservices/axis2/scratch/c/dinesh/532/c/include/axis2_soap_over_http_sender.h
webservices/axis2/scratch/c/dinesh/532/c/modules/core/clientapi/Makefile.am
webservices/axis2/scratch/c/dinesh/532/c/modules/core/clientapi/mep_client.c
webservices/axis2/scratch/c/dinesh/532/c/modules/core/context/msg_ctx.c
webservices/axis2/scratch/c/dinesh/532/c/modules/core/description/op.c
webservices/axis2/scratch/c/dinesh/532/c/modules/core/description/svc.c
webservices/axis2/scratch/c/dinesh/532/c/modules/core/engine/conf.c
webservices/axis2/scratch/c/dinesh/532/c/modules/core/engine/disp_checker.c
webservices/axis2/scratch/c/dinesh/532/c/modules/core/engine/engine.c
webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/Makefile.am
webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/http_transport_sender.c
webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/rest_sender.c
webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/soap_over_http_sender.c
webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/ssl/ssl_utils.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/include/openssl_sign.h
webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_axiom.h
webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_c14n.h
webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_constants.h
webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_error.h
webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_sign_ctx.h
webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_sign_part.h
webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_signature.h
webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_token_ds_reference.h
webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_token_transform.h
webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_xml_signature.h
webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rampart_constants.h
webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rampart_context.h
webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rampart_engine.h
webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rampart_handler_util.h
webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rp_defines.h
webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rp_policy_creator.h
webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rp_qname_matcher.h
webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rp_rampart_config.h
webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rp_rampart_config_builder.h
webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario1/client-incoming-secpolicy.xml
webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario1/client-outgoing-secpolicy.xml
webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario1/service-incoming-secpolicy.xml
webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario1/service-outgoing-secpolicy.xml
webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario2/client-incoming-secpolicy.xml
webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario2/client-outgoing-secpolicy.xml
webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario2/service-incoming-secpolicy.xml
webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario2/service-outgoing-secpolicy.xml
webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario3/client-incoming-secpolicy.xml
webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml
webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario3/service-incoming-secpolicy.xml
webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario3/service-outgoing-secpolicy.xml
webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario4/client-incoming-secpolicy.xml
webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml
webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario4/service-incoming-secpolicy.xml
webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario4/service-outgoing-secpolicy.xml
webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario5/client-incoming-secpolicy.xml
webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml
webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario5/service-incoming-secpolicy.xml
webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario5/service-outgoing-secpolicy.xml
webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario6/client-incoming-secpolicy.xml
webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario6/client-outgoing-secpolicy.xml
webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario6/service-incoming-secpolicy.xml
webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario6/service-outgoing-secpolicy.xml
webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario7/client-incoming-secpolicy.xml
webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario7/client-outgoing-secpolicy.xml
webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario7/service-incoming-secpolicy.xml
webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario7/service-outgoing-secpolicy.xml
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/handlers/rampart_in_handler.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/handlers/rampart_out_handler.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/omxmlsec/Makefile.am
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/omxmlsec/asym_ctx.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/omxmlsec/axiom.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/omxmlsec/c14n/c14n.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/omxmlsec/error.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/omxmlsec/key_mgr.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/omxmlsec/openssl/sign.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/omxmlsec/sign_ctx.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/omxmlsec/sign_part.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/omxmlsec/signature.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/omxmlsec/tokens/token_c14n_method.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/omxmlsec/tokens/token_ds_reference.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/omxmlsec/tokens/token_transform.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/omxmlsec/xml_signature.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/secpolicy/builder/Makefile.am
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/secpolicy/builder/policy_creator.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/secpolicy/builder/qname_matcher.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/secpolicy/builder/rampart_config_builder.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/secpolicy/model/Makefile.am
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/secpolicy/model/rampart_config.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/util/rampart_context.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/util/rampart_encryption.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/util/rampart_engine.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/util/rampart_handler_util.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/util/rampart_sec_header_builder.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/util/rampart_sec_header_processor.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/src/util/username_token.c
webservices/axis2/scratch/c/dinesh/532/c/rampart/test/omxmlsec/test.c
webservices/axis2/scratch/c/dinesh/532/c/samples/client/google/google_client.c
webservices/axis2/scratch/c/dinesh/532/c/samples/server/notify/services.xml
webservices/axis2/scratch/c/dinesh/532/c/savan/include/savan_client.h
webservices/axis2/scratch/c/dinesh/532/c/savan/include/savan_publishing_client.h
webservices/axis2/scratch/c/dinesh/532/c/savan/samples/client/subscriber/subscriber.c
webservices/axis2/scratch/c/dinesh/532/c/savan/samples/server/listener/listener_skeleton.c
webservices/axis2/scratch/c/dinesh/532/c/savan/samples/server/publisher/publisher.c
webservices/axis2/scratch/c/dinesh/532/c/savan/samples/server/publisher/publisher_skeleton.c
webservices/axis2/scratch/c/dinesh/532/c/savan/src/client/savan_client.c
webservices/axis2/scratch/c/dinesh/532/c/savan/src/client/savan_publishing_client.c
webservices/axis2/scratch/c/dinesh/532/c/test/core/addr/Makefile.am
webservices/axis2/scratch/c/dinesh/532/c/test/core/clientapi/Makefile.am
webservices/axis2/scratch/c/dinesh/532/c/test/core/context/Makefile.am
webservices/axis2/scratch/c/dinesh/532/c/test/core/deployment/Makefile.am
webservices/axis2/scratch/c/dinesh/532/c/test/core/description/Makefile.am
webservices/axis2/scratch/c/dinesh/532/c/test/core/engine/Makefile.am
webservices/axis2/scratch/c/dinesh/532/c/test/core/transport/http/Makefile.am
webservices/axis2/scratch/c/dinesh/532/c/test/core/transport/http/test_http_transport.c
webservices/axis2/scratch/c/dinesh/532/c/test/itest/whitemesa/round1/Makefile.am
webservices/axis2/scratch/c/dinesh/532/c/test/itest/whitemesa/round2/Makefile.am
webservices/axis2/scratch/c/dinesh/532/c/test/wsdl/builder/print/Makefile.am
webservices/axis2/scratch/c/dinesh/532/c/tools/codegen/src/typemappers/c.default.typemap.xml
webservices/axis2/scratch/c/dinesh/532/c/tools/codegen/src/util/typemapper.c
webservices/axis2/scratch/c/dinesh/532/c/tools/codegen/src/util/xslt_utils.c
webservices/axis2/scratch/c/dinesh/532/c/tools/tcpmon/src/entry.c
webservices/axis2/scratch/c/dinesh/532/c/util/src/stream.c
webservices/axis2/scratch/c/dinesh/532/c/util/test/util/Makefile.am
webservices/axis2/scratch/c/dinesh/532/c/xdocs/docs/axis2c_manual.html
Propchange: webservices/axis2/scratch/c/dinesh/532/c/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Feb 28 21:58:03 2007
@@ -1 +1 @@
-/webservices/axis2/trunk/c:1-509080
+/webservices/axis2/trunk/c:1-513145
Modified: webservices/axis2/scratch/c/dinesh/532/c/axiom/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/axiom/configure.ac?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/axiom/configure.ac (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/axiom/configure.ac Wed Feb 28 21:58:03 2007
@@ -49,7 +49,7 @@
#CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE -Wno-implicit-function-declaration"
CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
if test "$GCC" = "yes"; then
- CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration -Werror"
+ CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration "
fi
LDFLAGS="$LDFLAGS -lpthread"
Modified: webservices/axis2/scratch/c/dinesh/532/c/axiom/src/attachments/mime_body_part.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/axiom/src/attachments/mime_body_part.c?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/axiom/src/attachments/mime_body_part.c (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/axiom/src/attachments/mime_body_part.c Wed Feb 28 21:58:03 2007
@@ -266,8 +266,8 @@
if (data_handler_stream)
{
memcpy(byte_stream + header_str_size, data_handler_stream, data_handler_stream_size);
- AXIS2_FREE(env->allocator, data_handler_stream);
- data_handler_stream = NULL;
+ /*AXIS2_FREE(env->allocator, data_handler_stream);
+ data_handler_stream = NULL;*/
}
*output_stream = byte_stream;
Modified: webservices/axis2/scratch/c/dinesh/532/c/axiom/test/om/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/axiom/test/om/Makefile.am?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/axiom/test/om/Makefile.am (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/axiom/test/om/Makefile.am Wed Feb 28 21:58:03 2007
@@ -1,6 +1,5 @@
TESTS =
-bindir=$(prefix)/bin/system_test
-bin_PROGRAMS = test_om
+noinst_PROGRAMS = test_om
check_PROGRAMS = test_om
SUBDIRS =
AM_CFLAGS = -g -O2 -pthread
Modified: webservices/axis2/scratch/c/dinesh/532/c/axiom/test/soap/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/axiom/test/soap/Makefile.am?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/axiom/test/soap/Makefile.am (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/axiom/test/soap/Makefile.am Wed Feb 28 21:58:03 2007
@@ -1,6 +1,5 @@
TESTS = test_soap
-bindir=$(prefix)/bin/system_test
-bin_PROGRAMS = test_soap
+noinst_PROGRAMS = test_soap
check_PROGRAMS = test_soap
SUBDIRS =
AM_CFLAGS = -g -O2 -pthread
Modified: webservices/axis2/scratch/c/dinesh/532/c/build/win32/makefile
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/build/win32/makefile?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/build/win32/makefile (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/build/win32/makefile Wed Feb 28 21:58:03 2007
@@ -31,6 +31,9 @@
# directory structure of install directory
+
+AXIS2_RELEASE_DIR=axis2c-bin-$(RELEASE_VER)-win32
+
AXIS2_BINDIR = ..\deploy
AXIS2_SERVICES = $(AXIS2_BINDIR)\services
AXIS2_MODULES = $(AXIS2_BINDIR)\modules
@@ -177,14 +180,20 @@
AXIS2_MOD_ADDR_SRC = $(AXIS2_SOURCE_DIR)\modules\mod_addr\*.c
-#compiler options
+
+##################### compiler options
CC = @cl.exe
CFLAGS = /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "AXIS2_DECLARE_EXPORT" \
/D "AXIS2_SVR_MULTI_THREADED" /w /nologo $(AXIS2_INCLUDE_PATH) \
$(APACHE_INCLUDE_PATH)
-# linker options
+!if "$(ENABLE_SSL)" == "1"
+CFLAGS = $(CFLAGS) /D "AXIS2_SSL_ENABLED"
+!endif
+
+################### linker options
+
LD = @link.exe
LDFLAGS = /nologo /LIBPATH:$(AXIS2_LIBS) /LIBPATH:$(LIBXSLT_BIN_DIR)\lib \
/LIBPATH:$(LIBXML2_BIN_DIR)\lib /LIBPATH:$(APACHE_BIN_DIR)\lib \
@@ -203,7 +212,9 @@
APACHE_LIBS = apr-1.lib xml.lib libhttpd.lib aprutil-1.lib libapr-1.lib
!endif
-#debug symbols
+
+
+#################### debug symbols
!if "$(DEBUG)" == "1"
CFLAGS = $(CFLAGS) /D "_DEBUG" /Od /Z7
LDFLAGS = $(LDFLAGS) /DEBUG /NODEFAULTLIB:LIBCMTD.lib
@@ -662,9 +673,11 @@
mv_dist:
+ cd $(AXIS2_BINDIR)
cd ..
- if exist axis2c-bin-$(RELEASE_VER)-win32 rmdir /S /Q axis2c-bin-$(RELEASE_VER)-win32
- rename deploy axis2c-bin-$(RELEASE_VER)-win32
+ if exist $(AXIS2_RELEASE_DIR) rmdir /S /Q $(AXIS2_RELEASE_DIR)
+ rename deploy $(AXIS2_RELEASE_DIR)
+
all_services: axis2_services_echo axis2_services_math axis2_services_notify axis2_services_sg_math axis2_services_mtom axis2_services_calculator
@@ -898,6 +911,64 @@
codegen_ext: w2c_databinding_adb_ext w2c_c_code_indenter_ext w2c_c_namemaker_ext w2c_default_qname2name_ext w2c_c_qname2name_ext w2c_databinding_default_ext
codegen_tool: codegen_dirs w2c_codegen wsdl2code schema2code codegen_writers codegen_ext copy_config copy_resources
+################################# SAVAN #################################################
+
+SAVAN_INTDIR = $(AXIS2_INTDIR)\modules\savan
+
+SAVAN_SRC = $(AXIS2_SOURCE_DIR)\savan\src\client\*.c \
+ $(AXIS2_SOURCE_DIR)\savan\src\core\*.c \
+ $(AXIS2_SOURCE_DIR)\savan\src\msgreceivers\*.c \
+ $(AXIS2_SOURCE_DIR)\savan\src\subscribers\*.c \
+ $(AXIS2_SOURCE_DIR)\savan\src\util\*.c \
+ $(AXIS2_SOURCE_DIR)\savan\src\handlers\*.c
+
+savan_dirs:
+ if not exist $(AXIS2_BINDIR)\savan mkdir $(AXIS2_BINDIR)\savan
+ if not exist $(AXIS2_BINDIR)\savan\savan mkdir $(AXIS2_BINDIR)\savan\savan
+ if not exist $(AXIS2_BINDIR)\savan\samples mkdir $(AXIS2_BINDIR)\savan\samples
+ if not exist $(AXIS2_BINDIR)\savan\services\listener mkdir $(AXIS2_BINDIR)\savan\services\listener
+ if not exist $(AXIS2_BINDIR)\savan\services\publisher mkdir $(AXIS2_BINDIR)\savan\services\publisher
+ if not exist $(AXIS2_BINDIR)\savan\bin mkdir $(AXIS2_BINDIR)\savan\bin
+ if not exist $(AXIS2_BINDIR)\savan\include mkdir $(AXIS2_BINDIR)\savan\include
+
+ if not exist $(SAVAN_INTDIR) mkdir $(SAVAN_INTDIR)
+ if not exist $(SAVAN_INTDIR)\samples\client\subscriber mkdir $(SAVAN_INTDIR)\samples\client\subscriber
+ if not exist $(SAVAN_INTDIR)\samples\server\listener mkdir $(SAVAN_INTDIR)\samples\server\listener
+ if not exist $(SAVAN_INTDIR)\samples\server\publisher mkdir $(SAVAN_INTDIR)\samples\server\publisher
+
+mod_savan: savan_dirs
+
+ $(CC) $(CFLAGS) /I$(AXIS2_SOURCE_DIR)\savan\include $(SAVAN_SRC) /Fo$(SAVAN_INTDIR)\ /c
+ $(LD) $(LDFLAGS) $(SAVAN_INTDIR)\*.obj $(AXIS2_UTIL).lib $(AXIOM).lib $(AXIS2_PARSER).lib \
+ $(LIBS) $(AXIS2_ENGINE).lib /DLL /OUT:$(AXIS2_BINDIR)\savan\savan\mod_savan.dll
+ copy $(AXIS2_SOURCE_DIR)\savan\src\data\module.xml $(AXIS2_BINDIR)\savan\savan\
+
+savan_samples:
+ $(CC) $(CFLAGS) $(AXIS2_SOURCE_DIR)\savan\samples\client\subscriber\*.c \
+ /I$(AXIS2_SOURCE_DIR)\savan\include /Fo$(SAVAN_INTDIR)\samples\client\subscriber\ /c
+ $(LD) $(LDFLAGS) $(SAVAN_INTDIR)\samples\client\subscriber\*.obj axis2_util.lib axiom.lib axis2_parser.lib mod_savan.lib axis2_engine.lib $(LIBS) \
+ /LIBPATH:$(AXIS2_BINDIR)\savan\savan /OUT:$(AXIS2_BINDIR)\savan\bin\subscriber.exe
+
+ $(CC) $(CFLAGS) $(AXIS2_SOURCE_DIR)\savan\samples\server\listener\*.c \
+ /I$(AXIS2_SOURCE_DIR)\savan\include /Fo$(SAVAN_INTDIR)\samples\server\listener\ /c
+ $(LD) $(LDFLAGS) $(SAVAN_INTDIR)\samples\server\listener\*.obj axis2_util.lib axiom.lib axis2_parser.lib mod_savan.lib axis2_engine.lib $(LIBS) \
+ /LIBPATH:$(AXIS2_BINDIR)\savan\savan /DLL /OUT:$(AXIS2_BINDIR)\savan\services\listener\listener.dll
+
+ copy $(AXIS2_SOURCE_DIR)\savan\samples\server\listener\services.xml $(AXIS2_BINDIR)\savan\services\listener\
+
+ $(CC) $(CFLAGS) $(AXIS2_SOURCE_DIR)\savan\samples\server\publisher\*.c \
+ /I$(AXIS2_SOURCE_DIR)\savan\include /Fo$(SAVAN_INTDIR)\samples\server\publisher\ /c
+ $(LD) $(LDFLAGS) $(SAVAN_INTDIR)\samples\server\publisher\*.obj axis2_util.lib axiom.lib axis2_parser.lib mod_savan.lib axis2_engine.lib $(LIBS) \
+ /LIBPATH:$(AXIS2_BINDIR)\savan\savan /DLL /OUT:$(AXIS2_BINDIR)\savan\services\publisher\publisher.dll
+
+ copy $(AXIS2_SOURCE_DIR)\savan\samples\server\publisher\services.xml $(AXIS2_BINDIR)\savan\services\publisher\
+
+ xcopy /E /I /Y $(AXIS2_SOURCE_DIR)\savan\samples $(AXIS2_BINDIR)\savan\samples
+
+savan_include:
+ xcopy /E /I /Y $(AXIS2_SOURCE_DIR)\savan\include $(AXIS2_BINDIR)\savan\include
+
+savan: mod_savan savan_samples savan_include
################################ other porjects #########################################
@@ -1085,9 +1156,10 @@
##############################################################################################
+
all: clean_make_dir clean deploy axis2_core axis2_samples copy_include clean_make_dir
install: all
-dist: all mod_rampart_all axis2_server_modules copy_extra copy_samples mv_dist
+dist: all axis2_server_modules savan copy_extra copy_samples mv_dist
Modified: webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/axis2_engine/axis2_engine.vcproj
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/axis2_engine/axis2_engine.vcproj?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/axis2_engine/axis2_engine.vcproj (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/axis2_engine/axis2_engine.vcproj Wed Feb 28 21:58:03 2007
@@ -529,6 +529,50 @@
<Filter
Name="http"
>
+ <Filter
+ Name="common"
+ >
+ <File
+ RelativePath="..\..\..\..\modules\core\transport\http\common\http_header.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\modules\core\transport\http\common\http_out_transport_info.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\modules\core\transport\http\common\http_request_line.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\modules\core\transport\http\common\http_simple_request.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\modules\core\transport\http\common\http_simple_response.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\modules\core\transport\http\common\http_status_line.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\modules\core\transport\http\common\http_worker.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="util"
+ >
+ <File
+ RelativePath="..\..\..\..\modules\core\transport\http\util\http_chunked_stream.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\modules\core\transport\http\util\http_transport_utils.c"
+ >
+ </File>
+ </Filter>
</Filter>
</Filter>
<Filter
Modified: webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/axis2_http_receiver/axis2_http_receiver.vcproj
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/axis2_http_receiver/axis2_http_receiver.vcproj?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/axis2_http_receiver/axis2_http_receiver.vcproj (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/axis2_http_receiver/axis2_http_receiver.vcproj Wed Feb 28 21:58:03 2007
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="axis2_util.lib axis2_parser.lib axis2_engine.lib axis2_http_util.lib axis2_http_common.lib"
+ AdditionalDependencies="axis2_util.lib axis2_parser.lib axis2_engine.lib axis2_http_util.lib"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(SolutionDir)\deploy\lib""
GenerateManifest="true"
@@ -181,11 +181,11 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\..\..\..\modules\core\transport\http\receiver\http_response_writer.c"
+ RelativePath="..\..\..\..\modules\core\transport\http\receiver\http_receiver.c"
>
</File>
<File
- RelativePath="..\..\..\..\modules\core\transport\http\receiver\http_server.c"
+ RelativePath="..\..\..\..\modules\core\transport\http\receiver\http_response_writer.c"
>
</File>
<File
Modified: webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/axis2_http_sender/axis2_http_sender.vcproj
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/axis2_http_sender/axis2_http_sender.vcproj?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/axis2_http_sender/axis2_http_sender.vcproj (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/axis2_http_sender/axis2_http_sender.vcproj Wed Feb 28 21:58:03 2007
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="axis2_util.lib axis2_parser.lib axis2_engine.lib axis2_http_util.lib axis2_http_common.lib"
+ AdditionalDependencies="axis2_util.lib axis2_parser.lib axis2_engine.lib axis2_http_util.lib ssleay32MTd.lib libeay32MTd.lib"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(SolutionDir)\deploy\lib""
GenerateDebugInformation="true"
@@ -194,6 +194,26 @@
RelativePath="..\..\..\..\modules\core\transport\http\sender\soap_over_http_sender.c"
>
</File>
+ <Filter
+ Name="ssl"
+ >
+ <File
+ RelativePath="..\..\..\..\modules\core\transport\http\sender\ssl\ssl_stream.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\modules\core\transport\http\sender\ssl\ssl_stream.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\modules\core\transport\http\sender\ssl\ssl_utils.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\modules\core\transport\http\sender\ssl\ssl_utils.h"
+ >
+ </File>
+ </Filter>
</Filter>
<Filter
Name="Header Files"
Modified: webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/axis2c.sln
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/axis2c.sln?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/axis2c.sln (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/axis2c.sln Wed Feb 28 21:58:03 2007
@@ -41,7 +41,6 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "axis2_http_receiver", "axis2_http_receiver\axis2_http_receiver.vcproj", "{9441F689-6ED3-4FF8-9B13-2E80E391DF39}"
ProjectSection(ProjectDependencies) = postProject
{7C816A64-FA96-4C6C-8DB0-5256441F54BC} = {7C816A64-FA96-4C6C-8DB0-5256441F54BC}
- {3D25ED71-1590-4009-856D-1DEAC76E4A1F} = {3D25ED71-1590-4009-856D-1DEAC76E4A1F}
{7B4EF49A-B4B7-428E-A70B-D78E6CBD32DD} = {7B4EF49A-B4B7-428E-A70B-D78E6CBD32DD}
{D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8} = {D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8}
{9524B8C5-79D9-4470-9A47-8BD163ABBB15} = {9524B8C5-79D9-4470-9A47-8BD163ABBB15}
@@ -75,7 +74,6 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "axis2_http_sender", "axis2_http_sender\axis2_http_sender.vcproj", "{7332F525-8C77-4FB3-A0C0-FCEB2382F03C}"
ProjectSection(ProjectDependencies) = postProject
{7C816A64-FA96-4C6C-8DB0-5256441F54BC} = {7C816A64-FA96-4C6C-8DB0-5256441F54BC}
- {3D25ED71-1590-4009-856D-1DEAC76E4A1F} = {3D25ED71-1590-4009-856D-1DEAC76E4A1F}
{7B4EF49A-B4B7-428E-A70B-D78E6CBD32DD} = {7B4EF49A-B4B7-428E-A70B-D78E6CBD32DD}
{D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8} = {D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8}
{9524B8C5-79D9-4470-9A47-8BD163ABBB15} = {9524B8C5-79D9-4470-9A47-8BD163ABBB15}
@@ -92,7 +90,9 @@
{3887B3E3-1A45-40E5-BC95-9C51000C86DB} = {3887B3E3-1A45-40E5-BC95-9C51000C86DB}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "axis2_http_common", "axis2_http_common\axis2_http_commons.vcproj", "{3D25ED71-1590-4009-856D-1DEAC76E4A1F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_savan", "mod_savan\mod_savan.vcproj", "{C781F3DE-8F38-4778-A50F-003D04336A10}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rampart", "mod_rampart\mod_rampart.vcproj", "{E29A8228-26E8-431F-A218-3F2849BC724D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -152,10 +152,14 @@
{7B4EF49A-B4B7-428E-A70B-D78E6CBD32DD}.Debug|Win32.Build.0 = Debug|Win32
{7B4EF49A-B4B7-428E-A70B-D78E6CBD32DD}.Release|Win32.ActiveCfg = Release|Win32
{7B4EF49A-B4B7-428E-A70B-D78E6CBD32DD}.Release|Win32.Build.0 = Release|Win32
- {3D25ED71-1590-4009-856D-1DEAC76E4A1F}.Debug|Win32.ActiveCfg = Debug|Win32
- {3D25ED71-1590-4009-856D-1DEAC76E4A1F}.Debug|Win32.Build.0 = Debug|Win32
- {3D25ED71-1590-4009-856D-1DEAC76E4A1F}.Release|Win32.ActiveCfg = Release|Win32
- {3D25ED71-1590-4009-856D-1DEAC76E4A1F}.Release|Win32.Build.0 = Release|Win32
+ {C781F3DE-8F38-4778-A50F-003D04336A10}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C781F3DE-8F38-4778-A50F-003D04336A10}.Debug|Win32.Build.0 = Debug|Win32
+ {C781F3DE-8F38-4778-A50F-003D04336A10}.Release|Win32.ActiveCfg = Release|Win32
+ {C781F3DE-8F38-4778-A50F-003D04336A10}.Release|Win32.Build.0 = Release|Win32
+ {E29A8228-26E8-431F-A218-3F2849BC724D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E29A8228-26E8-431F-A218-3F2849BC724D}.Debug|Win32.Build.0 = Debug|Win32
+ {E29A8228-26E8-431F-A218-3F2849BC724D}.Release|Win32.ActiveCfg = Release|Win32
+ {E29A8228-26E8-431F-A218-3F2849BC724D}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/clients/clients.sln
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/clients/clients.sln?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/clients/clients.sln (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/ides/vc/axis2c/clients/clients.sln Wed Feb 28 21:58:03 2007
@@ -7,12 +7,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "math", "math\math.vcproj", "{9121BA33-CE71-4775-AD78-1114696BFEC8}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rm_echo", "..\..\..\..\..\SandeshaC\ides\vc8\rm_echo\rm_echo.vcproj", "{38A618E5-CB4C-4D3C-AB22-8EE82A3D4FFA}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "axis2_engine", "..\axis2_engine\axis2_engine.vcproj", "{9524B8C5-79D9-4470-9A47-8BD163ABBB15}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sandesha2", "..\..\..\..\..\SandeshaC\ides\vc8\sandesha2\sandesha2.vcproj", "{5D4A55B6-5A2A-4B2E-8DE3-AF69F1DFCB1C}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -31,18 +27,10 @@
{9121BA33-CE71-4775-AD78-1114696BFEC8}.Debug|Win32.Build.0 = Debug|Win32
{9121BA33-CE71-4775-AD78-1114696BFEC8}.Release|Win32.ActiveCfg = Release|Win32
{9121BA33-CE71-4775-AD78-1114696BFEC8}.Release|Win32.Build.0 = Release|Win32
- {38A618E5-CB4C-4D3C-AB22-8EE82A3D4FFA}.Debug|Win32.ActiveCfg = Debug|Win32
- {38A618E5-CB4C-4D3C-AB22-8EE82A3D4FFA}.Debug|Win32.Build.0 = Debug|Win32
- {38A618E5-CB4C-4D3C-AB22-8EE82A3D4FFA}.Release|Win32.ActiveCfg = Release|Win32
- {38A618E5-CB4C-4D3C-AB22-8EE82A3D4FFA}.Release|Win32.Build.0 = Release|Win32
{9524B8C5-79D9-4470-9A47-8BD163ABBB15}.Debug|Win32.ActiveCfg = Debug|Win32
{9524B8C5-79D9-4470-9A47-8BD163ABBB15}.Debug|Win32.Build.0 = Debug|Win32
{9524B8C5-79D9-4470-9A47-8BD163ABBB15}.Release|Win32.ActiveCfg = Release|Win32
{9524B8C5-79D9-4470-9A47-8BD163ABBB15}.Release|Win32.Build.0 = Release|Win32
- {5D4A55B6-5A2A-4B2E-8DE3-AF69F1DFCB1C}.Debug|Win32.ActiveCfg = Debug|Win32
- {5D4A55B6-5A2A-4B2E-8DE3-AF69F1DFCB1C}.Debug|Win32.Build.0 = Debug|Win32
- {5D4A55B6-5A2A-4B2E-8DE3-AF69F1DFCB1C}.Release|Win32.ActiveCfg = Release|Win32
- {5D4A55B6-5A2A-4B2E-8DE3-AF69F1DFCB1C}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: webservices/axis2/scratch/c/dinesh/532/c/include/axis2_const.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/include/axis2_const.h?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/include/axis2_const.h (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/include/axis2_const.h Wed Feb 28 21:58:03 2007
@@ -343,6 +343,7 @@
#define AXIS2_SVC_GRP_ID "ServiceGroupId"
+#define AXIS2_RESPONSE_SOAP_ENVELOPE "Axis2ResponseEnvelope"
#ifdef __cplusplus
}
Modified: webservices/axis2/scratch/c/dinesh/532/c/include/axis2_soap_over_http_sender.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/include/axis2_soap_over_http_sender.h?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/include/axis2_soap_over_http_sender.h (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/include/axis2_soap_over_http_sender.h Wed Feb 28 21:58:03 2007
@@ -35,6 +35,7 @@
#include <axiom_output.h>
#include <axis2_http_simple_response.h>
#include <axiom_soap_envelope.h>
+#include <axis2_http_client.h>
#ifdef __cplusplus
@@ -73,6 +74,11 @@
const axis2_char_t *str_url,
const axis2_char_t *soap_action);
+ axis2_http_client_t* (AXIS2_CALL *
+ get_client)(
+ axis2_soap_over_http_sender_t *sender,
+ const axis2_env_t *env);
+
/**
* @param sender sender
* @param env pointer to environment struct
@@ -183,6 +189,9 @@
#define AXIS2_SOAP_OVER_HTTP_SENDER_SEND(sender, env, msg_ctx, output, url, \
soap_action) ((sender)->ops->send (sender, env, msg_ctx\
,output, url, soap_action))
+
+#define AXIS2_SOAP_OVER_HTTP_SENDER_GET_CLIENT(sender, env) \
+ ((sender)->ops->get_client(sender, env))
/** Set chunked.
@sa axis2_soap_over_http_sender_ops#set_chunked */
Modified: webservices/axis2/scratch/c/dinesh/532/c/modules/core/clientapi/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/modules/core/clientapi/Makefile.am?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/modules/core/clientapi/Makefile.am (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/modules/core/clientapi/Makefile.am Wed Feb 28 21:58:03 2007
@@ -13,4 +13,5 @@
-I$(top_builddir)/modules/core/engine \
-I$(top_builddir)/modules/core/deployment \
-I$(top_builddir)/util/include \
+ -I$(top_builddir)/util/include/platforms \
-I$(top_builddir)/axiom/include
Modified: webservices/axis2/scratch/c/dinesh/532/c/modules/core/clientapi/mep_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/modules/core/clientapi/mep_client.c?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/modules/core/clientapi/mep_client.c (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/modules/core/clientapi/mep_client.c Wed Feb 28 21:58:03 2007
@@ -24,6 +24,7 @@
#include <axiom_soap_body.h>
#include <axis2_http_transport_utils.h>
#include <axis2_property.h>
+#include <axis2_platform_auto_sense.h>
typedef struct axis2_mep_client_impl
{
@@ -703,8 +704,42 @@
}
else
{
+ int count = 0;
+ axis2_op_ctx_t *op_ctx = NULL;
+ axis2_svc_ctx_t *svc_ctx = NULL;
+ axis2_ctx_t *ctx = NULL;
+ axis2_property_t *prop = NULL;
+ while (!response_envelope && count < 5)
+ {
+ count++;
+ AXIS2_SLEEP(1);
+ op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
+ svc_ctx = AXIS2_OP_CTX_GET_PARENT(op_ctx, env);
+ ctx = AXIS2_SVC_CTX_GET_BASE((const axis2_svc_ctx_t *)svc_ctx, env);
+ prop = AXIS2_CTX_GET_PROPERTY(ctx, env, AXIS2_RESPONSE_SOAP_ENVELOPE, AXIS2_FALSE);
+ if (prop)
+ response_envelope = AXIS2_PROPERTY_GET_VALUE(prop, env);
+ if (response_envelope)
+ AXIS2_MSG_CTX_SET_RESPONSE_SOAP_ENVELOPE (msg_ctx, env, response_envelope);
+ }
+
+
/* if it is a two way message, then the status should be in error,
else it is a one way message */
+ if (response_envelope)
+ {
+ AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(response, env, response_envelope);
+ engine = axis2_engine_create(env, conf_ctx);
+ if (engine)
+ {
+ status = AXIS2_ENGINE_RECEIVE(engine, env, response);
+ if (status != AXIS2_SUCCESS)
+ return NULL;
+ }
+ }
+ else
+ {
+
if (AXIS2_ERROR_GET_STATUS_CODE(env->error) != AXIS2_SUCCESS)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_BLOCKING_INVOCATION_EXPECTS_RESPONSE, AXIS2_FAILURE);
@@ -716,6 +751,7 @@
AXIS2_MSG_CTX_FREE(response, env);
return NULL;
}
+ }
}
/* property is NULL, and we set null for AXIS2_TRANSPORT_IN in msg_ctx to
@@ -788,7 +824,9 @@
{
status = AXIS2_ENGINE_RECEIVE(engine, env, response);
if (status != AXIS2_SUCCESS)
+ {
return NULL;
+ }
}
}
Modified: webservices/axis2/scratch/c/dinesh/532/c/modules/core/context/msg_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/modules/core/context/msg_ctx.c?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/modules/core/context/msg_ctx.c Wed Feb 28 21:58:03 2007
@@ -216,6 +216,7 @@
msg_ctx->transport_headers = NULL;
msg_ctx->transfer_encoding = NULL;
msg_ctx->transport_url = NULL;
+ msg_ctx->response_soap_envelope = NULL;
msg_ctx->base = axis2_ctx_create(env);
if (!(msg_ctx->base))
Modified: webservices/axis2/scratch/c/dinesh/532/c/modules/core/description/op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/modules/core/description/op.c?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/modules/core/description/op.c (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/modules/core/description/op.c Wed Feb 28 21:58:03 2007
@@ -993,42 +993,42 @@
temp = AXIS2_MEP_CONSTANT_INVALID;
if (AXIS2_STRCMP(AXIS2_MEP_URI_IN_OUT,
- axis2_op_get_msg_exchange_pattern(op, env)))
+ axis2_op_get_msg_exchange_pattern(op, env)) == 0)
{
temp = AXIS2_MEP_CONSTANT_IN_OUT;
}
else if (AXIS2_STRCMP(AXIS2_MEP_URI_IN_ONLY,
- axis2_op_get_msg_exchange_pattern(op, env)))
+ axis2_op_get_msg_exchange_pattern(op, env)) == 0)
{
temp = AXIS2_MEP_CONSTANT_IN_ONLY;
}
else if (AXIS2_STRCMP(AXIS2_MEP_URI_IN_OPTIONAL_OUT,
- axis2_op_get_msg_exchange_pattern(op, env)))
+ axis2_op_get_msg_exchange_pattern(op, env)) == 0)
{
temp = AXIS2_MEP_CONSTANT_IN_OPTIONAL_OUT;
}
else if (AXIS2_STRCMP(AXIS2_MEP_URI_OUT_IN,
- axis2_op_get_msg_exchange_pattern(op, env)))
+ axis2_op_get_msg_exchange_pattern(op, env)) == 0)
{
temp = AXIS2_MEP_CONSTANT_OUT_IN;
}
else if (AXIS2_STRCMP(AXIS2_MEP_URI_OUT_ONLY,
- axis2_op_get_msg_exchange_pattern(op, env)))
+ axis2_op_get_msg_exchange_pattern(op, env)) == 0)
{
temp = AXIS2_MEP_CONSTANT_OUT_ONLY;
}
else if (AXIS2_STRCMP(AXIS2_MEP_URI_OUT_OPTIONAL_IN,
- axis2_op_get_msg_exchange_pattern(op, env)))
+ axis2_op_get_msg_exchange_pattern(op, env)) == 0)
{
temp = AXIS2_MEP_CONSTANT_OUT_OPTIONAL_IN;
}
else if (AXIS2_STRCMP(AXIS2_MEP_URI_ROBUST_IN_ONLY,
- axis2_op_get_msg_exchange_pattern(op, env)))
+ axis2_op_get_msg_exchange_pattern(op, env)) == 0)
{
temp = AXIS2_MEP_CONSTANT_ROBUST_IN_ONLY;
}
else if (AXIS2_STRCMP(AXIS2_MEP_URI_ROBUST_OUT_ONLY,
- axis2_op_get_msg_exchange_pattern(op, env)))
+ axis2_op_get_msg_exchange_pattern(op, env)) == 0)
{
temp = AXIS2_MEP_CONSTANT_ROBUST_OUT_ONLY;
}
Modified: webservices/axis2/scratch/c/dinesh/532/c/modules/core/description/svc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/modules/core/description/svc.c?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/modules/core/description/svc.c (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/modules/core/description/svc.c Wed Feb 28 21:58:03 2007
@@ -1244,7 +1244,10 @@
module_desc);
if (status)
{
+ const axis2_qname_t *qname = NULL;
status = AXIS2_ARRAY_LIST_ADD(svc_impl->engaged_modules, env, module_desc);
+ qname = AXIS2_MODULE_DESC_GET_QNAME(module_desc, env);
+ axis2_svc_add_module_qname(svc, env, qname);
}
if (phase_resolver)
{
Modified: webservices/axis2/scratch/c/dinesh/532/c/modules/core/engine/conf.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/modules/core/engine/conf.c?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/modules/core/engine/conf.c Wed Feb 28 21:58:03 2007
@@ -17,7 +17,7 @@
#include <string.h>
#include <axis2_disp.h>
-#include <axis2_disp_checker.h>
+#include "axis2_disp_checker.h"
#include <axis2_conf.h>
#include <axis2_dir_handler.h>
#include <axis2_dep_engine.h>
Modified: webservices/axis2/scratch/c/dinesh/532/c/modules/core/engine/disp_checker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/modules/core/engine/disp_checker.c?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/modules/core/engine/disp_checker.c (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/modules/core/engine/disp_checker.c Wed Feb 28 21:58:03 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-#include <axis2_disp_checker.h>
+#include "axis2_disp_checker.h"
#include <axis2_handler_desc.h>
#include <axis2_string.h>
#include <axis2_relates_to.h>
Modified: webservices/axis2/scratch/c/dinesh/532/c/modules/core/engine/engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/modules/core/engine/engine.c?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/modules/core/engine/engine.c Wed Feb 28 21:58:03 2007
@@ -664,9 +664,6 @@
AXIS2_MSG_CTX_SET_PROCESS_FAULT(fault_ctx, env, AXIS2_TRUE);
AXIS2_MSG_CTX_SET_SERVER_SIDE(fault_ctx, env, AXIS2_TRUE);
- axis2_msg_ctx_set_http_out_transport_info(fault_ctx, env,
- axis2_msg_ctx_get_http_out_transport_info(processing_context, env));
-
envelope = AXIS2_MSG_CTX_GET_FAULT_SOAP_ENVELOPE(processing_context, env);
if (!envelope)
Modified: webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/Makefile.am?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/Makefile.am (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/Makefile.am Wed Feb 28 21:58:03 2007
@@ -6,7 +6,7 @@
http_client.c
libaxis2_http_sender_la_LIBADD = $(top_builddir)/modules/core/transport/http/common/libaxis2_http_common.la\
- $(top_builddir)/modules/core/transport/http/util/libaxis2_http_util.la\
+ $(top_builddir)/modules/core/transport/http/util/libaxis2_http_util.la\
$(top_builddir)/axiom/src/om/libaxis2_axiom.la\
$(top_builddir)/util/src/libaxis2_util.la
Modified: webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/http_transport_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/http_transport_sender.c?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/http_transport_sender.c (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/http_transport_sender.c Wed Feb 28 21:58:03 2007
@@ -251,7 +251,8 @@
AXIS2_FAILURE);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "%s",
AXIS2_ERROR_GET_MESSAGE(env->error));
- return AXIS2_FAILURE;
+ /*return AXIS2_FAILURE;*/
+ return AXIS2_SUCCESS;
}
xml_writer = axiom_xml_writer_create_for_memory(env, NULL,
AXIS2_TRUE, 0, AXIS2_XML_PARSER_TYPE_BUFFER);
@@ -547,6 +548,7 @@
const axis2_char_t *soap_ns_uri = NULL;
axiom_soap_envelope_t *response_envelope = NULL;
axis2_op_t *op = NULL;
+/* axis2_http_client_t *client = NULL; */
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
@@ -570,6 +572,16 @@
}
+ /* Get the client used to send. We will own this, and free it after
+ * having read the response */
+/* client = AXIS2_SOAP_OVER_HTTP_SENDER_GET_CLIENT(sender, env); */
+
+ /*
+ * TODO check for errors
+ */
+/* AXIS2_SOAP_OVER_HTTP_SENDER_FREE(sender, env); */
+/* sender = NULL; */
+/* } */
AXIS2_HTTP_SENDER_SET_CHUNKED(sender, env,
AXIS2_INTF_TO_IMPL(transport_sender)->chunked);
@@ -589,8 +601,11 @@
{
/* handle one way case */
const axis2_char_t *mep = AXIS2_OP_GET_MSG_EXCHANGE_PATTERN(op, env);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "OP name axis2_qname_get_localpart = %s",
+ mep);
if (AXIS2_STRCMP(mep, AXIS2_MEP_URI_OUT_ONLY) == 0 ||
- AXIS2_STRCMP(mep, AXIS2_MEP_URI_ROBUST_OUT_ONLY) == 0)
+ AXIS2_STRCMP(mep, AXIS2_MEP_URI_ROBUST_OUT_ONLY) == 0 ||
+ AXIS2_STRCMP(mep, AXIS2_MEP_URI_IN_ONLY) == 0)
{
return status;
}
@@ -600,17 +615,35 @@
AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI : AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI;
response_envelope = axis2_http_transport_utils_create_soap_msg(env,
msg_ctx, soap_ns_uri);
- AXIS2_MSG_CTX_SET_RESPONSE_SOAP_ENVELOPE (msg_ctx, env, response_envelope);
+ if (response_envelope)
+ AXIS2_MSG_CTX_SET_RESPONSE_SOAP_ENVELOPE (msg_ctx, env, response_envelope);
}
}
+ /* Free the client */
+/* if (client) */
+/* { */
+/* AXIS2_HTTP_CLIENT_FREE(client, env); */
+/* client = NULL; */
+/* } */
+
return status;
}
/**
* Following block distinguish the exposed part of the dll.
*/
+
+/* When building for static deployment, give the get and remove methods
+ * unique names. This avoids having the linker fail with duplicate symbol
+ * errors.
+ */
+
AXIS2_EXPORT int
+#ifndef AXIS2_STATIC_DEPLOY
axis2_get_instance(
+#else
+axis2_http_transport_sender_get_instance(
+#endif
struct axis2_transport_sender **inst,
const axis2_env_t *env)
{
@@ -625,7 +658,11 @@
}
AXIS2_EXPORT int
+#ifndef AXIS2_STATIC_DEPLOY
axis2_remove_instance(
+#else
+axis2_http_transport_sender_remove_instance(
+#endif
axis2_transport_sender_t *inst,
const axis2_env_t *env)
{
Modified: webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/rest_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/rest_sender.c?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/rest_sender.c (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/rest_sender.c Wed Feb 28 21:58:03 2007
@@ -522,14 +522,8 @@
transfer_encoding =
AXIS2_STRDUP(AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED,
env);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, transfer_encoding);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env,
- AXIS2_HTTP_HEADER_TRANSFER_ENCODING,
- property,
- AXIS2_FALSE);
response_chunked = AXIS2_TRUE;
+ axis2_msg_ctx_set_transfer_encoding(msg_ctx, env, transfer_encoding);
}
if (0 != AXIS2_STRCMP(name, AXIS2_HTTP_HEADER_CONTENT_TYPE))
{
Modified: webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/soap_over_http_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/soap_over_http_sender.c?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/soap_over_http_sender.c (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/soap_over_http_sender.c Wed Feb 28 21:58:03 2007
@@ -80,6 +80,11 @@
const axis2_char_t *str_url,
const axis2_char_t *soap_action);
+axis2_http_client_t* AXIS2_CALL
+axis2_soap_over_http_sender_get_client(
+ axis2_soap_over_http_sender_t *sender,
+ const axis2_env_t *env);
+
axis2_status_t AXIS2_CALL
axis2_soap_over_http_sender_set_chunked(
axis2_soap_over_http_sender_t *sender,
@@ -162,6 +167,8 @@
sender_impl->sender.ops->send =
axis2_soap_over_http_sender_send;
+ sender_impl->sender.ops->get_client =
+ axis2_soap_over_http_sender_get_client;
sender_impl->sender.ops->set_chunked =
axis2_soap_over_http_sender_set_chunked;
sender_impl->sender.ops->set_om_output =
@@ -224,6 +231,7 @@
int output_stream_size = 0;
axis2_bool_t doing_mtom = AXIS2_FALSE;
axis2_property_t *dump_property = NULL;
+ axis2_property_t *ssl_pp_property = NULL;
axis2_param_t *ssl_pp_param = NULL; /* ssl passphrase */
axis2_char_t *ssl_pp = NULL;
@@ -466,14 +474,23 @@
/* TODO: Load from property
* ssl_pp_property = AXIS2_MSG_CTX_GET_PROPERTY(AXIS2_SSL_PASSPHRASE);*/
-
- ssl_pp_param = AXIS2_MSG_CTX_GET_PARAMETER(msg_ctx, env, AXIS2_SSL_PASSPHRASE);
-
- if (ssl_pp_param)
+
+ ssl_pp_property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
+ AXIS2_SSL_PASSPHRASE, AXIS2_FALSE);
+ if (ssl_pp_property)
{
- ssl_pp = AXIS2_PARAM_GET_VALUE(ssl_pp_param, env);
+ ssl_pp = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
+ ssl_pp_property, env);
}
+ else
+ {
+ ssl_pp_param = AXIS2_MSG_CTX_GET_PARAMETER(msg_ctx, env, AXIS2_SSL_PASSPHRASE);
+ if (ssl_pp_param)
+ {
+ ssl_pp = AXIS2_PARAM_GET_VALUE(ssl_pp_param, env);
+ }
+ }
status_code = AXIS2_HTTP_CLIENT_SEND(sender_impl->client, env, request, ssl_pp);
@@ -543,6 +560,16 @@
}
+axis2_http_client_t* AXIS2_CALL
+axis2_soap_over_http_sender_get_client(
+ axis2_soap_over_http_sender_t *sender,
+ const axis2_env_t *env)
+{
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ return AXIS2_INTF_TO_IMPL(sender)->client;
+}
+
+
axis2_status_t AXIS2_CALL
axis2_soap_over_http_sender_set_chunked(
axis2_soap_over_http_sender_t *sender,
@@ -613,14 +640,8 @@
transfer_encoding =
AXIS2_STRDUP(AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED,
env);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, transfer_encoding);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env,
- AXIS2_HTTP_HEADER_TRANSFER_ENCODING,
- property,
- AXIS2_FALSE);
response_chunked = AXIS2_TRUE;
+ axis2_msg_ctx_set_transfer_encoding(msg_ctx, env, transfer_encoding);
}
if (0 != AXIS2_STRCMP(name, AXIS2_HTTP_HEADER_CONTENT_TYPE))
{
Modified: webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/ssl/ssl_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/ssl/ssl_utils.c?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/ssl/ssl_utils.c (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/ssl/ssl_utils.c Wed Feb 28 21:58:03 2007
@@ -89,14 +89,14 @@
if(!(SSL_CTX_use_certificate_chain_file(ctx, key_file)))
{
- printf("Loading client certificate failed!\n");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[ssl client] loading client certificate failed ");
SSL_CTX_free(ctx);
return NULL;
}
if(!(SSL_CTX_use_PrivateKey_file(ctx, key_file, SSL_FILETYPE_PEM)))
{
- printf("Loading client key failed!\n");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[ssl client] Loading client key failed");
SSL_CTX_free(ctx);
return NULL;
}
@@ -105,7 +105,7 @@
/* Load the CAs we trust*/
if (!(SSL_CTX_load_verify_locations(ctx, ca_file, 0)))
{
- printf("Loading CA certifiate failed!\n");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[ ssl client ] Loading CA certificate failed ");
SSL_CTX_free(ctx);
return NULL;
}
Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/include/openssl_sign.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/include/openssl_sign.h?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/include/openssl_sign.h (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/include/openssl_sign.h Wed Feb 28 21:58:03 2007
@@ -37,12 +37,16 @@
*/
AXIS2_EXTERN int AXIS2_CALL
-openssl_sign(const axis2_env_t *env,
- oxs_sign_ctx_t *sign_ctx,
+openssl_sig_sign(const axis2_env_t *env,
+ openssl_pkey_t *prvkey,
oxs_buffer_t *input_buf,
oxs_buffer_t *output_buf);
-
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+openssl_sig_verify(const axis2_env_t *env,
+ openssl_pkey_t *pubkey,
+ oxs_buffer_t *input_buf,
+ oxs_buffer_t *sig_buf);
/** @} */
#ifdef __cplusplus
}
Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_axiom.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_axiom.h?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_axiom.h (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_axiom.h Wed Feb 28 21:58:03 2007
@@ -28,6 +28,7 @@
#include <axis2_env.h>
#include <axis2_util.h>
#include <axiom_node.h>
+#include <axiom_util.h>
#include <axiom_document.h>
#include <axiom.h>
@@ -36,7 +37,13 @@
{
#endif
-
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+oxs_axiom_add_attribute(const axis2_env_t *env,
+ axiom_node_t* node,
+ axis2_char_t* attribute_ns,
+ axis2_char_t* attribute_ns_uri,
+ axis2_char_t* attribute,
+ axis2_char_t* value);
AXIS2_EXTERN int AXIS2_CALL
oxs_axiom_get_number_of_children_with_qname(const axis2_env_t *env,
Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_c14n.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_c14n.h?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_c14n.h (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_c14n.h Wed Feb 28 21:58:03 2007
@@ -42,6 +42,26 @@
extern "C"
{
#endif
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ oxs_c14n_apply_stream_algo(
+ const axis2_env_t *env,
+ const axiom_document_t *doc,
+ axis2_stream_t *stream,
+ const axis2_array_list_t *ns_prefixes,
+ const axiom_node_t *node,
+ const axis2_char_t* algo
+ );
+
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ oxs_c14n_apply_algo(
+ const axis2_env_t *env,
+ const axiom_document_t *doc,
+ axis2_char_t **outbuf,
+ const axis2_array_list_t *ns_prefixes,
+ const axiom_node_t *node,
+ const axis2_char_t *algo
+ );
+
AXIS2_EXTERN axis2_status_t AXIS2_CALL
oxs_c14n_apply_stream(
Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_constants.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_constants.h?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_constants.h (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_constants.h Wed Feb 28 21:58:03 2007
@@ -36,12 +36,14 @@
#define OXS_XENC "xenc"
#define OXS_DS "ds"
#define OXS_WSSE "wsse"
-
+#define OXS_WSSE_XMLNS "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
+#define OXS_WSU "wsu"
/****************************************************************
ID Prefixes
****************************************************************/
#define OXS_ENCDATA_ID "EncDataID"
#define OXS_ENCKEY_ID "EncKeyID"
+#define OXS_SIG_ID "SigID"
#define OXS_CERT_ID "CertID"
#define OXS_EMBEDDED_ID "EmbeddedID"
@@ -178,7 +180,18 @@
/****************************************************************
C14N
****************************************************************/
-#define OXS_HREF_C14N "http://www.w3.org/TR/2001/REC-xml-c14n-20010315"
+
+#define OXS_HREF_XML_C14N "http://www.w3.org/TR/2001/REC-xml-c14n-20010315"
+#define OXS_HREF_XML_EXC_C14N "http://www.w3.org/2001/10/xml-exc-c14n#"
+
+#define OXS_HREF_XML_C14N_WITH_COMMENTS "http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"
+#define OXS_HREF_XML_EXC_C14N_WITH_COMMENTS "http://www.w3.org/2001/10/xml-exc-c14n#WithComments"
+/****************************************************************
+ Transforms
+****************************************************************/
+#define OXS_HREF_TRANSFORM_XML_EXC_C14N OXS_HREF_XML_EXC_C14N
+#define OXS_HREF_TRANSFORM_STR_TRANSFORM "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#STR-Transform"
+#define OXS_HREF_TRANSFORM_ENVELOPED_SIGNATURE "http://www.w3.org/2000/09/xmldsig#enveloped-signature"
/****************************************************************
KeyNAME
Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_error.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_error.h?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_error.h (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_error.h Wed Feb 28 21:58:03 2007
@@ -56,7 +56,9 @@
#define OXS_ERROR_INITIALIZATION_FAILED 9
#define OXS_ERROR_DATA_CONV_FAILED 10
#define OXS_ERROR_OPENSSL_FUNC_FAILED 11
-
+#define OXS_ERROR_TRANSFORM_FAILED 12
+#define OXS_ERROR_SIGN_FAILED 13
+#define OXS_ERROR_SIG_VERIFICATION_FAILED 14
typedef struct _oxs_error_description oxs_error_description, *oxs_error_description_ptr;
Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_sign_ctx.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_sign_ctx.h?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_sign_ctx.h (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_sign_ctx.h Wed Feb 28 21:58:03 2007
@@ -34,6 +34,13 @@
extern "C"
{
#endif
+
+ /*The type of operation*/
+ typedef enum {
+ OXS_SIGN_OPERATION_NONE = 0,
+ OXS_SIGN_OPERATION_SIGN,
+ OXS_SIGN_OPERATION_VERIFY
+ } oxs_sign_operation_t;
typedef struct oxs_sign_ctx_t oxs_sign_ctx_t;
@@ -49,74 +56,94 @@
/**********************Getter functions******************************************/
-axis2_char_t *AXIS2_CALL
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
oxs_sign_ctx_get_sign_mtd_algo(
const oxs_sign_ctx_t *sign_ctx,
const axis2_env_t *env);
-axis2_char_t *AXIS2_CALL
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
oxs_sign_ctx_get_c14n_mtd(
const oxs_sign_ctx_t *sign_ctx,
const axis2_env_t *env);
-axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+oxs_sign_ctx_get_sig_val(
+ const oxs_sign_ctx_t *sign_ctx,
+ const axis2_env_t *env);
+
+AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
oxs_sign_ctx_get_sign_parts(
const oxs_sign_ctx_t *sign_ctx,
const axis2_env_t *env);
-oxs_x509_cert_t *AXIS2_CALL
+AXIS2_EXTERN oxs_x509_cert_t *AXIS2_CALL
oxs_sign_ctx_get_certificate(
const oxs_sign_ctx_t *sign_ctx,
const axis2_env_t *env);
-openssl_pkey_t *AXIS2_CALL
+AXIS2_EXTERN openssl_pkey_t *AXIS2_CALL
oxs_sign_ctx_get_private_key(
const oxs_sign_ctx_t *sign_ctx,
const axis2_env_t *env);
-openssl_pkey_t *AXIS2_CALL
+AXIS2_EXTERN openssl_pkey_t *AXIS2_CALL
oxs_sign_ctx_get_public_key(
const oxs_sign_ctx_t *sign_ctx,
const axis2_env_t *env);
+AXIS2_EXTERN oxs_sign_operation_t AXIS2_CALL
+oxs_sign_ctx_get_operation(
+ const oxs_sign_ctx_t *sign_ctx,
+ const axis2_env_t *env);
+
/**********************Setter functions******************************************/
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
oxs_sign_ctx_set_sign_mtd_algo(
oxs_sign_ctx_t *sign_ctx,
const axis2_env_t *env,
axis2_char_t *sign_mtd_algo);
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
oxs_sign_ctx_set_c14n_mtd(
oxs_sign_ctx_t *sign_ctx,
const axis2_env_t *env,
axis2_char_t *c14n_mtd);
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+oxs_sign_ctx_set_sig_val(
+ oxs_sign_ctx_t *sign_ctx,
+ const axis2_env_t *env,
+ axis2_char_t *sig_val);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
oxs_sign_ctx_set_sign_parts(
oxs_sign_ctx_t *sign_ctx,
const axis2_env_t *env,
axis2_array_list_t *sign_parts);
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
oxs_sign_ctx_set_certificate(
oxs_sign_ctx_t *sign_ctx,
const axis2_env_t *env,
oxs_x509_cert_t *certificate);
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
oxs_sign_ctx_set_private_key(
oxs_sign_ctx_t *sign_ctx,
const axis2_env_t *env,
openssl_pkey_t *prv_key);
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
oxs_sign_ctx_set_public_key(
oxs_sign_ctx_t *sign_ctx,
const axis2_env_t *env,
openssl_pkey_t *pub_key);
-
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+oxs_sign_ctx_set_operation(
+ oxs_sign_ctx_t *sign_ctx,
+ const axis2_env_t *env,
+ oxs_sign_operation_t operation);
/** @} */
#ifdef __cplusplus
}
Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_sign_part.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_sign_part.h?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_sign_part.h (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_sign_part.h Wed Feb 28 21:58:03 2007
@@ -47,46 +47,57 @@
/**********************Getter functions******************************************/
-axis2_char_t *AXIS2_CALL
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
oxs_sign_part_get_id(
const oxs_sign_part_t *sign_part,
const axis2_env_t *env);
-axis2_char_t *AXIS2_CALL
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
oxs_sign_part_get_digest_mtd(
const oxs_sign_part_t *sign_part,
const axis2_env_t *env);
-axiom_node_t *AXIS2_CALL
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+oxs_sign_part_get_digest_val(
+ const oxs_sign_part_t *sign_part,
+ const axis2_env_t *env);
+
+AXIS2_EXTERN axiom_node_t *AXIS2_CALL
oxs_sign_part_get_node(
const oxs_sign_part_t *sign_part,
const axis2_env_t *env);
-axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
oxs_sign_part_get_transforms(
const oxs_sign_part_t *sign_part,
const axis2_env_t *env);
/**********************Setter functions******************************************/
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
oxs_sign_part_set_id(
oxs_sign_part_t *sign_part,
const axis2_env_t *env,
axis2_char_t *id);
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
oxs_sign_part_set_digest_mtd(
oxs_sign_part_t *sign_part,
const axis2_env_t *env,
axis2_char_t *digest_mtd);
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+oxs_sign_part_set_digest_val(
+ oxs_sign_part_t *sign_part,
+ const axis2_env_t *env,
+ axis2_char_t *digest_val);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
oxs_sign_part_set_node(
oxs_sign_part_t *sign_part,
const axis2_env_t *env,
axiom_node_t *node);
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
oxs_sign_part_set_transforms(
oxs_sign_part_t *sign_part,
const axis2_env_t *env,
Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_signature.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_signature.h?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_signature.h (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_signature.h Wed Feb 28 21:58:03 2007
@@ -52,7 +52,14 @@
oxs_buffer_t *input,
oxs_buffer_t *output);
-
+/**
+ * Verify
+ */
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+oxs_sig_verify(const axis2_env_t *env,
+ oxs_sign_ctx_t *sign_ctx,
+ axis2_char_t *content,
+ axis2_char_t *signature);
/** @} */
#ifdef __cplusplus
}
Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_token_ds_reference.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_token_ds_reference.h?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_token_ds_reference.h (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_token_ds_reference.h Wed Feb 28 21:58:03 2007
@@ -44,6 +44,9 @@
axis2_char_t *uri,
axis2_char_t *type);
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+oxs_token_get_ds_reference(const axis2_env_t *env, axiom_node_t *ref_node);
+
/** @} */
#ifdef __cplusplus
}
Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_token_transform.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_token_transform.h?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_token_transform.h (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_token_transform.h Wed Feb 28 21:58:03 2007
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-#ifndef OXS_TRANSFORM_H
-#define OXS_TRANSFORM_H
+#ifndef OXS_TOKEN_TRANSFORM_H
+#define OXS_TOKEN_TRANSFORM_H
/**
- * @file oxs_token_c14n_method.h
+ * @file oxs_token_transform.h
* @brief
*/
@@ -51,4 +51,4 @@
}
#endif
-#endif /* OXS_TRANSFORM_H */
+#endif /* OXS_TOKEN_TRANSFORM_H */
Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_xml_signature.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_xml_signature.h?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_xml_signature.h (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/include/oxs_xml_signature.h Wed Feb 28 21:58:03 2007
@@ -31,6 +31,7 @@
#include <axiom_element.h>
#include <axis2_qname.h>
#include <oxs_sign_ctx.h>
+#include <oxs_sign_part.h>
#ifdef __cplusplus
extern "C"
@@ -44,14 +45,42 @@
oxs_sign_ctx_t *sign_ctx,
axiom_node_t *parent);
+
+
/**
* Verify
*/
+/* Do transforms, Generate digest and compare with the digest in hand
+ * For a single signature part*/
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+oxs_xml_sig_verify_sign_part(const axis2_env_t *env,
+ oxs_sign_part_t *sign_part);
+
+/*Verify all digests in signature parts*/
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+oxs_xml_sig_verify_digests(const axis2_env_t *env,
+ oxs_sign_ctx_t *sign_ctx);
+
+/*Verify a complete xml document*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
oxs_xml_sig_verify(const axis2_env_t *env,
oxs_sign_ctx_t *sign_ctx,
- axiom_node_t *signature_node);
+ axiom_node_t *signature_node,
+ axiom_node_t *scope_node);
+
+/*Process the ds:Reference node. Populate a signature part*/
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+oxs_xml_sig_process_ref_node(const axis2_env_t *env,
+ oxs_sign_part_t *sign_part,
+ axiom_node_t *ref_node,
+ axiom_node_t *scope_node);
+/*Process the ds:Signature node. Populate a signature context*/
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+oxs_xml_sig_process_signature_node(const axis2_env_t *env,
+ oxs_sign_ctx_t *sign_ctx,
+ axiom_node_t *signature_node,
+ axiom_node_t *scope_node);
/** @} */
#ifdef __cplusplus
}
Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rampart_constants.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rampart_constants.h?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rampart_constants.h (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rampart_constants.h Wed Feb 28 21:58:03 2007
@@ -46,7 +46,8 @@
#define RAMPART_SECURITY_TIMESTAMP "Timestamp"
#define RAMPART_SECURITY_TIMESTAMP_CREATED "Created"
#define RAMPART_SECURITY_TIMESTAMP_EXPIRES "Expires"
-
+#define RAMPART_RAMPART "rampart"
+
/*Rampart URIs*/
#define RAMPART_WSSE "wsse"
#define RAMPART_WSSE_XMLNS "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
@@ -96,8 +97,15 @@
#define RAMPART_INFLOW_SECURITY_POLICY "InflowSecurityPolicy"
#define RAMPART_OUTFLOW_SECURITY_POLICY "OutflowSecurityPolicy"
+#define INFLOW_RAMPART_CONTEXT "InflowRampartContext"
+#define OUTFLOW_RAMPART_CONTEXT "OutflowRampartContext"
+/*
#define RAMPART_PASSWORD_TEXT "passwordText"
#define RAMPART_PASSWORD_DIGEST "passwordDigest"
+*/
+#define RAMPART_PASSWORD_TEXT "plainText"
+#define RAMPART_PASSWORD_DIGEST "Digest"
+
#define RAMPART_ACTION "action"
/*These are the parameters of actions in the axis2.xml file*/
#define RAMPART_ACTION_ITEMS "items"
@@ -169,6 +177,7 @@
#define RAMPART_STR_EXTERNAL_URI OXS_STR_EXTERNAL_URI
#define RAMPART_STR_ENCRYPTED_KEY OXS_STR_ENCRYPTED_KEY
+#define AXIS2_PEM 10
#ifdef __cplusplus
}
Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rampart_context.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rampart_context.h?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rampart_context.h (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rampart_context.h Wed Feb 28 21:58:03 2007
@@ -30,6 +30,7 @@
#include <rampart_constants.h>
#include <rampart_callback.h>
#include <rampart_authn_provider.h>
+#include <axis2_key_type.h>
#ifdef __cplusplus
extern "C"
@@ -37,9 +38,9 @@
#endif
typedef axis2_char_t *(AXIS2_CALL*
- pfunc)(const axis2_env_t *env,
+ password_callback_fn)(const axis2_env_t *env,
const axis2_char_t *username,
- void *param);
+ void *ctx);
typedef rampart_authn_provider_status_t (AXIS2_CALL*
auth_password_func)(const axis2_env_t* env,
@@ -62,6 +63,130 @@
rampart_context_free(rampart_context_t *rampart_context,
const axis2_env_t *env);
+
+ /*Following functions are the interface between rampart and PHP
+ *extension */
+
+
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ rampart_context_set_policy_node(rampart_context_t *rampart_context,
+ const axis2_env_t *env,
+ axiom_node_t *policy_node);
+
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ rampart_context_set_prv_key(rampart_context_t *rampart_context,
+ const axis2_env_t *env,
+ void *prv_key);
+
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ rampart_context_set_prv_key_type(rampart_context_t *rampart_context,
+ const axis2_env_t *env,
+ axis2_key_type_t type);
+
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ rampart_context_set_pub_key(rampart_context_t *rampart_context,
+ const axis2_env_t *env,
+ void *pub_key);
+
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ rampart_context_set_pub_key_type(rampart_context_t *rampart_context,
+ const axis2_env_t *env,
+ axis2_key_type_t type);
+
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ rampart_context_set_user(rampart_context_t *rampart_context,
+ const axis2_env_t *env,
+ axis2_char_t *user);
+
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ rampart_context_set_password(rampart_context_t *rampart_context,
+ const axis2_env_t *env,
+ axis2_char_t *password);
+
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ rampart_context_set_prv_key_password(rampart_context_t *rampart_context,
+ const axis2_env_t *env,
+ axis2_char_t *prv_key_password);
+
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ rampart_context_set_pwcb_function(rampart_context_t *rampart_context,
+ const axis2_env_t *env,
+ password_callback_fn pwcb_function,
+ void *ctx);
+
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ rampart_context_set_password_type(rampart_context_t *rampart_context,
+ const axis2_env_t *env,
+ axis2_char_t *password_type);
+
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ rampart_context_set_ttl(rampart_context_t *rampart_context,
+ const axis2_env_t *env,
+ int ttl);
+
+ /*End of the PHP extension-rampart interface*/
+
+ /*Getters of the above set functions*/
+
+ AXIS2_EXTERN axiom_node_t *AXIS2_CALL
+ rampart_context_get_policy_node(
+ rampart_context_t *rampart_context,
+ const axis2_env_t *env);
+
+ AXIS2_EXTERN void *AXIS2_CALL
+ rampart_context_get_prv_key(
+ rampart_context_t *rampart_context,
+ const axis2_env_t *env);
+
+ AXIS2_EXTERN axis2_key_type_t AXIS2_CALL
+ rampart_context_get_prv_key_type(
+ rampart_context_t *rampart_context,
+ const axis2_env_t *env);
+
+ AXIS2_EXTERN void *AXIS2_CALL
+ rampart_context_get_pub_key(
+ rampart_context_t *rampart_context,
+ const axis2_env_t *env);
+
+ AXIS2_EXTERN axis2_key_type_t AXIS2_CALL
+ rampart_context_get_pub_key_type(
+ rampart_context_t *rampart_context,
+ const axis2_env_t *env);
+
+ AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+ rampart_context_get_user(
+ rampart_context_t *rampart_context,
+ const axis2_env_t *env);
+
+ AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+ rampart_context_get_password(
+ rampart_context_t *rampart_context,
+ const axis2_env_t *env);
+
+ AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+ rampart_context_get_prv_key_password(
+ rampart_context_t *rampart_context,
+ const axis2_env_t *env);
+
+ AXIS2_EXTERN password_callback_fn AXIS2_CALL
+ rampart_context_get_pwcb_function(
+ rampart_context_t *rampart_context,
+ const axis2_env_t *env);
+
+ AXIS2_EXTERN int AXIS2_CALL
+ rampart_context_get_ttl(
+ rampart_context_t *rampart_context,
+ const axis2_env_t *env);
+
+ AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+ rampart_context_get_password_type(
+ rampart_context_t *rampart_context,
+ const axis2_env_t *env);
+
+
+ /*End of Getters */
+
+/*Rampart specific functions */
AXIS2_EXTERN rp_secpolicy_t *AXIS2_CALL
rampart_context_get_secpolicy(
rampart_context_t *rampart_context,
@@ -82,16 +207,6 @@
const axis2_env_t *env,
rampart_callback_t *password_callback_module);
- AXIS2_EXTERN pfunc AXIS2_CALL
- rampart_context_get_password_function(
- rampart_context_t *rampart_context,
- const axis2_env_t *env);
-
- AXIS2_EXTERN axis2_status_t AXIS2_CALL
- rampart_context_set_password_function(rampart_context_t *rampart_context,
- const axis2_env_t *env,
- pfunc password_func);
-
AXIS2_EXTERN auth_password_func AXIS2_CALL
rampart_context_get_auth_password_function(
rampart_context_t *rampart_context,
@@ -138,11 +253,6 @@
const axis2_env_t *env);
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
- rampart_context_get_user(
- rampart_context_t *rampart_context,
- const axis2_env_t *env);
-
- AXIS2_EXTERN axis2_char_t *AXIS2_CALL
rampart_context_get_password_callback_class(
rampart_context_t *rampart_context,
const axis2_env_t *env);
@@ -153,11 +263,6 @@
const axis2_env_t *env);
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
- rampart_context_get_password_type(
- rampart_context_t *rampart_context,
- const axis2_env_t *env);
-
- AXIS2_EXTERN axis2_bool_t AXIS2_CALL
rampart_context_is_encrypt_before_sign(
rampart_context_t *rampart_context,
const axis2_env_t *env);
@@ -192,11 +297,6 @@
const axis2_env_t *env);
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
- rampart_context_get_encryption_prop_file(
- rampart_context_t *rampart_context,
- const axis2_env_t *env);
-
- AXIS2_EXTERN axis2_char_t *AXIS2_CALL
rampart_context_get_encryption_user(
rampart_context_t *rampart_context,
const axis2_env_t *env);
@@ -213,16 +313,36 @@
rampart_context_t *rampart_context,
const axis2_env_t *env);
- AXIS2_EXTERN axis2_char_t *AXIS2_CALL
- rampart_context_get_decryption_prop_file(
+ AXIS2_EXTERN axis2_bool_t AXIS2_CALL
+ rampart_context_check_whether_to_encrypt(
rampart_context_t *rampart_context,
const axis2_env_t *env);
- AXIS2_EXTERN axis2_bool_t AXIS2_CALL
- rampart_context_check_whether_to_encrypt(
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ rampart_context_set_user_from_file(
rampart_context_t *rampart_context,
const axis2_env_t *env);
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ rampart_context_set_password_type_from_file(
+ rampart_context_t *rampart_context,
+ const axis2_env_t *env);
+
+ AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+ rampart_context_get_public_key_file(
+ rampart_context_t *rampart_context,
+ const axis2_env_t *env);
+
+ AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+ rampart_context_get_private_key_file(
+ rampart_context_t *rampart_context,
+ const axis2_env_t *env);
+
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ rampart_context_set_ttl_from_file(
+ rampart_context_t *rampart_context,
+ const axis2_env_t *env);
+
#ifdef __cplusplus
}
Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rampart_engine.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rampart_engine.h?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rampart_engine.h (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rampart_engine.h Wed Feb 28 21:58:03 2007
@@ -43,8 +43,12 @@
AXIS2_EXTERN rampart_context_t* AXIS2_CALL
rampart_engine_init(const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx,
- axis2_char_t *x_flow_policy);
-
+ axis2_bool_t is_inflow);
+
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ rampart_engine_shutdown(const axis2_env_t *env,
+ rampart_context_t *rampart_context);
+
#ifdef __cplusplus
}
Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rampart_handler_util.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rampart_handler_util.h?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rampart_handler_util.h (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rampart_handler_util.h Wed Feb 28 21:58:03 2007
@@ -153,11 +153,15 @@
axis2_msg_ctx_t *msg_ctx,
axiom_node_t *sec_node);
-
-AXIS2_EXTERN axis2_char_t *AXIS2_CALL
-rampart_get_policy_location(const axis2_env_t *env,
+AXIS2_EXTERN void *AXIS2_CALL
+rampart_get_rampart_configuration(const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx,
axis2_char_t *param_name);
+
+AXIS2_EXTERN axis2_bool_t AXIS2_CALL
+rampart_is_rampart_engaged(const axis2_env_t *env,
+ axis2_msg_ctx_t *msg_ctx);
+
/** @} */
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org