Author: ningjiang
Date: Tue Nov 11 05:17:51 2008
New Revision: 713030
URL: http://svn.apache.org/viewvc?rev=713030&view=rev
Log:
Fixed the CS errors also reenabled the DataSetSedaTest
Modified:
activemq/camel/trunk/camel-core/pom.xml
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/URISupport.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ObjectHelperTest.java
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
Modified: activemq/camel/trunk/camel-core/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/pom.xml?rev=713030&r1=713029&r2=713030&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/pom.xml (original)
+++ activemq/camel/trunk/camel-core/pom.xml Tue Nov 11 05:17:51 2008
@@ -136,8 +136,7 @@
<forkMode>pertest</forkMode>
<excludes>
<!-- TODO FIXME ASAP -->
- <exclude>**/XXXTest.*</exclude>
- <exclude>**/DataSetSedaTest.*</exclude>
+ <exclude>**/XXXTest.*</exclude>
</excludes>
</configuration>
</plugin>
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java?rev=713030&r1=713029&r2=713030&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
Tue Nov 11 05:17:51 2008
@@ -170,8 +170,8 @@
AggregationStrategy strategy =
createAggregationStrategy(routeContext);
if (getExpression() == null) {
- throw new IllegalArgumentException("You need to specify an
expression or " +
- "aggregation collection for
this aggregator: " + this);
+ throw new IllegalArgumentException("You need to specify an
expression or "
+ + "aggregation collection
for this aggregator: " + this);
}
Expression aggregateExpression =
getExpression().createExpression(routeContext);
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/URISupport.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/URISupport.java?rev=713030&r1=713029&r2=713030&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/URISupport.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/URISupport.java
Tue Nov 11 05:17:51 2008
@@ -32,7 +32,11 @@
*
* @version $Revision$
*/
-public class URISupport {
+public final class URISupport {
+
+ private URISupport() {
+ // Helper class
+ }
/**
* Holder to get parts of the URI.
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ObjectHelperTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ObjectHelperTest.java?rev=713030&r1=713029&r2=713030&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ObjectHelperTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ObjectHelperTest.java
Tue Nov 11 05:17:51 2008
@@ -18,9 +18,8 @@
import java.util.Iterator;
-import org.apache.camel.util.ObjectHelper;
-
import junit.framework.TestCase;
+import org.apache.camel.util.ObjectHelper;
/**
* @version $Revision: 640438 $
Modified:
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java?rev=713030&r1=713029&r2=713030&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
(original)
+++
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
Tue Nov 11 05:17:51 2008
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.http;
-import static org.apache.camel.component.http.HttpMethods.HTTP_METHOD;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
@@ -42,6 +40,8 @@
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
+import static org.apache.camel.component.http.HttpMethods.HTTP_METHOD;
/**
* @version $Revision$
*/
Modified:
activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java?rev=713030&r1=713029&r2=713030&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
(original)
+++
activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
Tue Nov 11 05:17:51 2008
@@ -21,6 +21,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+
import javax.activation.DataHandler;
import javax.activation.DataSource;
import javax.mail.Address;
@@ -37,11 +38,11 @@
import org.apache.camel.Exchange;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.util.ObjectHelper;
import org.apache.camel.converter.ObjectConverter;
import org.apache.camel.impl.DefaultHeaderFilterStrategy;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.util.CollectionHelper;
+import org.apache.camel.util.ObjectHelper;
/**
* A Strategy used to convert between a Camel [EMAIL PROTECTED] Exchange} and
[EMAIL PROTECTED] Message} to and
