Author: davsclaus
Date: Sat Aug 7 06:51:23 2010
New Revision: 983178
URL: http://svn.apache.org/viewvc?rev=983178&view=rev
Log:
Fixed test not shutting down properly
Modified:
camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletEndpoint.java
camel/trunk/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java
camel/trunk/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletCamelRouterTestSupport.java
camel/trunk/components/camel-servlet/src/test/resources/log4j.properties
Modified:
camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletEndpoint.java?rev=983178&r1=983177&r2=983178&view=diff
==============================================================================
---
camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletEndpoint.java
(original)
+++
camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletEndpoint.java
Sat Aug 7 06:51:23 2010
@@ -35,8 +35,8 @@ public class ServletEndpoint extends Htt
super();
}
- public ServletEndpoint(String endPointURI, ServletComponent component, URI
httpUri, HttpClientParams params
- , HttpConnectionManager httpConnectionManager,
HttpClientConfigurer clientConfigurer) throws URISyntaxException {
+ public ServletEndpoint(String endPointURI, ServletComponent component, URI
httpUri, HttpClientParams params,
+ HttpConnectionManager httpConnectionManager,
HttpClientConfigurer clientConfigurer) throws URISyntaxException {
super(endPointURI, component, httpUri, params, httpConnectionManager,
clientConfigurer);
}
Modified:
camel/trunk/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java?rev=983178&r1=983177&r2=983178&view=diff
==============================================================================
---
camel/trunk/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java
(original)
+++
camel/trunk/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java
Sat Aug 7 06:51:23 2010
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.servlet;
import java.io.ByteArrayInputStream;
@@ -30,12 +29,12 @@ import com.meterware.servletunit.Servlet
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.junit.Ignore;
import org.junit.Test;
public class HttpClientRouteTest extends ServletCamelRouterTestSupport {
private static final String POST_DATA = "<request> hello world </request>";
private static final String CONTENT_TYPE = "text/xml";
-
@Test
public void testHttpClient() throws Exception {
Modified:
camel/trunk/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletCamelRouterTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletCamelRouterTestSupport.java?rev=983178&r1=983177&r2=983178&view=diff
==============================================================================
---
camel/trunk/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletCamelRouterTestSupport.java
(original)
+++
camel/trunk/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletCamelRouterTestSupport.java
Sat Aug 7 06:51:23 2010
@@ -50,6 +50,7 @@ public class ServletCamelRouterTestSuppo
if (startCamelContext) {
super.tearDown();
}
+ sr.shutDown();
}
protected void loadServlets() throws Exception {
Modified:
camel/trunk/components/camel-servlet/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-servlet/src/test/resources/log4j.properties?rev=983178&r1=983177&r2=983178&view=diff
==============================================================================
--- camel/trunk/components/camel-servlet/src/test/resources/log4j.properties
(original)
+++ camel/trunk/components/camel-servlet/src/test/resources/log4j.properties
Sat Aug 7 06:51:23 2010
@@ -2,19 +2,25 @@
#
# The logging properties used for eclipse testing, We want to see debug output
on the console.
#
-log4j.rootLogger=WARN, out
+log4j.rootLogger=INFO, file
-# uncomment the following line to turn on Camel debugging
#log4j.logger.org.apache.camel=DEBUG
-
-# uncomment the following line to turn on ActiveMQ debugging
-#log4j.logger.org.apache.activemq=DEBUG
+log4j.logger.org.apache.camel.impl.converter=WARN
+log4j.logger.org.apache.camel.management=WARN
+log4j.logger.org.apache.camel.impl.DefaultPackageScanClassResolver=WARN
log4j.logger.org.springframework=WARN
-
# CONSOLE appender not used by default
log4j.appender.out=org.apache.log4j.ConsoleAppender
log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
-#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} -
%m%n
+log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} -
%m%n
+
+# File appender
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} -
%m%n
+log4j.appender.file.file=target/camel-servlet-test.log
+log4j.appender.file.append=true
+
+log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file
