Fix for RAMPARTC-138
Removing client_repo creation
diff --git a/build/win32/deploy_rampart.bat b/build/win32/deploy_rampart.bat
index 18c1c24..1ad6887 100644
--- a/build/win32/deploy_rampart.bat
+++ b/build/win32/deploy_rampart.bat
@@ -10,10 +10,6 @@
xcopy .\services %AXIS2C_HOME%\services /E /I /Y /S
copy .\samples\src\rampartc\data\server_axis2.xml %AXIS2C_HOME%\axis2.xml
-cd .\samples\src\rampartc\client
-deploy_client_repo.bat
-cd ..\..\..\..\
-
echo -------------------------------------------------------------------------
echo Rampart deployed
echo -------------------------------------------------------------------------
diff --git a/samples/client/Makefile.am b/samples/client/Makefile.am
index 6e5d7de..cb3e5c2 100644
--- a/samples/client/Makefile.am
+++ b/samples/client/Makefile.am
@@ -1,3 +1,2 @@
TESTS =
SUBDIRS = sec_echo sts_client saml_echo issued_token saml_protect
-EXTRA_DIST = deploy_client_repo.bat deploy_client_repo.sh
diff --git a/samples/client/deploy_client_repo.bat b/samples/client/deploy_client_repo.bat
deleted file mode 100644
index f477d8c..0000000
--- a/samples/client/deploy_client_repo.bat
+++ /dev/null
@@ -1,35 +0,0 @@
-echo off
-echo -------------------------------------------------------------------------
-echo deploying client repository ....
-echo -------------------------------------------------------------------------
-
-rem if your client repository is different, change the value.
-set CLIENT_REPO=%AXIS2C_HOME%\client_repo
-
-echo Start creating a client repository at %CLIENT_REPO%
-
-if exist "%CLIENT_REPO%" (
- echo %CLIENT_REPO% exists.
-) else (
- echo Creating a new directory for client repo
- mkdir "%CLIENT_REPO%"
-)
-
-
-@echo Copying axis2.xml to client_repo
-copy /Y "..\data\client_axis2.xml" "%CLIENT_REPO%\axis2.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"
-
-@echo Copying latest modules to client_repo
-xcopy /S/I/Q/Y "%AXIS2C_HOME%\modules" "%CLIENT_REPO%\modules"
-
-echo -------------------------------------------------------------------------
-echo Client repository deployed to %CLIENT_REPO%
-echo -------------------------------------------------------------------------
-echo on
diff --git a/samples/client/deploy_client_repo.sh b/samples/client/deploy_client_repo.sh
deleted file mode 100644
index fc3993a..0000000
--- a/samples/client/deploy_client_repo.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-CLIENT_REPO="$AXIS2C_HOME/client_repo"
-echo "Start creating a client repository at $CLIENT_REPO"
-
-if [ -d $CLIENT_REPO ];
-then
- echo "$CLIENT_REPO exists. "
-else
- #Create client repo
- echo "Creating a new directory for client repo"
- mkdir $CLIENT_REPO
-fi
-
-#copy [client]axis2.xml to CLIENT_REPO
-echo "Copying axis2.xml to $CLIENT_REPO"
-cp ../data/client_axis2.xml $CLIENT_REPO/axis2.xml
-
-#copy libs to client_repo
-echo "Copying libraries to $CLIENT_REPO"
-cp -r $AXIS2C_HOME/lib $CLIENT_REPO/
-
-#INSTALL MODULES to make sure that both server and client have the same module.
-echo "Copying latest modules to $CLIENT_REPO"
-cp -r $AXIS2C_HOME/modules $CLIENT_REPO/
-
-echo "WARNING: Make sure that you have correct configurations in sec_echo/services.xml and $CLIENT_REPO/axis2.xml file."
diff --git a/samples/client/issued_token/echo.c b/samples/client/issued_token/echo.c
index bc34b68..bf54f06 100644
--- a/samples/client/issued_token/echo.c
+++ b/samples/client/issued_token/echo.c
@@ -154,7 +154,7 @@
payload = build_om_payload_for_echo_svc(env);
/*If not engaged in the client's axis2.xml, uncomment this line*/
- /*axis2_svc_client_engage_module(svc_client, env, "rampart");*/
+ axis2_svc_client_engage_module(svc_client, env, "rampart");
/* Send request */
ret_node = axis2_svc_client_send_receive(svc_client, env, payload);
diff --git a/samples/client/saml_echo/echo.c b/samples/client/saml_echo/echo.c
index 53410b0..c1d8ccf 100644
--- a/samples/client/saml_echo/echo.c
+++ b/samples/client/saml_echo/echo.c
@@ -151,7 +151,7 @@
payload = build_om_payload_for_echo_svc(env);
/*If not engaged in the client's axis2.xml, uncomment this line*/
- /*axis2_svc_client_engage_module(svc_client, env, "rampart");*/
+ axis2_svc_client_engage_module(svc_client, env, "rampart");
/* Send request */
ret_node = axis2_svc_client_send_receive(svc_client, env, payload);
diff --git a/samples/client/saml_echo/update_n_run.bat b/samples/client/saml_echo/update_n_run.bat
index 6d47d24..1f989f7 100644
--- a/samples/client/saml_echo/update_n_run.bat
+++ b/samples/client/saml_echo/update_n_run.bat
@@ -1,10 +1,6 @@
@echo off
rem if your client repository is different, change the value.
-set CLIENT_REPO=%AXIS2C_HOME%\client_repo
-
-rem INSTALL MODULE to make sure that both server and client have the same module.
-echo "Copying latest module to client_repo"
-xcopy /E /Y /I "%AXIS2C_HOME%\modules\rampart" "%CLIENT_REPO%\modules\rampart"
+set CLIENT_REPO=%AXIS2C_HOME%
%AXIS2C_HOME%\samples\bin\rampartc\saml_echo.exe http://localhost:9090/axis2/services/sec_echo/echoString %CLIENT_REPO%
diff --git a/samples/client/saml_protect/echo.c b/samples/client/saml_protect/echo.c
index 6ec6d77..85bf6f5 100644
--- a/samples/client/saml_protect/echo.c
+++ b/samples/client/saml_protect/echo.c
@@ -184,7 +184,7 @@
payload = build_om_payload_for_echo_svc(env);
/*If not engaged in the client's axis2.xml, uncomment this line*/
- /*axis2_svc_client_engage_module(svc_client, env, "rampart");*/
+ axis2_svc_client_engage_module(svc_client, env, "rampart");
/* Send request */
ret_node = axis2_svc_client_send_receive(svc_client, env, payload);
diff --git a/samples/client/saml_protect/update_n_run.bat b/samples/client/saml_protect/update_n_run.bat
index b403c9e..6924f99 100644
--- a/samples/client/saml_protect/update_n_run.bat
+++ b/samples/client/saml_protect/update_n_run.bat
@@ -1,10 +1,6 @@
@echo off
rem if your client repository is different, change the value.
-set CLIENT_REPO=%AXIS2C_HOME%\client_repo
-
-rem INSTALL MODULE to make sure that both server and client have the same module.
-echo "Copying latest module to client_repo"
-xcopy /E /Y /I "%AXIS2C_HOME%\modules\rampart" "%CLIENT_REPO%\modules\rampart"
+set CLIENT_REPO=%AXIS2C_HOME%
%AXIS2C_HOME%\samples\bin\rampartc\saml_protect_echo.exe http://localhost:9090/axis2/services/sec_echo/echoString %CLIENT_REPO%
diff --git a/samples/client/sec_echo/echo.c b/samples/client/sec_echo/echo.c
index 20f4281..281a8d6 100644
--- a/samples/client/sec_echo/echo.c
+++ b/samples/client/sec_echo/echo.c
@@ -26,13 +26,16 @@
#include <axis2_addr.h>
axiom_node_t *
-build_om_payload_for_echo_svc(const axutil_env_t *env);
+build_om_payload_for_echo_svc(
+ const axutil_env_t *env);
axiom_node_t *
-build_om_payload_for_echo_svc_interop(const axutil_env_t *env);
+build_om_payload_for_echo_svc_interop(
+ const axutil_env_t *env);
-axiom_node_t *
-build_om_programatically_mtom(const axutil_env_t * env);
+axiom_node_t *
+build_om_programatically_mtom(
+ const axutil_env_t * env);
int
main(
@@ -158,7 +161,7 @@
/*axis2_options_set_enable_mtom(options, env, AXIS2_TRUE);*/
/*If not engaged in the client's axis2.xml, uncomment this line*/
- /*axis2_svc_client_engage_module(svc_client, env, "rampart");*/
+ axis2_svc_client_engage_module(svc_client, env, "rampart");
/* Send request */
ret_node = axis2_svc_client_send_receive(svc_client, env, payload);
@@ -218,7 +221,8 @@
/* build SOAP request message content using OM */
axiom_node_t *
-build_om_payload_for_echo_svc(const axutil_env_t *env)
+build_om_payload_for_echo_svc(
+ const axutil_env_t *env)
{
axiom_node_t *echo_om_node = NULL;
axiom_element_t* echo_om_ele = NULL;
@@ -229,23 +233,25 @@
ns1 = axiom_namespace_create(env, "http://ws.apache.org/rampart/c/samples", "ns1");
/*ns1 = axiom_namespace_create(env, "http://echo.services.wsas.wso2.org", "ns1");*/
- echo_om_ele = axiom_element_create(env, NULL, "echoIn", ns1, &echo_om_node);
-
+ echo_om_ele = axiom_element_create(env, NULL, "echoIn", ns1, &echo_om_node);
+
text_om_ele = axiom_element_create(env, echo_om_node, "text", NULL, &text_om_node);
axiom_element_set_text(text_om_ele, env, "Hello", text_om_node);
om_str = axiom_node_to_string(echo_om_node, env);
- if (om_str){
+ if(om_str)
+ {
printf("\nSending OM : %s\n", om_str);
AXIS2_FREE(env->allocator, om_str);
- om_str = NULL;
+ om_str = NULL;
}
return echo_om_node;
}
/* build SOAP request message content using OM (for java interop)*/
axiom_node_t *
-build_om_payload_for_echo_svc_interop(const axutil_env_t *env)
+build_om_payload_for_echo_svc_interop(
+ const axutil_env_t *env)
{
axiom_node_t *ping_request_om_node = NULL;
axiom_element_t* ping_request_om_ele = NULL;
@@ -259,82 +265,78 @@
ns0 = axiom_namespace_create(env, "http://InteropBaseAddress/interop", "ns0");
ns1 = axiom_namespace_create(env, "http://xmlsoap.org/Ping", "ns1");
- ping_request_om_ele = axiom_element_create(env, NULL, "PingRequest", ns0, &ping_request_om_node);
- ping_om_ele = axiom_element_create(env, ping_request_om_node, "Ping", ns1, &ping_om_node);
-
+ ping_request_om_ele
+ = axiom_element_create(env, NULL, "PingRequest", ns0, &ping_request_om_node);
+ ping_om_ele = axiom_element_create(env, ping_request_om_node, "Ping", ns1, &ping_om_node);
+
text_om_ele = axiom_element_create(env, ping_om_node, "scenario", ns1, &text_om_node);
axiom_element_set_text(text_om_ele, env, "scenario", text_om_node);
- text_om_node= NULL;
+ text_om_node = NULL;
text_om_ele = axiom_element_create(env, ping_om_node, "origin", ns1, &text_om_node);
axiom_element_set_text(text_om_ele, env, "origin", text_om_node);
- text_om_node= NULL;
+ text_om_node = NULL;
text_om_ele = axiom_element_create(env, ping_om_node, "text", ns1, &text_om_node);
axiom_element_set_text(text_om_ele, env, "text", text_om_node);
om_str = axiom_node_to_string(ping_request_om_node, env);
- if (om_str){
+ if(om_str)
+ {
printf("\nSending OM : %s\n", om_str);
AXIS2_FREE(env->allocator, om_str);
- om_str = NULL;
+ om_str = NULL;
}
return ping_request_om_node;
}
-/* build SOAP request message content using OM */
-axiom_node_t *
-build_om_programatically_mtom(
- const axutil_env_t * env)
-{
- axiom_node_t *mtom_om_node = NULL;
- axiom_element_t *mtom_om_ele = NULL;
- axiom_node_t *image_om_node = NULL;
- axiom_element_t *image_om_ele = NULL;
- axiom_node_t *file_om_node = NULL;
- axiom_element_t *file_om_ele = NULL;
- axiom_node_t *data_om_node = NULL;
- axiom_text_t *data_text = NULL;
- axiom_namespace_t *ns1 = NULL;
- axis2_char_t *om_str = NULL;
- const axis2_char_t *image_name = "E:/src/C/Axis2C/build/deploy/samples/bin/resources/axis2.jpg";
- const axis2_char_t *to_save_name = "test.jpg";
- axis2_bool_t optimized = AXIS2_TRUE;
-
- axiom_data_handler_t *data_handler = NULL;
-
- ns1 =
- axiom_namespace_create(env, "http://ws.apache.org/axis2/c/samples/mtom",
- "ns1");
- mtom_om_ele =
- axiom_element_create(env, NULL, "mtomSample", ns1, &mtom_om_node);
-
- file_om_ele =
- axiom_element_create(env, mtom_om_node, "fileName", ns1, &file_om_node);
- axiom_element_set_text(file_om_ele, env, to_save_name, file_om_node);
-
- image_om_ele =
- axiom_element_create(env, mtom_om_node, "image", ns1, &image_om_node);
-
- /* This is when we directly give file name */
-
- data_handler = axiom_data_handler_create(env, image_name, "image/jpeg");
-
- /* Uncomment following to set a callback instead of a file */
-
- /*data_handler = axiom_data_handler_create(env, NULL, "image/jpeg");
- axiom_data_handler_set_data_handler_type(data_handler, env, AXIOM_DATA_HANDLER_TYPE_CALLBACK);
- axiom_data_handler_set_user_param(data_handler, env, (void *)image_name);*/
-
- data_text =
- axiom_text_create_with_data_handler(env, image_om_node, data_handler,
- &data_om_node);
-
- axiom_text_set_optimize(data_text, env, optimized);
- /*axiom_text_set_is_swa(data_text, env, AXIS2_TRUE);*/
- om_str = axiom_node_to_string(mtom_om_node, env);
- if (om_str)
- {
- printf("%s", om_str);
- AXIS2_FREE(env->allocator, om_str);
- }
- return mtom_om_node;
-}
+/* build SOAP request message content using OM */
+axiom_node_t *
+build_om_programatically_mtom(
+ const axutil_env_t * env)
+{
+ axiom_node_t *mtom_om_node = NULL;
+ axiom_element_t *mtom_om_ele = NULL;
+ axiom_node_t *image_om_node = NULL;
+ axiom_element_t *image_om_ele = NULL;
+ axiom_node_t *file_om_node = NULL;
+ axiom_element_t *file_om_ele = NULL;
+ axiom_node_t *data_om_node = NULL;
+ axiom_text_t *data_text = NULL;
+ axiom_namespace_t *ns1 = NULL;
+ axis2_char_t *om_str = NULL;
+ const axis2_char_t *image_name = "E:/src/C/Axis2C/build/deploy/samples/bin/resources/axis2.jpg";
+ const axis2_char_t *to_save_name = "test.jpg";
+ axis2_bool_t optimized = AXIS2_TRUE;
+
+ axiom_data_handler_t *data_handler = NULL;
+
+ ns1 = axiom_namespace_create(env, "http://ws.apache.org/axis2/c/samples/mtom", "ns1");
+ mtom_om_ele = axiom_element_create(env, NULL, "mtomSample", ns1, &mtom_om_node);
+
+ file_om_ele = axiom_element_create(env, mtom_om_node, "fileName", ns1, &file_om_node);
+ axiom_element_set_text(file_om_ele, env, to_save_name, file_om_node);
+
+ image_om_ele = axiom_element_create(env, mtom_om_node, "image", ns1, &image_om_node);
+
+ /* This is when we directly give file name */
+
+ data_handler = axiom_data_handler_create(env, image_name, "image/jpeg");
+
+ /* Uncomment following to set a callback instead of a file */
+
+ /*data_handler = axiom_data_handler_create(env, NULL, "image/jpeg");
+ axiom_data_handler_set_data_handler_type(data_handler, env, AXIOM_DATA_HANDLER_TYPE_CALLBACK);
+ axiom_data_handler_set_user_param(data_handler, env, (void *)image_name);*/
+
+ data_text
+ = axiom_text_create_with_data_handler(env, image_om_node, data_handler, &data_om_node);
+
+ axiom_text_set_optimize(data_text, env, optimized);
+ /*axiom_text_set_is_swa(data_text, env, AXIS2_TRUE);*/
+ om_str = axiom_node_to_string(mtom_om_node, env);
+ if(om_str)
+ {
+ printf("%s", om_str);
+ AXIS2_FREE(env->allocator, om_str);
+ }
+ return mtom_om_node;
+}
diff --git a/samples/client/sec_echo/update_n_run.bat b/samples/client/sec_echo/update_n_run.bat
index 0c54106..405bd8a 100644
--- a/samples/client/sec_echo/update_n_run.bat
+++ b/samples/client/sec_echo/update_n_run.bat
@@ -1,10 +1,6 @@
@echo off
rem if your client repository is different, change the value.
-set CLIENT_REPO=%AXIS2C_HOME%\client_repo
-
-rem INSTALL MODULE to make sure that both server and client have the same module.
-echo "Copying latest module to client_repo"
-xcopy /E /Y /I "%AXIS2C_HOME%\modules\rampart" "%CLIENT_REPO%\modules\rampart"
+set CLIENT_REPO=%AXIS2C_HOME%
%AXIS2C_HOME%\samples\bin\rampartc\sec_echo.exe http://localhost:9090/axis2/services/sec_echo %CLIENT_REPO%
diff --git a/samples/client/sec_echo/update_n_run.sh b/samples/client/sec_echo/update_n_run.sh
index dcab6bb..e355280 100755
--- a/samples/client/sec_echo/update_n_run.sh
+++ b/samples/client/sec_echo/update_n_run.sh
@@ -1,10 +1,6 @@
#!/bin/bash
#If your client repository is different, change the value.
-CLIENT_REPO="$AXIS2C_HOME/client_repo"
-
-#INSTALL MODULE to make sure that both server and client have the same module.
-echo "Copying latest module to client_repo"
-cp -r $AXIS2C_HOME/modules/rampart $CLIENT_REPO/modules
+CLIENT_REPO="$AXIS2C_HOME"
#RUN
./sec_echo http://localhost:9090/axis2/services/sec_echo $CLIENT_REPO
diff --git a/samples/data/Makefile.am b/samples/data/Makefile.am
index b9bf8cc..10f6ffd 100644
--- a/samples/data/Makefile.am
+++ b/samples/data/Makefile.am
@@ -1,3 +1,3 @@
resdir=$(prefix)/samples/src/rampartc/data
-res_DATA= passwords.txt server_axis2.xml client_axis2.xml
+res_DATA= passwords.txt server_axis2.xml
diff --git a/samples/data/client_axis2.xml b/samples/data/client_axis2.xml
deleted file mode 100644
index ee3bb88..0000000
--- a/samples/data/client_axis2.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<axisconfig name="Axis2/C">
- <!-- ================================================= -->
- <!-- Parameters -->
- <!-- ================================================= -->
- <!-- Uncomment following to enable MTOM support globally -->
- <!--parameter name="enableMTOM" locked="false">true</parameter-->
-
- <!-- Set the suitable size for optimum memory usage when sending large attachments -->
- <!--parameter name="MTOMBufferSize" locked="false">10</parameter-->
- <!--parameter name="MTOMMaxBuffers" locked="false">1000</parameter-->
- <!--parameter name="EnableMTOMServiceCallback" locked="false">true</parameter-->
- <!--parameter name="attachmentDIR" locked="false">/path/to/the/attachment/caching/dir/</parameter-->
- <!--parameter name="MTOMCachingCallback" locked="false">/path/to/the/caching_callback</parameter-->
- <!--parameter name="MTOMSendingCallback" locked="false">/path/to/the/sending_callback</parameter-->
-
- <!-- Enable REST -->
- <parameter name="enableREST" locked="false">true</parameter>
-
- <!-- Uncomment following to persist op_ctx, useful with RM -->
- <!--parameter name="persistOperationContext" locked="false">true</parameter-->
-
- <!--if you want to extract the service archive file and work with that please uncomment this-->
- <!--else , it wont extract archive file or does not take into consideration if someone drop-->
- <!--exploded directory into /service directory-->
- <!--<parameter name="extractServiceArchive" locked="false">true</parameter>-->
-
-
- <!-- ================================================= -->
- <!-- Message Receivers -->
- <!-- ================================================= -->
- <!-- This is the Deafult Message Receiver for the Request Response style Operations -->
- <!--messageReceiver mep="INOUT" class="axis2_receivers"/-->
-
-
- <!-- ================================================= -->
- <!-- Transport Ins -->
- <!-- ================================================= -->
-
- <transportReceiver name="http" class="axis2_http_receiver">
- <parameter name="port" locked="false">6060</parameter>
- <parameter name="exposeHeaders" locked="true">false</parameter>
- </transportReceiver>
-
- <!--transportReceiver name="https" class="axis2_http_receiver">
- <parameter name="port" locked="false">6060</parameter>
- <parameter name="exposeHeaders" locked="true">false</parameter>
- </transportReceiver-->
-
- <!--transportReceiver name="tcp" class="axis2_tcp_receiver">
- <parameter name="port" locked="false">6060</parameter>
- </transportReceiver-->
-
-
- <!-- ================================================= -->
- <!-- Transport Outs -->
- <!-- ================================================= -->
-
- <transportSender name="http" class="axis2_http_sender">
- <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
- <parameter name="xml-declaration" insert="false"/>
- <!--parameter name="Transfer-Encoding">chunked</parameter-->
- <!--parameter name="HTTP-Authentication" username="" password="" locked="true"/-->
- <!--parameter name="PROXY" proxy_host="127.0.0.1" proxy_port="8080" proxy_username="" proxy_password="" locked="true"/-->
- </transportSender>
-
- <!-- Uncomment the following with appropriate parameters to enable the SSL transport sender.
- Also make sure that the appropriate transport receiver is enabled above.-->
- <!--transportSender name="https" class="axis2_http_sender">
- <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
- <parameter name="xml-declaration" insert="false"/>
- </transportSender>
- <parameter name="SERVER_CERT">/path/to/ca/certificate</parameter>
- <parameter name="KEY_FILE">/path/to/client/certificate/chain/file</parameter>
- <parameter name="SSL_PASSPHRASE">passphrase</parameter>
- -->
-
- <!-- Uncomment this one with the appropriate papameters to enable the TCP transport Sender-->
- <!--transportSender name="tcp" class="axis2_tcp_sender">
- <parameter name="PROTOCOL" locked="false">TCP</parameter>
- <parameter name="xml-declaration" insert="false"/>
- </transportSender-->
-
-
- <!-- ================================================= -->
- <!-- Global Modules -->
- <!-- ================================================= -->
- <!-- Comment this to disable Addressing -->
- <module ref="addressing"/>
-
- <!-- Comment this to disable Security -->
- <module ref="rampart"/>
-
-
- <!--Configuring module , providing paramters for modules whether they refer or not-->
- <!--<moduleConfig name="addressing">-->
- <!--<parameter name="addressingPara" locked="false">N/A</parameter>-->
- <!--</moduleConfig>-->
-
- <!-- ================================================= -->
- <!-- Phases -->
- <!-- ================================================= -->
- <phaseOrder type="inflow">
- <!-- System pre defined phases -->
- <phase name="Transport"/>
- <phase name="PreDispatch"/>
- <phase name="Dispatch"/>
- <phase name="PostDispatch"/>
- <!-- End system pre defined phases -->
- <!-- After PostDispatch phase, module or service author can add any phase as required -->
- <!-- User defined phases could be added here -->
- <phase name="Security" />
- <!--phase name="userphase1"/-->
- <!--phase name="RMPhase"/-->
- <!--phase name="SavanPhase"/-->
- </phaseOrder>
- <phaseOrder type="outflow">
- <!-- User defined phases could be added here -->
- <!--phase name="RMPhase"/-->
- <!--phase name="SavanPhase"/-->
- <!--phase name="userphase1"/-->
- <!--system predefined phase-->
- <phase name="MessageOut"/>
- <phase name="Security"/>
- </phaseOrder>
- <phaseOrder type="INfaultflow">
- <!-- User defined phases could be added here -->
- <!--phase name="userphase1"/-->
- <!--phase name="RMPhase"/-->
- <!--phase name="SavanPhase"/-->
- </phaseOrder>
- <phaseOrder type="Outfaultflow">
- <!-- User defined phases could be added here -->
- <!--phase name="RMPhase"/-->
- <!--phase name="SavanPhase"/-->
- <!--phase name="userphase1"/-->
- <phase name="MessageOut"/>
- </phaseOrder>
-</axisconfig>
-
diff --git a/samples/secpolicy/deploy.bat b/samples/secpolicy/deploy.bat
index 2175ece..02a32e3 100644
--- a/samples/secpolicy/deploy.bat
+++ b/samples/secpolicy/deploy.bat
@@ -5,7 +5,7 @@
echo Deploying %scn%
echo Copying %scn%\client policy file
-deploy.js %scn%\client-policy.xml %AXIS2C_HOME%\client_repo\policy.xml
+deploy.js %scn%\client-policy.xml %AXIS2C_HOME%\policy.xml
echo Copying %scn%\services.xml
deploy.js %scn%\services.xml %AXIS2C_HOME%\services\sec_echo\services.xml
diff --git a/samples/secpolicy/deploy.sh b/samples/secpolicy/deploy.sh
index 5bc5fee..ad35c82 100644
--- a/samples/secpolicy/deploy.sh
+++ b/samples/secpolicy/deploy.sh
@@ -6,7 +6,7 @@
fi
INST_DIR=$AXIS2C_HOME
-CLIENT_REPO="$INST_DIR/client_repo/"
+CLIENT_REPO="$INST_DIR/"
SERVICE_HOME="$INST_DIR/services/sec_echo"
#COPYING THE RELEVENT POLICY FILES TO CLIENT AND SERVER
