You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by sa...@apache.org on 2006/07/24 07:47:23 UTC
svn commit: r424913 - in /webservices/sandesha/trunk/c: config/ src/core/
src/handlers/ src/storage/inmemory/ src/util/
Author: sahan
Date: Sun Jul 23 22:47:22 2006
New Revision: 424913
URL: http://svn.apache.org/viewvc?rev=424913&view=rev
Log:
Adding custom axis2.xml.
Fixing some bugs
Added:
webservices/sandesha/trunk/c/config/axis2.xml
Modified:
webservices/sandesha/trunk/c/config/module.xml
webservices/sandesha/trunk/c/src/core/mod_sandesha2.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c
webservices/sandesha/trunk/c/src/storage/inmemory/create_seq_mgr.c
webservices/sandesha/trunk/c/src/storage/inmemory/invoker_mgr.c
webservices/sandesha/trunk/c/src/storage/inmemory/next_msg_mgr.c
webservices/sandesha/trunk/c/src/storage/inmemory/sender_mgr.c
webservices/sandesha/trunk/c/src/storage/inmemory/seq_property_mgr.c
webservices/sandesha/trunk/c/src/util/Makefile.am
webservices/sandesha/trunk/c/src/util/property_bean.c
webservices/sandesha/trunk/c/src/util/property_mgr.c
Added: webservices/sandesha/trunk/c/config/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/config/axis2.xml?rev=424913&view=auto
==============================================================================
--- webservices/sandesha/trunk/c/config/axis2.xml (added)
+++ webservices/sandesha/trunk/c/config/axis2.xml Sun Jul 23 22:47:22 2006
@@ -0,0 +1,166 @@
+<axisconfig name="Axis2/C">
+ <!-- ================================================= -->
+ <!-- Parameters -->
+ <!-- ================================================= -->
+ <parameter name="hotdeployment" locked="false">false</parameter>
+ <parameter name="hotupdate" locked="false">false</parameter>
+ <!--parameter name="enableMTOM" locked="false">true</parameter-->
+ <!-- Uncomment this to enable REST support -->
+ <!-- <parameter name="enableREST" locked="false">true</parameter>-->
+
+
+ <parameter name="userName" locked="false">admin</parameter>
+ <parameter name="password" locked="false">axis2</parameter>
+
+ <parameter name="seralizeLocation" locked="false">.</parameter>
+ <hostConfiguration>
+ <ip>127.0.0.1</ip>
+ <port>5555</port>
+ </hostConfiguration>
+
+
+ <!--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>-->
+
+
+ <!-- The way of adding listener to the system-->
+ <!-- <listener class="org.apache.axis2.ObserverIMPL">-->
+ <!-- <parameter name="RSS_URL" locked="false">http://127.0.0.1/rss</parameter>-->
+ <!-- </listener>-->
+
+ <!-- ================================================= -->
+ <!-- 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>
+ </transportReceiver>
+
+ <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
+ <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
+ <parameter name="transport.mail.pop3.host" locked="false">127.0.0.1</parameter>
+ <parameter name="transport.mail.pop3.user" locked="false">axis2</parameter>
+ <parameter name="transport.mail.pop3.password" locked="false">axis2</parameter>
+ <parameter name="transport.mail.pop3.port" locked="false">110</parameter>
+ <parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>
+ </transportReceiver> -->
+
+ <!--
+ <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
+ <parameter name="port" locked="false">6060</parameter>
+ </transportReceiver>
+ -->
+ <!-- ================================================= -->
+ <!-- Transport Outs -->
+ <!-- ================================================= -->
+
+ <!--
+ <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
+ <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
+ -->
+ <transportSender name="http" class="axis2_http_sender">
+ <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
+ <!--parameter name="Transfer-Encoding">chunked</parameter-->
+ <!--parameter name="PROXY" proxy_host="127.0.0.1" proxy_port="8080" locked="true"/-->
+ </transportSender>
+ <!--
+ <transportSender name="https" class="axis2_http_sender">
+ <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
+ </transportSender>
+ -->
+ <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
+ <transportSender name="mailto" class="org.apache.axis2.transport.mail.MailTransportSender">
+ <parameter name="transport.mail.smtp.host" locked="false">127.0.0.1</parameter>
+ <parameter name="transport.mail.smtp.user" locked="false">axis2</parameter>
+ <parameter name="transport.mail.smtp.password" locked="false">axis2</parameter>
+ <parameter name="transport.mail.smtp.port" locked="false">25</parameter>
+ </transportSender>
+ -->
+
+ <!-- ================================================= -->
+ <!-- Global Modules -->
+ <!-- ================================================= -->
+ <!-- Comment this to disable Addressing -->
+ <module ref="addressing"/>
+ <module ref="sandesha2"/>
+
+
+ <!--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="TransportIn"/>
+ <phase name="PreDispatch"/>
+ <phase name="Dispatch">
+ <handler name="AddressingBasedDispatcher"
+ class="axis2_engine">
+ <order phase="Dispatch"/>
+ </handler>
+ <handler name="RequestURIBasedDispatcher"
+ class="axis2_engine">
+ <order phase="Dispatch"/>
+ </handler>
+ <handler name="SOAPActionBasedDispatcher"
+ class="axis2_engine">
+ <order phase="Dispatch"/>
+ </handler>
+ <handler name="SOAPMessageBodyBasedDispatcher"
+ class="axis2_engine">
+ <order phase="Dispatch"/>
+ </handler>
+ </phase>
+ <phase name="PostDispatch">
+ <handler name="DispatchPostConditionsEvaluator"
+ class="axis2_engine">
+ <order phase="PostDispatch"/>
+ </handler>
+ <handler name="InstanceDispatcher"
+ class="axis2_engine">
+ <order phase="PostDispatch"/>
+ </handler>
+ <handler name="SOAPProcessingModelChecker"
+ class="axis2_engine">
+ <order phase="PostDispatch"/>
+ </handler>
+ </phase>
+ <!-- System pre defined phases -->
+ <!-- After Postdispatch phase module author or or service author can add any phase he want -->
+ <!--phase name="userphase1"/-->
+ <phase name="RMPhase"/>
+ </phaseOrder>
+ <phaseOrder type="outflow">
+ <!-- user can add his own phases to this area -->
+ <phase name="RMPhase"/>
+ <!--phase name="userphase1"/-->
+ <!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
+ <!--phase name="PolicyDetermination"/-->
+ <!--phase name="MessageOut"/-->
+ </phaseOrder>
+ <phaseOrder type="INfaultflow">
+ <!-- user can add his own phases to this area -->
+ <!--phase name="userphase1"/-->
+ <phase name="RMPhase"/>
+ </phaseOrder>
+ <phaseOrder type="Outfaultflow">
+ <!-- user can add his own phases to this area -->
+ <phase name="RMPhase"/>
+ <!--phase name="userphase1"/-->
+ <!--phase name="PolicyDetermination"/-->
+ <phase name="MessageOut"/>
+ </phaseOrder>
+</axisconfig>
+
Modified: webservices/sandesha/trunk/c/config/module.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/config/module.xml?rev=424913&r1=424912&r2=424913&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/config/module.xml (original)
+++ webservices/sandesha/trunk/c/config/module.xml Sun Jul 23 22:47:22 2006
@@ -36,15 +36,45 @@
</handler>
</OUTfaultflow>
+ <operation name="RMInOnlyOperation" mep="http://www.w3.org/2004/08/wsdl/in-only">
+ <messageReceiver class="axis2_receivers"/>
+
+ <!-- namespaces for the 2005-02 spec -->
+
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/rm/TerminateSequence</actionMapping>
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/rm/SequenceAcknowledgement</actionMapping>
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequenceResponse</actionMapping>
- <!-- Database connection parameters -->
- <parameter name="sandesha2.db.conn.id" locked="false">jdbc:derby:SANDESHA2DB;create=true</parameter>
- <parameter name="sandesha2.db.driver" locked="false">org.apache.derby.jdbc.EmbeddedDriver</parameter>
- <parameter name="sandesha2.db.sql.dialect" locked="false">org.hibernate.dialect.DerbyDialect</parameter>
- <parameter name="sandesha2.db.username" locked="false"></parameter>
- <parameter name="sandesha2.db.password" locked="false"></parameter>
- <parameter name="sandesha2.db.create.mode" locked="false">update</parameter>
+ <!-- namespaces for the 2005-10 spec -->
+
+ <actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200602/SequenceAcknowledgement</actionMapping>
+ <actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200602/CreateSequenceResponse</actionMapping>
+ <actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200602/AckRequested</actionMapping>
+ </operation>
+
+ <operation name="RMInOutOperation" mep="http://www.w3.org/2004/08/wsdl/in-out">
+ <messageReceiver class="axis2_receivers"/>
+
+ <!-- namespaces for the 2005-02 spec -->
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequence</actionMapping>
+
+ <!-- namespaces for the 2005-10 spec -->
+ <actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200602/CreateSequence</actionMapping>
+ <actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200602/TerminateSequence</actionMapping>
+ <actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200602/CloseSequence</actionMapping>
+ <actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200602/TerminateSequenceResponse</actionMapping>
+ <actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200602/CloseSequenceResponse</actionMapping>
+
+ </operation>
+
+ <!-- Database connection parameters -->
+ <parameter name="sandesha2.db.conn.id" locked="false">jdbc:derby:SANDESHA2DB;create=true</parameter>
+ <parameter name="sandesha2.db.driver" locked="false">org.apache.derby.jdbc.EmbeddedDriver</parameter>
+ <parameter name="sandesha2.db.sql.dialect" locked="false">org.hibernate.dialect.DerbyDialect</parameter>
+ <parameter name="sandesha2.db.username" locked="false"></parameter>
+ <parameter name="sandesha2.db.password" locked="false"></parameter>
+ <parameter name="sandesha2.db.create.mode" locked="false">update</parameter>
</module>
Modified: webservices/sandesha/trunk/c/src/core/mod_sandesha2.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/core/mod_sandesha2.c?rev=424913&r1=424912&r2=424913&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/core/mod_sandesha2.c (original)
+++ webservices/sandesha/trunk/c/src/core/mod_sandesha2.c Sun Jul 23 22:47:22 2006
@@ -74,6 +74,7 @@
AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, module_desc, AXIS2_FAILURE);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] module initializing ..");
const_property_bean = sandesha2_property_mgr_load_properties_from_def_values
(env);
property_bean = sandesha2_property_mgr_load_properties_from_module_desc(env,
@@ -97,6 +98,7 @@
SANDESHA2_STORAGE_MGR_INIT_STORAGE(storage_mgr, env, module_desc);
/* we need to add permenent storage mgr as well */
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] module initializing completed");
return AXIS2_SUCCESS;
}
@@ -150,7 +152,7 @@
AXIS2_HASH_KEY_STRING, sandesha2_global_in_handler_create);
axis2_hash_set(module->handler_create_func_map, "SandeshaInHandler",
AXIS2_HASH_KEY_STRING, sandesha2_in_handler_create);
- axis2_hash_set(module->handler_create_func_map, "SandeshaOutHandler",
+ axis2_hash_set(module->handler_create_func_map, "SandeshaOutHandler",
AXIS2_HASH_KEY_STRING, sandesha2_out_handler_create);
return AXIS2_SUCCESS;
Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c?rev=424913&r1=424912&r2=424913&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c Sun Jul 23 22:47:22 2006
@@ -90,12 +90,12 @@
AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
- AXIS2_LOG_INFO(env->log, "Starting sandesha2 in handler .........");
+ AXIS2_LOG_INFO(env->log, "[sandesha2] Starting in handler .........");
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
if(conf_ctx == NULL)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Configuration Context is NULL");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Configuration Context is NULL");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CONF_CTX_NULL, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -111,7 +111,7 @@
if(reinjected_msg && 0 == AXIS2_STRCMP(SANDESHA2_VALUE_TRUE, reinjected_msg))
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "Exit: sandesha2_in_handler::invoke, reinjected_msg");
+ "[sandesha2] Exit: sandesha2_in_handler::invoke, reinjected_msg");
return AXIS2_SUCCESS; /* Reinjected Messages are not processed by
sandesha2 inflow handlers */
}
@@ -139,7 +139,7 @@
svc = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env);
if(svc == NULL)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Axis2 Service is NULL");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Axis2 Service is NULL");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SVC_NULL, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -172,7 +172,7 @@
AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
prop, AXIS2_FALSE);
}
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Cannot initialize the message");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Cannot initialize the message");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CANNOT_INIT_MSG,
AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -211,7 +211,7 @@
AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
prop, AXIS2_FALSE);
}
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Error in processing the message");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Error in processing the message");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CANNOT_PROCESS_MSG,
AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -227,7 +227,7 @@
AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
prop, AXIS2_FALSE);
}
- AXIS2_LOG_INFO(env->log, "Exit: sandesha2_in_handler::invoke");
+ AXIS2_LOG_INFO(env->log, "[sandesha2] Exit: sandesha2_in_handler::invoke");
return AXIS2_SUCCESS;
}
Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c?rev=424913&r1=424912&r2=424913&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c Sun Jul 23 22:47:22 2006
@@ -95,19 +95,19 @@
AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
- AXIS2_LOG_INFO(env->log, "Starting sandesha2 out handler .........");
+ AXIS2_LOG_INFO(env->log, "[sandesha2] Starting out handler .........");
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
if(conf_ctx == NULL)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Configuration Context is NULL");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Configuration Context is NULL");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CONF_CTX_NULL, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
svc = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env);
if(svc == NULL)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Axis2 Service is NULL");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Axis2 Service is NULL");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SVC_NULL, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -118,7 +118,7 @@
if(str_done && 0 == AXIS2_STRCMP(SANDESHA2_VALUE_TRUE, str_done))
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "Exit: sandesha2_out_handler::invoke, Application Processing Done");
+ "[sandesha2] Exit: sandesha2_out_handler::invoke, Application Processing Done");
return AXIS2_SUCCESS;
}
temp_prop = axis2_property_create(env);
@@ -210,7 +210,7 @@
prop, AXIS2_FALSE);
rolled_back = AXIS2_TRUE;
}
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Error in processing the message");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Error in processing the message");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CANNOT_PROCESS_MSG,
AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -226,7 +226,7 @@
AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
prop, AXIS2_FALSE);
}
- AXIS2_LOG_INFO(env->log, "Exit: sandesha2_out_handler::invoke");
+ AXIS2_LOG_INFO(env->log, "[sandesha2] Exit: sandesha2_out_handler::invoke");
return AXIS2_SUCCESS;
}
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/create_seq_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/create_seq_mgr.c?rev=424913&r1=424912&r2=424913&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/create_seq_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/create_seq_mgr.c Sun Jul 23 22:47:22 2006
@@ -108,7 +108,8 @@
property = AXIS2_CTX_GET_PROPERTY(ctx, env,
SANDESHA2_BEAN_MAP_CREATE_SEQUECE, AXIS2_FALSE);
- seq_mgr_impl->table = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
+ if(NULL != property)
+ seq_mgr_impl->table = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
if(!seq_mgr_impl->table)
{
axis2_property_t *property = NULL;
@@ -361,7 +362,7 @@
size = AXIS2_ARRAY_LIST_SIZE(beans, env);
if( size > 1)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Non-Unique result");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Non-Unique result");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NON_UNIQUE_RESULT, AXIS2_FAILURE);
axis2_thread_mutex_unlock(seq_mgr_impl->mutex);
return NULL;
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/invoker_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/invoker_mgr.c?rev=424913&r1=424912&r2=424913&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/invoker_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/invoker_mgr.c Sun Jul 23 22:47:22 2006
@@ -108,7 +108,8 @@
property = AXIS2_CTX_GET_PROPERTY(ctx, env,
SANDESHA2_BEAN_MAP_STORAGE_MAP, AXIS2_FALSE);
- invoker_impl->table = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
+ if(NULL != property)
+ invoker_impl->table = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
if(!invoker_impl->table)
{
axis2_property_t *property = NULL;
@@ -366,7 +367,7 @@
size = AXIS2_ARRAY_LIST_SIZE(beans, env);
if( size > 1)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Non-Unique result");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Non-Unique result");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NON_UNIQUE_RESULT, AXIS2_FAILURE);
axis2_thread_mutex_unlock(invoker_impl->mutex);
return NULL;
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/next_msg_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/next_msg_mgr.c?rev=424913&r1=424912&r2=424913&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/next_msg_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/next_msg_mgr.c Sun Jul 23 22:47:22 2006
@@ -116,7 +116,8 @@
property = AXIS2_CTX_GET_PROPERTY(ctx, env,
SANDESHA2_BEAN_MAP_NEXT_MESSAGE, AXIS2_FALSE);
- next_msg_impl->table = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
+ if(NULL != property)
+ next_msg_impl->table = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
if(!next_msg_impl->table)
{
axis2_property_t *property = NULL;
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/sender_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/sender_mgr.c?rev=424913&r1=424912&r2=424913&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/sender_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/sender_mgr.c Sun Jul 23 22:47:22 2006
@@ -141,7 +141,8 @@
property = AXIS2_CTX_GET_PROPERTY(ctx, env,
SANDESHA2_BEAN_MAP_RETRANSMITTER, AXIS2_FALSE);
- sender_impl->table = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
+ if(NULL != property)
+ sender_impl->table = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
if(!sender_impl->table)
{
axis2_property_t *property = NULL;
@@ -541,7 +542,7 @@
long time_now = 0;
time_to_send = SANDESHA2_SENDER_BEAN_GET_TIME_TO_SEND(temp, env);
- time_now = SANDESHA2_UTIL_GET_CURRENT_TIME_IN_MILLIS(env);
+ time_now = sandesha2_utils_get_current_time_in_millis(env);
if(time_now >= time_to_send)
{
int msg_type = SANDESHA2_SENDER_BEAN_GET_MSG_TYPE(temp, env);
@@ -571,7 +572,7 @@
long time_now = 0;
time_to_send = SANDESHA2_SENDER_BEAN_GET_TIME_TO_SEND(temp, env);
- time_now = SANDESHA2_UTIL_GET_CURRENT_TIME_IN_MILLIS(env);
+ time_now = sandesha2_utils_get_current_time_in_millis(env);
if(time_now >= time_to_send)
{
axis2_bool_t valid = AXIS2_FALSE;
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/seq_property_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/seq_property_mgr.c?rev=424913&r1=424912&r2=424913&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/seq_property_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/seq_property_mgr.c Sun Jul 23 22:47:22 2006
@@ -130,7 +130,8 @@
property = AXIS2_CTX_GET_PROPERTY(ctx, env,
SANDESHA2_BEAN_MAP_SEQ_PROPERTY, AXIS2_FALSE);
- seq_property_impl->table = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
+ if(NULL != property)
+ seq_property_impl->table = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
if(!seq_property_impl->table)
{
axis2_property_t *property = NULL;
Modified: webservices/sandesha/trunk/c/src/util/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/Makefile.am?rev=424913&r1=424912&r2=424913&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/util/Makefile.am Sun Jul 23 22:47:22 2006
@@ -12,6 +12,7 @@
msg_init.c \
msg_creator.c\
msg_retrans_adjuster.c\
+ property_bean.c\
property_mgr.c
INCLUDES = -I$(top_builddir)/include \
Modified: webservices/sandesha/trunk/c/src/util/property_bean.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/property_bean.c?rev=424913&r1=424912&r2=424913&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/property_bean.c (original)
+++ webservices/sandesha/trunk/c/src/util/property_bean.c Sun Jul 23 22:47:22 2006
@@ -17,7 +17,7 @@
#include <sandesha2/sandesha2_constants.h>
#include <stdio.h>
#include <axis2_string.h>
-
+#include <axis2_utils.h>
/**
* @brief Property Bean struct impl
@@ -32,8 +32,8 @@
long ack_interval;
long retrans_interval;
axis2_bool_t is_exp_backoff;
- axis2_char_t *in_mem_storage_manager;
- axis2_char_t *permanent_storage_manager;
+ axis2_char_t *in_mem_storage_mgr;
+ axis2_char_t *permanent_storage_mgr;
axis2_bool_t is_in_order;
axis2_array_list_t *msg_types_to_drop;
int max_retrans_count;
@@ -90,22 +90,22 @@
const axis2_env_t *env, axis2_bool_t exp_backoff);
axis2_char_t* AXIS2_CALL
-sandesha2_property_bean_get_in_mem_storage_manager
+sandesha2_property_bean_get_in_mem_storage_mgr
(sandesha2_property_bean_t *bean,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-sandesha2_property_bean_set_in_mem_storage_manager
+sandesha2_property_bean_set_in_mem_storage_mgr
(sandesha2_property_bean_t *bean,
const axis2_env_t *env, axis2_char_t *manager);
axis2_char_t* AXIS2_CALL
-sandesha2_property_bean_get_permanent_storage_manager
+sandesha2_property_bean_get_permanent_storage_mgr
(sandesha2_property_bean_t *bean,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-sandesha2_property_bean_set_permanent_storage_manager
+sandesha2_property_bean_set_permanent_storage_mgr
(sandesha2_property_bean_t *bean,
const axis2_env_t *env, axis2_char_t *manager);
@@ -168,8 +168,8 @@
property_bean_impl->ack_interval = 0;
property_bean_impl->retrans_interval = 0;
property_bean_impl->is_exp_backoff = 0;
- property_bean_impl->in_mem_storage_manager = NULL;
- property_bean_impl->permanent_storage_manager= NULL;
+ property_bean_impl->in_mem_storage_mgr = NULL;
+ property_bean_impl->permanent_storage_mgr= NULL;
property_bean_impl->is_in_order = AXIS2_FALSE;
property_bean_impl->msg_types_to_drop = NULL;
property_bean_impl->max_retrans_count = 0;
@@ -202,14 +202,14 @@
sandesha2_property_bean_is_exp_backoff;
property_bean_impl->bean.ops->set_exp_backoff =
sandesha2_property_bean_set_exp_backoff;
- property_bean_impl->bean.ops->get_in_mem_storage_manager =
- sandesha2_property_bean_get_in_mem_storage_manager;
- property_bean_impl->bean.ops->set_in_mem_storage_manager =
- sandesha2_property_bean_set_in_mem_storage_manager;
- property_bean_impl->bean.ops->get_permanent_storage_manager =
- sandesha2_property_bean_get_permanent_storage_manager;
- property_bean_impl->bean.ops->set_permanent_storage_manager =
- sandesha2_property_bean_set_permanent_storage_manager;
+ property_bean_impl->bean.ops->get_in_mem_storage_mgr =
+ sandesha2_property_bean_get_in_mem_storage_mgr;
+ property_bean_impl->bean.ops->set_in_mem_storage_mgr =
+ sandesha2_property_bean_set_in_mem_storage_mgr;
+ property_bean_impl->bean.ops->get_permanent_storage_mgr =
+ sandesha2_property_bean_get_permanent_storage_mgr;
+ property_bean_impl->bean.ops->set_permanent_storage_mgr =
+ sandesha2_property_bean_set_permanent_storage_mgr;
property_bean_impl->bean.ops->is_in_order =
sandesha2_property_bean_is_in_order;
property_bean_impl->bean.ops->set_in_order =
@@ -222,6 +222,8 @@
sandesha2_property_bean_add_msg_type_to_drop;
property_bean_impl->bean.ops->get_max_retrans_count =
sandesha2_property_bean_get_max_retrans_count;
+ property_bean_impl->bean.ops->set_max_retrans_count =
+ sandesha2_property_bean_set_max_retrans_count;
property_bean_impl->bean.ops->free = sandesha2_property_bean_free;
return &(property_bean_impl->bean);
@@ -249,15 +251,15 @@
}
AXIS2_ARRAY_LIST_FREE(property_bean_impl->msg_types_to_drop, env);
}
- if(NULL != property_bean_impl->in_mem_storage_manager)
+ if(NULL != property_bean_impl->in_mem_storage_mgr)
{
- AXIS2_FREE(env->allocator, property_bean_impl->in_mem_storage_manager);
- property_bean_impl->in_mem_storage_manager = NULL;
+ AXIS2_FREE(env->allocator, property_bean_impl->in_mem_storage_mgr);
+ property_bean_impl->in_mem_storage_mgr = NULL;
}
- if(NULL != property_bean_impl->permanent_storage_manager)
+ if(NULL != property_bean_impl->permanent_storage_mgr)
{
- AXIS2_FREE(env->allocator, property_bean_impl->permanent_storage_manager);
- property_bean_impl->permanent_storage_manager = NULL;
+ AXIS2_FREE(env->allocator, property_bean_impl->permanent_storage_mgr);
+ property_bean_impl->permanent_storage_mgr = NULL;
}
if(NULL != bean->ops)
{
@@ -372,43 +374,43 @@
}
axis2_char_t* AXIS2_CALL
-sandesha2_property_bean_get_in_mem_storage_manager
+sandesha2_property_bean_get_in_mem_storage_mgr
(sandesha2_property_bean_t *bean,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
- return SANDESHA2_INTF_TO_IMPL(bean)->in_mem_storage_manager;
+ return SANDESHA2_INTF_TO_IMPL(bean)->in_mem_storage_mgr;
}
axis2_status_t AXIS2_CALL
-sandesha2_property_bean_set_in_mem_storage_manager
+sandesha2_property_bean_set_in_mem_storage_mgr
(sandesha2_property_bean_t *bean,
const axis2_env_t *env, axis2_char_t *manager)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, manager, AXIS2_FAILURE);
- SANDESHA2_INTF_TO_IMPL(bean)->in_mem_storage_manager = AXIS2_STRDUP(manager,
+ SANDESHA2_INTF_TO_IMPL(bean)->in_mem_storage_mgr = AXIS2_STRDUP(manager,
env);
return AXIS2_SUCCESS;
}
axis2_char_t* AXIS2_CALL
-sandesha2_property_bean_get_permanent_storage_manager
+sandesha2_property_bean_get_permanent_storage_mgr
(sandesha2_property_bean_t *bean,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
- return SANDESHA2_INTF_TO_IMPL(bean)->permanent_storage_manager;
+ return SANDESHA2_INTF_TO_IMPL(bean)->permanent_storage_mgr;
}
axis2_status_t AXIS2_CALL
-sandesha2_property_bean_set_permanent_storage_manager
+sandesha2_property_bean_set_permanent_storage_mgr
(sandesha2_property_bean_t *bean,
const axis2_env_t *env, axis2_char_t *manager)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, manager, AXIS2_FAILURE);
- SANDESHA2_INTF_TO_IMPL(bean)->permanent_storage_manager = AXIS2_STRDUP(
+ SANDESHA2_INTF_TO_IMPL(bean)->permanent_storage_mgr = AXIS2_STRDUP(
manager, env);
return AXIS2_SUCCESS;
}
Modified: webservices/sandesha/trunk/c/src/util/property_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/property_mgr.c?rev=424913&r1=424912&r2=424913&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/property_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/property_mgr.c Sun Jul 23 22:47:22 2006
@@ -102,7 +102,7 @@
SANDESHA2_DEF_VAL_PERM_STORAGE_MGR);
SANDESHA2_PROPERTY_BEAN_SET_MAX_RETRANS_COUNT(property_bean, env,
SANDESHA2_DEF_VAL_MAX_RETR_COUNT);
- sandesha2_property_mgr_set_msg_types_to_drop(env,
+ sandesha2_property_mgr_load_msg_types_to_drop(env,
SANDESHA2_DEF_VAL_MSG_TYPES_TO_DROP, property_bean);
return property_bean;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org