You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ma...@apache.org on 2007/04/19 04:57:14 UTC
svn commit: r530241 - in /webservices/axis2/scratch/c/neethi: axis2c/
axis2c/axiom/src/om/ axis2c/src/core/clientapi/
axis2c/src/core/transport/http/server/IIS/ axis2c/util/src/ include/ src/
src/secpolicy/builder/
Author: manjula
Date: Wed Apr 18 19:57:12 2007
New Revision: 530241
URL: http://svn.apache.org/viewvc?view=rev&rev=530241
Log:
Uploading latest changes.
Added:
webservices/axis2/scratch/c/neethi/src/engine.c
- copied unchanged from r530240, webservices/axis2/scratch/c/neethi/src/policy_engine.c
webservices/axis2/scratch/c/neethi/src/operator.c
- copied unchanged from r530240, webservices/axis2/scratch/c/neethi/src/policy_operator.c
Removed:
webservices/axis2/scratch/c/neethi/src/policy_engine.c
webservices/axis2/scratch/c/neethi/src/policy_operator.c
Modified:
webservices/axis2/scratch/c/neethi/axis2c/ (props changed)
webservices/axis2/scratch/c/neethi/axis2c/axiom/src/om/om_stax_builder.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/clientapi/svc_client.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/server/IIS/README
webservices/axis2/scratch/c/neethi/axis2c/util/src/stream.c
webservices/axis2/scratch/c/neethi/include/neethi_engine.h
webservices/axis2/scratch/c/neethi/include/neethi_policy.h
webservices/axis2/scratch/c/neethi/src/policy.c
webservices/axis2/scratch/c/neethi/src/secpolicy/builder/transport_binding_builder.c
webservices/axis2/scratch/c/neethi/src/secpolicy/builder/transport_token_builder.c
Propchange: webservices/axis2/scratch/c/neethi/axis2c/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Apr 18 19:57:12 2007
@@ -1 +1 @@
-/webservices/axis2/trunk/c:1-529878
+/webservices/axis2/trunk/c:1-529938
Modified: webservices/axis2/scratch/c/neethi/axis2c/axiom/src/om/om_stax_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/axiom/src/om/om_stax_builder.c?view=diff&rev=530241&r1=530240&r2=530241
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/axiom/src/om/om_stax_builder.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/axiom/src/om/om_stax_builder.c Wed Apr 18 19:57:12 2007
@@ -930,7 +930,11 @@
break;
case AXIOM_XML_READER_SPACE:
- /* Do nothing */
+ val = axiom_stax_builder_create_om_text(om_builder, env);
+ if (!val)
+ {
+ return -1;
+ }
break;
case AXIOM_XML_READER_CHARACTER:
@@ -974,5 +978,6 @@
}
return token;
}
+
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/clientapi/svc_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/clientapi/svc_client.c?view=diff&rev=530241&r1=530240&r2=530241
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/clientapi/svc_client.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/clientapi/svc_client.c Wed Apr 18 19:57:12 2007
@@ -24,6 +24,7 @@
#include <axiom_soap_const.h>
#include <axiom_soap_body.h>
#include <axiom_soap_header.h>
+#include <axiom_util.h>
#include <axis2_listener_manager.h>
#include <axis2_module_desc.h>
#include <axutil_array_list.h>
@@ -760,6 +761,17 @@
if (!soap_body)
{
+ axiom_node_t *node = axiom_soap_envelope_get_base_node(soap_envelope, env);
+ if (node)
+ {
+ axiom_element_t *envelope_element =
+ (axiom_element_t*) axiom_node_get_data_element(node, env);
+ axiom_util_get_first_child_element_with_localname(envelope_element,
+ env, node, AXIOM_SOAP_BODY_LOCAL_NAME, &soap_node);
+ if (soap_node){
+ return axiom_node_get_first_element(soap_node, env);
+ }
+ }
return NULL;
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/server/IIS/README
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/server/IIS/README?view=diff&rev=530241&r1=530240&r2=530241
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/server/IIS/README (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/server/IIS/README Wed Apr 18 19:57:12 2007
@@ -1,7 +1,7 @@
How to configure IIS module for Axis2C
________________________________________
-Use the Axis2C vc project or makefile to buid the component.
+Use the Axis2/C VC project or makefile to buid the component.
In this document I assume that the mod_axis2_IIS.dll is in the directory
c:\axis2c\lib\mod_axis2_IIS.dll and axis2c_home is c:\axis2c
@@ -28,4 +28,4 @@
-
\ No newline at end of file
+
Modified: webservices/axis2/scratch/c/neethi/axis2c/util/src/stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/util/src/stream.c?view=diff&rev=530241&r1=530240&r2=530241
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/util/src/stream.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/util/src/stream.c Wed Apr 18 19:57:12 2007
@@ -300,7 +300,6 @@
if (!buffer)
return -1;
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[axutil_stream_write_basic] %s %d",(char*)buffer, count);
stream = stream;
new_len = stream->len + count;
Modified: webservices/axis2/scratch/c/neethi/include/neethi_engine.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/include/neethi_engine.h?view=diff&rev=530241&r1=530240&r2=530241
==============================================================================
--- webservices/axis2/scratch/c/neethi/include/neethi_engine.h (original)
+++ webservices/axis2/scratch/c/neethi/include/neethi_engine.h Wed Apr 18 19:57:12 2007
@@ -40,7 +40,7 @@
#endif
AXIS2_EXTERN neethi_policy_t *AXIS2_CALL
- neethi_engine_get_neethi_policy(
+ neethi_engine_get_policy(
const axutil_env_t *env,
axiom_node_t *node,
axiom_element_t *element);
Modified: webservices/axis2/scratch/c/neethi/include/neethi_policy.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/include/neethi_policy.h?view=diff&rev=530241&r1=530240&r2=530241
==============================================================================
--- webservices/axis2/scratch/c/neethi/include/neethi_policy.h (original)
+++ webservices/axis2/scratch/c/neethi/include/neethi_policy.h Wed Apr 18 19:57:12 2007
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef NEETHI_H
-#define NEETHI_H
+#ifndef NEETHI_POLICY_H
+#define NEETHI_POLICY_H
/**
@@ -45,12 +45,12 @@
const axutil_env_t *env);
AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
- neethi_policy_get_neethi_policy_components(
+ neethi_policy_get_policy_components(
neethi_policy_t *neethi_policy,
const axutil_env_t *env);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- neethi_policy_add_neethi_policy_components(
+ neethi_policy_add_policy_components(
neethi_policy_t *neethi_policy,
axutil_array_list_t *arraylist,
const axutil_env_t *env);
@@ -81,4 +81,4 @@
}
#endif
-#endif /* NEETHI_H */
+#endif /* NEETHI_POLICY_H */
Modified: webservices/axis2/scratch/c/neethi/src/policy.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/src/policy.c?view=diff&rev=530241&r1=530240&r2=530241
==============================================================================
--- webservices/axis2/scratch/c/neethi/src/policy.c (original)
+++ webservices/axis2/scratch/c/neethi/src/policy.c Wed Apr 18 19:57:12 2007
@@ -22,7 +22,7 @@
struct neethi_policy_t
{
- axutil_array_list_t *neethi_policy_components;
+ axutil_array_list_t *policy_components;
};
AXIS2_EXTERN neethi_policy_t *AXIS2_CALL
@@ -40,10 +40,10 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- neethi_policy->neethi_policy_components = NULL;
+ neethi_policy->policy_components = NULL;
- neethi_policy->neethi_policy_components = axutil_array_list_create(env, 0);
- if (!(neethi_policy->neethi_policy_components) )
+ neethi_policy->policy_components = axutil_array_list_create(env, 0);
+ if (!(neethi_policy->policy_components) )
{
neethi_policy_free(neethi_policy, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -60,22 +60,22 @@
if(neethi_policy)
{
- if(neethi_policy->neethi_policy_components)
+ if(neethi_policy->policy_components)
{
int i = 0;
- for (i = 0; i < axutil_array_list_size(neethi_policy->neethi_policy_components,
+ for (i = 0; i < axutil_array_list_size(neethi_policy->policy_components,
env); i++)
{
neethi_operator_t *operator = NULL;
operator = (neethi_operator_t *)
- axutil_array_list_get(neethi_policy->neethi_policy_components,env, i);
+ axutil_array_list_get(neethi_policy->policy_components,env, i);
if (operator)
neethi_operator_free(operator, env);
operator = NULL;
}
- axutil_array_list_free(neethi_policy->neethi_policy_components , env);
- neethi_policy->neethi_policy_components = NULL;
+ axutil_array_list_free(neethi_policy->policy_components , env);
+ neethi_policy->policy_components = NULL;
}
AXIS2_FREE(env->allocator,neethi_policy);
neethi_policy = NULL;
@@ -93,11 +93,11 @@
{
AXIS2_ENV_CHECK(env, NULL);
- return neethi_policy->neethi_policy_components;
+ return neethi_policy->policy_components;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-neethi_policy_add_neethi_policy_components(
+neethi_policy_add_policy_components(
neethi_policy_t *neethi_policy,
axutil_array_list_t *arraylist,
const axutil_env_t *env)
@@ -106,14 +106,14 @@
int size = axutil_array_list_size(arraylist,env);
int i = 0;
- if (axutil_array_list_ensure_capacity(neethi_policy->neethi_policy_components , env, size + 1) != AXIS2_SUCCESS)
+ if (axutil_array_list_ensure_capacity(neethi_policy->policy_components , env, size + 1) != AXIS2_SUCCESS)
return AXIS2_FAILURE;
for(i=0; i<size; i++)
{
void *value = NULL;
value = axutil_array_list_get(arraylist ,env ,i);
- axutil_array_list_add(neethi_policy->neethi_policy_components,env,value);
+ axutil_array_list_add(neethi_policy->policy_components,env,value);
}
return AXIS2_SUCCESS;
}
@@ -127,7 +127,7 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- axutil_array_list_add(neethi_policy->neethi_policy_components,env,operator);
+ axutil_array_list_add(neethi_policy->policy_components,env,operator);
return AXIS2_SUCCESS;
}
@@ -136,7 +136,7 @@
const axutil_env_t *env)
{
- return axutil_array_list_is_empty(neethi_policy->neethi_policy_components , env);
+ return axutil_array_list_is_empty(neethi_policy->policy_components , env);
}
AXIS2_EXTERN neethi_exactlyone_t *AXIS2_CALL
Modified: webservices/axis2/scratch/c/neethi/src/secpolicy/builder/transport_binding_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/src/secpolicy/builder/transport_binding_builder.c?view=diff&rev=530241&r1=530240&r2=530241
==============================================================================
--- webservices/axis2/scratch/c/neethi/src/secpolicy/builder/transport_binding_builder.c (original)
+++ webservices/axis2/scratch/c/neethi/src/secpolicy/builder/transport_binding_builder.c Wed Apr 18 19:57:12 2007
@@ -17,7 +17,7 @@
#include <rp_transport_binding_builder.h>
#include <neethi_operator.h>
-#include <policy.h>
+#include <neethi_policy.h>
#include <neethi_assertion.h>
#include <neethi_exactlyone.h>
#include <neethi_all.h>
@@ -42,7 +42,7 @@
{
rp_transport_binding_t *transport_binding = NULL;
- policy_t *policy = NULL;
+ neethi_policy_t *policy = NULL;
axiom_node_t *child_node = NULL;
axiom_element *child_element = NULL;
axutil_array_list_t *alternatives = NULL;
@@ -64,7 +64,7 @@
return NULL;
}
policy = neethi_engine_get_normalize(policy, AXIS2_FALSE, env);
- alternatives = policy_get_alternatives(policy, env);
+ alternatives = neethi_policy_get_alternatives(policy, env);
component = (neethi_operator_t *)axutil_array_list_get(alternatives, env, 0);
all = (neethi_all_t *)neethi_operator_get_value(component ,env);
transport_binding_process_alternatives(env, all, transport_binding);
@@ -86,7 +86,7 @@
neethi_operator_t *operator = NULL;
axutil_array_list_t *arraylist = NULL;
neethi_assertion_t *assertion = NULL;
- neethi_assertion_type_t *type;
+ neethi_assertion_type_t type;
void *value = NULL;
rp_binding_commons_t *commons = NULL;
Modified: webservices/axis2/scratch/c/neethi/src/secpolicy/builder/transport_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/src/secpolicy/builder/transport_token_builder.c?view=diff&rev=530241&r1=530240&r2=530241
==============================================================================
--- webservices/axis2/scratch/c/neethi/src/secpolicy/builder/transport_token_builder.c (original)
+++ webservices/axis2/scratch/c/neethi/src/secpolicy/builder/transport_token_builder.c Wed Apr 18 19:57:12 2007
@@ -17,7 +17,7 @@
#include <rp_transport_token_builder.h>
#include <neethi_operator.h>
-#include <policy.h>
+#include <neethi_policy.h>
#include <neethi_assertion.h>
#include <neethi_exactlyone.h>
#include <neethi_all.h>
@@ -42,7 +42,7 @@
{
rp_property_t *transport_token = NULL;
- policy_t *policy = NULL;
+ neethi_policy_t *policy = NULL;
axiom_node_t *child_node = NULL;
axiom_element *child_element = NULL;
axutil_array_list_t *alternatives = NULL;
@@ -86,7 +86,7 @@
neethi_operator_t *operator = NULL;
axutil_array_list_t *arraylist = NULL;
neethi_assertion_t *assertion = NULL;
- neethi_assertion_type_t *type;
+ neethi_assertion_type_t type;
void *value = NULL;
int i = 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org