Author: milinda
Date: Sun Jun 22 22:00:41 2008
New Revision: 670448
URL: http://svn.apache.org/viewvc?rev=670448&view=rev
Log:
Fixing the Linux build.
Modified:
webservices/rampart/trunk/c/samples/replay_detector/Makefile.am
webservices/rampart/trunk/c/samples/sct_provider/ (props changed)
webservices/rampart/trunk/c/samples/server/secconv_echo/ (props changed)
webservices/rampart/trunk/c/samples/server/secconv_echo/Makefile.am
webservices/rampart/trunk/c/src/secconv/ (props changed)
webservices/rampart/trunk/c/src/secconv/Makefile.am
webservices/rampart/trunk/c/src/secconv/sct_provider.c
webservices/rampart/trunk/c/src/trust/ (props changed)
webservices/rampart/trunk/c/src/util/Makefile.am
webservices/rampart/trunk/c/src/util/rampart_context.c
Modified: webservices/rampart/trunk/c/samples/replay_detector/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/replay_detector/Makefile.am?rev=670448&r1=670447&r2=670448&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/replay_detector/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/replay_detector/Makefile.am Sun Jun 22
22:00:41 2008
@@ -4,6 +4,6 @@
librdflatfile_la_LIBADD = $(LDFLAGS) \
-L$(AXIS2C_HOME)/lib \
-laxutil \
-
../../src/util/librampart_util.la
+
../../src/util/librampart_util.la
INCLUDES = -I ../../include\
@AXIS2INC@
Propchange: webservices/rampart/trunk/c/samples/sct_provider/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jun 22 22:00:41 2008
@@ -0,0 +1,2 @@
+.libs
+.deps
Propchange: webservices/rampart/trunk/c/samples/server/secconv_echo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jun 22 22:00:41 2008
@@ -0,0 +1,2 @@
+.libs
+.deps
Modified: webservices/rampart/trunk/c/samples/server/secconv_echo/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/server/secconv_echo/Makefile.am?rev=670448&r1=670447&r2=670448&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/server/secconv_echo/Makefile.am
(original)
+++ webservices/rampart/trunk/c/samples/server/secconv_echo/Makefile.am Sun Jun
22 22:00:41 2008
@@ -11,7 +11,8 @@
-L$(AXIS2C_HOME)/lib \
-L$(AXIS2C_HOME)/modules/rampart \
-lmod_rampart \
- -ltrust
+ -ltrust
+
INCLUDES = @AXIS2INC@ \
Propchange: webservices/rampart/trunk/c/src/secconv/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jun 22 22:00:41 2008
@@ -0,0 +1,3 @@
+.sct_provider.c.swp
+.libs
+.deps
Modified: webservices/rampart/trunk/c/src/secconv/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/secconv/Makefile.am?rev=670448&r1=670447&r2=670448&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/secconv/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/secconv/Makefile.am Sun Jun 22 22:00:41 2008
@@ -3,6 +3,8 @@
libsecconv_la_SOURCES = sct_provider.c \
security_context_token.c
+libsecconv_la_LIBADD = ../trust/libtrust.la
+
INCLUDES = -I$(top_builddir)/include \
-I ../../../../util/include \
-I ../../../../include \
Modified: webservices/rampart/trunk/c/src/secconv/sct_provider.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/secconv/sct_provider.c?rev=670448&r1=670447&r2=670448&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/secconv/sct_provider.c (original)
+++ webservices/rampart/trunk/c/src/secconv/sct_provider.c Sun Jun 22 22:00:41
2008
@@ -39,7 +39,6 @@
rampart_context_t* rampart_context,
axis2_msg_ctx_t* msg_ctx)
{
- rampart_sct_provider_t* sct_provider = NULL;
security_context_token_t* sct = NULL;
/* if sct id is not given, check whether it is stored in rampart context */
@@ -310,7 +309,7 @@
if(endpoint)
{
- issuer_address = axis2_endpoint_ref_get_address(endpoint, env);
+ issuer_address =
(axis2_char_t*)axis2_endpoint_ref_get_address(endpoint, env);
}
if(!issuer_address)
@@ -328,7 +327,7 @@
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
if(conf)
{
- client_home = axis2_conf_get_repo(conf, env);
+ client_home = (axis2_char_t*)axis2_conf_get_repo(conf, env);
}
}
@@ -649,4 +648,6 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[rampart]Using default sct
provider validate function.");
return AXIS2_SUCCESS;
-}
\ No newline at end of file
+}
+
+
Propchange: webservices/rampart/trunk/c/src/trust/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jun 22 22:00:41 2008
@@ -0,0 +1,2 @@
+.libs
+.deps
Modified: webservices/rampart/trunk/c/src/util/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/Makefile.am?rev=670448&r1=670447&r2=670448&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/util/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/util/Makefile.am Sun Jun 22 22:00:41 2008
@@ -13,6 +13,7 @@
librampart_util_la_LIBADD = -lssl \
../omxmlsec/libomxmlsec.la \
+ ../secconv/libsecconv.la \
-lcrypto \
@OPENSSLLIB@
Modified: webservices/rampart/trunk/c/src/util/rampart_context.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_context.c?rev=670448&r1=670447&r2=670448&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_context.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_context.c Sun Jun 22 22:00:41
2008
@@ -3143,4 +3143,6 @@
const axutil_env_t *env)
{
return rampart_context->validate_sct_function;
-}
\ No newline at end of file
+}
+
+
