From nrice@example.net Tue May 01 10:54:05 2007 Return-Path: <nrice@example.net> Delivered-To: nrice@example.net Received: (qmail 75895 invoked from network); 1 May 2007 10:53:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 May 2007 10:53:52 -0000 Received: (qmail 32513 invoked by uid 500); 1 May 2007 10:53:51 -0000 Delivered-To: nrice@example.net Received: (qmail 32467 invoked by uid 500); 1 May 2007 10:53:51 -0000 Mailing-List: contact nrice@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:nrice@example.net> List-Unsubscribe: <mailto:nrice@example.net> List-Post: <mailto:nrice@example.net> List-Id: <addressing-dev.ws.apache.org> Delivered-To: mailing list nrice@example.net Received: (qmail 31960 invoked by uid 99); 1 May 2007 10:53:50 -0000 Received: from herse.apache.org (HELO herse.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 May 2007 03:53:50 -0700 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (herse.apache.org: domain of nrice@example.net designates 83.161.120.155 as permitted sender) Received: from [83.161.120.155] (HELO nz-out-0506.google.com) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 May 2007 03:53:40 -0700 Received: by nz-out-0506.google.com with SMTP id m7so2334352nzf for <nrice@example.net>; Tue, 01 May 2007 03:53:19 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:reply-to:to:subject:mime-version:content-type:content-transfer-encoding:content-disposition; b=ZUUnCHWcXuhPcG7BaDHU9AexMfdFSeAuNJhaZxfiONG+YKpvkn5Tjs/E0/iI9cja82gM2Kq+iSOn5DVEHU06bNzyKmBBAONDpoyfzf0gpAYqRG/HmSSskEemg50WqirhPhrnOIFFvG/Vc+1H/o40wB+KOjIC3+6SrU2P6ERxcLU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:reply-to:to:subject:mime-version:content-type:content-transfer-encoding:content-disposition; b=tHurZ/O82H0WuceUId9lIOJUFIA0D3GiQQtVRGpjtb3usKg/3voNEtVtMpU9g/hxnLX+UUy6J6pESFjVFqNV918bv5qmV4oyRsSPQIm1ik1t5/+xySXj24MbQLpuYuC5+RWfMTc3P8S0gz7ok+1zE+phe/vLnp82u8B+gAArHbE= Received: by 83.161.120.155 with SMTP id b1mr2341062waa.1178016799456; Tue, 01 May 2007 03:53:19 -0700 (PDT) Received: by 83.161.120.155 with HTTP; Tue, 1 May 2007 03:53:19 -0700 (PDT) Message-ID: <nrice@example.net> Date: Tue, 1 May 2007 06:53:19 -0400 From: "Davanum Srinivas" <nrice@example.net> Reply-To: nrice@example.net To: "nrice@example.net" <nrice@example.net> Subject: [POLICY] Release Policy MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline X-Virus-Checked: Checked by ClamAV on apache.org Folks, How about we follow incubator project guidelines in addition to what we do now...Please reply back to general@ws (am BCC'ing all dev lists). - All Release binaries must be be explicitly VOTE'd on - All Release binaries should pass the RAT test [1] (exception: not sure if RAT support C/C++ code) - There must be at least 3 Binding PMC VOTE's on each release (which we do already) Thanks, dims [1] http://code.google.com/p/arat/ -- Davanum Srinivas 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4 http://davanum.wordpress.com --------------------------------------------------------------------- To unsubscribe, e-mail: nrice@example.net For additional commands, e-mail: nrice@example.net From nrice@example.net Tue May 01 11:15:47 2007 Return-Path: <nrice@example.net> Delivered-To: nrice@example.net Received: (qmail 81995 invoked from network); 1 May 2007 11:15:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 May 2007 11:15:28 -0000 Received: (qmail 57711 invoked by uid 500); 1 May 2007 11:15:33 -0000 Delivered-To: nrice@example.net Received: (qmail 57656 invoked by uid 500); 1 May 2007 11:15:32 -0000 Mailing-List: contact nrice@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:nrice@example.net> List-Unsubscribe: <mailto:nrice@example.net> List-Post: <mailto:nrice@example.net> List-Id: <wss4j-dev.ws.apache.org> Delivered-To: mailing list nrice@example.net Received: (qmail 57641 invoked by uid 99); 1 May 2007 11:15:32 -0000 Received: from herse.apache.org (HELO herse.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 May 2007 04:15:32 -0700 X-ASF-Spam-Status: No, hits=2.9 required=10.0 tests=HTML_10_20,HTML_MESSAGE,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (herse.apache.org: domain of nrice@example.net designates 83.161.120.155 as permitted sender) Received: from [83.161.120.155] (HELO ug-out-1314.google.com) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 May 2007 04:15:25 -0700 Received: by ug-out-1314.google.com with SMTP id j40so28084ugd for <nrice@example.net>; Tue, 01 May 2007 04:15:04 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=googlemail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:to:subject:mime-version:content-type; b=jRzi8q9ozcuR96bSyDE7z6Kj2BY1VeRbktfh3uusqtUqwsAhEfFOG6Zov13VXvVuwMBUkB5H22Vkw35XRcXQcROxQfIL49GqkqtatooFPLYtb6UnzZSmuCRyebKI+f8fKI1P2d9vdExevwhn6r9KpwWBGLI6zlRROx2C5KvE/k4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=beta; h=received:message-id:date:from:to:subject:mime-version:content-type; b=Z4zvKolMmOjtIgqiLaQyxy3t9EnG/6+LsRAjceKZpNK784C8fpJJbJzUVexuBtLjOGrGAjkQ6LNfPNgTWPZGQlDXfm7sfWLAlWGn7HVdMNZo7WfOHXSt+Oh4oIZUNXYOg+mt6uwq510Vu8P2SDeFGBvfX4zv/r/K9xS0z3MMKJ4= Received: by 83.161.120.155 with SMTP id v5mr254486ugh.1178018104011; Tue, 01 May 2007 04:15:04 -0700 (PDT) Received: by 83.161.120.155 with HTTP; Tue, 1 May 2007 04:15:03 -0700 (PDT) Message-ID: <nrice@example.net> Date: Tue, 1 May 2007 13:15:03 +0200 From: "=?ISO-8859-2?Q?Wac=B3aw_Borowiec?=" <nrice@example.net> To: nrice@example.net Subject: client public key MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----=_Part_10798_23525731.1178018103940" X-Virus-Checked: Checked by ClamAV on apache.org ------=_Part_10798_23525731.1178018103940 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline Hello I want to provide a service with two-way encryption. I don't want client's public key to be permanently stored on server's side. Is it possible to fetch client's certificate when he sends the request and use it for encryption of the answer? I'll be grateful for any help Waclaw Borowiec ------=_Part_10798_23525731.1178018103940 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline Hello<br><br>I want to provide a service with two-way encryption. I don&#39;t want client&#39;s public key to be permanently stored on server&#39;s side. Is it possible to fetch client&#39;s certificate when he sends the request and use it for encryption of the answer? <br><br>I&#39;ll be grateful for any help<br>Waclaw Borowiec<br> ------=_Part_10798_23525731.1178018103940-- From nrice@example.net Wed May 02 06:38:38 2007 Return-Path: <nrice@example.net> Delivered-To: nrice@example.net Received: (qmail 15849 invoked from network); 2 May 2007 06:38:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 May 2007 06:38:35 -0000 Received: (qmail 18469 invoked by uid 500); 2 May 2007 06:38:41 -0000 Delivered-To: nrice@example.net Received: (qmail 18257 invoked by uid 500); 2 May 2007 06:38:41 -0000 Mailing-List: contact nrice@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:nrice@example.net> List-Unsubscribe: <mailto:nrice@example.net> List-Post: <mailto:nrice@example.net> List-Id: <sandesha-dev.ws.apache.org> Delivered-To: mailing list nrice@example.net Received: (qmail 18246 invoked by uid 500); 2 May 2007 06:38:40 -0000 Delivered-To: nrice@example.net Received: (qmail 18243 invoked by uid 99); 2 May 2007 06:38:40 -0000 Received: from herse.apache.org (HELO herse.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 May 2007 23:38:40 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 May 2007 23:38:33 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 572911A9838; Tue, 1 May 2007 23:38:13 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r534332 - in /webservices/sandesha/trunk/c: include/ src/msgprocessors/ src/util/ Date: Wed, 02 May 2007 06:38:13 -0000 To: nrice@example.net From: nrice@example.net X-Mailer: svnmailer-1.1.0 Message-Id: <nrice@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: damitha Date: Tue May 1 23:38:12 2007 New Revision: 534332 URL: http://svn.apache.org/viewvc?view=rev&rev=534332 Log: Now sandesha2c interop with the sandesha2 java single channel client. Modified: webservices/sandesha/trunk/c/include/sandesha2_constants.h webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c webservices/sandesha/trunk/c/src/util/ack_mgr.c webservices/sandesha/trunk/c/src/util/fault_mgr.c webservices/sandesha/trunk/c/src/util/sandesha2_utils.c webservices/sandesha/trunk/c/src/util/seq_mgr.c webservices/sandesha/trunk/c/src/util/terminate_mgr.c Modified: webservices/sandesha/trunk/c/include/sandesha2_constants.h URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_constants.h?view=diff&rev=534332&r1=534331&r2=534332 ============================================================================== --- webservices/sandesha/trunk/c/include/sandesha2_constants.h (original) +++ webservices/sandesha/trunk/c/include/sandesha2_constants.h Tue May 1 23:38:12 2007 @@ -489,6 +489,8 @@ #define SANDESHA2_MODULE_CLASS_LOADER "Sandesha2ModuleClassLoader" #define SANDESHA2_WSRM_ANON_URI_PREFIX "http://docs.oasis-open.org/ws-rx/wsrm/200608/anonymous" + + #define AXIS2_WS_RM_ANONYMOUS_URL "http://docs.oasis-open.org/ws-rx/wsmc/200702/anonymous?id=" /** * Message context values Modified: webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c?view=diff&rev=534332&r1=534331&r2=534332 ============================================================================== --- webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c (original) +++ webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c Tue May 1 23:38:12 2007 @@ -158,7 +158,6 @@ axiom_soap_envelope_t *envelope = NULL; axis2_char_t *wsa_version = NULL; axis2_char_t *addr_ns_val = NULL; - axis2_char_t *anon_uri = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE); @@ -245,8 +244,7 @@ addr_ns_val = sandesha2_utils_get_seq_property(env, seq_id, SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE, storage_mgr); - anon_uri = sandesha2_spec_specific_consts_get_anon_uri(env, addr_ns_val); - if(0 == axutil_strcmp(anon_uri, acks_to_str)) + if(sandesha2_utils_is_anon_uri(env, acks_to_str)) { axis2_engine_t *engine = NULL; axis2_op_ctx_t *op_ctx = NULL; Modified: webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c?view=diff&rev=534332&r1=534331&r2=534332 ============================================================================== --- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original) +++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Tue May 1 23:38:12 2007 @@ -231,6 +231,8 @@ msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env); if(!msg_ctx) { + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "[sandesha2]Message context is not set"); AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_MSG_CTX, AXIS2_FAILURE); return AXIS2_FAILURE; @@ -244,6 +246,8 @@ } if(processed && 0 == axutil_strcmp(processed, "true")) { + AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, + "[sandesha2]Message already processed. So returning here"); return AXIS2_SUCCESS; } @@ -259,11 +263,14 @@ { axis2_engine_t *engine = axis2_engine_create(env, conf_ctx); - AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "sandesha2_app_msg_processor_process_in_msg send Fault"); + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "[sandesha2]sandesha2_app_msg_processor_process_in_msg send Fault"); if(!axis2_engine_send_fault(engine, env, sandesha2_msg_ctx_get_msg_ctx(fault_ctx, env))) { + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "[sandesha2]An error occured while sending the fault"); AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SENDING_FAULT, AXIS2_FAILURE); return AXIS2_FAILURE; @@ -283,9 +290,13 @@ if(fault_ctx) { axis2_engine_t *engine = axis2_engine_create(env, conf_ctx); + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "[sandesha2]sandesha2_app_msg_processor_process_in_msg send Fault"); if(!axis2_engine_send_fault(engine, env, sandesha2_msg_ctx_get_msg_ctx(fault_ctx, env))) { + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "[sandesha2]An error occured while sending the fault"); AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SENDING_FAULT, AXIS2_FAILURE); return AXIS2_FAILURE; @@ -300,9 +311,13 @@ if(fault_ctx) { axis2_engine_t *engine = axis2_engine_create(env, conf_ctx); + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "[sandesha2]sandesha2_app_msg_processor_process_in_msg send Fault"); if(!axis2_engine_send_fault(engine, env, sandesha2_msg_ctx_get_msg_ctx(fault_ctx, env))) { + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "[sandesha2]An error occured while sending the fault"); AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SENDING_FAULT, AXIS2_FAILURE); return AXIS2_FAILURE; @@ -319,6 +334,8 @@ seq, env), env); if(0 == msg_no) { + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "[sandesha2]Invalid message number"); AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_MSG_NUM, AXIS2_FAILURE); return AXIS2_FAILURE; @@ -437,6 +454,8 @@ str_seq_id); if(!next_msg_bean) { + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "[sandesha2]Sequence does not exist"); AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SEQ_NOT_EXIST, AXIS2_FAILURE); return AXIS2_FAILURE; @@ -511,7 +530,11 @@ { axis2_status_t status = AXIS2_ERROR_GET_STATUS_CODE(env->error); if(AXIS2_SUCCESS != status) + { + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "[sandesha2]Incoming sequence list empty"); return status; + } } /* Adding current seq to the incoming seq List */ if(!sandesha2_utils_array_list_contains(env, @@ -546,7 +569,8 @@ rm_version = sandesha2_utils_get_rm_version(env, str_seq_id, storage_mgr); if(!rm_version) { - AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Unable to find RM spec version"); + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "[sandesha2]Unable to find RM spec version"); return AXIS2_FAILURE; } reply_to_epr = axis2_msg_ctx_get_reply_to(msg_ctx, env); @@ -579,8 +603,10 @@ reply_to_addr = sandesha2_seq_property_bean_get_value(to_bean, env); } if(back_channel_free) + { sandesha2_app_msg_processor_send_ack_if_reqd(env, rm_msg_ctx, msgs_str, storage_mgr); + } else if(sandesha2_utils_is_single_channel(env, rm_version, acks_to_str)) { /* Do nothing */ @@ -1075,7 +1101,7 @@ env), env); if(!conf_ctx) { - AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] cont_ctx is NULL"); AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CONF_CTX_NULL, AXIS2_FAILURE); return AXIS2_FAILURE; @@ -1095,7 +1121,7 @@ sent = axis2_engine_send(engine, env, msg_ctx); if(!sent) { - AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[Sandesha2]Engine Send failed"); AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SENDING_ACK, AXIS2_FAILURE); return AXIS2_FAILURE; Modified: webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c?view=diff&rev=534332&r1=534331&r2=534332 ============================================================================== --- webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c (original) +++ webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c Tue May 1 23:38:12 2007 @@ -333,11 +333,15 @@ anon_uri = sandesha2_spec_specific_consts_get_anon_uri(env, addr_ns_uri); op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env); - if(0 == axutil_strcmp(anon_uri, axis2_endpoint_ref_get_address(to_epr, - env))) + if(sandesha2_utils_is_anon_uri(env, axis2_endpoint_ref_get_address(to_epr, + env))) + { axis2_op_ctx_set_response_written(op_ctx, env, AXIS2_TRUE); + } else + { axis2_op_ctx_set_response_written(op_ctx, env, AXIS2_FALSE); + } sandesha2_msg_ctx_set_paused(rm_msg_ctx, env, AXIS2_TRUE); AXIS2_LOG_INFO(env->log, Modified: webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c?view=diff&rev=534332&r1=534331&r2=534332 ============================================================================== --- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c (original) +++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c Tue May 1 23:38:12 2007 @@ -354,7 +354,6 @@ axutil_property_t *property = NULL; axis2_engine_t *engine = NULL; axis2_char_t *addr_ns_uri = NULL; - axis2_char_t *anon_uri = NULL; axis2_endpoint_ref_t *to_epr = NULL; axis2_op_ctx_t *op_ctx = NULL; axis2_transport_out_desc_t *orig_trans_out = NULL; @@ -429,11 +428,11 @@ addr_ns_uri = sandesha2_utils_get_seq_property(env, seq_id, SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE, storage_mgr); - anon_uri = sandesha2_spec_specific_consts_get_anon_uri(env, addr_ns_uri); to_epr = axis2_msg_ctx_get_to(msg_ctx, env); op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env); - if(0 == axutil_strcmp(anon_uri, axis2_endpoint_ref_get_address(to_epr, env))) + if(sandesha2_utils_is_anon_uri(env, axis2_endpoint_ref_get_address(to_epr, + env))) { axis2_op_ctx_set_response_written(op_ctx, env, AXIS2_TRUE); } Modified: webservices/sandesha/trunk/c/src/util/ack_mgr.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/ack_mgr.c?view=diff&rev=534332&r1=534331&r2=534332 ============================================================================== --- webservices/sandesha/trunk/c/src/util/ack_mgr.c (original) +++ webservices/sandesha/trunk/c/src/util/ack_mgr.c Tue May 1 23:38:12 2007 @@ -52,7 +52,6 @@ axis2_op_t *ref_op = NULL; axis2_msg_ctx_t *ack_msg_ctx = NULL; axis2_char_t *addr_ns_uri = NULL; - axis2_char_t *anon_uri = NULL; axutil_property_t *property = NULL; sandesha2_msg_ctx_t *ack_rm_msg = NULL; axiom_soap_envelope_t *soap_env = NULL; @@ -75,6 +74,7 @@ acks_to_str = (axis2_char_t*)axis2_endpoint_ref_get_address(acks_to, env); if(!acks_to_str) { + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Invalid epr"); AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_EPR, AXIS2_FAILURE); return NULL; } @@ -136,8 +136,7 @@ axis2_msg_ctx_set_property(ack_msg_ctx, env, AXIS2_WSA_VERSION, property); } } - anon_uri = sandesha2_spec_specific_consts_get_anon_uri(env, addr_ns_uri); - if(0 == axutil_strcmp(acks_to_str, anon_uri)) + if(sandesha2_utils_is_anon_uri(env, acks_to_str)) { axis2_op_ctx_t *op_ctx = NULL; Modified: webservices/sandesha/trunk/c/src/util/fault_mgr.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/fault_mgr.c?view=diff&rev=534332&r1=534331&r2=534332 ============================================================================== --- webservices/sandesha/trunk/c/src/util/fault_mgr.c (original) +++ webservices/sandesha/trunk/c/src/util/fault_mgr.c Tue May 1 23:38:12 2007 @@ -401,7 +401,6 @@ axis2_op_t *op = NULL; axis2_op_ctx_t *op_ctx = NULL; axis2_char_t *acks_to_str = NULL; - axis2_char_t *anon_uri = NULL; axutil_string_t *grp_ctx_id = NULL; int soap_ver = -1; sandesha2_msg_ctx_t *fault_rm_msg = NULL; @@ -464,8 +463,7 @@ acks_to_str = sandesha2_seq_property_bean_get_value(acks_to_bean, env); } - anon_uri = sandesha2_spec_specific_consts_get_anon_uri(env, addr_ns_uri); - if(NULL!= acks_to_str && 0 != axutil_strcmp(acks_to_str, anon_uri)) + if(!sandesha2_utils_is_anon_uri(env, acks_to_str)) axis2_msg_ctx_set_to(fault_msg_ctx, env, axis2_endpoint_ref_create(env, acks_to_str)); soap_ver = sandesha2_utils_get_soap_version(env, Modified: webservices/sandesha/trunk/c/src/util/sandesha2_utils.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/sandesha2_utils.c?view=diff&rev=534332&r1=534331&r2=534332 ============================================================================== --- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original) +++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Tue May 1 23:38:12 2007 @@ -46,7 +46,6 @@ #include <stdlib.h> #include <sys/timeb.h> -#define AXIS2_WS_RM_ANONYMOUS_URL "http://docs.oasis-open.org/ws-rx/wsmc/200702/anonymous?id=" static axutil_array_list_t * get_sorted_msg_no_list( Modified: webservices/sandesha/trunk/c/src/util/seq_mgr.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/seq_mgr.c?view=diff&rev=534332&r1=534331&r2=534332 ============================================================================== --- webservices/sandesha/trunk/c/src/util/seq_mgr.c (original) +++ webservices/sandesha/trunk/c/src/util/seq_mgr.c Tue May 1 23:38:12 2007 @@ -447,8 +447,8 @@ acks_to_bean = sandesha2_seq_property_bean_create_with_data(env, int_seq_id, SANDESHA2_SEQ_PROP_ACKS_TO_EPR, acks_to_str); - if(!axis2_msg_ctx_get_server_side(first_app_msg, env) && - 0 != axutil_strcmp(acks_to_str, anon_uri)) + if(!axis2_msg_ctx_get_server_side(first_app_msg, env) && + !sandesha2_utils_is_anon_uri(env, acks_to_str)) { ctx = axis2_msg_ctx_get_base(first_app_msg, env); /* TODO currently axis2 doesn't expose the *options* at msg ctx level. Modified: webservices/sandesha/trunk/c/src/util/terminate_mgr.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/terminate_mgr.c?view=diff&rev=534332&r1=534331&r2=534332 ============================================================================== --- webservices/sandesha/trunk/c/src/util/terminate_mgr.c (original) +++ webservices/sandesha/trunk/c/src/util/terminate_mgr.c Tue May 1 23:38:12 2007 @@ -506,7 +506,6 @@ { sandesha2_seq_property_bean_t *acks_to_bean = NULL; axis2_char_t *addr_ns_uri = NULL; - axis2_char_t *anon_uri = NULL; axis2_bool_t stop_listner_for_async = AXIS2_FALSE; acks_to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, @@ -514,12 +513,11 @@ addr_ns_uri = sandesha2_utils_get_seq_property(env, seq_id, SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE, storage_mgr); - anon_uri = sandesha2_spec_specific_consts_get_anon_uri(env, addr_ns_uri); if(acks_to_bean) { axis2_char_t *acks_to = NULL; acks_to = sandesha2_seq_property_bean_get_value(acks_to_bean, env); - if(acks_to && 0 == axutil_strcmp(acks_to, anon_uri)) + if(sandesha2_utils_is_anon_uri(env, acks_to)) stop_listner_for_async = AXIS2_TRUE; } --------------------------------------------------------------------- To unsubscribe, e-mail: nrice@example.net For additional commands, e-mail: nrice@example.net From nrice@example.net Wed May 02 11:50:37 2007 Return-Path: <nrice@example.net> Delivered-To: nrice@example.net Received: (qmail 24167 invoked from network); 2 May 2007 11:50:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 May 2007 11:50:36 -0000 Received: (qmail 86046 invoked by uid 500); 2 May 2007 11:50:41 -0000 Delivered-To: nrice@example.net Received: (qmail 86002 invoked by uid 500); 2 May 2007 11:50:40 -0000 Mailing-List: contact nrice@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:nrice@example.net> List-Unsubscribe: <mailto:nrice@example.net> List-Post: <mailto:nrice@example.net> List-Id: <wss4j-dev.ws.apache.org> Delivered-To: mailing list nrice@example.net Received: (qmail 85991 invoked by uid 500); 2 May 2007 11:50:40 -0000 Delivered-To: nrice@example.net Received: (qmail 85984 invoked by uid 99); 2 May 2007 11:50:40 -0000 Received: from herse.apache.org (HELO herse.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 May 2007 04:50:40 -0700 X-ASF-Spam-Status: No, hits=-98.6 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 May 2007 04:50:33 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 79A211A9838; Wed, 2 May 2007 04:50:13 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r534397 - in /webservices/wss4j/trunk/test/wssec: TestWSSecurityNew11.java TestWSSecurityNew2.java TestWSSecurityNewST1.java Date: Wed, 02 May 2007 11:50:13 -0000 To: nrice@example.net From: nrice@example.net X-Mailer: svnmailer-1.1.0 Message-Id: <nrice@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: werner Date: Wed May 2 04:50:12 2007 New Revision: 534397 URL: http://svn.apache.org/viewvc?view=rev&rev=534397 Log: Replace some more toSOAPMessage with toAxisMessage. Now all testcase run with Java 6. Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew11.java webservices/wss4j/trunk/test/wssec/TestWSSecurityNew2.java webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST1.java Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew11.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew11.java?view=diff&rev=534397&r1=534396&r2=534397 ============================================================================== --- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew11.java (original) +++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew11.java Wed May 2 04:50:12 2007 @@ -276,7 +276,7 @@ Document signedDoc = builder.build(doc, crypto, secHeader); - Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc); + Message signedMsg = (Message) SOAPUtil.toAxisMessage(signedDoc); if (log.isDebugEnabled()) { log.debug("Signed message with STR IssuerSerial key identifier:"); XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out)); @@ -333,7 +333,7 @@ Document signedDoc = builder.build(doc, crypto, secHeader); - Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc); + Message signedMsg = (Message) SOAPUtil.toAxisMessage(signedDoc); if (log.isDebugEnabled()) { log.debug("Signed message with STR SKI key identifier:"); XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out)); Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew2.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew2.java?view=diff&rev=534397&r1=534396&r2=534397 ============================================================================== --- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew2.java (original) +++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew2.java Wed May 2 04:50:12 2007 @@ -184,7 +184,7 @@ log.info("Before Encryption AES 128/RSA-15...."); encryptedDoc = builder.build(doc, crypto, secHeader); log.info("After Encryption AES 128/RSA-15...."); - encryptedMsg = (Message) SOAPUtil.toSOAPMessage(encryptedDoc); + encryptedMsg = (Message) SOAPUtil.toAxisMessage(encryptedDoc); if (log.isDebugEnabled()) { log.debug("Encrypted message, RSA-15 keytransport, AES 128:"); XMLUtils.PrettyElementToWriter(encryptedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out)); @@ -216,7 +216,7 @@ Document encryptedDoc = builder.build(doc, crypto, secHeader); log.info("After Encryption Triple DES/RSA-OAEP...."); - Message encryptedMsg = (Message) SOAPUtil.toSOAPMessage(encryptedDoc); + Message encryptedMsg = (Message) SOAPUtil.toAxisMessage(encryptedDoc); if (log.isDebugEnabled()) { log.debug("Encrypted message, RSA-OAEP keytransport, 3DES:"); XMLUtils.PrettyElementToWriter(encryptedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out)); Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST1.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST1.java?view=diff&rev=534397&r1=534396&r2=534397 ============================================================================== --- webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST1.java (original) +++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST1.java Wed May 2 04:50:12 2007 @@ -23,7 +23,6 @@ import org.apache.ws.security.saml.SAMLIssuerFactory; import org.apache.ws.security.saml.SAMLIssuer; -import org.apache.ws.security.saml.SAMLIssuerFactory; import org.apache.axis.Message; import org.apache.axis.MessageContext; --------------------------------------------------------------------- To unsubscribe, e-mail: nrice@example.net For additional commands, e-mail: nrice@example.net From nrice@example.net Wed May 02 11:53:06 2007 Return-Path: <nrice@example.net> Delivered-To: nrice@example.net Received: (qmail 25205 invoked from network); 2 May 2007 11:53:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 May 2007 11:53:04 -0000 Received: (qmail 89797 invoked by uid 500); 2 May 2007 11:53:09 -0000 Delivered-To: nrice@example.net Received: (qmail 89743 invoked by uid 500); 2 May 2007 11:53:09 -0000 Mailing-List: contact nrice@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:nrice@example.net> List-Unsubscribe: <mailto:nrice@example.net> List-Post: <mailto:nrice@example.net> List-Id: <sandesha-dev.ws.apache.org> Delivered-To: mailing list nrice@example.net Received: (qmail 89732 invoked by uid 500); 2 May 2007 11:53:09 -0000 Delivered-To: nrice@example.net Received: (qmail 89725 invoked by uid 99); 2 May 2007 11:53:09 -0000 Received: from herse.apache.org (HELO herse.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 May 2007 04:53:09 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 May 2007 04:53:01 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 9F4401A983E; Wed, 2 May 2007 04:52:41 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r534400 - in /webservices/sandesha/trunk/c/src: msgprocessors/app_msg_processor.c msgprocessors/create_seq_msg_processor.c msgprocessors/terminate_seq_msg_processor.c util/ack_mgr.c util/sandesha2_utils.c Date: Wed, 02 May 2007 11:52:41 -0000 To: nrice@example.net From: nrice@example.net X-Mailer: svnmailer-1.1.0 Message-Id: <nrice@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: damitha Date: Wed May 2 04:52:40 2007 New Revision: 534400 URL: http://svn.apache.org/viewvc?view=rev&rev=534400 Log: Adding log messages where appropriate and cleaning the code. Modified: webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c webservices/sandesha/trunk/c/src/util/ack_mgr.c webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Modified: webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c?view=diff&rev=534400&r1=534399&r2=534400 ============================================================================== --- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original) +++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Wed May 2 04:52:40 2007 @@ -670,15 +670,14 @@ AXIS2_WSDL_MESSAGE_LABEL_IN); /* TODO setting up fault callback */ - /*axutil_allocator_switch_to_global_pool(env->allocator);*/ storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, axis2_conf_ctx_get_conf(conf_ctx, env)); - /*axutil_allocator_switch_to_local_pool(env->allocator);*/ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr( storage_mgr, env); if(!seq_prop_mgr) { - AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "seq_prop_mgr is NULL"); + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "[sandesha2]seq_prop_mgr is NULL"); return AXIS2_FAILURE; } is_svr_side = axis2_msg_ctx_get_server_side(msg_ctx, env); @@ -688,7 +687,8 @@ || 0 == axutil_strlen(axis2_endpoint_ref_get_address( to_epr, env))) && !is_svr_side) { - AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "to epr is not set - a" + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "[sandesha2]To epr is not set - a" "requirement in sandesha client side"); return AXIS2_FAILURE; } @@ -712,7 +712,8 @@ req_rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ); if(!req_seq) { - AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Sequence is NULL"); + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "[sandesha2]Sequence is NULL"); AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SEQ_NOT_EXIST, AXIS2_FAILURE); return AXIS2_FAILURE; @@ -721,7 +722,8 @@ sandesha2_seq_get_identifier(req_seq, env), env); if(!incoming_seq_id) { - AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Sequence ID is NULL"); + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "[sandesha2]Sequence ID is NULL"); return AXIS2_FAILURE; } request_msg_no = SANDESHA2_MSG_NUMBER_GET_MSG_NUM( @@ -766,13 +768,9 @@ if(!spec_ver) { axutil_property_t *spec_ver_prop = NULL; - /*sandesha2_seq_property_bean_t *spec_ver_bean = NULL;*/ spec_ver_prop = axis2_msg_ctx_get_property(msg_ctx, env, SANDESHA2_CLIENT_RM_SPEC_VERSION); spec_ver = axutil_property_get_value(spec_ver_prop, env); - /*spec_ver_bean = sandesha2_seq_property_bean_create_with_data(env, - internal_seq_id, SANDESHA2_SEQ_PROP_RM_SPEC_VERSION, spec_ver); - sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, spec_ver_bean);*/ } if(sandesha2_spec_specific_consts_is_last_msg_indicator_reqd (env, spec_ver)) @@ -788,7 +786,8 @@ msg_num_lng = *(long*)(axutil_property_get_value(property, env)); if(msg_num_lng <= 0) { - AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Invalid message number"); + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "[sandesha2]Invalid message number"); AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_MSG_NUM, AXIS2_FAILURE); return AXIS2_FAILURE; @@ -1023,29 +1022,17 @@ axis2_msg_ctx_get_op_ctx(msg_ctx, env), env), env), env); if (to_epr) to_addr = (axis2_char_t*)axis2_endpoint_ref_get_address(to_epr, env); - /* test code */ - /*if(!axis2_msg_ctx_get_wsa_action(msg_ctx, env)) - axis2_msg_ctx_set_wsa_action(msg_ctx, env, axutil_strcat(env, to_addr, - "/", op_name, NULL));*/ if(!axis2_msg_ctx_get_wsa_action(msg_ctx, env)) axis2_msg_ctx_set_wsa_action(msg_ctx, env, to_addr); - /*if(!axis2_msg_ctx_get_soap_action(msg_ctx, env)) - axis2_msg_ctx_set_soap_action(msg_ctx, env, axutil_strcat(env, "\"", - to_addr, "/", op_name, "\"", NULL));*/ if(!axis2_msg_ctx_get_soap_action(msg_ctx, env)) { axutil_string_t *soap_action = axutil_string_create(env, to_addr); axis2_msg_ctx_set_soap_action(msg_ctx, env, soap_action); } - /* end test code */ if(!dummy_msg) sandesha2_app_msg_processor_process_response_msg(env, rm_msg_ctx, internal_seq_id, out_seq_id, msg_number, storage_key, storage_mgr); - /*if(1 < msg_number && !axis2_msg_ctx_get_server_side(msg_ctx, env)) - { - return AXIS2_SUCCESS; - }*/ axis2_msg_ctx_set_paused(msg_ctx, env, AXIS2_TRUE); AXIS2_LOG_INFO(env->log, "[sandesha2] Exit: sandesha2_app_msg_processor_process_out_msg"); @@ -1263,7 +1250,7 @@ env)); if(!axis2_engine_resume_send(engine, env, create_seq_msg)) { - AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]Engine Resume Send failed"); return AXIS2_FAILURE; } @@ -1365,7 +1352,8 @@ rm_version = sandesha2_utils_get_rm_version(env, internal_seq_id, storage_mgr); if(!rm_version) { - AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Unable to find RM spec version"); + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "[sandesha2]Unable to find RM spec version"); return AXIS2_FAILURE; } rm_ns_val = sandesha2_spec_specific_consts_get_rm_ns_val(env, rm_version); @@ -1384,7 +1372,8 @@ env, SANDESHA2_MSG_PART_SEQ); if(!req_seq) { - AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Sequence not found"); + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "[sandesha2]Sequence not found"); AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_SEQ, AXIS2_FAILURE); return AXIS2_FAILURE; } @@ -1456,7 +1445,8 @@ req_rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ); if(!req_seq) { - AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Sequence is NULL"); + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "[sandesha2]Sequence is NULL"); AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SEQ_NOT_EXIST, AXIS2_FAILURE); return AXIS2_FAILURE; @@ -1465,10 +1455,10 @@ sandesha2_seq_get_identifier(req_seq, env), env); if(!incoming_seq_id) { - AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Sequence ID is NULL"); + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "[sandesha2]Sequence ID is NULL"); return AXIS2_FAILURE; } - AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "sandesha to_addr = %s sandesha2_msg_creator_add_ack_msg", to_addr); sandesha2_msg_creator_add_ack_msg(env, rm_msg_ctx, incoming_seq_id, storage_mgr); engine = axis2_engine_create(env, axis2_msg_ctx_get_conf_ctx(msg_ctx, Modified: webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c?view=diff&rev=534400&r1=534399&r2=534400 ============================================================================== --- webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c (original) +++ webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c Wed May 2 04:52:40 2007 @@ -195,7 +195,7 @@ { axis2_engine_t *engine = NULL; AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, - "[sandesha2]A fault occurred in create_seq_msg_processor_process_in_msg"); + "[sandesha2]A fault occurred"); engine = axis2_engine_create(env, conf_ctx); axis2_engine_send_fault(engine, env, sandesha2_msg_ctx_get_msg_ctx( fault_rm_msg_ctx, env)); @@ -215,11 +215,11 @@ AXIS2_VALUE_TRUE); /* For making sure that this won't be processed again */ sandesha2_msg_ctx_set_property(create_seq_res_msg, env, - SANDESHA2_APPLICATION_PROCESSING_DONE, property); + SANDESHA2_APPLICATION_PROCESSING_DONE, property); create_seq_res_part = (sandesha2_create_seq_res_t*) - sandesha2_msg_ctx_get_msg_part(create_seq_res_msg, - env, SANDESHA2_MSG_PART_CREATE_SEQ_RESPONSE); + sandesha2_msg_ctx_get_msg_part(create_seq_res_msg, + env, SANDESHA2_MSG_PART_CREATE_SEQ_RESPONSE); seq_offer = sandesha2_create_seq_get_seq_offer(create_seq_part, env); /* Offer processing */ @@ -252,8 +252,8 @@ sandesha2_seq_property_bean_t *out_seq_bean = NULL; sandesha2_seq_property_bean_t *int_seq_bean = NULL; - AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Offer Accepted"); - + AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, + "[sandesha2] Offer Accepted"); create_seq_bean = sandesha2_create_seq_bean_create(env); sandesha2_create_seq_bean_set_seq_id(create_seq_bean, env, offer_seq_id); @@ -270,10 +270,6 @@ out_seq_bean = sandesha2_seq_property_bean_create(env); sandesha2_seq_property_bean_set_name(out_seq_bean, env, SANDESHA2_SEQ_PROP_OUT_SEQ_ID); - /*sandesha2_seq_property_bean_set_seq_id(out_seq_bean, env, - offer_seq_id); - sandesha2_seq_property_bean_set_value(out_seq_bean, env, - int_seq_id);*/ sandesha2_seq_property_bean_set_seq_id(out_seq_bean, env, int_seq_id); sandesha2_seq_property_bean_set_value(out_seq_bean, env, @@ -302,8 +298,7 @@ if(!acks_to || !axis2_endpoint_ref_get_address(acks_to, env)) { - AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]Acks to is null" - " in create_seq message"); + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]Acks to is null"); AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_EPR, AXIS2_FAILURE); return AXIS2_FAILURE; @@ -326,10 +321,10 @@ return AXIS2_FAILURE; } to_epr = axis2_endpoint_ref_create(env, - sandesha2_seq_property_bean_get_value(to_bean, env)); + sandesha2_seq_property_bean_get_value(to_bean, env)); addr_ns_uri = sandesha2_utils_get_seq_property(env, new_seq_id, - SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE, - storage_mgr); + SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE, + storage_mgr); anon_uri = sandesha2_spec_specific_consts_get_anon_uri(env, addr_ns_uri); op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env); @@ -352,9 +347,9 @@ static axis2_status_t AXIS2_CALL sandesha2_create_seq_msg_processor_process_out_msg( - sandesha2_msg_processor_t *msg_processor, - const axutil_env_t *env, - sandesha2_msg_ctx_t *rm_msg_ctx) + sandesha2_msg_processor_t *msg_processor, + const axutil_env_t *env, + sandesha2_msg_ctx_t *rm_msg_ctx) { AXIS2_ENV_CHECK(env, AXIS2_FAILURE); Modified: webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c?view=diff&rev=534400&r1=534399&r2=534400 ============================================================================== --- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c (original) +++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c Wed May 2 04:52:40 2007 @@ -213,7 +213,8 @@ { axis2_engine_t *engine = NULL; engine = axis2_engine_create(env, conf_ctx); - + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "[sandesha2] Send fault occurred"); axis2_engine_send_fault(engine, env, sandesha2_msg_ctx_get_msg_ctx( fault_ctx, env)); axis2_msg_ctx_set_paused(msg_ctx, env, AXIS2_TRUE); @@ -474,7 +475,7 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE); AXIS2_LOG_INFO(env->log, - "[sandesha2] sandesha2_terminate_msg_processor_process_out_msg ........."); + "[sandesha2] sandesha2_terminate_msg_processor_process_out_msg."); msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env); conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env); Modified: webservices/sandesha/trunk/c/src/util/ack_mgr.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/ack_mgr.c?view=diff&rev=534400&r1=534399&r2=534400 ============================================================================== --- webservices/sandesha/trunk/c/src/util/ack_mgr.c (original) +++ webservices/sandesha/trunk/c/src/util/ack_mgr.c Wed May 2 04:52:40 2007 @@ -298,8 +298,10 @@ } else { + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "[sandesha2]completed_msgs_bean is NULL"); AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_COMPLETED_MSGS_BEAN_IS_NULL, - AXIS2_FAILURE); + AXIS2_FAILURE); return NULL; } return completed_msg_list; @@ -307,9 +309,9 @@ AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL sandesha2_ack_mgr_get_svr_completed_msgs_list( - const axutil_env_t *env, - axis2_char_t *seq_id, - sandesha2_seq_property_mgr_t *seq_prop_mgr) + const axutil_env_t *env, + axis2_char_t *seq_id, + sandesha2_seq_property_mgr_t *seq_prop_mgr) { sandesha2_seq_property_bean_t *completed_msgs_bean = NULL; axutil_array_list_t *completed_msg_list = NULL; @@ -325,6 +327,8 @@ } else { + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "[sandesha2]completed_msgs_bean is NULL"); AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_COMPLETED_MSGS_BEAN_IS_NULL, AXIS2_FAILURE); return NULL; @@ -435,7 +439,6 @@ axis2_msg_ctx_get_to(msg_ctx1, env), env); if(0 == axutil_strcmp(to, to_str)) continue; - /*axis2_char_t *msg_id = sandesha2_sender_bean_get_msg_id((const sandesha2_sender_bean_t *)sender_bean, env);*/ sandesha2_sender_mgr_remove(retrans_mgr, env, sandesha2_sender_bean_get_msg_id((sandesha2_rm_bean_t *) sender_bean, env)); Modified: webservices/sandesha/trunk/c/src/util/sandesha2_utils.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/sandesha2_utils.c?view=diff&rev=534400&r1=534399&r2=534400 ============================================================================== --- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original) +++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Wed May 2 04:52:40 2007 @@ -75,16 +75,22 @@ soap_body = axiom_soap_envelope_get_body(envelope, env); if(!soap_body) { + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "[sandesha2]Soap envelope does not have a soap body"); return AXIS2_FAILURE; } body_node = axiom_soap_body_get_base_node(soap_body, env); if(!body_node) { + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "[sandesha2]Soap body does not have a base node"); return AXIS2_FAILURE; } body_element = axiom_node_get_data_element(body_node, env); if(!body_element) { + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "[sandesha2]Soap body node does not have a node element"); return AXIS2_FAILURE; } body_rm_element = axiom_element_get_first_child_with_qname(body_element, @@ -167,6 +173,7 @@ else { axutil_allocator_switch_to_local_pool(env->allocator); + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]Unknown storage manager"); AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_STORAGE_MGR, AXIS2_FAILURE); return NULL; @@ -212,6 +219,7 @@ param = axis2_conf_get_param(conf, env, SANDESHA2_SANDESHA_PROPERTY_BEAN); if(!param) { + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]Configuration not set"); AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CONFIGURATION_NOT_SET, AXIS2_FAILURE); return NULL; @@ -239,8 +247,8 @@ { axis2_char_t *ret_str = NULL; - ret_str = axutil_strcat(env, "Invalid String Array", str, NULL); - AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, ret_str); + ret_str = axutil_strcat(env, "[sandesha2]Invalid String Array", str, NULL); + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, ret_str); AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_STRING_ARRAY, AXIS2_FAILURE); AXIS2_FREE(env->allocator, ret_str); @@ -253,8 +261,8 @@ { axis2_char_t *ret_str = NULL; - ret_str = axutil_strcat(env, "Invalid String Array", str, NULL); - AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, ret_str); + ret_str = axutil_strcat(env, "[sandesha2]Invalid String Array", str, NULL); + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, ret_str); AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_STRING_ARRAY, AXIS2_FAILURE); AXIS2_FREE(env->allocator, ret_str); @@ -267,8 +275,8 @@ { axis2_char_t *ret_str = NULL; - ret_str = axutil_strcat(env, "Invalid String Array", str, NULL); - AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, ret_str); + ret_str = axutil_strcat(env, "[sandesha2]Invalid String Array", str, NULL); + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, ret_str); AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_STRING_ARRAY, AXIS2_FAILURE); AXIS2_FREE(env->allocator, ret_str); @@ -357,34 +365,39 @@ { sandesha2_in_order_invoker_t *invoker = NULL; axutil_property_t *property = NULL; + axis2_status_t status = AXIS2_FAILURE; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE); property = axis2_ctx_get_property(axis2_conf_ctx_get_base(conf_ctx, env), - env, SANDESHA2_INVOKER); + env, SANDESHA2_INVOKER); if(property) invoker = axutil_property_get_value(property, env); if(!invoker) { invoker = sandesha2_in_order_invoker_create(env); property = axutil_property_create_with_args(env, AXIS2_SCOPE_APPLICATION, - AXIS2_FALSE, (void *)sandesha2_in_order_invoker_free_void_arg, invoker); + AXIS2_FALSE, (void *)sandesha2_in_order_invoker_free_void_arg, + invoker); axis2_ctx_set_property(axis2_conf_ctx_get_base(conf_ctx, env), - env, SANDESHA2_INVOKER, property); + env, SANDESHA2_INVOKER, property); } - sandesha2_in_order_invoker_run_for_seq(invoker, env, conf_ctx, seq_id); - return AXIS2_SUCCESS; + status = sandesha2_in_order_invoker_run_for_seq(invoker, env, conf_ctx, + seq_id); + return status; } AXIS2_EXTERN axis2_status_t AXIS2_CALL -sandesha2_utils_start_sender_for_seq(const axutil_env_t *env, - axis2_conf_ctx_t *conf_ctx, - axis2_char_t *seq_id) +sandesha2_utils_start_sender_for_seq( + const axutil_env_t *env, + axis2_conf_ctx_t *conf_ctx, + axis2_char_t *seq_id) { sandesha2_sender_t *sender = NULL; axutil_property_t *property = NULL; + axis2_status_t status = AXIS2_FAILURE; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE); @@ -403,8 +416,8 @@ axis2_ctx_set_property(axis2_conf_ctx_get_base(conf_ctx, env), env, SANDESHA2_SENDER, property); } - sandesha2_sender_run_for_seq(sender, env, conf_ctx, seq_id); - return AXIS2_SUCCESS; + status = sandesha2_sender_run_for_seq(sender, env, conf_ctx, seq_id); + return status; } AXIS2_EXTERN axis2_status_t AXIS2_CALL @@ -414,6 +427,7 @@ { sandesha2_polling_mgr_t *polling_mgr = NULL; axutil_property_t *property = NULL; + axis2_status_t status = AXIS2_FAILURE; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE); @@ -434,20 +448,21 @@ axis2_ctx_set_property(axis2_conf_ctx_get_base(conf_ctx, env), env, SANDESHA2_POLLING_MGR, property); } - sandesha2_polling_mgr_start(polling_mgr, env, conf_ctx); - return AXIS2_SUCCESS; + status = sandesha2_polling_mgr_start(polling_mgr, env, conf_ctx); + return status; } AXIS2_EXTERN axis2_char_t* AXIS2_CALL -sandesha2_utils_get_outgoing_internal_seq_id(const axutil_env_t *env, +sandesha2_utils_get_outgoing_internal_seq_id( + const axutil_env_t *env, axis2_char_t *seq_id) { AXIS2_ENV_CHECK(env, NULL); AXIS2_PARAM_CHECK(env->error, seq_id, NULL); return axutil_strcat(env, SANDESHA2_INTERNAL_SEQ_PREFIX, ":", - seq_id, NULL); + seq_id, NULL); } AXIS2_EXTERN axis2_transport_out_desc_t* AXIS2_CALL @@ -465,8 +480,9 @@ } AXIS2_EXTERN sandesha2_storage_mgr_t* AXIS2_CALL -sandesha2_utils_get_inmemory_storage_mgr(const axutil_env_t *env, - axis2_conf_ctx_t *conf_ctx) +sandesha2_utils_get_inmemory_storage_mgr( + const axutil_env_t *env, + axis2_conf_ctx_t *conf_ctx) { axutil_property_t *property = NULL; axis2_ctx_t *ctx = axis2_conf_ctx_get_base(conf_ctx, env); @@ -504,7 +520,6 @@ { axutil_property_t *property = NULL; axis2_ctx_t *ctx = axis2_conf_ctx_get_base(conf_ctx, env); - /*axutil_array_list_t *storage_mgr_list = axutil_array_list_create(env, 0);*/ sandesha2_storage_mgr_t *storage_mgr = NULL; AXIS2_ENV_CHECK(env, NULL); @@ -519,15 +534,6 @@ AXIS2_FALSE, 0, storage_mgr); axis2_ctx_set_property(ctx, env, SANDESHA2_PERMANENT_STORAGE_MGR, property); - /*if(property) - storage_mgr_list = axutil_property_get_value(property, env); - sandesha2_storage_mgr_t *storage_mgr = - sandesha2_permanent_storage_mgr_create(env, conf_ctx); - axutil_array_list_add(storage_mgr_list, env, storage_mgr); - property = axutil_property_create_with_args(env, AXIS2_SCOPE_APPLICATION, - AXIS2_FALSE, 0, storage_mgr_list); - axis2_ctx_set_property(ctx, env, SANDESHA2_PERMANENT_STORAGE_MGR, - property, AXIS2_FALSE);*/ return storage_mgr; } @@ -565,6 +571,8 @@ param = axis2_op_get_param(op, env, SANDESHA2_SANDESHA_PROPERTY_BEAN); if(!param) { + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "[sandesha2]Configuration not set."); AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CONFIGURATION_NOT_SET, AXIS2_FAILURE); return NULL; @@ -598,7 +606,7 @@ else { ret = axutil_strcat(env, SANDESHA2_INTERNAL_SEQ_PREFIX, ":", to, ":", - seq_key, NULL); + seq_key, NULL); return ret; } return NULL; @@ -673,7 +681,8 @@ if(axis2_msg_ctx_get_svc(ref_msg, env)) { - axis2_msg_ctx_set_svc_grp(new_msg, env, (axis2_svc_grp_t *)axis2_msg_ctx_get_svc(ref_msg, env)); + axis2_msg_ctx_set_svc_grp(new_msg, env, (axis2_svc_grp_t *) + axis2_msg_ctx_get_svc(ref_msg, env)); if(axis2_msg_ctx_get_svc_ctx(ref_msg, env)) { axis2_msg_ctx_set_svc_ctx(new_msg, env, @@ -873,7 +882,7 @@ if(!soap_env) { AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] SOAP envelope is" - " null"); + " NULL"); return AXIS2_FALSE; } soap_header = axiom_soap_envelope_get_header(soap_env, env); --------------------------------------------------------------------- To unsubscribe, e-mail: nrice@example.net For additional commands, e-mail: nrice@example.net From nrice@example.net Wed May 02 12:19:18 2007 Return-Path: <nrice@example.net> Delivered-To: nrice@example.net Received: (qmail 37061 invoked from network); 2 May 2007 12:19:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 May 2007 12:19:16 -0000 Received: (qmail 30627 invoked by uid 500); 2 May 2007 12:19:22 -0000 Delivered-To: nrice@example.net Received: (qmail 30580 invoked by uid 500); 2 May 2007 12:19:21 -0000 Mailing-List: contact nrice@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:nrice@example.net> List-Unsubscribe: <mailto:nrice@example.net> List-Post: <mailto:nrice@example.net> List-Id: <sandesha-dev.ws.apache.org> Delivered-To: mailing list nrice@example.net Received: (qmail 30569 invoked by uid 500); 2 May 2007 12:19:21 -0000 Delivered-To: nrice@example.net Received: (qmail 30566 invoked by uid 99); 2 May 2007 12:19:21 -0000 Received: from herse.apache.org (HELO herse.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 May 2007 05:19:21 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 May 2007 05:19:14 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 4BD4F1A9838; Wed, 2 May 2007 05:18:54 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r534413 - in /webservices/sandesha/trunk/java/modules/core/src/main: java/org/apache/sandesha2/i18n/ java/org/apache/sandesha2/msgprocessors/ resources/org/apache/sandesha2/i18n/ Date: Wed, 02 May 2007 12:18:54 -0000 To: nrice@example.net From: nrice@example.net X-Mailer: svnmailer-1.1.0 Message-Id: <nrice@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: gatfora Date: Wed May 2 05:18:53 2007 New Revision: 534413 URL: http://svn.apache.org/viewvc?view=rev&rev=534413 Log: Make a CreateSequenceRefused fault if RM is not enabled for a particular service and it receives a CreateSequence message Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java?view=diff&rev=534413&r1=534412&r2=534413 ============================================================================== --- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java (original) +++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java Wed May 2 05:18:53 2007 @@ -106,6 +106,7 @@ public static final String cannotDerriveRetransInterval="cannotDerriveRetransInterval"; public static final String cannotDerriveInactivityTimeout="cannotDerriveInactivityTimeout"; public static final String noCreateSeqParts="noCreateSeqParts"; + public static final String reliableMessagingNotEnabled="reliableMessagingNotEnabled"; public static final String noAcceptPart="noAcceptPart"; public static final String noAcksToPartInCreateSequence="noAcksToPartInCreateSequence"; public static final String tempSeqIdNotSet="tempSeqIdNotSet"; Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java?view=diff&rev=534413&r1=534412&r2=534413 ============================================================================== --- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java (original) +++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java Wed May 2 05:18:53 2007 @@ -27,6 +27,7 @@ import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.context.MessageContext; import org.apache.axis2.context.OperationContext; +import org.apache.axis2.description.Parameter; import org.apache.axis2.engine.AxisEngine; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -68,6 +69,18 @@ log.debug("Enter: CreateSeqMsgProcessor888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4processInMessage"); try { + if (createSeqRMMsg.getMessageContext().getAxisService() != null) { + Parameter unreliableParam = createSeqRMMsg.getMessageContext().getAxisService().getParameter(SandeshaClientConstants.UNRELIABLE_MESSAGE); + if (null != unreliableParam && "true".equals(unreliableParam.getValue())) { + FaultManager.makeCreateSequenceRefusedFault(createSeqRMMsg, + SandeshaMessageHelper.getMessage(SandeshaMessageKeys.reliableMessagingNotEnabled, createSeqRMMsg.getMessageContext().getAxisService().getName()), + new Exception()); + + log.debug("Exit: CreateSeqMsgProcessor888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4processInMessage, Service has disabled RM " + false); + return false; + } + } + CreateSequence createSeqPart = (CreateSequence) createSeqRMMsg .getMessagePart(Sandesha2Constants.MessageParts.CREATE_SEQ); if (createSeqPart == null) { Modified: webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties?view=diff&rev=534413&r1=534412&r2=534413 ============================================================================== --- webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties (original) +++ webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties Wed May 2 05:18:53 2007 @@ -121,6 +121,7 @@ cannotDerriveRetransInterval=Cannot derive the ''Retransmission Interval'' from the passed string {0}. cannotDerriveInactivityTimeout=Cannot derive the ''Inactivity Timeout'' from the passed string {0}. noCreateSeqParts=No ''CreateSequence'' part is present in the create sequence message. +reliableMessagingNotEnabled=WS-RM not enabled for service with name {0}. noAcceptPart=An ''Accept'' part has not been generated for the ''create sequence request'' with an offer part. noAcksToPartInCreateSequence=No ''AcksTo'' part is present in the create sequence message. tempSeqIdNotSet=Error: ''TempSequenceId'' is not set. --------------------------------------------------------------------- To unsubscribe, e-mail: nrice@example.net For additional commands, e-mail: nrice@example.net From nrice@example.net Wed May 02 17:36:45 2007 Return-Path: <nrice@example.net> Delivered-To: nrice@example.net Received: (qmail 88380 invoked from network); 2 May 2007 17:36:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 May 2007 17:36:43 -0000 Received: (qmail 27910 invoked by uid 500); 2 May 2007 17:36:48 -0000 Delivered-To: nrice@example.net Received: (qmail 27845 invoked by uid 500); 2 May 2007 17:36:48 -0000 Mailing-List: contact nrice@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:nrice@example.net> List-Unsubscribe: <mailto:nrice@example.net> List-Post: <mailto:nrice@example.net> List-Id: <sandesha-dev.ws.apache.org> Delivered-To: mailing list nrice@example.net Received: (qmail 27833 invoked by uid 500); 2 May 2007 17:36:48 -0000 Delivered-To: nrice@example.net Received: (qmail 27830 invoked by uid 99); 2 May 2007 17:36:48 -0000 Received: from herse.apache.org (HELO herse.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 May 2007 10:36:48 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 May 2007 10:36:39 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 6248D1A983A; Wed, 2 May 2007 10:36:19 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r534564 - in /webservices/sandesha/trunk/java: ./ modules/core/src/main/java/org/apache/sandesha2/ modules/samples/ modules/samples/conf/ modules/samples/src/main/ modules/samples/src/main/java/ modules/samples/src/main/java/sandesha2/ modu... Date: Wed, 02 May 2007 17:36:17 -0000 To: nrice@example.net From: nrice@example.net X-Mailer: svnmailer-1.1.0 Message-Id: <nrice@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: chamikara Date: Wed May 2 10:36:15 2007 New Revision: 534564 URL: http://svn.apache.org/viewvc?view=rev&rev=534564 Log: Added the samples and test modules to the maven2 build. Repo creation and sample creation scripts were written in seperate Ant files which get called from the pom.xml file. Moved the test and sample; src,resources files to the correct locations. Maven1 build was corrected according to these changes. Added: webservices/sandesha/trunk/java/modules/samples/pom.xml webservices/sandesha/trunk/java/modules/samples/samples.build.xml webservices/sandesha/trunk/java/modules/samples/src/main/ webservices/sandesha/trunk/java/modules/samples/src/main/java/ webservices/sandesha/trunk/java/modules/samples/src/main/java/sandesha2/ - copied from r533340, webservices/sandesha/trunk/java/modules/samples/src/sandesha2/ webservices/sandesha/trunk/java/modules/samples/src/main/java/sandesha2/samples/ - copied from r534554, webservices/sandesha/trunk/java/modules/samples/src/sandesha2/samples/ webservices/sandesha/trunk/java/modules/samples/src/main/resources/ webservices/sandesha/trunk/java/modules/samples/src/main/resources/userguide/ - copied from r533340, webservices/sandesha/trunk/java/modules/samples/conf/userguide/ webservices/sandesha/trunk/java/modules/samples/src/main/resources/userguide/AsyncEchoClient.bat - copied unchanged from r534554, webservices/sandesha/trunk/java/modules/samples/conf/userguide/AsyncEchoClient.bat webservices/sandesha/trunk/java/modules/samples/src/main/resources/userguide/AsyncEchoClient.sh - copied unchanged from r534554, webservices/sandesha/trunk/java/modules/samples/conf/userguide/AsyncEchoClient.sh webservices/sandesha/trunk/java/modules/samples/src/main/resources/userguide/AsyncPingClient.bat - copied unchanged from r534554, webservices/sandesha/trunk/java/modules/samples/conf/userguide/AsyncPingClient.bat webservices/sandesha/trunk/java/modules/samples/src/main/resources/userguide/AsyncPingClient.sh - copied unchanged from r534554, webservices/sandesha/trunk/java/modules/samples/conf/userguide/AsyncPingClient.sh webservices/sandesha/trunk/java/modules/samples/src/main/resources/userguide/SyncEchoClient.bat - copied unchanged from r534554, webservices/sandesha/trunk/java/modules/samples/conf/userguide/SyncEchoClient.bat webservices/sandesha/trunk/java/modules/samples/src/main/resources/userguide/SyncEchoClient.sh - copied unchanged from r534554, webservices/sandesha/trunk/java/modules/samples/conf/userguide/SyncEchoClient.sh webservices/sandesha/trunk/java/modules/samples/src/main/resources/userguide/SyncPingClient.bat - copied unchanged from r534554, webservices/sandesha/trunk/java/modules/samples/conf/userguide/SyncPingClient.bat webservices/sandesha/trunk/java/modules/samples/src/main/resources/userguide/SyncPingClient.sh - copied unchanged from r534554, webservices/sandesha/trunk/java/modules/samples/conf/userguide/SyncPingClient.sh webservices/sandesha/trunk/java/modules/samples/src/main/resources/userguide/services.xml - copied unchanged from r534554, webservices/sandesha/trunk/java/modules/samples/conf/userguide/services.xml webservices/sandesha/trunk/java/modules/samples/src/main/resources/userguide/userguide_sample.html - copied unchanged from r534554, webservices/sandesha/trunk/java/modules/samples/conf/userguide/userguide_sample.html webservices/sandesha/trunk/java/modules/tests/pom.xml webservices/sandesha/trunk/java/modules/tests/src/test/ webservices/sandesha/trunk/java/modules/tests/src/test/java/ webservices/sandesha/trunk/java/modules/tests/src/test/java/org/ - copied from r533340, webservices/sandesha/trunk/java/modules/tests/src/org/ webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/ - copied from r534554, webservices/sandesha/trunk/java/modules/tests/src/org/apache/ webservices/sandesha/trunk/java/modules/tests/tests.build.xml Removed: webservices/sandesha/trunk/java/modules/samples/conf/ webservices/sandesha/trunk/java/modules/samples/src/sandesha2/ webservices/sandesha/trunk/java/modules/tests/src/org/ Modified: webservices/sandesha/trunk/java/maven.xml webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java webservices/sandesha/trunk/java/pom.xml webservices/sandesha/trunk/java/project.xml Modified: webservices/sandesha/trunk/java/maven.xml URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/maven.xml?view=diff&rev=534564&r1=534563&r2=534564 ============================================================================== --- webservices/sandesha/trunk/java/maven.xml (original) +++ webservices/sandesha/trunk/java/maven.xml Wed May 2 10:36:15 2007 @@ -337,8 +337,8 @@ <ant:mkdir dir="${dir.sample.userguide.temp}" /> <ant:mkdir dir="${dir.sample.userguide.temp}/META-INF" /> - <ant:copy file="${dir.samples}/conf/userguide/services.xml" todir="${dir.sample.userguide.temp}/META-INF" /> - <!-- <ant:copy file="${dir.samples}/conf/userguide/RMSampleService.wsdl" todir="${dir.sample.userguide.temp}" /> --> + <ant:copy file="${dir.samples}/src/main/resources/userguide/services.xml" todir="${dir.sample.userguide.temp}/META-INF" /> + <!-- <ant:copy file="${dir.samples}/src/main/resources/userguide/RMSampleService.wsdl" todir="${dir.sample.userguide.temp}" /> --> <ant:copy todir="${dir.sample.userguide.temp}" > <ant:fileset dir="${maven.build.dir}/samples/classes"> <ant:include name="sandesha2/samples/userguide/**/*Service*.class" /> Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java?view=diff&rev=534564&r1=534563&r2=534564 ============================================================================== --- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java (original) +++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java Wed May 2 10:36:15 2007 @@ -83,7 +83,7 @@ if (propertyBean==null) { String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.couldNotLoadModulePolicies); - log.error (message); + log.warn (message); propertyBean = PropertyManager.loadPropertiesFromDefaultValues(); } else { Added: webservices/sandesha/trunk/java/modules/samples/pom.xml URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/samples/pom.xml?view=auto&rev=534564 ============================================================================== --- webservices/sandesha/trunk/java/modules/samples/pom.xml (added) +++ webservices/sandesha/trunk/java/modules/samples/pom.xml Wed May 2 10:36:15 2007 @@ -0,0 +1,84 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <parent> + <groupId>org.apache.sandesha2</groupId> + <artifactId>sandesha2-parent</artifactId> + <version>SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>sandesha2-samples</artifactId> + <packaging>jar</packaging> + <name>Sandesha2 - Samples</name> + + <build> + <sourceDirectory>src/main/java</sourceDirectory> + <testSourceDirectory>src/main/java</testSourceDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + <include>**/*.xsl</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.4</source> + <target>1.4</target> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.1</version> + <executions> + <execution> + <id>create_samples</id> + <phase>package</phase> + <configuration> + <tasks> + <ant antfile="samples.build.xml" target="sample:userguide:create" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + + <properties> + <test.property>2.8.1</test.property> + </properties> + + <dependencies> + <dependency> + <groupId>org.apache.sandesha2</groupId> + <artifactId>sandesha2-core</artifactId> + <version>${pom.version}</version> + </dependency> + <dependency> + <groupId>org.apache.sandesha2</groupId> + <artifactId>sandesha2-policy</artifactId> + <version>${pom.version}</version> + </dependency> + <dependency> + <groupId>org.apache.sandesha2</groupId> + <artifactId>sandesha2</artifactId> + <version>${pom.version}</version> + </dependency> + </dependencies> + +</project> Added: webservices/sandesha/trunk/java/modules/samples/samples.build.xml URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/samples/samples.build.xml?view=auto&rev=534564 ============================================================================== --- webservices/sandesha/trunk/java/modules/samples/samples.build.xml (added) +++ webservices/sandesha/trunk/java/modules/samples/samples.build.xml Wed May 2 10:36:15 2007 @@ -0,0 +1,48 @@ +<project> + + <target name="samples:setup"> + <mkdir dir="target/aars" /> + <mkdir dir="target/jars" /> + <mkdir dir="target/temp" /> + </target> + <target name="sample:userguide:create" depends="samples:setup"> + + <property name="dir.sample.userguide.temp" value="target/temp/userguide" /> + <property name="dir.sample.userguide.clients.temp" value="target/temp/userguideclients" /> + <property name="dir.sample.userguide.clients.temp" value="target/temp/userguideclients" /> + <property name="userguide.service.aar.name" value="RMSampleService.aar" /> + <property name="userguide.client.jar.name" value="UserguideSampleClients.jar" /> + <property name="build.samples.clients.dir" value="target/sampleClients" /> + + <mkdir dir="${dir.sample.userguide.temp}/META-INF" /> + + <copy file="src/main/resources/userguide/services.xml" todir="${dir.sample.userguide.temp}/META-INF" /> + <!-- <copy file="src/main/resources/userguide/RMSampleService.wsdl" todir="${dir.sample.userguide.temp}" /> --> + <copy todir="${dir.sample.userguide.temp}" > + <fileset dir="target/classes"> + <include name="sandesha2/samples/userguide/**/*Service*.class" /> + </fileset> + </copy> + + <mkdir dir="${dir.sample.userguide.clients.temp}" /> + <copy todir="${dir.sample.userguide.clients.temp}" > + <fileset dir="target/classes"> + <include name="sandesha2/samples/userguide/**/*Client*.class" /> + </fileset> + </copy> + + <jar jarfile="target/aars/${userguide.service.aar.name}" basedir="${dir.sample.userguide.temp}" /> + <jar jarfile="target/jars/${userguide.client.jar.name}" basedir="${dir.sample.userguide.clients.temp}" /> + + <mkdir dir="${build.samples.clients.dir}" /> + <copy todir="${build.samples.clients.dir}" > + <fileset dir="src/main/resources/userguide"> + <include name="*.bat" /> + <include name="*.sh" /> + <include name="*.html" /> + </fileset> + </copy> + + </target> + +</project> \ No newline at end of file Added: webservices/sandesha/trunk/java/modules/tests/pom.xml URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/pom.xml?view=auto&rev=534564 ============================================================================== --- webservices/sandesha/trunk/java/modules/tests/pom.xml (added) +++ webservices/sandesha/trunk/java/modules/tests/pom.xml Wed May 2 10:36:15 2007 @@ -0,0 +1,95 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <parent> + <groupId>org.apache.sandesha2</groupId> + <artifactId>sandesha2-parent</artifactId> + <version>SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>sandesha2-tests</artifactId> + <packaging>jar</packaging> + <name>Sandesha2 - Test Suite</name> + + <build> + <sourceDirectory>src/test/java</sourceDirectory> + <testSourceDirectory>src/test/java</testSourceDirectory> + <testResources> + <testResource> + <directory>test-resources</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + <include>**/*.xsl</include> + </includes> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.4</source> + <target>1.4</target> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.1</version> + <executions> + <execution> + <id>create_test_repos</id> + <phase>process-test-resources</phase> + <configuration> + <tasks> + <ant antfile="tests.build.xml" inheritAll="true" target="repo:create"> + <property name="sandesha2.version" value="${sandesha2.version}"/> + <property name="build.dir" value="${project.build.directory}"/> + <property name="local.repo" value="${settings.localRepository}"/> + <property name="addressing.version" value="${axis2.version}"/> + <property name="rampart.version" value="${rampart.version}"/> + </ant> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + + <properties> + <test.property>2.8.1</test.property> + </properties> + + <dependencies> + <dependency> + <groupId>org.apache.sandesha2</groupId> + <artifactId>sandesha2-core</artifactId> + <version>${pom.version}</version> + </dependency> + <dependency> + <groupId>org.apache.sandesha2</groupId> + <artifactId>sandesha2-policy</artifactId> + <version>${pom.version}</version> + </dependency> + <dependency> + <groupId>org.apache.sandesha2</groupId> + <artifactId>sandesha2-samples</artifactId> + <version>${pom.version}</version> + </dependency> + <dependency> + <groupId>org.apache.sandesha2</groupId> + <artifactId>sandesha2</artifactId> + <version>${pom.version}</version> + </dependency> + </dependencies> + +</project> Modified: webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java?view=diff&rev=534564&r1=534554&r2=534564 ============================================================================== --- webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java (original) +++ webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java Wed May 2 10:36:15 2007 @@ -79,7 +79,7 @@ public SandeshaTestCase(String name) { super(name); File baseDir = new File(""); - String testRource = baseDir.getAbsolutePath() + File.separator + "modules" + File.separator + "tests" + File.separator + "test-resources"; + String testRource = "target" + File.separator + "test-classes"; resourceDir = new File(testRource).getPath(); String propFileStr = resourceDir + File.separator + PROPERTY_FILE_NAME; Added: webservices/sandesha/trunk/java/modules/tests/tests.build.xml URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/tests.build.xml?view=auto&rev=534564 ============================================================================== --- webservices/sandesha/trunk/java/modules/tests/tests.build.xml (added) +++ webservices/sandesha/trunk/java/modules/tests/tests.build.xml Wed May 2 10:36:15 2007 @@ -0,0 +1,120 @@ +<project> + + <target name="repo:create" depends="test:aars:create,server:create,client:create,serialize:create,secure:create" /> + + <target name="test:aars:create"> + </target> + + <target name="server:create" > + + <property name="build.repo.dir" value="${build.dir}/repos" /> + <property name="server.dist.path" value="${build.repo.dir}/server" /> + + <property name="repo.addressing.mar" value="${local.repo}/org/apache/axis2/addressing/${addressing.version}/addressing-${addressing.version}.mar" /> + <property name="repo.rampart.mar" value="${local.repo}/org/apache/rampart/rampart/${rampart.version}/rampart-${rampart.version}.mar" /> + + <mkdir dir="${server.dist.path}" /> + <mkdir dir="${server.dist.path}/modules" /> + <mkdir dir="${server.dist.path}/services" /> + + <copy file="${basedir}/../../config/server_axis2.xml" todir="${server.dist.path}" /> + <copy file="${basedir}/../mar/target/sandesha2-${sandesha2.version}.mar" todir="${server.dist.path}/modules" /> + + <copy todir="${server.dist.path}/services" > + <fileset dir="../samples/target/aars"> + <include name="**/*.aar" /> + </fileset> + </copy> + + <!-- Copying dependent mar files --> + <copy file="${repo.addressing.mar}" toDir="${server.dist.path}/modules/" /> + <copy file="${repo.rampart.mar}" toDir="${server.dist.path}/modules/" /> + + </target> + + <target name="client:create"> + + <property name="build.repo.dir" value="${build.dir}/repos" /> + <property name="client.dist.path" value="${build.repo.dir}/client" /> + + <property name="repo.addressing.mar" value="${local.repo}/org/apache/axis2/addressing/${addressing.version}/addressing-${addressing.version}.mar" /> + <property name="repo.rampart.mar" value="${local.repo}/org/apache/rampart/rampart/${rampart.version}/rampart-${rampart.version}.mar" /> + + <mkdir dir="${client.dist.path}" /> + <mkdir dir="${client.dist.path}/modules" /> + + <copy file="${basedir}/../../config/client_axis2.xml" todir="${client.dist.path}" /> + <copy file="${basedir}/../mar/target/sandesha2-${sandesha2.version}.mar" todir="${client.dist.path}/modules" /> + + <!-- Copying dependent mar files --> + <copy file="${repo.addressing.mar}" toDir="${client.dist.path}/modules/" /> + <copy file="${repo.rampart.mar}" toDir="${client.dist.path}/modules/" /> + + </target> + + <target name="serialize:create"> + + <property name="serialize.client.path" value="${build.dir}/repos/serialize-client"/> + <property name="serialize.server.path" value="${build.dir}/repos/serialize-server"/> + + <property name="serialize.temp.path" value="${build.dir}/temp/serialize" /> + <mkdir dir="${serialize.temp.path}" /> + + <copy todir="${serialize.client.path}"> + <fileset dir="${build.dir}/repos/client"> + <exclude name="modules/sandesha2*.mar"/> + </fileset> + </copy> + + <copy todir="${serialize.server.path}"> + <fileset dir="${build.dir}/repos/server"> + <exclude name="modules/sandesha2*.mar"/> + </fileset> + </copy> + + <!-- Switch on serialization in the module.xml file --> + <unjar src="../mar/target/sandesha2-${sandesha2.version}.mar" dest="${serialize.temp.path}"/> + <replace file="${serialize.temp.path}/META-INF/module.xml" + token="&lt;!-- &lt;sandesha2:UseMessageSerialization>true&lt;/sandesha2:UseMessageSerialization> -->" + value="&lt;sandesha2:UseMessageSerialization>true&lt;/sandesha2:UseMessageSerialization>"/> + <jar jarfile="${serialize.client.path}/modules/sandesha2-UnitTest.mar" basedir="${serialize.temp.path}"/> + <jar jarfile="${serialize.server.path}/modules/sandesha2-UnitTest.mar" basedir="${serialize.temp.path}"/> + + <delete dir="${build.temp.dir}"/> + + </target> + + <target name="secure:create"> + + <property name="secure.client.path" value="${build.dir}/repos/secure-client"/> + <property name="secure.server.path" value="${build.dir}/repos/secure-server"/> + + <property name="secure.temp.path" value="${build.dir}/temp/secure" /> + <mkdir dir="${secure.temp.path}" /> + + <copy todir="${secure.client.path}"> + <fileset dir="${build.dir}/repos/client"> + <exclude name="modules/sandesha2*.mar"/> + </fileset> + </copy> + + <copy todir="${secure.server.path}"> + <fileset dir="${build.dir}/repos/server"> + <exclude name="modules/sandesha2*.mar"/> + </fileset> + </copy> + + <!-- Replace the security manager in the module.xml file --> + <unjar src="../mar/target/sandesha2-${sandesha2.version}.mar" dest="${secure.temp.path}"/> + <replace file="${secure.temp.path}/META-INF/module.xml" + token="dummy.DummySecurityManager" value="UnitTestSecurityManager"/> + <jar jarfile="${secure.client.path}/modules/sandesha2-UnitTest.mar" basedir="${secure.temp.path}"/> + <jar jarfile="${secure.server.path}/modules/sandesha2-UnitTest.mar" basedir="${secure.temp.path}"/> + + <delete dir="${build.temp.dir}"/> + + </target> + +</project> + + Modified: webservices/sandesha/trunk/java/pom.xml URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/pom.xml?view=diff&rev=534564&r1=534563&r2=534564 ============================================================================== --- webservices/sandesha/trunk/java/pom.xml (original) +++ webservices/sandesha/trunk/java/pom.xml Wed May 2 10:36:15 2007 @@ -1,82 +1,81 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.sandesha2</groupId> - <artifactId>sandesha2-parent</artifactId> - <packaging>pom</packaging> +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.sandesha2</groupId> + <artifactId>sandesha2-parent</artifactId> + <packaging>pom</packaging> <description> -Sandesha2 is an implementation of WS-ReliableMessaging specifications for Apache Axis2. By using Sandesha2 you can add reliable messaging capability to the Web services you have hosted in Axis2. You can also use Sandesha2 with Axis2 client to interact with already hosted web services in a reliable manner. Please see Sandesha2 user guide for more information on using Sandesha2. Read Sandesha2 Architecture guide to see how Sandesha2 works internally. - </description> - <version>SNAPSHOT</version> - <name>Apache Sandesha</name> - <url>http://ws.apache.org/ws-fx/sandesha/sandesha2</url> - - <licenses> - <license> - <name>Apache License Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0</url> - </license> - </licenses> - - <organization> - <name>Apache Software Foundation</name> - <url>http://www.apache.org</url> - </organization> - - <issueManagement> - <system>JIRA</system> - <url>http://issues.apache.org/jira/browse/SANDESHA2</url> +Sandesha2 is an implementation of WS-ReliableMessaging specifications for Apache Axis2. By using Sandesha2 you can add reliable messaging capability to the Web services you have hosted in Axis2. You can also use Sandesha2 with Axis2 client to interact with already hosted web services in a reliable manner. Please see Sandesha2 user guide for more information on using Sandesha2. Read Sandesha2 Architecture guide to see how Sandesha2 works internally. + </description> + <version>SNAPSHOT</version> + <name>Apache Sandesha</name> + <url>http://ws.apache.org/ws-fx/sandesha/sandesha2</url> + + <licenses> + <license> + <name>Apache License Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0</url> + </license> + </licenses> + + <organization> + <name>Apache Software Foundation</name> + <url>http://www.apache.org</url> + </organization> + + <issueManagement> + <system>JIRA</system> + <url>http://issues.apache.org/jira/browse/SANDESHA2</url> </issueManagement> - <mailingLists> - <mailingList> - <name>Sandesha Developer List</name> - <subscribe>nrice@example.net</subscribe> - <unsubscribe>nrice@example.net</unsubscribe> - <archive></archive> - </mailingList> + <mailingLists> + <mailingList> + <name>Sandesha Developer List</name> + <subscribe>nrice@example.net</subscribe> + <unsubscribe>nrice@example.net</unsubscribe> + <archive/> + </mailingList> </mailingLists> <inceptionYear>2005</inceptionYear> - - <developers> - <developer> - <name>Chamikara Jayalath</name> - <id>chamikara</id> - <email>nrice@example.net</email> - <organization>WSO2</organization> - </developer> - <developer> - <name>Davanum Srinivas</name> - <id>dims</id> - <email>nrice@example.net</email> - <organization>WSO2</organization> - </developer> - <developer> - <name>Jaliya Ekanayake</name> - <id>jaliya</id> - <email>nrice@example.net</email> - <organization>Indiana University, USA</organization> - <url>http://www.apache.org/~jaliya</url> - </developer> - <developer> - <name>Sanjiva Weerawarana</name> - <id>sanjiva</id> - <email>nrice@example.net</email> - <organization>WSO2</organization> + + <developers> + <developer> + <name>Chamikara Jayalath</name> + <id>chamikara</id> + <email>nrice@example.net</email> + <organization>WSO2</organization> + </developer> + <developer> + <name>Davanum Srinivas</name> + <id>dims</id> + <email>nrice@example.net</email> + <organization>WSO2</organization> + </developer> + <developer> + <name>Jaliya Ekanayake</name> + <id>jaliya</id> + <email>nrice@example.net</email> + <organization>Indiana University, USA</organization> + <url>http://www.apache.org/~jaliya</url> + </developer> + <developer> + <name>Sanjiva Weerawarana</name> + <id>sanjiva</id> + <email>nrice@example.net</email> + <organization>WSO2</organization> </developer> <developer> <name>Sanka Samaranayaka</name> <id>sanka</id> <email>nrice@example.net</email> <organization>WSO2</organization> - </developer> - <developer> - <name>Andrew K Gatford</name> - <id>gatfora</id> - <email>nrice@example.net</email> - <organization>IBM</organization> + </developer> + <developer> + <name>Andrew K Gatford</name> + <id>gatfora</id> + <email>nrice@example.net</email> + <organization>IBM</organization> </developer> <developer> <name>Thomas McKiernan</name> @@ -92,73 +91,6 @@ </developer> </developers> - <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/sandesha/trunk/java/</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/sandesha/trunk/java/</developerConnection> - <url>http://svn.apache.org/repos/asf/webservices/sandesha/trunk</url> - </scm> - - <repositories> - <repository> - <releases> - <enabled>false</enabled> - <updatePolicy>always</updatePolicy> - <checksumPolicy>warn</checksumPolicy> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <id>apache-snapshots</id> - <name>Apache Maven2 SNAPSHOTS</name> - <url>http://people.apache.org/repo/m2-snapshot-repository</url> - <layout>default</layout> - </repository> - <repository> - <releases> - <enabled>true</enabled> - <updatePolicy>always</updatePolicy> - <checksumPolicy>warn</checksumPolicy> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <id>apache-ws-snapshots2</id> - <name>Apache ws.zones - 2</name> - <url>http://ws.zones.apache.org/repository2</url> - </repository> - </repositories> - - <pluginRepositories> - <pluginRepository> - <id>snapshot-apache</id> - <name>Apache Snapshot repository</name> - <url>http://people.apache.org/repo/m2-snapshot-repository</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </pluginRepository> - - <pluginRepository> - <id>snapshot</id> - <name>Snapshot repository</name> - <url>http://snapshots.maven.codehaus.org/maven2</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </pluginRepository> - - </pluginRepositories> - <build> <plugins> @@ -180,8 +112,74 @@ </plugins> </build> - - <dependencies> + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/sandesha/trunk/java/</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/sandesha/trunk/java/</developerConnection> + <url>http://svn.apache.org/repos/asf/webservices/sandesha/trunk</url> + </scm> + + <repositories> + <repository> + <releases> + <enabled>false</enabled> + <updatePolicy>always</updatePolicy> + <checksumPolicy>warn</checksumPolicy> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <id>apache-snapshots</id> + <name>Apache Maven2 SNAPSHOTS</name> + <url>http://people.apache.org/repo/m2-snapshot-repository</url> + <layout>default</layout> + </repository> + <repository> + <releases> + <enabled>true</enabled> + <updatePolicy>always</updatePolicy> + <checksumPolicy>warn</checksumPolicy> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + <checksumPolicy>warn</checksumPolicy> + </snapshots> + <id>apache-ws-snapshots2</id> + <name>Apache ws.zones - 2</name> + <url>http://ws.zones.apache.org/repository2</url> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>snapshot-apache</id> + <name>Apache Snapshot repository</name> + <url>http://people.apache.org/repo/m2-snapshot-repository</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </pluginRepository> + + <pluginRepository> + <id>snapshot</id> + <name>Snapshot repository</name> + <url>http://snapshots.maven.codehaus.org/maven2</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </pluginRepository> + + </pluginRepositories> + + <dependencies> <!-- Axis2 --> <dependency> @@ -196,294 +194,297 @@ </dependency> <!-- Rampart --> - <dependency> - <groupId>org.apache.rampart</groupId> - <artifactId>rampart-core</artifactId> - <version>${rampart.version}</version> + <dependency> + <groupId>org.apache.rampart</groupId> + <artifactId>rampart-core</artifactId> + <version>${rampart.version}</version> </dependency> - <dependency> - <groupId>org.apache.rampart</groupId> + <dependency> + <groupId>org.apache.rampart</groupId> <artifactId>rampart-trust</artifactId> - <version>${rampart.version}</version> + <version>${rampart.version}</version> </dependency> - <dependency> - <groupId>org.apache.rampart</groupId> - <artifactId>rampart-policy</artifactId> - <version>${rampart.version}</version> - </dependency> - - <!-- AXIOM --> - <dependency> - <groupId>org.apache.ws.commons.axiom</groupId> - <artifactId>axiom-impl</artifactId> - <version>${axiom.version}</version> - </dependency> - <dependency> - <groupId>org.apache.ws.commons.axiom</groupId> - <artifactId>axiom-api</artifactId> - <version>${axiom.version}</version> - </dependency> - <dependency> - <groupId>org.apache.ws.commons.axiom</groupId> - <artifactId>axiom-dom</artifactId> - <version>${axiom.version}</version> - </dependency> - - <!-- Other third party dependencies --> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>${commons.logging.version}</version> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>${commons.httpclient.version}</version> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>${commons.collections.version}</version> - </dependency> - <dependency> - <groupId>commons-discovery</groupId> - <artifactId>commons-discovery</artifactId> - <version>${commons.discovery.version}</version> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>${commons.codec.version}</version> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j.version}</version> - </dependency> - <dependency> - <groupId>${stax.impl.groupid}</groupId> - <artifactId>${stax.impl.artifactid}</artifactId> - <version>${stax.impl.version}</version> - </dependency> - <dependency> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - <version>${stax.api.version}</version> - </dependency> - <dependency> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - <version>${xml.apis.version}</version> - </dependency> - <dependency> - <groupId>org.apache.woden</groupId> - <artifactId>woden</artifactId> - <version>${woden.version}</version> - </dependency> - <dependency> - <groupId>wsdl4j</groupId> - <artifactId>wsdl4j</artifactId> - <version>${wsdl4j.version}</version> - </dependency> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - <version>${javamail.version}</version> - </dependency> - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>${activation.version}</version> - </dependency> - <dependency> - <groupId>xmlbeans</groupId> - <artifactId>xbean</artifactId> - <version>${xbean.version}</version> - </dependency> - <dependency> - <groupId>org.apache.ws.security</groupId> - <artifactId>wss4j</artifactId> - <version>${wss4j.version}</version> - </dependency> - <dependency> - <groupId>xml-security</groupId> - <artifactId>xmlsec</artifactId> - <version>${xmlsec.version}</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>${jaxen.version}</version> - </dependency> - <dependency> - <groupId>backport-util-concurrent</groupId> - <artifactId>backport-util-concurrent</artifactId> - <version>${backport_util_concurrent.version}</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${servletapi.version}</version> - </dependency> - <dependency> - <groupId>org.apache.ws.commons.schema</groupId> - <artifactId>XmlSchema</artifactId> - <version>${XmlSchema.version}</version> - </dependency> - <dependency> - <groupId>annogen</groupId> - <artifactId>annogen</artifactId> - <version>${annogen.version}</version> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-nodeps</artifactId> - <version>${ant.version}</version> - </dependency> - <dependency> - <groupId>org.apache.neethi</groupId> - <artifactId>neethi</artifactId> - <version>${neethi.version}</version> - </dependency> - <dependency> - <groupId>httpcomponents-httpcore</groupId> - <artifactId>jakarta-httpcore</artifactId> - <version>${jakarta.httpcore.version}</version> - </dependency> - <dependency> - <groupId>opensaml</groupId> - <artifactId>opensaml</artifactId> - <version>${opensaml.version}</version> - </dependency> - <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - <version>${xalan.version}</version> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>${xerces.version}</version> - </dependency> - <dependency> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - <version>${xml.apis.version}</version> - </dependency> - <dependency> - <groupId>org.apache.axis2</groupId> - <artifactId>addressing</artifactId> - <type>mar</type> - <version>${addressing.mar.version}</version> - </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>${commons.fileupload.version}</version> - </dependency> - </dependencies> - - <profiles> - <profile> - <id>jdk14</id> - <activation> - <activeByDefault>true</activeByDefault> - <jdk>1.4</jdk> - </activation> - <dependencies> - <dependency> - <groupId>bouncycastle</groupId> - <artifactId>bcprov-jdk13</artifactId> - <version>${bcprov.jdk13.version}</version> - </dependency> - </dependencies> - </profile> - - <profile> - <id>jdk15</id> - <activation> - <jdk>1.5</jdk> - </activation> - <dependencies> - <dependency> - <groupId>bouncycastle</groupId> - <artifactId>bcprov-jdk15</artifactId> - <version>${bcprov.jdk15.version}</version> - </dependency> - </dependencies> - </profile> - - </profiles> - + <dependency> + <groupId>org.apache.rampart</groupId> + <artifactId>rampart-policy</artifactId> + <version>${rampart.version}</version> + </dependency> + + <!-- AXIOM --> + <dependency> + <groupId>org.apache.ws.commons.axiom</groupId> + <artifactId>axiom-impl</artifactId> + <version>${axiom.version}</version> + </dependency> + <dependency> + <groupId>org.apache.ws.commons.axiom</groupId> + <artifactId>axiom-api</artifactId> + <version>${axiom.version}</version> + </dependency> + <dependency> + <groupId>org.apache.ws.commons.axiom</groupId> + <artifactId>axiom-dom</artifactId> + <version>${axiom.version}</version> + </dependency> + + <!-- Other third party dependencies --> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${commons.logging.version}</version> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>${commons.httpclient.version}</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>${commons.collections.version}</version> + </dependency> + <dependency> + <groupId>commons-discovery</groupId> + <artifactId>commons-discovery</artifactId> + <version>${commons.discovery.version}</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>${commons.codec.version}</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4j.version}</version> + </dependency> + <dependency> + <groupId>${stax.impl.groupid}</groupId> + <artifactId>${stax.impl.artifactid}</artifactId> + <version>${stax.impl.version}</version> + </dependency> + <dependency> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + <version>${stax.api.version}</version> + </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>${xml.apis.version}</version> + </dependency> + <dependency> + <groupId>org.apache.woden</groupId> + <artifactId>woden</artifactId> + <version>${woden.version}</version> + </dependency> + <dependency> + <groupId>wsdl4j</groupId> + <artifactId>wsdl4j</artifactId> + <version>${wsdl4j.version}</version> + </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>${javamail.version}</version> + </dependency> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>${activation.version}</version> + </dependency> + <dependency> + <groupId>xmlbeans</groupId> + <artifactId>xbean</artifactId> + <version>${xbean.version}</version> + </dependency> + <dependency> + <groupId>org.apache.ws.security</groupId> + <artifactId>wss4j</artifactId> + <version>${wss4j.version}</version> + </dependency> + <dependency> + <groupId>xml-security</groupId> + <artifactId>xmlsec</artifactId> + <version>${xmlsec.version}</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + </dependency> + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>${jaxen.version}</version> + </dependency> + <dependency> + <groupId>backport-util-concurrent</groupId> + <artifactId>backport-util-concurrent</artifactId> + <version>${backport_util_concurrent.version}</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>${servletapi.version}</version> + </dependency> + <dependency> + <groupId>org.apache.ws.commons.schema</groupId> + <artifactId>XmlSchema</artifactId> + <version>${XmlSchema.version}</version> + </dependency> + <dependency> + <groupId>annogen</groupId> + <artifactId>annogen</artifactId> + <version>${annogen.version}</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-nodeps</artifactId> + <version>${ant.version}</version> + </dependency> + <dependency> + <groupId>org.apache.neethi</groupId> + <artifactId>neethi</artifactId> + <version>${neethi.version}</version> + </dependency> + <dependency> + <groupId>httpcomponents-httpcore</groupId> + <artifactId>jakarta-httpcore</artifactId> + <version>${jakarta.httpcore.version}</version> + </dependency> + <dependency> + <groupId>opensaml</groupId> + <artifactId>opensaml</artifactId> + <version>${opensaml.version}</version> + </dependency> + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <version>${xalan.version}</version> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>${xerces.version}</version> + </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>${xml.apis.version}</version> + </dependency> + <dependency> + <groupId>org.apache.axis2</groupId> + <artifactId>addressing</artifactId> + <type>mar</type> + <version>${addressing.mar.version}</version> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>${commons.fileupload.version}</version> + </dependency> + </dependencies> + + <profiles> + <profile> + <id>jdk14</id> + <activation> + <activeByDefault>true</activeByDefault> + <jdk>1.4</jdk> + </activation> + <dependencies> + <dependency> + <groupId>bouncycastle</groupId> + <artifactId>bcprov-jdk13</artifactId> + <version>${bcprov.jdk13.version}</version> + </dependency> + </dependencies> + </profile> + + <profile> + <id>jdk15</id> + <activation> + <jdk>1.5</jdk> + </activation> + <dependencies> + <dependency> + <groupId>bouncycastle</groupId> + <artifactId>bcprov-jdk15</artifactId> + <version>${bcprov.jdk15.version}</version> + </dependency> + </dependencies> + </profile> + + </profiles> + <modules> - <!--<module>modules/samples</module>--> - <module>modules/interop</module> - <module>modules/core</module> + <module>modules/samples</module> + <module>modules/interop</module> + <module>modules/core</module> <module>modules/mar</module> <module>modules/client</module> <module>modules/policy</module> + <module>modules/tests</module> <module>modules/distribution</module> - </modules> + </modules> <properties> - <rampart.version>SNAPSHOT</rampart.version> - <axis2.version>SNAPSHOT</axis2.version> - <axiom.version>SNAPSHOT</axiom.version> - <addressing.mar.version>SNAPSHOT</addressing.mar.version> - <wss4j.version>SNAPSHOT</wss4j.version> - <xmlsec.version>1.3.0</xmlsec.version> - <opensaml.version>1.1</opensaml.version> - <XmlSchema.version>SNAPSHOT</XmlSchema.version> - <neethi.version>2.0</neethi.version> - <xbean.version>2.1.0</xbean.version> - <woden.version>1.0-incubating-SNAPSHOT</woden.version> - <wsdl4j.version>1.6.1</wsdl4j.version> - <annogen.version>0.1.0</annogen.version> - <activation.version>1.1</activation.version> - <javamail.version>1.4</javamail.version> - <jaxen.version>1.1-beta-10</jaxen.version> - <stax.impl.groupid>org.codehaus.woodstox</stax.impl.groupid> - <stax.impl.artifactid>wstx-asl</stax.impl.artifactid> - <stax.impl.version>3.2.0</stax.impl.version> - <stax.api.version>1.0.1</stax.api.version> - <xml.apis.version>1.3.03</xml.apis.version> - <bcprov.jdk13.version>132</bcprov.jdk13.version> - <bcprov.jdk15.version>132</bcprov.jdk15.version> - <commons.codec.version>1.3</commons.codec.version> - <commons.httpclient.version>3.0.1</commons.httpclient.version> - <commons.logging.version>1.1</commons.logging.version> - <backport_util_concurrent.version>2.1</backport_util_concurrent.version> - <servletapi.version>2.3</servletapi.version> - <junit.version>3.8.1</junit.version> - <xmlunit.version>1.0</xmlunit.version> - <log4j.version>1.2.13</log4j.version> - <jakarta.httpcore.version>4.0-alpha3</jakarta.httpcore.version> - <commons.collections.version>3.1</commons.collections.version> - <commons.fileupload.version>1.1.1</commons.fileupload.version> - <commons.discovery.version>0.2</commons.discovery.version> - <ant.version>1.7.0</ant.version> - <xalan.version>2.7.0</xalan.version> - <xerces.version>2.8.1</xerces.version> + <sandesha2.version>SNAPSHOT</sandesha2.version> + + <rampart.version>SNAPSHOT</rampart.version> + <axis2.version>SNAPSHOT</axis2.version> + <axiom.version>SNAPSHOT</axiom.version> + <addressing.mar.version>SNAPSHOT</addressing.mar.version> + <wss4j.version>SNAPSHOT</wss4j.version> + <xmlsec.version>1.3.0</xmlsec.version> + <opensaml.version>1.1</opensaml.version> + <XmlSchema.version>SNAPSHOT</XmlSchema.version> + <neethi.version>2.0</neethi.version> + <xbean.version>2.1.0</xbean.version> + <woden.version>1.0-incubating-SNAPSHOT</woden.version> + <wsdl4j.version>1.6.1</wsdl4j.version> + <annogen.version>0.1.0</annogen.version> + <activation.version>1.1</activation.version> + <javamail.version>1.4</javamail.version> + <jaxen.version>1.1-beta-10</jaxen.version> + <stax.impl.groupid>org.codehaus.woodstox</stax.impl.groupid> + <stax.impl.artifactid>wstx-asl</stax.impl.artifactid> + <stax.impl.version>3.2.0</stax.impl.version> + <stax.api.version>1.0.1</stax.api.version> + <xml.apis.version>1.3.03</xml.apis.version> + <bcprov.jdk13.version>132</bcprov.jdk13.version> + <bcprov.jdk15.version>132</bcprov.jdk15.version> + <commons.codec.version>1.3</commons.codec.version> + <commons.httpclient.version>3.0.1</commons.httpclient.version> + <commons.logging.version>1.1</commons.logging.version> + <backport_util_concurrent.version>2.1</backport_util_concurrent.version> + <servletapi.version>2.3</servletapi.version> + <junit.version>3.8.1</junit.version> + <xmlunit.version>1.0</xmlunit.version> + <log4j.version>1.2.13</log4j.version> + <jakarta.httpcore.version>4.0-alpha3</jakarta.httpcore.version> + <commons.collections.version>3.1</commons.collections.version> + <commons.fileupload.version>1.1.1</commons.fileupload.version> + <commons.discovery.version>0.2</commons.discovery.version> + <ant.version>1.7.0</ant.version> + <xalan.version>2.7.0</xalan.version> + <xerces.version>2.8.1</xerces.version> </properties> - - <distributionManagement> - <repository> - <id>apache-repo</id> + + <distributionManagement> + <repository> + <id>apache-repo</id> <name>Maven Central Repository</name> <url>scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository</url> </repository> - <!-- - <snapshotRepository> - <id>apache-snapshots</id> - <name>Apache Development Repository</name> - <url>scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository</url> + <!-- + <snapshotRepository> + <id>apache-snapshots</id> + <name>Apache Development Repository</name> + <url>scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository</url> </snapshotRepository> - --> - </distributionManagement> - + --> + </distributionManagement> + </project> Modified: webservices/sandesha/trunk/java/project.xml URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/project.xml?view=diff&rev=534564&r1=534563&r2=534564 ============================================================================== --- webservices/sandesha/trunk/java/project.xml (original) +++ webservices/sandesha/trunk/java/project.xml Wed May 2 10:36:15 2007 @@ -83,7 +83,7 @@ <build> <nagEmailAddress>nrice@example.net</nagEmailAddress> <sourceDirectory>modules/core/src/main/java</sourceDirectory> - <unitTestSourceDirectory>modules/tests/src</unitTestSourceDirectory> + <unitTestSourceDirectory>modules/tests/src/test/java</unitTestSourceDirectory> <unitTest> <includes> --------------------------------------------------------------------- To unsubscribe, e-mail: nrice@example.net For additional commands, e-mail: nrice@example.net From nrice@example.net Wed May 02 18:55:00 2007 Return-Path: <nrice@example.net> Delivered-To: nrice@example.net Received: (qmail 18002 invoked from network); 2 May 2007 18:54:58
{'source': 'Apache Software Foundation Public Mail Archives'}