Author: pini
Date: Fri Mar 30 12:55:01 2007
New Revision: 524256
URL: http://svn.apache.org/viewvc?view=rev&rev=524256
Log:
Fixing jira issue 292
Modified:
webservices/rampart/trunk/c/include/openssl_digest.h
webservices/rampart/trunk/c/include/oxs_c14n.h
webservices/rampart/trunk/c/include/rampart_authn_provider.h
webservices/rampart/trunk/c/include/rampart_credentials.h
webservices/rampart/trunk/c/include/rampart_crypto_util.h
webservices/rampart/trunk/c/include/rampart_encryption.h
webservices/rampart/trunk/c/include/rampart_sec_header_builder.h
webservices/rampart/trunk/c/include/rampart_sec_header_processor.h
webservices/rampart/trunk/c/include/rampart_sec_processed_result.h
webservices/rampart/trunk/c/include/rampart_signature.h
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/include/rp_includes.h
webservices/rampart/trunk/c/samples/authn_provider/authn_provider.c
webservices/rampart/trunk/c/samples/callback/htpasswd_callback/htpwcb.c
webservices/rampart/trunk/c/samples/callback/pwcb.c
webservices/rampart/trunk/c/samples/credential_provider/cred_provider.c
webservices/rampart/trunk/c/src/omxmlsec/c14n/c14n.c
webservices/rampart/trunk/c/src/omxmlsec/utility.c
webservices/rampart/trunk/c/src/util/rampart_encryption.c
webservices/rampart/trunk/c/src/util/rampart_sec_header_builder.c
webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c
webservices/rampart/trunk/c/src/util/rampart_signature.c
webservices/rampart/trunk/c/test/openssl/block_cipher_test.c
webservices/rampart/trunk/c/test/openssl/rsa/test_rsa.c
Modified: webservices/rampart/trunk/c/include/openssl_digest.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/openssl_digest.h?view=diff&rev=524256&r1=524255&r2=524256
==============================================================================
--- webservices/rampart/trunk/c/include/openssl_digest.h (original)
+++ webservices/rampart/trunk/c/include/openssl_digest.h Fri Mar 30 12:55:01
2007
@@ -16,7 +16,7 @@
#include <openssl/sha.h>
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
#include <axis2_defines.h>
#include <axutil_env.h>
Modified: webservices/rampart/trunk/c/include/oxs_c14n.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/oxs_c14n.h?view=diff&rev=524256&r1=524255&r2=524256
==============================================================================
--- webservices/rampart/trunk/c/include/oxs_c14n.h (original)
+++ webservices/rampart/trunk/c/include/oxs_c14n.h Fri Mar 30 12:55:01 2007
@@ -30,8 +30,8 @@
#include <axis2_const.h>
#include <axutil_error.h>
-#include <axis2_utils_defines.h>
-#include <axis2_utils.h>
+#include <axutil_utils_defines.h>
+#include <axutil_utils.h>
#include <axutil_env.h>
#include <axutil_string.h>
#include <axiom_document.h>
Modified: webservices/rampart/trunk/c/include/rampart_authn_provider.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/rampart_authn_provider.h?view=diff&rev=524256&r1=524255&r2=524256
==============================================================================
--- webservices/rampart/trunk/c/include/rampart_authn_provider.h (original)
+++ webservices/rampart/trunk/c/include/rampart_authn_provider.h Fri Mar 30
12:55:01 2007
@@ -26,7 +26,7 @@
#include <axis2_defines.h>
#include <axutil_error.h>
#include <axutil_env.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
#include <axis2_msg_ctx.h>
#ifdef __cplusplus
Modified: webservices/rampart/trunk/c/include/rampart_credentials.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/rampart_credentials.h?view=diff&rev=524256&r1=524255&r2=524256
==============================================================================
--- webservices/rampart/trunk/c/include/rampart_credentials.h (original)
+++ webservices/rampart/trunk/c/include/rampart_credentials.h Fri Mar 30
12:55:01 2007
@@ -21,7 +21,7 @@
#include <axis2_defines.h>
#include <axutil_error.h>
#include <axutil_env.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
#include <axis2_msg_ctx.h>
/**
Modified: webservices/rampart/trunk/c/include/rampart_crypto_util.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/rampart_crypto_util.h?view=diff&rev=524256&r1=524255&r2=524256
==============================================================================
--- webservices/rampart/trunk/c/include/rampart_crypto_util.h (original)
+++ webservices/rampart/trunk/c/include/rampart_crypto_util.h Fri Mar 30
12:55:01 2007
@@ -15,7 +15,7 @@
*/
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
#include <axis2_defines.h>
#include <axutil_env.h>
Modified: webservices/rampart/trunk/c/include/rampart_encryption.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/rampart_encryption.h?view=diff&rev=524256&r1=524255&r2=524256
==============================================================================
--- webservices/rampart/trunk/c/include/rampart_encryption.h (original)
+++ webservices/rampart/trunk/c/include/rampart_encryption.h Fri Mar 30
12:55:01 2007
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
#include <axis2_defines.h>
#include <axutil_env.h>
#include <axiom_soap.h>
Modified: webservices/rampart/trunk/c/include/rampart_sec_header_builder.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/rampart_sec_header_builder.h?view=diff&rev=524256&r1=524255&r2=524256
==============================================================================
--- webservices/rampart/trunk/c/include/rampart_sec_header_builder.h (original)
+++ webservices/rampart/trunk/c/include/rampart_sec_header_builder.h Fri Mar 30
12:55:01 2007
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
#include <axis2_defines.h>
#include <axutil_env.h>
#include <axiom_soap.h>
Modified: webservices/rampart/trunk/c/include/rampart_sec_header_processor.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/rampart_sec_header_processor.h?view=diff&rev=524256&r1=524255&r2=524256
==============================================================================
--- webservices/rampart/trunk/c/include/rampart_sec_header_processor.h
(original)
+++ webservices/rampart/trunk/c/include/rampart_sec_header_processor.h Fri Mar
30 12:55:01 2007
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
#include <axis2_defines.h>
#include <axutil_env.h>
#include <axiom_soap.h>
Modified: webservices/rampart/trunk/c/include/rampart_sec_processed_result.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/rampart_sec_processed_result.h?view=diff&rev=524256&r1=524255&r2=524256
==============================================================================
--- webservices/rampart/trunk/c/include/rampart_sec_processed_result.h
(original)
+++ webservices/rampart/trunk/c/include/rampart_sec_processed_result.h Fri Mar
30 12:55:01 2007
@@ -16,7 +16,7 @@
#include <rampart_constants.h>
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
#include <axis2_defines.h>
#include <axutil_env.h>
Modified: webservices/rampart/trunk/c/include/rampart_signature.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/rampart_signature.h?view=diff&rev=524256&r1=524255&r2=524256
==============================================================================
--- webservices/rampart/trunk/c/include/rampart_signature.h (original)
+++ webservices/rampart/trunk/c/include/rampart_signature.h Fri Mar 30 12:55:01
2007
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
#include <axis2_defines.h>
#include <axutil_env.h>
#include <axiom_soap.h>
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=524256&r1=524255&r2=524256
==============================================================================
--- webservices/rampart/trunk/c/include/rampart_token_builder.h (original)
+++ webservices/rampart/trunk/c/include/rampart_token_builder.h Fri Mar 30
12:55:01 2007
@@ -16,7 +16,7 @@
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
#include <axis2_defines.h>
#include <axutil_date_time.h>
#include <axutil_env.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=524256&r1=524255&r2=524256
==============================================================================
--- webservices/rampart/trunk/c/include/rampart_token_processor.h (original)
+++ webservices/rampart/trunk/c/include/rampart_token_processor.h Fri Mar 30
12:55:01 2007
@@ -16,7 +16,7 @@
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
#include <axis2_defines.h>
#include <axutil_date_time.h>
#include <axutil_env.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=524256&r1=524255&r2=524256
==============================================================================
--- webservices/rampart/trunk/c/include/rampart_util.h (original)
+++ webservices/rampart/trunk/c/include/rampart_util.h Fri Mar 30 12:55:01 2007
@@ -16,7 +16,7 @@
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
#include <axis2_defines.h>
#include <axutil_date_time.h>
#include <axutil_env.h>
Modified: webservices/rampart/trunk/c/include/rp_includes.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/rp_includes.h?view=diff&rev=524256&r1=524255&r2=524256
==============================================================================
--- webservices/rampart/trunk/c/include/rp_includes.h (original)
+++ webservices/rampart/trunk/c/include/rp_includes.h Fri Mar 30 12:55:01 2007
@@ -25,7 +25,7 @@
#include <axutil_array_list.h>
#include <axis2_const.h>
#include <axutil_error.h>
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
#include <axutil_log_default.h>
#include <axutil_error_default.h>
#include <axutil_env.h>
Modified: webservices/rampart/trunk/c/samples/authn_provider/authn_provider.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/authn_provider/authn_provider.c?view=diff&rev=524256&r1=524255&r2=524256
==============================================================================
--- webservices/rampart/trunk/c/samples/authn_provider/authn_provider.c
(original)
+++ webservices/rampart/trunk/c/samples/authn_provider/authn_provider.c Fri Mar
30 12:55:01 2007
@@ -19,7 +19,7 @@
#include <axis2_defines.h>
#include <axutil_error.h>
#include <axutil_env.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
#include <rampart_authn_provider.h>
#include <rampart_crypto_util.h>
#include <axutil_string.h>
Modified:
webservices/rampart/trunk/c/samples/callback/htpasswd_callback/htpwcb.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/callback/htpasswd_callback/htpwcb.c?view=diff&rev=524256&r1=524255&r2=524256
==============================================================================
--- webservices/rampart/trunk/c/samples/callback/htpasswd_callback/htpwcb.c
(original)
+++ webservices/rampart/trunk/c/samples/callback/htpasswd_callback/htpwcb.c Fri
Mar 30 12:55:01 2007
@@ -19,7 +19,7 @@
#include <axis2_defines.h>
#include <axutil_error.h>
#include <axutil_env.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
#include <rampart_callback.h>
#include <axutil_string.h>
#include <axis2_svc_skeleton.h>
Modified: webservices/rampart/trunk/c/samples/callback/pwcb.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/callback/pwcb.c?view=diff&rev=524256&r1=524255&r2=524256
==============================================================================
--- webservices/rampart/trunk/c/samples/callback/pwcb.c (original)
+++ webservices/rampart/trunk/c/samples/callback/pwcb.c Fri Mar 30 12:55:01 2007
@@ -19,7 +19,7 @@
#include <axis2_defines.h>
#include <axutil_error.h>
#include <axutil_env.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
#include <rampart_callback.h>
#include <axutil_string.h>
#include <axis2_svc_skeleton.h>
Modified:
webservices/rampart/trunk/c/samples/credential_provider/cred_provider.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/credential_provider/cred_provider.c?view=diff&rev=524256&r1=524255&r2=524256
==============================================================================
--- webservices/rampart/trunk/c/samples/credential_provider/cred_provider.c
(original)
+++ webservices/rampart/trunk/c/samples/credential_provider/cred_provider.c Fri
Mar 30 12:55:01 2007
@@ -19,7 +19,7 @@
#include <axis2_defines.h>
#include <axutil_error.h>
#include <axutil_env.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
#include <rampart_credentials.h>
#include <rampart_crypto_util.h>
#include <axutil_string.h>
Modified: webservices/rampart/trunk/c/src/omxmlsec/c14n/c14n.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/c14n/c14n.c?view=diff&rev=524256&r1=524255&r2=524256
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/c14n/c14n.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/c14n/c14n.c Fri Mar 30 12:55:01
2007
@@ -20,8 +20,8 @@
#include <stdio.h>
#include <axis2_const.h>
#include <axutil_error.h>
-#include <axis2_utils_defines.h>
-#include <axis2_utils.h>
+#include <axutil_utils_defines.h>
+#include <axutil_utils.h>
#include <axutil_env.h>
#include <axutil_string.h>
#include <axutil_array_list.h>
Modified: webservices/rampart/trunk/c/src/omxmlsec/utility.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/utility.c?view=diff&rev=524256&r1=524255&r2=524256
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/utility.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/utility.c Fri Mar 30 12:55:01 2007
@@ -32,7 +32,7 @@
char _id[50];
axis2_char_t *random ;
- random = axis2_strndup(env, axis2_uuid_gen(env),18);
+ random = axis2_strndup(env, axutil_uuid_gen(env),18);
sprintf(_id, "%s-%s",prefix,random);
id = (axis2_char_t*)axis2_strdup(env, _id);
return id;
Modified: webservices/rampart/trunk/c/src/util/rampart_encryption.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_encryption.c?view=diff&rev=524256&r1=524255&r2=524256
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_encryption.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_encryption.c Fri Mar 30
12:55:01 2007
@@ -16,7 +16,7 @@
*/
#include <stdio.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
#include <oxs_ctx.h>
#include <oxs_error.h>
#include <oxs_utility.h>
Modified: webservices/rampart/trunk/c/src/util/rampart_sec_header_builder.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_sec_header_builder.c?view=diff&rev=524256&r1=524255&r2=524256
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_sec_header_builder.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_sec_header_builder.c Fri Mar
30 12:55:01 2007
@@ -30,7 +30,7 @@
#include <oxs_axiom.h>
#include <oxs_asym_ctx.h>
#include <oxs_tokens.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
#include <axutil_array_list.h>
#include <rampart_signature.h>
Modified: webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c?view=diff&rev=524256&r1=524255&r2=524256
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c
(original)
+++ webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c Fri Mar
30 12:55:01 2007
@@ -31,7 +31,7 @@
#include <oxs_axiom.h>
#include <oxs_asym_ctx.h>
#include <oxs_tokens.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
#include <axutil_array_list.h>
#include <axis2_key_type.h>
#include <rampart_token_processor.h>
Modified: webservices/rampart/trunk/c/src/util/rampart_signature.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_signature.c?view=diff&rev=524256&r1=524255&r2=524256
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_signature.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_signature.c Fri Mar 30
12:55:01 2007
@@ -17,7 +17,7 @@
#include <rampart_signature.h>
#include <stdio.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
#include <oxs_ctx.h>
#include <oxs_error.h>
#include <oxs_utility.h>
Modified: webservices/rampart/trunk/c/test/openssl/block_cipher_test.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/test/openssl/block_cipher_test.c?view=diff&rev=524256&r1=524255&r2=524256
==============================================================================
--- webservices/rampart/trunk/c/test/openssl/block_cipher_test.c (original)
+++ webservices/rampart/trunk/c/test/openssl/block_cipher_test.c Fri Mar 30
12:55:01 2007
@@ -24,7 +24,7 @@
#include <openssl_cipher_ctx.h>
#include <openssl_crypt.h>
#include <openssl_constants.h>
-#include <oxs_axis2_utils.h>
+#include <oxs_axutil_utils.h>
Modified: webservices/rampart/trunk/c/test/openssl/rsa/test_rsa.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/test/openssl/rsa/test_rsa.c?view=diff&rev=524256&r1=524255&r2=524256
==============================================================================
--- webservices/rampart/trunk/c/test/openssl/rsa/test_rsa.c (original)
+++ webservices/rampart/trunk/c/test/openssl/rsa/test_rsa.c Fri Mar 30 12:55:01
2007
@@ -24,7 +24,7 @@
#include <openssl_rsa.h>
#include <openssl_digest.h>
#include <openssl_constants.h>
-#include <oxs_axis2_utils.h>
+#include <oxs_axutil_utils.h>
axutil_env_t *test_init()
{
