Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 77172 invoked from network); 24 Jan 2006 06:30:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 24 Jan 2006 06:30:05 -0000 Received: (qmail 22833 invoked by uid 500); 24 Jan 2006 06:30:04 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 22596 invoked by uid 500); 24 Jan 2006 06:30:03 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 22584 invoked by uid 500); 24 Jan 2006 06:30:03 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 22581 invoked by uid 99); 24 Jan 2006 06:30:03 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Jan 2006 22:30:03 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 23 Jan 2006 22:30:02 -0800 Received: (qmail 77025 invoked by uid 65534); 24 Jan 2006 06:29:41 -0000 Message-ID: <20060124062941.77024.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r371842 - in /webservices/axis2/trunk/c: deploy/services/echo/ deploy/services/svc_grp/ modules/core/deployment/ modules/core/description/ modules/wsdl/ test/unit/wsdl/ Date: Tue, 24 Jan 2006 06:29:40 -0000 To: axis2-cvs@ws.apache.org From: damitha@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: damitha Date: Mon Jan 23 22:29:22 2006 New Revision: 371842 URL: http://svn.apache.org/viewcvs?rev=371842&view=rev Log: in svc_builder.c's populate_svc method, earlier dll_path for service is not set. Fixed it Modified: webservices/axis2/trunk/c/deploy/services/echo/services.xml webservices/axis2/trunk/c/deploy/services/svc_grp/services.xml webservices/axis2/trunk/c/modules/core/deployment/module_builder.c webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c webservices/axis2/trunk/c/modules/core/description/axis2_description.h webservices/axis2/trunk/c/modules/wsdl/wsdl_component.c webservices/axis2/trunk/c/test/unit/wsdl/test_wsdl_component.c Modified: webservices/axis2/trunk/c/deploy/services/echo/services.xml URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/deploy/services/echo/services.xml?rev=371842&r1=371841&r2=371842&view=diff ============================================================================== --- webservices/axis2/trunk/c/deploy/services/echo/services.xml (original) +++ webservices/axis2/trunk/c/deploy/services/echo/services.xml Mon Jan 23 22:29:22 2006 @@ -1,5 +1,5 @@ - echo.so + libecho.so This is a testing service , to test the system is working or not Modified: webservices/axis2/trunk/c/deploy/services/svc_grp/services.xml URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/deploy/services/svc_grp/services.xml?rev=371842&r1=371841&r2=371842&view=diff ============================================================================== --- webservices/axis2/trunk/c/deploy/services/svc_grp/services.xml (original) +++ webservices/axis2/trunk/c/deploy/services/svc_grp/services.xml Mon Jan 23 22:29:22 2006 @@ -2,7 +2,7 @@ - add.so + libadd.so @@ -11,7 +11,7 @@ - multiply.so + libmultiply.so Modified: webservices/axis2/trunk/c/modules/core/deployment/module_builder.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/module_builder.c?rev=371842&r1=371841&r2=371842&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/deployment/module_builder.c (original) +++ webservices/axis2/trunk/c/modules/core/deployment/module_builder.c Mon Jan 23 22:29:22 2006 @@ -379,12 +379,13 @@ if(NULL == mep_url) { /* assuming in-out mep */ - /* TODO op_descrip = new InOnlyAxisOperation(); */ op_desc = axis2_op_create(env); } else { - /* TODO op_descrip = AxisOperationFactory.getOperetionDescription(mepURL); */ + /* TODO op_descrip = AxisOperationFactory.getOperetionDescription(mepURL); + * we don't have a operation constructor taking mepURL as argument. + * do we need this? */ op_desc = axis2_op_create(env); } Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c?rev=371842&r1=371841&r2=371842&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original) +++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Mon Jan 23 22:29:22 2006 @@ -15,6 +15,7 @@ */ #include +#include /** * This struct is to convert OM->ServiceDescrption , where it first create OM @@ -210,7 +211,7 @@ axis2_om_children_qname_iterator_t *operation_itr = NULL; /*axis2_om_children_qname_iterator_t *module_configs_itr = NULL; */ axis2_qname_t *qparamst = NULL; - axis2_qname_t *qdesc = NULL; + /*axis2_qname_t *qdesc = NULL;*/ axis2_qname_t *qmodulest = NULL; axis2_qname_t *qinflowst = NULL; axis2_qname_t *qoutflowst = NULL; @@ -221,8 +222,9 @@ /*axis2_qname_t *qmodule_config = NULL; */ axis2_status_t status = AXIS2_FAILURE; axis2_svc_grp_t *parent = NULL; - axis2_om_element_t *desc_element = NULL; + /*axis2_om_element_t *desc_element = NULL; axis2_om_node_t *desc_node = NULL; + */ axis2_om_children_qname_iterator_t *module_refs = NULL; axis2_om_node_t *in_flow_node = NULL; axis2_om_element_t *in_flow_element = NULL; @@ -235,6 +237,16 @@ axis2_om_attribute_t *name_attr = NULL; axis2_array_list_t *ops = NULL; axis2_char_t *svc_name = NULL; + axis2_char_t *svc_dll_name = NULL; + axis2_dll_desc_t *dll_desc = NULL; + axis2_param_t *impl_info_param = NULL; + axis2_char_t *repos_path = NULL; + axis2_char_t *svcs_path = NULL; + axis2_char_t *temp_path1 = NULL; + axis2_char_t *temp_path2 = NULL; + axis2_char_t *temp_path3 = NULL; + axis2_char_t *dll_path = NULL; + axis2_char_t *svc_folder_path = NULL; int i = 0; int size = 0; @@ -312,6 +324,39 @@ svc_name = AXIS2_OM_ATTRIBUTE_GET_VALUE(name_attr, env); AXIS2_SVC_SET_AXIS2_SVC_NAME(builder_impl->svc, env, svc_name); AXIS2_QNAME_FREE(qattname, env); + + /* create dll_desc and set it in a parameter. then set that param in svc */ + dll_desc = axis2_dll_desc_create(env); + impl_info_param = AXIS2_PARAM_CONTAINER_GET_PARAM(builder_impl->svc-> + param_container, env, AXIS2_SERVICE_CLASS); + svc_dll_name = AXIS2_PARAM_GET_VALUE(impl_info_param, env); + + repos_path = AXIS2_DEP_ENGINE_GET_REPOS_PATH(builder_impl->svc_builder. + desc_builder->engine, env); + temp_path1 = AXIS2_STRACAT(repos_path, AXIS2_PATH_SEP_STR, env); + temp_path2 = AXIS2_STRACAT(temp_path1, AXIS2_SERVICE_FOLDER, env); + svcs_path = AXIS2_STRACAT(temp_path2, AXIS2_PATH_SEP_STR, env); + temp_path3 = AXIS2_STRACAT(svcs_path, svc_name, env); + svc_folder_path = AXIS2_STRACAT(temp_path3, AXIS2_PATH_SEP_STR, env); + dll_path = AXIS2_STRACAT(svc_folder_path, svc_dll_name, env); + AXIS2_DLL_DESC_SET_NAME(dll_desc, env, dll_path); + /* param does not free the value, because it does not know the value type. + * therefore we free the value + */ + AXIS2_FREE((*env)->allocator, svc_dll_name); + /* free all temp vars */ + AXIS2_FREE((*env)->allocator, repos_path); + AXIS2_FREE((*env)->allocator, svcs_path); + AXIS2_FREE((*env)->allocator, temp_path1); + AXIS2_FREE((*env)->allocator, temp_path2); + AXIS2_FREE((*env)->allocator, temp_path3); + AXIS2_FREE((*env)->allocator, svc_folder_path); + AXIS2_FREE((*env)->allocator, dll_path); + + AXIS2_DLL_DESC_SET_TYPE(dll_desc, env, AXIS2_SVC_DLL); + axis2_class_loader_init(env); + AXIS2_PARAM_SET_VALUE(impl_info_param, env, dll_desc); + /* end of my logic */ /* processing service wide modules which required to engage globally */ qmodulest = axis2_qname_create(env, AXIS2_MODULEST, NULL, NULL); @@ -467,7 +512,7 @@ axis2_qname_t *qparamst = NULL; axis2_qname_t *qmsgrecv = NULL; axis2_qname_t *qmodulest = NULL; - axis2_qname_t *qmodule_config = NULL; + /*axis2_qname_t *qmodule_config = NULL;*/ axis2_qname_t *qattname = NULL; axis2_char_t *mep_url = NULL; axis2_char_t *op_name = NULL; Modified: webservices/axis2/trunk/c/modules/core/description/axis2_description.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/axis2_description.h?rev=371842&r1=371841&r2=371842&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/description/axis2_description.h (original) +++ webservices/axis2/trunk/c/modules/core/description/axis2_description.h Mon Jan 23 22:29:22 2006 @@ -111,7 +111,7 @@ /** * Field SERVICE_CLASS */ -#define AXIS2_SERVICE_CLASS "SERVICE_CLASS" +#define AXIS2_SERVICE_CLASS "ServiceClass" /** * Field SERVICE_CLASS_NAME Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_component.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/wsdl_component.c?rev=371842&r1=371841&r2=371842&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/wsdl/wsdl_component.c (original) +++ webservices/axis2/trunk/c/modules/wsdl/wsdl_component.c Mon Jan 23 22:29:22 2006 @@ -209,7 +209,6 @@ AXIS2_FREE((*env)->allocator, component_impl); component_impl = NULL; - return AXIS2_SUCCESS; } Modified: webservices/axis2/trunk/c/test/unit/wsdl/test_wsdl_component.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/wsdl/test_wsdl_component.c?rev=371842&r1=371841&r2=371842&view=diff ============================================================================== --- webservices/axis2/trunk/c/test/unit/wsdl/test_wsdl_component.c (original) +++ webservices/axis2/trunk/c/test/unit/wsdl/test_wsdl_component.c Mon Jan 23 22:29:22 2006 @@ -81,7 +81,7 @@ module_list_map = get_module_list_map(&env); CuAssertPtrNotNull(tc, module_list_map); actual = AXIS2_WSDL_COMPONENT_SET_COMPONENT_PROPERTIES(wsdl_comp, &env, module_list_map); - AXIS2_WSDL_COMPONENT_FREE(wsdl_comp, &env); + /*AXIS2_WSDL_COMPONENT_FREE(wsdl_comp, &env);*/ CuAssertIntEquals(tc, expected, actual); }