Author: bvahdat
Date: Mon Jun 4 21:17:34 2012
New Revision: 1346160
URL: http://svn.apache.org/viewvc?rev=1346160&view=rev
Log:
Polished.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java
camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleBackwardsCompatibleTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserExpressionInvalidTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserExpressionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateInvalidTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserRegexpPredicateTest.java
camel/trunk/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/IntegerPatternFormat.java
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelThreadPoolFactoryBean.java
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackException.java
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackProducer.java
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/InvalidFixedLengthTest.java
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hazelcast/HazelcastTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsBlueprintRouteTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodecTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreBlueprintRouteTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiBlueprintRouteTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/quartz/QuartzCronRouteTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/stream/StreamTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityBlueprintTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTestSupport.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java?rev=1346160&r1=1346159&r2=1346160&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java
Mon Jun 4 21:17:34 2012
@@ -17,7 +17,6 @@
package org.apache.camel.component.file.strategy;
import java.io.File;
-import java.io.IOException;
import org.apache.camel.Exchange;
import org.apache.camel.component.file.GenericFile;
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleBackwardsCompatibleTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleBackwardsCompatibleTest.java?rev=1346160&r1=1346159&r2=1346160&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleBackwardsCompatibleTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleBackwardsCompatibleTest.java
Mon Jun 4 21:17:34 2012
@@ -55,7 +55,7 @@ public class SimpleBackwardsCompatibleTe
exchange.getIn().setHeader("high", true);
exchange.getIn().setHeader("foo", 123);
- SimplePredicateParser parser = new
SimplePredicateParser("${header.high} == true and ${header.foo} == 123");
+ SimplePredicateParser parser = new
SimplePredicateParser("${header.high} == true and ${header.foo} == 123", true);
Predicate pre = parser.parsePredicate();
assertTrue("Should match", pre.matches(exchange));
@@ -66,7 +66,7 @@ public class SimpleBackwardsCompatibleTe
exchange.getIn().setHeader("high", true);
exchange.getIn().setHeader("foo", 123);
- SimplePredicateParser parser = new
SimplePredicateParser("${header.high} == false or ${header.foo} == 123");
+ SimplePredicateParser parser = new
SimplePredicateParser("${header.high} == false or ${header.foo} == 123", true);
Predicate pre = parser.parsePredicate();
assertTrue("Should match", pre.matches(exchange));
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserExpressionInvalidTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserExpressionInvalidTest.java?rev=1346160&r1=1346159&r2=1346160&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserExpressionInvalidTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserExpressionInvalidTest.java
Mon Jun 4 21:17:34 2012
@@ -25,7 +25,7 @@ import org.apache.camel.language.simple.
public class SimpleParserExpressionInvalidTest extends ExchangeTestSupport {
public void testSimpleUnbalanceFunction() throws Exception {
- SimpleExpressionParser parser = new SimpleExpressionParser("${body is
a nice day");
+ SimpleExpressionParser parser = new SimpleExpressionParser("${body is
a nice day", true);
try {
parser.parseExpression();
fail("Should thrown exception");
@@ -35,7 +35,7 @@ public class SimpleParserExpressionInval
}
public void testSimpleNestedUnbalanceFunction() throws Exception {
- SimpleExpressionParser parser = new
SimpleExpressionParser("${body${foo}");
+ SimpleExpressionParser parser = new
SimpleExpressionParser("${body${foo}", true);
try {
parser.parseExpression();
fail("Should thrown exception");
@@ -45,7 +45,7 @@ public class SimpleParserExpressionInval
}
public void testSimpleUnknownFunction() throws Exception {
- SimpleExpressionParser parser = new SimpleExpressionParser("Hello
${foo} how are you?");
+ SimpleExpressionParser parser = new SimpleExpressionParser("Hello
${foo} how are you?", true);
try {
parser.parseExpression();
fail("Should thrown exception");
@@ -55,7 +55,7 @@ public class SimpleParserExpressionInval
}
public void testSimpleNestedUnknownFunction() throws Exception {
- SimpleExpressionParser parser = new SimpleExpressionParser("Hello
${bodyAs(${foo})} how are you?");
+ SimpleExpressionParser parser = new SimpleExpressionParser("Hello
${bodyAs(${foo})} how are you?", true);
try {
// nested functions can only be syntax evaluated when evaluating
an exchange at runtime
parser.parseExpression().evaluate(exchange, String.class);
@@ -66,7 +66,7 @@ public class SimpleParserExpressionInval
}
public void testNoEndFunction() throws Exception {
- SimpleExpressionParser parser = new SimpleExpressionParser("Hello
${body");
+ SimpleExpressionParser parser = new SimpleExpressionParser("Hello
${body", true);
try {
parser.parseExpression();
fail("Should thrown exception");
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserExpressionTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserExpressionTest.java?rev=1346160&r1=1346159&r2=1346160&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserExpressionTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserExpressionTest.java
Mon Jun 4 21:17:34 2012
@@ -25,14 +25,14 @@ import org.apache.camel.Expression;
public class SimpleParserExpressionTest extends ExchangeTestSupport {
public void testSimpleParserEol() throws Exception {
- SimpleExpressionParser parser = new SimpleExpressionParser("Hello");
+ SimpleExpressionParser parser = new SimpleExpressionParser("Hello",
true);
Expression exp = parser.parseExpression();
assertEquals("Hello", exp.evaluate(exchange, String.class));
}
public void testSimpleSingleQuote() throws Exception {
- SimpleExpressionParser parser = new SimpleExpressionParser("'Hello'");
+ SimpleExpressionParser parser = new SimpleExpressionParser("'Hello'",
true);
Expression exp = parser.parseExpression();
assertEquals("'Hello'", exp.evaluate(exchange, String.class));
@@ -40,7 +40,7 @@ public class SimpleParserExpressionTest
public void testSimpleSingleQuoteWithFunction() throws Exception {
exchange.getIn().setBody("World");
- SimpleExpressionParser parser = new SimpleExpressionParser("'Hello
${body} how are you?'");
+ SimpleExpressionParser parser = new SimpleExpressionParser("'Hello
${body} how are you?'", true);
Expression exp = parser.parseExpression();
assertEquals("'Hello World how are you?'", exp.evaluate(exchange,
String.class));
@@ -48,14 +48,14 @@ public class SimpleParserExpressionTest
public void testSimpleSingleQuoteWithFunctionBodyAs() throws Exception {
exchange.getIn().setBody("World");
- SimpleExpressionParser parser = new SimpleExpressionParser("'Hello
${bodyAs(String)} how are you?'");
+ SimpleExpressionParser parser = new SimpleExpressionParser("'Hello
${bodyAs(String)} how are you?'", true);
Expression exp = parser.parseExpression();
assertEquals("'Hello World how are you?'", exp.evaluate(exchange,
String.class));
}
public void testSimpleSingleQuoteEol() throws Exception {
- SimpleExpressionParser parser = new SimpleExpressionParser("'Hello'
World");
+ SimpleExpressionParser parser = new SimpleExpressionParser("'Hello'
World", true);
Expression exp = parser.parseExpression();
assertEquals("'Hello' World", exp.evaluate(exchange, String.class));
@@ -63,21 +63,21 @@ public class SimpleParserExpressionTest
public void testSimpleFunction() throws Exception {
exchange.getIn().setBody("World");
- SimpleExpressionParser parser = new SimpleExpressionParser("${body}");
+ SimpleExpressionParser parser = new SimpleExpressionParser("${body}",
true);
Expression exp = parser.parseExpression();
assertEquals("World", exp.evaluate(exchange, String.class));
}
public void testSimpleSingleQuoteDollar() throws Exception {
- SimpleExpressionParser parser = new SimpleExpressionParser("Pay 200$
today");
+ SimpleExpressionParser parser = new SimpleExpressionParser("Pay 200$
today", true);
Expression exp = parser.parseExpression();
assertEquals("Pay 200$ today", exp.evaluate(exchange, String.class));
}
public void testSimpleSingleQuoteDollarEnd() throws Exception {
- SimpleExpressionParser parser = new SimpleExpressionParser("Pay 200$");
+ SimpleExpressionParser parser = new SimpleExpressionParser("Pay 200$",
true);
Expression exp = parser.parseExpression();
assertEquals("Pay 200$", exp.evaluate(exchange, String.class));
@@ -85,7 +85,7 @@ public class SimpleParserExpressionTest
public void testSimpleUnaryInc() throws Exception {
exchange.getIn().setBody("122");
- SimpleExpressionParser parser = new
SimpleExpressionParser("${body}++");
+ SimpleExpressionParser parser = new
SimpleExpressionParser("${body}++", true);
Expression exp = parser.parseExpression();
assertEquals("123", exp.evaluate(exchange, String.class));
@@ -93,7 +93,7 @@ public class SimpleParserExpressionTest
public void testSimpleUnaryDec() throws Exception {
exchange.getIn().setBody("122");
- SimpleExpressionParser parser = new
SimpleExpressionParser("${body}--");
+ SimpleExpressionParser parser = new
SimpleExpressionParser("${body}--", true);
Expression exp = parser.parseExpression();
assertEquals("121", exp.evaluate(exchange, String.class));
@@ -101,7 +101,7 @@ public class SimpleParserExpressionTest
public void testSimpleUnaryIncInt() throws Exception {
exchange.getIn().setBody(122);
- SimpleExpressionParser parser = new
SimpleExpressionParser("${body}++");
+ SimpleExpressionParser parser = new
SimpleExpressionParser("${body}++", true);
Expression exp = parser.parseExpression();
assertEquals(Integer.valueOf(123), exp.evaluate(exchange,
Integer.class));
@@ -109,7 +109,7 @@ public class SimpleParserExpressionTest
public void testSimpleUnaryDecInt() throws Exception {
exchange.getIn().setBody(122);
- SimpleExpressionParser parser = new
SimpleExpressionParser("${body}--");
+ SimpleExpressionParser parser = new
SimpleExpressionParser("${body}--", true);
Expression exp = parser.parseExpression();
assertEquals(Integer.valueOf(121), exp.evaluate(exchange,
Integer.class));
@@ -118,7 +118,7 @@ public class SimpleParserExpressionTest
public void testHeaderNestedFunction() throws Exception {
exchange.getIn().setBody("foo");
exchange.getIn().setHeader("foo", "abc");
- SimpleExpressionParser parser = new
SimpleExpressionParser("${header.${body}}");
+ SimpleExpressionParser parser = new
SimpleExpressionParser("${header.${body}}", true);
Expression exp = parser.parseExpression();
Object obj = exp.evaluate(exchange, Object.class);
@@ -129,7 +129,7 @@ public class SimpleParserExpressionTest
public void testBodyAsNestedFunction() throws Exception {
exchange.getIn().setBody("123");
exchange.getIn().setHeader("foo", "Integer");
- SimpleExpressionParser parser = new
SimpleExpressionParser("${bodyAs(${header.foo})}");
+ SimpleExpressionParser parser = new
SimpleExpressionParser("${bodyAs(${header.foo})}", true);
Expression exp = parser.parseExpression();
Object obj = exp.evaluate(exchange, Object.class);
@@ -143,7 +143,7 @@ public class SimpleParserExpressionTest
exchange.getIn().setHeader("foo", "Int");
exchange.getIn().setHeader("bar", "e");
exchange.getIn().setHeader("baz", "ger");
- SimpleExpressionParser parser = new
SimpleExpressionParser("${bodyAs(${header.foo}${header.bar}${header.baz})}");
+ SimpleExpressionParser parser = new
SimpleExpressionParser("${bodyAs(${header.foo}${header.bar}${header.baz})}",
true);
Expression exp = parser.parseExpression();
Object obj = exp.evaluate(exchange, Object.class);
@@ -156,7 +156,7 @@ public class SimpleParserExpressionTest
exchange.getIn().setBody("123");
exchange.getIn().setHeader("foo", "Integer");
exchange.getIn().setHeader("bar", "foo");
- SimpleExpressionParser parser = new
SimpleExpressionParser("${bodyAs(${header.${header.bar}})}");
+ SimpleExpressionParser parser = new
SimpleExpressionParser("${bodyAs(${header.${header.bar}})}", true);
Expression exp = parser.parseExpression();
Object obj = exp.evaluate(exchange, Object.class);
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateInvalidTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateInvalidTest.java?rev=1346160&r1=1346159&r2=1346160&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateInvalidTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateInvalidTest.java
Mon Jun 4 21:17:34 2012
@@ -28,7 +28,7 @@ public class SimpleParserPredicateInvali
exchange.getIn().setBody("Hello");
exchange.getIn().setHeader("high", true);
- SimplePredicateParser parser = new
SimplePredicateParser("${header.high} == abc");
+ SimplePredicateParser parser = new
SimplePredicateParser("${header.high} == abc", true);
try {
parser.parsePredicate();
fail("Should thrown exception");
@@ -41,7 +41,7 @@ public class SimpleParserPredicateInvali
exchange.getIn().setBody("Hello");
exchange.getIn().setHeader("high", true);
- SimplePredicateParser parser = new
SimplePredicateParser("${header.high} = true");
+ SimplePredicateParser parser = new
SimplePredicateParser("${header.high} = true", true);
try {
parser.parsePredicate();
fail("Should thrown exception");
@@ -53,7 +53,7 @@ public class SimpleParserPredicateInvali
public void testSimpleUnevenSingleQuote() throws Exception {
exchange.getIn().setBody("foo");
- SimplePredicateParser parser = new SimplePredicateParser("${body} ==
'foo");
+ SimplePredicateParser parser = new SimplePredicateParser("${body} ==
'foo", true);
try {
parser.parsePredicate();
fail("Should thrown exception");
@@ -65,7 +65,7 @@ public class SimpleParserPredicateInvali
public void testSimpleUnevenDoubleQuote() throws Exception {
exchange.getIn().setBody("foo");
- SimplePredicateParser parser = new SimplePredicateParser("${body} ==
\"foo");
+ SimplePredicateParser parser = new SimplePredicateParser("${body} ==
\"foo", true);
try {
parser.parsePredicate();
fail("Should thrown exception");
@@ -77,7 +77,7 @@ public class SimpleParserPredicateInvali
public void testSimpleTwoAnd() throws Exception {
exchange.getIn().setBody("foo");
- SimplePredicateParser parser = new SimplePredicateParser("${body} ==
'foo' && && ${header} == 123");
+ SimplePredicateParser parser = new SimplePredicateParser("${body} ==
'foo' && && ${header} == 123", true);
try {
parser.parsePredicate();
fail("Should thrown exception");
@@ -89,7 +89,7 @@ public class SimpleParserPredicateInvali
public void testSimpleTwoOr() throws Exception {
exchange.getIn().setBody("foo");
- SimplePredicateParser parser = new SimplePredicateParser("${body} ==
'foo' || || ${header} == 123");
+ SimplePredicateParser parser = new SimplePredicateParser("${body} ==
'foo' || || ${header} == 123", true);
try {
parser.parsePredicate();
fail("Should thrown exception");
@@ -101,7 +101,7 @@ public class SimpleParserPredicateInvali
public void testSimpleTwoEq() throws Exception {
exchange.getIn().setBody("foo");
- SimplePredicateParser parser = new SimplePredicateParser("${body} ==
== 'foo'");
+ SimplePredicateParser parser = new SimplePredicateParser("${body} ==
== 'foo'", true);
try {
parser.parsePredicate();
fail("Should thrown exception");
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateTest.java?rev=1346160&r1=1346159&r2=1346160&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateTest.java
Mon Jun 4 21:17:34 2012
@@ -27,7 +27,7 @@ public class SimpleParserPredicateTest e
public void testSimpleEq() throws Exception {
exchange.getIn().setBody("foo");
- SimplePredicateParser parser = new SimplePredicateParser("${body} ==
'foo'");
+ SimplePredicateParser parser = new SimplePredicateParser("${body} ==
'foo'", true);
Predicate pre = parser.parsePredicate();
assertTrue(pre.matches(exchange));
@@ -36,7 +36,7 @@ public class SimpleParserPredicateTest e
public void testSimpleEqNumeric() throws Exception {
exchange.getIn().setBody(123);
- SimplePredicateParser parser = new SimplePredicateParser("${body} ==
123");
+ SimplePredicateParser parser = new SimplePredicateParser("${body} ==
123", true);
Predicate pre = parser.parsePredicate();
assertTrue("Should match", pre.matches(exchange));
@@ -46,7 +46,7 @@ public class SimpleParserPredicateTest e
exchange.getIn().setBody(122);
exchange.getIn().setHeader("val", 122);
- SimplePredicateParser parser = new SimplePredicateParser("${body} ==
${header.val}");
+ SimplePredicateParser parser = new SimplePredicateParser("${body} ==
${header.val}", true);
Predicate pre = parser.parsePredicate();
assertTrue("Should match", pre.matches(exchange));
@@ -55,7 +55,7 @@ public class SimpleParserPredicateTest e
public void testSimpleEqFunctionNumeric() throws Exception {
exchange.getIn().setBody(122);
- SimplePredicateParser parser = new SimplePredicateParser("${body} ==
122");
+ SimplePredicateParser parser = new SimplePredicateParser("${body} ==
122", true);
Predicate pre = parser.parsePredicate();
assertTrue("Should match", pre.matches(exchange));
@@ -64,7 +64,7 @@ public class SimpleParserPredicateTest e
public void testSimpleGtFunctionNumeric() throws Exception {
exchange.getIn().setBody(122);
- SimplePredicateParser parser = new SimplePredicateParser("${body} >
120");
+ SimplePredicateParser parser = new SimplePredicateParser("${body} >
120", true);
Predicate pre = parser.parsePredicate();
assertTrue("Should match", pre.matches(exchange));
@@ -73,7 +73,7 @@ public class SimpleParserPredicateTest e
public void testSimpleUnaryInc() throws Exception {
exchange.getIn().setBody(122);
- SimplePredicateParser parser = new SimplePredicateParser("${body}++ ==
123");
+ SimplePredicateParser parser = new SimplePredicateParser("${body}++ ==
123", true);
Predicate pre = parser.parsePredicate();
assertTrue("Should match", pre.matches(exchange));
@@ -82,7 +82,7 @@ public class SimpleParserPredicateTest e
public void testSimpleUnaryDec() throws Exception {
exchange.getIn().setBody(122);
- SimplePredicateParser parser = new SimplePredicateParser("${body}-- ==
121");
+ SimplePredicateParser parser = new SimplePredicateParser("${body}-- ==
121", true);
Predicate pre = parser.parsePredicate();
assertTrue("Should match", pre.matches(exchange));
@@ -92,7 +92,7 @@ public class SimpleParserPredicateTest e
exchange.getIn().setBody("Hello");
exchange.getIn().setHeader("high", true);
- SimplePredicateParser parser = new
SimplePredicateParser("${header.high} == true");
+ SimplePredicateParser parser = new
SimplePredicateParser("${header.high} == true", true);
Predicate pre = parser.parsePredicate();
assertTrue("Should match", pre.matches(exchange));
@@ -102,7 +102,7 @@ public class SimpleParserPredicateTest e
exchange.getIn().setBody("Hello");
exchange.getIn().setHeader("high", true);
- SimplePredicateParser parser = new
SimplePredicateParser("${header.high} == true");
+ SimplePredicateParser parser = new
SimplePredicateParser("${header.high} == true", true);
Predicate pre = parser.parsePredicate();
assertTrue("Should match", pre.matches(exchange));
@@ -113,7 +113,7 @@ public class SimpleParserPredicateTest e
exchange.getIn().setHeader("high", true);
exchange.getIn().setHeader("foo", 123);
- SimplePredicateParser parser = new
SimplePredicateParser("${header.high} == true && ${header.foo} == 123");
+ SimplePredicateParser parser = new
SimplePredicateParser("${header.high} == true && ${header.foo} == 123", true);
Predicate pre = parser.parsePredicate();
assertTrue("Should match", pre.matches(exchange));
@@ -124,7 +124,7 @@ public class SimpleParserPredicateTest e
exchange.getIn().setHeader("high", true);
exchange.getIn().setHeader("foo", 123);
- SimplePredicateParser parser = new
SimplePredicateParser("${header.high} == false || ${header.foo} == 123");
+ SimplePredicateParser parser = new
SimplePredicateParser("${header.high} == false || ${header.foo} == 123", true);
Predicate pre = parser.parsePredicate();
assertTrue("Should match", pre.matches(exchange));
@@ -136,7 +136,7 @@ public class SimpleParserPredicateTest e
exchange.getIn().setHeader("foo", 123);
exchange.getIn().setHeader("bar", "beer");
- SimplePredicateParser parser = new
SimplePredicateParser("${header.high} == true && ${header.foo} == 123 &&
${header.bar} == 'beer'");
+ SimplePredicateParser parser = new
SimplePredicateParser("${header.high} == true && ${header.foo} == 123 &&
${header.bar} == 'beer'", true);
Predicate pre = parser.parsePredicate();
assertTrue("Should match", pre.matches(exchange));
@@ -154,7 +154,7 @@ public class SimpleParserPredicateTest e
}
}
- SimplePredicateParser parser = new
SimplePredicateParser(sb.toString());
+ SimplePredicateParser parser = new
SimplePredicateParser(sb.toString(), true);
Predicate pre = parser.parsePredicate();
assertTrue("Should match", pre.matches(exchange));
@@ -172,7 +172,7 @@ public class SimpleParserPredicateTest e
}
sb.append(" || ${body} == 'Hello'");
- SimplePredicateParser parser = new
SimplePredicateParser(sb.toString());
+ SimplePredicateParser parser = new
SimplePredicateParser(sb.toString(), true);
Predicate pre = parser.parsePredicate();
assertTrue("Should match", pre.matches(exchange));
@@ -181,7 +181,7 @@ public class SimpleParserPredicateTest e
public void testSimpleExpressionPredicate() throws Exception {
exchange.getIn().setBody("Hello");
exchange.getIn().setHeader("number", "1234");
- SimplePredicateParser parser = new
SimplePredicateParser("${in.header.number} regex '\\d{4}'");
+ SimplePredicateParser parser = new
SimplePredicateParser("${in.header.number} regex '\\d{4}'", true);
Predicate pre = parser.parsePredicate();
assertTrue("Should match", pre.matches(exchange));
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserRegexpPredicateTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserRegexpPredicateTest.java?rev=1346160&r1=1346159&r2=1346160&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserRegexpPredicateTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserRegexpPredicateTest.java
Mon Jun 4 21:17:34 2012
@@ -28,7 +28,7 @@ public class SimpleParserRegexpPredicate
public void testSimpleRegexp() throws Exception {
exchange.getIn().setBody("12.34.5678");
- SimplePredicateParser parser = new SimplePredicateParser("${body}
regex '^\\d{2}\\.\\d{2}\\.\\d{4}$'");
+ SimplePredicateParser parser = new SimplePredicateParser("${body}
regex '^\\d{2}\\.\\d{2}\\.\\d{4}$'", true);
Predicate pre = parser.parsePredicate();
assertTrue(pre.matches(exchange));
Modified:
camel/trunk/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java?rev=1346160&r1=1346159&r2=1346160&view=diff
==============================================================================
---
camel/trunk/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java
(original)
+++
camel/trunk/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java
Mon Jun 4 21:17:34 2012
@@ -163,7 +163,7 @@ public class BeanIODataFormat extends Se
@Override
public void invalidRecord(InvalidRecordException ex) throws
Exception {
- LOG.warn(LOG_PREFIX + ex.getMessage() + ": " +
ex.getContext().getRecordText());
+ LOG.warn(LOG_PREFIX + ex.getMessage() + ": " +
ex.getRecordContext().getRecordText());
if (!ignoreInvalidRecords) {
throw ex;
@@ -172,7 +172,7 @@ public class BeanIODataFormat extends Se
@Override
public void unexpectedRecord(UnexpectedRecordException ex) throws
Exception {
- LOG.warn(LOG_PREFIX + ex.getMessage() + ": " +
ex.getContext().getRecordText());
+ LOG.warn(LOG_PREFIX + ex.getMessage() + ": " +
ex.getRecordContext().getRecordText());
if (!ignoreUnexpectedRecords) {
throw ex;
@@ -181,7 +181,7 @@ public class BeanIODataFormat extends Se
@Override
public void unidentifiedRecord(UnidentifiedRecordException ex)
throws Exception {
- LOG.warn(LOG_PREFIX + ex.getMessage() + ": " +
ex.getContext().getRecordText());
+ LOG.warn(LOG_PREFIX + ex.getMessage() + ": " +
ex.getRecordContext().getRecordText());
if (!ignoreUnidentifiedRecords) {
throw ex;
Modified:
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/IntegerPatternFormat.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/IntegerPatternFormat.java?rev=1346160&r1=1346159&r2=1346160&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/IntegerPatternFormat.java
(original)
+++
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/IntegerPatternFormat.java
Mon Jun 4 21:17:34 2012
@@ -16,7 +16,6 @@
*/
package org.apache.camel.dataformat.bindy.format;
-import java.text.NumberFormat;
import java.util.Locale;
public class IntegerPatternFormat extends NumberPatternFormat<Integer> {
Modified:
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java?rev=1346160&r1=1346159&r2=1346160&view=diff
==============================================================================
---
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
(original)
+++
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
Mon Jun 4 21:17:34 2012
@@ -23,7 +23,6 @@ import javax.xml.bind.annotation.XmlTran
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
-import org.apache.camel.NoSuchBeanException;
import org.apache.camel.model.IdentifiedType;
@XmlAccessorType(XmlAccessType.FIELD)
Modified:
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelThreadPoolFactoryBean.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelThreadPoolFactoryBean.java?rev=1346160&r1=1346159&r2=1346160&view=diff
==============================================================================
---
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelThreadPoolFactoryBean.java
(original)
+++
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelThreadPoolFactoryBean.java
Mon Jun 4 21:17:34 2012
@@ -23,7 +23,6 @@ import javax.xml.bind.annotation.XmlAcce
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.camel.CamelContext;
import org.apache.camel.ThreadPoolRejectedPolicy;
import org.apache.camel.builder.ThreadPoolProfileBuilder;
import org.apache.camel.builder.xml.TimeUnitAdapter;
Modified:
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackException.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackException.java?rev=1346160&r1=1346159&r2=1346160&view=diff
==============================================================================
---
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackException.java
(original)
+++
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackException.java
Mon Jun 4 21:17:34 2012
@@ -27,6 +27,7 @@ import org.apache.camel.Exchange;
*/
public class FlatpackException extends CamelExchangeException {
+ private static final long serialVersionUID = 1L;
private final List<DataError> errors;
public FlatpackException(String message, Exchange exchange,
List<DataError> errors) {
Modified:
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackProducer.java?rev=1346160&r1=1346159&r2=1346160&view=diff
==============================================================================
---
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackProducer.java
(original)
+++
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackProducer.java
Mon Jun 4 21:17:34 2012
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.flatpack;
-import net.sf.flatpack.DataError;
import net.sf.flatpack.DataSet;
import net.sf.flatpack.Parser;
import org.apache.camel.Exchange;
Modified:
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/InvalidFixedLengthTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/InvalidFixedLengthTest.java?rev=1346160&r1=1346159&r2=1346160&view=diff
==============================================================================
---
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/InvalidFixedLengthTest.java
(original)
+++
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/InvalidFixedLengthTest.java
Mon Jun 4 21:17:34 2012
@@ -20,8 +20,6 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.test.context.ContextConfiguration;
import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
import org.springframework.util.Assert;
@@ -31,7 +29,6 @@ import org.springframework.util.Assert;
*/
@ContextConfiguration
public class InvalidFixedLengthTest extends AbstractJUnit4SpringContextTests {
- private static final transient Logger LOG =
LoggerFactory.getLogger(FixedLengthTest.class);
@EndpointInject(uri = "mock:results")
protected MockEndpoint results;
Modified:
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java?rev=1346160&r1=1346159&r2=1346160&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
(original)
+++
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
Mon Jun 4 21:17:34 2012
@@ -18,7 +18,6 @@ package org.apache.camel.component.jetty
import java.io.IOException;
import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java?rev=1346160&r1=1346159&r2=1346160&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
Mon Jun 4 21:17:34 2012
@@ -16,8 +16,6 @@
*/
package org.apache.camel.itest.osgi;
import java.io.File;
-import java.io.IOException;
-import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hazelcast/HazelcastTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hazelcast/HazelcastTest.java?rev=1346160&r1=1346159&r2=1346160&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hazelcast/HazelcastTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hazelcast/HazelcastTest.java
Mon Jun 4 21:17:34 2012
@@ -25,7 +25,6 @@ import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import static org.ops4j.pax.exam.CoreOptions.scanFeatures;
import static org.ops4j.pax.exam.OptionUtils.combine;
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsBlueprintRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsBlueprintRouteTest.java?rev=1346160&r1=1346159&r2=1346160&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsBlueprintRouteTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsBlueprintRouteTest.java
Mon Jun 4 21:17:34 2012
@@ -16,15 +16,12 @@
*/
package org.apache.camel.itest.osgi.hdfs;
-import java.io.File;
-import java.io.InputStream;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.osgi.blueprint.OSGiBlueprintTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Customizer;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@@ -32,7 +29,6 @@ import org.osgi.framework.Constants;
import static org.ops4j.pax.exam.CoreOptions.provision;
import static org.ops4j.pax.exam.OptionUtils.combine;
-import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.modifyBundle;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
@RunWith(JUnit4TestRunner.class)
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodecTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodecTest.java?rev=1346160&r1=1346159&r2=1346160&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodecTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodecTest.java
Mon Jun 4 21:17:34 2012
@@ -27,7 +27,6 @@ import org.ops4j.pax.exam.junit.Configur
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import
org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
-import static org.ops4j.pax.exam.CoreOptions.scanFeatures;
import static org.ops4j.pax.exam.OptionUtils.combine;
@RunWith(JUnit4TestRunner.class)
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreBlueprintRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreBlueprintRouteTest.java?rev=1346160&r1=1346159&r2=1346160&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreBlueprintRouteTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreBlueprintRouteTest.java
Mon Jun 4 21:17:34 2012
@@ -17,7 +17,6 @@
package org.apache.camel.itest.osgi.jclouds;
-import java.io.InputStream;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.jclouds.JcloudsConstants;
@@ -28,7 +27,6 @@ import org.jclouds.blobstore.BlobStoreCo
import org.jclouds.blobstore.BlobStoreContextFactory;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Customizer;
import org.ops4j.pax.exam.Inject;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.Configuration;
@@ -39,7 +37,6 @@ import static org.ops4j.pax.exam.CoreOpt
import static org.ops4j.pax.exam.CoreOptions.provision;
import static org.ops4j.pax.exam.CoreOptions.workingDirectory;
import static org.ops4j.pax.exam.OptionUtils.combine;
-import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.modifyBundle;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
@RunWith(JUnit4TestRunner.class)
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java?rev=1346160&r1=1346159&r2=1346160&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java
Mon Jun 4 21:17:34 2012
@@ -26,12 +26,10 @@ import org.ops4j.pax.exam.junit.JUnit4Te
import org.ops4j.pax.swissbox.tinybundles.dp.Constants;
import static org.ops4j.pax.exam.CoreOptions.provision;
-import static org.ops4j.pax.exam.CoreOptions.scanFeatures;
import static org.ops4j.pax.exam.OptionUtils.combine;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
@RunWith(JUnit4TestRunner.class)
-//@Ignore("TODO: fix me")
public class OSGiMulitJettyCamelContextsTest extends
OSGiIntegrationTestSupport {
@Test
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiBlueprintRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiBlueprintRouteTest.java?rev=1346160&r1=1346159&r2=1346160&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiBlueprintRouteTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiBlueprintRouteTest.java
Mon Jun 4 21:17:34 2012
@@ -16,8 +16,6 @@
*/
package org.apache.camel.itest.osgi.krati;
-import java.io.InputStream;
-
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.krati.KratiConstants;
@@ -25,7 +23,6 @@ import org.apache.camel.component.mock.M
import org.apache.camel.itest.osgi.blueprint.OSGiBlueprintTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Customizer;
import org.ops4j.pax.exam.Inject;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.Configuration;
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/quartz/QuartzCronRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/quartz/QuartzCronRouteTest.java?rev=1346160&r1=1346159&r2=1346160&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/quartz/QuartzCronRouteTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/quartz/QuartzCronRouteTest.java
Mon Jun 4 21:17:34 2012
@@ -25,7 +25,6 @@ import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import static org.ops4j.pax.exam.CoreOptions.scanFeatures;
import static org.ops4j.pax.exam.OptionUtils.combine;
@RunWith(JUnit4TestRunner.class)
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/stream/StreamTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/stream/StreamTest.java?rev=1346160&r1=1346159&r2=1346160&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/stream/StreamTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/stream/StreamTest.java
Mon Jun 4 21:17:34 2012
@@ -24,7 +24,6 @@ import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import static org.ops4j.pax.exam.CoreOptions.scanFeatures;
import static org.ops4j.pax.exam.OptionUtils.combine;
@RunWith(JUnit4TestRunner.class)
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityBlueprintTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityBlueprintTest.java?rev=1346160&r1=1346159&r2=1346160&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityBlueprintTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityBlueprintTest.java
Mon Jun 4 21:17:34 2012
@@ -30,7 +30,6 @@ import org.ops4j.pax.exam.junit.Configur
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.osgi.framework.Constants;
-import static org.ops4j.pax.exam.CoreOptions.scanFeatures;
import static org.ops4j.pax.exam.OptionUtils.combine;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.withBnd;
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityTest.java?rev=1346160&r1=1346159&r2=1346160&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityTest.java
Mon Jun 4 21:17:34 2012
@@ -28,7 +28,6 @@ import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import static org.ops4j.pax.exam.CoreOptions.scanFeatures;
import static org.ops4j.pax.exam.OptionUtils.combine;
@RunWith(JUnit4TestRunner.class)
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java?rev=1346160&r1=1346159&r2=1346160&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java
Mon Jun 4 21:17:34 2012
@@ -17,14 +17,12 @@
package org.apache.camel.itest.osgi.xstream;
-import java.io.InputStream;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.osgi.blueprint.OSGiBlueprintTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Customizer;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@@ -33,7 +31,6 @@ import org.osgi.framework.Constants;
import static org.ops4j.pax.exam.CoreOptions.provision;
import static org.ops4j.pax.exam.OptionUtils.combine;
-import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.modifyBundle;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
@RunWith(JUnit4TestRunner.class)
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTestSupport.java?rev=1346160&r1=1346159&r2=1346160&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTestSupport.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTestSupport.java
Mon Jun 4 21:17:34 2012
@@ -58,7 +58,6 @@ import org.ops4j.pax.exam.junit.Configur
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.ops4j.pax.exam.CoreOptions.scanFeatures;
import static org.ops4j.pax.exam.OptionUtils.combine;
