axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From manj...@apache.org
Subject svn commit: r542098 - in /webservices/axis2/scratch/c/neethi/axis2c: build/win32/ neethi/include/ neethi/src/ neethi/src/secpolicy/builder/ src/core/deployment/ src/core/description/
Date Mon, 28 May 2007 03:48:49 GMT
Author: manjula
Date: Sun May 27 20:48:48 2007
New Revision: 542098

URL: http://svn.apache.org/viewvc?view=rev&rev=542098
Log:
Adding assertion free function pointer to assertion struct.
Modified windows makefile to build neethi in windows and fixing some windows 
build errors.

Modified:
    webservices/axis2/scratch/c/neethi/axis2c/build/win32/makefile
    webservices/axis2/scratch/c/neethi/axis2c/neethi/include/neethi_assertion.h
    webservices/axis2/scratch/c/neethi/axis2c/neethi/src/all.c
    webservices/axis2/scratch/c/neethi/axis2c/neethi/src/assertion.c
    webservices/axis2/scratch/c/neethi/axis2c/neethi/src/exactlyone.c
    webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/rampart_config_builder.c
    webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/signed_encrypted_parts_builder.c
    webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/svc_builder.c
    webservices/axis2/scratch/c/neethi/axis2c/src/core/description/policy_include.c

Modified: webservices/axis2/scratch/c/neethi/axis2c/build/win32/makefile
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/build/win32/makefile?view=diff&rev=542098&r1=542097&r2=542098
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/build/win32/makefile (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/build/win32/makefile Sun May 27 20:48:48 2007
@@ -53,6 +53,7 @@
 AXIS2_INTDIR= .\int.msvc
 AXIS2_INTDIR_AXIOM = $(AXIS2_INTDIR)\axiom
 AXIS2_INTDIR_UTIL  = $(AXIS2_INTDIR)\util
+AXIS2_INTDIR_NEETHI = $(AXIS2_INTDIR)\neethi
 AXIS2_INTDIR_CORE  = $(AXIS2_INTDIR)\core
 AXIS2_INTDIR_TNS = $(AXIS2_INTDIR)\http_sender
 AXIS2_INTDIR_TNR = $(AXIS2_INTDIR)\http_receiver
@@ -73,6 +74,7 @@
 AXUTIL   = axutil
 AXIS2_PARSER = axis2_parser
 AXIOM        = axiom
+NEETHI	= neethi				 
 AXIS2_TRANSPORT_SENDER = axis2_http_sender
 AXIS2_TRANSPORT_RECEIVER = axis2_http_receiver
 AXIS2_ENGINE = axis2_engine
@@ -102,6 +104,10 @@
 		/I$(AXIS2_SOURCE_DIR)\axiom\src\om  \
 		/I$(AXIS2_SOURCE_DIR)\axiom\src\soap \
 		/I$(AXIS2_SOURCE_DIR)\util\include\platforms \
+		/I$(AXIS2_SOURCE_DIR)\neethi\include \
+		/I$(AXIS2_SOURCE_DIR)\neethi\src \
+		/I$(AXIS2_SOURCE_DIR)\neethi\src\secpolicy\builder \
+		/I$(AXIS2_SOURCE_DIR)\neethi\src\secpolicy\model \
 		/I$(AXIS2_SOURCE_DIR)\src\core\clientapi \
 		/I$(AXIS2_SOURCE_DIR)\src\core\deployment \
 		/I$(AXIS2_SOURCE_DIR)\src\core\description \
@@ -144,6 +150,12 @@
 		$(AXIS2_SOURCE_DIR)\axiom\src\attachments\*.c \
 		$(AXIS2_SOURCE_DIR)\axiom\src\util\*.c
 
+
+NEETHI_SRC = $(AXIS2_SOURCE_DIR)\neethi\src\*.c \
+        $(AXIS2_SOURCE_DIR)\neethi\src\secpolicy\model\*.c \
+        $(AXIS2_SOURCE_DIR)\neethi\src\secpolicy\builder\*.c \
+
+
 AXIS2_ENGINE_SRC =  $(AXIS2_SOURCE_DIR)\src\core\addr\*.c \
 		$(AXIS2_SOURCE_DIR)\src\core\clientapi\*.c \
 		$(AXIS2_SOURCE_DIR)\src\core\context\*.c \
@@ -249,6 +261,7 @@
 	if not exist $(AXIS2_INTDIR) mkdir $(AXIS2_INTDIR)
 	if not exist $(AXIS2_INTDIR_AXIOM) mkdir $(AXIS2_INTDIR_AXIOM)
 	if not exist $(AXIS2_INTDIR_UTIL) mkdir $(AXIS2_INTDIR_UTIL)
+	if not exist $(AXIS2_INTDIR_NEETHI) mkdir $(AXIS2_INTDIR_NEETHI)
 	if not exist $(AXIS2_INTDIR_CORE) mkdir $(AXIS2_INTDIR_CORE)
 	if not exist $(AXIS2_INTDIR_TNS) mkdir $(AXIS2_INTDIR_TNS)
 	if not exist $(AXIS2_INTDIR_TNR) mkdir $(AXIS2_INTDIR_TNR)
@@ -277,14 +290,13 @@
 	/DLL /OUT:$(AXIS2_LIBS)\$(GUTHTHILA).dll /IMPLIB:$(AXIS2_LIBS)\$(GUTHTHILA).lib
 
 axis2_parser:
-		
 	$(CC) $(CFLAGS) $(AXIS2_PARSER_SRC) /Fo$(AXIS2_INTDIR_PARSER)\ /c
 	$(LD) $(LDFLAGS) $(AXIS2_INTDIR_PARSER)\*.obj $(AXUTIL).lib $(LIBS) \
 	$(LIBXML2_BIN_DIR)\lib\libxml2.lib  /DLL \
 	/OUT:$(AXIS2_LIBS)\$(AXIS2_PARSER).dll /IMPLIB:$(AXIS2_LIBS)\$(AXIS2_PARSER).lib
 	
 axis2_parser_with_guththila:
-        $(CC) $(CFLAGS) $(GUTHTHILA_INCLUDE_PATH) $(AXIS2_GUTHTHILA_PARSER_SRC) /Fo$(AXIS2_INTDIR_PARSER)\
/c
+    $(CC) $(CFLAGS) $(GUTHTHILA_INCLUDE_PATH) $(AXIS2_GUTHTHILA_PARSER_SRC) /Fo$(AXIS2_INTDIR_PARSER)\
/c
 	$(LD) $(LDFLAGS) $(AXIS2_INTDIR_PARSER)\*.obj $(AXUTIL).lib $(LIBS) \
 	$(AXIS2_LIBS)\$(GUTHTHILA).lib  /DLL \
 	/OUT:$(AXIS2_LIBS)\$(AXIS2_PARSER).dll /IMPLIB:$(AXIS2_LIBS)\$(AXIS2_PARSER).lib
@@ -294,11 +306,17 @@
 	$(LD) $(LDFLAGS) $(AXIS2_INTDIR_AXIOM)\*.obj $(AXUTIL).lib \
 	$(AXIS2_PARSER).lib $(LIBS)  /DLL /OUT:$(AXIS2_LIBS)\$(AXIOM).dll \
 	/IMPLIB:$(AXIS2_LIBS)\$(AXIOM).lib
-	
+
+neethi:
+	$(CC) $(CFLAGS) $(NEETHI_SRC) /Fo$(AXIS2_INTDIR_NEETHI)\ /c
+    $(LD) $(LDFLAGS) $(AXIS2_INTDIR_NEETHI)\*.obj $(AXUTIL).lib $(AXIOM).lib \
+    $(AXIS2_PARSER).lib $(LIBS)  \
+    /DLL /OUT:$(AXIS2_LIBS)\$(NEETHI).dll /IMPLIB:$(AXIS2_LIBS)\$(NEETHI).lib
+
 axis2_engine: 
 	$(CC) $(CFLAGS) $(AXIS2_ENGINE_SRC) /Fo$(AXIS2_INTDIR_CORE)\ /c
 	$(LD) $(LDFLAGS) $(AXIS2_INTDIR_CORE)\*.obj $(AXUTIL).lib $(AXIOM).lib \
-	$(AXIS2_PARSER).lib $(LIBS)  \
+	$(AXIS2_PARSER).lib $(NEETHI).lib $(LIBS) \
 	/DLL /OUT:$(AXIS2_LIBS)\$(AXIS2_ENGINE).dll /IMPLIB:$(AXIS2_LIBS)\$(AXIS2_ENGINE).lib
 
 axis2_http_sender: 
@@ -336,7 +354,7 @@
 	
 	copy $(AXIS2_SOURCE_DIR)\samples\server\axis2.xml $(AXIS2_BINDIR)\
 
-axis2_core: axis2_util axis2_parser axiom axis2_engine axis2_http_sender axis2_http_receiver
axis2_mod_addr axis2_server
+axis2_core: axis2_util axis2_parser axiom neethi axis2_engine axis2_http_sender axis2_http_receiver
axis2_mod_addr axis2_server
 
 axis2_core_guththila: axis2_util guththila axis2_parser_with_guththila axiom axis2_engine
axis2_http_sender axis2_http_receiver axis2_mod_addr axis2_server
 	
@@ -691,6 +709,11 @@
 
 	xcopy /E /I /Y $(AXIS2_SOURCE_DIR)\util\include $(AXIS2_BINDIR)\include\
 
+	if exist $(AXIS2_BINDIR)\include\Makefile.am del $(AXIS2_BINDIR)\include\Makefile.am
+
+    xcopy /E /I /Y $(AXIS2_SOURCE_DIR)\neethi\include $(AXIS2_BINDIR)\include\
+	
+
 copy_vc_projects:
       if not exist $(AXIS2_BINDIR)\ides mkdir $(AXIS2_BINDIR)\ides
       if not exist $(AXIS2_BINDIR)\ides\vc mkdir $(AXIS2_BINDIR)\ides\vc
@@ -796,6 +819,9 @@
 		$(AXIS2_SOURCE_DIR)\axiom\src\soap\*.c \
 		$(AXIS2_SOURCE_DIR)\axiom\src\attachments\*.c \
 		$(AXIS2_SOURCE_DIR)\axiom\src\util\*.c \
+		$(AXIS2_SOURCE_DIR)\neethi\src\*.c \
+		$(AXIS2_SOURCE_DIR)\neethi\src\secpolicy\model\*.c \
+		$(AXIS2_SOURCE_DIR)\neethi\src\secpolicy\builder\*.c \
 		$(AXIS2_SOURCE_DIR)\src\core\addr\*.c \
 		$(AXIS2_SOURCE_DIR)\src\core\clientapi\*.c \
 		$(AXIS2_SOURCE_DIR)\src\core\context\*.c \

Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/include/neethi_assertion.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/include/neethi_assertion.h?view=diff&rev=542098&r1=542097&r2=542098
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/include/neethi_assertion.h (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/include/neethi_assertion.h Sun May 27
20:48:48 2007
@@ -76,6 +76,16 @@
     AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
     neethi_assertion_create(const axutil_env_t *env);
 
+    neethi_assertion_t *AXIS2_CALL
+    neethi_assertion_create_with_args(const axutil_env_t *env,
+        AXIS2_FREE_VOID_ARG free_func,
+        void *value,
+        neethi_assertion_type_t type);
+
+    AXIS2_EXTERN void AXIS2_CALL
+    neethi_assertion_free(neethi_assertion_t *neethi_assertion,
+        const axutil_env_t *env);
+
     AXIS2_EXTERN neethi_assertion_type_t AXIS2_CALL
     neethi_assertion_get_type(neethi_assertion_t *neethi_assertion,
             const axutil_env_t *env);

Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/src/all.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/src/all.c?view=diff&rev=542098&r1=542097&r2=542098
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/src/all.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/src/all.c Sun May 27 20:48:48 2007
@@ -18,6 +18,7 @@
 
 
 #include <neethi_all.h>
+#include <neethi_policy.h>
 
 struct neethi_all_t
 {

Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/src/assertion.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/src/assertion.c?view=diff&rev=542098&r1=542097&r2=542098
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/src/assertion.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/src/assertion.c Sun May 27 20:48:48 2007
@@ -27,6 +27,7 @@
     axiom_element_t *element;
     axiom_node_t *node;
     axis2_bool_t is_optional;
+    AXIS2_FREE_VOID_ARG free_func;
 };
 
 AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL 
@@ -58,32 +59,90 @@
     neethi_assertion->element = NULL;
     neethi_assertion->is_optional = AXIS2_FALSE;
     neethi_assertion->node = NULL;
+    neethi_assertion->free_func = 0;
 
     return neethi_assertion;
 }
 
-/*
-This will be implemented later. 
+
+neethi_assertion_t *AXIS2_CALL
+neethi_assertion_create_with_args(const axutil_env_t *env,
+    AXIS2_FREE_VOID_ARG free_func,
+    void *value,
+    neethi_assertion_type_t type)
+{
+    neethi_assertion_t *neethi_assertion = NULL;
+
+    AXIS2_ENV_CHECK(env, NULL);
+
+    neethi_assertion =  (neethi_assertion_t *) AXIS2_MALLOC (env->allocator,
+    sizeof (neethi_assertion_t));
+
+    if(neethi_assertion == NULL)
+    {
+        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+        return NULL;
+    }
+    neethi_assertion->policy_components = NULL;
+
+    neethi_assertion->policy_components = axutil_array_list_create(env, 0);
+    if (!(neethi_assertion->policy_components))
+    {
+/*      policy_free(policy, env);*/
+        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+        return NULL;
+    }
+    neethi_assertion->value = value;
+    neethi_assertion->type = type;
+    neethi_assertion->element = NULL;
+    neethi_assertion->is_optional = AXIS2_FALSE;
+    neethi_assertion->node = NULL;
+    neethi_assertion->free_func = free_func;
+
+    return neethi_assertion;
+
+}
+
+
+
 
 AXIS2_EXTERN void AXIS2_CALL 
 neethi_assertion_free(neethi_assertion_t *neethi_assertion,
         const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    
+
     if(neethi_assertion)
     {
+        if(neethi_assertion->policy_components)
+        {
+            int i = 0;
+            for (i = 0; i < axutil_array_list_size(neethi_assertion->policy_components,
+                env); i++)
+            {
+                neethi_operator_t *operator = NULL;
+                operator = (neethi_operator_t *)
+                    axutil_array_list_get(neethi_assertion->policy_components,env, i);
+                if (operator)
+                    neethi_operator_free(operator, env);
+
+                operator = NULL;
+            }
+            axutil_array_list_free(neethi_assertion->policy_components , env);
+            neethi_assertion->policy_components = NULL;
+        }
         if(neethi_assertion->value)
         {
-            switch(neethi_assertion->type)
+            if(neethi_assertion->free_func)
             {
+                neethi_assertion->free_func(neethi_assertion->value, env);
             }
-            AXIS2_FREE(env->allocator,neethi_assertion->value);     
-        }            
+        }
+        AXIS2_FREE(env->allocator,neethi_assertion);
+        neethi_assertion = NULL;
     }
-    return; 
+    return;
 }
-*/
 
 /* Implementations */
 

Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/src/exactlyone.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/src/exactlyone.c?view=diff&rev=542098&r1=542097&r2=542098
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/src/exactlyone.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/src/exactlyone.c Sun May 27 20:48:48
2007
@@ -18,6 +18,7 @@
 
 
 #include <neethi_exactlyone.h>
+#include <neethi_policy.h>
 
 struct neethi_exactlyone_t
 {

Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/rampart_config_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/rampart_config_builder.c?view=diff&rev=542098&r1=542097&r2=542098
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/rampart_config_builder.c
(original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/rampart_config_builder.c
Sun May 27 20:48:48 2007
@@ -17,6 +17,7 @@
 
 
 #include <rp_rampart_config_builder.h>
+#include <rp_qname_matcher.h>
 
 /*private functions*/
 

Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/signed_encrypted_parts_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/signed_encrypted_parts_builder.c?view=diff&rev=542098&r1=542097&r2=542098
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/signed_encrypted_parts_builder.c
(original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/signed_encrypted_parts_builder.c
Sun May 27 20:48:48 2007
@@ -22,7 +22,7 @@
 #include <neethi_exactlyone.h>
 #include <neethi_all.h>
 #include <neethi_engine.h>
-
+#include <rp_qname_matcher.h>
 
 rp_header_t *AXIS2_CALL
 rp_signed_encrypted_parts_builder_build_header(

Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/svc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/svc_builder.c?view=diff&rev=542098&r1=542097&r2=542098
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/svc_builder.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/svc_builder.c Sun May 27
20:48:48 2007
@@ -670,10 +670,10 @@
 
             if (itr)
             {
-                /*axis2_process_policy_elements(env, AXIS2_SERVICE_POLICY, itr,
-                    policy_include);*/
-                 axis2_process_policy_elements(env, AXIS2_MESSAGE_POLICY, itr,
+                axis2_process_policy_elements(env, AXIS2_SERVICE_POLICY, itr,
                     policy_include);
+               /* axis2_process_policy_elements(env, AXIS2_MESSAGE_POLICY, itr,
+                    policy_include);*/
 
             }
 

Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/description/policy_include.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/description/policy_include.c?view=diff&rev=542098&r1=542097&r2=542098
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/description/policy_include.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/description/policy_include.c Sun May
27 20:48:48 2007
@@ -17,6 +17,7 @@
 
 #include <axis2_policy_include.h>
 #include <neethi_policy.h>
+#include <neethi_engine.h>
 
 struct axis2_policy_include
 {



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message