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 da...@apache.org on 2005/12/13 07:26:29 UTC
svn commit: r356488 [8/8] - in /webservices/axis2/trunk/c: include/
modules/core/addr/src/ modules/core/context/src/
modules/core/deployment/src/ modules/core/description/src/
modules/core/engine/src/ modules/core/phaseresolver/src/
modules/core/transp...
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c Mon Dec 12 22:23:36 2005
@@ -107,7 +107,7 @@
- /* operations */
+ /* ops */
builder->om_stax_builder.ops = NULL;
builder->om_stax_builder.ops = (axis2_om_stax_builder_ops_t *) AXIS2_MALLOC(
(*env)->allocator, sizeof(axis2_om_stax_builder_ops_t));
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c Mon Dec 12 22:23:36 2005
@@ -18,7 +18,7 @@
#include <axis2_om_output.h>
#include <axis2_string.h>
-/* operations */
+/* ops */
axis2_status_t AXIS2_CALL
axis2_om_text_free (axis2_om_text_t * om_text,
axis2_env_t **env);
@@ -106,7 +106,7 @@
AXIS2_OM_NODE_ADD_CHILD ( *node, env, parent);
}
- /* operations */
+ /* ops */
om_text->om_text.ops = NULL;
om_text->om_text.ops = (axis2_om_text_ops_t *) AXIS2_MALLOC((*env)->allocator,
sizeof (axis2_om_text_ops_t));
Modified: webservices/axis2/trunk/c/modules/xml/parser/axis2_xml_reader.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/axis2_xml_reader.h?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/axis2_xml_reader.h (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/axis2_xml_reader.h Mon Dec 12 22:23:36 2005
@@ -56,8 +56,8 @@
};
/**
- * \brief AXIS2_XML_READER operations
- * Encapsulator struct for operations of axis2_xml_reader
+ * \brief AXIS2_XML_READER ops
+ * Encapsulator struct for ops of axis2_xml_reader
*/
AXIS2_DECLARE_DATA struct axis2_xml_reader_ops
@@ -249,7 +249,7 @@
* @param parser pointer to axis2_xml_reader
* @param env environment, MUST NOT be NULL.
* @param data data values to be destroyed
- * @return status of the operation, AXIS2_SUCCESS on success,
+ * @return status of the op, AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *xml_free)(axis2_xml_reader_t *parser,
Modified: webservices/axis2/trunk/c/modules/xml/parser/axis2_xml_writer.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/axis2_xml_writer.h?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/axis2_xml_writer.h (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/axis2_xml_writer.h Mon Dec 12 22:23:36 2005
@@ -43,8 +43,8 @@
/**
- * \brief axis2_xml_writer operations
- * Encapsulator struct for operations of axis2_xml_writer
+ * \brief axis2_xml_writer ops
+ * Encapsulator struct for ops of axis2_xml_writer
*/
AXIS2_DECLARE_DATA struct axis2_xml_writer_ops
@@ -53,7 +53,7 @@
* Free xml writer
* @param writer pointer to xml_writer struct to be freed
* @param env environment, MUST NOT be NULL.
- * @returns status of the operation.
+ * @returns status of the op.
* AXIS2_SUCCESS on success and AXIS2_FAILURE on error
*/
@@ -65,7 +65,7 @@
* @param writer pointer to xml writer struct
* @param env environment. MUST NOT be NULL.
* @param localname localname of the tag, May not be NULL.
- * @return the status of the operation, AXIS2_SUCCESS on success
+ * @return the status of the op, AXIS2_SUCCESS on success
AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *write_start_element)(
@@ -77,7 +77,7 @@
* the element
* @param writer xml_writer struct
* @param env environment, MUST NOT be NULL.
- * @return status of the operation. AXIS2_SUCCESS on success.
+ * @return status of the op. AXIS2_SUCCESS on success.
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *end_start_element)(axis2_xml_writer_t *writer,
@@ -89,7 +89,7 @@
* @param localname localname of the tag, May not be null.
* @param namespace_uri the namespace URI of the the pefix
* to use.may not be null.
- * @returns status of the operation, AXIS2_SUCCESS on success.
+ * @returns status of the op, AXIS2_SUCCESS on success.
* AXIS2_FAILURE on error
*/
axis2_status_t (AXIS2_CALL *write_start_element_with_namespace)(
@@ -105,7 +105,7 @@
* @param localname localname of the tag, May not be null.
* @param namespace_uri namespace to bind the prefix to
* @param prefix the prefix to the tag.May not be NULL.
- * @return status of the operation
+ * @return status of the op
AXIS2_SUCCESS on success. AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *write_start_element_with_namespace_prefix)(
@@ -119,7 +119,7 @@
* @param writer xml_writer
* @param env environment
* @param localname localname
- * @return status of the operation AXIS2_SUCCESS on success,
+ * @return status of the op AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *write_empty_element)(
@@ -132,7 +132,7 @@
* @param env environment
* @param localname localname
* @param namespace uri
- * @return status of the operation, AXIS2_SUCCESS on success,
+ * @return status of the op, AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error.
*/
@@ -148,7 +148,7 @@
* @param localname localname
* @param namespace_uri namespace uri
* @param prefix prefix
- * @return status of the operation, AXIS2_SUCCESS on success,
+ * @return status of the op, AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *write_empty_element_with_namespace_prefix)(
@@ -161,7 +161,7 @@
* write end tag with correct localname prefix resolved internally
* @param writer xml writer
* @param env environment
- * @return status of the operation, AXIS2_SUCCESS on success,
+ * @return status of the op, AXIS2_SUCCESS on success,
* AXIS2_FAILURE on failure
*/
axis2_status_t (AXIS2_CALL *write_end_element)(axis2_xml_writer_t *writer,
@@ -170,7 +170,7 @@
* write end document
* @param writer xml writer
* @param env environment
- * @return status of the operation AXIS2_SUCCESS on success,
+ * @return status of the op AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *write_end_document)(axis2_xml_writer_t *writer,
@@ -181,7 +181,7 @@
* @param env environment
* @param localname localname
* @param value text value of attribute
- * @return status of the operation AXIS2_SUCCESS on success,
+ * @return status of the op AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *write_attribute)(axis2_xml_writer_t *writer,
@@ -194,7 +194,7 @@
* @param localname
* @param value text value of attribute
* @param namespace uri namespace uri
- * @return status code of the operation AXIS2_SUCCESS on success,
+ * @return status code of the op AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *write_attribute_with_namespace)(
@@ -223,7 +223,7 @@
* @param env environment
* @param prefix prefix
* @param namespace uri namespaceuri
- * @return status of operation AXIS2_SUCCESS on success,
+ * @return status of op AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error.
*/
@@ -235,7 +235,7 @@
* @param writer xml_writer
* @param env environment
* @param namespace uri namespaceuri
- * @return status of operation AXIS2_SUCCESS on success,
+ * @return status of op AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error.
*/
@@ -247,7 +247,7 @@
* @param writer xml_writer
* @param env environment
* @param value value
- * @return status of operation AXIS2_SUCCESS on success,
+ * @return status of op AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error.
*/
@@ -259,7 +259,7 @@
* @param writer xml_writer
* @param env environment
* @param target pi target
- * @return status of operation AXIS2_SUCCESS on success,
+ * @return status of op AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error.
*/
@@ -274,7 +274,7 @@
* @param env environment
* @param target pi target
* @param data pi data
- * @return status of operation AXIS2_SUCCESS on success,
+ * @return status of op AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error.
*/
@@ -288,7 +288,7 @@
* @param writer xml_writer
* @param env environment
* @param data cdata
- * @return status of operation AXIS2_SUCCESS on success,
+ * @return status of op AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *write_cdata)(axis2_xml_writer_t *writer,
@@ -300,7 +300,7 @@
* @param writer xml_writer
* @param env environment
* @param dtd dtd
- * @return status of operation AXIS2_SUCCESS on success,
+ * @return status of op AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *write_dtd)(axis2_xml_writer_t *writer,
@@ -312,7 +312,7 @@
* @param writer xml_writer
* @param env environment
* @param name name
- * @return status of operation AXIS2_SUCCESS on success,
+ * @return status of op AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *write_entity_ref)(
@@ -323,7 +323,7 @@
/**
* @param writer xml_writer
* @param env environment
- * @return status of operation AXIS2_SUCCESS on success,
+ * @return status of op AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *write_start_document)(
@@ -335,7 +335,7 @@
* @param writer xml_writer
* @param env environment
* @param version version
- * @return status of operation AXIS2_SUCCESS on success,
+ * @return status of op AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *write_start_document_with_version)(
@@ -348,7 +348,7 @@
* @param env environment
* @param version version
* @param encoding encoding
- * @return status of operation AXIS2_SUCCESS on success,
+ * @return status of op AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *write_start_document_with_version_encoding)(
@@ -361,7 +361,7 @@
* @param writer xml_writer
* @param env environment
* @param text text
- * @return status of operation AXIS2_SUCCESS on success,
+ * @return status of op AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *write_characters)(
@@ -373,7 +373,7 @@
* @param writer xml_writer
* @param env environment
* @param uri uri
- * @return status of operation AXIS2_SUCCESS on success,
+ * @return status of op AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error.
*/
axis2_char_t* (AXIS2_CALL *get_prefix)( axis2_xml_writer_t *writer,
@@ -385,7 +385,7 @@
* @param env environment
* @param prefix prefix
* @param uri uri
- * @return status of operation AXIS2_SUCCESS on success,
+ * @return status of op AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *set_prefix)( axis2_xml_writer_t *writer,
@@ -397,7 +397,7 @@
* @param writer xml_writer
* @param env environment
* @param uri uri
- * @return status of operation AXIS2_SUCCESS on success,
+ * @return status of op AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *set_default_prefix)(
@@ -410,7 +410,7 @@
* @param env environment
* @param text text
* @param in_attr
- * @return status of operation AXIS2_SUCCESS on success,
+ * @return status of op AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *write_encoded)(
Modified: webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_hash.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_hash.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_hash.c (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_hash.c Mon Dec 12 22:23:36 2005
@@ -224,8 +224,8 @@
* number 33 and a few other equally good numbers like 17, 31, 63,
* 127 and 129 have nevertheless a great advantage to the remaining
* numbers in the large set of possible multipliers: their multiply
- * operation can be replaced by a faster operation based on just one
- * shift plus either a single addition or subtraction operation. And
+ * op can be replaced by a faster op based on just one
+ * shift plus either a single addition or subtraction op. And
* because a hash function has to both distribute good _and_ has to
* be very fast to compute, those few numbers should be preferred.
*
Modified: webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_log.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_log.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_log.c (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_log.c Mon Dec 12 22:23:36 2005
@@ -34,7 +34,7 @@
GUTHTHILA_DECLARE (guththila_log_t *)
guththila_log_create (guththila_allocator_t * allocator,
- guththila_log_ops_t * operations)
+ guththila_log_ops_t * ops)
{
guththila_log_t *log;
if (!allocator)
@@ -47,8 +47,8 @@
if (!log)
return NULL;
- if (operations)
- log->ops = operations;
+ if (ops)
+ log->ops = ops;
else
{
log->ops =
Modified: webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_log.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_log.h?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_log.h (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_log.h Mon Dec 12 22:23:36 2005
@@ -54,7 +54,7 @@
GUTHTHILA_DECLARE (guththila_log_t *)
guththila_log_create (guththila_allocator_t * allocator,
- guththila_log_ops_t * operations);
+ guththila_log_ops_t * ops);
Modified: webservices/axis2/trunk/c/modules/xml/parser/guththila/src/guththila_xml_reader_wrapper.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/guththila/src/guththila_xml_reader_wrapper.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/guththila/src/guththila_xml_reader_wrapper.c (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/guththila/src/guththila_xml_reader_wrapper.c Mon Dec 12 22:23:36 2005
@@ -202,7 +202,7 @@
guththila_xml_reader_wrapper_init_map(guththila_impl);
-/************** operations *****/
+/************** ops *****/
guththila_impl->parser.ops->next = guththila_xml_reader_wrapper_next;
guththila_impl->parser.ops->free = guththila_xml_reader_wrapper_free;
@@ -296,7 +296,7 @@
guththila_xml_reader_wrapper_init_map(guththila_impl);
-/************** operations *****/
+/************** ops *****/
guththila_impl->parser.ops->next = guththila_xml_reader_wrapper_next;
guththila_impl->parser.ops->free = guththila_xml_reader_wrapper_free;
Modified: webservices/axis2/trunk/c/modules/xml/parser/guththila/src/guththila_xml_writer_wrapper.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/guththila/src/guththila_xml_writer_wrapper.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/guththila/src/guththila_xml_writer_wrapper.c (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/guththila/src/guththila_xml_writer_wrapper.c Mon Dec 12 22:23:36 2005
@@ -261,7 +261,7 @@
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
}
- /* operations */
+ /* ops */
writer_impl->writer.ops->free = guththila_xml_writer_wrapper_free;
writer_impl->writer.ops->write_start_element = guththila_xml_writer_wrapper_write_start_element;
writer_impl->writer.ops->write_start_element_with_namespace =
Modified: webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_reader_wrapper.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_reader_wrapper.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_reader_wrapper.c (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_reader_wrapper.c Mon Dec 12 22:23:36 2005
@@ -225,7 +225,7 @@
AXIS2_FREE((*env)->allocator, wrapper_impl);
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
}
- /* operations */
+ /* ops */
wrapper_impl->parser.ops->free = axis2_libxml2_reader_wrapper_free;
wrapper_impl->parser.ops->next = axis2_libxml2_reader_wrapper_next;
Modified: webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_writer_wrapper.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_writer_wrapper.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_writer_wrapper.c (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_writer_wrapper.c Mon Dec 12 22:23:36 2005
@@ -321,7 +321,7 @@
AXIS2_FREE((*env)->allocator,writer_impl);
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
}
- /* operations */
+ /* ops */
writer_impl->writer.ops->free = axis2_libxml2_writer_wrapper_free;
writer_impl->writer.ops->write_start_element = axis2_libxml2_writer_wrapper_write_start_element;
writer_impl->writer.ops->write_start_element_with_namespace =
@@ -454,7 +454,7 @@
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
}
- /* operations */
+ /* ops */
writer_impl->writer.ops->free = axis2_libxml2_writer_wrapper_free;
writer_impl->writer.ops->write_start_element =
axis2_libxml2_writer_wrapper_write_start_element;
Modified: webservices/axis2/trunk/c/test/unit/core/description/description_test.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/description/description_test.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/description/description_test.c (original)
+++ webservices/axis2/trunk/c/test/unit/core/description/description_test.c Mon Dec 12 22:23:36 2005
@@ -6,7 +6,7 @@
CuSuite* axis2_descriptionGetSuite() {
CuSuite* suite = CuSuiteNew();
- SUITE_ADD_TEST(suite, Testaxis2_operation_set_remaining_phases_inflow);
+ SUITE_ADD_TEST(suite, Testaxis2_op_set_remaining_phases_inflow);
return suite;
}
Modified: webservices/axis2/trunk/c/test/unit/core/phaseresolver/phaseresolver_test.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/phaseresolver/phaseresolver_test.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/phaseresolver/phaseresolver_test.c (original)
+++ webservices/axis2/trunk/c/test/unit/core/phaseresolver/phaseresolver_test.c Mon Dec 12 22:23:36 2005
@@ -7,7 +7,7 @@
CuSuite* axis2_phaseresolverGetSuite()
{
CuSuite* suite = CuSuiteNew();
- SUITE_ADD_TEST(suite, Testaxis2_phase_resolver_engage_module_to_operation);
+ SUITE_ADD_TEST(suite, Testaxis2_phase_resolver_engage_module_to_op);
return suite;
}
Modified: webservices/axis2/trunk/c/test/unit/core/phaseresolver/test_resolver.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/phaseresolver/test_resolver.c?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/phaseresolver/test_resolver.c (original)
+++ webservices/axis2/trunk/c/test/unit/core/phaseresolver/test_resolver.c Mon Dec 12 22:23:36 2005
@@ -1,16 +1,16 @@
#include "test_resolver.h"
void add_handlers_to_flow(struct axis2_flow *flow, axis2_env_t **env);
-axis2_array_list_t *get_operation_inphases(axis2_env_t **env);
+axis2_array_list_t *get_op_inphases(axis2_env_t **env);
void axis2_phase_resolver_engage_module_to_svc(CuTest *tc)
{
}
-void Testaxis2_phase_resolver_engage_module_to_operation(CuTest *tc)
+void Testaxis2_phase_resolver_engage_module_to_op(CuTest *tc)
{
struct axis2_phase_resolver *resolver = NULL;
- axis2_array_list_t *operation_inphases = NULL;
+ axis2_array_list_t *op_inphases = NULL;
struct axis2_module_desc *module_desc = NULL;
struct axis2_flow *flow = NULL;
axis2_status_t expected = AXIS2_SUCCESS;
@@ -19,9 +19,9 @@
axis2_allocator_t *allocator = axis2_allocator_init (NULL);
axis2_env_t *env = axis2_env_create (allocator);
- struct axis2_operation *optr = axis2_operation_create(&env);
- operation_inphases = get_operation_inphases(&env);
- AXIS2_OPERATION_SET_REMAINING_PHASES_INFLOW(optr, &env, operation_inphases);
+ struct axis2_op *optr = axis2_op_create(&env);
+ op_inphases = get_op_inphases(&env);
+ AXIS2_OPERATION_SET_REMAINING_PHASES_INFLOW(optr, &env, op_inphases);
flow = axis2_flow_create(&env);
add_handlers_to_flow(flow, &env);
@@ -76,30 +76,30 @@
}
/** helper method. This is the requirement method from phases_info's
- * axis2_get_operation_inphases method
+ * axis2_get_op_inphases method
*/
-axis2_array_list_t *get_operation_inphases(axis2_env_t **env)
+axis2_array_list_t *get_op_inphases(axis2_env_t **env)
{
struct axis2_phase *phase = NULL;
- axis2_array_list_t *operation_inphases = NULL;
+ axis2_array_list_t *op_inphases = NULL;
- operation_inphases = axis2_array_list_create(env, 0);
+ op_inphases = axis2_array_list_create(env, 0);
phase = axis2_phase_create(env, AXIS2_PHASE_POLICY_DETERMINATION);
- AXIS2_ARRAY_LIST_ADD(operation_inphases, env, phase);
+ AXIS2_ARRAY_LIST_ADD(op_inphases, env, phase);
phase = axis2_phase_create(env, AXIS2_PHASE_TRANSPORTIN);
- AXIS2_ARRAY_LIST_ADD(operation_inphases, env, phase);
+ AXIS2_ARRAY_LIST_ADD(op_inphases, env, phase);
phase = axis2_phase_create(env, AXIS2_PHASE_PRE_DISPATCH);
- AXIS2_ARRAY_LIST_ADD(operation_inphases, env, phase);
+ AXIS2_ARRAY_LIST_ADD(op_inphases, env, phase);
phase = axis2_phase_create(env, AXIS2_PHASE_DISPATCH);
- AXIS2_ARRAY_LIST_ADD(operation_inphases, env, phase);
+ AXIS2_ARRAY_LIST_ADD(op_inphases, env, phase);
phase = axis2_phase_create(env, AXIS2_PHASE_POLICY_DETERMINATION);
- AXIS2_ARRAY_LIST_ADD(operation_inphases, env, phase);
+ AXIS2_ARRAY_LIST_ADD(op_inphases, env, phase);
- return operation_inphases;
+ return op_inphases;
}
Modified: webservices/axis2/trunk/c/test/unit/core/phaseresolver/test_resolver.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/phaseresolver/test_resolver.h?rev=356488&r1=356487&r2=356488&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/phaseresolver/test_resolver.h (original)
+++ webservices/axis2/trunk/c/test/unit/core/phaseresolver/test_resolver.h Mon Dec 12 22:23:36 2005
@@ -10,16 +10,16 @@
#include <axis2_string.h>
#include <axis2_phase_resolver.h>
#include <axis2_module_desc.h>
-#include <axis2_operation.h>
+#include <axis2_op.h>
#include <axis2_flow.h>
struct axis2_flow;
-struct axis2_operation;
+struct axis2_op;
struct axis2_svc;
struct axis2_module_desc;
void axis2_phase_resolver_engage_module_to_svc(CuTest *tc);
-void Testaxis2_phase_resolver_engage_module_to_operation(CuTest *tc);
+void Testaxis2_phase_resolver_engage_module_to_op(CuTest *tc);
#endif /* TEST_RESOLVER_H*/