ws-axis-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r370025 - in /webservices/axis2/trunk/c: deploy/services/ include/ modules/core/deployment/ modules/platforms/unix/ modules/util/ test/core/deployment/
Date Wed, 18 Jan 2006 03:05:24 GMT
Author: damitha
Date: Tue Jan 17 19:05:06 2006
New Revision: 370025

URL: http://svn.apache.org/viewcvs?rev=370025&view=rev
Log:
load engine is now returning valid conf

Modified:
    webservices/axis2/trunk/c/deploy/services/services.xml
    webservices/axis2/trunk/c/include/axis2_desc_builder.h
    webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c
    webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
    webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
    webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
    webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
    webservices/axis2/trunk/c/modules/platforms/unix/axis2_unix.h
    webservices/axis2/trunk/c/modules/util/axis2_string.h
    webservices/axis2/trunk/c/modules/util/dir_handler.c
    webservices/axis2/trunk/c/modules/util/string.c
    webservices/axis2/trunk/c/test/core/deployment/Makefile.am
    webservices/axis2/trunk/c/test/core/deployment/test_deployment.c

Modified: webservices/axis2/trunk/c/deploy/services/services.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/deploy/services/services.xml?rev=370025&r1=370024&r2=370025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/deploy/services/services.xml (original)
+++ webservices/axis2/trunk/c/deploy/services/services.xml Tue Jan 17 19:05:06 2006
@@ -6,7 +6,7 @@
    </description>
 
     <operation name="echo">
-            <messageReceiver class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"
/>
+            <messageReceiver class="libaxis2_receivers.so" />
     </operation>
 
 </service>

Modified: webservices/axis2/trunk/c/include/axis2_desc_builder.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_desc_builder.h?rev=370025&r1=370024&r2=370025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_desc_builder.h (original)
+++ webservices/axis2/trunk/c/include/axis2_desc_builder.h Tue Jan 17 19:05:06 2006
@@ -151,8 +151,12 @@
                                             axis2_env_t **env,
                                             axis2_char_t *file_name);
     
-    
-    /**
+    axis2_char_t *(AXIS2_CALL *
+    get_file_name_without_prefix) (axis2_desc_builder_t *desc_builder,
+                                    axis2_env_t **env,
+                                    axis2_char_t *short_file_name);    
+ 
+ /**
      * this method is to get the value of attribue
      * eg xsd:anyVal --> anyVal
      *
@@ -162,6 +166,8 @@
     get_value) (axis2_desc_builder_t *desc_builder,
                                     axis2_env_t **env,
                                     axis2_char_t *in);
+                                    
+                                        
 
 
 };
@@ -235,6 +241,9 @@
 
 #define AXIS2_DESC_BUILDER_GET_SHORT_FILE_NAME(desc_builder, env, file_name) \
 		((desc_builder)->ops->get_short_file_name (desc_builder, env, file_name))  
+
+#define AXIS2_DESC_BUILDER_GET_FILE_NAME_WITHOUT_PREFIX(desc_builder, env, file_name) \
+		((desc_builder)->ops->get_file_name_without_prefix (desc_builder, env, file_name))
 
 
 #define AXIS2_DESC_BUILDER_GET_VALUE(desc_builder, env, in) \
 		((desc_builder)->ops->get_value (desc_builder, env, in))  

Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c?rev=370025&r1=370024&r2=370025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c Tue Jan 17 19:05:06
2006
@@ -136,6 +136,14 @@
     arch_file_data_impl->deployable_svcs = NULL;
     arch_file_data_impl->arch_file_data.ops = NULL;
     
+    arch_file_data_impl->deployable_svcs = axis2_array_list_create(env, 20);
+    if(!arch_file_data_impl->deployable_svcs)
+    {
+        axis2_arch_file_data_free(&(arch_file_data_impl->arch_file_data), env);
+		AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+        return NULL;
+    }
+    
 	arch_file_data_impl->arch_file_data.ops = 
 		AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_arch_file_data_ops_t));
 	if(NULL == arch_file_data_impl->arch_file_data.ops)

Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c?rev=370025&r1=370024&r2=370025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c Tue Jan 17 19:05:06 2006
@@ -373,19 +373,22 @@
         axis2_svc_builder_t *svc_builder = NULL;
         axis2_arch_file_data_t *file_data = NULL;
         axis2_array_list_t *dep_svcs = NULL;
+        axis2_char_t *svc_name = NULL;
         
         file_data = AXIS2_DEP_ENGINE_GET_CURRENT_FILE_ITEM(dep_engine, env);
         name = AXIS2_ARCH_FILE_DATA_GET_NAME(file_data, env);
-        printf("name:%s\n", name);
+        printf("name*:%s\n", name);
         short_file_name = AXIS2_DESC_BUILDER_GET_SHORT_FILE_NAME(desc_builder, 
             env, name);
-        printf("short_file_name:%s\n", short_file_name);
-        svc = AXIS2_ARCH_FILE_DATA_GET_SVC(file_data, env, short_file_name);
+        svc_name = AXIS2_DESC_BUILDER_GET_FILE_NAME_WITHOUT_PREFIX(desc_builder,
+            env, short_file_name);
+        printf("svc_name:%s\n", svc_name);
+        svc = AXIS2_ARCH_FILE_DATA_GET_SVC(file_data, env, svc_name);
         if(NULL == svc)
         {
             axis2_qname_t *svc_qname = NULL;
             
-            svc_qname = axis2_qname_create(env, short_file_name, NULL, NULL);
+            svc_qname = axis2_qname_create(env, svc_name, NULL, NULL);
             svc = axis2_svc_create_with_qname(env, svc_qname);
             status = AXIS2_ARCH_FILE_DATA_ADD_SVC(file_data, env, svc);
             if(AXIS2_FAILURE == status)

Modified: webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c?rev=370025&r1=370024&r2=370025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Tue Jan 17 19:05:06 2006
@@ -1051,7 +1051,10 @@
             op_desc = (axis2_op_t *)v;
         
             modules = AXIS2_OP_GET_MODULE_REFS(op_desc, env);
-            size = AXIS2_ARRAY_LIST_SIZE(modules, env);
+            if(modules)
+            {
+                size = AXIS2_ARRAY_LIST_SIZE(modules, env);
+            }
             for (i = 0; i < size; i++) 
             {
                 axis2_qname_t *module_qname = NULL;
@@ -1308,7 +1311,6 @@
                     printf("file_name:%s\n", file_name);
                     status = AXIS2_ARCH_READER_PROCESS_SVC_GRP(arch_reader, env,
                         file_name, dep_engine, svc_grp);
-                    printf("came40\n");
                     if(AXIS2_SUCCESS != status)
                     {
                         AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_SVC, 

Modified: webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c?rev=370025&r1=370024&r2=370025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Tue Jan 17 19:05:06 2006
@@ -15,7 +15,7 @@
  */
  
 #include <axis2_desc_builder.h>
-#include <string.h>
+#include <axis2_string.h>
 #include <axis2_class_loader.h>
 
 /** 
@@ -90,6 +90,10 @@
                                         axis2_env_t **env,
                                         axis2_char_t *file_name);
 
+axis2_char_t *AXIS2_CALL
+axis2_desc_builder_get_file_name_without_prefix(axis2_desc_builder_t *desc_builder,
+                                axis2_env_t **env,
+                                axis2_char_t *short_file_name);
 
 axis2_char_t *AXIS2_CALL
 axis2_desc_builder_get_value(axis2_desc_builder_t *desc_builder,
@@ -145,6 +149,8 @@
             axis2_desc_builder_load_default_msg_recv;
     desc_builder_impl->desc_builder.ops->get_short_file_name = 
             axis2_desc_builder_get_short_file_name;
+    desc_builder_impl->desc_builder.ops->get_file_name_without_prefix =
+            axis2_desc_builder_get_file_name_without_prefix;
     desc_builder_impl->desc_builder.ops->get_value = 
             axis2_desc_builder_get_value;  
 	
@@ -872,7 +878,7 @@
     }
     separator = ".";
     
-    value = strstr(file_name_l, separator);
+    value = AXIS2_STRSTR(file_name_l, separator);
     
     value[0] = AXIS2_EOLN;
     short_name = file_name_l;
@@ -881,6 +887,30 @@
 }
 
 axis2_char_t *AXIS2_CALL
+axis2_desc_builder_get_file_name_without_prefix(axis2_desc_builder_t *desc_builder,
+                                axis2_env_t **env,
+                                axis2_char_t *short_file_name)
+{
+    axis2_char_t *file_name_l = NULL;
+    axis2_char_t *short_name = NULL;
+    int len = 0;
+    printf("short_file_name*:%s\n", short_file_name);
+    AXIS2_FUNC_PARAM_CHECK(desc_builder, env, NULL);
+    AXIS2_PARAM_CHECK((*env)->error, short_file_name, NULL);
+    file_name_l = AXIS2_STRDUP(short_file_name, env);
+    if(!file_name_l)
+    {
+        AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+        return NULL;
+    }
+    len = AXIS2_STRLEN(AXIS2_LIB_PREFIX);
+    short_name = &file_name_l[len];
+    printf("short_name:%s\n", short_name);
+    return short_name;
+
+}
+
+axis2_char_t *AXIS2_CALL
 axis2_desc_builder_get_value(axis2_desc_builder_t *desc_builder,
                                 axis2_env_t **env,
                                 axis2_char_t *in) 
@@ -898,7 +928,7 @@
         AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    value = strpbrk(in_l, separator);
+    value = AXIS2_STRSTR(in_l, separator);
     value = value + 1;
     
     return value;

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=370025&r1=370024&r2=370025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Tue Jan 17 19:05:06 2006
@@ -311,6 +311,7 @@
     name_attr = AXIS2_OM_ELEMENT_GET_ATTRIBUTE(svc_element, env, qattname);
     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);
     /* end of my logic */
     /* processing service wide modules which required to engage globally */
     qmodulest = axis2_qname_create(env, AXIS2_MODULEST, NULL, NULL);
@@ -431,7 +432,7 @@
         module_configs_itr, builder_impl->svc->param_container, builder_impl->svc);
     */
     AXIS2_QNAME_FREE(qparamst, env);
-    AXIS2_QNAME_FREE(qdesc, env) ;
+    /*AXIS2_QNAME_FREE(qdesc, env) ;*/
     AXIS2_QNAME_FREE(qmodulest, env) ;
     AXIS2_QNAME_FREE(qinflowst, env) ;
     AXIS2_QNAME_FREE(qoutflowst, env) ;
@@ -592,7 +593,7 @@
         AXIS2_QNAME_FREE(qparamst, env);
         AXIS2_QNAME_FREE(qmsgrecv, env);
         AXIS2_QNAME_FREE(qmodulest, env);
-        AXIS2_QNAME_FREE(qmodule_config, env);
+        /*AXIS2_QNAME_FREE(qmodule_config, env);*/
         AXIS2_QNAME_FREE(qattname, env);
     }
     return ops;

Modified: webservices/axis2/trunk/c/modules/platforms/unix/axis2_unix.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/platforms/unix/axis2_unix.h?rev=370025&r1=370024&r2=370025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/platforms/unix/axis2_unix.h (original)
+++ webservices/axis2/trunk/c/modules/platforms/unix/axis2_unix.h Tue Jan 17 19:05:06 2006
@@ -159,6 +159,8 @@
  */
 #define AXIS2_PATH_SEP_CHAR '/'
 #define AXIS2_PATH_SEP_STR "/"
+#define AXIS2_LIB_PREFIX "lib"
+#define AXIS2_LIB_SUFFIX ".so"
 
 
 /**

Modified: webservices/axis2/trunk/c/modules/util/axis2_string.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/axis2_string.h?rev=370025&r1=370024&r2=370025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/axis2_string.h (original)
+++ webservices/axis2/trunk/c/modules/util/axis2_string.h Tue Jan 17 19:05:06 2006
@@ -54,6 +54,10 @@
      */
     AXIS2_DECLARE(axis2_char_t*)
     axis2_stracat(const axis2_char_t *s1, const axis2_char_t *s2, axis2_env_t **env);
+    
+    AXIS2_DECLARE(axis2_char_t *)
+    axis2_strstr (const axis2_char_t *heystack,
+                    const axis2_char_t *needle);
 
 
 #define AXIS2_STRDUP(pts, env) axis2_strdup(pts, env)
@@ -62,6 +66,7 @@
 #define AXIS2_STRCASECMP(s1,s2) axis2_strcasecmp(s1,s2)
 #define AXIS2_STRNCASECMP(s1,s2,n) axis2_strncasecmp(s1,s2,n)
 #define AXIS2_STRACAT(s1, s2, env) axis2_stracat(s1, s2, env)
+#define AXIS2_STRSTR(s1, s2) axis2_strstr(s1, s2)
 
 /** @} */
     

Modified: webservices/axis2/trunk/c/modules/util/dir_handler.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/dir_handler.c?rev=370025&r1=370024&r2=370025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/dir_handler.c (original)
+++ webservices/axis2/trunk/c/modules/util/dir_handler.c Tue Jan 17 19:05:06 2006
@@ -109,8 +109,7 @@
 	/* Check for filename extensions */
 	ptr = rindex(entry->d_name, '.');
 	if ((ptr != NULL) &&
-		((strcmp(ptr, ".so") == 0)
-		|| (strcmp(ptr, ".zip") == 0) ))
+		((strcmp(ptr, AXIS2_LIB_SUFFIX) == 0) ))
     {
 		return (AXIS2_TRUE);
     }

Modified: webservices/axis2/trunk/c/modules/util/string.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/string.c?rev=370025&r1=370024&r2=370025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/string.c (original)
+++ webservices/axis2/trunk/c/modules/util/string.c Tue Jan 17 19:05:06 2006
@@ -106,3 +106,10 @@
 	    return(0);
     return(n < 0 ? 0 : toupper(*s1) - toupper(*--s2));
 }
+
+AXIS2_DECLARE(axis2_char_t *)
+axis2_strstr (const axis2_char_t *heystack,
+                const axis2_char_t *needle)
+{
+	return strstr(heystack, needle);
+}

Modified: webservices/axis2/trunk/c/test/core/deployment/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/core/deployment/Makefile.am?rev=370025&r1=370024&r2=370025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/deployment/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/deployment/Makefile.am Tue Jan 17 19:05:06 2006
@@ -1,7 +1,7 @@
 prgbindir=$(prefix)/bin/system_test
 prgbin_PROGRAMS = test_deployment
 SUBDIRS =
-AM_CPPFLAGS = $(CPPFLAGS) -g -pthread
+AM_CFLAGS = $(CFLAGS) -g -pthread
 test_deployment_SOURCES = test_deployment.c
 
 test_deployment_LDADD   =  -L$(AXIS2C_HOME)/lib \

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=370025&r1=370024&r2=370025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/deployment/test_deployment.c (original)
+++ webservices/axis2/trunk/c/test/core/deployment/test_deployment.c Tue Jan 17 19:05:06 2006
@@ -165,9 +165,9 @@
 {
     /*axis2_test_dep_engine_do_deploy();
     axis2_test_engine_conf_builder_populate_conf();*/
-    /*axis2_test_dep_engine_load();*/
+    axis2_test_dep_engine_load();
     /*axis2_test_transport_receiver_load();*/
-    axis2_test_transport_sender_load();
+    /*axis2_test_transport_sender_load();*/
     
 	return 0;
 }



Mime
View raw message