svn commit: r525102 - in /webservices/rampart/trunk/c/test/c14n: Makefile.am test.c

[ka...@apache.org]

Author: kaushalye
Date: Tue Apr  3 02:10:10 2007
New Revision: 525102

URL: http://svn.apache.org/viewvc?view=rev&rev=525102
Log:
Fixed build breaks in C14N tests

Modified:
    webservices/rampart/trunk/c/test/c14n/Makefile.am
    webservices/rampart/trunk/c/test/c14n/test.c

Modified: webservices/rampart/trunk/c/test/c14n/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/test/c14n/Makefile.am?view=diff&rev=525102&r1=525101&r2=525102
==============================================================================
--- webservices/rampart/trunk/c/test/c14n/Makefile.am (original)
+++ webservices/rampart/trunk/c/test/c14n/Makefile.am Tue Apr  3 02:10:10 2007
@@ -6,11 +6,9 @@
 test_c14n_SOURCES =  test.c
 
 INCLUDES = -I$(top_builddir)/include \
-		    -I ../../../include \
-            -I ../../../util/include \
-            -I ../../../axiom/include
+		    @AXIS2INC@
 
-test_c14n_LDADD   =	../../../util/src/libaxis2_util.la \
-					../../../axiom/src/om/libaxis2_axiom.la \
-					../../../axiom/src/parser/libxml2/libaxis2_libxml2.la \
-					../../../rampart/src/omxmlsec/c14n/liboxsc14n.la 
+test_c14n_LDADD  = ${AXIS2C_HOME}/lib/libaxis2_util.la \
+		    	   ${AXIS2C_HOME}/lib/libaxis2_axiom.la \
+		    	   ${AXIS2C_HOME}/lib/libaxis2_libxml2.la \
+				   $(top_builddir)/src/omxmlsec/c14n/liboxsc14n.la 

Modified: webservices/rampart/trunk/c/test/c14n/test.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/test/c14n/test.c?view=diff&rev=525102&r1=525101&r2=525102
==============================================================================
--- webservices/rampart/trunk/c/test/c14n/test.c (original)
+++ webservices/rampart/trunk/c/test/c14n/test.c Tue Apr  3 02:10:10 2007
@@ -64,6 +64,7 @@
     axis2_char_t *c14n_doc = NULL;
     int len;
     axis2_status_t res = AXIS2_SUCCESS;
+    axiom_node_t *c14n_node = NULL;
 
     if (argc < 2)
     {
@@ -94,7 +95,8 @@
     stream = axutil_stream_create_basic(env);
     
     axiom_node_t *root_node = axiom_document_get_root_element(doc, env);
-    axiom_node_t *c14n_node = AXIOM_NODE_GET_FIRST_ELEMENT(root_node, env);
+    
+    c14n_node = axiom_node_get_first_element(root_node, env);
 
     if (argc>2 && !(argv[2][0]-'e'))
         res = oxs_c14n_apply_stream(env, doc, AXIS2_TRUE, stream, AXIS2_TRUE , NULL, c14n_node);