Author: kaushalye
Date: Tue Mar 27 22:20:16 2007
New Revision: 523180
URL: http://svn.apache.org/viewvc?view=rev&rev=523180
Log:
1. Date time comparison logic moved to axis2 util.
2. Copying certificates to bin/sample/keys
Modified:
webservices/rampart/trunk/c/samples/keys/ahome/Makefile.am
webservices/rampart/trunk/c/samples/keys/bhome/Makefile.am
webservices/rampart/trunk/c/src/util/rampart_util.c
Modified: webservices/rampart/trunk/c/samples/keys/ahome/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/keys/ahome/Makefile.am?view=diff&rev=523180&r1=523179&r2=523180
==============================================================================
--- webservices/rampart/trunk/c/samples/keys/ahome/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/keys/ahome/Makefile.am Tue Mar 27
22:20:16 2007
@@ -1,2 +1,2 @@
resdir=$(prefix)/bin/samples/rampart/keys/ahome
-res_DATA= a_key.pem a_req.pem a_store.pfx b_cert.cert
+res_DATA= a_key.pem a_req.pem a_store.pfx b_cert.cert a_cert.cert
Modified: webservices/rampart/trunk/c/samples/keys/bhome/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/keys/bhome/Makefile.am?view=diff&rev=523180&r1=523179&r2=523180
==============================================================================
--- webservices/rampart/trunk/c/samples/keys/bhome/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/keys/bhome/Makefile.am Tue Mar 27
22:20:16 2007
@@ -1,2 +1,2 @@
resdir=$(prefix)/bin/samples/rampart/keys/bhome
-res_DATA= a_cert.cert b_key.pem b_req.pem b_store.pfx
+res_DATA= a_cert.cert b_key.pem b_req.pem b_store.pfx b_cert.cert
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=523180&r1=523179&r2=523180
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_util.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_util.c Tue Mar 27 22:20:16 2007
@@ -208,10 +208,11 @@
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;
+#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);
@@ -221,6 +222,12 @@
return AXIS2_FAILURE;
}
+ status = axis2_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);
@@ -229,12 +236,6 @@
ss1 = axis2_date_time_get_second(dt1, env);
ml1 = axis2_date_time_get_msec(dt1, env);
- status = axis2_date_time_deserialize_date_time(dt2, env, dt2_str);
- if (status == AXIS2_FAILURE)
- {
- return AXIS2_FAILURE;
- }
-
yyyy2 = axis2_date_time_get_year(dt2, env);
mm2 = axis2_date_time_get_month(dt2, env);
dd2 = axis2_date_time_get_date(dt2, env);
@@ -307,11 +308,19 @@
{
return AXIS2_FAILURE;
}
+ return AXIS2_SUCCESS;
+#else
+ /*Moved comparison logic to axis2_date_time */
- /*axis2_date_time_free(dt1, env);
- axis2_date_time_free(dt2, env);*/
+ /*dt1<dt2 for SUCCESS*/
+ res = axis2_date_time_compare(dt1, env, dt2);
+ if(AXIS2_DATE_TIME_COMP_RES_NOT_EXPIRED == res){
+ return AXIS2_SUCCESS;
+ }else{
+ return AXIS2_FAILURE;
+ }
- return AXIS2_SUCCESS;
+#endif
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
