Author: davsclaus
Date: Thu Nov 15 13:59:06 2012
New Revision: 1409790
URL: http://svn.apache.org/viewvc?rev=1409790&view=rev
Log:
Enable AIX testing again
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1409787
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java?rev=1409790&r1=1409789&r2=1409790&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java
Thu Nov 15 13:59:06 2012
@@ -38,11 +38,6 @@ public class CxfJavaMtomProducerPayloadT
return;
}
- // skip test on aix
- if (TestHelper.isPlatform("aix")) {
- return;
- }
-
final Holder<byte[]> photo = new
Holder<byte[]>("RequestFromCXF".getBytes("UTF-8"));
final Holder<Image> image = new Holder<Image>(getImage("/java.jpg"));
Modified:
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java?rev=1409790&r1=1409789&r2=1409790&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java
Thu Nov 15 13:59:06 2012
@@ -71,11 +71,6 @@ public class CxfMtomConsumerPayloadModeT
return;
}
- // skip test on aix
- if (TestHelper.isPlatform("aix")) {
- return;
- }
-
context.createProducerTemplate().send("cxf:bean:consumerEndpoint", new
Processor() {
public void process(Exchange exchange) throws Exception {
Modified:
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java?rev=1409790&r1=1409789&r2=1409790&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
Thu Nov 15 13:59:06 2012
@@ -102,11 +102,6 @@ public class CxfMtomConsumerTest extends
return;
}
- // skip test on aix
- if (TestHelper.isPlatform("aix")) {
- return;
- }
-
Holder<byte[]> photo = new
Holder<byte[]>("RequestFromCXF".getBytes("UTF-8"));
Holder<Image> image = new Holder<Image>(getImage("/java.jpg"));
Modified:
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java?rev=1409790&r1=1409789&r2=1409790&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
Thu Nov 15 13:59:06 2012
@@ -80,11 +80,6 @@ public class CxfMtomDisabledProducerPayl
return;
}
- // skip test on aix
- if (TestHelper.isPlatform("aix")) {
- return;
- }
-
Exchange exchange =
context.createProducerTemplate().send("direct:testEndpoint", new Processor() {
public void process(Exchange exchange) throws Exception {
Modified:
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java?rev=1409790&r1=1409789&r2=1409790&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java
Thu Nov 15 13:59:06 2012
@@ -77,11 +77,6 @@ public class CxfMtomPOJOProducerTest ext
return;
}
- // skip test on aix
- if (TestHelper.isPlatform("aix")) {
- return;
- }
-
final Holder<byte[]> photo = new
Holder<byte[]>(MtomTestHelper.REQ_PHOTO_DATA);
final Holder<Image> image = new Holder<Image>(getImage("/java.jpg"));
Modified:
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java?rev=1409790&r1=1409789&r2=1409790&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
Thu Nov 15 13:59:06 2012
@@ -92,11 +92,6 @@ public class CxfMtomProducerPayloadModeT
return;
}
- // skip test on aix
- if (TestHelper.isPlatform("aix")) {
- return;
- }
-
// START SNIPPET: producer
Exchange exchange =
context.createProducerTemplate().send("direct:testEndpoint", new Processor() {
Modified:
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java?rev=1409790&r1=1409789&r2=1409790&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java
Thu Nov 15 13:59:06 2012
@@ -80,11 +80,6 @@ public class CxfMtomRouterPayloadModeTes
return;
}
- // skip test on aix
- if (TestHelper.isPlatform("aix")) {
- return;
- }
-
Holder<byte[]> photo = new
Holder<byte[]>(MtomTestHelper.REQ_PHOTO_DATA);
Holder<Image> image = new Holder<Image>(getImage("/java.jpg"));
