You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by da...@apache.org on 2007/02/02 05:39:11 UTC
svn commit: r502483 - in /webservices/sandesha/trunk/c: config/ include/
src/core/ src/msgprocessors/ src/storage/permanent/ src/util/
Author: damitha
Date: Thu Feb 1 20:39:10 2007
New Revision: 502483
URL: http://svn.apache.org/viewvc?view=rev&rev=502483
Log:
Now two messaging and single channel is working with apache2. Also now working
with latest axis2c svn.
Modified:
webservices/sandesha/trunk/c/config/axis2.xml
webservices/sandesha/trunk/c/include/sandesha2_msg_ctx.h
webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c
webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
webservices/sandesha/trunk/c/src/util/terminate_mgr.c
Modified: webservices/sandesha/trunk/c/config/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/config/axis2.xml?view=diff&rev=502483&r1=502482&r2=502483
==============================================================================
--- webservices/sandesha/trunk/c/config/axis2.xml (original)
+++ webservices/sandesha/trunk/c/config/axis2.xml Thu Feb 1 20:39:10 2007
@@ -30,7 +30,7 @@
<!-- Transport Ins -->
<!-- ================================================= -->
<transportReceiver name="http" class="axis2_http_receiver">
- <parameter name="port" locked="false">6060</parameter>
+ <parameter name="port" locked="false">6666</parameter>
</transportReceiver>
<!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
@@ -44,7 +44,7 @@
<!--
<transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port" locked="false">6060</parameter>
+ <parameter name="port" locked="false">6666</parameter>
</transportReceiver>
-->
<!-- ================================================= -->
Modified: webservices/sandesha/trunk/c/include/sandesha2_msg_ctx.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_msg_ctx.h?view=diff&rev=502483&r1=502482&r2=502483
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_msg_ctx.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_msg_ctx.h Thu Feb 1 20:39:10 2007
@@ -243,6 +243,17 @@
sandesha2_msg_ctx_free(
sandesha2_msg_ctx_t *rm_msg_ctx,
const axis2_env_t *env);
+
+AXIS2_EXTERN axis2_stream_t *AXIS2_CALL
+sandesha2_msg_ctx_get_transport_out_stream(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+sandesha2_msg_ctx_set_transport_out_stream(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env,
+ axis2_stream_t *stream);
/** @} */
#ifdef __cplusplus
Modified: webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c?view=diff&rev=502483&r1=502482&r2=502483
==============================================================================
--- webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c (original)
+++ webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c Thu Feb 1 20:39:10 2007
@@ -525,3 +525,25 @@
return rm_msg_ctx->spec_ver;
}
+AXIS2_EXTERN axis2_stream_t *AXIS2_CALL
+sandesha2_msg_ctx_get_transport_out_stream(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env)
+{
+ if(!rm_msg_ctx->msg_ctx)
+ return NULL;
+ return axis2_msg_ctx_get_transport_out_stream(rm_msg_ctx->msg_ctx, env);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+sandesha2_msg_ctx_set_transport_out_stream(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env,
+ axis2_stream_t *stream)
+{
+ if(!rm_msg_ctx->msg_ctx)
+ return AXIS2_FAILURE;
+ return axis2_msg_ctx_set_transport_out_stream(rm_msg_ctx->msg_ctx, env,
+ stream);
+}
+
Modified: webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c?view=diff&rev=502483&r1=502482&r2=502483
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c Thu Feb 1 20:39:10 2007
@@ -480,13 +480,17 @@
sandesha2_msg_ctx_t *make_conn_msg_ctx)
{
axis2_property_t *property = NULL;
+ axis2_stream_t *out_stream = NULL;
if(make_conn_msg_ctx && return_msg_ctx)
{
- property = sandesha2_msg_ctx_get_property(make_conn_msg_ctx, env,
+ /*property = sandesha2_msg_ctx_get_property(make_conn_msg_ctx, env,
AXIS2_TRANSPORT_OUT);
axis2_property_set_own_value(property, env, AXIS2_FALSE);
axis2_msg_ctx_set_property(return_msg_ctx, env, AXIS2_TRANSPORT_OUT,
- axis2_property_clone(property, env), AXIS2_FALSE);
+ axis2_property_clone(property, env), AXIS2_FALSE);*/
+ out_stream = sandesha2_msg_ctx_get_transport_out_stream(make_conn_msg_ctx,
+ env);
+ axis2_msg_ctx_set_transport_out_stream(return_msg_ctx, env, out_stream);
property = sandesha2_msg_ctx_get_property(make_conn_msg_ctx, env,
AXIS2_HTTP_OUT_TRANSPORT_INFO);
axis2_property_set_own_value(property, env, AXIS2_FALSE);
Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c?view=diff&rev=502483&r1=502482&r2=502483
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c Thu Feb 1 20:39:10 2007
@@ -956,6 +956,7 @@
sandesha2_msg_store_bean_get_flow(msg_store_bean, env));
transport_to_str = sandesha2_msg_store_bean_get_transport_to(msg_store_bean,
env);
+ printf("transport_to_str:%s\n", transport_to_str);
if(transport_to_str)
{
property = axis2_property_create_with_args(env, 0, 0, 0, transport_to_str);
Modified: webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/sandesha2_utils.c?view=diff&rev=502483&r1=502482&r2=502483
==============================================================================
--- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Thu Feb 1 20:39:10 2007
@@ -622,6 +622,7 @@
axis2_char_t *addr_ver = NULL;
axis2_char_t *paused_phase_name = NULL;
axis2_svc_grp_t *svc_grp = NULL;
+ axis2_stream_t *out_stream = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, ref_rm_msg, NULL);
@@ -758,14 +759,17 @@
AXIS2_MSG_CTX_SET_PROPERTY(new_msg, env, AXIS2_WSA_VERSION, property,
AXIS2_FALSE);
- property = AXIS2_MSG_CTX_GET_PROPERTY(ref_msg, env, AXIS2_TRANSPORT_OUT,
+ /*property = AXIS2_MSG_CTX_GET_PROPERTY(ref_msg, env, AXIS2_TRANSPORT_OUT,
AXIS2_FALSE);
if(property)
{
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
AXIS2_MSG_CTX_SET_PROPERTY(new_msg, env, AXIS2_TRANSPORT_OUT,
AXIS2_PROPERTY_CLONE(property, env), AXIS2_FALSE);
- }
+ }*/
+ out_stream = axis2_msg_ctx_get_transport_out_stream(ref_msg,
+ env);
+ axis2_msg_ctx_set_transport_out_stream(new_msg, env, out_stream);
property = AXIS2_MSG_CTX_GET_PROPERTY(ref_msg, env,
AXIS2_TRANSPORT_IN, AXIS2_FALSE);
if(property)
Modified: webservices/sandesha/trunk/c/src/util/terminate_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/terminate_mgr.c?view=diff&rev=502483&r1=502482&r2=502483
==============================================================================
--- webservices/sandesha/trunk/c/src/util/terminate_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/terminate_mgr.c Thu Feb 1 20:39:10 2007
@@ -669,7 +669,7 @@
transport_to_bean, env);
property = axis2_property_create_with_args(env, 0, 0, 0, value);
sandesha2_msg_ctx_set_property(terminate_rm_msg, env,
- AXIS2_TRANSPORT_URL, property);
+ AXIS2_TRANSPORT_URL, property);
}
sandesha2_msg_ctx_add_soap_envelope(terminate_rm_msg, env);
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org