svn commit: r1303952 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/management/mbean/ camel-core/src/test/java/org/apache/camel/processor/ components/camel-quartz/src/test/java/org/apache/camel/component/quartz/ components/camel-xmlsecuri...

[hadrian]

Author: hadrian
Date: Thu Mar 22 18:19:24 2012
New Revision: 1303952

URL: http://svn.apache.org/viewvc?rev=1303952&view=rev
Log:
Update xmlsecurity tests to use the junit4 based camel test support. Fixed 
minor warnings.

Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
    
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/WireTapOnExceptionTest.java
    
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
    
camel/trunk/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java?rev=1303952&r1=1303951&r2=1303952&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
 Thu Mar 22 18:19:24 2012
@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+
 import javax.management.MBeanServer;
 import javax.management.MBeanServerInvocationHandler;
 import javax.management.ObjectName;
@@ -30,7 +31,6 @@ import javax.management.ObjectName;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.ProducerTemplate;
-import org.apache.camel.ServiceStatus;
 import org.apache.camel.TimerListener;
 import org.apache.camel.api.management.ManagedResource;
 import org.apache.camel.api.management.mbean.ManagedCamelContextMBean;

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/WireTapOnExceptionTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/WireTapOnExceptionTest.java?rev=1303952&r1=1303951&r2=1303952&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/WireTapOnExceptionTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/WireTapOnExceptionTest.java
 Thu Mar 22 18:19:24 2012
@@ -17,6 +17,7 @@
 package org.apache.camel.processor;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
@@ -56,9 +57,9 @@ public class WireTapOnExceptionTest exte
     }
 
     public static final class MyProducerFailEndpoint extends DefaultEndpoint {
-
         private MyProducerFailEndpoint(String endpointUri, CamelContext 
camelContext) {
-            super(endpointUri, camelContext);
+            super(endpointUri, (Component)null);
+            setCamelContext(camelContext);
         }
 
         @Override
@@ -80,6 +81,5 @@ public class WireTapOnExceptionTest exte
         public boolean isSingleton() {
             return true;
         }
-
     }
 }

Modified: 
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java?rev=1303952&r1=1303951&r2=1303952&view=diff
==============================================================================
--- 
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
 (original)
+++ 
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
 Thu Mar 22 18:19:24 2012
@@ -19,7 +19,6 @@ package org.apache.camel.component.quart
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.TestSupport;
-import org.apache.camel.util.ObjectHelper;
 import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;

Modified: 
camel/trunk/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java?rev=1303952&r1=1303951&r2=1303952&view=diff
==============================================================================
--- 
camel/trunk/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java
 (original)
+++ 
camel/trunk/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java
 Thu Mar 22 18:19:24 2012
@@ -26,7 +26,7 @@ import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.converter.jaxp.XmlConverter;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.camel.util.jsse.KeyStoreParameters;
 import org.apache.xml.security.encryption.XMLCipher;
 import org.junit.Test;