Author: dkulp
Date: Wed Apr 9 07:53:00 2008
New Revision: 646390
URL: http://svn.apache.org/viewvc?rev=646390&view=rev
Log:
Merged revisions 646387 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r646387 | dkulp | 2008-04-09 10:50:33 -0400 (Wed, 09 Apr 2008) | 2 lines
Yet another attempt to get the MTOM/SwA tests to not fail the build on a
headless TeamCity enabled mac mini. If headless, we'll skip the tests that do
ImageIO stuff to hopefully avoid it causing the VM to just exit.
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/parent/pom.xml
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/SwAServiceImpl.java
incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: incubator/cxf/branches/2.0.x-fixes/parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/parent/pom.xml?rev=646390&r1=646389&r2=646390&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/parent/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/parent/pom.xml Wed Apr 9 07:53:00 2008
@@ -223,7 +223,7 @@
<systemProperties>
<property>
<name>java.awt.headless</name>
- <value>true</value>
+ <value>${java.awt.headless}</value>
</property>
<property>
<name>java.util.logging.config.file</name>
Modified:
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java?rev=646390&r1=646389&r2=646390&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java
Wed Apr 9 07:53:00 2008
@@ -42,7 +42,7 @@
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly",
launchServer(Server.class));
+ assertTrue("server did not launch correctly",
launchServer(Server.class, true));
}
@Test
@@ -134,6 +134,11 @@
@Test
public void testSwaTypes() throws Exception {
+ if (Boolean.getBoolean("java.awt.headless")) {
+ System.out.println("Running headless. Skipping test as Images may
not work.");
+ return;
+ }
+
SwAService service = new SwAService();
SwAServiceInterface port = service.getSwAServiceHttpPort();
Modified:
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/SwAServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/SwAServiceImpl.java?rev=646390&r1=646389&r2=646390&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/SwAServiceImpl.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/SwAServiceImpl.java
Wed Apr 9 07:53:00 2008
@@ -96,7 +96,6 @@
Holder<DataHandler>
attach2, Holder<Source> attach3,
Holder<Image> attach4,
Holder<Image> attach5) {
try {
- System.out.println("Enter echoAllAttachmentTypes() ......");
OutputResponseAll theResponse = new OutputResponseAll();
theResponse.setResult("ok");
theResponse.setReason("ok");
@@ -141,7 +140,6 @@
}
theResponse.setResult("not ok");
}
- System.out.println("Leave echoAllAttachmentTypes() ......");
return theResponse;
} catch (Exception e) {
throw new WebServiceException(e.getMessage());
Modified:
incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java?rev=646390&r1=646389&r2=646390&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
Wed Apr 9 07:53:00 2008
@@ -328,7 +328,9 @@
cmd.add("-D" + entry.getKey() + "=" + entry.getValue());
}
}
- cmd.add("-Djava.awt.headless=true");
+ if (Boolean.getBoolean("java.awt.headless")) {
+ cmd.add("-Djava.awt.headless=true");
+ }
cmd.add("-ea");
cmd.add("-Djavax.xml.ws.spi.Provider=org.apache.cxf.bus.jaxws.spi.ProviderImpl");
