You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2011/06/09 04:41:41 UTC
svn commit: r1133636 - in /camel/trunk: ./
components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/
Author: hadrian
Date: Thu Jun 9 02:41:41 2011
New Revision: 1133636
URL: http://svn.apache.org/viewvc?rev=1133636&view=rev
Log:
CAMEL-4047. Patch applied with thanks to Dan Kulp
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java
camel/trunk/pom.xml
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java?rev=1133636&r1=1133635&r2=1133636&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java Thu Jun 9 02:41:41 2011
@@ -32,8 +32,7 @@ public class CxfJavaMtomProducerPayloadT
@Test
public void testInvokingService() throws Exception {
- if (Boolean.getBoolean("java.awt.headless")
- || System.getProperty("os.name").startsWith("Mac OS") && System.getProperty("user.name").equals("cruise")) {
+ if (Boolean.getBoolean("java.awt.headless")) {
System.out.println("Running headless. Skipping test as Images may not work.");
return;
}
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java?rev=1133636&r1=1133635&r2=1133636&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java Thu Jun 9 02:41:41 2011
@@ -89,8 +89,7 @@ public class CxfMtomConsumerTest extends
@Test
public void testInvokingService() throws Exception {
- if (Boolean.getBoolean("java.awt.headless")
- || System.getProperty("os.name").startsWith("Mac OS") && System.getProperty("user.name").equals("cruise")) {
+ if (Boolean.getBoolean("java.awt.headless")) {
System.out.println("Running headless. Skipping test as Images may not work.");
return;
}
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java?rev=1133636&r1=1133635&r2=1133636&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java Thu Jun 9 02:41:41 2011
@@ -73,7 +73,7 @@ public class CxfMtomDisabledProducerPayl
@Override
public void testProducer() throws Exception {
- if (Boolean.getBoolean("java.awt.headless") || System.getProperty("os.name").startsWith("Mac OS")) {
+ if (Boolean.getBoolean("java.awt.headless")) {
System.out.println("Running headless. Skipping test as Images may not work.");
return;
}
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java?rev=1133636&r1=1133635&r2=1133636&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java Thu Jun 9 02:41:41 2011
@@ -68,8 +68,7 @@ public class CxfMtomPOJOProducerTest ext
@SuppressWarnings("unchecked")
@Test
public void testInvokingServiceFromCxfProducer() throws Exception {
- if (Boolean.getBoolean("java.awt.headless")
- || System.getProperty("os.name").startsWith("Mac OS") && System.getProperty("user.name").equals("cruise")) {
+ if (Boolean.getBoolean("java.awt.headless")) {
System.out.println("Running headless. Skipping test as Images may not work.");
return;
}
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java?rev=1133636&r1=1133635&r2=1133636&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java Thu Jun 9 02:41:41 2011
@@ -80,8 +80,7 @@ public class CxfMtomProducerPayloadModeT
@Test
public void testProducer() throws Exception {
- if (Boolean.getBoolean("java.awt.headless")
- || System.getProperty("os.name").startsWith("Mac OS") && System.getProperty("user.name").equals("cruise")) {
+ if (Boolean.getBoolean("java.awt.headless")) {
System.out.println("Running headless. Skipping test as Images may not work.");
return;
}
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java?rev=1133636&r1=1133635&r2=1133636&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java Thu Jun 9 02:41:41 2011
@@ -70,8 +70,7 @@ public class CxfMtomRouterPayloadModeTes
@Test
public void testInvokingServiceFromCXFClient() throws Exception {
- if (Boolean.getBoolean("java.awt.headless")
- || System.getProperty("os.name").startsWith("Mac OS") && System.getProperty("user.name").equals("cruise")) {
+ if (Boolean.getBoolean("java.awt.headless")) {
System.out.println("Running headless. Skipping test as Images may not work.");
return;
}
Modified: camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=1133636&r1=1133635&r2=1133636&view=diff
==============================================================================
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Thu Jun 9 02:41:41 2011
@@ -445,6 +445,9 @@
<childDelegation>false</childDelegation>
<useFile>true</useFile>
<failIfNoTests>false</failIfNoTests>
+ <systemPropertyVariables>
+ <java.awt.headless>${java.awt.headless}</java.awt.headless>
+ </systemPropertyVariables>
<includes>
<include>**/*Test.java</include>
</includes>