Author: tjsnell
Date: Sun Apr 17 15:33:06 2011
New Revision: 1094160
URL: http://svn.apache.org/viewvc?rev=1094160&view=rev
Log:
Removed unused imports from my Camel-3622 fix
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProxyRouteContentTypeTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpReturnFaultTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringJettyNoConnectionRedeliveryTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConcurrentTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSendFileTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSynchronousFalseTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpsProducerRouteSetupWithSystemPropsTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyProducerHandle404Test.java
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java?rev=1094160&r1=1094159&r2=1094160&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
Sun Apr 17 15:33:06 2011
@@ -19,7 +19,6 @@ package org.apache.camel.component.jetty
import java.io.File;
import java.io.FileOutputStream;
import java.util.Properties;
-import java.util.Random;
import org.apache.camel.CamelContext;
import org.apache.camel.component.properties.PropertiesComponent;
@@ -27,12 +26,11 @@ import org.apache.camel.converter.IOConv
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.commons.logging.impl.AvalonLogger;
import org.junit.AfterClass;
import org.junit.BeforeClass;
/**
- * @version
+ * @version
*/
public abstract class BaseJettyTest extends CamelTestSupport {
private static volatile int port;
@@ -79,7 +77,7 @@ public abstract class BaseJettyTest exte
@Override
protected JndiRegistry createRegistry() throws Exception {
JndiRegistry jndi = super.createRegistry();
-
+
Properties prop = new Properties();
prop.setProperty("port", "" + getPort());
jndi.bind("prop", prop);
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java?rev=1094160&r1=1094159&r2=1094160&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java
Sun Apr 17 15:33:06 2011
@@ -28,7 +28,6 @@ import org.apache.camel.RuntimeCamelExce
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.http.HttpOperationFailedException;
import org.apache.camel.impl.JndiRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.eclipse.jetty.http.security.Constraint;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
@@ -38,7 +37,7 @@ import org.eclipse.jetty.security.authen
import org.junit.Test;
/**
- * @version
+ * @version
*/
public class HttpBasicAuthTest extends BaseJettyTest {
@@ -60,7 +59,7 @@ public class HttpBasicAuthTest extends B
ConstraintSecurityHandler sh = new ConstraintSecurityHandler();
sh.setAuthenticator(new BasicAuthenticator());
sh.setConstraintMappings(Arrays.asList(new ConstraintMapping[] {cm}));
-
+
HashLoginService loginService = new HashLoginService("MyRealm",
"src/test/resources/myRealm.properties");
sh.setLoginService(loginService);
sh.setConstraintMappings(Arrays.asList(new ConstraintMapping[]{cm}));
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProxyRouteContentTypeTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProxyRouteContentTypeTest.java?rev=1094160&r1=1094159&r2=1094160&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProxyRouteContentTypeTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProxyRouteContentTypeTest.java
Sun Apr 17 15:33:06 2011
@@ -20,15 +20,13 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.util.ExchangeHelper;
-import org.apache.camel.util.StopWatch;
-import org.apache.camel.util.TimeUtils;
import org.junit.Test;
public class HttpProxyRouteContentTypeTest extends BaseJettyTest {
@Test
public void testHttpProxyWithContentType() throws Exception {
-
+
String out =
template.requestBodyAndHeader("http://localhost:{{port}}/hello";, "test",
"Content-Type", "application/xml", String.class);
assertEquals("Get a wrong response ", "application/xml", out);
@@ -42,13 +40,13 @@ public class HttpProxyRouteContentTypeTe
from("jetty://http://localhost:{{port}}/bye";).process(new
Processor() {
public void process(Exchange exchange) throws Exception {
-
+
exchange.getOut().setBody(ExchangeHelper.getContentType(exchange));
}
-
+
});
}
};
- }
+ }
}
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpReturnFaultTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpReturnFaultTest.java?rev=1094160&r1=1094159&r2=1094160&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpReturnFaultTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpReturnFaultTest.java
Sun Apr 17 15:33:06 2011
@@ -19,11 +19,10 @@ package org.apache.camel.component.jetty
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
/**
- * @version
+ * @version
*/
public class HttpReturnFaultTest extends BaseJettyTest {
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringJettyNoConnectionRedeliveryTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringJettyNoConnectionRedeliveryTest.java?rev=1094160&r1=1094159&r2=1094160&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringJettyNoConnectionRedeliveryTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringJettyNoConnectionRedeliveryTest.java
Sun Apr 17 15:33:06 2011
@@ -20,14 +20,13 @@ import java.net.ConnectException;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.Route;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
- * @version
+ * @version
*/
public class SpringJettyNoConnectionRedeliveryTest extends
CamelSpringTestSupport {
@@ -60,4 +59,4 @@ public class SpringJettyNoConnectionRede
assertEquals(true, exchange.getIn().getHeader(Exchange.REDELIVERED));
assertEquals(4,
exchange.getIn().getHeader(Exchange.REDELIVERY_COUNTER));
}
-}
\ No newline at end of file
+}
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConcurrentTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConcurrentTest.java?rev=1094160&r1=1094159&r2=1094160&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConcurrentTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConcurrentTest.java
Sun Apr 17 15:33:06 2011
@@ -27,14 +27,12 @@ import java.util.concurrent.Future;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jetty.BaseJettyTest;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
import org.junit.Test;
/**
* Jetty HTTP producer concurrent test.
*
- * @version
+ * @version
*/
public class JettyHttpProducerConcurrentTest extends BaseJettyTest {
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSendFileTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSendFileTest.java?rev=1094160&r1=1094159&r2=1094160&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSendFileTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSendFileTest.java
Sun Apr 17 15:33:06 2011
@@ -24,12 +24,10 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jetty.BaseJettyTest;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
import org.junit.Test;
/**
- * @version
+ * @version
*/
public class JettyHttpProducerSendFileTest extends BaseJettyTest {
@@ -78,4 +76,4 @@ public class JettyHttpProducerSendFileTe
};
}
-}
\ No newline at end of file
+}
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSynchronousFalseTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSynchronousFalseTest.java?rev=1094160&r1=1094159&r2=1094160&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSynchronousFalseTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSynchronousFalseTest.java
Sun Apr 17 15:33:06 2011
@@ -20,11 +20,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jetty.BaseJettyTest;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
/**
- * @version
+ * @version
*/
public class JettyHttpProducerSynchronousFalseTest extends BaseJettyTest {
@@ -76,4 +75,4 @@ public class JettyHttpProducerSynchronou
}
};
}
-}
\ No newline at end of file
+}
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpsProducerRouteSetupWithSystemPropsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpsProducerRouteSetupWithSystemPropsTest.java?rev=1094160&r1=1094159&r2=1094160&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpsProducerRouteSetupWithSystemPropsTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpsProducerRouteSetupWithSystemPropsTest.java
Sun Apr 17 15:33:06 2011
@@ -22,7 +22,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.junit.Before;
-import org.junit.Ignore;
public class JettyHttpsProducerRouteSetupWithSystemPropsTest extends
JettyProducerHttpsRouteTest {
@@ -70,4 +69,4 @@ public class JettyHttpsProducerRouteSetu
}
};
}
-}
\ No newline at end of file
+}
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyProducerHandle404Test.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyProducerHandle404Test.java?rev=1094160&r1=1094159&r2=1094160&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyProducerHandle404Test.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyProducerHandle404Test.java
Sun Apr 17 15:33:06 2011
@@ -17,12 +17,11 @@
package org.apache.camel.component.jetty.jettyproducer;
import org.apache.camel.component.jetty.JettyHandle404Test;
-import org.junit.Ignore;
/**
* Based on end user on forum how to get the 404 error code in his enrich
aggregator
*
- * @version
+ * @version
*/
public class JettyProducerHandle404Test extends JettyHandle404Test {
@@ -30,4 +29,4 @@ public class JettyProducerHandle404Test
return "jetty://http://localhost:{{port}}/myserver?user=Camel";;
}
-}
\ No newline at end of file
+}
