Author: coheigea Date: Tue Aug 7 16:21:23 2012 New Revision: 1370344 URL: http://svn.apache.org/viewvc?rev=1370344&view=rev Log: Merged revisions 1370306 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1370306 | coheigea | 2012-08-07 16:10:38 +0100 (Tue, 07 Aug 2012) | 10 lines Merged revisions 1370296 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1370296 | coheigea | 2012-08-07 15:59:32 +0100 (Tue, 07 Aug 2012) | 2 lines Adding the ability to run all STS basic systests in eclipse ........ ........ Modified: cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509_symmetric/X509SymmetricBindingTest.java Modified: cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java?rev=1370344&r1=1370343&r2=1370344&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java (original) +++ cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java Tue Aug 7 16:21:23 2012 @@ -72,7 +72,7 @@ public class BearerTest extends Abstract launchServer(Server.class, true) ); String deployment = System.getProperty("sts.deployment"); - if ("standalone".equals(deployment)) { + if ("standalone".equals(deployment) || deployment == null) { standalone = true; assertTrue( "Server failed to launch", Modified: cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java?rev=1370344&r1=1370343&r2=1370344&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java (original) +++ cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java Tue Aug 7 16:21:23 2012 @@ -70,7 +70,7 @@ public class IntermediaryTransformationC launchServer(Server.class, true) ); String deployment = System.getProperty("sts.deployment"); - if ("standalone".equals(deployment)) { + if ("standalone".equals(deployment) || deployment == null) { standalone = true; assertTrue( "Server failed to launch", Modified: cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java?rev=1370344&r1=1370343&r2=1370344&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java (original) +++ cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java Tue Aug 7 16:21:23 2012 @@ -71,7 +71,7 @@ public class IntermediaryTransformationT launchServer(Server.class, true) ); String deployment = System.getProperty("sts.deployment"); - if ("standalone".equals(deployment)) { + if ("standalone".equals(deployment) || deployment == null) { standalone = true; assertTrue( "Server failed to launch", Modified: cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java?rev=1370344&r1=1370343&r2=1370344&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java (original) +++ cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java Tue Aug 7 16:21:23 2012 @@ -80,7 +80,7 @@ public class IssueUnitTest extends Abstr @BeforeClass public static void startServers() throws Exception { String deployment = System.getProperty("sts.deployment"); - if ("standalone".equals(deployment)) { + if ("standalone".equals(deployment) || deployment == null) { standalone = true; assertTrue( "Server failed to launch", Modified: cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java?rev=1370344&r1=1370343&r2=1370344&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java (original) +++ cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java Tue Aug 7 16:21:23 2012 @@ -61,7 +61,7 @@ public class SymmetricBindingTest extend launchServer(Server.class, true) ); String deployment = System.getProperty("sts.deployment"); - if ("standalone".equals(deployment)) { + if ("standalone".equals(deployment) || deployment == null) { standalone = true; assertTrue( "Server failed to launch", Modified: cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java?rev=1370344&r1=1370343&r2=1370344&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java (original) +++ cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java Tue Aug 7 16:21:23 2012 @@ -59,7 +59,7 @@ public class TransportBindingTest extend launchServer(Server.class, true) ); String deployment = System.getProperty("sts.deployment"); - if ("standalone".equals(deployment)) { + if ("standalone".equals(deployment) || deployment == null) { standalone = true; assertTrue( "Server failed to launch", Modified: cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java?rev=1370344&r1=1370343&r2=1370344&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java (original) +++ cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java Tue Aug 7 16:21:23 2012 @@ -65,7 +65,7 @@ public class UsernameOnBehalfOfTest exte launchServer(Server.class, true) ); String deployment = System.getProperty("sts.deployment"); - if ("standalone".equals(deployment)) { + if ("standalone".equals(deployment) || deployment == null) { standalone = true; assertTrue( "Server failed to launch", Modified: cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509_symmetric/X509SymmetricBindingTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509_symmetric/X509SymmetricBindingTest.java?rev=1370344&r1=1370343&r2=1370344&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509_symmetric/X509SymmetricBindingTest.java (original) +++ cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509_symmetric/X509SymmetricBindingTest.java Tue Aug 7 16:21:23 2012 @@ -61,7 +61,7 @@ public class X509SymmetricBindingTest ex launchServer(Server.class, true) ); String deployment = System.getProperty("sts.deployment"); - if ("standalone".equals(deployment)) { + if ("standalone".equals(deployment) || deployment == null) { standalone = true; assertTrue( "Server failed to launch",
