svn commit: r689324 - /servicemix/smx3/tags/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderSecurityTest.java

[ff...@apache.org]

Author: ffang
Date: Tue Aug 26 18:22:47 2008
New Revision: 689324

URL: http://svn.apache.org/viewvc?rev=689324&view=rev
Log:
[SM-1523]CxfBcProviderSecurityTest failure with ibm jdk

Modified:
    servicemix/smx3/tags/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderSecurityTest.java

Modified: servicemix/smx3/tags/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderSecurityTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/tags/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderSecurityTest.java?rev=689324&r1=689323&r2=689324&view=diff
==============================================================================
--- servicemix/smx3/tags/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderSecurityTest.java (original)
+++ servicemix/smx3/tags/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderSecurityTest.java Tue Aug 26 18:22:47 2008
@@ -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;
@@ -70,7 +72,17 @@
     public boolean launchServer(Class<?> clz, boolean inProcess) {
         boolean ok = false;
         try { 
-            sl = new ServerLauncher(clz.getName(), inProcess);
+            // java.security.properties is set when using the ibm jdk to work
+            // 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;
+            if (System.getProperty("java.security.properties") != null) {
+                properties = new HashMap<String, String>();
+                properties.put("java.security.properties",
+                    System.getProperty("java.security.properties"));
+            }
+            sl = new ServerLauncher(clz.getName(), properties, null, inProcess);
             ok = sl.launchServer();            
             assertTrue("server failed to launch", ok);