You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/07/24 15:55:57 UTC
svn commit: r797459 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/component/file/
camel-core/src/main/java/org/apache/camel/component/file/strategy/
camel-core/src/main/java/org/apache/c...
Author: davsclaus
Date: Fri Jul 24 13:55:56 2009
New Revision: 797459
URL: http://svn.apache.org/viewvc?rev=797459&view=rev
Log:
Fixed some sonartype reportings. Removed xsddoc as it just get outdated on the apache site.
Removed:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/NoRouteBuilder.java
camel/trunk/tooling/camel-xsddoc/
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileBinding.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileBinding.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileExpressionRenamer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameExclusiveReadLockStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyFilterTest.java
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/AnyLanguageFilterTest.java
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/BeanShellFilterTest.java
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/GroovyFilterTest.java
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/JavaScriptFilterTest.java
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/PythonFilterTest.java
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/RubyFilterTest.java
camel/trunk/components/camel-spring/pom.xml
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/SpringXPathFilterTest.java
camel/trunk/tooling/pom.xml
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java?rev=797459&r1=797458&r2=797459&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java Fri Jul 24 13:55:56 2009
@@ -71,7 +71,7 @@
return this;
}
- public DefaultErrorHandlerBuilder collisionAvoidancePercent(short collisionAvoidancePercent) {
+ public DefaultErrorHandlerBuilder collisionAvoidancePercent(double collisionAvoidancePercent) {
getRedeliveryPolicy().collisionAvoidancePercent(collisionAvoidancePercent);
return this;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileBinding.java?rev=797459&r1=797458&r2=797459&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileBinding.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileBinding.java Fri Jul 24 13:55:56 2009
@@ -18,7 +18,6 @@
import java.io.File;
import java.io.IOException;
-import java.io.Serializable;
import org.apache.camel.Exchange;
import org.apache.camel.NoTypeConversionAvailableException;
@@ -27,7 +26,7 @@
/**
* File binding with the {@link java.io.File} type.
*/
-public class FileBinding implements GenericFileBinding<File>, Serializable {
+public class FileBinding implements GenericFileBinding<File> {
private File body;
private byte[] content;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java?rev=797459&r1=797458&r2=797459&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java Fri Jul 24 13:55:56 2009
@@ -30,7 +30,7 @@
* Generic File. Specific implementations of a file based endpoint need to
* provide a File for transfer.
*/
-public class GenericFile<T> implements Cloneable, Serializable {
+public class GenericFile<T> implements Serializable {
private static final Log LOG = LogFactory.getLog(GenericFile.class);
@@ -49,16 +49,11 @@
return File.separatorChar;
}
- @Override
- public GenericFile<T> clone() {
- return copyFrom(this);
- }
-
/**
- * Creates a clone based on the source
+ * Creates a copy based on the source
*
* @param source the source
- * @return a clone of the source
+ * @return a copy of the source
*/
@SuppressWarnings("unchecked")
public GenericFile<T> copyFrom(GenericFile<T> source) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileBinding.java?rev=797459&r1=797458&r2=797459&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileBinding.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileBinding.java Fri Jul 24 13:55:56 2009
@@ -17,13 +17,14 @@
package org.apache.camel.component.file;
import java.io.IOException;
+import java.io.Serializable;
import org.apache.camel.Exchange;
/**
* Binding between the generic file and the body content.
*/
-public interface GenericFileBinding<T> {
+public interface GenericFileBinding<T> extends Serializable {
/**
* Gets the body of the file
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java?rev=797459&r1=797458&r2=797459&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java Fri Jul 24 13:55:56 2009
@@ -117,6 +117,7 @@
* Perform any actions that need to occur before we write such as connecting to an FTP server etc.
*/
protected void preWriteCheck() throws Exception {
+ // nothing needed to check
}
protected void writeFile(Exchange exchange, String fileName) throws GenericFileOperationFailedException {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileExpressionRenamer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileExpressionRenamer.java?rev=797459&r1=797458&r2=797459&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileExpressionRenamer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileExpressionRenamer.java Fri Jul 24 13:55:56 2009
@@ -36,8 +36,8 @@
String newName = expression.evaluate(exchange, String.class);
- // clone and change the name
- GenericFile<T> result = file.clone();
+ // make a copy as result and change its file name
+ GenericFile<T> result = file.copyFrom(file);
result.changeFileName(newName);
return result;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameExclusiveReadLockStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameExclusiveReadLockStrategy.java?rev=797459&r1=797458&r2=797459&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameExclusiveReadLockStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameExclusiveReadLockStrategy.java Fri Jul 24 13:55:56 2009
@@ -42,8 +42,8 @@
// since its a Generic file we cannot use java.nio to get a RW lock
String newName = file.getFileName() + ".camelExclusiveReadLock";
- // clone and change the name
- GenericFile<T> newFile = file.clone();
+ // make a copy as result and change its file name
+ GenericFile<T> newFile = file.copyFrom(file);
newFile.changeFileName(newName);
long start = System.currentTimeMillis();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java?rev=797459&r1=797458&r2=797459&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java Fri Jul 24 13:55:56 2009
@@ -61,6 +61,7 @@
}
protected DefaultEndpoint() {
+ super();
}
public int hashCode() {
@@ -212,6 +213,7 @@
}
public void configureProperties(Map options) {
+ // do nothing by default
}
/**
@@ -240,6 +242,4 @@
return false;
}
-
-
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java?rev=797459&r1=797458&r2=797459&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java Fri Jul 24 13:55:56 2009
@@ -181,7 +181,7 @@
lowerCase = value;
}
- public boolean getAllowNullValues() {
+ public boolean isAllowNullValues() {
return allowNullValues;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java?rev=797459&r1=797458&r2=797459&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java Fri Jul 24 13:55:56 2009
@@ -104,15 +104,6 @@
}
/**
- * A strategy method populate the initial set of headers on an inbound
- * message from an underlying binding
- *
- * @param map is the empty header map to populate
- */
- protected void populateInitialHeaders(Map<String, Object> map) {
- }
-
- /**
* A factory method to lazily create the attachments to make it easy to
* create efficient Message implementations which only construct and
* populate the Map on demand
@@ -126,12 +117,23 @@
}
/**
+ * A strategy method populate the initial set of headers on an inbound
+ * message from an underlying binding
+ *
+ * @param map is the empty header map to populate
+ */
+ protected void populateInitialHeaders(Map<String, Object> map) {
+ // do nothing by default
+ }
+
+ /**
* A strategy method populate the initial set of attachments on an inbound
* message from an underlying binding
*
* @param map is the empty attachment map to populate
*/
protected void populateInitialAttachments(Map<String, DataHandler> map) {
+ // do nothing by default
}
public void addAttachment(String id, DataHandler content) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedEndpoint.java?rev=797459&r1=797458&r2=797459&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedEndpoint.java Fri Jul 24 13:55:56 2009
@@ -34,12 +34,12 @@
}
@ManagedAttribute(description = "Endpoint Uri")
- public String getUri() throws Exception {
+ public String getUri() {
return endpoint.getEndpointUri();
}
@ManagedAttribute(description = "Singleton")
- public boolean getSingleton() throws Exception {
+ public boolean isSingleton() {
return endpoint.isSingleton();
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java?rev=797459&r1=797458&r2=797459&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java Fri Jul 24 13:55:56 2009
@@ -286,7 +286,7 @@
* @param collisionAvoidancePercent the percentage
* @return the builder
*/
- public OnExceptionDefinition collisionAvoidancePercent(short collisionAvoidancePercent) {
+ public OnExceptionDefinition collisionAvoidancePercent(double collisionAvoidancePercent) {
getOrCreateRedeliveryPolicy().collisionAvoidancePercent(collisionAvoidancePercent);
return this;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java?rev=797459&r1=797458&r2=797459&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java Fri Jul 24 13:55:56 2009
@@ -76,7 +76,7 @@
setProperty(dataFormat, "secureTag", "");
}
- setProperty(dataFormat, "secureTagContents", getSecureTagContents());
+ setProperty(dataFormat, "secureTagContents", isSecureTagContents());
if (passPhrase != null) {
setProperty(dataFormat, "passPhrase", getPassPhrase());
@@ -119,10 +119,6 @@
return secureTagContents;
}
- public boolean getSecureTagContents() {
- return secureTagContents;
- }
-
public void setSecureTagContents(boolean secureTagContents) {
this.secureTagContents = secureTagContents;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java?rev=797459&r1=797458&r2=797459&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java Fri Jul 24 13:55:56 2009
@@ -344,8 +344,8 @@
this.backOffMultiplier = backOffMultiplier;
}
- public short getCollisionAvoidancePercent() {
- return (short)Math.round(collisionAvoidanceFactor * 100);
+ public long getCollisionAvoidancePercent() {
+ return Math.round(collisionAvoidanceFactor * 100);
}
/**
Modified: camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyFilterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyFilterTest.java?rev=797459&r1=797458&r2=797459&view=diff
==============================================================================
--- camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyFilterTest.java (original)
+++ camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyFilterTest.java Fri Jul 24 13:55:56 2009
@@ -17,24 +17,23 @@
package org.apache.camel.processor.groovy;
import org.apache.camel.CamelContext;
-import org.apache.camel.builder.NoRouteBuilder;
-import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.processor.XPathFilterTest;
import org.apache.camel.spring.SpringCamelContext;
-
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
* @version $Revision$
*/
public class GroovyFilterTest extends XPathFilterTest {
+
@Override
- protected CamelContext createCamelContext() throws Exception {
- return SpringCamelContext.springCamelContext(new ClassPathXmlApplicationContext("org/apache/camel/processor/groovy/groovyFilter.xml"));
+ public boolean isUseRouteBuilder() {
+ return false;
}
@Override
- protected RouteBuilder createRouteBuilder() {
- return NoRouteBuilder.getInstance();
+ protected CamelContext createCamelContext() throws Exception {
+ return SpringCamelContext.springCamelContext(new ClassPathXmlApplicationContext("org/apache/camel/processor/groovy/groovyFilter.xml"));
}
+
}
\ No newline at end of file
Modified: camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/AnyLanguageFilterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/AnyLanguageFilterTest.java?rev=797459&r1=797458&r2=797459&view=diff
==============================================================================
--- camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/AnyLanguageFilterTest.java (original)
+++ camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/AnyLanguageFilterTest.java Fri Jul 24 13:55:56 2009
@@ -18,8 +18,6 @@
import org.apache.camel.CamelContext;
import org.apache.camel.ScriptTestHelper;
-import org.apache.camel.builder.NoRouteBuilder;
-import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.processor.XPathFilterTest;
import org.apache.camel.spring.SpringCamelContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -30,6 +28,11 @@
public class AnyLanguageFilterTest extends XPathFilterTest {
@Override
+ public boolean isUseRouteBuilder() {
+ return false;
+ }
+
+ @Override
public void testSendMatchingMessage() throws Exception {
if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
return;
@@ -52,8 +55,4 @@
return SpringCamelContext.springCamelContext(new ClassPathXmlApplicationContext("org/apache/camel/builder/script/example/anyLanguageFilter.xml"));
}
- @Override
- protected RouteBuilder createRouteBuilder() {
- return NoRouteBuilder.getInstance();
- }
}
\ No newline at end of file
Modified: camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/BeanShellFilterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/BeanShellFilterTest.java?rev=797459&r1=797458&r2=797459&view=diff
==============================================================================
--- camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/BeanShellFilterTest.java (original)
+++ camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/BeanShellFilterTest.java Fri Jul 24 13:55:56 2009
@@ -18,8 +18,6 @@
import org.apache.camel.CamelContext;
import org.apache.camel.ScriptTestHelper;
-import org.apache.camel.builder.NoRouteBuilder;
-import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.processor.XPathFilterTest;
import org.apache.camel.spring.SpringCamelContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -30,6 +28,11 @@
public class BeanShellFilterTest extends XPathFilterTest {
@Override
+ public boolean isUseRouteBuilder() {
+ return false;
+ }
+
+ @Override
public void testSendMatchingMessage() throws Exception {
if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
return;
@@ -52,8 +55,4 @@
return SpringCamelContext.springCamelContext(new ClassPathXmlApplicationContext("org/apache/camel/builder/script/example/beanShellFilter.xml"));
}
- @Override
- protected RouteBuilder createRouteBuilder() {
- return NoRouteBuilder.getInstance();
- }
}
\ No newline at end of file
Modified: camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/GroovyFilterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/GroovyFilterTest.java?rev=797459&r1=797458&r2=797459&view=diff
==============================================================================
--- camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/GroovyFilterTest.java (original)
+++ camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/GroovyFilterTest.java Fri Jul 24 13:55:56 2009
@@ -18,8 +18,6 @@
import org.apache.camel.CamelContext;
import org.apache.camel.ScriptTestHelper;
-import org.apache.camel.builder.NoRouteBuilder;
-import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.processor.XPathFilterTest;
import org.apache.camel.spring.SpringCamelContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -30,6 +28,11 @@
public class GroovyFilterTest extends XPathFilterTest {
@Override
+ public boolean isUseRouteBuilder() {
+ return false;
+ }
+
+ @Override
public void testSendMatchingMessage() throws Exception {
if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
return;
@@ -51,9 +54,4 @@
protected CamelContext createCamelContext() throws Exception {
return SpringCamelContext.springCamelContext(new ClassPathXmlApplicationContext("org/apache/camel/builder/script/example/groovyFilter.xml"));
}
-
- @Override
- protected RouteBuilder createRouteBuilder() {
- return NoRouteBuilder.getInstance();
- }
}
Modified: camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/JavaScriptFilterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/JavaScriptFilterTest.java?rev=797459&r1=797458&r2=797459&view=diff
==============================================================================
--- camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/JavaScriptFilterTest.java (original)
+++ camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/JavaScriptFilterTest.java Fri Jul 24 13:55:56 2009
@@ -18,8 +18,6 @@
import org.apache.camel.CamelContext;
import org.apache.camel.ScriptTestHelper;
-import org.apache.camel.builder.NoRouteBuilder;
-import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.processor.XPathFilterTest;
import org.apache.camel.spring.SpringCamelContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -30,6 +28,11 @@
public class JavaScriptFilterTest extends XPathFilterTest {
@Override
+ public boolean isUseRouteBuilder() {
+ return false;
+ }
+
+ @Override
public void testSendMatchingMessage() throws Exception {
if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
return;
@@ -52,8 +55,4 @@
return SpringCamelContext.springCamelContext(new ClassPathXmlApplicationContext("org/apache/camel/builder/script/example/javaScriptFilter.xml"));
}
- @Override
- protected RouteBuilder createRouteBuilder() {
- return NoRouteBuilder.getInstance();
- }
}
\ No newline at end of file
Modified: camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/PythonFilterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/PythonFilterTest.java?rev=797459&r1=797458&r2=797459&view=diff
==============================================================================
--- camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/PythonFilterTest.java (original)
+++ camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/PythonFilterTest.java Fri Jul 24 13:55:56 2009
@@ -18,8 +18,6 @@
import org.apache.camel.CamelContext;
import org.apache.camel.ScriptTestHelper;
-import org.apache.camel.builder.NoRouteBuilder;
-import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.processor.XPathFilterTest;
import org.apache.camel.spring.SpringCamelContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -30,6 +28,11 @@
public class PythonFilterTest extends XPathFilterTest {
@Override
+ public boolean isUseRouteBuilder() {
+ return false;
+ }
+
+ @Override
public void testSendMatchingMessage() throws Exception {
if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
return;
@@ -52,8 +55,4 @@
return SpringCamelContext.springCamelContext(new ClassPathXmlApplicationContext("org/apache/camel/builder/script/example/pythonFilter.xml"));
}
- @Override
- protected RouteBuilder createRouteBuilder() {
- return NoRouteBuilder.getInstance();
- }
}
\ No newline at end of file
Modified: camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/RubyFilterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/RubyFilterTest.java?rev=797459&r1=797458&r2=797459&view=diff
==============================================================================
--- camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/RubyFilterTest.java (original)
+++ camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/RubyFilterTest.java Fri Jul 24 13:55:56 2009
@@ -18,8 +18,6 @@
import org.apache.camel.CamelContext;
import org.apache.camel.ScriptTestHelper;
-import org.apache.camel.builder.NoRouteBuilder;
-import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.processor.XPathFilterTest;
import org.apache.camel.spring.SpringCamelContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -30,6 +28,11 @@
public class RubyFilterTest extends XPathFilterTest {
@Override
+ public boolean isUseRouteBuilder() {
+ return false;
+ }
+
+ @Override
public void testSendMatchingMessage() throws Exception {
if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
return;
@@ -52,8 +55,4 @@
return SpringCamelContext.springCamelContext(new ClassPathXmlApplicationContext("org/apache/camel/builder/script/example/rubyFilter.xml"));
}
- @Override
- protected RouteBuilder createRouteBuilder() {
- return NoRouteBuilder.getInstance();
- }
}
\ No newline at end of file
Modified: camel/trunk/components/camel-spring/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/pom.xml?rev=797459&r1=797458&r2=797459&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/pom.xml (original)
+++ camel/trunk/components/camel-spring/pom.xml Fri Jul 24 13:55:56 2009
@@ -217,18 +217,6 @@
</goals>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>xsddoc</groupId>
- <artifactId>maven-xsddoc-plugin</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>xsddoc</groupId>
- <artifactId>xsddoc</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
</plugin>
<!-- generate the attached tests jar -->
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/SpringXPathFilterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/SpringXPathFilterTest.java?rev=797459&r1=797458&r2=797459&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/SpringXPathFilterTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/SpringXPathFilterTest.java Fri Jul 24 13:55:56 2009
@@ -17,8 +17,6 @@
package org.apache.camel.spring.example;
import org.apache.camel.CamelContext;
-import org.apache.camel.builder.NoRouteBuilder;
-import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.processor.XPathFilterTest;
import org.apache.camel.spring.SpringCamelContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -27,13 +25,15 @@
* @version $Revision$
*/
public class SpringXPathFilterTest extends XPathFilterTest {
+
@Override
- protected CamelContext createCamelContext() throws Exception {
- return SpringCamelContext.springCamelContext(new ClassPathXmlApplicationContext("org/apache/camel/spring/example/xpathFilter.xml"));
+ public boolean isUseRouteBuilder() {
+ return false;
}
@Override
- protected RouteBuilder createRouteBuilder() {
- return NoRouteBuilder.getInstance();
+ protected CamelContext createCamelContext() throws Exception {
+ return SpringCamelContext.springCamelContext(new ClassPathXmlApplicationContext("org/apache/camel/spring/example/xpathFilter.xml"));
}
+
}
Modified: camel/trunk/tooling/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/pom.xml?rev=797459&r1=797458&r2=797459&view=diff
==============================================================================
--- camel/trunk/tooling/pom.xml (original)
+++ camel/trunk/tooling/pom.xml Fri Jul 24 13:55:56 2009
@@ -30,8 +30,6 @@
<packaging>pom</packaging>
<modules>
- <!-- TODO when this doesn't barf when running 'mvn site' -->
- <!--<module>camel-xsddoc</module>-->
<module>maven</module>
<module>archetypes</module>
<module>camel-manual</module>