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/05 06:39:15 UTC
svn commit: r482499 - in /webservices/axis2/trunk/c/tools/codegen: include/
src/ src/schema/ src/schema/compiler/ src/schema/writer/ src/util/
src/wsdl/ src/wsdl/extensions/
Author: nandika
Date: Mon Dec 4 21:39:09 2006
New Revision: 482499
URL: http://svn.apache.org/viewvc?view=rev&rev=482499
Log:
codegen tool problems fixed for windows
Removed:
webservices/axis2/trunk/c/tools/codegen/src/util/cqname2name_maker.c
Modified:
webservices/axis2/trunk/c/tools/codegen/include/w2c_messages.h
webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_property_loader.c
webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_c_writer.c
webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_writer.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/messages.c
webservices/axis2/trunk/c/tools/codegen/src/util/properties.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_configuration.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_qname2name_ext.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl2code.c
Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_messages.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_messages.h?view=diff&rev=482499&r1=482498&r2=482499
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_messages.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_messages.h Mon Dec 4 21:39:09 2006
@@ -31,7 +31,8 @@
{
#endif
-#define W2C_MESSAGES_INTER_PATH "/conf/"
+#define W2C_MESSAGES_INTER_PATH "/conf/"
+
/**
* @defgroup w2c_messages handles file writing
Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_property_loader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_property_loader.c?view=diff&rev=482499&r1=482498&r2=482499
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_property_loader.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_property_loader.c Mon Dec 4 21:39:09 2006
@@ -164,15 +164,17 @@
sprintf(schema_property_loader_impl-> prop_filename, "%s%s", axis2c_home,
W2C_SCHEMA_PROPERTY_LOADER_DEFAULT_PROPERTIES);
- f = fopen ( schema_property_loader_impl-> prop_filename, "r+");
+ /*
+ f = fopen ( schema_property_loader_impl-> prop_filename, "r+");
if ( f == NULL )
{
w2c_schema_property_loader_free(&(schema_property_loader_impl->schema_property_loader), env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_COULD_NOT_OPEN_FILE, AXIS2_FAILURE);
return NULL;
}
+ */
schema_property_loader_impl-> prop_set = axis2_properties_create( env);
- AXIS2_PROPERTIES_LOAD( schema_property_loader_impl-> prop_set, env, f);
+ AXIS2_PROPERTIES_LOAD( schema_property_loader_impl-> prop_set, env, schema_property_loader_impl->prop_filename);
if ( schema_property_loader_impl-> prop_set != NULL )
{
@@ -317,7 +319,7 @@
{
AXIS2_PROPERTIES_FREE ( schema_property_loader_impl->prop_set, env );
}
-
+ /*
f = fopen ( schema_property_loader_impl-> prop_filename, "r+");
if ( f == NULL )
{
@@ -325,8 +327,9 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_COULD_NOT_OPEN_FILE, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
+ */
schema_property_loader_impl-> prop_set = axis2_properties_create( env);
- AXIS2_PROPERTIES_LOAD( schema_property_loader_impl-> prop_set, env, f);
+ AXIS2_PROPERTIES_LOAD( schema_property_loader_impl-> prop_set, env, schema_property_loader_impl->prop_filename);
if ( schema_property_loader_impl-> prop_set != NULL )
{
Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_c_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_c_writer.c?view=diff&rev=482499&r1=482498&r2=482499
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_c_writer.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_c_writer.c Mon Dec 4 21:39:09 2006
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#include <schema_writer_protected.h>
+#include "schema_writer_protected.h"
+#include <w2c_xslt_template_processor.h>
/**
* @brief
@@ -40,7 +41,7 @@
axis2_char_t *temp_uri = NULL;
axis2_char_t *temp_prefix = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
writer_impl = W2C_INTF_TO_IMPL(writer);
Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_writer.c?view=diff&rev=482499&r1=482498&r2=482499
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_writer.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_writer.c Mon Dec 4 21:39:09 2006
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#include <schema_writer_protected.h>
+#include "schema_writer_protected.h"
+#include <w2c_xslt_template_processor.h>
/**
* The following set of functions suppose to be implemented
@@ -127,7 +128,7 @@
}
if( writer_impl-> global_wrapped_node)
{
- AXIOM_NODE_FREE( writer_impl-> global_wrapped_node, env);
+ AXIOM_NODE_FREE_TREE( writer_impl-> global_wrapped_node, env);
}
if( writer_impl-> model_map)
@@ -172,7 +173,7 @@
{
w2c_schema_writer_impl_t *writer_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
writer_impl = W2C_INTF_TO_IMPL(writer);
@@ -343,7 +344,7 @@
{
AXIS2_ENV_CHECK(env, NULL);
w2c_messages_print_n_log_error( env, "schema.notImplemented");
- return AXIS2_FAILURE;
+ return NULL;
}
axis2_status_t
@@ -380,7 +381,7 @@
W2C_ENGINE_CONFIGURATION_NAMEMAKER name_maker = NULL;
w2c_schema_writer_impl_t *writer_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
writer_impl = W2C_INTF_TO_IMPL(writer);
ns_uri = AXIS2_QNAME_GET_URI( qname, env);
@@ -925,7 +926,7 @@
return prefix;
}
-axis2_status_t
+axis2_status_t AXIS2_CALL
w2c_schema_writer_register_extension_mapper_packagename(w2c_schema_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *packagename)
@@ -937,7 +938,7 @@
return AXIS2_SUCCESS;
}
-axis2_status_t
+axis2_status_t AXIS2_CALL
w2c_schema_writer_write_extension_mapper( w2c_schema_writer_t *writer,
const axis2_env_t *env,
axis2_hash_t *meta_info_array)
@@ -945,7 +946,7 @@
return AXIS2_SUCCESS;
}
-axis2_char_t*
+axis2_char_t* AXIS2_CALL
w2c_schema_writer_get_extension_mapper_package_name(w2c_schema_writer_t *writer,
const axis2_env_t *env)
{
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=482499&r1=482498&r2=482499
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/xsd2code.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/xsd2code.c Mon Dec 4 21:39:09 2006
@@ -46,7 +46,6 @@
w2c_schema_print_usage( env);
}
- axis2_allocator_free(allocator);
axis2_env_free( env );
return 0;
}
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=482499&r1=482498&r2=482499
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/class_loader.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/class_loader.c Mon Dec 4 21:39:09 2006
@@ -58,7 +58,8 @@
AXIS2_PARAM_SET_VALUE(impl_info_param, env, dll_desc);
axis2_class_loader_init(env);
- obj = axis2_class_loader_create_dll(env, impl_info_param);
+ printf("\n%s\n", file_path);
+ obj = axis2_class_loader_create_dll(env, impl_info_param);
AXIS2_FREE ( env->allocator, file_path);
return obj;
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/messages.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/messages.c?view=diff&rev=482499&r1=482498&r2=482499
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/messages.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/messages.c Mon Dec 4 21:39:09 2006
@@ -49,10 +49,8 @@
filepath = AXIS2_MALLOC ( env-> allocator, path_len* sizeof(axis2_char_t) );
sprintf ( filepath, "%s%s%s", axis2c_home, inter_path, filename );
- f = fopen( filepath, "r+");
props = axis2_properties_create(env);
- AXIS2_PROPERTIES_LOAD( props, env, f);
- fclose(f);
+ AXIS2_PROPERTIES_LOAD( props, env, filepath);
return props;
}
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/properties.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/properties.c?view=diff&rev=482499&r1=482498&r2=482499
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/properties.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/properties.c Mon Dec 4 21:39:09 2006
@@ -62,18 +62,9 @@
axis2_char_t *p = NULL;
axis2_char_t *tag = NULL;
axis2_hash_t *tmp_hash = NULL;
- FILE *f = NULL;
axis2_array_list_t *arr_list = NULL;
int i = 0;
- AXIS2_ENV_CHECK(env, NULL);
-
- f = fopen ( filename, "r+");
- if ( f == NULL )
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_COULD_NOT_OPEN_FILE, AXIS2_FAILURE);
- return NULL;
- }
properties_impl = (w2c_properties_impl_t *) AXIS2_MALLOC(env->
allocator, sizeof(w2c_properties_impl_t));
@@ -89,9 +80,7 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- AXIS2_PROPERTIES_LOAD( main_props, env, f );
- fclose(f);
-
+ AXIS2_PROPERTIES_LOAD( main_props, env, filename );
tmp_hash = AXIS2_PROPERTIES_GET_ALL( main_props, 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=482499&r1=482498&r2=482499
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_configuration.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_configuration.c Mon Dec 4 21:39:09 2006
@@ -698,11 +698,15 @@
}
if ( engine_configuration_impl->base_uri )
{
+ /*
AXIS2_FREE ( env-> allocator, engine_configuration_impl->base_uri );
- }
+ */
+ }
if ( engine_configuration_impl->wsdl_uri )
{
+ /*
AXIS2_FREE ( env-> allocator, engine_configuration_impl->wsdl_uri );
+ */
}
if ( engine_configuration_impl->repository_path )
{
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=482499&r1=482498&r2=482499
==============================================================================
--- 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 Mon Dec 4 21:39:09 2006
@@ -33,7 +33,15 @@
((w2c_c_qname2name_ext_impl_t*) extension)
#define W2C_QNAME2NAME_MAKER_INTF_TO_IMPL(qname2name_maker) \
- ((w2c_c_qname2name_ext_impl_t*) ((void*)(qname2name_maker) - sizeof(w2c_extension_t)))
+ ((w2c_c_qname2name_ext_impl_t*) ((qname2name_maker) - sizeof(w2c_extension_t)))
+
+/**
+Above macro was as
+((w2c_c_qname2name_ext_impl_t*) ((void*)(qname2name_maker) - sizeof(w2c_extension_t)))
+
+This gives a compilation error on win32, and in current form it currupts
+memory.
+*/
/**************implmentations for w2c_extension_t methods**********************/
axis2_status_t AXIS2_CALL
@@ -148,7 +156,7 @@
given_name = axis2_stracat( local, counter_str, env);
axis2_hash_set(impl-> qname2name, key, AXIS2_HASH_KEY_STRING, given_name);
- axis2_hash_set(impl-> name2number, local, AXIS2_HASH_KEY_STRING, (void*)counter+1);
+ axis2_hash_set(impl-> name2number, local, AXIS2_HASH_KEY_STRING, (void*)(counter+1));
return given_name;
}
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl2code.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl2code.c?view=diff&rev=482499&r1=482498&r2=482499
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl2code.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl2code.c Mon Dec 4 21:39:09 2006
@@ -48,7 +48,6 @@
}
}
W2C_CMDLINE_OPTION_PARSER_FREE(cmd_opt_parser, env);
- axis2_allocator_free(allocator);
axis2_env_free(env);
return 0;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org