You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2010/07/30 11:06:45 UTC
svn commit: r980691 - in /camel/branches/camel-1.x: ./
components/camel-josql/
components/camel-josql/src/main/java/org/apache/camel/language/
components/camel-josql/src/main/java/org/apache/camel/language/sql/
components/camel-josql/src/main/resources...
Author: ningjiang
Date: Fri Jul 30 09:06:44 2010
New Revision: 980691
URL: http://svn.apache.org/viewvc?rev=980691&view=rev
Log:
Merged revisions 980675,980677 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r980675 | ningjiang | 2010-07-30 16:22:09 +0800 (Fri, 30 Jul 2010) | 1 line
CAMEL-3014 camel-josql should have SQL language META-INF which can be found automatically by camel-core
........
r980677 | ningjiang | 2010-07-30 16:28:37 +0800 (Fri, 30 Jul 2010) | 1 line
CAMEL-3014 add test resouces files
........
Added:
camel/branches/camel-1.x/components/camel-josql/src/main/java/org/apache/camel/language/
- copied from r980677, camel/trunk/components/camel-josql/src/main/java/org/apache/camel/language/
camel/branches/camel-1.x/components/camel-josql/src/main/java/org/apache/camel/language/sql/
- copied from r980677, camel/trunk/components/camel-josql/src/main/java/org/apache/camel/language/sql/
camel/branches/camel-1.x/components/camel-josql/src/main/java/org/apache/camel/language/sql/SqlLanguage.java
- copied, changed from r980677, camel/trunk/components/camel-josql/src/main/java/org/apache/camel/language/sql/SqlLanguage.java
camel/branches/camel-1.x/components/camel-josql/src/main/resources/META-INF/services/
- copied from r980677, camel/trunk/components/camel-josql/src/main/resources/META-INF/services/
camel/branches/camel-1.x/components/camel-josql/src/main/resources/META-INF/services/org/
- copied from r980677, camel/trunk/components/camel-josql/src/main/resources/META-INF/services/org/
camel/branches/camel-1.x/components/camel-josql/src/main/resources/META-INF/services/org/apache/
- copied from r980677, camel/trunk/components/camel-josql/src/main/resources/META-INF/services/org/apache/
camel/branches/camel-1.x/components/camel-josql/src/main/resources/META-INF/services/org/apache/camel/
- copied from r980677, camel/trunk/components/camel-josql/src/main/resources/META-INF/services/org/apache/camel/
camel/branches/camel-1.x/components/camel-josql/src/main/resources/META-INF/services/org/apache/camel/language/
- copied from r980677, camel/trunk/components/camel-josql/src/main/resources/META-INF/services/org/apache/camel/language/
camel/branches/camel-1.x/components/camel-josql/src/main/resources/META-INF/services/org/apache/camel/language/sql
- copied unchanged from r980677, camel/trunk/components/camel-josql/src/main/resources/META-INF/services/org/apache/camel/language/sql
camel/branches/camel-1.x/components/camel-josql/src/test/java/org/apache/camel/lanaguage/
- copied from r980677, camel/trunk/components/camel-josql/src/test/java/org/apache/camel/lanaguage/
camel/branches/camel-1.x/components/camel-josql/src/test/java/org/apache/camel/lanaguage/sql/
- copied from r980677, camel/trunk/components/camel-josql/src/test/java/org/apache/camel/lanaguage/sql/
camel/branches/camel-1.x/components/camel-josql/src/test/java/org/apache/camel/lanaguage/sql/SqlLanguageTest.java
- copied, changed from r980677, camel/trunk/components/camel-josql/src/test/java/org/apache/camel/lanaguage/sql/SqlLanguageTest.java
camel/branches/camel-1.x/components/camel-josql/src/test/resources/
- copied from r980677, camel/trunk/components/camel-josql/src/test/resources/
camel/branches/camel-1.x/components/camel-josql/src/test/resources/log4j.properties
- copied unchanged from r980677, camel/trunk/components/camel-josql/src/test/resources/log4j.properties
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/components/camel-josql/pom.xml
camel/branches/camel-1.x/components/camel-josql/src/test/java/org/apache/camel/builder/sql/SqlTest.java
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 30 09:06:44 2010
@@ -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,800785,800797,801084,801196,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744,818747,819475,819956,820152,820168,821272,821290,822655,823013,823018,823031,823102,823177,823575,824218,824721,825760,825765,828288,828333,832647,833285,833289,833350,833370,833381,833419,835511,880655,880667,883713,884525,884750,885876,887196,895119,896772,898201,901634,902688,903638,903970,904365,904440,904442,905171,905241,905585,905883,906013,906068,906342,908925,909028,916096,924119,925739,937165,938778,941148,943394,949109
+/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,800797,801084,801196,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744,818747,819475,819956,820152,820168,821272,821290,822655,823013,823018,823031,823102,823177,823575,824218,824721,825760,825765,828288,828333,832647,833285,833289,833350,833370,833381,833419,835511,880655,880667,883713,884525,884750,885876,887196,895119,896772,898201,901634,902688,903638,903970,904365,904440,904442,905171,905241,905585,905883,906013,906068,906342,908925,909028,916096,924119,925739,937165,938778,941148,943394,949109,980675-980677
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-1.x/components/camel-josql/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-josql/pom.xml?rev=980691&r1=980690&r2=980691&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-josql/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-josql/pom.xml Fri Jul 30 09:06:44 2010
@@ -67,7 +67,13 @@
<dependency>
<groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
+ <artifactId>commons-logging</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
Copied: camel/branches/camel-1.x/components/camel-josql/src/main/java/org/apache/camel/language/sql/SqlLanguage.java (from r980677, camel/trunk/components/camel-josql/src/main/java/org/apache/camel/language/sql/SqlLanguage.java)
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-josql/src/main/java/org/apache/camel/language/sql/SqlLanguage.java?p2=camel/branches/camel-1.x/components/camel-josql/src/main/java/org/apache/camel/language/sql/SqlLanguage.java&p1=camel/trunk/components/camel-josql/src/main/java/org/apache/camel/language/sql/SqlLanguage.java&r1=980677&r2=980691&rev=980691&view=diff
==============================================================================
--- camel/trunk/components/camel-josql/src/main/java/org/apache/camel/language/sql/SqlLanguage.java (original)
+++ camel/branches/camel-1.x/components/camel-josql/src/main/java/org/apache/camel/language/sql/SqlLanguage.java Fri Jul 30 09:06:44 2010
@@ -19,7 +19,6 @@ package org.apache.camel.language.sql;
import javax.xml.namespace.QName;
import org.apache.camel.Expression;
-import org.apache.camel.IsSingleton;
import org.apache.camel.Predicate;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.sql.SqlBuilder;
@@ -32,7 +31,7 @@ import org.josql.QueryParseException;
*
* @version $Revision$
*/
-public class SqlLanguage implements Language, IsSingleton {
+public class SqlLanguage implements Language {
public Predicate createPredicate(String expression) {
try {
@@ -55,7 +54,4 @@ public class SqlLanguage implements Lang
}
}
- public boolean isSingleton() {
- return false;
- }
}
Modified: camel/branches/camel-1.x/components/camel-josql/src/test/java/org/apache/camel/builder/sql/SqlTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-josql/src/test/java/org/apache/camel/builder/sql/SqlTest.java?rev=980691&r1=980690&r2=980691&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-josql/src/test/java/org/apache/camel/builder/sql/SqlTest.java (original)
+++ camel/branches/camel-1.x/components/camel-josql/src/test/java/org/apache/camel/builder/sql/SqlTest.java Fri Jul 30 09:06:44 2010
@@ -19,10 +19,10 @@ package org.apache.camel.builder.sql;
import java.util.List;
import org.apache.camel.CamelContext;
+import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Message;
-import org.apache.camel.TestSupport;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.DefaultExchange;
@@ -31,9 +31,9 @@ import static org.apache.camel.builder.s
/**
* @version $Revision$
*/
-public class SqlTest extends TestSupport {
+public class SqlTest extends ContextTestSupport {
- protected CamelContext context = new DefaultCamelContext();
+ //protected CamelContext context = new DefaultCamelContext();
protected Exchange exchange;
public void testExpression() throws Exception {
@@ -74,6 +74,7 @@ public class SqlTest extends TestSupport
}
protected void setUp() throws Exception {
+ super.setUp();
exchange = createExchange();
}
Copied: camel/branches/camel-1.x/components/camel-josql/src/test/java/org/apache/camel/lanaguage/sql/SqlLanguageTest.java (from r980677, camel/trunk/components/camel-josql/src/test/java/org/apache/camel/lanaguage/sql/SqlLanguageTest.java)
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-josql/src/test/java/org/apache/camel/lanaguage/sql/SqlLanguageTest.java?p2=camel/branches/camel-1.x/components/camel-josql/src/test/java/org/apache/camel/lanaguage/sql/SqlLanguageTest.java&p1=camel/trunk/components/camel-josql/src/test/java/org/apache/camel/lanaguage/sql/SqlLanguageTest.java&r1=980677&r2=980691&rev=980691&view=diff
==============================================================================
--- camel/trunk/components/camel-josql/src/test/java/org/apache/camel/lanaguage/sql/SqlLanguageTest.java (original)
+++ camel/branches/camel-1.x/components/camel-josql/src/test/java/org/apache/camel/lanaguage/sql/SqlLanguageTest.java Fri Jul 30 09:06:44 2010
@@ -22,19 +22,18 @@ import org.apache.camel.Expression;
import org.apache.camel.builder.sql.Person;
import org.apache.camel.builder.sql.SqlTest;
import org.apache.camel.spi.Language;
-import org.junit.Test;
/**
* @version $Revision$
*/
public class SqlLanguageTest extends SqlTest {
- @Test
public void testExpression() throws Exception {
Language language = assertResolveLanguage(getLanguageName());
Expression expression = language.createExpression("SELECT * FROM org.apache.camel.builder.sql.Person where city = 'London'");
- List value = expression.evaluate(exchange, List.class);
+ Object value = expression.evaluate(exchange);
+ assertIsInstanceOf(List.class, value);
List list = (List)value;
assertEquals("List size", 2, list.size());
@@ -45,13 +44,12 @@ public class SqlLanguageTest extends Sql
}
@SuppressWarnings("unchecked")
- @Test
public void testExpressionWithHeaderVariable() throws Exception {
Language language = assertResolveLanguage(getLanguageName());
Expression expression = language.createExpression("SELECT * FROM org.apache.camel.builder.sql.Person where name = :fooHeader");
- List value = expression.evaluate(exchange, List.class);
-
+ Object value = expression.evaluate(exchange);
+ assertIsInstanceOf(List.class, value);
List<Person> list = (List<Person>)value;
assertEquals("List size", 1, list.size());
@@ -62,14 +60,12 @@ public class SqlLanguageTest extends Sql
}
}
- @Test
public void testPredicates() throws Exception {
Language language = assertResolveLanguage(getLanguageName());
assertPredicate(language.createPredicate("SELECT * FROM org.apache.camel.builder.sql.Person where city = 'London'"), exchange, true);
assertPredicate(language.createPredicate("SELECT * FROM org.apache.camel.builder.sql.Person where city = 'Manchester'"), exchange, false);
}
- @Test
public void testPredicateWithHeaderVariable() throws Exception {
Language language = assertResolveLanguage(getLanguageName());
assertPredicate(language.createPredicate("SELECT * FROM org.apache.camel.builder.sql.Person where name = :fooHeader"), exchange, true);