You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/10/03 11:56:00 UTC
[1/2] git commit: Skip JMX tests on AIX as they hang the servers.
Updated Branches:
refs/heads/master 5105d1d74 -> a49053bd7
Skip JMX tests on AIX as they hang the servers.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a49053bd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a49053bd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a49053bd
Branch: refs/heads/master
Commit: a49053bd72cab0b85636dc2efebde2bb29967486
Parents: 6870071
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Oct 3 11:54:15 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Oct 3 11:55:54 2013 +0200
----------------------------------------------------------------------
camel-core/pom.xml | 80 ++++++++++++++++++++++--------------
components/camel-spring/pom.xml | 19 +++++++++
2 files changed, 68 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a49053bd/camel-core/pom.xml
----------------------------------------------------------------------
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index fb417f7..913f127 100755
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -15,7 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -33,22 +34,22 @@
<properties>
<camel.osgi.export.pkg>
- !org.apache.camel.tools.*,
- org.apache.camel.*;-noimport:=true
+ !org.apache.camel.tools.*,
+ org.apache.camel.*;-noimport:=true
</camel.osgi.export.pkg>
<camel.osgi.import>
- org.apache.camel.tools.*;resolution:=optional,
- !org.apache.camel.*,
- !com.googlecode.concurrentlinkedhashmap,
- ${camel.osgi.import.defaults},
- org.apache.xalan.xsltc.trax;resolution:=optional,
- javax.activation;resolution:=optional,
- javax.xml.bind;resolution:=optional,
- javax.xml.bind.annotation;resolution:=optional,
- javax.xml.bind.annotation.adapters;resolution:=optional,
- javax.xml.stream;resolution:=optional,
- javax.xml.transform.stax;resolution:=optional,
- *
+ org.apache.camel.tools.*;resolution:=optional,
+ !org.apache.camel.*,
+ !com.googlecode.concurrentlinkedhashmap,
+ ${camel.osgi.import.defaults},
+ org.apache.xalan.xsltc.trax;resolution:=optional,
+ javax.activation;resolution:=optional,
+ javax.xml.bind;resolution:=optional,
+ javax.xml.bind.annotation;resolution:=optional,
+ javax.xml.bind.annotation.adapters;resolution:=optional,
+ javax.xml.stream;resolution:=optional,
+ javax.xml.transform.stax;resolution:=optional,
+ *
</camel.osgi.import>
<camel.osgi.export.service>
org.apache.camel.spi.ComponentResolver;component=direct,
@@ -87,15 +88,17 @@
org.apache.camel.spi.LanguageResolver;language=tokenize
</camel.osgi.export.service>
<camel.osgi.dynamic>
- org.apache.camel.spring.util;${camel.osgi.import.strict.version},
- org.apache.camel.spring.pollingconsumer;${camel.osgi.import.strict.version},
- org.apache.camel.processor.interceptor.jpa;${camel.osgi.import.strict.version},
- org.apache.camel.pollconsumer.quartz2;${camel.osgi.import.strict.version},
- net.sf.saxon
+ org.apache.camel.spring.util;${camel.osgi.import.strict.version},
+ org.apache.camel.spring.pollingconsumer;${camel.osgi.import.strict.version},
+ org.apache.camel.processor.interceptor.jpa;${camel.osgi.import.strict.version},
+ org.apache.camel.pollconsumer.quartz2;${camel.osgi.import.strict.version},
+ net.sf.saxon
</camel.osgi.dynamic>
<camel.osgi.activator>
- org.apache.camel.impl.osgi.Activator
+ org.apache.camel.impl.osgi.Activator
</camel.osgi.activator>
+ <!-- do not skip any tests by default -->
+ <platform.skip.tests></platform.skip.tests>
</properties>
<dependencies>
@@ -160,12 +163,12 @@
</dependency>
<!-- validator -->
- <dependency>
- <groupId>xml-resolver</groupId>
- <artifactId>xml-resolver</artifactId>
- <version>${xml-resolver-version}</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
+ <version>${xml-resolver-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
@@ -193,10 +196,10 @@
</excludes>
</artifactSet>
<relocations>
- <relocation>
- <pattern>com.googlecode.concurrentlinkedhashmap</pattern>
- <shadedPattern>org.apache.camel.com.googlecode.concurrentlinkedhashmap</shadedPattern>
- </relocation>
+ <relocation>
+ <pattern>com.googlecode.concurrentlinkedhashmap</pattern>
+ <shadedPattern>org.apache.camel.com.googlecode.concurrentlinkedhashmap</shadedPattern>
+ </relocation>
</relocations>
</configuration>
</execution>
@@ -227,6 +230,7 @@
<exclude>org/apache/camel/component/file/stress/**.java</exclude>
<exclude>**/DistributedCompletionIntervalTest.java</exclude>
<exclude>**/DistributedConcurrentPerCorrelationKeyTest.java</exclude>
+ <exclude>${platform.skip.tests}</exclude>
</excludes>
<forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds>
</configuration>
@@ -428,6 +432,20 @@
</dependency>
</dependencies>
</profile>
+
+ <!-- skip management tests on AIX as it hangs CI servers -->
+ <profile>
+ <id>aix</id>
+ <activation>
+ <os>
+ <name>aix</name>
+ </os>
+ </activation>
+ <properties>
+ <platform.skip.tests>org/apache/camel/management/**/*.java</platform.skip.tests>
+ </properties>
+ </profile>
+
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/a49053bd/components/camel-spring/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index 1d4777d..d86ffd7 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -61,6 +61,8 @@
<camel.osgi.activator>
org.apache.camel.osgi.Activator
</camel.osgi.activator>
+ <!-- do not skip any tests by default -->
+ <platform.skip.tests></platform.skip.tests>
</properties>
<dependencies>
@@ -222,6 +224,10 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <!-- skip file stress tests as they are intended to run manually -->
+ <excludes>
+ <exclude>${platform.skip.tests}</exclude>
+ </excludes>
<forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
</configuration>
</plugin>
@@ -406,6 +412,19 @@
</plugins>
</build>
</profile>
+
+ <!-- skip management tests on AIX as it hangs CI servers -->
+ <profile>
+ <id>aix</id>
+ <activation>
+ <os>
+ <name>aix</name>
+ </os>
+ </activation>
+ <properties>
+ <platform.skip.tests>org/apache/camel/spring/management/**/*.java</platform.skip.tests>
+ </properties>
+ </profile>
</profiles>
<reporting>
[2/2] git commit: Fixed test
Posted by da...@apache.org.
Fixed test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/68700711
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/68700711
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/68700711
Branch: refs/heads/master
Commit: 687007117ac1ef188a16041bd07c92a524f726d3
Parents: 5105d1d
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Oct 3 11:30:21 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Oct 3 11:55:54 2013 +0200
----------------------------------------------------------------------
.../processor/aggregator/AggregateCompletionIntervalTest.java | 4 ++--
.../aggregator/SpringAggregateCompletionIntervalTest.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/68700711/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateCompletionIntervalTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateCompletionIntervalTest.java b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateCompletionIntervalTest.java
index 02b45a9..3859672 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateCompletionIntervalTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateCompletionIntervalTest.java
@@ -37,7 +37,7 @@ public class AggregateCompletionIntervalTest extends ContextTestSupport {
Thread.sleep(2000);
for (int i = 0; i < 10; i++) {
- template.sendBodyAndHeader("direct:start", "Message " + i, "id", "1");
+ template.sendBodyAndHeader("seda:start", "Message " + i, "id", "1");
}
assertMockEndpointsSatisfied();
@@ -49,7 +49,7 @@ public class AggregateCompletionIntervalTest extends ContextTestSupport {
@Override
public void configure() throws Exception {
// START SNIPPET: e1
- from("direct:start")
+ from("seda:start")
.aggregate(header("id"), new UseLatestAggregationStrategy())
// trigger completion every 5th second
.completionInterval(5000)
http://git-wip-us.apache.org/repos/asf/camel/blob/68700711/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateCompletionIntervalTest.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateCompletionIntervalTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateCompletionIntervalTest.xml
index ae7468b..343d2f7 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateCompletionIntervalTest.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateCompletionIntervalTest.xml
@@ -25,7 +25,7 @@
<!-- START SNIPPET: e1 -->
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
- <from uri="direct:start"/>
+ <from uri="seda:start"/>
<!-- trigger completion of all current aggregated exchanges every 5th second -->
<aggregate strategyRef="aggregatorStrategy" completionInterval="5000">
<correlationExpression>