axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r372495 - in /webservices/axis2/trunk/c: modules/core/deployment/axis2_deployment.h modules/core/deployment/repos_listener.c modules/core/deployment/svc_builder.c modules/core/deployment/ws_info_list.c test/core/deployment/test_deployment.c
Date Thu, 26 Jan 2006 10:15:45 GMT
Author: damitha
Date: Thu Jan 26 02:15:30 2006
New Revision: 372495

URL: http://svn.apache.org/viewcvs?rev=372495&view=rev
Log:
Fixed Jira AXIS2C-34


Modified:
    webservices/axis2/trunk/c/modules/core/deployment/axis2_deployment.h
    webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c
    webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
    webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c
    webservices/axis2/trunk/c/test/core/deployment/test_deployment.c

Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_deployment.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/axis2_deployment.h?rev=372495&r1=372494&r2=372495&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_deployment.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_deployment.h Thu Jan 26 02:15:30
2006
@@ -65,8 +65,8 @@
 #define AXIS2_OUT_FAILTFLOW "Outfaultflow" /* faultflow start tag */
 
 /* #define AXIS2_FOLDE_NAME "D:/Axis 2.0/projects/Deployement/test-data" */
-#define AXIS2_MODULE_PATH "/modules/"
-#define AXIS2_SVC_PATH "/services/"
+#define AXIS2_MODULE_PATH "modules"
+#define AXIS2_SVC_PATH "services"
 
 /* for jws file extension */
 #define AXIS2_JWS_EXTENSION ".jws"

Modified: webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c?rev=372495&r1=372494&r2=372495&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c Thu Jan 26 02:15:30
2006
@@ -212,12 +212,15 @@
 {
     axis2_repos_listener_impl_t *listener_impl = NULL;
     axis2_char_t *module_path = NULL;
+    axis2_char_t *temp_path = NULL;
     
     AXIS2_FUNC_PARAM_CHECK(listener, env, AXIS2_FAILURE);
     listener_impl = AXIS2_INTF_TO_IMPL(listener);
     
-    module_path = AXIS2_STRACAT(listener_impl->folder_name, AXIS2_MODULE_PATH,
+    temp_path = AXIS2_STRACAT(listener_impl->folder_name, AXIS2_PATH_SEP_STR, 
         env);
+    module_path = AXIS2_STRACAT(temp_path, AXIS2_MODULE_PATH, env);
+    AXIS2_FREE((*env)->allocator, temp_path);
     return axis2_repos_listener_search(listener, env, module_path, AXIS2_MODULE);
 }
 
@@ -227,10 +230,14 @@
 {
     axis2_repos_listener_impl_t *listener_impl = NULL;
     axis2_char_t *svc_path = NULL;
+    axis2_char_t *temp_path = NULL;
     
     AXIS2_FUNC_PARAM_CHECK(listener, env, AXIS2_FAILURE);
     listener_impl = AXIS2_INTF_TO_IMPL(listener);
-    svc_path = AXIS2_STRACAT(listener_impl->folder_name, AXIS2_SVC_PATH, env);
+    temp_path = AXIS2_STRACAT(listener_impl->folder_name, AXIS2_PATH_SEP_STR, 
+        env);
+    svc_path = AXIS2_STRACAT(temp_path, AXIS2_SVC_PATH, env);
+    AXIS2_FREE((*env)->allocator, temp_path);
     return axis2_repos_listener_search(listener, env, svc_path, AXIS2_SVC);
 }
 
@@ -318,7 +325,7 @@
         file = AXIS2_ARRAY_LIST_GET(current_info_list, env, i);
         AXIS2_WS_INFO_LIST_ADD_WS_INFO_ITEM(listener_impl->info_list, env,
             file, type);
-        AXIS2_FILE_FREE(file, env);
+        /*AXIS2_FILE_FREE(file, env);*/
         
     }
     return AXIS2_SUCCESS;

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=372495&r1=372494&r2=372495&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Thu Jan 26 02:15:30 2006
@@ -368,8 +368,6 @@
     /* free all temp vars */
     AXIS2_FREE((*env)->allocator, temp_path);
     temp_path = NULL;
-    AXIS2_FREE((*env)->allocator, svc_folder_path);
-    svc_folder_path = NULL;
     AXIS2_FREE((*env)->allocator, dll_path);
     dll_path = NULL;
     

Modified: webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c?rev=372495&r1=372494&r2=372495&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c Thu Jan 26 02:15:30 2006
@@ -361,7 +361,6 @@
     axis2_ws_info_list_impl_t *info_list_impl = NULL;
     int list_size = 0;
     axis2_array_list_t *temp_list = NULL;
-    axis2_char_t *file_name = NULL;
     int i = 0;
     
     AXIS2_FUNC_PARAM_CHECK(info_list, env, AXIS2_FAILURE);
@@ -384,13 +383,16 @@
         
         file_item = (axis2_ws_info_t *) AXIS2_ARRAY_LIST_GET(info_list_impl->
             info_list, env, i);
+        file_item_name = AXIS2_WS_INFO_GET_FILE_NAME(file_item, env);            
         current_lists_size = AXIS2_ARRAY_LIST_SIZE(info_list_impl->
             current_info_lists, env);
         for (j = 0; j < current_lists_size; j++) 
         {
-            file_item_name = AXIS2_WS_INFO_GET_FILE_NAME(file_item, env);            
+            axis2_char_t *file_name = NULL;
+            printf("file_item_name:%s\n", file_item_name);
             file_name = (axis2_char_t *) AXIS2_ARRAY_LIST_GET(info_list_impl->
                 current_info_lists, env, j);
+            printf("file_name:%s\n", file_name);
             if(0 == AXIS2_STRCMP(file_name, file_item_name))
             {
                 exist = AXIS2_TRUE;

Modified: webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/core/deployment/test_deployment.c?rev=372495&r1=372494&r2=372495&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/deployment/test_deployment.c (original)
+++ webservices/axis2/trunk/c/test/core/deployment/test_deployment.c Thu Jan 26 02:15:30 2006
@@ -181,9 +181,9 @@
     printf("transport receiver name:%s\n", dll_name);
     AXIS2_DLL_DESC_SET_NAME(dll_desc, &env, dll_name);
     AXIS2_DLL_DESC_SET_TYPE(dll_desc, &env, AXIS2_TRANSPORT_RECV_DLL);
-    axis2_class_loader_init(&env);
     impl_info_param = axis2_param_create(&env, NULL, NULL);
     AXIS2_PARAM_SET_VALUE(impl_info_param, &env, dll_desc);
+    axis2_class_loader_init(&env);
     transport_recv = (axis2_transport_receiver_t *) axis2_class_loader_create_dll(&env,

         impl_info_param);
     is_running = AXIS2_TRANSPORT_RECEIVER_IS_RUNNING(transport_recv, &env);
@@ -218,9 +218,9 @@
     printf("transport sender name:%s\n", dll_name);
     AXIS2_DLL_DESC_SET_NAME(dll_desc, &env, dll_name);
     AXIS2_DLL_DESC_SET_TYPE(dll_desc, &env, AXIS2_TRANSPORT_SENDER_DLL);
-    axis2_class_loader_init(&env);
     impl_info_param = axis2_param_create(&env, NULL, NULL);
     AXIS2_PARAM_SET_VALUE(impl_info_param, &env, dll_desc);
+    axis2_class_loader_init(&env);
     transport_sender = (axis2_transport_sender_t *) axis2_class_loader_create_dll(&env,

         impl_info_param);
     



Mime
View raw message