(1) Changing the locations of sample binary and sample libraries
(2) Splitting mod_rampart.dll into rampart.dll and mod_rampart.dll
(3) Changing the locations of axis2.xml files
Above modifications were done only to windows build.
diff --git a/build/win32/deploy_rampart.bat b/build/win32/deploy_rampart.bat
index c6656d3..87a2b7c 100644
--- a/build/win32/deploy_rampart.bat
+++ b/build/win32/deploy_rampart.bat
@@ -6,58 +6,43 @@
md %AXIS2C_HOME%\modules\rampart\
copy modules\rampart\mod_rampart.dll %AXIS2C_HOME%\modules\rampart\
copy modules\rampart\module.xml %AXIS2C_HOME%\modules\rampart\
-copy modules\rampart\mod_rampart.* %AXIS2C_HOME%\lib\
+
+copy lib\rampart.* %AXIS2C_HOME%\lib\
md %AXIS2C_HOME%\modules\rahas\
copy modules\rahas\mod_rahas.dll %AXIS2C_HOME%\modules\rahas\
copy modules\rahas\module.xml %AXIS2C_HOME%\modules\rahas\module.xml
-copy modules\rahas\mod_rahas.* %AXIS2C_HOME%\lib\
md %AXIS2C_HOME%\services\sec_echo\
-copy bin\samples\services\sec_echo\sec_echo.dll %AXIS2C_HOME%\services\sec_echo\
-copy bin\samples\services\sec_echo\services.xml %AXIS2C_HOME%\services\sec_echo\
+copy services\sec_echo\sec_echo.dll %AXIS2C_HOME%\services\sec_echo\
+copy services\sec_echo\services.xml %AXIS2C_HOME%\services\sec_echo\
md %AXIS2C_HOME%\services\secconv_echo\
-copy bin\samples\services\secconv_echo\secconv_echo.dll %AXIS2C_HOME%\services\secconv_echo\
-copy bin\samples\services\secconv_echo\services.xml %AXIS2C_HOME%\services\secconv_echo\
+copy services\secconv_echo\secconv_echo.dll %AXIS2C_HOME%\services\secconv_echo\
+copy services\secconv_echo\services.xml %AXIS2C_HOME%\services\secconv_echo\
md %AXIS2C_HOME%\services\saml_sts\
-copy bin\samples\services\saml_sts\saml_sts.dll %AXIS2C_HOME%\services\saml_sts\
-copy bin\samples\services\saml_sts\services.xml %AXIS2C_HOME%\services\saml_sts\
+copy services\saml_sts\saml_sts.dll %AXIS2C_HOME%\services\saml_sts\
+copy services\saml_sts\services.xml %AXIS2C_HOME%\services\saml_sts\
-md %AXIS2C_HOME%\bin\samples\rampart\
-md %AXIS2C_HOME%\bin\samples\rampart\authn_provider\
-copy bin\samples\authn_provider\authn.dll %AXIS2C_HOME%\bin\samples\rampart\authn_provider\
+md %AXIS2C_HOME%\samples\lib\
+copy samples\lib\authn.dll %AXIS2C_HOME%\samples\lib\
+copy samples\lib\rdflatfile.dll %AXIS2C_HOME%\samples\lib\
+copy samples\lib\sctprovider.dll %AXIS2C_HOME%\samples\lib\
+copy samples\lib\sctprovider_hashdb.dll %AXIS2C_HOME%\samples\lib\
+copy samples\lib\pwcb.dll %AXIS2C_HOME%\samples\lib\
+copy samples\lib\cred_provider.dll %AXIS2C_HOME%\samples\lib\
-md %AXIS2C_HOME%\bin\samples\rampart\replay_detector\
-copy bin\samples\replay_detector\rdflatfile.dll %AXIS2C_HOME%\bin\samples\rampart\replay_detector\
+md %AXIS2C_HOME%\samples\data\
+copy samples\data\passwords.txt %AXIS2C_HOME%\samples\data\
+xcopy samples\data\keys %AXIS2C_HOME%\samples\data\keys\ /E /I /Y /S
-md %AXIS2C_HOME%\bin\samples\rampart\sct_provider\
-copy bin\samples\sct_provider\sctprovider.dll %AXIS2C_HOME%\bin\samples\rampart\sct_provider\
-copy bin\samples\sct_provider\sctprovider_hashdb.dll %AXIS2C_HOME%\bin\samples\rampart\sct_provider\
+md %AXIS2C_HOME%\samples\bin\
+copy samples\bin\sec_echo.exe %AXIS2C_HOME%\samples\bin\
+copy samples\bin\saml_echo.exe %AXIS2C_HOME%\samples\bin\
+copy samples\bin\issued_token_echo.exe %AXIS2C_HOME%\samples\bin\
-md %AXIS2C_HOME%\bin\samples\rampart\data\
-copy bin\samples\data\passwords.txt %AXIS2C_HOME%\bin\samples\rampart\data\
-
-md %AXIS2C_HOME%\bin\samples\rampart\client\
-md %AXIS2C_HOME%\bin\samples\rampart\client\sec_echo\
-copy bin\samples\client\sec_echo\echo.exe %AXIS2C_HOME%\bin\samples\rampart\client\sec_echo\
-
-md %AXIS2C_HOME%\bin\samples\rampart\client\saml_echo\
-copy bin\samples\client\saml_echo\echo.exe %AXIS2C_HOME%\bin\samples\rampart\client\saml_echo\
-
-md %AXIS2C_HOME%\bin\samples\rampart\client\issued_token\
-copy bin\samples\client\issued_token\echo.exe %AXIS2C_HOME%\bin\samples\rampart\client\issued_token\
-
-md %AXIS2C_HOME%\bin\samples\rampart\callback
-copy bin\samples\callback\pwcb.dll %AXIS2C_HOME%\bin\samples\rampart\callback\
-
-md %AXIS2C_HOME%\bin\samples\rampart\credential_provider
-copy bin\samples\credential_provider\cred_provider.dll %AXIS2C_HOME%\bin\samples\rampart\credential_provider\
-
-xcopy bin\samples\keys %AXIS2C_HOME%\bin\samples\rampart\keys\ /E /I /Y /S
-
-copy bin\samples\services\sec_echo\server_axis2.xml %AXIS2C_HOME%\axis2.xml
+copy samples\data\server_axis2.xml %AXIS2C_HOME%\axis2.xml
echo -------------------------------------------------------------------------
echo Rampart deployed
diff --git a/build/win32/make_bin_dist.bat b/build/win32/make_bin_dist.bat
index 48225be..4779f35 100644
--- a/build/win32/make_bin_dist.bat
+++ b/build/win32/make_bin_dist.bat
@@ -1,24 +1,5 @@
-set BINDIST=..\rampartc-bin-1.2.0-win32
+set BINDIST=..\rampartc-bin-1.3.0-win32
if exist %BINDIST% rd /s /q %BINDIST%
mkdir %BINDIST%
-mkdir %BINDIST%\bin
-mkdir %BINDIST%\bin\samples
-mkdir %BINDIST%\modules
-mkdir %BINDIST%\include
-mkdir %BINDIST%\include\rampart-1.2.0
-mkdir %BINDIST%\docs
+xcopy /E /I /Y ..\rampartc-1.3.0\* %BINDIST%\
-
-xcopy /E /I /Y .\bin\samples\*.* %BINDIST%\bin\samples\
-xcopy /E /I /Y .\modules\*.* %BINDIST%\modules\
-xcopy /E /I /Y .\include\*.* %BINDIST%\include\rampart-1.2.0\
-xcopy /E /I /Y .\docs\*.* %BINDIST%\docs\
-
-xcopy README %BINDIST%
-xcopy INSTALL %BINDIST%
-xcopy AUTHORS %BINDIST%
-xcopy COPYING %BINDIST%
-xcopy LICENSE %BINDIST%
-xcopy NEWS %BINDIST%
-xcopy NOTICE %BINDIST%
-xcopy deploy_rampart.bat %BINDIST%
diff --git a/build/win32/makefile b/build/win32/makefile
index 85aa82a..15e64d8 100644
--- a/build/win32/makefile
+++ b/build/win32/makefile
@@ -8,23 +8,29 @@
RAMPART_INTDIR = .\int.msvc
MAJOR_VER = 1
-MINOR_VER = 2
+MINOR_VER = 3
PATCH_VER = 0
RAMPART_DIST_NAME = .\..\rampartc-$(MAJOR_VER).$(MINOR_VER).$(PATCH_VER)
-#RAMPART_DISTDIR = .\..\rampartc
RAMPART_DISTDIR = $(RAMPART_DIST_NAME)
+RAMPART_SAMPLE_BIN_DIR = $(RAMPART_DISTDIR)\samples\bin
+RAMPART_SAMPLE_LIB_DIR = $(RAMPART_DISTDIR)\samples\lib
+RAMPART_SAMPLE_SERVICE_DIR = $(RAMPART_DISTDIR)\services
+RAMPART_SAMPLE_DATA_DIR = $(RAMPART_DISTDIR)\samples\data
+RAMPART_SAMPLE_POLICY_DIR = $(RAMPART_DISTDIR)\samples\secpolicy
#rampart module
OMXMLSEC_SRC = $(RAMPART_SOURCE_DIR)\src\omxmlsec\*.c \
$(RAMPART_SOURCE_DIR)\src\omxmlsec\tokens\*.c \
$(RAMPART_SOURCE_DIR)\src\omxmlsec\c14n\*.c \
- $(RAMPART_SOURCE_DIR)\src\omxmlsec\openssl\*.c $(RAMPART_SOURCE_DIR)\src\omxmlsec\saml\*.c
+ $(RAMPART_SOURCE_DIR)\src\omxmlsec\openssl\*.c \
+ $(RAMPART_SOURCE_DIR)\src\omxmlsec\saml\*.c
MOD_RAMPART_SRC = $(RAMPART_SOURCE_DIR)\src\core\*.c \
- $(RAMPART_SOURCE_DIR)\src\handlers\*.c \
- $(RAMPART_SOURCE_DIR)\src\util\*.c
+ $(RAMPART_SOURCE_DIR)\src\handlers\*.c
+
+RAMPART_SRC = $(RAMPART_SOURCE_DIR)\src\util\*.c
SECCONV_SRC = $(RAMPART_SOURCE_DIR)\src\secconv\*.c
@@ -92,24 +98,19 @@
CFLAGS = $(CFLAGS) /D "_WINSOCKAPI_"
distdir:
- if not exist $(RAMPART_DISTDIR) mkdir $(RAMPART_DISTDIR)
- if not exist $(RAMPART_DISTDIR)\bin\samples\callback mkdir $(RAMPART_DISTDIR)\bin\samples\callback
- if not exist $(RAMPART_DISTDIR)\bin\samples\authn_provider mkdir $(RAMPART_DISTDIR)\bin\samples\authn_provider
- if not exist $(RAMPART_DISTDIR)\bin\samples\replay_detector mkdir $(RAMPART_DISTDIR)\bin\samples\replay_detector
- if not exist $(RAMPART_DISTDIR)\bin\samples\sct_provider mkdir $(RAMPART_DISTDIR)\bin\samples\sct_provider
- if not exist $(RAMPART_DISTDIR)\bin\samples\services\sec_echo mkdir $(RAMPART_DISTDIR)\bin\samples\services\sec_echo
- if not exist $(RAMPART_DISTDIR)\bin\samples\services\secconv_echo mkdir $(RAMPART_DISTDIR)\bin\samples\services\secconv_echo
- if not exist $(RAMPART_DISTDIR)\bin\samples\services\saml_sts mkdir $(RAMPART_DISTDIR)\bin\samples\services\saml_sts
- if not exist $(RAMPART_DISTDIR)\bin\samples\client\sec_echo mkdir $(RAMPART_DISTDIR)\bin\samples\client\sec_echo
- if not exist $(RAMPART_DISTDIR)\bin\samples\client\saml_echo mkdir $(RAMPART_DISTDIR)\bin\samples\client\saml_echo
- if not exist $(RAMPART_DISTDIR)\bin\samples\client\issued_token mkdir $(RAMPART_DISTDIR)\bin\samples\client\issued_token
- if not exist $(RAMPART_DISTDIR)\bin\samples\client\saml_protect mkdir $(RAMPART_DISTDIR)\bin\samples\client\saml_protect
- if not exist $(RAMPART_DISTDIR)\bin\samples\client\sec_echo\data mkdir $(RAMPART_DISTDIR)\bin\samples\client\sec_echo\data
- if not exist $(RAMPART_DISTDIR)\bin\samples\credential_provider mkdir $(RAMPART_DISTDIR)\bin\samples\credential_provider
- if not exist $(RAMPART_DISTDIR)\bin\samples\data mkdir $(RAMPART_DISTDIR)\bin\samples\data
- if not exist $(RAMPART_DISTDIR)\modules\rampart mkdir $(RAMPART_DISTDIR)\modules\rampart
- if not exist $(RAMPART_DISTDIR)\modules\rahas mkdir $(RAMPART_DISTDIR)\modules\rahas
- if not exist $(RAMPART_DISTDIR)\include mkdir $(RAMPART_DISTDIR)\include
+ if not exist $(RAMPART_DISTDIR) mkdir $(RAMPART_DISTDIR)
+ if not exist $(RAMPART_SAMPLE_BIN_DIR) mkdir $(RAMPART_SAMPLE_BIN_DIR)
+ if not exist $(RAMPART_SAMPLE_LIB_DIR) mkdir $(RAMPART_SAMPLE_LIB_DIR)
+ if not exist $(RAMPART_SAMPLE_DATA_DIR) mkdir $(RAMPART_SAMPLE_DATA_DIR)
+ if not exist $(RAMPART_SAMPLE_POLICY_DIR) mkdir $(RAMPART_SAMPLE_POLICY_DIR)
+ if not exist $(RAMPART_SAMPLE_SERVICE_DIR) mkdir $(RAMPART_SAMPLE_SERVICE_DIR)
+ if not exist $(RAMPART_SAMPLE_SERVICE_DIR)\sec_echo mkdir $(RAMPART_SAMPLE_SERVICE_DIR)\sec_echo
+ if not exist $(RAMPART_SAMPLE_SERVICE_DIR)\secconv_echo mkdir $(RAMPART_SAMPLE_SERVICE_DIR)\secconv_echo
+ if not exist $(RAMPART_SAMPLE_SERVICE_DIR)\saml_sts mkdir $(RAMPART_SAMPLE_SERVICE_DIR)\saml_sts
+ if not exist $(RAMPART_DISTDIR)\modules\rampart mkdir $(RAMPART_DISTDIR)\modules\rampart
+ if not exist $(RAMPART_DISTDIR)\modules\rahas mkdir $(RAMPART_DISTDIR)\modules\rahas
+ if not exist $(RAMPART_DISTDIR)\include mkdir $(RAMPART_DISTDIR)\include
+ if not exist $(RAMPART_DISTDIR)\lib mkdir $(RAMPART_DISTDIR)\lib
clean:
if exist $(RAMPART_DISTDIR) rmdir /S /Q $(RAMPART_DISTDIR)
@@ -119,6 +120,7 @@
if not exist $(RAMPART_INTDIR) mkdir $(RAMPART_INTDIR)
if not exist $(RAMPART_INTDIR)\rahas mkdir $(RAMPART_INTDIR)\rahas
+ if not exist $(RAMPART_INTDIR)\rampart mkdir $(RAMPART_INTDIR)\rampart
if not exist $(RAMPART_INTDIR)\samples\callback\pwcb mkdir $(RAMPART_INTDIR)\samples\callback\pwcb
if not exist $(RAMPART_INTDIR)\samples\authn_provider mkdir $(RAMPART_INTDIR)\samples\authn_provider
if not exist $(RAMPART_INTDIR)\samples\replay_detector mkdir $(RAMPART_INTDIR)\samples\replay_detector
@@ -133,12 +135,22 @@
if not exist $(RAMPART_INTDIR)\samples\credential_provider\ mkdir $(RAMPART_INTDIR)\samples\credential_provider
mod_rampart_sample_data:
- copy $(RAMPART_SOURCE_DIR)\samples\data\passwords.txt $(RAMPART_DISTDIR)\bin\samples\data
+ copy $(RAMPART_SOURCE_DIR)\samples\data\passwords.txt $(RAMPART_SAMPLE_DATA_DIR)
-$(RAMPART_DISTDIR)\modules\rampart\mod_rampart.dll : $(MOD_RAMPART_SRC) $(OMXMLSEC_SRC) $(SECCONV_SRC) $(TRUST_SRC)
- $(CC) $(CFLAGS) $(MOD_RAMPART_INCLUDE_PATH) $(MOD_RAMPART_SRC) $(OMXMLSEC_SRC) $(SECCONV_SRC) $(TRUST_SRC) \
+$(RAMPART_DISTDIR)\lib\rampart.dll : $(RAMPART_SRC) $(OMXMLSEC_SRC) $(SECCONV_SRC) $(TRUST_SRC)
+ $(CC) $(CFLAGS) $(MOD_RAMPART_INCLUDE_PATH) $(RAMPART_SRC) $(OMXMLSEC_SRC) $(SECCONV_SRC) $(TRUST_SRC) \
$(APPLINK_FILE) /Fo$(RAMPART_INTDIR)\ /c
$(LD) $(LDFLAGS) $(RAMPART_INTDIR)\*.obj $(LIBS) axutil.lib axiom.lib \
+ axis2_parser.lib axis2_engine.lib neethi.lib /DLL /OUT:$(RAMPART_DISTDIR)\lib\rampart.dll \
+ /IMPLIB:$(RAMPART_DISTDIR)\lib\rampart.lib
+ -@$(_VC_MANIFEST_EMBED_DLL)
+
+rampart : $(RAMPART_DISTDIR)\lib\rampart.dll
+
+$(RAMPART_DISTDIR)\modules\rampart\mod_rampart.dll : $(MOD_RAMPART_SRC)
+ $(CC) $(CFLAGS) $(MOD_RAMPART_INCLUDE_PATH) $(MOD_RAMPART_SRC) \
+ $(APPLINK_FILE) /Fo$(RAMPART_INTDIR)\rampart\ /c
+ $(LD) /LIBPATH:$(RAMPART_DISTDIR)\lib $(LDFLAGS) $(RAMPART_INTDIR)\rampart\*.obj $(LIBS) axutil.lib axiom.lib rampart.lib\
axis2_parser.lib axis2_engine.lib neethi.lib /DLL /OUT:$(RAMPART_DISTDIR)\modules\rampart\mod_rampart.dll \
/IMPLIB:$(RAMPART_DISTDIR)\modules\rampart\mod_rampart.lib
-@$(_VC_MANIFEST_EMBED_DLL)
@@ -148,166 +160,157 @@
$(RAMPART_DISTDIR)\modules\rahas\mod_rahas.dll : $(RAHAS_SRC)
$(CC) $(CFLAGS) $(MOD_RAMPART_INCLUDE_PATH) $(RAHAS_SRC) $(APPLINK_FILE) /Fo$(RAMPART_INTDIR)\rahas\ /c
- $(LD) /LIBPATH:$(RAMPART_DISTDIR)\modules\rampart $(LDFLAGS) $(RAMPART_INTDIR)\rahas\*.obj $(LIBS) axutil.lib axiom.lib \
- axis2_parser.lib axis2_engine.lib neethi.lib mod_rampart.lib \
+ $(LD) /LIBPATH:$(RAMPART_DISTDIR)\lib $(LDFLAGS) $(RAMPART_INTDIR)\rahas\*.obj $(LIBS) axutil.lib axiom.lib \
+ axis2_parser.lib axis2_engine.lib neethi.lib rampart.lib \
/DLL /OUT:$(RAMPART_DISTDIR)\modules\rahas\mod_rahas.dll /IMPLIB:$(RAMPART_DISTDIR)\modules\rahas\mod_rahas.lib
-@$(_VC_MANIFEST_EMBED_DLL)
copy $(RAMPART_SOURCE_DIR)\src\data\rahas_module.xml $(RAMPART_DISTDIR)\modules\rahas\module.xml
mod_rahas : $(RAMPART_DISTDIR)\modules\rahas\mod_rahas.dll
-$(RAMPART_DISTDIR)\bin\samples\callback\pwcb.dll : $(RAMPART_SOURCE_DIR)\samples\callback\pwcb.c
+$(RAMPART_SAMPLE_LIB_DIR)\pwcb.dll : $(RAMPART_SOURCE_DIR)\samples\callback\pwcb.c
$(CC) $(CFLAGS) $(MOD_RAMPART_INCLUDE_PATH) $(RAMPART_SOURCE_DIR)\samples\callback\pwcb.c \
/Fo$(RAMPART_INTDIR)\samples\callback\ /c
$(LD) $(LDFLAGS) $(LIBS) axutil.lib $(RAMPART_INTDIR)\samples\callback\*.obj \
- /DLL /OUT:$(RAMPART_DISTDIR)\bin\samples\callback\pwcb.dll /IMPLIB:$(RAMPART_DISTDIR)\bin\samples\callback\pwcb.lib
+ /DLL /OUT:$(RAMPART_SAMPLE_LIB_DIR)\pwcb.dll /IMPLIB:$(RAMPART_SAMPLE_LIB_DIR)\pwcb.lib
-@$(_VC_MANIFEST_EMBED_DLL)
-mod_rampart_pwcb: $(RAMPART_DISTDIR)\bin\samples\callback\pwcb.dll
+mod_rampart_pwcb: $(RAMPART_SAMPLE_LIB_DIR)\pwcb.dll
-$(RAMPART_DISTDIR)\bin\samples\authn_provider\authn.dll : $(RAMPART_SOURCE_DIR)\samples\authn_provider\authn_provider.c
+$(RAMPART_SAMPLE_LIB_DIR)\authn.dll : $(RAMPART_SOURCE_DIR)\samples\authn_provider\authn_provider.c
$(CC) $(CFLAGS) $(MOD_RAMPART_INCLUDE_PATH) $(RAMPART_SOURCE_DIR)\samples\authn_provider\authn_provider.c \
/Fo$(RAMPART_INTDIR)\samples\authn_provider\ /c
- $(LD) $(LDFLAGS) $(RAMPART_INTDIR)\samples\authn_provider\*.obj mod_rampart.lib \
- axutil.lib /LIBPATH:$(RAMPART_DISTDIR)\modules\rampart /DLL \
- /OUT:$(RAMPART_DISTDIR)\bin\samples\authn_provider\authn.dll
+ $(LD) $(LDFLAGS) $(RAMPART_INTDIR)\samples\authn_provider\*.obj rampart.lib \
+ axutil.lib /LIBPATH:$(RAMPART_DISTDIR)\lib /DLL \
+ /OUT:$(RAMPART_SAMPLE_LIB_DIR)\authn.dll
-@$(_VC_MANIFEST_EMBED_DLL)
-mod_rampart_authn : $(RAMPART_DISTDIR)\bin\samples\authn_provider\authn.dll
+mod_rampart_authn : $(RAMPART_SAMPLE_LIB_DIR)\authn.dll
-$(RAMPART_DISTDIR)\bin\samples\replay_detector\rdflatfile.dll : $(RAMPART_SOURCE_DIR)\samples\replay_detector\*.c
+$(RAMPART_SAMPLE_LIB_DIR)\rdflatfile.dll : $(RAMPART_SOURCE_DIR)\samples\replay_detector\*.c
$(CC) $(CFLAGS) $(MOD_RAMPART_INCLUDE_PATH) $(RAMPART_SOURCE_DIR)\samples\replay_detector\*.c \
/Fo$(RAMPART_INTDIR)\samples\replay_detector\ /c
- $(LD) $(LDFLAGS) $(RAMPART_INTDIR)\samples\replay_detector\*.obj mod_rampart.lib \
- axutil.lib axis2_engine.lib /LIBPATH:$(RAMPART_DISTDIR)\modules\rampart /DLL \
- /OUT:$(RAMPART_DISTDIR)\bin\samples\replay_detector\rdflatfile.dll
+ $(LD) $(LDFLAGS) $(RAMPART_INTDIR)\samples\replay_detector\*.obj rampart.lib \
+ axutil.lib axis2_engine.lib /LIBPATH:$(RAMPART_DISTDIR)\lib /DLL \
+ /OUT:$(RAMPART_SAMPLE_LIB_DIR)\rdflatfile.dll
-@$(_VC_MANIFEST_EMBED_DLL)
-mod_rampart_rd: $(RAMPART_DISTDIR)\bin\samples\replay_detector\rdflatfile.dll
+mod_rampart_rd: $(RAMPART_SAMPLE_LIB_DIR)\rdflatfile.dll
-$(RAMPART_DISTDIR)\bin\samples\sct_provider\sctprovider.dll : $(RAMPART_SOURCE_DIR)\samples\sct_provider\sct_provider_stored_key.c
+$(RAMPART_SAMPLE_LIB_DIR)\sctprovider.dll : $(RAMPART_SOURCE_DIR)\samples\sct_provider\sct_provider_stored_key.c
$(CC) $(CFLAGS) $(MOD_RAMPART_INCLUDE_PATH) $(RAMPART_SOURCE_DIR)\samples\sct_provider\sct_provider_stored_key.c \
/Fo$(RAMPART_INTDIR)\samples\sct_provider\ /c
- $(LD) $(LDFLAGS) $(RAMPART_INTDIR)\samples\sct_provider\sct_provider_stored_key.obj mod_rampart.lib \
- axutil.lib axis2_engine.lib neethi.lib /LIBPATH:$(RAMPART_DISTDIR)\modules\rampart /DLL \
- /OUT:$(RAMPART_DISTDIR)\bin\samples\sct_provider\sctprovider.dll
+ $(LD) $(LDFLAGS) $(RAMPART_INTDIR)\samples\sct_provider\sct_provider_stored_key.obj rampart.lib \
+ axutil.lib axis2_engine.lib neethi.lib /LIBPATH:$(RAMPART_DISTDIR)\lib /DLL \
+ /OUT:$(RAMPART_SAMPLE_LIB_DIR)\sctprovider.dll
-@$(_VC_MANIFEST_EMBED_DLL)
-mod_rampart_sct_provider: $(RAMPART_DISTDIR)\bin\samples\sct_provider\sctprovider.dll
+mod_rampart_sct_provider: $(RAMPART_SAMPLE_LIB_DIR)\sctprovider.dll
-$(RAMPART_DISTDIR)\bin\samples\sct_provider\sctprovider_hashdb.dll : $(RAMPART_SOURCE_DIR)\samples\sct_provider\sct_provider_hash_map.c
+$(RAMPART_SAMPLE_LIB_DIR)\sctprovider_hashdb.dll : $(RAMPART_SOURCE_DIR)\samples\sct_provider\sct_provider_hash_map.c
$(CC) $(CFLAGS) $(MOD_RAMPART_INCLUDE_PATH) $(RAMPART_SOURCE_DIR)\samples\sct_provider\sct_provider_hash_map.c \
/Fo$(RAMPART_INTDIR)\samples\sct_provider\ /c
- $(LD) $(LDFLAGS) $(RAMPART_INTDIR)\samples\sct_provider\sct_provider_hash_map.obj mod_rampart.lib \
- axutil.lib axis2_engine.lib neethi.lib /LIBPATH:$(RAMPART_DISTDIR)\modules\rampart /DLL \
- /OUT:$(RAMPART_DISTDIR)\bin\samples\sct_provider\sctprovider_hashdb.dll
+ $(LD) $(LDFLAGS) $(RAMPART_INTDIR)\samples\sct_provider\sct_provider_hash_map.obj rampart.lib \
+ axutil.lib axis2_engine.lib neethi.lib /LIBPATH:$(RAMPART_DISTDIR)\lib /DLL \
+ /OUT:$(RAMPART_SAMPLE_LIB_DIR)\sctprovider_hashdb.dll
-@$(_VC_MANIFEST_EMBED_DLL)
-mod_rampart_sct_provider_hashdb: $(RAMPART_DISTDIR)\bin\samples\sct_provider\sctprovider_hashdb.dll
+mod_rampart_sct_provider_hashdb: $(RAMPART_SAMPLE_LIB_DIR)\sctprovider_hashdb.dll
-$(RAMPART_DISTDIR)\bin\samples\services\sec_echo\sec_echo.dll : $(RAMPART_SOURCE_DIR)\samples\server\sec_echo\*.c
+$(RAMPART_SAMPLE_SERVICE_DIR)\sec_echo\sec_echo.dll : $(RAMPART_SOURCE_DIR)\samples\server\sec_echo\*.c
$(CC) $(CFLAGS) $(MOD_RAMPART_INCLUDE_PATH) /I$(RAMPART_SOURCE_DIR)\samples\server\sec_echo \
$(RAMPART_SOURCE_DIR)\samples\server\sec_echo\*.c $(APPLINK_FILE) /Fo$(RAMPART_INTDIR)\samples\services\sec_echo\ /c
$(LD) $(LDFLAGS) $(RAMPART_INTDIR)\samples\services\sec_echo\*.obj \
axutil.lib axiom.lib axis2_parser.lib $(LIBS) axis2_engine.lib \
axis2_http_receiver.lib axis2_http_sender.lib \
- mod_rampart.lib /LIBPATH:$(RAMPART_DISTDIR)\modules\rampart \
- /DLL /OUT:$(RAMPART_DISTDIR)\bin\samples\services\sec_echo\sec_echo.dll
+ rampart.lib /LIBPATH:$(RAMPART_DISTDIR)\lib \
+ /DLL /OUT:$(RAMPART_SAMPLE_SERVICE_DIR)\sec_echo\sec_echo.dll
-@$(_VC_MANIFEST_EMBED_DLL)
- copy $(RAMPART_SOURCE_DIR)\samples\server\sec_echo\services.xml $(RAMPART_DISTDIR)\bin\samples\services\sec_echo\
+ copy $(RAMPART_SOURCE_DIR)\samples\server\sec_echo\services.xml $(RAMPART_SAMPLE_SERVICE_DIR)\sec_echo\
- copy $(RAMPART_SOURCE_DIR)\samples\server\sec_echo\server_axis2.xml $(RAMPART_DISTDIR)\bin\samples\services\sec_echo\
-
-mod_rampart_services_sec_echo: $(RAMPART_DISTDIR)\bin\samples\services\sec_echo\sec_echo.dll
+mod_rampart_services_sec_echo: $(RAMPART_SAMPLE_SERVICE_DIR)\sec_echo\sec_echo.dll
-$(RAMPART_DISTDIR)\bin\samples\services\saml_sts\saml_sts.dll : $(RAMPART_SOURCE_DIR)\samples\server\saml_sts\*.c
+$(RAMPART_SAMPLE_SERVICE_DIR)\saml_sts\saml_sts.dll : $(RAMPART_SOURCE_DIR)\samples\server\saml_sts\*.c
$(CC) $(CFLAGS) $(MOD_RAMPART_INCLUDE_PATH) /I$(RAMPART_SOURCE_DIR)\samples\server\saml_sts \
$(RAMPART_SOURCE_DIR)\samples\server\saml_sts\*.c /Fo$(RAMPART_INTDIR)\samples\services\saml_sts\ /c
$(LD) $(LDFLAGS) $(RAMPART_INTDIR)\samples\services\saml_sts\*.obj \
- axutil.lib axiom.lib axis2_parser.lib $(LIBS) axis2_engine.lib /LIBPATH:$(RAMPART_DISTDIR)\modules\rampart\ \
- axis2_http_receiver.lib axis2_http_sender.lib mod_rampart.lib \
- /DLL /OUT:$(RAMPART_DISTDIR)\bin\samples\services\saml_sts\saml_sts.dll
+ axutil.lib axiom.lib axis2_parser.lib $(LIBS) axis2_engine.lib /LIBPATH:$(RAMPART_DISTDIR)\lib\ \
+ axis2_http_receiver.lib axis2_http_sender.lib rampart.lib \
+ /DLL /OUT:$(RAMPART_SAMPLE_SERVICE_DIR)\saml_sts\saml_sts.dll
-@$(_VC_MANIFEST_EMBED_DLL)
- copy $(RAMPART_SOURCE_DIR)\samples\server\saml_sts\services.xml $(RAMPART_DISTDIR)\bin\samples\services\saml_sts\
+ copy $(RAMPART_SOURCE_DIR)\samples\server\saml_sts\services.xml $(RAMPART_SAMPLE_SERVICE_DIR)\saml_sts\
- copy $(RAMPART_SOURCE_DIR)\samples\server\sec_echo\server_axis2.xml $(RAMPART_DISTDIR)\bin\samples\services\saml_sts\
+mod_rampart_services_saml_sts: $(RAMPART_SAMPLE_SERVICE_DIR)\saml_sts\saml_sts.dll
-mod_rampart_services_saml_sts: $(RAMPART_DISTDIR)\bin\samples\services\saml_sts\saml_sts.dll
-
-$(RAMPART_DISTDIR)\bin\samples\services\secconv_echo\secconv_echo.dll : $(RAMPART_SOURCE_DIR)\samples\server\secconv_echo\*.c
+$(RAMPART_SAMPLE_SERVICE_DIR)\secconv_echo\secconv_echo.dll : $(RAMPART_SOURCE_DIR)\samples\server\secconv_echo\*.c
$(CC) $(CFLAGS) $(MOD_RAMPART_INCLUDE_PATH) /I$(RAMPART_SOURCE_DIR)\samples\server\secconv_echo \
$(RAMPART_SOURCE_DIR)\samples\server\secconv_echo\*.c $(APPLINK_FILE) /Fo$(RAMPART_INTDIR)\samples\services\secconv_echo\ /c
$(LD) $(LDFLAGS) $(RAMPART_INTDIR)\samples\services\secconv_echo\*.obj \
- axutil.lib axiom.lib axis2_parser.lib $(LIBS) axis2_engine.lib mod_rampart.lib /LIBPATH:$(RAMPART_DISTDIR)\modules\rampart\
+ axutil.lib axiom.lib axis2_parser.lib $(LIBS) axis2_engine.lib rampart.lib /LIBPATH:$(RAMPART_DISTDIR)\lib\
axis2_http_receiver.lib axis2_http_sender.lib \
- /DLL /OUT:$(RAMPART_DISTDIR)\bin\samples\services\secconv_echo\secconv_echo.dll
+ /DLL /OUT:$(RAMPART_SAMPLE_SERVICE_DIR)\secconv_echo\secconv_echo.dll
-@$(_VC_MANIFEST_EMBED_DLL)
- copy $(RAMPART_SOURCE_DIR)\samples\server\secconv_echo\services.xml $(RAMPART_DISTDIR)\bin\samples\services\secconv_echo\
+ copy $(RAMPART_SOURCE_DIR)\samples\server\secconv_echo\services.xml $(RAMPART_SAMPLE_SERVICE_DIR)\secconv_echo\
- copy $(RAMPART_SOURCE_DIR)\samples\server\secconv_echo\server_axis2.xml $(RAMPART_DISTDIR)\bin\samples\services\secconv_echo\
+mod_rampart_services_secconv_echo: $(RAMPART_SAMPLE_SERVICE_DIR)\secconv_echo\secconv_echo.dll
-mod_rampart_services_secconv_echo: $(RAMPART_DISTDIR)\bin\samples\services\secconv_echo\secconv_echo.dll
-
-$(RAMPART_DISTDIR)\bin\samples\client\sec_echo\echo.exe : $(RAMPART_SOURCE_DIR)\samples\client\sec_echo\echo.c
+$(RAMPART_SAMPLE_BIN_DIR)\sec_echo.exe : $(RAMPART_SOURCE_DIR)\samples\client\sec_echo\echo.c
$(CC) $(CFLAGS) $(MOD_RAMPART_INCLUDE_PATH) \
$(RAMPART_SOURCE_DIR)\samples\client\sec_echo\echo.c \
/Fo$(RAMPART_INTDIR)\samples\client\sec_echo\ /c
$(LD) $(LDFLAGS) /FIXED:No $(RAMPART_INTDIR)\samples\client\sec_echo\echo.obj axutil.lib axiom.lib neethi.lib \
- axis2_parser.lib axis2_engine.lib /LIBPATH:$(RAMPART_DISTDIR)\modules\rampart mod_rampart.lib /OUT:$(RAMPART_DISTDIR)\bin\samples\client\sec_echo\echo.exe
+ axis2_parser.lib axis2_engine.lib /LIBPATH:$(RAMPART_DISTDIR)\lib rampart.lib /OUT:$(RAMPART_SAMPLE_BIN_DIR)\sec_echo.exe
-@$(_VC_MANIFEST_EMBED_EXE)
- copy $(RAMPART_SOURCE_DIR)\samples\client\sec_echo\data\client.axis2.xml \
- $(RAMPART_DISTDIR)\bin\samples\client\sec_echo\data\
-
-mod_rampart_samples_sec_echo: $(RAMPART_DISTDIR)\bin\samples\client\sec_echo\echo.exe
+mod_rampart_samples_sec_echo: $(RAMPART_SAMPLE_BIN_DIR)\sec_echo.exe
####### SAML Echo
-$(RAMPART_DISTDIR)\bin\samples\client\saml_echo\echo.exe : $(RAMPART_SOURCE_DIR)\samples\client\saml_echo\echo.c
+$(RAMPART_SAMPLE_BIN_DIR)\saml_echo.exe : $(RAMPART_SOURCE_DIR)\samples\client\saml_echo\echo.c
$(CC) $(CFLAGS) $(MOD_RAMPART_INCLUDE_PATH) \
$(RAMPART_SOURCE_DIR)\samples\client\saml_echo\echo.c $(APPLINK_FILE) \
/Fo$(RAMPART_INTDIR)\samples\client\saml_echo\ /c
$(LD) $(LDFLAGS) $(RAMPART_INTDIR)\samples\client\saml_echo\echo.obj axutil.lib axiom.lib neethi.lib \
- axis2_parser.lib axis2_engine.lib /FIXED:NO /LIBPATH:$(RAMPART_DISTDIR)\modules\rampart mod_rampart.lib /OUT:$(RAMPART_DISTDIR)\bin\samples\client\saml_echo\echo.exe
+ axis2_parser.lib axis2_engine.lib /FIXED:NO /LIBPATH:$(RAMPART_DISTDIR)\lib rampart.lib /OUT:$(RAMPART_SAMPLE_BIN_DIR)\saml_echo.exe
-@$(_VC_MANIFEST_EMBED_EXE)
-mod_rampart_samples_saml_echo: $(RAMPART_DISTDIR)\bin\samples\client\saml_echo\echo.exe
+mod_rampart_samples_saml_echo: $(RAMPART_SAMPLE_BIN_DIR)\saml_echo.exe
-$(RAMPART_DISTDIR)\bin\samples\client\issued_token\echo.exe : $(RAMPART_SOURCE_DIR)\samples\client\issued_token\echo.c
+$(RAMPART_SAMPLE_BIN_DIR)\issued_token_echo.exe : $(RAMPART_SOURCE_DIR)\samples\client\issued_token\echo.c
$(CC) $(CFLAGS) $(MOD_RAMPART_INCLUDE_PATH) \
$(RAMPART_SOURCE_DIR)\samples\client\issued_token\echo.c \
/Fo$(RAMPART_INTDIR)\samples\client\issued_token\ /c
$(LD) $(LDFLAGS) $(RAMPART_INTDIR)\samples\client\issued_token\echo.obj axutil.lib axiom.lib neethi.lib \
- axis2_parser.lib axis2_engine.lib /LIBPATH:$(RAMPART_DISTDIR)\modules\rampart mod_rampart.lib /OUT:$(RAMPART_DISTDIR)\bin\samples\client\issued_token\echo.exe
+ axis2_parser.lib axis2_engine.lib /LIBPATH:$(RAMPART_DISTDIR)\lib rampart.lib /OUT:$(RAMPART_SAMPLE_BIN_DIR)\issued_token_echo.exe
-@$(_VC_MANIFEST_EMBED_EXE)
-mod_rampart_samples_issued_token: $(RAMPART_DISTDIR)\bin\samples\client\issued_token\echo.exe
+mod_rampart_samples_issued_token: $(RAMPART_SAMPLE_BIN_DIR)\issued_token_echo.exe
-$(RAMPART_DISTDIR)\bin\samples\client\saml_protect\echo.exe : $(RAMPART_SOURCE_DIR)\samples\client\saml_protect\echo.c
+$(RAMPART_SAMPLE_BIN_DIR)\saml_protect_echo.exe : $(RAMPART_SOURCE_DIR)\samples\client\saml_protect\echo.c
$(CC) $(CFLAGS) $(MOD_RAMPART_INCLUDE_PATH) \
$(RAMPART_SOURCE_DIR)\samples\client\saml_protect\echo.c \
/Fo$(RAMPART_INTDIR)\samples\client\saml_protect\ /c
$(LD) $(LDFLAGS) $(RAMPART_INTDIR)\samples\client\saml_protect\echo.obj axutil.lib axiom.lib neethi.lib \
- axis2_parser.lib axis2_engine.lib /LIBPATH:$(RAMPART_DISTDIR)\modules\rampart mod_rampart.lib /OUT:$(RAMPART_DISTDIR)\bin\samples\client\saml_protect\echo.exe
+ axis2_parser.lib axis2_engine.lib /LIBPATH:$(RAMPART_DISTDIR)\lib rampart.lib /OUT:$(RAMPART_SAMPLE_BIN_DIR)\saml_protect_echo.exe
-@$(_VC_MANIFEST_EMBED_EXE)
-mod_rampart_samples_saml_protect: $(RAMPART_DISTDIR)\bin\samples\client\saml_protect\echo.exe
+mod_rampart_samples_saml_protect: $(RAMPART_SAMPLE_BIN_DIR)\saml_protect_echo.exe
-$(RAMPART_DISTDIR)\bin\samples\credential_provider\cred_provider.dll : $(RAMPART_SOURCE_DIR)\samples\credential_provider\*.c
+$(RAMPART_SAMPLE_LIB_DIR)\cred_provider.dll : $(RAMPART_SOURCE_DIR)\samples\credential_provider\*.c
$(CC) $(CFLAGS) $(MOD_RAMPART_INCLUDE_PATH) \
$(RAMPART_SOURCE_DIR)\samples\credential_provider\*.c \
/Fo$(RAMPART_INTDIR)\samples\credential_provider\ /c
$(LD) $(LDFLAGS) $(RAMPART_INTDIR)\samples\credential_provider\cred_provider.obj \
axutil.lib axiom.lib axis2_parser.lib $(LIBS) axis2_engine.lib \
axis2_http_receiver.lib axis2_http_sender.lib \
- /DLL /OUT:$(RAMPART_DISTDIR)\bin\samples\credential_provider\cred_provider.dll
+ /DLL /OUT:$(RAMPART_SAMPLE_LIB_DIR)\cred_provider.dll
-@$(_VC_MANIFEST_EMBED_DLL)
-mod_rampart_samples_credential_provider: $(RAMPART_DISTDIR)\bin\samples\credential_provider\cred_provider.dll
+mod_rampart_samples_credential_provider: $(RAMPART_SAMPLE_LIB_DIR)\cred_provider.dll
mod_rampart_samples: mod_rampart_samples_sec_echo mod_rampart_services_sec_echo mod_rampart_services_secconv_echo mod_rampart_samples_saml_protect
@@ -315,17 +318,19 @@
xcopy /E /I /Y $(RAMPART_SOURCE_DIR)\include $(RAMPART_DISTDIR)\include
mod_rampart_copy_keys:
- if not exist $(RAMPART_DISTDIR)\bin\samples\keys mkdir $(RAMPART_DISTDIR)\bin\samples\keys
- xcopy /E /I /Y $(RAMPART_SOURCE_DIR)\samples\keys\* $(RAMPART_DISTDIR)\bin\samples\keys
+ if not exist $(RAMPART_SAMPLE_DATA_DIR)\keys mkdir $(RAMPART_SAMPLE_DATA_DIR)\keys
+ xcopy /E /I /Y $(RAMPART_SOURCE_DIR)\samples\keys\* $(RAMPART_SAMPLE_DATA_DIR)\keys
mod_rampart_copy_deploy:
copy deploy_rampart.bat $(RAMPART_DISTDIR)
- copy $(RAMPART_SOURCE_DIR)\samples\client\sec_echo\deploy_client_repo.bat $(RAMPART_DISTDIR)\bin\samples\client\sec_echo
- copy $(RAMPART_SOURCE_DIR)\samples\client\sec_echo\update_n_run.bat $(RAMPART_DISTDIR)\bin\samples\client\sec_echo
- copy $(RAMPART_SOURCE_DIR)\samples\client\saml_echo\update_n_run.bat $(RAMPART_DISTDIR)\bin\samples\client\saml_echo
+ copy $(RAMPART_SOURCE_DIR)\samples\client\deploy_client_repo.bat $(RAMPART_SAMPLE_BIN_DIR)
+ copy $(RAMPART_SOURCE_DIR)\samples\client\sec_echo\update_n_run.bat $(RAMPART_SAMPLE_BIN_DIR)
+ copy $(RAMPART_SOURCE_DIR)\samples\client\saml_echo\update_n_run.bat $(RAMPART_SAMPLE_BIN_DIR)\saml_update_n_run.bat
+ copy $(RAMPART_SOURCE_DIR)\samples\data\client_axis2.xml $(RAMPART_SAMPLE_DATA_DIR)\
+ copy $(RAMPART_SOURCE_DIR)\samples\data\server_axis2.xml $(RAMPART_SAMPLE_DATA_DIR)\
copy_sec_policy:
- xcopy /E /I /Y $(RAMPART_SOURCE_DIR)\samples\secpolicy $(RAMPART_DISTDIR)\bin\samples\secpolicy
+ xcopy /E /I /Y $(RAMPART_SOURCE_DIR)\samples\secpolicy $(RAMPART_SAMPLE_POLICY_DIR)\
copy_dist_files:
copy $(RAMPART_SOURCE_DIR)\README $(RAMPART_DISTDIR)
@@ -335,11 +340,12 @@
copy $(RAMPART_SOURCE_DIR)\LICENSE $(RAMPART_DISTDIR)
copy $(RAMPART_SOURCE_DIR)\NEWS $(RAMPART_DISTDIR)
copy $(RAMPART_SOURCE_DIR)\NOTICE $(RAMPART_DISTDIR)
+ copy $(RAMPART_SOURCE_DIR)\ChangeLog $(RAMPART_DISTDIR)
#copy make_bin_dist.bat $(RAMPART_DISTDIR)
-mod_rampart_all: mod_rampart mod_rampart_authn mod_rampart_rd mod_rampart_sct_provider mod_rampart_sct_provider_hashdb mod_rampart_pwcb mod_rampart_htpwcb mod_rampart_samples mod_rampart_copy_include copy_dist_files
+mod_rampart_all: rampart mod_rampart mod_rampart_authn mod_rampart_rd mod_rampart_sct_provider mod_rampart_sct_provider_hashdb mod_rampart_pwcb mod_rampart_htpwcb mod_rampart_samples mod_rampart_copy_include copy_dist_files
mv_dist:
move $(RAMPART_DISTDIR) $(RAMPART_DIST_NAME)
@@ -352,16 +358,16 @@
copy_docs:
if exist $(RAMPART_SOURCE_DIR)\docs xcopy /E /I /Y $(RAMPART_SOURCE_DIR)\docs $(RAMPART_DISTDIR)\docs
-dist: distdir intdirs mod_rampart mod_rahas mod_rampart_pwcb mod_rampart_authn mod_rampart_rd mod_rampart_sct_provider mod_rampart_sct_provider_hashdb mod_rampart_services_sec_echo mod_rampart_services_secconv_echo mod_rampart_services_saml_sts mod_rampart_samples_sec_echo mod_rampart_samples_saml_echo mod_rampart_samples_issued_token mod_rampart_samples_saml_protect mod_rampart_samples_credential_provider mod_rampart_copy_deploy mod_rampart_copy_include copy_dist_files copy_sec_policy mod_rampart_copy_keys del_am mod_rampart_sample_data copy_docs
+dist: distdir intdirs rampart mod_rampart mod_rahas mod_rampart_pwcb mod_rampart_authn mod_rampart_rd mod_rampart_sct_provider mod_rampart_sct_provider_hashdb mod_rampart_services_sec_echo mod_rampart_services_secconv_echo mod_rampart_services_saml_sts mod_rampart_samples_sec_echo mod_rampart_samples_saml_echo mod_rampart_samples_issued_token mod_rampart_samples_saml_protect mod_rampart_samples_credential_provider mod_rampart_copy_deploy mod_rampart_copy_include copy_dist_files copy_sec_policy mod_rampart_copy_keys del_am mod_rampart_sample_data copy_docs
-dist_no_samples: clean distdir intdirs mod_rampart mod_rahas mod_rampart_copy_include copy_dist_files
+dist_no_samples: clean distdir intdirs rampart mod_rampart mod_rahas mod_rampart_copy_include copy_dist_files
deploy:
chdir $(RAMPART_DISTDIR)
deploy_rampart.bat
- chdir $(RAMPART_DISTDIR)\bin\samples\client\sec_echo
+ chdir $(RAMPART_DISTDIR)\samples\bin
deploy_client_repo.bat
- chdir .\..\..\..\..\..\win32
+ chdir .\..\..\..\win32
install: dist deploy
diff --git a/include/rampart_error.h b/include/rampart_error.h
index 13cd356..8f27844 100644
--- a/include/rampart_error.h
+++ b/include/rampart_error.h
@@ -68,7 +68,7 @@
* AXIS2_SUCCESS on success and AXIS2_FAILURE on error
*/
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
rampart_error_init();
/** @} */
diff --git a/samples/client/sec_echo/deploy_client_repo.bat b/samples/client/deploy_client_repo.bat
similarity index 87%
rename from samples/client/sec_echo/deploy_client_repo.bat
rename to samples/client/deploy_client_repo.bat
index 5879be4..f477d8c 100644
--- a/samples/client/sec_echo/deploy_client_repo.bat
+++ b/samples/client/deploy_client_repo.bat
@@ -17,9 +17,11 @@
@echo Copying axis2.xml to client_repo
-copy /Y ".\data\client.axis2.xml" "%CLIENT_REPO%\axis2.xml"
+copy /Y "..\data\client_axis2.xml" "%CLIENT_REPO%\axis2.xml"
-copy /Y ".\..\..\secpolicy\scenario5\client-policy.xml" "%CLIENT_REPO%\policy.xml"
+@cd ..\secpolicy\
+call deploy.bat
+echo off
@echo Copying libraries to client_repo
xcopy /S/I/Q/Y "%AXIS2C_HOME%\lib" "%CLIENT_REPO%\lib"
diff --git a/samples/client/sec_echo/deploy_client_repo.sh b/samples/client/deploy_client_repo.sh
old mode 100755
new mode 100644
similarity index 100%
rename from samples/client/sec_echo/deploy_client_repo.sh
rename to samples/client/deploy_client_repo.sh
diff --git a/samples/client/saml_echo/update_n_run.bat b/samples/client/saml_echo/update_n_run.bat
index 6ed547f..abec951 100644
--- a/samples/client/saml_echo/update_n_run.bat
+++ b/samples/client/saml_echo/update_n_run.bat
@@ -6,6 +6,6 @@
echo "Copying latest module to client_repo"
xcopy /E /Y /I "%AXIS2C_HOME%\modules\rampart" "%CLIENT_REPO%\modules\rampart"
-%AXIS2C_HOME%\bin\samples\rampart\client\saml_echo\echo.exe http://localhost:9090/axis2/services/sec_echo/echoString %CLIENT_REPO%
+%AXIS2C_HOME%\samples\bin\saml_echo.exe http://localhost:9090/axis2/services/sec_echo/echoString %CLIENT_REPO%
@echo on
diff --git a/samples/client/saml_protect/update_n_run.bat b/samples/client/saml_protect/update_n_run.bat
index 6ed547f..8c7b09c 100644
--- a/samples/client/saml_protect/update_n_run.bat
+++ b/samples/client/saml_protect/update_n_run.bat
@@ -6,6 +6,6 @@
echo "Copying latest module to client_repo"
xcopy /E /Y /I "%AXIS2C_HOME%\modules\rampart" "%CLIENT_REPO%\modules\rampart"
-%AXIS2C_HOME%\bin\samples\rampart\client\saml_echo\echo.exe http://localhost:9090/axis2/services/sec_echo/echoString %CLIENT_REPO%
+%AXIS2C_HOME%\samples\bin\saml_protect_echo.exe http://localhost:9090/axis2/services/sec_echo/echoString %CLIENT_REPO%
@echo on
diff --git a/samples/client/sec_echo/README b/samples/client/sec_echo/README
deleted file mode 100644
index 3039ce1..0000000
--- a/samples/client/sec_echo/README
+++ /dev/null
@@ -1,42 +0,0 @@
-This sample works with sec_echo service.
-
-1. HOW TO CONFIGURE SERVER?
------------------------
-Go to rampart/samples/server/sec_echo and
-Run %make install
-This will deploy a sec_echo service and copy security enabled services.xml
-file.
-
-2. HOW TO START SERVER
----------------------
-Start server in port 8080
- ./axis2_http_server -p8080
-
-3. HOW TO CONFIGURE TCP MONITOR (To view messages)
-------------------------------
- Listen port: 9090 [specified as in the client argument]
- Target port: 8080 [server port]
-
-NOTE: This step is OPTIONAL and can be avoided by starting the server without -p8080
-option.
-
-HOW TO RUN CLIENT?
------------------
-Using scripts
--------------------------
-1. Run %deploy_client_repo.sh/bat
-2. Run %update_n_run.sh/bat
-
-Using the actual binary
---------------------------------------
-Run %echo <address> <client_repository>
-
-
-If everything is configured properly You should be able to see the security token(s) is/are attached to the header of
- the SOAP message in the TCP Monitor.
-
-NOTE:
-You need to change the passwordCallbackClass/authnModule and the en/decryptionPropFile
-in rampart/samples/client/enc_echo/data/client.axis2.xml and
-rampart/samples/server/sec_echo/services.xml to suit your environment.
-
diff --git a/samples/client/sec_echo/update_n_run.bat b/samples/client/sec_echo/update_n_run.bat
index ae2b60e..df8ee0d 100644
--- a/samples/client/sec_echo/update_n_run.bat
+++ b/samples/client/sec_echo/update_n_run.bat
@@ -6,6 +6,6 @@
echo "Copying latest module to client_repo"
xcopy /E /Y /I "%AXIS2C_HOME%\modules\rampart" "%CLIENT_REPO%\modules\rampart"
-%AXIS2C_HOME%\bin\samples\rampart\client\sec_echo\echo.exe http://localhost:9090/axis2/services/sec_echo %CLIENT_REPO%
+%AXIS2C_HOME%\samples\bin\sec_echo.exe http://localhost:9090/axis2/services/sec_echo %CLIENT_REPO%
@echo on
diff --git a/samples/client/client_axis2.xml b/samples/data/client_axis2.xml
similarity index 100%
rename from samples/client/client_axis2.xml
rename to samples/data/client_axis2.xml
diff --git a/samples/server/server_axis2.xml b/samples/data/server_axis2.xml
similarity index 100%
rename from samples/server/server_axis2.xml
rename to samples/data/server_axis2.xml
diff --git a/samples/secpolicy/run_all.js b/samples/secpolicy/run_all.js
index d0fb840..3f427db 100644
--- a/samples/secpolicy/run_all.js
+++ b/samples/secpolicy/run_all.js
@@ -10,9 +10,9 @@
for (var i = 1; i <= 14; i++) {
if (i != 14 && i != 24) {
- run (i, "\\bin\\samples\\rampart\\client\\sec_echo\\echo.exe")
+ run (i, "\\samples\\bin\\sec_echo.exe")
} else if (i == 14) {
- run(i, "\\bin\\samples\\rampart\\client\\saml_echo\\echo.exe");
+ run(i, "\\samples\\bin\\saml_echo.exe");
}
}
@@ -23,18 +23,18 @@
var http_server = WshShell.Exec(axis2c_home + "\\bin\\axis2_http_server.exe -p " + server_port + " -r " + axis2c_home);
WScript.Sleep(3000);
WScript.Echo("Started Axis2C simple HTTP server\n\n");
-var client = WshShell.Exec(axis2c_home + "\\bin\\samples\\rampart\\client\\issued_token\\echo.exe http://localhost:9090/axis2/services/sec_echo/echoString " + client_repo);
+var client = WshShell.Exec(axis2c_home + "\\samples\\bin\\issued_token_echo.exe http://localhost:9090/axis2/services/sec_echo/echoString " + client_repo);
s = client.StdOut.ReadAll();
WScript.Echo(s);
http_server.Terminate();
for (var i = 21; i <= 24; i++) {
if (i != 14 && i != 24) {
- run (i, "\\bin\\samples\\rampart\\client\\sec_echo\\echo.exe")
+ run (i, "\\samples\\bin\\sec_echo.exe")
} else if (i == 14) {
- run(i, "\\bin\\samples\\rampart\\client\\saml_echo\\echo.exe");
+ run(i, "\\samples\\bin\\saml_echo.exe");
} else if (i == 24) {
- run(i, "\\bin\\samples\\rampart\\client\\saml_protect\\echo.exe");
+ run(i, "\\samples\\bin\\saml_protect_echo.exe");
}
}
diff --git a/samples/secpolicy/scenario10/client-policy.xml b/samples/secpolicy/scenario10/client-policy.xml
index bba92f5..06e3f2f 100644
--- a/samples/secpolicy/scenario10/client-policy.xml
+++ b/samples/secpolicy/scenario10/client-policy.xml
@@ -58,10 +58,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario10/services.xml b/samples/secpolicy/scenario10/services.xml
index 5dcf9de..2a29e1b 100644
--- a/samples/secpolicy/scenario10/services.xml
+++ b/samples/secpolicy/scenario10/services.xml
@@ -63,10 +63,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>b</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/alice_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/bhome/alice_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/bhome/bob_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/bhome/bob_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario11/client-policy.xml b/samples/secpolicy/scenario11/client-policy.xml
index 39a00b5..e530634 100644
--- a/samples/secpolicy/scenario11/client-policy.xml
+++ b/samples/secpolicy/scenario11/client-policy.xml
@@ -57,10 +57,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario11/services.xml b/samples/secpolicy/scenario11/services.xml
index 1cf858d..f0f7ab7 100644
--- a/samples/secpolicy/scenario11/services.xml
+++ b/samples/secpolicy/scenario11/services.xml
@@ -62,10 +62,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>b</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/alice_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/bhome/alice_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/bhome/bob_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/bhome/bob_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario12/client-policy.xml b/samples/secpolicy/scenario12/client-policy.xml
index 7f00210..8b16bbe 100644
--- a/samples/secpolicy/scenario12/client-policy.xml
+++ b/samples/secpolicy/scenario12/client-policy.xml
@@ -58,10 +58,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario12/services.xml b/samples/secpolicy/scenario12/services.xml
index 7b8c46d..8fae292 100644
--- a/samples/secpolicy/scenario12/services.xml
+++ b/samples/secpolicy/scenario12/services.xml
@@ -63,10 +63,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>b</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/alice_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/bhome/alice_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/bhome/bob_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/bhome/bob_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario13/client-policy.xml b/samples/secpolicy/scenario13/client-policy.xml
index 76388fa..6cf7a6c 100644
--- a/samples/secpolicy/scenario13/client-policy.xml
+++ b/samples/secpolicy/scenario13/client-policy.xml
@@ -59,10 +59,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario13/services.xml b/samples/secpolicy/scenario13/services.xml
index 011c8a8..cfc3ba1 100644
--- a/samples/secpolicy/scenario13/services.xml
+++ b/samples/secpolicy/scenario13/services.xml
@@ -64,10 +64,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>b</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/alice_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/bhome/alice_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/bhome/bob_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/bhome/bob_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario14/client-policy.xml b/samples/secpolicy/scenario14/client-policy.xml
index 56f1424..9783183 100644
--- a/samples/secpolicy/scenario14/client-policy.xml
+++ b/samples/secpolicy/scenario14/client-policy.xml
@@ -54,10 +54,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario14/services.xml b/samples/secpolicy/scenario14/services.xml
index 98b2305..70da7f8 100644
--- a/samples/secpolicy/scenario14/services.xml
+++ b/samples/secpolicy/scenario14/services.xml
@@ -63,10 +63,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>b</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/alice_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/bhome/alice_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/bhome/bob_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/bhome/bob_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario15/client-policy.xml b/samples/secpolicy/scenario15/client-policy.xml
index 03dd642..e94fc95 100644
--- a/samples/secpolicy/scenario15/client-policy.xml
+++ b/samples/secpolicy/scenario15/client-policy.xml
@@ -50,8 +50,8 @@
<rampc:User>Alice</rampc:User>
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:SecurityContextTokenProvider>AXIS2C_HOME/bin/samples/rampart/sct_provider/libsctprovider.so</rampc:SecurityContextTokenProvider>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:SecurityContextTokenProvider>AXIS2C_HOME/samples/lib/libsctprovider.so</rampc:SecurityContextTokenProvider>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario15/services.xml b/samples/secpolicy/scenario15/services.xml
index 3c5e094..5e92006 100644
--- a/samples/secpolicy/scenario15/services.xml
+++ b/samples/secpolicy/scenario15/services.xml
@@ -55,8 +55,8 @@
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
<rampc:User>Bob</rampc:User>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:SecurityContextTokenProvider>AXIS2C_HOME/bin/samples/rampart/sct_provider/libsctprovider.so</rampc:SecurityContextTokenProvider>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:SecurityContextTokenProvider>AXIS2C_HOME/samples/lib/libsctprovider.so</rampc:SecurityContextTokenProvider>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario16/client-policy.xml b/samples/secpolicy/scenario16/client-policy.xml
index a6e1520..c7e5df9 100644
--- a/samples/secpolicy/scenario16/client-policy.xml
+++ b/samples/secpolicy/scenario16/client-policy.xml
@@ -55,8 +55,8 @@
<rampc:User>Alice</rampc:User>
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:SecurityContextTokenProvider>AXIS2C_HOME/bin/samples/rampart/sct_provider/libsctprovider.so</rampc:SecurityContextTokenProvider>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:SecurityContextTokenProvider>AXIS2C_HOME/samples/lib/libsctprovider.so</rampc:SecurityContextTokenProvider>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario16/services.xml b/samples/secpolicy/scenario16/services.xml
index 0e837fb..8c08492 100644
--- a/samples/secpolicy/scenario16/services.xml
+++ b/samples/secpolicy/scenario16/services.xml
@@ -60,8 +60,8 @@
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
<rampc:User>Bob</rampc:User>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:SecurityContextTokenProvider>AXIS2C_HOME/bin/samples/rampart/sct_provider/libsctprovider.so</rampc:SecurityContextTokenProvider>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:SecurityContextTokenProvider>AXIS2C_HOME/samples/lib/libsctprovider.so</rampc:SecurityContextTokenProvider>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario17/client-policy.xml b/samples/secpolicy/scenario17/client-policy.xml
index d7c728f..0dd3469 100644
--- a/samples/secpolicy/scenario17/client-policy.xml
+++ b/samples/secpolicy/scenario17/client-policy.xml
@@ -95,8 +95,8 @@
<rampc:User>Alice</rampc:User>
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:SecurityContextTokenProvider>AXIS2C_HOME/bin/samples/rampart/sct_provider/libsctprovider_hashdb.so</rampc:SecurityContextTokenProvider>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:SecurityContextTokenProvider>AXIS2C_HOME/samples/lib/libsctprovider_hashdb.so</rampc:SecurityContextTokenProvider>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario17/services.xml b/samples/secpolicy/scenario17/services.xml
index 8312729..8c1a934 100644
--- a/samples/secpolicy/scenario17/services.xml
+++ b/samples/secpolicy/scenario17/services.xml
@@ -100,8 +100,8 @@
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
<rampc:User>Bob</rampc:User>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:SecurityContextTokenProvider>AXIS2C_HOME/bin/samples/rampart/sct_provider/libsctprovider_hashdb.so</rampc:SecurityContextTokenProvider>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:SecurityContextTokenProvider>AXIS2C_HOME/samples/lib/libsctprovider_hashdb.so</rampc:SecurityContextTokenProvider>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario18/client-policy.xml b/samples/secpolicy/scenario18/client-policy.xml
index 248a55e..04be498 100644
--- a/samples/secpolicy/scenario18/client-policy.xml
+++ b/samples/secpolicy/scenario18/client-policy.xml
@@ -147,8 +147,8 @@
<rampc:User>Alice</rampc:User>
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:SecurityContextTokenProvider>AXIS2C_HOME/bin/samples/rampart/sct_provider/libsctprovider_hashdb.so</rampc:SecurityContextTokenProvider>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:SecurityContextTokenProvider>AXIS2C_HOME/samples/lib/libsctprovider_hashdb.so</rampc:SecurityContextTokenProvider>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario18/services.xml b/samples/secpolicy/scenario18/services.xml
index f8ce5f1..43bdc99 100644
--- a/samples/secpolicy/scenario18/services.xml
+++ b/samples/secpolicy/scenario18/services.xml
@@ -152,8 +152,8 @@
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
<rampc:User>Bob</rampc:User>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:SecurityContextTokenProvider>AXIS2C_HOME/bin/samples/rampart/sct_provider/libsctprovider_hashdb.so</rampc:SecurityContextTokenProvider>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:SecurityContextTokenProvider>AXIS2C_HOME/samples/lib/libsctprovider_hashdb.so</rampc:SecurityContextTokenProvider>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario19/client-policy.xml b/samples/secpolicy/scenario19/client-policy.xml
index 545df0d..da735b7 100644
--- a/samples/secpolicy/scenario19/client-policy.xml
+++ b/samples/secpolicy/scenario19/client-policy.xml
@@ -143,8 +143,8 @@
<rampc:User>Alice</rampc:User>
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:SecurityContextTokenProvider>AXIS2C_HOME/bin/samples/rampart/sct_provider/libsctprovider_hashdb.so</rampc:SecurityContextTokenProvider>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:SecurityContextTokenProvider>AXIS2C_HOME/samples/lib/libsctprovider_hashdb.so</rampc:SecurityContextTokenProvider>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario19/services.xml b/samples/secpolicy/scenario19/services.xml
index dd3addd..9140927 100644
--- a/samples/secpolicy/scenario19/services.xml
+++ b/samples/secpolicy/scenario19/services.xml
@@ -151,8 +151,8 @@
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
<rampc:User>Bob</rampc:User>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:SecurityContextTokenProvider>AXIS2C_HOME/bin/samples/rampart/sct_provider/libsctprovider_hashdb.so</rampc:SecurityContextTokenProvider>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:SecurityContextTokenProvider>AXIS2C_HOME/samples/lib/libsctprovider_hashdb.so</rampc:SecurityContextTokenProvider>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario2/client-policy.xml b/samples/secpolicy/scenario2/client-policy.xml
index b17b640..a60ea4b 100644
--- a/samples/secpolicy/scenario2/client-policy.xml
+++ b/samples/secpolicy/scenario2/client-policy.xml
@@ -36,7 +36,7 @@
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
<rampc:User>Alice</rampc:User>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario2/services.xml b/samples/secpolicy/scenario2/services.xml
index 195c01e..08fa16b 100644
--- a/samples/secpolicy/scenario2/services.xml
+++ b/samples/secpolicy/scenario2/services.xml
@@ -48,7 +48,7 @@
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
<rampc:PasswordType>Digest</rampc:PasswordType>
<!--rampc:AuthnModuleName>AXIS2C_HOME/bin/samples/rampart/authn_provider/libauthn.so</rampc:AuthnModuleName-->
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario20/client-policy.xml b/samples/secpolicy/scenario20/client-policy.xml
index 81319f6..8ffd770 100644
--- a/samples/secpolicy/scenario20/client-policy.xml
+++ b/samples/secpolicy/scenario20/client-policy.xml
@@ -57,10 +57,10 @@
</sp:SignedParts>
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario20/services.xml b/samples/secpolicy/scenario20/services.xml
index 27f1f78..35b4d72 100644
--- a/samples/secpolicy/scenario20/services.xml
+++ b/samples/secpolicy/scenario20/services.xml
@@ -68,9 +68,9 @@
<sp:Header Namespace="http://www.w3.org/2005/08/addressing"/>
</sp:SignedParts>
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/bhome/bob_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/bhome/bob_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario21/client-policy.xml b/samples/secpolicy/scenario21/client-policy.xml
index 4a82d35..9031efc 100644
--- a/samples/secpolicy/scenario21/client-policy.xml
+++ b/samples/secpolicy/scenario21/client-policy.xml
@@ -47,8 +47,8 @@
<rampc:User>Alice</rampc:User>
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:PKCS12KeyStore>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_kstore.p12</rampc:PKCS12KeyStore>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:PKCS12KeyStore>AXIS2C_HOME/samples/data/keys/ahome/alice_kstore.p12</rampc:PKCS12KeyStore>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario21/services.xml b/samples/secpolicy/scenario21/services.xml
index 4db9f5c..f010fb3 100644
--- a/samples/secpolicy/scenario21/services.xml
+++ b/samples/secpolicy/scenario21/services.xml
@@ -59,8 +59,8 @@
<rampc:User>Bob</rampc:User>
<rampc:EncryptionUser>b</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:PKCS12KeyStore>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_kstore.p12</rampc:PKCS12KeyStore>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:PKCS12KeyStore>AXIS2C_HOME/samples/data/keys/bhome/bob_kstore.p12</rampc:PKCS12KeyStore>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario22/client-policy.xml b/samples/secpolicy/scenario22/client-policy.xml
index c7e0602..cb69c2b 100644
--- a/samples/secpolicy/scenario22/client-policy.xml
+++ b/samples/secpolicy/scenario22/client-policy.xml
@@ -48,8 +48,8 @@
<rampc:User>Alice</rampc:User>
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:PKCS12KeyStore>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_kstore.p12</rampc:PKCS12KeyStore>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:PKCS12KeyStore>AXIS2C_HOME/samples/data/keys/ahome/alice_kstore.p12</rampc:PKCS12KeyStore>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario22/services.xml b/samples/secpolicy/scenario22/services.xml
index c7ffa1f..f46690b 100644
--- a/samples/secpolicy/scenario22/services.xml
+++ b/samples/secpolicy/scenario22/services.xml
@@ -58,8 +58,8 @@
</sp:SignedParts>
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
<rampc:EncryptionUser>b</rampc:EncryptionUser>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:PKCS12KeyStore>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_kstore.p12</rampc:PKCS12KeyStore>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:PKCS12KeyStore>AXIS2C_HOME/samples/data/keys/bhome/bob_kstore.p12</rampc:PKCS12KeyStore>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario23/client-policy.xml b/samples/secpolicy/scenario23/client-policy.xml
index 1b1b019..03c44c3 100644
--- a/samples/secpolicy/scenario23/client-policy.xml
+++ b/samples/secpolicy/scenario23/client-policy.xml
@@ -60,8 +60,8 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>b</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:PKCS12KeyStore>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_kstore.p12</rampc:PKCS12KeyStore>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:PKCS12KeyStore>AXIS2C_HOME/samples/data/keys/bhome/bob_kstore.p12</rampc:PKCS12KeyStore>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario23/services.xml b/samples/secpolicy/scenario23/services.xml
index feab6ba..3b9dba8 100644
--- a/samples/secpolicy/scenario23/services.xml
+++ b/samples/secpolicy/scenario23/services.xml
@@ -70,8 +70,8 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:PKCS12KeyStore>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_kstore.p12</rampc:PKCS12KeyStore>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:PKCS12KeyStore>AXIS2C_HOME/samples/data/keys/ahome/alice_kstore.p12</rampc:PKCS12KeyStore>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario24/client-policy.xml b/samples/secpolicy/scenario24/client-policy.xml
index 551c97c..26e5eb4 100644
--- a/samples/secpolicy/scenario24/client-policy.xml
+++ b/samples/secpolicy/scenario24/client-policy.xml
@@ -46,10 +46,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario24/services.xml b/samples/secpolicy/scenario24/services.xml
index fa12755..d459986 100644
--- a/samples/secpolicy/scenario24/services.xml
+++ b/samples/secpolicy/scenario24/services.xml
@@ -60,10 +60,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>b</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/alice_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/bhome/alice_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/bhome/bob_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/bhome/bob_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario25/client-policy.xml b/samples/secpolicy/scenario25/client-policy.xml
index c8cc83a..c3b9561 100644
--- a/samples/secpolicy/scenario25/client-policy.xml
+++ b/samples/secpolicy/scenario25/client-policy.xml
@@ -141,7 +141,7 @@
<rampc:User>Alice</rampc:User>
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario25/services.xml b/samples/secpolicy/scenario25/services.xml
index bb69eda..e099a5b 100644
--- a/samples/secpolicy/scenario25/services.xml
+++ b/samples/secpolicy/scenario25/services.xml
@@ -69,7 +69,7 @@
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
<rampc:User>Bob</rampc:User>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario26/client-policy.xml b/samples/secpolicy/scenario26/client-policy.xml
index d22de52..e0bad37 100644
--- a/samples/secpolicy/scenario26/client-policy.xml
+++ b/samples/secpolicy/scenario26/client-policy.xml
@@ -68,10 +68,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
@@ -146,10 +146,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
@@ -203,7 +203,7 @@
<rampc:User>Alice</rampc:User>
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario26/services.xml b/samples/secpolicy/scenario26/services.xml
index 8412a3b..84787e6 100644
--- a/samples/secpolicy/scenario26/services.xml
+++ b/samples/secpolicy/scenario26/services.xml
@@ -63,10 +63,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>b</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/alice_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/bhome/alice_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/bhome/bob_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/bhome/bob_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
@@ -215,7 +215,7 @@
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
<rampc:User>Bob</rampc:User>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario27/client-policy.xml b/samples/secpolicy/scenario27/client-policy.xml
index 45743e2..8fc57f1 100644
--- a/samples/secpolicy/scenario27/client-policy.xml
+++ b/samples/secpolicy/scenario27/client-policy.xml
@@ -151,7 +151,7 @@
<rampc:User>Alice</rampc:User>
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario27/services.xml b/samples/secpolicy/scenario27/services.xml
index 5876870..2ef13d4 100644
--- a/samples/secpolicy/scenario27/services.xml
+++ b/samples/secpolicy/scenario27/services.xml
@@ -69,7 +69,7 @@
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
<rampc:User>Bob</rampc:User>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario28/client-policy.xml b/samples/secpolicy/scenario28/client-policy.xml
index 7030676..e182320 100644
--- a/samples/secpolicy/scenario28/client-policy.xml
+++ b/samples/secpolicy/scenario28/client-policy.xml
@@ -75,10 +75,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
@@ -160,10 +160,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
@@ -217,7 +217,7 @@
<rampc:User>Alice</rampc:User>
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario28/services.xml b/samples/secpolicy/scenario28/services.xml
index ea58f7b..cd9ead4 100644
--- a/samples/secpolicy/scenario28/services.xml
+++ b/samples/secpolicy/scenario28/services.xml
@@ -70,10 +70,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>b</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/alice_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/bhome/alice_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/bhome/bob_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/bhome/bob_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
@@ -220,7 +220,7 @@
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
<rampc:User>Bob</rampc:User>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario3/client-policy.xml b/samples/secpolicy/scenario3/client-policy.xml
index 6fea382..541a5fc 100644
--- a/samples/secpolicy/scenario3/client-policy.xml
+++ b/samples/secpolicy/scenario3/client-policy.xml
@@ -47,10 +47,10 @@
<rampc:User>Alice</rampc:User>
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario3/services.xml b/samples/secpolicy/scenario3/services.xml
index e9e03a2..e49f1fc 100644
--- a/samples/secpolicy/scenario3/services.xml
+++ b/samples/secpolicy/scenario3/services.xml
@@ -59,10 +59,10 @@
<rampc:User>Bob</rampc:User>
<rampc:EncryptionUser>b</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/alice_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/bhome/alice_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/bhome/bob_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/bhome/bob_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario4/client-policy.xml b/samples/secpolicy/scenario4/client-policy.xml
index 8bc8a7c..69c666d 100644
--- a/samples/secpolicy/scenario4/client-policy.xml
+++ b/samples/secpolicy/scenario4/client-policy.xml
@@ -46,10 +46,10 @@
</sp:SignedParts>
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario4/services.xml b/samples/secpolicy/scenario4/services.xml
index 2fd1f08..5375b4c 100644
--- a/samples/secpolicy/scenario4/services.xml
+++ b/samples/secpolicy/scenario4/services.xml
@@ -57,9 +57,9 @@
<sp:Header Namespace="http://www.w3.org/2005/08/addressing"/>
</sp:SignedParts>
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/bhome/bob_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/bhome/bob_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario5/client-policy.xml b/samples/secpolicy/scenario5/client-policy.xml
index d59e194..e9baa26 100644
--- a/samples/secpolicy/scenario5/client-policy.xml
+++ b/samples/secpolicy/scenario5/client-policy.xml
@@ -60,10 +60,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario5/services.xml b/samples/secpolicy/scenario5/services.xml
index 02703f6..00b04ff 100644
--- a/samples/secpolicy/scenario5/services.xml
+++ b/samples/secpolicy/scenario5/services.xml
@@ -70,10 +70,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>b</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/alice_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/bhome/alice_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/bhome/bob_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/bhome/bob_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario6/client-policy.xml b/samples/secpolicy/scenario6/client-policy.xml
index da136af..3b2ac3a 100644
--- a/samples/secpolicy/scenario6/client-policy.xml
+++ b/samples/secpolicy/scenario6/client-policy.xml
@@ -60,10 +60,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario6/services.xml b/samples/secpolicy/scenario6/services.xml
index f68d654..7f3196f 100644
--- a/samples/secpolicy/scenario6/services.xml
+++ b/samples/secpolicy/scenario6/services.xml
@@ -70,10 +70,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>b</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/alice_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/bhome/alice_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/bhome/bob_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/bhome/bob_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario7/services.xml b/samples/secpolicy/scenario7/services.xml
index 1b6e0c5..f3eb17b 100644
--- a/samples/secpolicy/scenario7/services.xml
+++ b/samples/secpolicy/scenario7/services.xml
@@ -44,7 +44,7 @@
</sp:AsymmetricBinding>
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
<rampc:ReplayDetection>5</rampc:ReplayDetection>
- <rampc:ReplayDetectionModule>AXIS2C_HOME/bin/samples/rampart/replay_detector/librdflatfile.so</rampc:ReplayDetectionModule>
+ <rampc:ReplayDetectionModule>AXIS2C_HOME/samples/lib/librdflatfile.so</rampc:ReplayDetectionModule>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario8/client-policy.xml b/samples/secpolicy/scenario8/client-policy.xml
index dff22fb..a340f12 100644
--- a/samples/secpolicy/scenario8/client-policy.xml
+++ b/samples/secpolicy/scenario8/client-policy.xml
@@ -53,10 +53,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario8/services.xml b/samples/secpolicy/scenario8/services.xml
index 9432d73..fdda16f 100644
--- a/samples/secpolicy/scenario8/services.xml
+++ b/samples/secpolicy/scenario8/services.xml
@@ -59,10 +59,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:EncryptionUser>b</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/alice_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/bhome/alice_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/bhome/bob_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/bhome/bob_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario9/client-policy.xml b/samples/secpolicy/scenario9/client-policy.xml
index bac7cd6..c2034ec 100644
--- a/samples/secpolicy/scenario9/client-policy.xml
+++ b/samples/secpolicy/scenario9/client-policy.xml
@@ -53,10 +53,10 @@
<rampc:User>Alice</rampc:User>
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/samples/secpolicy/scenario9/services.xml b/samples/secpolicy/scenario9/services.xml
index 409fdbf..1aa4fe9 100644
--- a/samples/secpolicy/scenario9/services.xml
+++ b/samples/secpolicy/scenario9/services.xml
@@ -58,10 +58,10 @@
<rampc:User>Bob</rampc:User>
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/alice_cert.cert</rampc:ReceiverCertificate>
- <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_cert.cert</rampc:Certificate>
- <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/samples/data/keys/bhome/alice_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/samples/data/keys/bhome/bob_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/samples/data/keys/bhome/bob_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
diff --git a/src/util/rampart_error.c b/src/util/rampart_error.c
index 6660776..dfbea1f 100644
--- a/src/util/rampart_error.c
+++ b/src/util/rampart_error.c
@@ -20,7 +20,7 @@
AXIS2_IMPORT extern const axis2_char_t* axutil_error_messages[];
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
rampart_error_init()
{
/* A namespace that is not supported by Sandesha2 */
