Author: ffang
Date: Wed Jan 20 08:34:15 2010
New Revision: 901103
URL: http://svn.apache.org/viewvc?rev=901103&view=rev
Log:
[SMXCOMP-701]several tests failed with IBM jdk caused by missing required
system to start test server
Modified:
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTransactionTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTransactionWsdlConfigTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderAsyncSystemTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderSystemTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/policy/CxfBCPolicyTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderConsumerMtomSecurityTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderHttpsTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderSecurityTest.java
Modified:
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTest.java?rev=901103&r1=901102&r2=901103&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTest.java
(original)
+++
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTest.java
Wed Jan 20 08:34:15 2010
@@ -61,8 +61,18 @@
assertTrue("server did not launch correctly",
launchServer(EmbededJMSBrokerLauncher.class, props, false));
embeddedLauncher = sl;
+ props = new HashMap<String, String>();
+ if (System.getProperty("javax.xml.transform.TransformerFactory") !=
null) {
+ props.put("javax.xml.transform.TransformerFactory",
System.getProperty("javax.xml.transform.TransformerFactory"));
+ }
+ if (System.getProperty("javax.xml.stream.XMLInputFactory") != null) {
+ props.put("javax.xml.stream.XMLInputFactory",
System.getProperty("javax.xml.stream.XMLInputFactory"));
+ }
+ if (System.getProperty("javax.xml.stream.XMLOutputFactory") != null) {
+ props.put("javax.xml.stream.XMLOutputFactory",
System.getProperty("javax.xml.stream.XMLOutputFactory"));
+ }
assertTrue("server did not launch correctly",
- launchServer(MyJMSServer.class, null, false));
+ launchServer(MyJMSServer.class, props, false));
jmsLauncher = sl;
serversStarted = true;
Modified:
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTransactionTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTransactionTest.java?rev=901103&r1=901102&r2=901103&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTransactionTest.java
(original)
+++
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTransactionTest.java
Wed Jan 20 08:34:15 2010
@@ -62,8 +62,18 @@
assertTrue("server did not launch correctly",
launchServer(EmbededJMSBrokerLauncher.class, props, true));
embeddedLauncher = sl;
+ props = new HashMap<String, String>();
+ if (System.getProperty("javax.xml.transform.TransformerFactory") !=
null) {
+ props.put("javax.xml.transform.TransformerFactory",
System.getProperty("javax.xml.transform.TransformerFactory"));
+ }
+ if (System.getProperty("javax.xml.stream.XMLInputFactory") != null) {
+ props.put("javax.xml.stream.XMLInputFactory",
System.getProperty("javax.xml.stream.XMLInputFactory"));
+ }
+ if (System.getProperty("javax.xml.stream.XMLOutputFactory") != null) {
+ props.put("javax.xml.stream.XMLOutputFactory",
System.getProperty("javax.xml.stream.XMLOutputFactory"));
+ }
assertTrue("server did not launch correctly",
- launchServer(MyJMSServer.class, null, false));
+ launchServer(MyJMSServer.class, props, false));
jmsLauncher = sl;
serversStarted = true;
Modified:
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTransactionWsdlConfigTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTransactionWsdlConfigTest.java?rev=901103&r1=901102&r2=901103&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTransactionWsdlConfigTest.java
(original)
+++
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTransactionWsdlConfigTest.java
Wed Jan 20 08:34:15 2010
@@ -61,8 +61,18 @@
assertTrue("server did not launch correctly",
launchServer(EmbededJMSBrokerLauncher.class, props, true));
embeddedLauncher = sl;
+ props = new HashMap<String, String>();
+ if (System.getProperty("javax.xml.transform.TransformerFactory") !=
null) {
+ props.put("javax.xml.transform.TransformerFactory",
System.getProperty("javax.xml.transform.TransformerFactory"));
+ }
+ if (System.getProperty("javax.xml.stream.XMLInputFactory") != null) {
+ props.put("javax.xml.stream.XMLInputFactory",
System.getProperty("javax.xml.stream.XMLInputFactory"));
+ }
+ if (System.getProperty("javax.xml.stream.XMLOutputFactory") != null) {
+ props.put("javax.xml.stream.XMLOutputFactory",
System.getProperty("javax.xml.stream.XMLOutputFactory"));
+ }
assertTrue("server did not launch correctly",
- launchServer(MyJMSServer.class, null, false));
+ launchServer(MyJMSServer.class, props, false));
jmsLauncher = sl;
serversStarted = true;
Modified:
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderAsyncSystemTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderAsyncSystemTest.java?rev=901103&r1=901102&r2=901103&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderAsyncSystemTest.java
(original)
+++
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderAsyncSystemTest.java
Wed Jan 20 08:34:15 2010
@@ -73,8 +73,18 @@
assertTrue("server did not launch correctly",
launchServer(EmbededJMSBrokerLauncher.class, props, false));
embeddedLauncher = sl;
+ props = new HashMap<String, String>();
+ if (System.getProperty("javax.xml.transform.TransformerFactory") !=
null) {
+ props.put("javax.xml.transform.TransformerFactory",
System.getProperty("javax.xml.transform.TransformerFactory"));
+ }
+ if (System.getProperty("javax.xml.stream.XMLInputFactory") != null) {
+ props.put("javax.xml.stream.XMLInputFactory",
System.getProperty("javax.xml.stream.XMLInputFactory"));
+ }
+ if (System.getProperty("javax.xml.stream.XMLOutputFactory") != null) {
+ props.put("javax.xml.stream.XMLOutputFactory",
System.getProperty("javax.xml.stream.XMLOutputFactory"));
+ }
assertTrue("server did not launch correctly",
- launchServer(MyJMSServer.class, null, false));
+ launchServer(MyJMSServer.class, props, false));
jmsLauncher = sl;
assertTrue("server did not launch correctly",
Modified:
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderSystemTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderSystemTest.java?rev=901103&r1=901102&r2=901103&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderSystemTest.java
(original)
+++
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderSystemTest.java
Wed Jan 20 08:34:15 2010
@@ -68,8 +68,18 @@
assertTrue("server did not launch correctly",
launchServer(EmbededJMSBrokerLauncher.class, props, false));
embeddedLauncher = sl;
+ props = new HashMap<String, String>();
+ if (System.getProperty("javax.xml.transform.TransformerFactory") !=
null) {
+ props.put("javax.xml.transform.TransformerFactory",
System.getProperty("javax.xml.transform.TransformerFactory"));
+ }
+ if (System.getProperty("javax.xml.stream.XMLInputFactory") != null) {
+ props.put("javax.xml.stream.XMLInputFactory",
System.getProperty("javax.xml.stream.XMLInputFactory"));
+ }
+ if (System.getProperty("javax.xml.stream.XMLOutputFactory") != null) {
+ props.put("javax.xml.stream.XMLOutputFactory",
System.getProperty("javax.xml.stream.XMLOutputFactory"));
+ }
assertTrue("server did not launch correctly",
- launchServer(MyJMSServer.class, null, false));
+ launchServer(MyJMSServer.class, props, false));
jmsLauncher = sl;
assertTrue("server did not launch correctly",
Modified:
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/policy/CxfBCPolicyTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/policy/CxfBCPolicyTest.java?rev=901103&r1=901102&r2=901103&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/policy/CxfBCPolicyTest.java
(original)
+++
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/policy/CxfBCPolicyTest.java
Wed Jan 20 08:34:15 2010
@@ -18,6 +18,7 @@
import java.io.IOException;
import java.net.URL;
+import java.util.HashMap;
import java.util.Map;
import java.util.logging.Logger;
@@ -49,9 +50,19 @@
if (serversStarted) {
return;
}
+ Map<String, String> props = new HashMap<String, String>();
+ if (System.getProperty("javax.xml.transform.TransformerFactory") !=
null) {
+ props.put("javax.xml.transform.TransformerFactory",
System.getProperty("javax.xml.transform.TransformerFactory"));
+ }
+ if (System.getProperty("javax.xml.stream.XMLInputFactory") != null) {
+ props.put("javax.xml.stream.XMLInputFactory",
System.getProperty("javax.xml.stream.XMLInputFactory"));
+ }
+ if (System.getProperty("javax.xml.stream.XMLOutputFactory") != null) {
+ props.put("javax.xml.stream.XMLOutputFactory",
System.getProperty("javax.xml.stream.XMLOutputFactory"));
+ }
assertTrue("JBIContainers did not launch correctly",
- launchServer(JBIServer.class, null, false));
+ launchServer(JBIServer.class, props, false));
serversStarted = true;
Modified:
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderConsumerMtomSecurityTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderConsumerMtomSecurityTest.java?rev=901103&r1=901102&r2=901103&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderConsumerMtomSecurityTest.java
(original)
+++
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderConsumerMtomSecurityTest.java
Wed Jan 20 08:34:15 2010
@@ -88,11 +88,21 @@
// for this key, and if it's set, then propagate the property on
// to the server we launch as well.
Map<String, String> properties = null;
+ properties = new HashMap<String, String>();
if (System.getProperty("java.security.properties") != null) {
- properties = new HashMap<String, String>();
+
properties.put("java.security.properties",
System.getProperty("java.security.properties"));
}
+ if (System.getProperty("javax.xml.transform.TransformerFactory")
!= null) {
+ properties.put("javax.xml.transform.TransformerFactory",
System.getProperty("javax.xml.transform.TransformerFactory"));
+ }
+ if (System.getProperty("javax.xml.stream.XMLInputFactory") !=
null) {
+ properties.put("javax.xml.stream.XMLInputFactory",
System.getProperty("javax.xml.stream.XMLInputFactory"));
+ }
+ if (System.getProperty("javax.xml.stream.XMLOutputFactory") !=
null) {
+ properties.put("javax.xml.stream.XMLOutputFactory",
System.getProperty("javax.xml.stream.XMLOutputFactory"));
+ }
sl = new ServerLauncher(clz.getName(), properties, null,
inProcess);
ok = sl.launchServer();
assertTrue("server failed to launch", ok);
Modified:
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderHttpsTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderHttpsTest.java?rev=901103&r1=901102&r2=901103&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderHttpsTest.java
(original)
+++
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderHttpsTest.java
Wed Jan 20 08:34:15 2010
@@ -19,6 +19,8 @@
import java.io.File;
import java.io.IOException;
import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
import javax.jbi.messaging.InOut;
import javax.xml.namespace.QName;
@@ -48,11 +50,22 @@
component.getServiceUnitManager().deploy("proxy",
getServiceUnitPath("provider"));
component.getServiceUnitManager().init("proxy",
getServiceUnitPath("provider"));
component.getServiceUnitManager().start("proxy");
+ Map<String, String> props = new HashMap<String, String>();
+ if (System.getProperty("javax.xml.transform.TransformerFactory") !=
null) {
+ props.put("javax.xml.transform.TransformerFactory",
System.getProperty("javax.xml.transform.TransformerFactory"));
+ }
+ if (System.getProperty("javax.xml.stream.XMLInputFactory") != null) {
+ props.put("javax.xml.stream.XMLInputFactory",
System.getProperty("javax.xml.stream.XMLInputFactory"));
+ }
+ if (System.getProperty("javax.xml.stream.XMLOutputFactory") != null) {
+ props.put("javax.xml.stream.XMLOutputFactory",
System.getProperty("javax.xml.stream.XMLOutputFactory"));
+ }
+
assertTrue(
"Server failed to launch",
// run the server in another process
// set this to false to fork
- launchServer(HttpsServer.class, false));
+ launchServer(HttpsServer.class, props, false));
}
protected void tearDown() throws Exception {
@@ -67,10 +80,10 @@
}
}
- public boolean launchServer(Class<?> clz, boolean inProcess) {
+ public boolean launchServer(Class<?> clz, Map<String, String> p, boolean
inProcess) {
boolean ok = false;
try {
- sl = new ServerLauncher(clz.getName(), inProcess);
+ sl = new ServerLauncher(clz.getName(), p, null, inProcess);
ok = sl.launchServer();
assertTrue("server failed to launch", ok);
Modified:
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderSecurityTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderSecurityTest.java?rev=901103&r1=901102&r2=901103&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderSecurityTest.java
(original)
+++
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderSecurityTest.java
Wed Jan 20 08:34:15 2010
@@ -76,12 +76,21 @@
// around some security test issues. Check our system properties
// for this key, and if it's set, then propagate the property on
// to the server we launch as well.
- Map<String, String> properties = null;
+ Map<String, String> properties = new HashMap<String, String>();;
if (System.getProperty("java.security.properties") != null) {
- properties = new HashMap<String, String>();
+
properties.put("java.security.properties",
System.getProperty("java.security.properties"));
}
+ if (System.getProperty("javax.xml.transform.TransformerFactory")
!= null) {
+ properties.put("javax.xml.transform.TransformerFactory",
System.getProperty("javax.xml.transform.TransformerFactory"));
+ }
+ if (System.getProperty("javax.xml.stream.XMLInputFactory") !=
null) {
+ properties.put("javax.xml.stream.XMLInputFactory",
System.getProperty("javax.xml.stream.XMLInputFactory"));
+ }
+ if (System.getProperty("javax.xml.stream.XMLOutputFactory") !=
null) {
+ properties.put("javax.xml.stream.XMLOutputFactory",
System.getProperty("javax.xml.stream.XMLOutputFactory"));
+ }
sl = new ServerLauncher(clz.getName(), properties, null,
inProcess);
ok = sl.launchServer();
assertTrue("server failed to launch", ok);
