Author: dkulp
Date: Tue Apr 8 12:32:28 2008
New Revision: 646047
URL: http://svn.apache.org/viewvc?rev=646047&view=rev
Log:
Merged revisions 646043 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r646043 | dkulp | 2008-04-08 15:27:59 -0400 (Tue, 08 Apr 2008) | 2 lines
Make sure surefire and the forked servers are set for headless to prevent
build failures on the headless machines.
........
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/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=646047&r1=646046&r2=646047&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/parent/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/parent/pom.xml Tue Apr 8 12:32:28 2008
@@ -222,6 +222,10 @@
<argLine>-ea</argLine>
<systemProperties>
<property>
+ <name>java.awt.headless</name>
+ <value>true</value>
+ </property>
+ <property>
<name>java.util.logging.config.file</name>
<value>${basedir}/target/test-classes/logging.properties</value>
</property>
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=646047&r1=646046&r2=646047&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
Tue Apr 8 12:32:28 2008
@@ -328,7 +328,7 @@
cmd.add("-D" + entry.getKey() + "=" + entry.getValue());
}
}
-
+ cmd.add("-Djava.awt.headless=true");
cmd.add("-ea");
cmd.add("-Djavax.xml.ws.spi.Provider=org.apache.cxf.bus.jaxws.spi.ProviderImpl");
