Return-Path: X-Original-To: apmail-axis-java-commits-archive@minotaur.apache.org Delivered-To: apmail-axis-java-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 81789498A for ; Wed, 15 Jun 2011 19:52:31 +0000 (UTC) Received: (qmail 44339 invoked by uid 500); 15 Jun 2011 19:52:31 -0000 Delivered-To: apmail-axis-java-commits-archive@axis.apache.org Received: (qmail 44321 invoked by uid 500); 15 Jun 2011 19:52:31 -0000 Mailing-List: contact java-commits-help@axis.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: java-dev@axis.apache.org Delivered-To: mailing list java-commits@axis.apache.org Received: (qmail 44314 invoked by uid 99); 15 Jun 2011 19:52:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Jun 2011 19:52:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Jun 2011 19:52:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 89C1223889E1; Wed, 15 Jun 2011 19:52:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1136161 - in /axis/axis2/java/core/branches/1_6: ./ modules/samples/quickstartadb/README.txt modules/samples/quickstartadb/build.xml modules/samples/quickstartaxiom/build.xml Date: Wed, 15 Jun 2011 19:52:07 -0000 To: java-commits@axis.apache.org From: veithen@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110615195207.89C1223889E1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: veithen Date: Wed Jun 15 19:52:07 2011 New Revision: 1136161 URL: http://svn.apache.org/viewvc?rev=1136161&view=rev Log: Merged some fixes for the samples to the 1.6 branch. Modified: axis/axis2/java/core/branches/1_6/ (props changed) axis/axis2/java/core/branches/1_6/modules/samples/quickstartadb/README.txt axis/axis2/java/core/branches/1_6/modules/samples/quickstartadb/build.xml axis/axis2/java/core/branches/1_6/modules/samples/quickstartaxiom/build.xml Propchange: axis/axis2/java/core/branches/1_6/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jun 15 19:52:07 2011 @@ -1 +1 @@ -/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085514,1087073,1088239,1088248-1088249,1088251,1088268,1091178,1091191,1099385,1099389,1100628,1101037,1103013,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616 +/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085514,1087073,1088239,1088248-1088249,1088251,1088268,1091178,1091191,1099385,1099389,1100628,1101037,1103013,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159 Modified: axis/axis2/java/core/branches/1_6/modules/samples/quickstartadb/README.txt URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/quickstartadb/README.txt?rev=1136161&r1=1136160&r2=1136161&view=diff ============================================================================== --- axis/axis2/java/core/branches/1_6/modules/samples/quickstartadb/README.txt (original) +++ axis/axis2/java/core/branches/1_6/modules/samples/quickstartadb/README.txt Wed Jun 15 19:52:07 2011 @@ -1,7 +1,7 @@ Axis2 Quick Start Guide- Sample 2 (ADB) ====================================== -This sample contains source code for the xdocs/1_1/quickstartguide.html document found in +This sample contains source code for the site/docs/quickstartguide.html document found in the extracted Axis2 Documents Distribution. For a more detailed description on the source code kindly see this 'Axis2 Quick Start Guide' document. Modified: axis/axis2/java/core/branches/1_6/modules/samples/quickstartadb/build.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/quickstartadb/build.xml?rev=1136161&r1=1136160&r2=1136161&view=diff ============================================================================== --- axis/axis2/java/core/branches/1_6/modules/samples/quickstartadb/build.xml (original) +++ axis/axis2/java/core/branches/1_6/modules/samples/quickstartadb/build.xml Wed Jun 15 19:52:07 2011 @@ -109,7 +109,7 @@ - + Modified: axis/axis2/java/core/branches/1_6/modules/samples/quickstartaxiom/build.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/quickstartaxiom/build.xml?rev=1136161&r1=1136160&r2=1136161&view=diff ============================================================================== --- axis/axis2/java/core/branches/1_6/modules/samples/quickstartaxiom/build.xml (original) +++ axis/axis2/java/core/branches/1_6/modules/samples/quickstartaxiom/build.xml Wed Jun 15 19:52:07 2011 @@ -67,7 +67,7 @@ - +