ws-savan-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shan...@apache.org
Subject svn commit: r762303 - in /webservices/savan/trunk/c: build/win32/ include/ src/msgreceivers/ src/publisher/common/ src/util/
Date Mon, 06 Apr 2009 12:09:50 GMT
Author: shankar
Date: Mon Apr  6 12:09:49 2009
New Revision: 762303

URL: http://svn.apache.org/viewvc?rev=762303&view=rev
Log:
Fixing windows build break.

Modified:
    webservices/savan/trunk/c/build/win32/makefile
    webservices/savan/trunk/c/include/savan_error.h
    webservices/savan/trunk/c/include/savan_publisher_mod.h
    webservices/savan/trunk/c/include/savan_util.h
    webservices/savan/trunk/c/src/msgreceivers/savan_msg_recv.c
    webservices/savan/trunk/c/src/publisher/common/publisher_mod.c
    webservices/savan/trunk/c/src/util/error.c
    webservices/savan/trunk/c/src/util/savan_util.c

Modified: webservices/savan/trunk/c/build/win32/makefile
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/build/win32/makefile?rev=762303&r1=762302&r2=762303&view=diff
==============================================================================
--- webservices/savan/trunk/c/build/win32/makefile (original)
+++ webservices/savan/trunk/c/build/win32/makefile Mon Apr  6 12:09:49 2009
@@ -14,17 +14,22 @@
 SAVANSRC = ..\..
 SAVANDISTDIR = ..\savanc
 SAVANINTDIR = .\int.msvc
-SAVANDLL = mod_savan
+SAVANDLL = savan
+MODSAVANDLL = mod_savan
 SAVAN_CLIENT = savan_client
+SAVAN_MSG_RECV = savan_msgreceivers
 
-SAVAN_CODE = $(SAVANSRC)\src\core\*.c \
-		 $(SAVANSRC)\src\client\*.c \
-		 $(SAVANSRC)\src\handlers\*.c \
+SAVAN_CODE = $(SAVANSRC)\src\client\*.c \
 		 $(SAVANSRC)\src\util\*.c \
 		 $(SAVANSRC)\src\subscribers\*.c \
-		 $(SAVANSRC)\src\msgreceivers\*.c \
 		 $(SAVANSRC)\src\storage\common\*.c \
-		 $(SAVANSRC)\src\storage\inmemory\*.c 
+		 $(SAVANSRC)\src\storage\inmemory\*.c \
+		 $(SAVANSRC)\src\publisher\common\*.c 
+
+MOD_SAVAN_CODE = $(SAVANSRC)\src\core\*.c \
+		 $(SAVANSRC)\src\handlers\*.c \
+
+SAVAN_MSG_RECV_CODE = $(SAVANSRC)\src\msgreceivers\*.c
 		
 #compiler options
 CC = @cl.exe
@@ -34,7 +39,7 @@
 
 #linker options 
 LD = @link.exe
-LDFLAGS = /nologo /LIBPATH:$(AXIS2_BIN_DIR)\lib /LIBPATH:$(SAVANDISTDIR)\modules\savan /LIBPATH:$(SAVANDISTDIR)\lib
+LDFLAGS = /nologo /LIBPATH:$(AXIS2_BIN_DIR)\lib /LIBPATH:$(SAVANDISTDIR)\lib
 LIBS = axutil.lib axiom.lib axis2_parser.lib axis2_engine.lib axis2_http_receiver.lib axis2_http_sender.lib
 
 #debug symbols
@@ -106,14 +111,23 @@
 copy_include:
 	@xcopy /E $(SAVANSRC)\include $(SAVANDISTDIR)\include
 
-$(SAVANDISTDIR)\modules\savan\$(SAVANDLL).dll:
+$(SAVANDISTDIR)\lib\$(SAVANDLL).dll:
 	$(CC) $(CFLAGS) $(SAVAN_CODE) /Fo$(SAVANINTDIR)\ /c
 	$(LD) $(LDFLAGS) $(LIBS) $(SAVANINTDIR)\*.obj /DLL \
-	/OUT:$(SAVANDISTDIR)\modules\savan\$(SAVANDLL).dll /IMPLIB:$(SAVANDISTDIR)\modules\savan\$(SAVANDLL).lib
+	/OUT:$(SAVANDISTDIR)\lib\$(SAVANDLL).dll /IMPLIB:$(SAVANDISTDIR)\lib\$(SAVANDLL).lib
+	-@$(_VC_MANIFEST_EMBED_DLL)
+
+savan: $(SAVANDISTDIR)\lib\$(SAVANDLL).dll
+
+$(SAVANDISTDIR)\modules\savan\$(MODSAVANDLL).dll:
+	if not exist $(SAVANINTDIR)\mod_savan mkdir $(SAVANINTDIR)\mod_savan
+	$(CC) $(CFLAGS) $(MOD_SAVAN_CODE) /Fo$(SAVANINTDIR)\mod_savan\ /c
+	$(LD) $(LDFLAGS) $(LIBS) $(SAVANDLL).lib $(SAVAN_MSG_RECV).lib $(SAVANINTDIR)\mod_savan\*.obj
/DLL \
+	/OUT:$(SAVANDISTDIR)\modules\savan\$(MODSAVANDLL).dll /IMPLIB:$(SAVANDISTDIR)\modules\savan\$(MODSAVANDLL).lib
 	-@$(_VC_MANIFEST_EMBED_DLL)
 	@copy $(SAVANSRC)\src\data\module.xml $(SAVANDISTDIR)\modules\savan\module.xml
 
-savan: $(SAVANDISTDIR)\modules\savan\$(SAVANDLL).dll
+mod_savan: $(SAVANDISTDIR)\modules\savan\$(MODSAVANDLL).dll
 
 ##### savan client
 SAVAN_CLIENT_SRC = $(SAVANSRC)\src\client\*.c \
@@ -129,6 +143,15 @@
 
 savan_client: $(SAVANDISTDIR)\lib\$(SAVAN_CLIENT).dll
 
+$(SAVANDISTDIR)\lib\$(SAVAN_MSG_RECV).dll :
+	if not exist $(SAVANINTDIR)\msg_recv mkdir $(SAVANINTDIR)\msg_recv
+	$(CC) $(CFLAGS) $(SAVAN_MSG_RECV_CODE) /Fo$(SAVANINTDIR)\msg_recv\ /c
+	$(LD) $(LDFLAGS) $(LIBS) $(SAVANDLL).lib $(SAVAN_CLIENT).lib $(SAVANINTDIR)\msg_recv\*.obj
/DLL \
+	/OUT:$(SAVANDISTDIR)\lib\$(SAVAN_MSG_RECV).dll /IMPLIB:$(SAVANDISTDIR)\lib\$(SAVAN_MSG_RECV).lib
+	-@$(_VC_MANIFEST_EMBED_DLL)
+
+savan_msg_recv: $(SAVANDISTDIR)\lib\$(SAVAN_MSG_RECV).dll
+
 
 ###samples
 
@@ -167,7 +190,7 @@
 
 subscriber: $(SAVANDISTDIR)\samples\bin\savanc\subscriber.exe
 	
-dist: clean distdir intdir savan savan_client listener weather subscription subscriber copy_include
copy_samples copy_extra
+dist: clean distdir intdir savan savan_client savan_msg_recv mod_savan listener weather subscription
subscriber copy_include copy_samples copy_extra
 
 
 	 

Modified: webservices/savan/trunk/c/include/savan_error.h
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/include/savan_error.h?rev=762303&r1=762302&r2=762303&view=diff
==============================================================================
--- webservices/savan/trunk/c/include/savan_error.h (original)
+++ webservices/savan/trunk/c/include/savan_error.h Mon Apr  6 12:09:49 2009
@@ -100,7 +100,7 @@
     
     } savan_error_codes_t;
 
-    axis2_status_t AXIS2_CALL
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
     savan_error_init();
 
 

Modified: webservices/savan/trunk/c/include/savan_publisher_mod.h
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/include/savan_publisher_mod.h?rev=762303&r1=762302&r2=762303&view=diff
==============================================================================
--- webservices/savan/trunk/c/include/savan_publisher_mod.h (original)
+++ webservices/savan/trunk/c/include/savan_publisher_mod.h Mon Apr  6 12:09:49 2009
@@ -82,10 +82,10 @@
  * @param publisher
  * @param env environment object
  */
-void AXIS2_CALL 
+AXIS2_EXTERN void AXIS2_CALL 
 savan_publisher_mod_free(
     savan_publisher_mod_t *publishermod,
-    const axutil_env_t *envv);
+    const axutil_env_t *env);
 
 /**
  * Apply publisher to payload.

Modified: webservices/savan/trunk/c/include/savan_util.h
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/include/savan_util.h?rev=762303&r1=762302&r2=762303&view=diff
==============================================================================
--- webservices/savan/trunk/c/include/savan_util.h (original)
+++ webservices/savan/trunk/c/include/savan_util.h Mon Apr  6 12:09:49 2009
@@ -57,7 +57,7 @@
      * @param detail, fault deails.
 	*/
 
-	axis2_status_t AXIS2_CALL
+	AXIS2_EXTERN axis2_status_t AXIS2_CALL
 	savan_util_create_fault_envelope(
 		axis2_msg_ctx_t *msg_ctx,
 		const axutil_env_t *env,
@@ -97,7 +97,7 @@
  	* and solution to avoid.
  	*/ 
 
-	axiom_node_t * AXIS2_CALL
+	AXIS2_EXTERN axiom_node_t * AXIS2_CALL
 	savan_util_build_fault_msg(
 		const axutil_env_t *env,
 		axis2_char_t * code,
@@ -105,7 +105,7 @@
 		axis2_char_t * reason,
 		axis2_char_t * detail);
 
-    savan_message_types_t AXIS2_CALL
+    AXIS2_EXTERN savan_message_types_t AXIS2_CALL
     savan_util_get_message_type(
         axis2_msg_ctx_t *msg_ctx,
         const axutil_env_t *env);
@@ -118,7 +118,7 @@
     * @return the ID on success, else NULL
     */
 
-    axis2_char_t * AXIS2_CALL
+    AXIS2_EXTERN axis2_char_t * AXIS2_CALL
     savan_util_get_subscription_id_from_msg(
         const axutil_env_t *env,
         axis2_msg_ctx_t *msg_ctx);
@@ -131,7 +131,7 @@
     * @return a pointer to subscriber on success, else NULL
     */
 
-    savan_subscriber_t * AXIS2_CALL
+    AXIS2_EXTERN savan_subscriber_t * AXIS2_CALL
     savan_util_get_subscriber_from_msg(
         const axutil_env_t *env,
         axis2_msg_ctx_t *msg_ctx,
@@ -148,7 +148,7 @@
     * @return a pointer to subscriber on success, else NULL
     */
 
-    savan_subscriber_t * AXIS2_CALL
+    AXIS2_EXTERN savan_subscriber_t * AXIS2_CALL
     savan_util_get_subscriber_from_renew_msg(
         const axutil_env_t *env,
         axis2_msg_ctx_t *msg_ctx,
@@ -165,7 +165,7 @@
     * @return the store on success, else NULL
     */
 
-    axutil_hash_t * AXIS2_CALL
+    AXIS2_EXTERN axutil_hash_t * AXIS2_CALL
     savan_util_get_subscriber_store(
         const axutil_env_t *env,
         axis2_msg_ctx_t *msg_ctx);
@@ -182,14 +182,14 @@
     * @return the store on success, else NULL
     */
 
-    axis2_status_t AXIS2_CALL
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
     savan_util_add_subscriber(
         const axutil_env_t *env,
         axis2_msg_ctx_t *msg_ctx,
         savan_storage_mgr_t *storage_mgr,
         savan_subscriber_t *subscriber);
 
-    axis2_status_t AXIS2_CALL
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
     savan_util_update_subscriber(
         const axutil_env_t *env,
         axis2_msg_ctx_t *msg_ctx,
@@ -208,7 +208,7 @@
     * @return the store on success, else NULL
     */
 
-    axis2_status_t AXIS2_CALL
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
     savan_util_remove_subscriber(
         const axutil_env_t *env,
         axis2_msg_ctx_t *msg_ctx,
@@ -221,7 +221,7 @@
     * @return the expiry time on success, else NULL
     */
 
-    axis2_char_t * AXIS2_CALL
+    AXIS2_EXTERN axis2_char_t * AXIS2_CALL
     savan_util_get_expiry_time(
         const axutil_env_t *env);
 
@@ -232,7 +232,7 @@
     * @param expiry current expiry time
     * @return the new expiry time on success, else NULL
     */
-    axis2_char_t * AXIS2_CALL
+    AXIS2_EXTERN axis2_char_t * AXIS2_CALL
     savan_util_get_renewed_expiry_time(
         const axutil_env_t *env,
         axis2_char_t *expiry);
@@ -303,13 +303,13 @@
     * @param subs_mgr_url url of the subscription manager
     * @return subscribers in a array list
     */
-    axutil_array_list_t *AXIS2_CALL
+    AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
     savan_util_get_topic_list_from_remote_subs_mgr(
         const axutil_env_t *env,
         axis2_char_t *subs_mgr_url,
         void *s_client);
 
-    savan_subscriber_t *AXIS2_CALL
+    AXIS2_EXTERN savan_subscriber_t *AXIS2_CALL
     savan_util_get_subscriber_from_remote_subs_mgr(
         const axutil_env_t *env,
         axis2_char_t *subs_id,
@@ -317,7 +317,7 @@
         void *s_client,
         axis2_conf_t *conf);
 
-    void *AXIS2_CALL
+    AXIS2_EXTERN void *AXIS2_CALL
     savan_util_get_svc_client(
         const axutil_env_t *env);
 

Modified: webservices/savan/trunk/c/src/msgreceivers/savan_msg_recv.c
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/msgreceivers/savan_msg_recv.c?rev=762303&r1=762302&r2=762303&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/msgreceivers/savan_msg_recv.c (original)
+++ webservices/savan/trunk/c/src/msgreceivers/savan_msg_recv.c Mon Apr  6 12:09:49 2009
@@ -100,6 +100,30 @@
 }
 
 axis2_status_t AXIS2_CALL
+savan_msg_recv_handle_event(
+    const axutil_env_t *env, 
+    axis2_msg_ctx_t *msg_ctx,
+    axis2_msg_ctx_t *new_msg_ctx)
+{
+    axis2_conf_t *conf = NULL;
+    axis2_conf_ctx_t *conf_ctx = NULL;
+    savan_publisher_mod_t *pub_mod = NULL;
+    
+    AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:savan_msg_recv_handle_event");
+   
+    conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
+    conf = axis2_conf_ctx_get_conf(conf_ctx, env);
+
+    pub_mod = savan_publisher_mod_create(env, conf);
+
+    savan_publisher_mod_publish(pub_mod, env, msg_ctx);
+    savan_publisher_mod_free(pub_mod, env);
+    
+    AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Exit:savan_msg_recv_handle_event");
+    return AXIS2_SUCCESS;
+}
+
+axis2_status_t AXIS2_CALL
 savan_msg_recv_invoke_business_logic_sync(
     axis2_msg_recv_t *msg_recv,
     const axutil_env_t *env,
@@ -517,29 +541,6 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_status_t AXIS2_CALL
-savan_msg_recv_handle_event(
-    const axutil_env_t *env, 
-    axis2_msg_ctx_t *msg_ctx,
-    axis2_msg_ctx_t *new_msg_ctx)
-{
-    axis2_conf_t *conf = NULL;
-    axis2_conf_ctx_t *conf_ctx = NULL;
-    savan_publisher_mod_t *pub_mod = NULL;
-    
-    AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:savan_msg_recv_handle_event");
-   
-    conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
-    conf = axis2_conf_ctx_get_conf(conf_ctx, env);
-
-    pub_mod = savan_publisher_mod_create(env, conf);
-
-    savan_publisher_mod_publish(pub_mod, env, msg_ctx);
-    savan_publisher_mod_free(pub_mod, env);
-    
-    AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Exit:savan_msg_recv_handle_event");
-    return AXIS2_SUCCESS;
-}
 
 axiom_soap_envelope_t *AXIS2_CALL
 savan_msg_recv_build_soap_envelope(

Modified: webservices/savan/trunk/c/src/publisher/common/publisher_mod.c
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/publisher/common/publisher_mod.c?rev=762303&r1=762302&r2=762303&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/publisher/common/publisher_mod.c (original)
+++ webservices/savan/trunk/c/src/publisher/common/publisher_mod.c Mon Apr  6 12:09:49 2009
@@ -41,4 +41,10 @@
 {
     publishermod->ops->publish(publishermod, env, msg_ctx);
 }
-
+AXIS2_EXTERN savan_publisher_mod_t * AXIS2_CALL
+savan_publisher_mod_create(
+    const axutil_env_t *env,
+    axis2_conf_t *conf)
+{
+	return NULL;
+}

Modified: webservices/savan/trunk/c/src/util/error.c
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/util/error.c?rev=762303&r1=762302&r2=762303&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/util/error.c (original)
+++ webservices/savan/trunk/c/src/util/error.c Mon Apr  6 12:09:49 2009
@@ -20,7 +20,7 @@
 
 AXIS2_IMPORT extern const axis2_char_t* axutil_error_messages[];
 
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 savan_error_init()
 {
     axutil_error_messages[SAVAN_ERROR_SOAP_ACTION_NULL] = 

Modified: webservices/savan/trunk/c/src/util/savan_util.c
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/util/savan_util.c?rev=762303&r1=762302&r2=762303&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/util/savan_util.c (original)
+++ webservices/savan/trunk/c/src/util/savan_util.c Mon Apr  6 12:09:49 2009
@@ -33,7 +33,7 @@
 #include <savan_error.h>
 #include <savan_storage_mgr.h>
 
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 savan_util_create_fault_envelope(
     axis2_msg_ctx_t *msg_ctx,
     const axutil_env_t *env,
@@ -74,7 +74,7 @@
     return AXIS2_SUCCESS;
 }
 
-axiom_node_t * AXIS2_CALL
+AXIS2_EXTERN axiom_node_t * AXIS2_CALL
 savan_util_build_fault_msg(
     const axutil_env_t *env,
     axis2_char_t * code,
@@ -118,7 +118,7 @@
     return fault_node;
 }
 
-savan_message_types_t AXIS2_CALL
+AXIS2_EXTERN savan_message_types_t AXIS2_CALL
 savan_util_get_message_type(
     axis2_msg_ctx_t *msg_ctx,
     const axutil_env_t *env)
@@ -161,7 +161,7 @@
     return SAVAN_MSG_TYPE_UNKNOWN;
 }
 
-axis2_char_t * AXIS2_CALL
+AXIS2_EXTERN axis2_char_t * AXIS2_CALL
 savan_util_get_subscription_id_from_msg(
     const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx)
@@ -213,7 +213,7 @@
     return sub_id;    
 }
 
-savan_subscriber_t * AXIS2_CALL
+AXIS2_EXTERN savan_subscriber_t * AXIS2_CALL
 savan_util_get_subscriber_from_msg(
         const axutil_env_t *env,
         axis2_msg_ctx_t *msg_ctx,
@@ -239,7 +239,7 @@
     return subscriber;
 }
 
-savan_subscriber_t * AXIS2_CALL
+AXIS2_EXTERN savan_subscriber_t * AXIS2_CALL
 savan_util_get_subscriber_from_renew_msg(
         const axutil_env_t *env,
         axis2_msg_ctx_t *msg_ctx,
@@ -351,7 +351,7 @@
     return subscriber;
 }
 
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 savan_util_add_subscriber(
     const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx,
@@ -377,7 +377,7 @@
     return status;
 }
 
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 savan_util_update_subscriber(
     const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx,
@@ -394,7 +394,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 savan_util_remove_subscriber(
     const axutil_env_t *env,
     axis2_msg_ctx_t *msg_ctx,
@@ -415,7 +415,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_status_t AXIS2_CALL 
+AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 savan_util_set_store(
     axis2_svc_t *svc,
     const axutil_env_t *env,
@@ -450,7 +450,7 @@
     return AXIS2_SUCCESS;       
 }
 
-axis2_char_t * AXIS2_CALL
+AXIS2_EXTERN axis2_char_t * AXIS2_CALL
 savan_util_get_expiry_time(
     const axutil_env_t *env)
 {
@@ -459,7 +459,7 @@
     return "*";
 }
 
-axis2_char_t * AXIS2_CALL
+AXIS2_EXTERN axis2_char_t * AXIS2_CALL
 savan_util_get_renewed_expiry_time(
     const axutil_env_t *env,
     axis2_char_t *expiry)
@@ -469,7 +469,7 @@
     return expiry;
 }
 
-axis2_char_t *AXIS2_CALL
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 savan_util_get_topic_name_from_topic_url(
     const axutil_env_t *env,
     axis2_char_t *topic_url)
@@ -494,7 +494,7 @@
     return topic;
 }
 
-void *AXIS2_CALL
+AXIS2_EXTERN void *AXIS2_CALL
 savan_util_get_svc_client(
     const axutil_env_t *env)
 {
@@ -980,7 +980,7 @@
     return filtermod;
 }
 
-axis2_bool_t AXIS2_CALL
+AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 savan_util_is_valid_duration(
     const axutil_env_t *env,
     const axis2_char_t *duration)
@@ -988,7 +988,7 @@
     return AXIS2_TRUE;
 }
 
-axis2_bool_t AXIS2_CALL
+AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 savan_util_is_valid_date_time(
     const axutil_env_t *env,
     const axis2_char_t *duration)



Mime
View raw message