Return-Path: Delivered-To: apmail-camel-commits-archive@www.apache.org Received: (qmail 66896 invoked from network); 4 Aug 2009 13:49:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Aug 2009 13:49:45 -0000 Received: (qmail 58566 invoked by uid 500); 4 Aug 2009 13:49:50 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 58516 invoked by uid 500); 4 Aug 2009 13:49:50 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 58487 invoked by uid 99); 4 Aug 2009 13:49:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Aug 2009 13:49:46 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Tue, 04 Aug 2009 13:49:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A15C42388849; Tue, 4 Aug 2009 13:49:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r800788 - in /camel/branches/camel-1.x: ./ components/camel-sql/src/test/java/org/apache/camel/component/sql/ components/camel-xstream/ Date: Tue, 04 Aug 2009 13:49:19 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090804134919.A15C42388849@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: davsclaus Date: Tue Aug 4 13:49:19 2009 New Revision: 800788 URL: http://svn.apache.org/viewvc?rev=800788&view=rev Log: Merged revisions 800785 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r800785 | davsclaus | 2009-08-04 15:47:05 +0200 (Tue, 04 Aug 2009) | 1 line CAMEL-1876: Removed GPL from files so ohloh not mistakenly think Camel depends on GPL .jars ........ Modified: camel/branches/camel-1.x/ (props changed) camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlPreserveHeaderTest.java camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java camel/branches/camel-1.x/components/camel-xstream/pom.xml Propchange: camel/branches/camel-1.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 4 13:49:19 2009 @@ -1 +1 @@ -/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781 923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368,794550,794967,795790,798027,798052,798063,798489,798864,799252,800340 +/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781 923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368,794550,794967,795790,798027,798052,798063,798489,798864,799252,800340,800785 Propchange: camel/branches/camel-1.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java?rev=800788&r1=800787&r2=800788&view=diff ============================================================================== --- camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java (original) +++ camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java Tue Aug 4 13:49:19 2009 @@ -52,9 +52,9 @@ // send the query to direct that will route it to the sql where we will execute the query // and bind the parameters with the data from the body. The body only contains one value - // in this case (GPL) but if we should use multi values then the body will be iterated + // in this case (XXX) but if we should use multi values then the body will be iterated // so we could supply a List instead containing each binding value. - template.sendBody("direct:simple", "GPL"); + template.sendBody("direct:simple", "XXX"); mock.assertIsSatisfied(); @@ -80,7 +80,7 @@ + "project varchar(10), license varchar(5))"); jdbcTemplate.execute("insert into projects values (1, 'Camel', 'ASF')"); jdbcTemplate.execute("insert into projects values (2, 'AMQ', 'ASF')"); - jdbcTemplate.execute("insert into projects values (3, 'Linux', 'GPL')"); + jdbcTemplate.execute("insert into projects values (3, 'Linux', 'XXX')"); // END SNIPPET: e2 } Modified: camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlPreserveHeaderTest.java URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlPreserveHeaderTest.java?rev=800788&r1=800787&r2=800788&view=diff ============================================================================== --- camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlPreserveHeaderTest.java (original) +++ camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlPreserveHeaderTest.java Tue Aug 4 13:49:19 2009 @@ -54,7 +54,7 @@ + "project varchar(10), license varchar(5))"); jdbcTemplate.execute("insert into projects values (1, 'Camel', 'ASF')"); jdbcTemplate.execute("insert into projects values (2, 'AMQ', 'ASF')"); - jdbcTemplate.execute("insert into projects values (3, 'Linux', 'GPL')"); + jdbcTemplate.execute("insert into projects values (3, 'Linux', 'XXX')"); } protected void tearDown() throws Exception { Modified: camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java?rev=800788&r1=800787&r2=800788&view=diff ============================================================================== --- camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java (original) +++ camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java Tue Aug 4 13:49:19 2009 @@ -46,7 +46,7 @@ public void testSimpleBody() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); - template.sendBody("direct:simple", "GPL"); + template.sendBody("direct:simple", "XXX"); mock.assertIsSatisfied(); List received = assertIsInstanceOf(List.class, mock.getReceivedExchanges().get(0).getIn().getBody()); Map row = assertIsInstanceOf(Map.class, received.get(0)); @@ -152,7 +152,7 @@ + "project varchar(10), license varchar(5))"); jdbcTemplate.execute("insert into projects values (1, 'Camel', 'ASF')"); jdbcTemplate.execute("insert into projects values (2, 'AMQ', 'ASF')"); - jdbcTemplate.execute("insert into projects values (3, 'Linux', 'GPL')"); + jdbcTemplate.execute("insert into projects values (3, 'Linux', 'XXX')"); } protected void tearDown() throws Exception { Modified: camel/branches/camel-1.x/components/camel-xstream/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-xstream/pom.xml?rev=800788&r1=800787&r2=800788&view=diff ============================================================================== --- camel/branches/camel-1.x/components/camel-xstream/pom.xml (original) +++ camel/branches/camel-1.x/components/camel-xstream/pom.xml Tue Aug 4 13:49:19 2009 @@ -47,8 +47,7 @@ xstream - + xom xom