Author: pini
Date: Fri Mar 30 08:43:17 2007
New Revision: 524135
URL: http://svn.apache.org/viewvc?view=rev&rev=524135
Log:
Fixing jira issue 292
Modified:
webservices/rampart/trunk/c/include/rampart_token_builder.h
webservices/rampart/trunk/c/include/rampart_token_processor.h
webservices/rampart/trunk/c/include/rampart_util.h
webservices/rampart/trunk/c/src/util/rampart_util.c
webservices/rampart/trunk/c/test/util/test_util.c
Modified: webservices/rampart/trunk/c/include/rampart_token_builder.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/rampart_token_builder.h?view=diff&rev=524135&r1=524134&r2=524135
==============================================================================
--- webservices/rampart/trunk/c/include/rampart_token_builder.h (original)
+++ webservices/rampart/trunk/c/include/rampart_token_builder.h Fri Mar 30
08:43:17 2007
@@ -18,7 +18,7 @@
#include <axis2_utils_defines.h>
#include <axis2_defines.h>
-#include <axis2_date_time.h>
+#include <axutil_date_time.h>
#include <axis2_env.h>
#include <axis2_property.h>
#include <axis2_msg_ctx.h>
Modified: webservices/rampart/trunk/c/include/rampart_token_processor.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/rampart_token_processor.h?view=diff&rev=524135&r1=524134&r2=524135
==============================================================================
--- webservices/rampart/trunk/c/include/rampart_token_processor.h (original)
+++ webservices/rampart/trunk/c/include/rampart_token_processor.h Fri Mar 30
08:43:17 2007
@@ -18,7 +18,7 @@
#include <axis2_utils_defines.h>
#include <axis2_defines.h>
-#include <axis2_date_time.h>
+#include <axutil_date_time.h>
#include <axis2_env.h>
#include <axis2_property.h>
#include <axis2_msg_ctx.h>
Modified: webservices/rampart/trunk/c/include/rampart_util.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/rampart_util.h?view=diff&rev=524135&r1=524134&r2=524135
==============================================================================
--- webservices/rampart/trunk/c/include/rampart_util.h (original)
+++ webservices/rampart/trunk/c/include/rampart_util.h Fri Mar 30 08:43:17 2007
@@ -18,7 +18,7 @@
#include <axis2_utils_defines.h>
#include <axis2_defines.h>
-#include <axis2_date_time.h>
+#include <axutil_date_time.h>
#include <axis2_env.h>
#include <axis2_property.h>
#include <axis2_msg_ctx.h>
Modified: webservices/rampart/trunk/c/src/util/rampart_util.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_util.c?view=diff&rev=524135&r1=524134&r2=524135
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_util.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_util.c Fri Mar 30 08:43:17 2007
@@ -192,12 +192,12 @@
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
rampart_generate_time(const axis2_env_t *env, int ttl)
{
- axis2_date_time_t *dt = NULL;
+ axutil_date_time_t *dt = NULL;
axis2_char_t *dt_str = NULL;
- dt = axis2_date_time_create_with_offset(env, ttl);
- dt_str = axis2_date_time_serialize_date_time(dt, env);
- axis2_date_time_free(dt, env);
+ dt = axutil_date_time_create_with_offset(env, ttl);
+ dt_str = axutil_date_time_serialize_date_time(dt, env);
+ axutil_date_time_free(dt, env);
return dt_str;
}
@@ -206,43 +206,43 @@
rampart_compare_date_time(const axis2_env_t *env, axis2_char_t *dt1_str,
axis2_char_t *dt2_str)
{
axis2_status_t status = AXIS2_FAILURE;
- axis2_date_time_t *dt1 = NULL;
- axis2_date_time_t *dt2 = NULL;
- axis2_date_time_comp_result_t res = AXIS2_DATE_TIME_COMP_RES_UNKNOWN;
+ axutil_date_time_t *dt1 = NULL;
+ axutil_date_time_t *dt2 = NULL;
+ axutil_date_time_comp_result_t res = AXIS2_DATE_TIME_COMP_RES_UNKNOWN;
#if 0
int yyyy1, mm1, dd1, hh1, mi1, ss1, ml1;
int yyyy2, mm2, dd2, hh2, mi2, ss2, ml2;
#endif
- dt1 = axis2_date_time_create(env);
- dt2 = axis2_date_time_create(env);
+ dt1 = axutil_date_time_create(env);
+ dt2 = axutil_date_time_create(env);
- status = axis2_date_time_deserialize_date_time(dt1, env, dt1_str);
+ status = axutil_date_time_deserialize_date_time(dt1, env, dt1_str);
if (status == AXIS2_FAILURE)
{
return AXIS2_FAILURE;
}
- status = axis2_date_time_deserialize_date_time(dt2, env, dt2_str);
+ status = axutil_date_time_deserialize_date_time(dt2, env, dt2_str);
if (status == AXIS2_FAILURE)
{
return AXIS2_FAILURE;
}
#if 0
- yyyy1 = axis2_date_time_get_year(dt1, env);
- mm1 = axis2_date_time_get_month(dt1, env);
- dd1 = axis2_date_time_get_date(dt1, env);
- hh1 = axis2_date_time_get_hour(dt1, env);
- mi1 = axis2_date_time_get_minute(dt1, env);
- ss1 = axis2_date_time_get_second(dt1, env);
- ml1 = axis2_date_time_get_msec(dt1, env);
-
- yyyy2 = axis2_date_time_get_year(dt2, env);
- mm2 = axis2_date_time_get_month(dt2, env);
- dd2 = axis2_date_time_get_date(dt2, env);
- hh2 = axis2_date_time_get_hour(dt2, env);
- mi2 = axis2_date_time_get_minute(dt2, env);
- ss2 = axis2_date_time_get_second(dt2, env);
- ml2 = axis2_date_time_get_msec(dt2, env);
+ yyyy1 = axutil_date_time_get_year(dt1, env);
+ mm1 = axutil_date_time_get_month(dt1, env);
+ dd1 = axutil_date_time_get_date(dt1, env);
+ hh1 = axutil_date_time_get_hour(dt1, env);
+ mi1 = axutil_date_time_get_minute(dt1, env);
+ ss1 = axutil_date_time_get_second(dt1, env);
+ ml1 = axutil_date_time_get_msec(dt1, env);
+
+ yyyy2 = axutil_date_time_get_year(dt2, env);
+ mm2 = axutil_date_time_get_month(dt2, env);
+ dd2 = axutil_date_time_get_date(dt2, env);
+ hh2 = axutil_date_time_get_hour(dt2, env);
+ mi2 = axutil_date_time_get_minute(dt2, env);
+ ss2 = axutil_date_time_get_second(dt2, env);
+ ml2 = axutil_date_time_get_msec(dt2, env);
/**
Comparison.
We expect dt1_str < dt2_str/ Otherwise FAILURE
@@ -310,10 +310,10 @@
}
return AXIS2_SUCCESS;
#else
- /*Moved comparison logic to axis2_date_time */
+ /*Moved comparison logic to axutil_date_time */
/*dt1<dt2 for SUCCESS*/
- res = axis2_date_time_compare(dt1, env, dt2);
+ res = axutil_date_time_compare(dt1, env, dt2);
if(AXIS2_DATE_TIME_COMP_RES_NOT_EXPIRED == res){
return AXIS2_SUCCESS;
}else{
Modified: webservices/rampart/trunk/c/test/util/test_util.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/test/util/test_util.c?view=diff&rev=524135&r1=524134&r2=524135
==============================================================================
--- webservices/rampart/trunk/c/test/util/test_util.c (original)
+++ webservices/rampart/trunk/c/test/util/test_util.c Fri Mar 30 08:43:17 2007
@@ -3,7 +3,7 @@
#include <rampart_crypto_util.h>
#include <axis2_util.h>
#include <axutil_base64.h>
-#include <axis2_date_time.h>
+#include <axutil_date_time.h>
axis2_env_t *test_init()
{
