svn commit: r634141 - in /servicemix/smx4/features/trunk/camel/servicemix-camel/src/test: java/org/apache/servicemix/camel/ resources/org/apache/servicemix/camel/spring/

[ffang]

Author: ffang
Date: Wed Mar  5 19:33:40 2008
New Revision: 634141

URL: http://svn.apache.org/viewvc?rev=634141&view=rev
Log:
fix test failures

Modified:
    
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ExceptionHandleTest.java
    
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/EndpointBeans.xml
    
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/mtom.xml

Modified: 
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ExceptionHandleTest.java
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ExceptionHandleTest.java?rev=634141&r1=634140&r2=634141&view=diff
==============================================================================
--- 
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ExceptionHandleTest.java
 (original)
+++ 
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ExceptionHandleTest.java
 Wed Mar  5 19:33:40 2008
@@ -137,8 +137,8 @@
         } catch (BadRecordLitFault brlf) {                
             BindingProvider bp = (BindingProvider)greeter;
             Map<String, Object> responseContext = bp.getResponseContext();
-            String contentType = (String) 
responseContext.get(Message.CONTENT_TYPE);
-            assertEquals("text/xml", contentType);
+            String encodingType = (String) 
responseContext.get(Message.ENCODING);
+            assertEquals("UTF-8", encodingType);
             Integer responseCode = (Integer) 
responseContext.get(Message.RESPONSE_CODE);
             assertEquals(200, responseCode.intValue());                
             assertNotNull(brlf.getFaultInfo());

Modified: 
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/EndpointBeans.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/EndpointBeans.xml?rev=634141&r1=634140&r2=634141&view=diff
==============================================================================
--- 
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/EndpointBeans.xml
 (original)
+++ 
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/EndpointBeans.xml
 Wed Mar  5 19:33:40 2008
@@ -42,8 +42,10 @@
   </bean>
   <bean id="endpointRegistry" 
class="org.apache.servicemix.nmr.core.EndpointRegistryImpl">
         <property name="nmr" ref="servicemix" />
+        <property name="registry" ref="serviceRegistry"/>
   </bean>  
   <bean id="listenerRegistry" 
class="org.apache.servicemix.nmr.core.ListenerRegistryImpl" />
   <bean id="flowRegistry" 
class="org.apache.servicemix.nmr.core.FlowRegistryImpl" />
   <bean id="staightThroughFlow" 
class="org.apache.servicemix.nmr.core.StraightThroughFlow" />
+  <bean id="serviceRegistry" 
class="org.apache.servicemix.nmr.core.ServiceRegistryImpl"/>
 </beans>

Modified: 
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/mtom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/mtom.xml?rev=634141&r1=634140&r2=634141&view=diff
==============================================================================
--- 
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/mtom.xml
 (original)
+++ 
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/mtom.xml
 Wed Mar  5 19:33:40 2008
@@ -44,8 +44,10 @@
   </bean>
   <bean id="endpointRegistry" 
class="org.apache.servicemix.nmr.core.EndpointRegistryImpl">
         <property name="nmr" ref="servicemix" />
+        <property name="registry" ref="serviceRegistry"/>
   </bean>  
   <bean id="listenerRegistry" 
class="org.apache.servicemix.nmr.core.ListenerRegistryImpl" />
   <bean id="flowRegistry" 
class="org.apache.servicemix.nmr.core.FlowRegistryImpl" />
   <bean id="staightThroughFlow" 
class="org.apache.servicemix.nmr.core.StraightThroughFlow" />
+  <bean id="serviceRegistry" 
class="org.apache.servicemix.nmr.core.ServiceRegistryImpl"/>
 </beans>