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 na...@apache.org on 2006/01/19 10:11:05 UTC
svn commit: r370448 - in /webservices/axis2/trunk/c: modules/xml/soap/
test/xml/soap/
Author: nandika
Date: Thu Jan 19 01:10:51 2006
New Revision: 370448
URL: http://svn.apache.org/viewcvs?rev=370448&view=rev
Log:
debug printf's removed
Modified:
webservices/axis2/trunk/c/modules/xml/soap/maven.xml
webservices/axis2/trunk/c/modules/xml/soap/project.xml
webservices/axis2/trunk/c/modules/xml/soap/soap11_builder_helper.c
webservices/axis2/trunk/c/modules/xml/soap/soap12_builder_helper.c
webservices/axis2/trunk/c/modules/xml/soap/soap_builder.c
webservices/axis2/trunk/c/modules/xml/soap/soap_fault_code.c
webservices/axis2/trunk/c/test/xml/soap/test_soap.c
Modified: webservices/axis2/trunk/c/modules/xml/soap/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/maven.xml?rev=370448&r1=370447&r2=370448&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/maven.xml (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/maven.xml Thu Jan 19 01:10:51 2006
@@ -1,29 +1,29 @@
-<!--
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<project default="all" xmlns:m="jelly:maven">
-
- <goal name="build-sub-module">
- <attainGoal name="nar:compile" />
- </goal>
- <goal name="compile-tests">
- <attainGoal name="nar:compile-tests" />
- </goal>
- <goal name="all" prereqs="build-sub-module,compile-tests" />
-
-</project>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<project default="all" xmlns:m="jelly:maven">
+
+ <goal name="build-sub-module">
+ <attainGoal name="nar:compile" />
+ </goal>
+ <goal name="compile-tests">
+ <attainGoal name="nar:compile-tests" />
+ </goal>
+ <goal name="all" prereqs="build-sub-module,compile-tests" />
+
+</project>
Modified: webservices/axis2/trunk/c/modules/xml/soap/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/project.xml?rev=370448&r1=370447&r2=370448&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/project.xml (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/project.xml Thu Jan 19 01:10:51 2006
@@ -1,43 +1,43 @@
-<?xml version="1.0"?>
-<!--
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<project>
- <extend>../../../project.xml</extend>
- <id>axis2-xml-soap</id>
- <name>SOAP module</name>
- <package>axis2.xml.soap.*</package>
- <description>SOAP project.</description>
- <shortDescription>SOAP project</shortDescription>
-
- <dependencies>
- <!--dependency>
- <groupId>j2ee</groupId>
- <artifactId>j2ee</artifactId>
- <version>1.3.1</version>
- </dependency-->
- <!--dependency>
- <groupId>axis2</groupId>
- <artifactId>libaxis2-xml-guththila-nar</artifactId>
- <version>0.0</version>
- <type>so</type>
- </dependency-->
-
- </dependencies>
-
-</project>
+<?xml version="1.0"?>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<project>
+ <extend>../../../project.xml</extend>
+ <id>axis2-xml-soap</id>
+ <name>SOAP module</name>
+ <package>axis2.xml.soap.*</package>
+ <description>SOAP project.</description>
+ <shortDescription>SOAP project</shortDescription>
+
+ <dependencies>
+ <!--dependency>
+ <groupId>j2ee</groupId>
+ <artifactId>j2ee</artifactId>
+ <version>1.3.1</version>
+ </dependency-->
+ <!--dependency>
+ <groupId>axis2</groupId>
+ <artifactId>libaxis2-xml-guththila-nar</artifactId>
+ <version>0.0</version>
+ <type>so</type>
+ </dependency-->
+
+ </dependencies>
+
+</project>
Modified: webservices/axis2/trunk/c/modules/xml/soap/soap11_builder_helper.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap11_builder_helper.c?rev=370448&r1=370447&r2=370448&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap11_builder_helper.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap11_builder_helper.c Thu Jan 19 01:10:51 2006
@@ -150,7 +150,6 @@
om_ele = (axis2_om_element_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(om_element_node, env);
ele_localname = AXIS2_OM_ELEMENT_GET_LOCALNAME(om_ele, env);
- printf("\nelement localname %s\n", ele_localname);
soap_envelope = AXIS2_SOAP_BUILDER_GET_SOAP_ENVELOPE(builder_helper_impl->soap_builder, env);
if(soap_envelope)
@@ -170,7 +169,7 @@
if(AXIS2_STRCMP(ele_localname, AXIS2_SOAP11_SOAP_FAULT_CODE_LOCAL_NAME) == 0)
- { printf("\n fault code found %s\n", AXIS2_SOAP11_SOAP_FAULT_CODE_LOCAL_NAME);
+ {
if(builder_helper_impl->fault_string_present)
{
AXIS2_SOAP_BUILDER_SET_BOOL_PROCESSING_MANDATORY_FAULT_ELEMENTS(
@@ -273,42 +272,42 @@
}
- else if (elementLevel == 5) {
-
- String parentTagName = "";
- if(parent instanceof Element) {
- parentTagName = ((Element)parent).getTagName();
- } else {
- parentTagName = parent.getLocalName();
- }
-
- if (parentTagName.equals(SOAP_FAULT_CODE_LOCAL_NAME)) {
- throw new OMBuilderException(
- "faultcode element should not have children");
- } else if (parentTagName.equals(
- SOAP_FAULT_STRING_LOCAL_NAME)) {
- throw new OMBuilderException(
- "faultstring element should not have children");
- } else if (parentTagName.equals(
- SOAP_FAULT_ACTOR_LOCAL_NAME)) {
- throw new OMBuilderException(
- "faultactor element should not have children");
- } else {
- element =
- this.factory.createOMElement(
- localName, null, parent, builder);
- processNamespaceData(element, false);
- processAttributes(element);
- }
-
- } else if (elementLevel > 5) {
- element =
- this.factory.createOMElement(localName,
- null,
- parent,
- builder);
- processNamespaceData(element, false);
- processAttributes(element);
+ else if (elementLevel == 5) {
+
+ String parentTagName = "";
+ if(parent instanceof Element) {
+ parentTagName = ((Element)parent).getTagName();
+ } else {
+ parentTagName = parent.getLocalName();
+ }
+
+ if (parentTagName.equals(SOAP_FAULT_CODE_LOCAL_NAME)) {
+ throw new OMBuilderException(
+ "faultcode element should not have children");
+ } else if (parentTagName.equals(
+ SOAP_FAULT_STRING_LOCAL_NAME)) {
+ throw new OMBuilderException(
+ "faultstring element should not have children");
+ } else if (parentTagName.equals(
+ SOAP_FAULT_ACTOR_LOCAL_NAME)) {
+ throw new OMBuilderException(
+ "faultactor element should not have children");
+ } else {
+ element =
+ this.factory.createOMElement(
+ localName, null, parent, builder);
+ processNamespaceData(element, false);
+ processAttributes(element);
+ }
+
+ } else if (elementLevel > 5) {
+ element =
+ this.factory.createOMElement(localName,
+ null,
+ parent,
+ builder);
+ processNamespaceData(element, false);
+ processAttributes(element);
}
Modified: webservices/axis2/trunk/c/modules/xml/soap/soap12_builder_helper.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap12_builder_helper.c?rev=370448&r1=370447&r2=370448&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap12_builder_helper.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap12_builder_helper.c Thu Jan 19 01:10:51 2006
@@ -181,7 +181,6 @@
if(element_level == 4)
{
- printf("\nlocalname %s \n",ele_localname);
if(AXIS2_STRCMP(AXIS2_SOAP12_SOAP_FAULT_CODE_LOCAL_NAME, ele_localname) == 0)
{
@@ -198,18 +197,16 @@
AXIS2_SOAP_FAULT_SET_CODE(soap_fault, env, soap_fault_code);
builder_helper_impl->code_present = AXIS2_TRUE;
builder_helper_impl->code_processing = AXIS2_TRUE;
- printf("\nsoap fault code \n");
}
}
else if(AXIS2_STRCMP(AXIS2_SOAP12_SOAP_FAULT_REASON_LOCAL_NAME, ele_localname) == 0)
- { printf(" code processing %d subcode processing %d ", builder_helper_impl->code_processing, builder_helper_impl->sub_code_processing);
+ {
if(!(builder_helper_impl->code_processing) && !(builder_helper_impl->sub_code_processing))
{
if(builder_helper_impl->code_present)
{
if(builder_helper_impl->reason_present)
{
- printf("\nAXIS2_ERROR_MULTIPLE_REASON_ELEMENTS_ENCOUNTERED\n");
AXIS2_ERROR_SET((*env)->error,
AXIS2_ERROR_MULTIPLE_REASON_ELEMENTS_ENCOUNTERED, AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -223,12 +220,10 @@
AXIS2_SOAP_FAULT_SET_REASON(soap_fault, env, fault_reason);
builder_helper_impl->reason_present = AXIS2_TRUE;
builder_helper_impl->reason_processing = AXIS2_TRUE;
- printf(" fault reason ");
}
}
else
{
- printf("\nAXIS2_ERROR_WRONG_ELEMENT_ORDER_ENCOUNTERED\n");
AXIS2_ERROR_SET((*env)->error,
AXIS2_ERROR_WRONG_ELEMENT_ORDER_ENCOUNTERED, AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -238,14 +233,12 @@
{
if(builder_helper_impl->code_processing)
{
- printf("\nAXIS2_ERROR_SOAP_FAULT_CODE_DOES_NOT_HAVE_A_VALUE\n");
AXIS2_ERROR_SET((*env)->error,
AXIS2_ERROR_SOAP_FAULT_CODE_DOES_NOT_HAVE_A_VALUE, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
else
{
- printf("\nAXIS2_ERROR_SOAP_FAULT_CODE_DOES_NOT_HAVE_A_VALUE\n");
AXIS2_ERROR_SET((*env)->error,
AXIS2_ERROR_SOAP_FAULT_CODE_DOES_NOT_HAVE_A_VALUE, AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -281,14 +274,13 @@
}
}else
{
- printf("AXIS2_ERROR_WRONG_ELEMENT_ORDER_ENCOUNTERED");
AXIS2_ERROR_SET((*env)->error,
AXIS2_ERROR_WRONG_ELEMENT_ORDER_ENCOUNTERED, AXIS2_FALSE);
return AXIS2_FAILURE;
}
}
else
- { printf("AXIS2_ERROR_SOAP_FAULT_REASON_ELEMENT_SHOULD_HAVE_A_TEXT");
+ {
AXIS2_ERROR_SET((*env)->error,
AXIS2_ERROR_SOAP_FAULT_REASON_ELEMENT_SHOULD_HAVE_A_TEXT, AXIS2_FALSE);
return AXIS2_FAILURE;
@@ -338,7 +330,6 @@
{
if(builder_helper_impl->detail_present)
{
- printf("\n AXIS2_ERROR_MULTIPLE_DETAIL_ELEMENTS_ENCOUNTERED\n");
AXIS2_ERROR_SET((*env)->error,
AXIS2_ERROR_MULTIPLE_DETAIL_ELEMENTS_ENCOUNTERED, AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -352,12 +343,10 @@
AXIS2_SOAP_FAULT_SET_SOAP_VERSION(soap_fault_detail, env, AXIS2_SOAP12);
AXIS2_SOAP_FAULT_SET_DETAIL(soap_fault, env, soap_fault_detail);
builder_helper_impl->detail_present = AXIS2_TRUE;
- printf("\n detail create\n");
}
}
else
{
- printf("\nAXIS2_ERROR_WRONG_ELEMENT_ORDER_ENCOUNTERED\n");
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_WRONG_ELEMENT_ORDER_ENCOUNTERED, AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -365,7 +354,6 @@
}
else
{
- printf("\n AXIS2_ERROR_SOAP_FAULT_REASON_ELEMENT_SHOULD_HAVE_A_TEXT\n");
AXIS2_ERROR_SET((*env)->error,
AXIS2_ERROR_SOAP_FAULT_REASON_ELEMENT_SHOULD_HAVE_A_TEXT, AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -405,11 +393,9 @@
builder_helper_impl->value_present = AXIS2_TRUE;
builder_helper_impl->code_processing = AXIS2_FALSE;
- printf("soap fault value ");
}
else
{
- printf("\n multiple values\n");
AXIS2_ERROR_SET((*env)->error,
AXIS2_ERROR_MULTIPLE_VALUE_ENCOUNTERED_IN_CODE_ELEMENT, AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -418,7 +404,6 @@
else if(AXIS2_STRCMP(ele_localname,
AXIS2_SOAP12_SOAP_FAULT_SUB_CODE_LOCAL_NAME) == 0)
{
- printf(" fault subcode first ");
if(!(builder_helper_impl->sub_code_present))
{
if(builder_helper_impl->value_present)
@@ -426,7 +411,6 @@
axis2_soap_fault_sub_code_t *fault_subcode = NULL;
axis2_soap_fault_code_t *fault_code = NULL;
- printf("\n fault code create\n");
fault_subcode = axis2_soap_fault_sub_code_create(env);
AXIS2_SOAP_FAULT_SUB_CODE_SET_BASE_NODE(fault_subcode, env, om_ele_node);
AXIS2_SOAP_FAULT_SUB_CODE_SET_SOAP_VRESION(fault_subcode, env, AXIS2_SOAP12);
@@ -492,8 +476,8 @@
}
else
{
- /* throw new OMBuilderException(
- parent.getLocalName() +
+ /* throw new OMBuilderException(
+ parent.getLocalName() +
" should not have child element");
*/
@@ -511,13 +495,10 @@
if(AXIS2_STRCMP(parent_localname, AXIS2_SOAP12_SOAP_FAULT_SUB_CODE_LOCAL_NAME) == 0)
{
- printf("\nparent is a subcode element (element localname %s ) -\n\n", ele_localname);
if(AXIS2_STRCMP(ele_localname, AXIS2_SOAP12_SOAP_FAULT_VALUE_LOCAL_NAME) == 0)
{
- printf(" sub code value");
if(builder_helper_impl->subcode_value_present)
{
- printf("\nAXIS2_ERROR_MULTIPLE_SUB_CODE_VALUES_ENCOUNTERED\n");
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_MULTIPLE_SUB_CODE_VALUES_ENCOUNTERED, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -537,12 +518,10 @@
builder_helper_impl->subcode_value_present = AXIS2_TRUE;
builder_helper_impl->sub_sub_code_present = AXIS2_FALSE;
builder_helper_impl->sub_code_processing = AXIS2_FALSE;
- printf("\ncreate subcode value \n");
}
}
else if(AXIS2_STRCMP(ele_localname, AXIS2_SOAP12_SOAP_FAULT_SUB_CODE_LOCAL_NAME) == 0)
{
- printf("\n parent subcode child subcode ");
if(builder_helper_impl->subcode_value_present)
{
if(!(builder_helper_impl->sub_sub_code_present))
@@ -559,18 +538,15 @@
builder_helper_impl->subcode_value_present = AXIS2_FALSE;
builder_helper_impl->sub_sub_code_present = AXIS2_TRUE;
builder_helper_impl->sub_code_processing = AXIS2_TRUE;
- printf(" sub code sub code created ");
}
else
{
- printf("\nAXIS2_ERROR_MULTIPLE_SUB_CODE_VALUES_ENCOUNTERED\n");
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_MULTIPLE_SUB_CODE_VALUES_ENCOUNTERED, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
}
else
{
- printf("\nAXIS2_ERROR_SOAP_FAULT_VALUE_SHOULD_BE_PRESENT_BEFORE_SUB_CODE\n");
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SOAP_FAULT_VALUE_SHOULD_BE_PRESENT_BEFORE_SUB_CODE, AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -578,7 +554,6 @@
}
else
{
- printf("\nAXIS2_ERROR_THIS_LOCALNAME_IS_NOT_SUPPORTED_INSIDE_THE_SUB_CODE_ELEMENT\n");
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_THIS_LOCALNAME_IS_NOT_SUPPORTED_INSIDE_THE_SUB_CODE_ELEMENT, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -605,9 +580,9 @@
else
{
/*
- throw new OMBuilderException(
- parent.getLocalName() +
- " should not have child at element level " +
+ throw new OMBuilderException(
+ parent.getLocalName() +
+ " should not have child at element level " +
elementLevel);
*/
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_builder.c?rev=370448&r1=370447&r2=370448&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_builder.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_builder.c Thu Jan 19 01:10:51 2006
@@ -112,8 +112,6 @@
axis2_om_node_t *om_node,
int is_soap_element);
-
-
static axis2_status_t
identify_soap_version(axis2_soap_builder_t *builder,
axis2_env_t **env,
@@ -312,7 +310,6 @@
current_node = AXIS2_OM_STAX_BUILDER_NEXT(builder_impl->om_builder, env);
- printf("\n element level %d -- status %d\n", AXIS2_OM_STAX_BUILDER_GET_ELEMENT_LEVEL( builder_impl->om_builder, env), status);
current_event = AXIS2_OM_STAX_BUILDER_GET_CURRENT_EVENT(builder_impl->om_builder, env);
if(current_event == AXIS2_XML_READER_EMPTY_ELEMENT ||
@@ -410,7 +407,6 @@
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SOAP_MESSAGE_FIRST_ELEMENT_MUST_CONTAIN_LOCAL_NAME, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- printf("\n soap envelope \n");
builder_impl->soap_envelope = axis2_soap_envelope_create_null(env);
status = AXIS2_SOAP_ENVELOPE_SET_BASE_NODE(builder_impl->soap_envelope, env, om_element_node);
@@ -423,7 +419,6 @@
axis2_soap_header_t *soap_header = NULL;
if(AXIS2_STRCMP(element_name, AXIS2_SOAP_HEADER_LOCAL_NAME) == 0)
{
- printf("\n soap header \n");
if(builder_impl->header_present)
{
AXIS2_ERROR_SET((*env)->error,
@@ -446,7 +441,6 @@
else if(AXIS2_STRCMP(element_name, AXIS2_SOAP_BODY_LOCAL_NAME))
{
axis2_soap_body_t *soap_body = NULL;
- printf("\n soap body \n");
if(builder_impl->body_present)
{
AXIS2_ERROR_SET((*env)->error,
@@ -473,8 +467,6 @@
{
axis2_soap_header_block_t *header_block = NULL;
axis2_soap_header_t *soap_header = NULL;
-
- printf("\n soap header block \n");
header_block = axis2_soap_header_block_create(env);
AXIS2_SOAP_HEADER_BLOCK_SET_BASE_NODE(header_block, env, om_element_node);
AXIS2_SOAP_HEADER_BLOCK_SET_SOAP_VERSION(header_block, env, builder_impl->soap_version);
@@ -491,8 +483,6 @@
axis2_om_node_t *envelope_node = NULL;
axis2_om_element_t *envelope_ele = NULL;
axis2_om_namespace_t *env_ns = NULL;
- printf("\n soap body \n");
- printf("%s", element_name);
envelope_node = AXIS2_SOAP_ENVELOPE_GET_BASE_NODE(
builder_impl->soap_envelope, env);
envelope_ele = (axis2_om_element_t *)
@@ -523,7 +513,6 @@
else if(AXIS2_STRCMP(AXIS2_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI,
AXIS2_OM_NAMESPACE_GET_URI(env_ns , env)) == 0)
{
- printf("\nsoap11 builder create\n");
builder_impl->builder_helper = axis2_soap11_builder_helper_create(env, builder, builder_impl->om_builder);
}
@@ -532,19 +521,14 @@
{
if(builder_impl->soap_version == AXIS2_SOAP11)
{
- printf("\nSoap11 handel event\n");
status = AXIS2_SOAP11_BUILDER_HELPER_HANDLE_EVENT(((axis2_soap11_builder_helper_t*)(builder_impl->builder_helper)),
env, om_element_node , element_level);
}
if(builder_impl->soap_version == AXIS2_SOAP12)
{
- status = AXIS2_SOAP12_BUILDER_HELPER_HANDLE_EVENT(((axis2_soap12_builder_helper_t *)(builder_impl->builder_helper)),
- env, om_element_node , element_level);
- if(status == AXIS2_FAILURE)
- {
- printf("\nfailure occured %s \n\n", AXIS2_ERROR_GET_MESSAGE((*env)->error));
- }
+ status = AXIS2_SOAP12_BUILDER_HELPER_HANDLE_EVENT(((axis2_soap12_builder_helper_t *)
+ (builder_impl->builder_helper)), env, om_element_node , element_level);
}
}
return status;
Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_fault_code.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_fault_code.c?rev=370448&r1=370447&r2=370448&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_fault_code.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_fault_code.c Thu Jan 19 01:10:51 2006
@@ -446,4 +446,3 @@
}
-
Modified: webservices/axis2/trunk/c/test/xml/soap/test_soap.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/xml/soap/test_soap.c?rev=370448&r1=370447&r2=370448&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/xml/soap/test_soap.c (original)
+++ webservices/axis2/trunk/c/test/xml/soap/test_soap.c Thu Jan 19 01:10:51 2006
@@ -39,7 +39,7 @@
return 0;
}
-int build_soap(axis2_env_t **env, char *filename)
+int build_soap(axis2_env_t **env, char *filename,axis2_char_t *uri)
{
axis2_om_document_t *om_doc = NULL;
axis2_om_stax_builder_t *om_builder = NULL;
@@ -67,7 +67,7 @@
om_doc = axis2_om_document_create(env, NULL, om_builder);
- soap_builder = axis2_soap_builder_create(env, om_builder, AXIS2_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI);
+ soap_builder = axis2_soap_builder_create(env, om_builder, uri);
/*
if(soap_builder)
printf("soap version %d", AXIS2_SOAP_BUILDER_GET_SOAP_VERSION(soap_builder, env) );
@@ -175,9 +175,17 @@
axis2_allocator_t *allocator = NULL;
axis2_error_t *error = NULL;
axis2_log_t *log = NULL;
+ axis2_char_t *uri = AXIS2_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI;
char *filename = "test.xml";
if(argc > 1)
filename = argv[1];
+ if(argc > 2)
+ {
+ if(AXIS2_STRCMP(argv[2],"0") == 0)
+ uri = AXIS2_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI;
+ else if(AXIS2_STRCMP(argv[2],"1") == 0)
+ uri = AXIS2_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI;
+ }
allocator = axis2_allocator_init (NULL);
log = axis2_log_create(allocator, NULL);
error = axis2_error_create(allocator);
@@ -188,7 +196,7 @@
printf("\nbuild soap\n");
*/
- build_soap(&env, filename);
- getchar();
+ build_soap(&env, filename,uri);
+ printf("\n");
return 0;
}