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/12/01 06:03:12 UTC
svn commit: r481156 - in /webservices/axis2/trunk/c/tools/codegen: include/
src/schema/ src/schema/compiler/ src/util/ src/wsdl/ src/wsdl/emitter/
src/wsdl/extensions/ src/wsdl/writer/
Author: nandika
Date: Thu Nov 30 21:03:10 2006
New Revision: 481156
URL: http://svn.apache.org/viewvc?view=rev&rev=481156
Log:
codegen tool compilation problems fixed for win32
Modified:
webservices/axis2/trunk/c/tools/codegen/include/w2c_string.h
webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler.c
webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler_options.c
webservices/axis2/trunk/c/tools/codegen/src/schema/databinding_adb_ext.c
webservices/axis2/trunk/c/tools/codegen/src/schema/xsd2code.c
webservices/axis2/trunk/c/tools/codegen/src/util/class_loader.c
webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option.c
webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option_parser.c
webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option_validator.c
webservices/axis2/trunk/c/tools/codegen/src/util/file_writer.c
webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c
webservices/axis2/trunk/c/tools/codegen/src/util/url_processor.c
webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/c_emitter.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_configuration.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_code_indenter_ext.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_qname2name_ext.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cservice_xml_writer.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cskel_header_writer.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cskel_source_writer.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cstub_header_writer.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cstub_source_writer.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/csvc_skeleton_writer.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer_protected.h
Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_string.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_string.h?view=diff&rev=481156&r1=481155&r2=481156
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_string.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_string.h Thu Nov 30 21:03:10 2006
@@ -63,7 +63,7 @@
* @param string2 string
* @return added string
*/
-AXIS2_EXTERN axis2_char_t*
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
w2c_string_add_string ( axis2_char_t *string1, axis2_char_t *string2,
const axis2_env_t *env );
@@ -75,7 +75,7 @@
* @param env pointer to the environment. MUST NOT be NULL
* @return c simple name
*/
-AXIS2_EXTERN axis2_char_t*
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
w2c_string_make_c_simple_name( axis2_char_t *name,
const axis2_env_t *env);
@@ -87,7 +87,7 @@
* @param env pointer to the environment. MUST NOT be NULL
* @return c macro name
*/
-AXIS2_EXTERN axis2_char_t*
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
w2c_string_make_c_macro_name(axis2_char_t *name,
const axis2_env_t *env);
Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler.c?view=diff&rev=481156&r1=481155&r2=481156
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler.c Thu Nov 30 21:03:10 2006
@@ -26,6 +26,7 @@
#include <xml_schema_includes.h>
#include <axis2_hash.h>
#include <w2c_string.h>
+#include <stdlib.h>
/**
* @brief
@@ -973,7 +974,7 @@
axis2_char_t *key = NULL;
axis2_char_t *value = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
compiler_impl = W2C_INTF_TO_IMPL(compiler);
Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler_options.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler_options.c?view=diff&rev=481156&r1=481155&r2=481156
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler_options.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler_options.c Thu Nov 30 21:03:10 2006
@@ -277,7 +277,7 @@
{
w2c_schema_compiler_options_impl_t *compiler_options_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
compiler_options_impl = W2C_INTF_TO_IMPL(compiler_options);
@@ -307,7 +307,7 @@
{
w2c_schema_compiler_options_impl_t *compiler_options_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
compiler_options_impl = W2C_INTF_TO_IMPL(compiler_options);
@@ -339,7 +339,7 @@
{
w2c_schema_compiler_options_impl_t *compiler_options_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
compiler_options_impl = W2C_INTF_TO_IMPL(compiler_options);
Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/databinding_adb_ext.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/databinding_adb_ext.c?view=diff&rev=481156&r1=481155&r2=481156
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/databinding_adb_ext.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/databinding_adb_ext.c Thu Nov 30 21:03:10 2006
@@ -48,6 +48,12 @@
w2c_databinding_adb_ext_invoke( const axis2_env_t * env,
w2c_engine_configuration_t *conf);
+axis2_status_t
+populate_default_options(
+ const axis2_env_t *env,
+ w2c_schema_compiler_options_t *options,
+ w2c_engine_configuration_t *config);
+
axiom_document_t*
get_root_element_from_filename(
Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/xsd2code.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/xsd2code.c?view=diff&rev=481156&r1=481155&r2=481156
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/xsd2code.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/xsd2code.c Thu Nov 30 21:03:10 2006
@@ -83,7 +83,7 @@
compiler = w2c_schema_compiler_create( env, compiler_options);
if ( compiler)
- w2c_schema_compiler_compile( compiler, env, current_schema);
+ W2C_SCHEMA_COMPILER_COMPILE( compiler, env, current_schema);
}
static void
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/class_loader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/class_loader.c?view=diff&rev=481156&r1=481155&r2=481156
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/class_loader.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/class_loader.c Thu Nov 30 21:03:10 2006
@@ -32,8 +32,8 @@
axis2_char_t *file_path = NULL;
void *obj = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, class_name, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
+ AXIS2_PARAM_CHECK(env->error, class_name, NULL);
file_path = getenv("AXIS2C_HOME");
file_path = AXIS2_STRDUP( file_path, env);
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option.c?view=diff&rev=481156&r1=481155&r2=481156
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option.c Thu Nov 30 21:03:10 2006
@@ -41,7 +41,7 @@
w2c_cmdline_option_free (w2c_cmdline_option_t *cmdline_option,
const axis2_env_t *env);
-axis2_char_t*
+axis2_char_t* AXIS2_CALL
w2c_cmdline_option_get_type(w2c_cmdline_option_t *cmdline_option,
const axis2_env_t *env);
@@ -166,7 +166,7 @@
return AXIS2_SUCCESS;
}
-axis2_char_t*
+axis2_char_t* AXIS2_CALL
w2c_cmdline_option_get_type(w2c_cmdline_option_t *cmdline_option,
const axis2_env_t *env)
{
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option_parser.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option_parser.c?view=diff&rev=481156&r1=481155&r2=481156
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option_parser.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option_parser.c Thu Nov 30 21:03:10 2006
@@ -19,6 +19,7 @@
#include <w2c_cmdline_option.h>
#include <w2c_cmdline_option_validator.h>
#include <axis2_string.h>
+#include <w2c_string.h>
/**
* @brief
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option_validator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option_validator.c?view=diff&rev=481156&r1=481155&r2=481156
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option_validator.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option_validator.c Thu Nov 30 21:03:10 2006
@@ -17,6 +17,8 @@
#include <w2c_cmdline_option_validator.h>
#include <w2c_cmdline_option_consts.h>
#include <w2c_cmdline_option.h>
+#include <string.h>
+#include <w2c_string.h>
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
@@ -27,7 +29,6 @@
axis2_bool_t isinvalid = AXIS2_FALSE;
axis2_char_t *type = NULL;
int index = -1;
-
type = W2C_CMDLINE_OPTION_GET_TYPE( option, env );
index = w2c_string_indexof_cs(type,
W2C_CMDLINE_OPTION_CONSTS_EXTRA_OPTIONTYPE_PREFIX);
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/file_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/file_writer.c?view=diff&rev=481156&r1=481155&r2=481156
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/file_writer.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/file_writer.c Thu Nov 30 21:03:10 2006
@@ -54,7 +54,7 @@
}
*cp = '\0';
/* TODO: this should be placed in platform */
- error = mkdir ( full_path, 0755 );
+ error = AXIS2_MKDIR ( full_path, 0755 );
if ( end )
{
if ( cp != full_path && *(cp-1) == AXIS2_PATH_SEP_CHAR )
@@ -91,7 +91,7 @@
}
*cp = '\0';
/* TODO:this should be placed in platform */
- error = mkdir ( full_path, 0755 );
+ error = AXIS2_MKDIR ( full_path, 0755 );
if ( end )
{
break;
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c?view=diff&rev=481156&r1=481155&r2=481156
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c Thu Nov 30 21:03:10 2006
@@ -180,7 +180,7 @@
xml_reader =
axiom_xml_reader_create_for_file(env, file_path, NULL);
if(!xml_reader)
- return AXIS2_FAILURE;
+ return NULL;
om_builder = axiom_stax_builder_create(env, xml_reader);
om_doc = axiom_document_create(env, NULL, om_builder);
AXIOM_DOCUMENT_BUILD_ALL(om_doc, env);
@@ -334,7 +334,7 @@
axis2_char_t counter_str[32];
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
local = AXIS2_STRDUP( "param", env);
@@ -361,7 +361,7 @@
axis2_char_t *value =NULL;
axis2_hash_t *h = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
typemapper_impl = W2C_INTF_TO_IMPL(typemapper);
h = typemapper_impl-> qname2name;
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/url_processor.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/url_processor.c?view=diff&rev=481156&r1=481155&r2=481156
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/url_processor.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/url_processor.c Thu Nov 30 21:03:10 2006
@@ -17,6 +17,7 @@
#include <w2c_url_processor.h>
#include <w2c_string.h>
#include <axis2_url.h>
+#include <ctype.h>
static axis2_bool_t AXIS2_CALL
@@ -113,7 +114,7 @@
}
}
}
- free (long_path );
+ AXIS2_FREE(env->allocator, long_path );
if ( NULL != path )
path_length = strlen ( path );
@@ -146,7 +147,7 @@
long_path_rev = ptr + 1;
}
}
- free ( long_path );
+ AXIS2_FREE(env->allocator, long_path );
}
return package_name;
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c?view=diff&rev=481156&r1=481155&r2=481156
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c Thu Nov 30 21:03:10 2006
@@ -43,7 +43,7 @@
{
axiom_node_t *child_node = NULL;
axiom_element_t *child_ele = NULL;
- AXIS2_ENV_CHECK ( env, AXIS2_FAILURE );
+ AXIS2_ENV_CHECK ( env, NULL );
child_ele = axiom_element_create ( env,
parent_node,
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/c_emitter.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/c_emitter.c?view=diff&rev=481156&r1=481155&r2=481156
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/c_emitter.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/c_emitter.c Thu Nov 30 21:03:10 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <w2c_emitter_protected.h>
+#include "w2c_emitter_protected.h"
#include <w2c_writer.h>
#include <w2c_xslt_utils.h>
#include <w2c_typemapper.h>
@@ -30,7 +30,13 @@
#define W2C_C_EMITTER_TYPE_SUFFIX "_t*"
/**********************fucntion prototypes ***********************************/
+axis2_status_t
+w2c_c_emitter_write_skel_header( w2c_emitter_impl_t *emitter_impl,
+ const axis2_env_t *env);
+axis2_status_t
+w2c_c_emitter_write_stub_header( w2c_emitter_impl_t *emitter_impl,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
w2c_c_emitter_set_config(w2c_emitter_t *emitter,
const axis2_env_t *env,
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c?view=diff&rev=481156&r1=481155&r2=481156
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c Thu Nov 30 21:03:10 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <w2c_emitter_protected.h>
+#include "w2c_emitter_protected.h"
#include <woden_wsdl10_desc.h>
#include <woden_wsdl10_svc.h>
@@ -59,6 +59,21 @@
#include <w2c_cmdline_option_consts.h>
#include <w2c_xslt_utils.h>
+
+axis2_status_t
+w2c_emitter_load_services_wsdl1( w2c_emitter_impl_t *emitter_impl,
+ const axis2_env_t *env,
+ axiom_node_t *root);
+axis2_status_t
+w2c_emitter_load_services_wsdl2( w2c_emitter_impl_t* emitter_impl,
+ const axis2_env_t* env,
+ axiom_node_t* root);
+
+axis2_status_t
+w2c_emitter_load_operations( w2c_emitter_impl_t *emitter_impl,
+ const axis2_env_t *env,
+ axiom_node_t *method,
+ void *interface_op, int wsdl_version);
/***************************Function implementation****************************/
w2c_emitter_impl_t*
@@ -145,7 +160,7 @@
}
if ( emitter_impl-> common_node )
{
- AXIOM_NODE_FREE_TREE_TREE ( emitter_impl-> common_node, env );
+ AXIOM_NODE_FREE_TREE( emitter_impl-> common_node, env );
}
if(emitter->ops)
{
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c?view=diff&rev=481156&r1=481155&r2=481156
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c Thu Nov 30 21:03:10 2006
@@ -141,7 +141,7 @@
{
w2c_messages_print_n_log_error( env,
"engine.noDefaultLang");
- return AXIS2_FAILURE;
+ return NULL;
}
}
w2c_engine_load_extension ( engine_impl, env );
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_configuration.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_configuration.c?view=diff&rev=481156&r1=481155&r2=481156
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_configuration.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_configuration.c Thu Nov 30 21:03:10 2006
@@ -15,6 +15,7 @@
*/
#include <w2c_engine_configuration.h>
+#include <w2c_engine_config_loader.h>
#include <axis2_array_list.h>
#include <axis2_hash.h>
#include <axis2_string.h>
@@ -1706,7 +1707,7 @@
{
w2c_engine_configuration_impl_t *engine_configuration_impl = NULL;
- AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK (env, NULL);
engine_configuration_impl = W2C_INTF_TO_IMPL(engine_configuration );
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_code_indenter_ext.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_code_indenter_ext.c?view=diff&rev=481156&r1=481155&r2=481156
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_code_indenter_ext.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_code_indenter_ext.c Thu Nov 30 21:03:10 2006
@@ -383,7 +383,7 @@
f = fopen ( filename, "r+");
if ( f == NULL )
{
- free (out_stream );
+ AXIS2_FREE(env->allocator, out_stream );
return NULL;
}
do{
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_qname2name_ext.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_qname2name_ext.c?view=diff&rev=481156&r1=481155&r2=481156
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_qname2name_ext.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_qname2name_ext.c Thu Nov 30 21:03:10 2006
@@ -122,7 +122,7 @@
axis2_char_t counter_str[32];
axis2_char_t *given_name = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
impl = W2C_QNAME2NAME_MAKER_INTF_TO_IMPL(qname2name_maker);
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cservice_xml_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cservice_xml_writer.c?view=diff&rev=481156&r1=481155&r2=481156
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cservice_xml_writer.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cservice_xml_writer.c Thu Nov 30 21:03:10 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <writer_protected.h>
+#include "writer_protected.h"
#include <w2c_file_writer.h>
#define W2C_CSERVICE_XML_WRITER_CLASS "w2c_cservice_xml_writer"
@@ -28,7 +28,7 @@
w2c_writer_impl_t* writer_impl = NULL;
axis2_char_t* output_locat = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
writer_impl = W2C_INTF_TO_IMPL(writer);
/* here the file_name, package_name would be build */
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cskel_header_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cskel_header_writer.c?view=diff&rev=481156&r1=481155&r2=481156
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cskel_header_writer.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cskel_header_writer.c Thu Nov 30 21:03:10 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <writer_protected.h>
+#include "writer_protected.h"
#include <w2c_file_writer.h>
#define W2C_CSKEL_HEADER_WRITER_CLASS "w2c_cskel_header_writer"
@@ -28,7 +28,7 @@
w2c_writer_impl_t* writer_impl = NULL;
axis2_char_t* output_locat = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
writer_impl = W2C_INTF_TO_IMPL(writer);
/* here the package_name would be build */
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cskel_source_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cskel_source_writer.c?view=diff&rev=481156&r1=481155&r2=481156
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cskel_source_writer.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cskel_source_writer.c Thu Nov 30 21:03:10 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <writer_protected.h>
+#include "writer_protected.h"
#include <w2c_file_writer.h>
#define W2C_CSKEL_SOURCE_WRITER_CLASS "w2c_cskel_source_writer"
@@ -29,7 +29,7 @@
axis2_char_t* output_locat = NULL;
axis2_char_t* ext_name = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
writer_impl = W2C_INTF_TO_IMPL(writer);
/* here the package_name would be build */
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cstub_header_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cstub_header_writer.c?view=diff&rev=481156&r1=481155&r2=481156
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cstub_header_writer.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cstub_header_writer.c Thu Nov 30 21:03:10 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <writer_protected.h>
+#include "writer_protected.h"
#include <w2c_file_writer.h>
#define W2C_CSTUB_HEADER_WRITER_CLASS "w2c_cstub_header_writer"
@@ -29,7 +29,7 @@
axis2_char_t* output_locat = NULL;
axis2_char_t* ext_name = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
writer_impl = W2C_INTF_TO_IMPL(writer);
ext_name = ".h";
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cstub_source_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cstub_source_writer.c?view=diff&rev=481156&r1=481155&r2=481156
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cstub_source_writer.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cstub_source_writer.c Thu Nov 30 21:03:10 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <writer_protected.h>
+#include "writer_protected.h"
#include <w2c_file_writer.h>
#define W2C_CSTUB_SOURCE_WRITER_CLASS "w2c_cstub_source_writer"
@@ -29,7 +29,7 @@
axis2_char_t* output_locat = NULL;
axis2_char_t* ext_name = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
writer_impl = W2C_INTF_TO_IMPL(writer);
ext_name = w2c_writer_get_extension ( writer_impl, env );
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/csvc_skeleton_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/csvc_skeleton_writer.c?view=diff&rev=481156&r1=481155&r2=481156
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/csvc_skeleton_writer.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/csvc_skeleton_writer.c Thu Nov 30 21:03:10 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <writer_protected.h>
+#include "writer_protected.h"
#include <w2c_file_writer.h>
#define W2C_CSVC_SKELETON_WRITER_CLASS "w2c_csvc_skeleton_writer"
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer.c?view=diff&rev=481156&r1=481155&r2=481156
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer.c Thu Nov 30 21:03:10 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <writer_protected.h>
+#include "writer_protected.h"
#include <axis2_array_list.h>
#include <axis2_string.h>
#include <w2c_string.h>
@@ -23,9 +23,10 @@
#include <stdlib.h>
#include <w2c_file_writer.h>
#include <w2c_xslt_utils.h>
+#include <w2c_xslt_template_processor.h>
-AXIS2_EXTERN w2c_writer_impl_t * AXIS2_CALL
+w2c_writer_impl_t * AXIS2_CALL
w2c_writer_create_impl (const axis2_env_t *env)
{
w2c_writer_impl_t *writer_impl = NULL;
@@ -106,7 +107,7 @@
axis2_char_t* ext_name = NULL;
axis2_char_t* output_locat = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
writer_impl = W2C_INTF_TO_IMPL(writer);
ext_name = w2c_writer_get_extension ( writer_impl, env );
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer_protected.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer_protected.h?view=diff&rev=481156&r1=481155&r2=481156
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer_protected.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer_protected.h Thu Nov 30 21:03:10 2006
@@ -45,7 +45,7 @@
/************************* Function prototypes ********************************/
-AXIS2_EXTERN w2c_writer_impl_t * AXIS2_CALL
+w2c_writer_impl_t * AXIS2_CALL
w2c_writer_create_impl (const axis2_env_t *env);
axis2_status_t AXIS2_CALL
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org