You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ac...@apache.org on 2007/07/17 11:35:46 UTC
svn commit: r556864 [1/3] - in /incubator/servicemix/trunk:
common/servicemix-common/src/test/java/org/apache/servicemix/common/tools/wsdl/
common/servicemix-components/src/main/java/org/apache/servicemix/components/drools/dsl/
common/servicemix-compon...
Author: aco
Date: Tue Jul 17 02:35:34 2007
New Revision: 556864
URL: http://svn.apache.org/viewvc?view=rev&rev=556864
Log:
- Fix some log4j settings problems
- Replaced most of the System.out and System.err with log.info, etc.
Added:
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/resources/log4j-tests.properties
incubator/servicemix/trunk/deployables/serviceengines/servicemix-drools/src/test/resources/log4j-tests.properties
incubator/servicemix/trunk/deployables/serviceengines/servicemix-script/src/test/resources/log4j-tests.properties
incubator/servicemix/trunk/samples/loan-broker/loan-broker-drools-su/src/test/resources/
incubator/servicemix/trunk/samples/loan-broker/loan-broker-drools-su/src/test/resources/log4j-tests.properties
incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/test/resources/
incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/test/resources/log4j-tests.properties
Removed:
incubator/servicemix/trunk/common/servicemix-soap2/src/test/java/log4j.properties
Modified:
incubator/servicemix/trunk/common/servicemix-common/src/test/java/org/apache/servicemix/common/tools/wsdl/WSDLFlattenerTest.java
incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/drools/dsl/ForwardConsequenceFactory.java
incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/drools/dsl/InvokeConsequenceFactory.java
incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/drools/dsl/RouteConsequenceFactory.java
incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/script/ScriptComponent.java
incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFBinding.java
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/cache/CacheTest.java
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/MimeMailTest.java
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/SimpleMailTest.java
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/StubJavaMailSender.java
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/GroovyChainTest.java
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/ServiceMixClientTest.java
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAndSaajTest.java
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAttachmentsTest.java
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapTest.java
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapWsTest.java
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpTest.java
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/jdbc/JdbcComponentTest.java
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/pojo/PojoTest.java
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/saaj/SaajTest.java
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/script/ScriptTest.java
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/validation/ValidationTest.java
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/wsif/SampleServiceMessageListener.java
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/wsif/WsifTest.java
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/XFireBindingTest.java
incubator/servicemix/trunk/common/servicemix-soap/src/test/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandlerTest.java
incubator/servicemix/trunk/common/servicemix-soap/src/test/java/org/apache/servicemix/soap/marshalers/FaultTest.java
incubator/servicemix/trunk/common/servicemix-soap2/src/test/java/org/apache/servicemix/soap/HelloWorldSoapTest.java
incubator/servicemix/trunk/common/servicemix-soap2/src/test/java/org/apache/servicemix/soap/PersonHttpTest.java
incubator/servicemix/trunk/common/servicemix-soap2/src/test/java/org/apache/servicemix/soap/bindings/soap/interceptors/SoapInInterceptorTest.java
incubator/servicemix/trunk/common/servicemix-soap2/src/test/java/org/apache/servicemix/soap/interceptors/jbi/JbiInWsdl1InterceptorTest.java
incubator/servicemix/trunk/common/servicemix-soap2/src/test/java/org/apache/servicemix/soap/wsdl/validator/WSIBPValidatorTest.java
incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/DeploymentMessageTest.java
incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/DeployAndListServiceAssemblyTasksTest.java
incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/AbstractPersistenceTest.java
incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/MultipleJMSFlowTest.java
incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/PingService.java
incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/SimpleClusterSendSyncTest.java
incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/PropertiesLoginModuleTest.java
incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/remoting/RemoteServiceMixClientTest.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/test/java/org/apache/servicemix/http/ConsumerEndpointTest.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/test/java/org/apache/servicemix/http/HttpAddressingTest.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/test/java/org/apache/servicemix/http/HttpProviderTest.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/test/java/org/apache/servicemix/http/HttpSoapTest.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/test/java/org/apache/servicemix/http/HttpSpringTest.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/test/java/org/apache/servicemix/http/HttpWsdlTest.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/test/java/org/apache/servicemix/http/ServerManagerTest.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/test/java/org/apache/servicemix/http/WsdlRoundtripTest.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/test/java/org/apache/servicemix/http/security/HttpSecurityTest.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPEndpoint.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/test/java/org/apache/servicemix/xmpp/SpringComponentTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bpe/src/test/java/loanbroker/Bank.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bpe/src/test/java/org/apache/servicemix/bpe/BPEComponentTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bpe/src/test/java/org/apache/servicemix/bpe/BPESpringComponentTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bpe/src/test/java/org/apache/servicemix/bpe/util/FileSystemJarInputStreamTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181ComplexPojoTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181ComplexTypeTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181MTOMTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-lwcontainer/src/test/java/org/apache/servicemix/lwcontainer/LwContainerComponentTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-quartz/src/test/java/org/apache/servicemix/quartz/QuartzSpringTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-saxon/src/test/java/org/apache/servicemix/saxon/SaxonComponentTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-script/src/test/java/org/apache/servicemix/script/ScriptComponentTest.java
Modified: incubator/servicemix/trunk/common/servicemix-common/src/test/java/org/apache/servicemix/common/tools/wsdl/WSDLFlattenerTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-common/src/test/java/org/apache/servicemix/common/tools/wsdl/WSDLFlattenerTest.java?view=diff&rev=556864&r1=556863&r2=556864
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-common/src/test/java/org/apache/servicemix/common/tools/wsdl/WSDLFlattenerTest.java (original)
+++ incubator/servicemix/trunk/common/servicemix-common/src/test/java/org/apache/servicemix/common/tools/wsdl/WSDLFlattenerTest.java Tue Jul 17 02:35:34 2007
@@ -29,12 +29,17 @@
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilderFactory;
+import org.w3c.dom.Document;
+
import junit.framework.TestCase;
-import org.w3c.dom.Document;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class WSDLFlattenerTest extends TestCase {
+ private static transient Log logger = LogFactory.getLog(WSDLFlattenerTest.class);
+
public void test() throws Exception {
URL resource = getClass().getClassLoader().getResource("wsn/wsn.wsdl");
WSDLReader reader = WSDLFactory.newInstance().newWSDLReader();
@@ -49,7 +54,7 @@
WSDLWriter writer = WSDLFactory.newInstance().newWSDLWriter();
writer.writeWSDL(flat, baos);
- System.err.println(baos.toString());
+ logger.info(baos.toString());
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setNamespaceAware(true);
@@ -66,7 +71,7 @@
String loc = "b-2.xsd";
URI rel = SchemaCollection.resolve(base, loc);
assertEquals("jar:file:/C:/java/servicemix/servicemix-assembly/target/incubator-servicemix-3.0-SNAPSHOT/bin/incubator-servicemix-3.0-SNAPSHOT/bin/../lib/optional/servicemix-wsn2005-3.0-SNAPSHOT.jar!/org/apache/servicemix/wsn/b-2.xsd", rel.toString());
- System.out.println(rel);
+ logger.info(rel);
}
}
Modified: incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/drools/dsl/ForwardConsequenceFactory.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/drools/dsl/ForwardConsequenceFactory.java?view=diff&rev=556864&r1=556863&r2=556864
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/drools/dsl/ForwardConsequenceFactory.java (original)
+++ incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/drools/dsl/ForwardConsequenceFactory.java Tue Jul 17 02:35:34 2007
@@ -16,6 +16,11 @@
*/
package org.apache.servicemix.components.drools.dsl;
+import javax.jbi.messaging.MessagingException;
+import javax.xml.namespace.QName;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.components.drools.JbiHelper;
import org.drools.rule.Rule;
import org.drools.smf.Configuration;
@@ -25,13 +30,12 @@
import org.drools.spi.RuleBaseContext;
import org.drools.spi.Tuple;
-import javax.jbi.messaging.MessagingException;
-import javax.xml.namespace.QName;
-
/**
* @version $Revision$
*/
public class ForwardConsequenceFactory implements ConsequenceFactory {
+ private static transient Log log = LogFactory.getLog(ForwardConsequenceFactory.class);
+
public Consequence newConsequence(Rule rule, RuleBaseContext ruleBaseContext, final Configuration configuration) throws FactoryException {
final String[] services = configuration.getAttribute("service").split(",");
return new JbiConsequence() {
@@ -75,7 +79,7 @@
}
}
}
- System.out.println("Creating QName with uri: " + uri + " name: " + localPart);
+ log.debug("Creating QName with uri: " + uri + " name: " + localPart);
return new QName(uri, localPart);
}
}
Modified: incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/drools/dsl/InvokeConsequenceFactory.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/drools/dsl/InvokeConsequenceFactory.java?view=diff&rev=556864&r1=556863&r2=556864
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/drools/dsl/InvokeConsequenceFactory.java (original)
+++ incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/drools/dsl/InvokeConsequenceFactory.java Tue Jul 17 02:35:34 2007
@@ -16,6 +16,11 @@
*/
package org.apache.servicemix.components.drools.dsl;
+import javax.jbi.messaging.MessagingException;
+import javax.xml.namespace.QName;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.components.drools.JbiHelper;
import org.drools.rule.Rule;
import org.drools.smf.Configuration;
@@ -25,13 +30,13 @@
import org.drools.spi.RuleBaseContext;
import org.drools.spi.Tuple;
-import javax.jbi.messaging.MessagingException;
-import javax.xml.namespace.QName;
-
/**
* @version $Revision$
*/
public class InvokeConsequenceFactory implements ConsequenceFactory {
+
+ private static transient Log log = LogFactory.getLog(InvokeConsequenceFactory.class);
+
public Consequence newConsequence(Rule rule, RuleBaseContext ruleBaseContext, Configuration configuration) throws FactoryException {
final QName operation = toQName(configuration, configuration.getAttribute("operation"));
final QName service = toQName(configuration, configuration.getAttribute("service"));
@@ -74,7 +79,7 @@
}
}
}
- System.out.println("Creating QName with uri: " + uri + " name: " + localPart);
+ log.debug("Creating QName with uri: " + uri + " name: " + localPart);
return new QName(uri, localPart);
}
}
Modified: incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/drools/dsl/RouteConsequenceFactory.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/drools/dsl/RouteConsequenceFactory.java?view=diff&rev=556864&r1=556863&r2=556864
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/drools/dsl/RouteConsequenceFactory.java (original)
+++ incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/drools/dsl/RouteConsequenceFactory.java Tue Jul 17 02:35:34 2007
@@ -16,6 +16,11 @@
*/
package org.apache.servicemix.components.drools.dsl;
+import javax.jbi.messaging.MessagingException;
+import javax.xml.namespace.QName;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.components.drools.JbiHelper;
import org.drools.rule.Rule;
import org.drools.smf.Configuration;
@@ -25,13 +30,12 @@
import org.drools.spi.RuleBaseContext;
import org.drools.spi.Tuple;
-import javax.jbi.messaging.MessagingException;
-import javax.xml.namespace.QName;
-
/**
* @version $Revision: 359186 $
*/
public class RouteConsequenceFactory implements ConsequenceFactory {
+ private static transient Log log = LogFactory.getLog(RouteConsequenceFactory.class);
+
public Consequence newConsequence(Rule rule, RuleBaseContext ruleBaseContext, Configuration configuration) throws FactoryException {
final QName operation = toQName(configuration, configuration.getAttribute("operation"));
final QName service = toQName(configuration, configuration.getAttribute("service"));
@@ -74,7 +78,7 @@
}
}
}
- System.out.println("Creating QName with uri: " + uri + " name: " + localPart);
+ log.debug("Creating QName with uri: " + uri + " name: " + localPart);
return new QName(uri, localPart);
}
}
Modified: incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/script/ScriptComponent.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/script/ScriptComponent.java?view=diff&rev=556864&r1=556863&r2=556864
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/script/ScriptComponent.java (original)
+++ incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/script/ScriptComponent.java Tue Jul 17 02:35:34 2007
@@ -215,8 +215,6 @@
return !isDisableOutput();
}
catch (ScriptException e) {
- System.out.println("Caught: " + e);
- e.printStackTrace();
throw new MessagingException("Failed to run compiledScript. Reason: " + e, e);
}
}
@@ -253,8 +251,9 @@
}
}
else {
- return Logger.getLogger(getClass().getName());
- } }
+ return Logger.getLogger(getClass().getName());
+ }
+ }
protected void runScript(Bindings bindings) throws ScriptException {
if (compiledScript != null) {
Modified: incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFBinding.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFBinding.java?view=diff&rev=556864&r1=556863&r2=556864
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFBinding.java (original)
+++ incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFBinding.java Tue Jul 17 02:35:34 2007
@@ -30,6 +30,8 @@
import javax.wsdl.Definition;
import javax.wsdl.WSDLException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.components.util.TransformComponentSupport;
import org.apache.wsif.WSIFException;
import org.apache.wsif.WSIFMessage;
@@ -47,6 +49,8 @@
*/
public class WSIFBinding extends TransformComponentSupport {
+ private static transient Log log = LogFactory.getLog(WSIFBinding.class);
+
private WSIFMarshaler marshaler = new WSIFMarshaler();
private WSIFService serviceHelper;
private Definition definition;
@@ -69,8 +73,10 @@
serviceHelper = factory.getService(definition);
}
- for (Iterator iter = serviceHelper.getAvailablePortNames(); iter.hasNext();) {
- System.out.println("Available port name: " + iter.next());
+ if (log.isDebugEnabled()) {
+ for (Iterator iter = serviceHelper.getAvailablePortNames(); iter.hasNext();) {
+ log.debug("Available port name: " + iter.next());
+ }
}
operationMap = new WSIFOperationMap(serviceHelper);
Modified: incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/cache/CacheTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/cache/CacheTest.java?view=diff&rev=556864&r1=556863&r2=556864
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/cache/CacheTest.java (original)
+++ incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/cache/CacheTest.java Tue Jul 17 02:35:34 2007
@@ -20,16 +20,21 @@
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
+import org.w3c.dom.Node;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.resolver.EndpointResolver;
import org.apache.servicemix.tck.TestSupport;
-import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.w3c.dom.Node;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.springframework.context.support.AbstractXmlApplicationContext;
/**
* @version $Revision$
*/
public class CacheTest extends TestSupport {
+ private static transient Log log = LogFactory.getLog(CacheTest.class);
+
public void testCache() throws Exception {
EndpointResolver cachedService = client.createResolverForService(new QName("http://servicemix.org/cheese/", "myService"));
EndpointResolver service = client.createResolverForService(new QName("http://servicemix.org/cheese/", "myServiceImpl"));
@@ -40,7 +45,7 @@
}
String text = transformer.toString((Source) object);
- System.out.println("Cache: Received response: " + text);
+ log.info("Cache: Received response: " + text);
object = client.request(cachedService, null, null, "<foo id='123'/>");
if (object instanceof Node) {
@@ -48,7 +53,7 @@
}
String text2 = transformer.toString((Source) object);
- System.out.println("Cache: Received response: " + text2);
+ log.info("Cache: Received response: " + text2);
assertEquals("Responses should be equal", text, text2);
@@ -60,7 +65,7 @@
}
text = transformer.toString((Source) object);
- System.out.println("ServiceImpl: Received response: " + text);
+ log.info("ServiceImpl: Received response: " + text);
object = client.request(service, null, null, "<foo id='123'/>");
if (object instanceof Node) {
@@ -68,7 +73,7 @@
}
text2 = transformer.toString((Source) object);
- System.out.println("ServiceImpl: Received response: " + text2);
+ log.info("ServiceImpl: Received response: " + text2);
assertTrue("Responses should be different but were both: " + text, !text.equals(text2));
Modified: incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/MimeMailTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/MimeMailTest.java?view=diff&rev=556864&r1=556863&r2=556864
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/MimeMailTest.java (original)
+++ incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/MimeMailTest.java Tue Jul 17 02:35:34 2007
@@ -30,17 +30,21 @@
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.resolver.ServiceNameEndpointResolver;
import org.apache.servicemix.jbi.util.ByteArrayDataSource;
import org.apache.servicemix.tck.TestSupport;
-import org.springframework.context.support.AbstractXmlApplicationContext;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.springframework.context.support.AbstractXmlApplicationContext;
/**
* @version $Revision$
*/
public class MimeMailTest extends TestSupport {
+ private static transient Log log = LogFactory.getLog(MimeMailTest.class);
+
public void testSendUsingMessageProperties() throws Exception {
// START SNIPPET: email
@@ -63,7 +67,7 @@
MimeMessage mail = (MimeMessage) messages.get(0);
- System.out.println("Created message: " + message);
+ log.info("Created message: " + message);
assertEquals("subject", "Hello from JUnit!", mail.getSubject());
}
@@ -92,7 +96,7 @@
MimeMessage mail = (MimeMessage) messages.get(0);
- System.out.println("Created message: " + message);
+ log.info("Created message: " + message);
assertEquals("subject", "Hello from JUnit!", mail.getSubject());
}
@@ -119,7 +123,7 @@
MimeMessage message = (MimeMessage) messages.get(0);
- System.out.println("Created message: " + message);
+ log.info("Created message: " + message);
assertEquals("subject", "Drink a beer James", message.getSubject());
}
@@ -149,7 +153,7 @@
MimeMessage message = (MimeMessage) messages.get(0);
- System.out.println("Created message: " + message);
+ log.info("Created message: " + message);
Object content = message.getContent();
assertTrue(content instanceof MimeMultipart);
MimeMultipart contentMP = (MimeMultipart) content;
Modified: incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/SimpleMailTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/SimpleMailTest.java?view=diff&rev=556864&r1=556863&r2=556864
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/SimpleMailTest.java (original)
+++ incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/SimpleMailTest.java Tue Jul 17 02:35:34 2007
@@ -24,17 +24,21 @@
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.resolver.ServiceNameEndpointResolver;
import org.apache.servicemix.tck.TestSupport;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.mail.SimpleMailMessage;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
/**
* @version $Revision$
*/
public class SimpleMailTest extends TestSupport {
+ private static final transient Log log = LogFactory.getLog(SimpleMailTest.class);
+
public void testUsingXPathExpressionsInSimpleEmail() throws Exception {
// START SNIPPET: xpathSimple
@@ -58,7 +62,7 @@
SimpleMailMessage message = (SimpleMailMessage) messages.get(0);
- System.out.println("Created message: " + message);
+ log.info("Created message: " + message);
assertEquals("text", "Hello there James how are you today?", message.getText());
assertEquals("from", "james@nowhere.com", message.getFrom());
@@ -89,7 +93,7 @@
SimpleMailMessage mailMessage = (SimpleMailMessage) messages.get(0);
- System.out.println("Created message: " + mailMessage);
+ log.info("Created message: " + mailMessage);
assertEquals("subject", "Subject came from expression", mailMessage.getSubject());
assertEquals("from", "junit@servicemix.org", mailMessage.getFrom());
Modified: incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/StubJavaMailSender.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/StubJavaMailSender.java?view=diff&rev=556864&r1=556863&r2=556864
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/StubJavaMailSender.java (original)
+++ incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/StubJavaMailSender.java Tue Jul 17 02:35:34 2007
@@ -16,18 +16,22 @@
*/
package org.apache.servicemix.components.email;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.mail.Session;
+import javax.mail.internet.MimeMessage;
+
import junit.framework.Assert;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.springframework.mail.MailException;
import org.springframework.mail.SimpleMailMessage;
import org.springframework.mail.javamail.JavaMailSender;
import org.springframework.mail.javamail.MimeMessagePreparator;
-import javax.mail.Session;
-import javax.mail.internet.MimeMessage;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* A stub {@link JavaMailSender} useful for testing.
*
@@ -35,10 +39,11 @@
*/
public class StubJavaMailSender extends Assert implements JavaMailSender {
+ private static transient Log log = LogFactory.getLog(StubJavaMailSender.class);
+
private List messages = new ArrayList();
private Object semaphore = new Object();
-
public void send(MimeMessage mimeMessage) throws MailException {
addMessage(mimeMessage);
}
@@ -120,7 +125,7 @@
public void waitForMessagesToArrive(int messageCount) {
- System.out.println("Waiting for message to arrive");
+ log.info("Waiting for message to arrive");
long start = System.currentTimeMillis();
@@ -134,12 +139,12 @@
}
}
catch (InterruptedException e) {
- System.out.println("Caught: " + e);
+ log.info("Caught: " + e);
}
}
long end = System.currentTimeMillis() - start;
- System.out.println("End of wait for " + end + " millis");
+ log.info("End of wait for " + end + " millis");
}
@@ -152,7 +157,7 @@
waitForMessagesToArrive(messageCount);
assertEquals("expected number of messages", messageCount, getMessageCount());
- System.out.println("Received messages: " + getMessages());
+ log.info("Received messages: " + getMessages());
}
public boolean hasReceivedMessage() {
Modified: incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/GroovyChainTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/GroovyChainTest.java?view=diff&rev=556864&r1=556863&r2=556864
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/GroovyChainTest.java (original)
+++ incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/GroovyChainTest.java Tue Jul 17 02:35:34 2007
@@ -25,17 +25,21 @@
import junit.framework.TestCase;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.client.ServiceMixClient;
import org.apache.servicemix.jbi.container.SpringJBIContainer;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.tck.Receiver;
-import org.springframework.context.support.AbstractXmlApplicationContext;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.springframework.context.support.AbstractXmlApplicationContext;
/**
* @version $Revision$
*/
public class GroovyChainTest extends TestCase {
+ private static transient Log log = LogFactory.getLog(GroovyChainTest.class);
+
protected AbstractXmlApplicationContext context;
protected ServiceMixClient client;
protected Receiver receiver;
@@ -56,7 +60,7 @@
exchange.setService(service);
client.sendSync(exchange);
- System.out.println(transformer.toString(exchange.getMessage("out").getContent()));
+ log.info(transformer.toString(exchange.getMessage("out").getContent()));
}
Modified: incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/ServiceMixClientTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/ServiceMixClientTest.java?view=diff&rev=556864&r1=556863&r2=556864
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/ServiceMixClientTest.java (original)
+++ incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/ServiceMixClientTest.java Tue Jul 17 02:35:34 2007
@@ -37,14 +37,14 @@
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.resolver.EndpointResolver;
import org.apache.servicemix.tck.Receiver;
-import org.springframework.context.support.AbstractXmlApplicationContext;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.springframework.context.support.AbstractXmlApplicationContext;
/**
* @version $Revision$
*/
public class ServiceMixClientTest extends TestCase {
- private static final transient Log log = LogFactory.getLog(ServiceMixClientTest.class);
+ private static transient Log log = LogFactory.getLog(ServiceMixClientTest.class);
protected AbstractXmlApplicationContext context;
protected ServiceMixClient client;
@@ -141,7 +141,7 @@
assertNotNull("Should have returned a non-null response!", response);
- System.out.println("Received result: " + response);
+ log.info("Received result: " + response);
}
@@ -163,8 +163,8 @@
assertNotNull("outMessage is null!", outMessage);
assertEquals("foo header", "hello", outMessage.getProperty("foo"));
- System.out.println("Received result: " + outMessage.getContent());
- System.out.println("XML is: " + transformer.toString(outMessage.getContent()));
+ log.info("Received result: " + outMessage.getContent());
+ log.info("XML is: " + transformer.toString(outMessage.getContent()));
}
protected void assertRequestUsingMapAndPOJOByServiceName(QName service) throws Exception {
@@ -176,7 +176,7 @@
assertNotNull("Should have returned a non-null response!", response);
- System.out.println("Received result: " + response);
+ log.info("Received result: " + response);
}
protected void setUp() throws Exception {
Modified: incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAndSaajTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAndSaajTest.java?view=diff&rev=556864&r1=556863&r2=556864
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAndSaajTest.java (original)
+++ incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAndSaajTest.java Tue Jul 17 02:35:34 2007
@@ -27,10 +27,17 @@
import javax.xml.namespace.QName;
import javax.xml.transform.TransformerException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.traversal.NodeIterator;
+
import junit.framework.TestCase;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.xbean.BrokerFactoryBean;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.components.saaj.SaajBinding;
import org.apache.servicemix.components.util.MockServiceComponent;
import org.apache.servicemix.jbi.container.ActivationSpec;
@@ -43,10 +50,6 @@
import org.apache.xml.serialize.XMLSerializer;
import org.apache.xpath.CachedXPathAPI;
import org.springframework.core.io.ClassPathResource;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.traversal.NodeIterator;
public class HttpSoapAndSaajTest extends TestCase {
@@ -55,6 +58,8 @@
private static final int PORT_WS_1 = 7014;
private static final int PORT_WS_2 = 7014;
+ private static transient Log log = LogFactory.getLog(HttpSoapAndSaajTest.class);
+
protected JBIContainer container;
protected BrokerService broker;
@@ -131,9 +136,11 @@
format.setLineWidth(65);
format.setIndenting(true);
format.setIndent(2);
- XMLSerializer serializer = new XMLSerializer(System.err, format);
- System.err.println();
+
+ ByteArrayOutputStream output = new ByteArrayOutputStream();
+ XMLSerializer serializer = new XMLSerializer(output, format);
serializer.serialize((Document) node);
+ log.info(output.toString());
CachedXPathAPI cachedXPathAPI = new CachedXPathAPI();
NodeIterator iterator = cachedXPathAPI.selectNodeIterator(node, "//*[local-name() = 'userId']");
Modified: incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAttachmentsTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAttachmentsTest.java?view=diff&rev=556864&r1=556863&r2=556864
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAttachmentsTest.java (original)
+++ incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAttachmentsTest.java Tue Jul 17 02:35:34 2007
@@ -31,7 +31,8 @@
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.methods.InputStreamRequestEntity;
import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.servicemix.components.http.HttpSoapConnector;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.components.util.EchoComponent;
import org.apache.servicemix.jbi.container.ActivationSpec;
import org.apache.servicemix.jbi.container.JBIContainer;
@@ -39,6 +40,7 @@
import org.codehaus.xfire.attachments.SimpleAttachment;
public class HttpSoapAttachmentsTest extends TestCase {
+ private static transient Log log = LogFactory.getLog(HttpSoapAttachmentsTest.class);
private static final int PORT = 7012;
@@ -84,7 +86,7 @@
method.setRequestEntity(new InputStreamRequestEntity(is));
method.setRequestHeader("Content-Type", sendAtts.getContentType());
new HttpClient().executeMethod(method);
- System.out.println(method.getResponseBodyAsString());
+ log.info(method.getResponseBodyAsString());
}
private DataHandler createDataHandler(String name) throws MessagingException {
Modified: incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapTest.java?view=diff&rev=556864&r1=556863&r2=556864
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapTest.java (original)
+++ incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapTest.java Tue Jul 17 02:35:34 2007
@@ -26,12 +26,18 @@
import javax.jbi.messaging.NormalizedMessage;
import javax.xml.namespace.QName;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.traversal.NodeIterator;
+
import junit.framework.TestCase;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.methods.InputStreamRequestEntity;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.methods.StringRequestEntity;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.components.util.EchoComponent;
import org.apache.servicemix.components.util.MockServiceComponent;
import org.apache.servicemix.components.util.TraceComponent;
@@ -45,12 +51,10 @@
import org.apache.servicemix.tck.ReceiverComponent;
import org.apache.xpath.CachedXPathAPI;
import org.springframework.core.io.ClassPathResource;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.traversal.NodeIterator;
public class HttpSoapTest extends TestCase {
-
+ private static transient Log log = LogFactory.getLog(HttpSoapTest.class);
+
protected JBIContainer container;
protected void setUp() throws Exception {
@@ -94,7 +98,7 @@
InputStream is = connection.getInputStream();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
FileUtil.copyInputStream(is, baos);
- System.out.println(baos.toString());
+ log.info(baos.toString());
}
public void testInOnly() throws Exception {
@@ -113,7 +117,7 @@
PostMethod method = new PostMethod("http://localhost:" + PORT + "/?name=Guillaume");
method.setRequestEntity(new InputStreamRequestEntity(getClass().getResourceAsStream("soap-request.xml")));
new HttpClient().executeMethod(method);
- System.out.println(method.getResponseBodyAsString());
+ log.info(method.getResponseBodyAsString());
}
public void testMarhaler() throws Exception {
@@ -128,18 +132,18 @@
exchange.setInMessage(in);
in.setContent(new StringSource("<?xml version='1.0'?><ns1:getQuote xmlns:ns1='urn:xmethods-delayed-quotes' xmlns:xsi='http://www.w3.org/1999/XMLSchema-instance' xmlns:se='http://schemas.xmlsoap.org/soap/envelope/' se:encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'><symbol xsi:type='xsd:string'>SUNW</symbol></ns1:getQuote>"));
marshaler.fromNMS(method, exchange, in);
- System.out.println(((StringRequestEntity) method.getRequestEntity()).getContent());
+ log.info(((StringRequestEntity) method.getRequestEntity()).getContent());
HttpClient httpClient = new HttpClient();
httpClient.executeMethod(method);
- System.out.println(method.getResponseBodyAsString());
+ log.info(method.getResponseBodyAsString());
exchange = new InOnlyImpl("id");
in = exchange.createMessage();
exchange.setInMessage(in);
marshaler.toNMS(in, method);
- System.out.println(new SourceTransformer().toString(in.getContent()));
+ log.info(new SourceTransformer().toString(in.getContent()));
}
public void testMarshalerNamespaces() throws Exception {
@@ -170,11 +174,11 @@
exchange.setInMessage(in);
in.setContent(new StringSource("<?xml version='1.0'?><ns1:getQuote xmlns:ns1='urn:xmethods-delayed-quotes' xmlns:xsi='http://www.w3.org/1999/XMLSchema-instance' xmlns:se='http://schemas.xmlsoap.org/soap/envelope/' se:encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'><symbol xsi:type='xsd:string'>SUNW</symbol></ns1:getQuote>"));
marshaler.fromNMS(method, exchange, in);
- System.out.println(((StringRequestEntity) method.getRequestEntity()).getContent());
+ log.info(((StringRequestEntity) method.getRequestEntity()).getContent());
HttpClient httpClient = new HttpClient();
httpClient.executeMethod(method);
- System.out.println(method.getResponseBodyAsString());
+ log.info(method.getResponseBodyAsString());
exchange = new InOnlyImpl("id");
in = exchange.createMessage();
@@ -183,7 +187,7 @@
Node node = new SourceTransformer().toDOMNode(new SourceTransformer().toStreamSource(in.getContent()));
- System.out.println(new SourceTransformer().toString(node));
+ log.info(new SourceTransformer().toString(node));
CachedXPathAPI cachedXPathAPI = new CachedXPathAPI();
NodeIterator iterator = cachedXPathAPI.selectNodeIterator(node, "//*[local-name() = 'userId']");
@@ -223,7 +227,7 @@
NormalizedMessage msg = (NormalizedMessage) receiver.getMessageList().flushMessages().get(0);
Node node = new SourceTransformer().toDOMNode(new SourceTransformer().toStreamSource(msg.getContent()));
- System.out.println(new SourceTransformer().toString(node));
+ log.info(new SourceTransformer().toString(node));
CachedXPathAPI cachedXPathAPI = new CachedXPathAPI();
NodeIterator iterator = cachedXPathAPI.selectNodeIterator(node, "//*[local-name() = 'userId']");
Modified: incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapWsTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapWsTest.java?view=diff&rev=556864&r1=556863&r2=556864
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapWsTest.java (original)
+++ incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapWsTest.java Tue Jul 17 02:35:34 2007
@@ -23,17 +23,17 @@
import java.net.URL;
import java.net.URLConnection;
-import javax.xml.namespace.QName;
-
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.tck.TestSupport;
-import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.w3c.dom.Node;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.springframework.context.support.AbstractXmlApplicationContext;
/**
* @version $Revision: 359186 $
*/
public class HttpSoapWsTest extends TestSupport {
+ private static transient Log log = LogFactory.getLog(HttpSoapWsTest.class);
protected String quote = "SUNW";
@@ -57,7 +57,7 @@
BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
String inputLine;
while ((inputLine = in.readLine()) != null) {
- System.out.println(inputLine);
+ log.info(inputLine);
}
in.close();
}
Modified: incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpTest.java?view=diff&rev=556864&r1=556863&r2=556864
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpTest.java (original)
+++ incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpTest.java Tue Jul 17 02:35:34 2007
@@ -26,15 +26,19 @@
import javax.xml.namespace.QName;
+import org.w3c.dom.Node;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.tck.TestSupport;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.w3c.dom.Node;
/**
* @version $Revision$
*/
public class HttpTest extends TestSupport {
+ private static transient Log log = LogFactory.getLog(HttpTest.class);
protected String quote = "SUNW";
@@ -63,11 +67,11 @@
Object answer = requestServiceWithFileRequest(serviceName, file);
assertTrue("Shoud return a DOM Node: " + answer, answer instanceof Node);
Node node = (Node) answer;
- System.out.println(transformer.toString(node));
+ log.info(transformer.toString(node));
String text = textValueOfXPath(node, "//Result").trim();
- System.out.println("Found price: " + text);
+ log.info("Found price: " + text);
assertTrue("price text should not be empty", text.length() > 0);
@@ -93,7 +97,7 @@
BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
String inputLine;
while ((inputLine = in.readLine()) != null) {
- System.out.println(inputLine);
+ log.info(inputLine);
}
in.close();
}
Modified: incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/jdbc/JdbcComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/jdbc/JdbcComponentTest.java?view=diff&rev=556864&r1=556863&r2=556864
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/jdbc/JdbcComponentTest.java (original)
+++ incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/jdbc/JdbcComponentTest.java Tue Jul 17 02:35:34 2007
@@ -25,6 +25,8 @@
import junit.framework.TestCase;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.jbi.container.JBIContainer;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
@@ -32,8 +34,9 @@
import org.hsqldb.jdbc.jdbcDataSource;
public class JdbcComponentTest extends TestCase {
+ private static transient Log log = LogFactory.getLog(JdbcComponentTest.class);
- private JBIContainer jbi;
+ private JBIContainer jbi;
private DataSource dataSource;
private JdbcComponent jdbc;
@@ -72,7 +75,7 @@
me.getInMessage().setContent(new StringSource("<sql>select * from MyTable</sql>"));
client.sendSync(me);
String out = new SourceTransformer().contentToString(me.getOutMessage());
- System.err.println(out);
+ log.info(out);
assertTrue(out.contains("One"));
assertTrue(out.contains("Two"));
}
Modified: incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/pojo/PojoTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/pojo/PojoTest.java?view=diff&rev=556864&r1=556863&r2=556864
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/pojo/PojoTest.java (original)
+++ incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/pojo/PojoTest.java Tue Jul 17 02:35:34 2007
@@ -16,14 +16,17 @@
*/
package org.apache.servicemix.components.pojo;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.tck.SpringTestSupport;
-import org.springframework.context.support.AbstractXmlApplicationContext;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.springframework.context.support.AbstractXmlApplicationContext;
/**
* @version $Revision$
*/
public class PojoTest extends SpringTestSupport {
+ private static transient Log log = LogFactory.getLog(PojoTest.class);
public void testSendAndReceiveOfMessages() throws Exception {
MySender sender = (MySender) getBean("sender");
@@ -46,7 +49,7 @@
assertMessagesReceived(receiver.getMessageList(), messageCount);
long end = System.currentTimeMillis();
- System.err.println((end - start) + " ms to send " + messageCount + " messages");
+ log.info((end - start) + " ms to send " + messageCount + " messages");
}
protected AbstractXmlApplicationContext createBeanFactory() {
Modified: incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/saaj/SaajTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/saaj/SaajTest.java?view=diff&rev=556864&r1=556863&r2=556864
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/saaj/SaajTest.java (original)
+++ incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/saaj/SaajTest.java Tue Jul 17 02:35:34 2007
@@ -18,15 +18,19 @@
import javax.xml.namespace.QName;
-import org.apache.servicemix.tck.TestSupport;
-import org.springframework.context.support.AbstractXmlApplicationContext;
import org.w3c.dom.Node;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.servicemix.tck.TestSupport;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.springframework.context.support.AbstractXmlApplicationContext;
/**
* @version $Revision$
*/
public class SaajTest extends TestSupport {
+ private static transient Log log = LogFactory.getLog(SaajTest.class);
protected String quote = "SUNW";
@@ -37,11 +41,11 @@
Object answer = requestServiceWithFileRequest(serviceName, file);
assertTrue("Shoud return a DOM Node: " + answer, answer instanceof Node);
Node node = (Node) answer;
- System.out.println(transformer.toString(node));
+ log.info(transformer.toString(node));
String text = textValueOfXPath(node, "//Result").trim();
- System.out.println("Found price: " + text);
+ log.info("Found price: " + text);
assertTrue("price text should not be empty", text.length() > 0);
Modified: incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/script/ScriptTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/script/ScriptTest.java?view=diff&rev=556864&r1=556863&r2=556864
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/script/ScriptTest.java (original)
+++ incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/script/ScriptTest.java Tue Jul 17 02:35:34 2007
@@ -18,15 +18,18 @@
import java.util.List;
-import org.apache.servicemix.components.script.ScriptComponent;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.tck.Sender;
-import org.springframework.context.support.AbstractXmlApplicationContext;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.springframework.context.support.AbstractXmlApplicationContext;
/**
* @version $Revision$
*/
public class ScriptTest extends org.apache.servicemix.tck.SpringTestSupport {
+ private static transient Log log = LogFactory.getLog(ScriptTest.class);
+
private static List result;
public static List getResult() {
@@ -46,7 +49,7 @@
List result = getResult();
assertNotNull("Have not received any results from groovy!", result);
- System.out.println("Found results: " + result);
+ log.info("Found results: " + result);
}
protected AbstractXmlApplicationContext createBeanFactory() {
Modified: incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/validation/ValidationTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/validation/ValidationTest.java?view=diff&rev=556864&r1=556863&r2=556864
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/validation/ValidationTest.java (original)
+++ incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/validation/ValidationTest.java Tue Jul 17 02:35:34 2007
@@ -20,6 +20,8 @@
import javax.jbi.messaging.InOut;
import javax.jbi.messaging.NormalizedMessage;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.client.ServiceMixClient;
import org.apache.servicemix.jbi.container.SpringJBIContainer;
import org.apache.servicemix.tck.Receiver;
@@ -31,6 +33,8 @@
* @version $Revision$
*/
public class ValidationTest extends SpringTestSupport {
+ private static transient Log log = LogFactory.getLog(ValidationTest.class);
+
protected ServiceMixClient client;
protected Receiver receiver;
@@ -71,10 +75,10 @@
assertEquals("out", null, out);
assertNotNull("Should have a fault", fault);
- System.out.println("error is: " + error);
+ log.info("error is: " + error);
- System.out.println("Fault is...");
- System.out.println(transformer.toString(fault.getContent()));
+ log.info("Fault is...");
+ log.info(transformer.toString(fault.getContent()));
// TODO?
//assertEquals("error", null, error);
@@ -94,10 +98,10 @@
assertEquals("out", null, out);
assertNotNull("Should have a fault", fault);
- System.out.println("error is: " + error);
+ log.info("error is: " + error);
- System.out.println("Fault is...");
- System.out.println(transformer.toString(fault.getContent()));
+ log.info("Fault is...");
+ log.info(transformer.toString(fault.getContent()));
// TODO?
//assertEquals("error", null, error);
Modified: incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/wsif/SampleServiceMessageListener.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/wsif/SampleServiceMessageListener.java?view=diff&rev=556864&r1=556863&r2=556864
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/wsif/SampleServiceMessageListener.java (original)
+++ incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/wsif/SampleServiceMessageListener.java Tue Jul 17 02:35:34 2007
@@ -17,16 +17,18 @@
package org.apache.servicemix.components.wsif;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.jms.core.JmsTemplate;
-import org.springframework.jms.core.MessageCreator;
-
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageListener;
import javax.jms.Session;
import javax.jms.TextMessage;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.jms.core.JmsTemplate;
+import org.springframework.jms.core.MessageCreator;
+
/**
* This is a simple MDB that processes a message containing an integer
* that represents a zip code, and returns a message containing a
@@ -38,6 +40,8 @@
* @version $Revision$
*/
public class SampleServiceMessageListener implements MessageListener, InitializingBean {
+ private static transient Log log = LogFactory.getLog(SampleServiceMessageListener.class);
+
private JmsTemplate template;
public JmsTemplate getTemplate() {
@@ -59,7 +63,7 @@
TextMessage message = (TextMessage) msg;
// assume we have an integer
String text = message.getText();
- System.out.println("Text: " + text);
+ log.info("Text: " + text);
int zipCode = new Integer(text).intValue();
// return true if zip code < 50000, false otherwise
if (zipCode < 50000) {
@@ -71,8 +75,7 @@
}
catch (Exception e) {
// aargh - this should not happen usually
- System.out.println(e);
- e.printStackTrace();
+ log.error(e.getMessage(), e);
}
}
Modified: incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/wsif/WsifTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/wsif/WsifTest.java?view=diff&rev=556864&r1=556863&r2=556864
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/wsif/WsifTest.java (original)
+++ incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/wsif/WsifTest.java Tue Jul 17 02:35:34 2007
@@ -20,15 +20,20 @@
import javax.jbi.messaging.NormalizedMessage;
import javax.xml.namespace.QName;
-import org.apache.servicemix.tck.TestSupport;
-import org.springframework.context.support.AbstractXmlApplicationContext;
import org.w3c.dom.Node;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.servicemix.tck.TestSupport;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.springframework.context.support.AbstractXmlApplicationContext;
/**
* @version $Revision$
*/
public class WsifTest extends TestSupport {
+ private static transient Log log = LogFactory.getLog(WsifTest.class);
+
QName serviceName = new QName("http://servicemix.org/cheese/", "checkAvailability");
public static final int MESSAGES = 2;
@@ -40,11 +45,11 @@
Object answer = requestServiceWithFileRequest(serviceName, file);
assertTrue("Shoud return a DOM Node: " + answer, answer instanceof Node);
Node node = (Node) answer;
- System.out.println(transformer.toString(node));
+ log.info(transformer.toString(node));
String text = textValueOfXPath(node, "/*/*[local-name()='part']").trim();
- System.out.println("Found value: " + text);
+ log.info("Found value: " + text);
assertTrue("price text should not be empty", text.length() > 0);
}
@@ -61,7 +66,7 @@
NormalizedMessage out = exchange.getOutMessage();
String result = (String) out.getProperty("result");
- System.out.println("Found value: " + result);
+ log.info("Found value: " + result);
// END SNIPPET: wsif
assertEquals("should have no fault", null, exchange.getFault());
@@ -96,7 +101,7 @@
String result = (String) out.getProperty("result");
- System.out.println("Found value: " + result);
+ log.info("Found value: " + result);
assertTrue("price text should not be empty", result.length() > 0);
}
Modified: incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/XFireBindingTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/XFireBindingTest.java?view=diff&rev=556864&r1=556863&r2=556864
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/XFireBindingTest.java (original)
+++ incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/XFireBindingTest.java Tue Jul 17 02:35:34 2007
@@ -18,19 +18,23 @@
import javax.xml.namespace.QName;
-import org.apache.servicemix.tck.TestSupport;
-import org.springframework.context.support.AbstractXmlApplicationContext;
import org.w3c.dom.Node;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.servicemix.tck.TestSupport;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.springframework.context.support.AbstractXmlApplicationContext;
public class XFireBindingTest extends TestSupport {
+ private static transient Log log = LogFactory.getLog(XFireBindingTest.class);
public void testSendingAndReceivingMessagesUsingSpring() throws Exception {
Object answer = requestServiceWithFileRequest(new QName("http://xfire.components.servicemix.org", "Echo"),
"/org/apache/servicemix/components/xfire/echo.xml");
assertTrue("Shoud return a DOM Node: " + answer, answer instanceof Node);
Node node = (Node) answer;
- System.out.println(transformer.toString(node));
+ log.info(transformer.toString(node));
Echo echo = (Echo) context.getBean("xfireReceiverService");
assertEquals(1, echo.getCount());
Modified: incubator/servicemix/trunk/common/servicemix-soap/src/test/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-soap/src/test/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandlerTest.java?view=diff&rev=556864&r1=556863&r2=556864
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-soap/src/test/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandlerTest.java (original)
+++ incubator/servicemix/trunk/common/servicemix-soap/src/test/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandlerTest.java Tue Jul 17 02:35:34 2007
@@ -21,8 +21,12 @@
import java.security.Principal;
import java.util.List;
+import org.w3c.dom.Document;
+
import junit.framework.TestCase;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.jaxp.StringSource;
import org.apache.servicemix.jbi.jaxp.W3CDOMStreamWriter;
import org.apache.servicemix.jbi.security.auth.impl.JAASAuthenticationService;
@@ -38,12 +42,12 @@
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.handler.WSHandlerResult;
import org.springframework.core.io.ClassPathResource;
-import org.w3c.dom.Document;
-
import sun.security.x509.X500Name;
public class WSSecurityHandlerTest extends TestCase {
-
+
+ private static transient Log log = LogFactory.getLog(WSSecurityHandlerTest.class);
+
static {
String path = System.getProperty("java.security.auth.login.config");
if (path == null) {
@@ -53,7 +57,7 @@
System.setProperty("java.security.auth.login.config", path);
}
}
- System.out.println("Path to login config: " + path);
+ log.info("Path to login config: " + path);
}
public void testUserNameToken() throws Exception {
@@ -109,7 +113,7 @@
handler.onSend(ctx);
Document doc = ctx.getInMessage().getDocument();
- System.err.println(DOMUtil.asXML(doc));
+ log.info(DOMUtil.asXML(doc));
handler.setReceiveAction(WSHandlerConstants.SIGNATURE);
handler.onReceive(ctx);
Modified: incubator/servicemix/trunk/common/servicemix-soap/src/test/java/org/apache/servicemix/soap/marshalers/FaultTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-soap/src/test/java/org/apache/servicemix/soap/marshalers/FaultTest.java?view=diff&rev=556864&r1=556863&r2=556864
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-soap/src/test/java/org/apache/servicemix/soap/marshalers/FaultTest.java (original)
+++ incubator/servicemix/trunk/common/servicemix-soap/src/test/java/org/apache/servicemix/soap/marshalers/FaultTest.java Tue Jul 17 02:35:34 2007
@@ -20,17 +20,21 @@
import javax.xml.namespace.QName;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
import junit.framework.TestCase;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
import org.apache.servicemix.jbi.util.DOMUtil;
import org.apache.servicemix.soap.SoapFault;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
public class FaultTest extends TestCase {
+ private static transient Log log = LogFactory.getLog(FaultTest.class);
private SourceTransformer sourceTransformer = new SourceTransformer();
@@ -78,7 +82,7 @@
ByteArrayOutputStream baos = new ByteArrayOutputStream();
writer.write(baos);
- System.err.println("Resulting Fault: \n" + baos);
+ log.info("Resulting Fault: \n" + baos);
}
public void testReadSoap11UsingDom() throws Exception {
@@ -128,7 +132,7 @@
msg.setFault(fault);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
marshaler.createWriter(msg).write(baos);
- System.err.println(baos.toString());
+ log.info(baos.toString());
Node node = sourceTransformer.toDOMNode(new StringSource(baos.toString()));
Element e = ((Document) node).getDocumentElement();
@@ -165,7 +169,7 @@
msg.setFault(fault);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
marshaler.createWriter(msg).write(baos);
- System.err.println(baos.toString());
+ log.info(baos.toString());
Node node = sourceTransformer.toDOMNode(new StringSource(baos.toString()));
Element e = ((Document) node).getDocumentElement();
Modified: incubator/servicemix/trunk/common/servicemix-soap2/src/test/java/org/apache/servicemix/soap/HelloWorldSoapTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-soap2/src/test/java/org/apache/servicemix/soap/HelloWorldSoapTest.java?view=diff&rev=556864&r1=556863&r2=556864
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-soap2/src/test/java/org/apache/servicemix/soap/HelloWorldSoapTest.java (original)
+++ incubator/servicemix/trunk/common/servicemix-soap2/src/test/java/org/apache/servicemix/soap/HelloWorldSoapTest.java Tue Jul 17 02:35:34 2007
@@ -31,11 +31,15 @@
import javax.xml.namespace.QName;
import javax.xml.transform.stream.StreamResult;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
import junit.framework.TestCase;
-import org.apache.log4j.PropertyConfigurator;
-import org.apache.servicemix.soap.api.Message;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.soap.api.InterceptorProvider.Phase;
+import org.apache.servicemix.soap.api.Message;
import org.apache.servicemix.soap.api.model.Binding;
import org.apache.servicemix.soap.api.model.Operation;
import org.apache.servicemix.soap.bindings.soap.Soap11;
@@ -50,20 +54,21 @@
import org.apache.servicemix.soap.wsdl.BindingFactory;
import org.apache.servicemix.soap.wsdl.WSDLUtils;
import org.apache.servicemix.soap.wsdl.validator.WSIBPValidator;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
public class HelloWorldSoapTest extends TestCase {
+ private static transient Log log = LogFactory.getLog(HelloWorldSoapTest.class);
- static {
- String conf = System.getProperty("log4j.configuration");
- System.err.println("Configuring log4j with: " + conf);
- if (conf != null) {
- PropertyConfigurator.configure(conf);
- }
- }
+// static {
+// String conf = System.getProperty("log4j.configuration");
+// System.err.println("Configuring log4j with: " + conf);
+// if (conf != null) {
+// PropertyConfigurator.configure(conf);
+// }
+// }
public void testDocLitInput() throws Exception {
+ ByteArrayOutputStream baos;
+
Binding<?> binding = getBinding("HelloWorld-DOC.wsdl");
PhaseInterceptorChain phaseIn = new PhaseInterceptorChain();
phaseIn.add(binding.getInterceptors(Phase.ServerIn));
@@ -76,7 +81,9 @@
NormalizedMessage nm = msg.getContent(NormalizedMessage.class);
Document doc = DomUtil.parse(nm.getContent());
- DomUtil.getTransformerFactory().newTransformer().transform(nm.getContent(), new StreamResult(System.err));
+ baos = new ByteArrayOutputStream();
+ DomUtil.getTransformerFactory().newTransformer().transform(nm.getContent(), new StreamResult(baos));
+ log.info(baos.toString());
// check jbi message element
Element root = DomUtil.getFirstChildElement(doc);
@@ -125,7 +132,8 @@
PhaseInterceptorChain phaseOut = new PhaseInterceptorChain();
phaseOut.add(binding.getInterceptors(Phase.ClientOut));
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ baos = new ByteArrayOutputStream();
+
Message msgOut = new MessageImpl();
msgOut.put(Binding.class, binding);
msgOut.setContent(OutputStream.class, baos);
@@ -133,7 +141,7 @@
msgOut.setContent(NormalizedMessage.class, nm);
msgOut.put(SoapVersion.class, msg.get(SoapVersion.class));
phaseOut.doIntercept(msgOut);
- System.err.println(baos.toString());
+ log.info(baos.toString());
Document node = DomUtil.parse(new ByteArrayInputStream(baos.toByteArray()));
@@ -170,6 +178,8 @@
}
public void testDocLitOutput() throws Exception {
+ ByteArrayOutputStream baos;
+
Binding<?> binding = getBinding("HelloWorld-DOC.wsdl");
PhaseInterceptorChain phaseIn = new PhaseInterceptorChain();
phaseIn.add(binding.getInterceptors(Phase.ClientIn));
@@ -184,7 +194,9 @@
NormalizedMessage nm = msg.getContent(NormalizedMessage.class);
Document doc = DomUtil.parse(nm.getContent());
- DomUtil.getTransformerFactory().newTransformer().transform(nm.getContent(), new StreamResult(System.err));
+ baos = new ByteArrayOutputStream();
+ DomUtil.getTransformerFactory().newTransformer().transform(nm.getContent(), new StreamResult(baos));
+ log.info(baos.toString());
// check jbi message element
Element root = DomUtil.getFirstChildElement(doc);
@@ -214,7 +226,8 @@
PhaseInterceptorChain phaseOut = new PhaseInterceptorChain();
phaseOut.add(binding.getInterceptors(Phase.ServerOut));
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+ baos = new ByteArrayOutputStream();
Message msgOut = new MessageImpl();
msgOut.put(Binding.class, binding);
msgOut.put(Operation.class, binding.getOperations().iterator().next());
@@ -223,7 +236,7 @@
msgOut.setContent(NormalizedMessage.class, nm);
msgOut.put(SoapVersion.class, msg.get(SoapVersion.class));
phaseOut.doIntercept(msgOut);
- System.err.println(baos.toString());
+ log.info(baos.toString());
Document node = DomUtil.parse(new ByteArrayInputStream(baos.toByteArray()));
Element envelope = DomUtil.getFirstChildElement(node);
@@ -244,6 +257,8 @@
}
public void testDocLitFault() throws Exception {
+ ByteArrayOutputStream baos;
+
Binding<?> binding = getBinding("HelloWorld-DOC.wsdl");
PhaseInterceptorChain phaseIn = new PhaseInterceptorChain();
phaseIn.add(binding.getInterceptors(Phase.ClientIn));
@@ -257,7 +272,9 @@
NormalizedMessage nm = msg.getContent(NormalizedMessage.class);
Document doc = DomUtil.parse(nm.getContent());
- DomUtil.getTransformerFactory().newTransformer().transform(nm.getContent(), new StreamResult(System.err));
+ baos = new ByteArrayOutputStream();
+ DomUtil.getTransformerFactory().newTransformer().transform(nm.getContent(), new StreamResult(baos));
+ log.info(baos.toString());
Element root = DomUtil.getFirstChildElement(doc);
assertNotNull(root);
@@ -266,7 +283,8 @@
PhaseInterceptorChain phaseOut = new PhaseInterceptorChain();
phaseOut.add(binding.getInterceptors(Phase.ServerOut));
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+ baos = new ByteArrayOutputStream();
Message msgOut = new MessageImpl();
msgOut.put(Binding.class, binding);
msgOut.setContent(OutputStream.class, baos);
@@ -283,7 +301,7 @@
phaseOutFault.doIntercept(msgOut);
}
- System.err.println(baos.toString());
+ log.info(baos.toString());
Document node = DomUtil.parse(new ByteArrayInputStream(baos.toByteArray()));
Element envelope = DomUtil.getFirstChildElement(node);
@@ -301,6 +319,8 @@
}
public void testRpcLitInput() throws Exception {
+ ByteArrayOutputStream baos;
+
Binding<?> binding = getBinding("HelloWorld-RPC.wsdl");
PhaseInterceptorChain phaseIn = new PhaseInterceptorChain();
phaseIn.add(binding.getInterceptors(Phase.ServerIn));
@@ -313,8 +333,11 @@
NormalizedMessage nm = msg.getContent(NormalizedMessage.class);
Document doc = DomUtil.parse(nm.getContent());
- DomUtil.getTransformerFactory().newTransformer().transform(nm.getContent(), new StreamResult(System.err));
-
+
+ baos = new ByteArrayOutputStream();
+ DomUtil.getTransformerFactory().newTransformer().transform(nm.getContent(), new StreamResult(baos));
+ log.info(baos.toString());
+
Element root = DomUtil.getFirstChildElement(doc);
assertNotNull(msg);
assertEquals(JbiConstants.WSDL11_WRAPPER_NAMESPACE, root.getNamespaceURI());
@@ -375,7 +398,8 @@
PhaseInterceptorChain phaseOut = new PhaseInterceptorChain();
phaseOut.add(binding.getInterceptors(Phase.ClientOut));
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+ baos = new ByteArrayOutputStream();
Message msgOut = new MessageImpl();
msgOut.put(Binding.class, binding);
msgOut.setContent(OutputStream.class, baos);
@@ -383,7 +407,7 @@
msgOut.setContent(NormalizedMessage.class, nm);
msgOut.put(SoapVersion.class, msg.get(SoapVersion.class));
phaseOut.doIntercept(msgOut);
- System.err.println(baos.toString());
+ log.info(baos.toString());
Document node = DomUtil.parse(new ByteArrayInputStream(baos.toByteArray()));
Element envelope = DomUtil.getFirstChildElement(node);
@@ -414,6 +438,8 @@
}
public void testRpcLitOutput() throws Exception {
+ ByteArrayOutputStream baos;
+
Binding<?> binding = getBinding("HelloWorld-RPC.wsdl");
PhaseInterceptorChain phaseIn = new PhaseInterceptorChain();
phaseIn.add(binding.getInterceptors(Phase.ClientIn));
@@ -428,7 +454,10 @@
NormalizedMessage nm = msg.getContent(NormalizedMessage.class);
Document doc = DomUtil.parse(nm.getContent());
- DomUtil.getTransformerFactory().newTransformer().transform(nm.getContent(), new StreamResult(System.err));
+
+ baos = new ByteArrayOutputStream();
+ DomUtil.getTransformerFactory().newTransformer().transform(nm.getContent(), new StreamResult(baos));
+ log.info(baos.toString());
// check jbi message element
Element root = DomUtil.getFirstChildElement(doc);
@@ -449,7 +478,8 @@
PhaseInterceptorChain phaseOut = new PhaseInterceptorChain();
phaseOut.add(binding.getInterceptors(Phase.ServerOut));
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+ baos = new ByteArrayOutputStream();
Message msgOut = new MessageImpl();
msgOut.put(Binding.class, binding);
msgOut.put(Operation.class, binding.getOperations().iterator().next());
@@ -458,7 +488,7 @@
msgOut.setContent(NormalizedMessage.class, nm);
msgOut.put(SoapVersion.class, msg.get(SoapVersion.class));
phaseOut.doIntercept(msgOut);
- System.err.println(baos.toString());
+ log.info(baos.toString());
Document node = DomUtil.parse(new ByteArrayInputStream(baos.toByteArray()));
Element envelope = DomUtil.getFirstChildElement(node);
@@ -485,7 +515,7 @@
WSIBPValidator validator = new WSIBPValidator(def);
if (!validator.isValid()) {
for (String err : validator.getErrors()) {
- System.err.println(err);
+ log.info(err);
}
}
Service svc = (Service) def.getServices().values().iterator().next();
Modified: incubator/servicemix/trunk/common/servicemix-soap2/src/test/java/org/apache/servicemix/soap/PersonHttpTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-soap2/src/test/java/org/apache/servicemix/soap/PersonHttpTest.java?view=diff&rev=556864&r1=556863&r2=556864
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-soap2/src/test/java/org/apache/servicemix/soap/PersonHttpTest.java (original)
+++ incubator/servicemix/trunk/common/servicemix-soap2/src/test/java/org/apache/servicemix/soap/PersonHttpTest.java Tue Jul 17 02:35:34 2007
@@ -17,6 +17,7 @@
package org.apache.servicemix.soap;
import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import javax.jbi.messaging.MessageExchange;
@@ -25,10 +26,15 @@
import javax.xml.namespace.QName;
import javax.xml.transform.stream.StreamResult;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
import junit.framework.TestCase;
-import org.apache.servicemix.soap.api.Message;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.soap.api.InterceptorProvider.Phase;
+import org.apache.servicemix.soap.api.Message;
import org.apache.servicemix.soap.api.model.Binding;
import org.apache.servicemix.soap.bindings.http.HttpConstants;
import org.apache.servicemix.soap.core.MessageImpl;
@@ -42,11 +48,10 @@
import org.apache.woden.wsdl20.Description;
import org.apache.woden.wsdl20.Endpoint;
import org.apache.woden.wsdl20.xml.DescriptionElement;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
public class PersonHttpTest extends TestCase {
-
+ private static transient Log log = LogFactory.getLog(PersonHttpTest.class);
+
private static Binding<?> binding = getBinding("Person.wsdl2");
public void testGetPerson() throws Exception {
@@ -64,7 +69,10 @@
MessageExchange me = message.getContent(MessageExchange.class);
NormalizedMessage nm = message.getContent(NormalizedMessage.class);
Document doc = DomUtil.parse(nm.getContent());
- DomUtil.getTransformerFactory().newTransformer().transform(nm.getContent(), new StreamResult(System.err));
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ DomUtil.getTransformerFactory().newTransformer().transform(nm.getContent(), new StreamResult(baos));
+ log.info(baos.toString());
assertEquals(new QName("http://example.org/Person", "getPerson"), me.getOperation());
Element e = DomUtil.getFirstChildElement(doc);
@@ -93,7 +101,10 @@
MessageExchange me = message.getContent(MessageExchange.class);
NormalizedMessage nm = message.getContent(NormalizedMessage.class);
Document doc = DomUtil.parse(nm.getContent());
- DomUtil.getTransformerFactory().newTransformer().transform(nm.getContent(), new StreamResult(System.err));
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ DomUtil.getTransformerFactory().newTransformer().transform(nm.getContent(), new StreamResult(baos));
+ log.info(baos.toString());
assertEquals(new QName("http://example.org/Person", "updatePerson"), me.getOperation());
Element e = DomUtil.getFirstChildElement(doc);
@@ -132,7 +143,10 @@
MessageExchange me = message.getContent(MessageExchange.class);
NormalizedMessage nm = message.getContent(NormalizedMessage.class);
Document doc = DomUtil.parse(nm.getContent());
- DomUtil.getTransformerFactory().newTransformer().transform(nm.getContent(), new StreamResult(System.err));
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ DomUtil.getTransformerFactory().newTransformer().transform(nm.getContent(), new StreamResult(baos));
+ log.info(baos.toString());
assertEquals(new QName("http://example.org/Person", "addPerson"), me.getOperation());
Element e = DomUtil.getFirstChildElement(doc);
@@ -170,7 +184,10 @@
MessageExchange me = message.getContent(MessageExchange.class);
NormalizedMessage nm = message.getContent(NormalizedMessage.class);
Document doc = DomUtil.parse(nm.getContent());
- DomUtil.getTransformerFactory().newTransformer().transform(nm.getContent(), new StreamResult(System.err));
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ DomUtil.getTransformerFactory().newTransformer().transform(nm.getContent(), new StreamResult(baos));
+ log.info(baos.toString());
assertEquals(new QName("http://example.org/Person", "deletePerson"), me.getOperation());
Element e = DomUtil.getFirstChildElement(doc);