Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 78784 invoked from network); 24 Nov 2005 03:47:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 24 Nov 2005 03:47:45 -0000 Received: (qmail 26766 invoked by uid 500); 24 Nov 2005 03:47:44 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 26539 invoked by uid 500); 24 Nov 2005 03:47:43 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 26528 invoked by uid 500); 24 Nov 2005 03:47:43 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 26525 invoked by uid 99); 24 Nov 2005 03:47:43 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 23 Nov 2005 19:47:41 -0800 Received: (qmail 78360 invoked by uid 65534); 24 Nov 2005 03:47:21 -0000 Message-ID: <20051124034721.78359.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r348632 - in /webservices/axis2/trunk/c: ./ include/ modules/core/ modules/core/description/src/ modules/core/engine/src/ modules/core/phaseresolver/src/ modules/xml/parser/guththila/src/ modules/xml/parser/guththila/test/ modules/xml/parse... Date: Thu, 24 Nov 2005 03:47:18 -0000 To: axis2-cvs@ws.apache.org From: damitha@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: damitha Date: Wed Nov 23 19:46:50 2005 New Revision: 348632 URL: http://svn.apache.org/viewcvs?rev=348632&view=rev Log: phase holder and resolver code added Modified: webservices/axis2/trunk/c/configure webservices/axis2/trunk/c/configure.ac webservices/axis2/trunk/c/include/axis2_phase.h webservices/axis2/trunk/c/include/axis2_phase_holder.h webservices/axis2/trunk/c/include/axis2_phase_meta.h webservices/axis2/trunk/c/include/axis2_phase_resolver.h webservices/axis2/trunk/c/modules/core/Makefile.am webservices/axis2/trunk/c/modules/core/Makefile.in webservices/axis2/trunk/c/modules/core/description/src/Makefile.am webservices/axis2/trunk/c/modules/core/description/src/Makefile.in webservices/axis2/trunk/c/modules/core/engine/src/phase.c webservices/axis2/trunk/c/modules/core/phaseresolver/src/phase_resolver.c webservices/axis2/trunk/c/modules/xml/parser/guththila/src/Makefile webservices/axis2/trunk/c/modules/xml/parser/guththila/test/Makefile webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/Makefile webservices/axis2/trunk/c/modules/xml/parser/libxml2/test/Makefile Modified: webservices/axis2/trunk/c/configure URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/configure?rev=348632&r1=348631&r2=348632&view=diff ============================================================================== --- webservices/axis2/trunk/c/configure (original) +++ webservices/axis2/trunk/c/configure Wed Nov 23 19:46:50 2005 @@ -22469,7 +22469,7 @@ PULL_PARSER=$want_parser - ac_config_files="$ac_config_files Makefile modules/Makefile modules/core/Makefile modules/core/context/Makefile modules/core/context/src/Makefile modules/core/context/test/Makefile modules/core/description/Makefile modules/core/description/src/Makefile modules/core/description/test/Makefile modules/core/engine/Makefile modules/core/engine/src/Makefile modules/core/engine/test/Makefile modules/core/handlers/Makefile modules/core/handlers/src/Makefile modules/core/phaseresolver/Makefile modules/core/phaseresolver/src/Makefile modules/xml/Makefile modules/xml/parser/Makefile modules/xml/parser/guththila/Makefile modules/xml/parser/guththila/impl/Makefile modules/xml/parser/guththila/impl/src/Makefile modules/xml/parser/guththila/src/Makefile modules/xml/parser/guththila/test/Makefile modules/xml/parser/libxml2/Makefile modules/xml/parser/libxml2/src/Makefile modules/xml/parser/libxml2/test/Makefile modules/xml/soap/Makefile modules/xml/soap/src/Makefile modules/xml/om/Makefile modules/xml/om/src/Makefile modules/xml/om/test/Makefile modules/common/Makefile modules/common/src/Makefile modules/common/test/Makefile modules/util/Makefile modules/util/src/Makefile modules/util/test/Makefile modules/wsdl/Makefile modules/wsdl/src/Makefile modules/wsdl/test/Makefile modules/test/Makefile modules/test/om/Makefile modules/test/om/src/Makefile modules/test/common/Makefile modules/test/core/Makefile modules/test/core/handlers/Makefile modules/test/util/Makefile modules/test/unit/Makefile" + ac_config_files="$ac_config_files Makefile modules/Makefile modules/core/Makefile modules/core/context/Makefile modules/core/context/src/Makefile modules/core/context/test/Makefile modules/core/description/Makefile modules/core/description/src/Makefile modules/core/description/test/Makefile modules/core/engine/Makefile modules/core/engine/src/Makefile modules/core/engine/test/Makefile modules/core/handlers/Makefile modules/core/handlers/src/Makefile modules/core/phaseresolver/Makefile modules/core/phaseresolver/src/Makefile modules/core/transport/Makefile modules/xml/Makefile modules/xml/parser/Makefile modules/xml/parser/guththila/Makefile modules/xml/parser/guththila/impl/Makefile modules/xml/parser/guththila/impl/src/Makefile modules/xml/parser/guththila/src/Makefile modules/xml/parser/guththila/test/Makefile modules/xml/parser/libxml2/Makefile modules/xml/parser/libxml2/src/Makefile modules/xml/parser/libxml2/test/Makefile modules/xml/soap/Makefile modules/xml/soap/src/Makefile modules/xml/om/Makefile modules/xml/om/src/Makefile modules/xml/om/test/Makefile modules/common/Makefile modules/common/src/Makefile modules/common/test/Makefile modules/util/Makefile modules/util/src/Makefile modules/util/test/Makefile modules/wsdl/Makefile modules/wsdl/src/Makefile modules/wsdl/test/Makefile modules/test/Makefile modules/test/om/Makefile modules/test/om/src/Makefile modules/test/common/Makefile modules/test/core/Makefile modules/test/core/handlers/Makefile modules/test/util/Makefile modules/test/unit/Makefile" cat >confcache <<\_ACEOF @@ -23079,6 +23079,7 @@ "modules/core/handlers/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/core/handlers/src/Makefile" ;; "modules/core/phaseresolver/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/core/phaseresolver/Makefile" ;; "modules/core/phaseresolver/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/core/phaseresolver/src/Makefile" ;; + "modules/core/transport/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/core/transport/Makefile" ;; "modules/xml/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/xml/Makefile" ;; "modules/xml/parser/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/xml/parser/Makefile" ;; "modules/xml/parser/guththila/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/xml/parser/guththila/Makefile" ;; Modified: webservices/axis2/trunk/c/configure.ac URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/configure.ac?rev=348632&r1=348631&r2=348632&view=diff ============================================================================== --- webservices/axis2/trunk/c/configure.ac (original) +++ webservices/axis2/trunk/c/configure.ac Wed Nov 23 19:46:50 2005 @@ -106,6 +106,7 @@ modules/core/handlers/src/Makefile \ modules/core/phaseresolver/Makefile \ modules/core/phaseresolver/src/Makefile \ + modules/core/transport/Makefile \ modules/xml/Makefile \ modules/xml/parser/Makefile \ modules/xml/parser/guththila/Makefile \ Modified: webservices/axis2/trunk/c/include/axis2_phase.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_phase.h?rev=348632&r1=348631&r2=348632&view=diff ============================================================================== --- webservices/axis2/trunk/c/include/axis2_phase.h (original) +++ webservices/axis2/trunk/c/include/axis2_phase.h Wed Nov 23 19:46:50 2005 @@ -167,7 +167,7 @@ /** * creates phase struct */ -AXIS2_DECLARE(axis2_phase_t*) axis2_phase_create(axis2_env_t **env, axis2_char_t *phase_name); +AXIS2_DECLARE(axis2_phase_t*) axis2_phase_create(axis2_env_t **env, const axis2_char_t *phase_name); #define AXIS2_PHASE_ADD_HANDLER_AT(phase, env, handler) ((phase)->ops->add_handler_at(phase, env, handler)) #define AXIS2_PHASE_ADD_HANDLER(phase, env, handler) ((phase)->ops->add_handler(phase, env, handler)) Modified: webservices/axis2/trunk/c/include/axis2_phase_holder.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_phase_holder.h?rev=348632&r1=348631&r2=348632&view=diff ============================================================================== --- webservices/axis2/trunk/c/include/axis2_phase_holder.h (original) +++ webservices/axis2/trunk/c/include/axis2_phase_holder.h Wed Nov 23 19:46:50 2005 @@ -126,16 +126,16 @@ }; /** - * Creates wsdl property struct - * @return pointer to newly created wsdl property + * Creates phase holder struct + * @return pointer to newly created phase holder */ AXIS2_DECLARE(axis2_phase_holder_t *) axis2_phase_holder_create (axis2_env_t **env); /** - * Creates wsdl property struct + * Creates phase holder struct * @param phases - * @return pointer to newly created wsdl property + * @return pointer to newly created phase holder */ AXIS2_DECLARE(axis2_phase_holder_t *) axis2_phase_holder_create_with_phases (axis2_env_t **env, axis2_array_list_t *phases); Modified: webservices/axis2/trunk/c/include/axis2_phase_meta.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_phase_meta.h?rev=348632&r1=348631&r2=348632&view=diff ============================================================================== --- webservices/axis2/trunk/c/include/axis2_phase_meta.h (original) +++ webservices/axis2/trunk/c/include/axis2_phase_meta.h Wed Nov 23 19:46:50 2005 @@ -39,22 +39,22 @@ static const int AXIS2_FAULT_IN_FLOW = 3; static const int AXIS2_FAULT_OUT_FLOW = 4; - //INFLOW - static const axhs2_char_t *AXIS2_PHASE_TRANSPORTIN = "TransportIn"; - static const axhs2_char_t *AXIS2_PHASE_PRE_DISPATCH = "PreDispatch"; - static const axhs2_char_t *AXIS2_PHASE_DISPATCH = "Dispatch"; - static const axhs2_char_t *AXIS2_PHASE_POST_DISPATCH = "PostDispatch"; - static const axhs2_char_t *AXIS2_PHASE_POLICY_DETERMINATION = "PolicyDetermination"; - static const axhs2_char_t *AXIS2_PHASE_MESSAGE_PROCESSING = "MessageProcessing"; + /* INFLOW */ + static const axis2_char_t *AXIS2_PHASE_TRANSPORTIN = "TransportIn"; + static const axis2_char_t *AXIS2_PHASE_PRE_DISPATCH = "PreDispatch"; + static const axis2_char_t *AXIS2_PHASE_DISPATCH = "Dispatch"; + static const axis2_char_t *AXIS2_PHASE_POST_DISPATCH = "PostDispatch"; + static const axis2_char_t *AXIS2_PHASE_POLICY_DETERMINATION = "PolicyDetermination"; + static const axis2_char_t *AXIS2_PHASE_MESSAGE_PROCESSING = "MessageProcessing"; - //OUTFLOW - static const axhs2_char_t *AXIS2_PHASE_MESSAGE_OUT = "MessageOut"; - static const axhs2_char_t *AXIS2_PHASE_TRANSPORT_OUT = "MessageOut"; + /* OUTFLOW */ + static const axis2_char_t *AXIS2_PHASE_MESSAGE_OUT = "MessageOut"; + static const axis2_char_t *AXIS2_PHASE_TRANSPORT_OUT = "MessageOut"; /** * All the handlers inside transport_sender and tranport_recievre in axis2.xml gose * to this phase */ - static const axhs2_char_t *AXIS2_TRANSPORT_PHASE = "TRANSPORT"; + static const axis2_char_t *AXIS2_TRANSPORT_PHASE = "TRANSPORT"; /** @} */ Modified: webservices/axis2/trunk/c/include/axis2_phase_resolver.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_phase_resolver.h?rev=348632&r1=348631&r2=348632&view=diff ============================================================================== --- webservices/axis2/trunk/c/include/axis2_phase_resolver.h (original) +++ webservices/axis2/trunk/c/include/axis2_phase_resolver.h Wed Nov 23 19:46:50 2005 @@ -0,0 +1,119 @@ +/* + * Copyright 2004,2005 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. + */ + +#ifndef AXIS2_PHASE_RESOLVER_H +#define AXIS2_PHASE_RESOLVER_H + +/** + * @file axis2_phase_resolver.h + * @brief Axis2 Wsdl soap operation interface + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef __cplusplus +extern "C" +{ +#endif + +struct axis2_phase; +struct axis2_handler_desc; +struct axis2_handler; +struct axis2_phase_rule; +typedef struct axis2_phase_resolver axis2_phase_resolver_t; +typedef struct axis2_phase_resolver_ops axis2_phase_resolver_ops_t; + +/** @defgroup axis2_phase_resolver Phase Resolver + * @ingroup axis2_phase + * @{ + */ + +/** + * @brief Wsdl Phase Resolver operations struct + * Encapsulator struct for operations of axis2_phase_resolver + */ +AXIS2_DECLARE_DATA struct axis2_phase_resolver_ops +{ + /** De-allocate memory + * @return status code + */ + axis2_status_t (AXIS2_CALL *free)( + axis2_phase_resolver_t *phase_resolver, + axis2_env_t **env); + + + +}; + +/** + * @brief Phase Resolver struct + */ +AXIS2_DECLARE_DATA struct axis2_phase_resolver +{ + axis2_phase_resolver_ops_t *ops; +}; + +/** + * Creates phase resolver struct + * @return pointer to newly created phase resolver + */ +AXIS2_DECLARE(axis2_phase_resolver_t *) +axis2_phase_resolver_create (axis2_env_t **env); + +/** + * Creates phase resolver struct + * @param phases + * @return pointer to newly created phase resolver + */ +AXIS2_DECLARE(axis2_phase_resolver_t *) +axis2_phase_resolver_create_with_phases (axis2_env_t **env, axis2_array_list_t *phases); + +/*************************** Function macros **********************************/ + +#define AXIS2_PHASE_RESOLVER_FREE(phase_resolver, env) \ + ((phase_resolver->ops)->free (phase_resolver, env)) + +#define AXIS2_PHASE_RESOLVER_IS_PHASE_EXIST(phase_resolver, env, phase_name) \ + ((phase_resolver->ops)->is_phase_exist (phase_resolver, env, phase_name)) + +#define AXIS2_PHASE_RESOLVER_ADD_HANDLER(phase_resolver, env, handler) \ + ((phase_resolver->ops)->add_handler (phase_resolver, env, handler)) + +#define AXIS2_PHASE_RESOLVER_GET_PHASE(phase_resolver, env, phase_name) \ + ((phase_resolver->ops)->get_phase (phase_resolver, env, phase_name)) + +#define AXIS2_PHASE_RESOLVER_BUILD_TRANSPORT_HANDLER_CHAIN(phase_resolver, env, phase, handlers) \ + ((phase_resolver->ops)->build_transport_handler_chain (phase_resolver, env, phase, handlers)) + +/*************************** End of function macros ***************************/ + +/** @} */ + +#ifdef __cplusplus +} +#endif +#endif /* AXIS2_PHASE_RESOLVER_H */ Modified: webservices/axis2/trunk/c/modules/core/Makefile.am URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/Makefile.am?rev=348632&r1=348631&r2=348632&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/Makefile.am (original) +++ webservices/axis2/trunk/c/modules/core/Makefile.am Wed Nov 23 19:46:50 2005 @@ -1 +1 @@ -SUBDIRS = description context engine handlers phaseresolver +SUBDIRS = description context engine handlers phaseresolver transport Modified: webservices/axis2/trunk/c/modules/core/Makefile.in URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/Makefile.in?rev=348632&r1=348631&r2=348632&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/Makefile.in (original) +++ webservices/axis2/trunk/c/modules/core/Makefile.in Wed Nov 23 19:46:50 2005 @@ -167,7 +167,7 @@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -SUBDIRS = description context engine handlers phaseresolver +SUBDIRS = description context engine handlers phaseresolver transport all: all-recursive .SUFFIXES: Modified: webservices/axis2/trunk/c/modules/core/description/src/Makefile.am URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/Makefile.am?rev=348632&r1=348631&r2=348632&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/description/src/Makefile.am (original) +++ webservices/axis2/trunk/c/modules/core/description/src/Makefile.am Wed Nov 23 19:46:50 2005 @@ -15,4 +15,5 @@ INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include \ -I$(top_builddir)/modules/xml/guththila/src \ -I$(top_builddir)/modules/util/src \ - -I$(top_builddir)/modules/wsdl/src + -I$(top_builddir)/modules/wsdl/src \ + -I$(top_builddir)/modules/core/transport Modified: webservices/axis2/trunk/c/modules/core/description/src/Makefile.in URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/Makefile.in?rev=348632&r1=348631&r2=348632&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/description/src/Makefile.in (original) +++ webservices/axis2/trunk/c/modules/core/description/src/Makefile.in Wed Nov 23 19:46:50 2005 @@ -207,7 +207,8 @@ INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include \ -I$(top_builddir)/modules/xml/guththila/src \ -I$(top_builddir)/modules/util/src \ - -I$(top_builddir)/modules/wsdl/src + -I$(top_builddir)/modules/wsdl/src \ + -I$(top_builddir)/modules/core/transport all: all-am Modified: webservices/axis2/trunk/c/modules/core/engine/src/phase.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/phase.c?rev=348632&r1=348631&r2=348632&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/engine/src/phase.c (original) +++ webservices/axis2/trunk/c/modules/core/engine/src/phase.c Wed Nov 23 19:46:50 2005 @@ -82,7 +82,7 @@ axis2_env_t **env); -axis2_phase_t* AXIS2_CALL axis2_phase_create(axis2_env_t **env, axis2_char_t *phase_name) +axis2_phase_t* AXIS2_CALL axis2_phase_create(axis2_env_t **env, const axis2_char_t *phase_name) { axis2_phase_impl_t *phase_impl = NULL; Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/src/phase_resolver.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/phaseresolver/src/phase_resolver.c?rev=348632&r1=348631&r2=348632&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/phaseresolver/src/phase_resolver.c (original) +++ webservices/axis2/trunk/c/modules/core/phaseresolver/src/phase_resolver.c Wed Nov 23 19:46:50 2005 @@ -0,0 +1,727 @@ +/* + * Copyright 2004,2005 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. + */ + +#include + +/** + * @brief Wsdl phase holder struct impl + * Phase Resolver + * This class hold all the phases found in the services.xml and server.xml + */ +typedef struct axis2_phase_resolver_impl +{ + axis2_phase_resolver_t phase_resolver; + /** + * Field axisConfig + */ + private AxisConfiguration axisConfig; + + /** + * Field axisService + */ + private AxisService axisService; + + + /** + * Field phaseHolder + */ + private PhaseHolder phaseHolder; + +} axis2_phase_resolver_impl_t; + +#define AXIS2_INTF_TO_IMPL(phase_resolver) ((axis2_phase_resolver_impl_t *)phase_resolver) + +/************************* Function prototypes ********************************/ + +axis2_status_t AXIS2_CALL + axis2_phase_resolver_free ( + axis2_phase_resolver_t *phase_resolver, + axis2_env_t **env); + + +/************************** End of function prototypes ************************/ + +axis2_phase_resolver_t * AXIS2_CALL +axis2_phase_resolver_create (axis2_env_t **env) +{ + AXIS2_ENV_CHECK(env, NULL); + + axis2_phase_resolver_impl_t *phase_resolver_impl = + (axis2_phase_resolver_impl_t *) AXIS2_MALLOC((*env)->allocator, + sizeof(axis2_phase_resolver_impl_t)); + + + if(NULL == phase_resolver_impl) + AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL); + + phase_resolver_impl->phase_list = axis2_array_list_create(env, 0); + if(NULL == phase_resolver_impl->phase_list) + { + axis2_phase_resolver_free(&(phase_resolver_impl->phase_resolver), env); + AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL); + } + + phase_resolver_impl->phase_resolver.ops = + AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_phase_resolver_ops_t)); + if(NULL == phase_resolver_impl->phase_resolver.ops) + { + axis2_phase_resolver_free(&(phase_resolver_impl-> + phase_resolver), env); + AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL); + } + + phase_resolver_impl->phase_resolver.ops->free = + axis2_phase_resolver_free; + + phase_resolver_impl->phase_resolver.ops->is_phase_exist = + axis2_phase_resolver_is_phase_exist; + phase_resolver_impl->phase_resolver.ops->add_handler = + axis2_phase_resolver_add_handler; + phase_resolver_impl->phase_resolver.ops->get_phase = + axis2_phase_resolver_get_phase; + phase_resolver_impl->phase_resolver.ops->build_transport_handler_chain = + axis2_phase_resolver_build_transport_handler_chain; + + return &(phase_resolver_impl->phase_resolver); +} + +axis2_phase_resolver_t * AXIS2_CALL +axis2_phase_resolver_create_with_phases (axis2_env_t **env, axis2_array_list_t *phases) +{ + AXIS2_ENV_CHECK(env, NULL); + AXIS2_PARAM_CHECK((*env)->error, phases, NULL); + + axis2_phase_resolver_impl_t *phase_resolver_impl = (axis2_phase_resolver_impl_t *) + axis2_phase_resolver_create(env); + AXIS2_ARRAY_LIST_FREE(phase_resolver_impl->phase_list, env); + phase_resolver_impl->phase_list = phases; + return &(phase_resolver_impl->phase_resolver); +} + +/***************************Function implementation****************************/ + +axis2_status_t AXIS2_CALL +axis2_phase_resolver_free (axis2_phase_resolver_t *phase_resolver, + axis2_env_t **env) +{ + axis2_phase_resolver_impl_t *phase_resolver_impl = + AXIS2_INTF_TO_IMPL(phase_resolver); + + AXIS2_FUNC_PARAM_CHECK(phase_resolver, env, AXIS2_FAILURE); + + if(NULL != phase_resolver->ops) + AXIS2_FREE((*env)->allocator, phase_resolver->ops); + + if(NULL != phase_resolver_impl->phase_list) + { + AXIS2_ARRAY_LIST_FREE(phase_resolver_impl->phase_list, env); + } + + AXIS2_FREE((*env)->allocator, phase_resolver_impl); + + return AXIS2_SUCCESS; +} + +/** + * Class PhaseResolver + */ +public class PhaseResolver { + /** + * Field axisConfig + */ + private AxisConfiguration axisConfig; + + /** + * Field axisService + */ + private AxisService axisService; + + + /** + * Field phaseHolder + */ + private PhaseHolder phaseHolder; + + public PhaseResolver() { + } + + /** + * default constructor , to obuild chains for GlobalDescription + * + * @param engineConfig + */ + public PhaseResolver(AxisConfiguration engineConfig) { + this.axisConfig = engineConfig; + } + + /** + * Constructor PhaseResolver + * + * @param axisConfig + * @param serviceContext + */ + public PhaseResolver(AxisConfiguration axisConfig, + AxisService serviceContext) { + this.axisConfig = axisConfig; + this.axisService = serviceContext; + } + + /** + * Method buildchains + * + * @throws PhaseException + * @throws AxisFault + */ + public void buildchains() throws PhaseException, AxisFault { + HashMap operations = axisService.getOperations(); + Collection col = operations.values(); + for (Iterator iterator = col.iterator(); iterator.hasNext();) { + AxisOperation axisOperation = (AxisOperation) iterator.next(); + for (int i = 1; i < 5; i++) { + buildExcutionChains(i, axisOperation); + } + } + } + + /** + * To build the opration for the opeartion which the module going to be added + * + * @param opartion AxisOperation + * @throws AxisFault + */ + public void buildModuleOperation(AxisOperation opartion) throws AxisFault { + for (int i = 1; i < 5; i++) { + buildExcutionChains(i, opartion); + } + } + + /** + * this opeartion is used to build all the three cahins , + * so type varible is used to difrenciate them + * type = 1 inflow + * type = 2 out flow + * type = 3 fault flow + * + * @param type + * @throws AxisFault + * @throws PhaseException + */ + private void buildExcutionChains(int type, AxisOperation axisOperation) + throws AxisFault, PhaseException { + ArrayList allHandlers = new ArrayList(); + ModuleDescription module; + Flow flow = null; + /////////////////////////////////////////////////////////////////////////////////////////// + ////////////////////////// Handlers from axis2.xml from modules///////////////////////// + ArrayList modulqnames = (ArrayList) ((AxisConfigurationImpl) axisConfig).getEngadgedModules(); + for (int i = 0; i < modulqnames.size(); i++) { + QName modulename = (QName) modulqnames.get(i); + module = axisConfig.getModule(modulename); + if (module != null) { + switch (type) { + case PhaseMetadata.IN_FLOW: + { + flow = module.getInFlow(); + break; + } + case PhaseMetadata.OUT_FLOW: + { + flow = module.getOutFlow(); + break; + } + case PhaseMetadata.FAULT_IN_FLOW: + { + flow = module.getFaultInFlow(); + break; + } + case PhaseMetadata.FAULT_OUT_FLOW: + { + flow = module.getFaultOutFlow(); + break; + } + } + axisService.addToEngagModuleList(module); + axisOperation.addToEngageModuleList(module); + } else { + throw new PhaseException(Messages.getMessage( + DeploymentErrorMsgs.INVALID_MODULE_REF, modulename.getLocalPart())); + } + + if (flow != null) { + for (int j = 0; j < flow.getHandlerCount(); j++) { + HandlerDescription metadata = flow.getHandler(j); + + if (!PhaseValidator.isSystemPhases(metadata.getRules().getPhaseName())) { + allHandlers.add(metadata); + } else { + /** + *This handler is trying to added to system pre defined phases , but those handlers + * are already added to global chain which run irrespective of the service + * + */ + } + } + } + + } + + /////////////////////////////////////////////////////////////////////////////////////////// + ////////////////////////// SERVICE HANDLERS /////////////////////////////////////////////// + switch (type) { + case PhaseMetadata.IN_FLOW: + { + flow = axisService.getInFlow(); + break; + } + case PhaseMetadata.OUT_FLOW: + { + flow = axisService.getOutFlow(); + break; + } + case PhaseMetadata.FAULT_IN_FLOW: + { + flow = axisService.getFaultInFlow(); + break; + } + case PhaseMetadata.FAULT_OUT_FLOW: + { + flow = axisService.getFaultOutFlow(); + break; + } + } + if (flow != null) { + for (int j = 0; j < flow.getHandlerCount(); j++) { + HandlerDescription metadata = flow.getHandler(j); + + // todo change this in properway + if (metadata.getRules().getPhaseName().equals("")) { + throw new PhaseException( + Messages.getMessage(DeploymentErrorMsgs.PHASE_DOES_NOT_SPECIFED, + metadata.getName().getLocalPart())); + } else if(PhaseValidator.isSystemPhases(metadata.getRules().getPhaseName())){ + throw new PhaseException(Messages.getMessage( + DeploymentErrorMsgs.SERVICE_MODULE_CAN_NOT_REFER_GLOBAL_PHASE, + metadata.getRules().getPhaseName())); + } else { + allHandlers.add(metadata); + } + } + } + switch (type) { + case PhaseMetadata.IN_FLOW: + { + phaseHolder = + new PhaseHolder(axisOperation.getRemainingPhasesInFlow()); + break; + } + case PhaseMetadata.OUT_FLOW: + { + phaseHolder = + new PhaseHolder(axisOperation.getPhasesOutFlow()); + break; + } + case PhaseMetadata.FAULT_IN_FLOW: + { + phaseHolder = + new PhaseHolder(axisOperation.getPhasesInFaultFlow()); + break; + } + case PhaseMetadata.FAULT_OUT_FLOW: + { + phaseHolder = + new PhaseHolder(axisOperation.getPhasesOutFaultFlow()); + break; + } + } + for (int i = 0; i < allHandlers.size(); i++) { + HandlerDescription handlerMetaData = + (HandlerDescription) allHandlers.get(i); + phaseHolder.addHandler(handlerMetaData); + } + } + + /** + * Method buildTranspotsChains + * + * @throws PhaseException + */ + public void buildTranspotsChains() throws PhaseException { + HashMap axisTransportIn = axisConfig.getTransportsIn(); + HashMap axisTransportOut = axisConfig.getTransportsOut(); + + Collection colintrnsport = axisTransportIn.values(); + for (Iterator iterator = colintrnsport.iterator(); + iterator.hasNext();) { + TransportInDescription transport = (TransportInDescription) iterator.next(); + buildINTransportChains(transport); + } + + Collection colouttrnsport = axisTransportOut.values(); + for (Iterator iterator = colouttrnsport.iterator(); + iterator.hasNext();) { + TransportOutDescription transport = (TransportOutDescription) iterator.next(); + buildOutTransportChains(transport); + } + } + + + private void buildINTransportChains(TransportInDescription transport) + throws PhaseException { + Flow flow = null; + Phase phase = null; + for (int type = 1; type < 4; type++) { + switch (type) { + case PhaseMetadata.IN_FLOW: + { + flow = transport.getInFlow(); + phase = transport.getInPhase(); + break; + } + case PhaseMetadata.FAULT_IN_FLOW: + { + flow = transport.getFaultFlow(); + phase = transport.getFaultPhase(); + break; + } + } + if (flow != null) { + ArrayList handlers = new ArrayList(); + for (int j = 0; j < flow.getHandlerCount(); j++) { + HandlerDescription metadata = flow.getHandler(j); + metadata.getRules().setPhaseName(PhaseMetadata.TRANSPORT_PHASE); + handlers.add(metadata); + } + new PhaseHolder().buildTransportHandlerChain(phase, handlers); + } else { + } + } + } + + + /** + * Method buildTransportChains + * + * @param transport + * @throws PhaseException + */ + private void buildOutTransportChains(TransportOutDescription transport) + throws PhaseException { + Flow flow = null; + Phase phase = null; + for (int type = 1; type < 5; type++) { + switch (type) { + case PhaseMetadata.OUT_FLOW: + { + flow = transport.getOutFlow(); + phase = transport.getOutPhase(); + break; + } + case PhaseMetadata.FAULT_OUT_FLOW: + { + flow = transport.getFaultFlow(); + phase = transport.getFaultPhase(); + break; + } + } + if (flow != null) { + ArrayList handlers = new ArrayList(); + for (int j = 0; j < flow.getHandlerCount(); j++) { + HandlerDescription metadata = flow.getHandler(j); + metadata.getRules().setPhaseName(PhaseMetadata.TRANSPORT_PHASE); + handlers.add(metadata); + } + new PhaseHolder().buildTransportHandlerChain(phase, handlers); + } else { + } + } + } + + + public void engageModuleGlobally(ModuleDescription module) throws AxisFault { + enageToGlobalChain(module); + Iterator servicegroups = axisConfig.getServiceGroups(); + while (servicegroups.hasNext()) { + AxisServiceGroup sericeGroup = (AxisServiceGroup) servicegroups.next(); + Iterator services = sericeGroup.getServices(); + while (services.hasNext()) { + AxisService axisService = (AxisService) services.next(); + axisService.addModuleOperations(module, axisConfig); + engageModuleToServiceFromGlobal(axisService, module); + axisService.addToEngagModuleList(module); + } + sericeGroup.addModule(module.getName()); + } + } + + /** + * To engage modules come form global + * + * @param service + * @param module + * @throws PhaseException + */ + public void engageModuleToServiceFromGlobal(AxisService service, + ModuleDescription module) throws PhaseException { + HashMap opeartions = service.getOperations(); + Collection opCol = opeartions.values(); + boolean engaged = false; + for (Iterator iterator = opCol.iterator(); iterator.hasNext();) { + AxisOperation opDesc = (AxisOperation) iterator.next(); + Collection modules = opDesc.getModules(); + for (Iterator iterator1 = modules.iterator(); + iterator1.hasNext();) { + ModuleDescription description = (ModuleDescription) iterator1.next(); + if (description.getName().equals(module.getName())) { + engaged = true; + break; + } + } + if (engaged) { + continue; + } + Flow flow = null; + for (int type = 1; type < 5; type++) { + switch (type) { + case PhaseMetadata.IN_FLOW: + { + phaseHolder = + new PhaseHolder(opDesc.getRemainingPhasesInFlow()); + break; + } + case PhaseMetadata.OUT_FLOW: + { + phaseHolder = + new PhaseHolder(opDesc.getPhasesOutFlow()); + break; + } + case PhaseMetadata.FAULT_IN_FLOW: + { + phaseHolder = + new PhaseHolder(opDesc.getPhasesInFaultFlow()); + break; + } + case PhaseMetadata.FAULT_OUT_FLOW: + { + phaseHolder = + new PhaseHolder(opDesc.getPhasesOutFaultFlow()); + break; + } + } + //////////////////////////////////////////////////////////////////////////////////// + /////////////////// Modules refered by axis2.xml ////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////////// + switch (type) { + case PhaseMetadata.IN_FLOW: + { + flow = module.getInFlow(); + break; + } + case PhaseMetadata.OUT_FLOW: + { + flow = module.getOutFlow(); + break; + } + case PhaseMetadata.FAULT_IN_FLOW: + { + flow = module.getFaultInFlow(); + break; + } + case PhaseMetadata.FAULT_OUT_FLOW: + { + flow = module.getFaultOutFlow(); + break; + } + } + if (flow != null) { + for (int j = 0; j < flow.getHandlerCount(); j++) { + HandlerDescription metadata = flow.getHandler(j); + if (!PhaseValidator.isSystemPhases(metadata.getRules().getPhaseName())) { + phaseHolder.addHandler(metadata); + } + } + } + } + opDesc.addToEngageModuleList(module); + } + } + + + private void enageToGlobalChain(ModuleDescription module) throws PhaseException { + Flow flow = null; + for (int type = 1; type < 5; type++) { + switch (type) { + case PhaseMetadata.IN_FLOW: + { + phaseHolder = + new PhaseHolder(axisConfig. + getInPhasesUptoAndIncludingPostDispatch()); + break; + } + case PhaseMetadata.OUT_FLOW: + { + phaseHolder = + new PhaseHolder(((AxisConfigurationImpl) axisConfig).getOutFlow()); + break; + } + case PhaseMetadata.FAULT_IN_FLOW: + { + phaseHolder = + new PhaseHolder(axisConfig.getInFaultFlow()); + break; + } + case PhaseMetadata.FAULT_OUT_FLOW: + { + phaseHolder = + new PhaseHolder(((AxisConfigurationImpl) axisConfig).getOutFaultFlow()); + break; + } + } + //////////////////////////////////////////////////////////////////////////////////// + /////////////////// Modules refered by axis2.xml ////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////////// + switch (type) { + case PhaseMetadata.IN_FLOW: + { + flow = module.getInFlow(); + break; + } + case PhaseMetadata.OUT_FLOW: + { + flow = module.getOutFlow(); + break; + } + case PhaseMetadata.FAULT_IN_FLOW: + { + flow = module.getFaultInFlow(); + break; + } + case PhaseMetadata.FAULT_OUT_FLOW: + { + flow = module.getFaultOutFlow(); + break; + } + } + if (flow != null) { + for (int j = 0; j < flow.getHandlerCount(); j++) { + HandlerDescription metadata = flow.getHandler(j); + if (PhaseValidator.isSystemPhases(metadata.getRules().getPhaseName())) { + phaseHolder.addHandler(metadata); + } else { + /** + * These handlers will go to operation's handler chains , since the module + * try to add handlres to both sytem predefined phases and user defined phase + * so global module can do that. here the global module are the module which are + * reffred by axis2.xml + */ + } + } + } + } + } + + + public void engageModuleToService(AxisService service, + ModuleDescription module) throws AxisFault { + HashMap opeartions = service.getOperations(); + Collection opCol = opeartions.values(); + boolean engaged = false; + service.addModuleOperations(module, axisConfig); + for (Iterator iterator = opCol.iterator(); iterator.hasNext();) { + AxisOperation opDesc = (AxisOperation) iterator.next(); + Collection modules = opDesc.getModules(); + for (Iterator iterator1 = modules.iterator(); + iterator1.hasNext();) { + ModuleDescription description = (ModuleDescription) iterator1.next(); + if (description.getName().equals(module.getName())) { + engaged = true; + break; + } + } + if (!engaged) { + engageModuleToOperation(opDesc, module); + opDesc.addToEngageModuleList(module); + } + } + } + + + public void engageModuleToOperation(AxisOperation axisOperation, + ModuleDescription module) throws PhaseException { + Flow flow = null; + for (int type = 1; type < 5; type++) { + switch (type) { + case PhaseMetadata.IN_FLOW: + { + phaseHolder = + new PhaseHolder(axisOperation.getRemainingPhasesInFlow()); + break; + } + case PhaseMetadata.OUT_FLOW: + { + phaseHolder = + new PhaseHolder(axisOperation.getPhasesOutFlow()); + break; + } + case PhaseMetadata.FAULT_IN_FLOW: + { + phaseHolder = + new PhaseHolder(axisOperation.getPhasesInFaultFlow()); + break; + } + case PhaseMetadata.FAULT_OUT_FLOW: + { + phaseHolder = + new PhaseHolder(axisOperation.getPhasesOutFaultFlow()); + break; + } + } + + switch (type) { + case PhaseMetadata.IN_FLOW: + { + flow = module.getInFlow(); + break; + } + case PhaseMetadata.OUT_FLOW: + { + flow = module.getOutFlow(); + break; + } + case PhaseMetadata.FAULT_IN_FLOW: + { + flow = module.getFaultInFlow(); + break; + } + case PhaseMetadata.FAULT_OUT_FLOW: + { + flow = module.getFaultOutFlow(); + break; + } + } + if (flow != null) { + for (int j = 0; j < flow.getHandlerCount(); j++) { + HandlerDescription metadata = flow.getHandler(j); + if (!PhaseValidator.isSystemPhases(metadata.getRules().getPhaseName())) { + phaseHolder.addHandler(metadata); + } else { + throw new PhaseException(Messages.getMessage(DeploymentErrorMsgs.SERVICE_MODULE_CAN_NOT_REFER_GLOBAL_PHASE, + metadata.getRules().getPhaseName())); + } + } + } + } + } +} Modified: webservices/axis2/trunk/c/modules/xml/parser/guththila/src/Makefile URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/guththila/src/Makefile?rev=348632&r1=348631&r2=348632&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/parser/guththila/src/Makefile (original) +++ webservices/axis2/trunk/c/modules/xml/parser/guththila/src/Makefile Wed Nov 23 19:46:50 2005 @@ -81,14 +81,14 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/nandika/axis2/c/conftools/missing --run aclocal-1.9 +ACLOCAL = ${SHELL} /home/damitha/projects/c/conftools/missing --run aclocal-1.9 AMDEP_FALSE = # AMDEP_TRUE = -AMTAR = ${SHELL} /home/nandika/axis2/c/conftools/missing --run tar +AMTAR = ${SHELL} /home/damitha/projects/c/conftools/missing --run tar AR = ar -AUTOCONF = ${SHELL} /home/nandika/axis2/c/conftools/missing --run autoconf -AUTOHEADER = ${SHELL} /home/nandika/axis2/c/conftools/missing --run autoheader -AUTOMAKE = ${SHELL} /home/nandika/axis2/c/conftools/missing --run automake-1.9 +AUTOCONF = ${SHELL} /home/damitha/projects/c/conftools/missing --run autoconf +AUTOHEADER = ${SHELL} /home/damitha/projects/c/conftools/missing --run autoheader +AUTOMAKE = ${SHELL} /home/damitha/projects/c/conftools/missing --run automake-1.9 AWK = gawk CC = gcc CCDEPMODE = depmode=gcc3 @@ -114,19 +114,19 @@ ECHO_T = EGREP = grep -E EXEEXT = -F77 = f95 +F77 = g77 FFLAGS = -g -O2 INSTALL_DATA = ${INSTALL} -m 644 INSTALL_PROGRAM = ${INSTALL} INSTALL_SCRIPT = ${INSTALL} INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LDFLAGS = -L/home/nandika/software/cutest/lib/ +LDFLAGS = -L/home/damitha/programs/cutest/lib/ LIBOBJS = LIBS = -lcutest -ldl LIBTOOL = $(SHELL) $(top_builddir)/libtool LN_S = ln -s LTLIBOBJS = -MAKEINFO = ${SHELL} /home/nandika/axis2/c/conftools/missing --run makeinfo +MAKEINFO = ${SHELL} /home/damitha/projects/c/conftools/missing --run makeinfo OBJEXT = o PACKAGE = axis2 PACKAGE_BUGREPORT = @@ -144,7 +144,7 @@ ac_ct_AR = ar ac_ct_CC = gcc ac_ct_CXX = g++ -ac_ct_F77 = f95 +ac_ct_F77 = g77 ac_ct_RANLIB = ranlib ac_ct_STRIP = strip am__fastdepCC_FALSE = # @@ -171,7 +171,7 @@ host_vendor = redhat includedir = ${prefix}/include infodir = ${prefix}/info -install_sh = /home/nandika/axis2/c/conftools/install-sh +install_sh = /home/damitha/projects/c/conftools/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localstatedir = ${prefix}/var Modified: webservices/axis2/trunk/c/modules/xml/parser/guththila/test/Makefile URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/guththila/test/Makefile?rev=348632&r1=348631&r2=348632&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/parser/guththila/test/Makefile (original) +++ webservices/axis2/trunk/c/modules/xml/parser/guththila/test/Makefile Wed Nov 23 19:46:50 2005 @@ -82,14 +82,14 @@ CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/nandika/axis2/c/conftools/missing --run aclocal-1.9 +ACLOCAL = ${SHELL} /home/damitha/projects/c/conftools/missing --run aclocal-1.9 AMDEP_FALSE = # AMDEP_TRUE = -AMTAR = ${SHELL} /home/nandika/axis2/c/conftools/missing --run tar +AMTAR = ${SHELL} /home/damitha/projects/c/conftools/missing --run tar AR = ar -AUTOCONF = ${SHELL} /home/nandika/axis2/c/conftools/missing --run autoconf -AUTOHEADER = ${SHELL} /home/nandika/axis2/c/conftools/missing --run autoheader -AUTOMAKE = ${SHELL} /home/nandika/axis2/c/conftools/missing --run automake-1.9 +AUTOCONF = ${SHELL} /home/damitha/projects/c/conftools/missing --run autoconf +AUTOHEADER = ${SHELL} /home/damitha/projects/c/conftools/missing --run autoheader +AUTOMAKE = ${SHELL} /home/damitha/projects/c/conftools/missing --run automake-1.9 AWK = gawk CC = gcc CCDEPMODE = depmode=gcc3 @@ -115,19 +115,19 @@ ECHO_T = EGREP = grep -E EXEEXT = -F77 = f95 +F77 = g77 FFLAGS = -g -O2 INSTALL_DATA = ${INSTALL} -m 644 INSTALL_PROGRAM = ${INSTALL} INSTALL_SCRIPT = ${INSTALL} INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LDFLAGS = -L/home/nandika/software/cutest/lib/ +LDFLAGS = -L/home/damitha/programs/cutest/lib/ LIBOBJS = LIBS = -lcutest -ldl LIBTOOL = $(SHELL) $(top_builddir)/libtool LN_S = ln -s LTLIBOBJS = -MAKEINFO = ${SHELL} /home/nandika/axis2/c/conftools/missing --run makeinfo +MAKEINFO = ${SHELL} /home/damitha/projects/c/conftools/missing --run makeinfo OBJEXT = o PACKAGE = axis2 PACKAGE_BUGREPORT = @@ -145,7 +145,7 @@ ac_ct_AR = ar ac_ct_CC = gcc ac_ct_CXX = g++ -ac_ct_F77 = f95 +ac_ct_F77 = g77 ac_ct_RANLIB = ranlib ac_ct_STRIP = strip am__fastdepCC_FALSE = # @@ -172,7 +172,7 @@ host_vendor = redhat includedir = ${prefix}/include infodir = ${prefix}/info -install_sh = /home/nandika/axis2/c/conftools/install-sh +install_sh = /home/damitha/projects/c/conftools/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localstatedir = ${prefix}/var Modified: webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/Makefile URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/Makefile?rev=348632&r1=348631&r2=348632&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/Makefile (original) +++ webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/Makefile Wed Nov 23 19:46:50 2005 @@ -81,14 +81,14 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/nandika/axis2/c/conftools/missing --run aclocal-1.9 +ACLOCAL = ${SHELL} /home/damitha/projects/c/conftools/missing --run aclocal-1.9 AMDEP_FALSE = # AMDEP_TRUE = -AMTAR = ${SHELL} /home/nandika/axis2/c/conftools/missing --run tar +AMTAR = ${SHELL} /home/damitha/projects/c/conftools/missing --run tar AR = ar -AUTOCONF = ${SHELL} /home/nandika/axis2/c/conftools/missing --run autoconf -AUTOHEADER = ${SHELL} /home/nandika/axis2/c/conftools/missing --run autoheader -AUTOMAKE = ${SHELL} /home/nandika/axis2/c/conftools/missing --run automake-1.9 +AUTOCONF = ${SHELL} /home/damitha/projects/c/conftools/missing --run autoconf +AUTOHEADER = ${SHELL} /home/damitha/projects/c/conftools/missing --run autoheader +AUTOMAKE = ${SHELL} /home/damitha/projects/c/conftools/missing --run automake-1.9 AWK = gawk CC = gcc CCDEPMODE = depmode=gcc3 @@ -114,19 +114,19 @@ ECHO_T = EGREP = grep -E EXEEXT = -F77 = f95 +F77 = g77 FFLAGS = -g -O2 INSTALL_DATA = ${INSTALL} -m 644 INSTALL_PROGRAM = ${INSTALL} INSTALL_SCRIPT = ${INSTALL} INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LDFLAGS = -L/home/nandika/software/cutest/lib/ +LDFLAGS = -L/home/damitha/programs/cutest/lib/ LIBOBJS = LIBS = -lcutest -ldl LIBTOOL = $(SHELL) $(top_builddir)/libtool LN_S = ln -s LTLIBOBJS = -MAKEINFO = ${SHELL} /home/nandika/axis2/c/conftools/missing --run makeinfo +MAKEINFO = ${SHELL} /home/damitha/projects/c/conftools/missing --run makeinfo OBJEXT = o PACKAGE = axis2 PACKAGE_BUGREPORT = @@ -144,7 +144,7 @@ ac_ct_AR = ar ac_ct_CC = gcc ac_ct_CXX = g++ -ac_ct_F77 = f95 +ac_ct_F77 = g77 ac_ct_RANLIB = ranlib ac_ct_STRIP = strip am__fastdepCC_FALSE = # @@ -171,7 +171,7 @@ host_vendor = redhat includedir = ${prefix}/include infodir = ${prefix}/info -install_sh = /home/nandika/axis2/c/conftools/install-sh +install_sh = /home/damitha/projects/c/conftools/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localstatedir = ${prefix}/var Modified: webservices/axis2/trunk/c/modules/xml/parser/libxml2/test/Makefile URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/libxml2/test/Makefile?rev=348632&r1=348631&r2=348632&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/parser/libxml2/test/Makefile (original) +++ webservices/axis2/trunk/c/modules/xml/parser/libxml2/test/Makefile Wed Nov 23 19:46:50 2005 @@ -82,14 +82,14 @@ CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/nandika/axis2/c/conftools/missing --run aclocal-1.9 +ACLOCAL = ${SHELL} /home/damitha/projects/c/conftools/missing --run aclocal-1.9 AMDEP_FALSE = # AMDEP_TRUE = -AMTAR = ${SHELL} /home/nandika/axis2/c/conftools/missing --run tar +AMTAR = ${SHELL} /home/damitha/projects/c/conftools/missing --run tar AR = ar -AUTOCONF = ${SHELL} /home/nandika/axis2/c/conftools/missing --run autoconf -AUTOHEADER = ${SHELL} /home/nandika/axis2/c/conftools/missing --run autoheader -AUTOMAKE = ${SHELL} /home/nandika/axis2/c/conftools/missing --run automake-1.9 +AUTOCONF = ${SHELL} /home/damitha/projects/c/conftools/missing --run autoconf +AUTOHEADER = ${SHELL} /home/damitha/projects/c/conftools/missing --run autoheader +AUTOMAKE = ${SHELL} /home/damitha/projects/c/conftools/missing --run automake-1.9 AWK = gawk CC = gcc CCDEPMODE = depmode=gcc3 @@ -115,19 +115,19 @@ ECHO_T = EGREP = grep -E EXEEXT = -F77 = f95 +F77 = g77 FFLAGS = -g -O2 INSTALL_DATA = ${INSTALL} -m 644 INSTALL_PROGRAM = ${INSTALL} INSTALL_SCRIPT = ${INSTALL} INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LDFLAGS = -L/home/nandika/software/cutest/lib/ +LDFLAGS = -L/home/damitha/programs/cutest/lib/ LIBOBJS = LIBS = -lcutest -ldl LIBTOOL = $(SHELL) $(top_builddir)/libtool LN_S = ln -s LTLIBOBJS = -MAKEINFO = ${SHELL} /home/nandika/axis2/c/conftools/missing --run makeinfo +MAKEINFO = ${SHELL} /home/damitha/projects/c/conftools/missing --run makeinfo OBJEXT = o PACKAGE = axis2 PACKAGE_BUGREPORT = @@ -145,7 +145,7 @@ ac_ct_AR = ar ac_ct_CC = gcc ac_ct_CXX = g++ -ac_ct_F77 = f95 +ac_ct_F77 = g77 ac_ct_RANLIB = ranlib ac_ct_STRIP = strip am__fastdepCC_FALSE = # @@ -172,7 +172,7 @@ host_vendor = redhat includedir = ${prefix}/include infodir = ${prefix}/info -install_sh = /home/nandika/axis2/c/conftools/install-sh +install_sh = /home/damitha/projects/c/conftools/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localstatedir = ${prefix}/var