Author: ningjiang
Date: Sun Jul 6 19:40:15 2008
New Revision: 674384
URL: http://svn.apache.org/viewvc?rev=674384&view=rev
Log:
CAMEL-678 clean up the commented tests
Modified:
activemq/camel/trunk/tests/camel-itest/pom.xml
activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java
activemq/camel/trunk/tests/camel-itest/src/test/resources/activemq.xml
Modified: activemq/camel/trunk/tests/camel-itest/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/tests/camel-itest/pom.xml?rev=674384&r1=674383&r2=674384&view=diff
==============================================================================
--- activemq/camel/trunk/tests/camel-itest/pom.xml (original)
+++ activemq/camel/trunk/tests/camel-itest/pom.xml Sun Jul 6 19:40:15 2008
@@ -7,9 +7,9 @@
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,46 +38,6 @@
<artifactId>camel-jms</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-mina</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-http</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-jms</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-jbi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-cxf</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-script</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- </dependency>
- -->
- <!--
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <type>test-jar</type>
- <optional>true</optional>
- <scope>test</scope>
- </dependency>
- -->
-
<!-- testing -->
<dependency>
<groupId>junit</groupId>
@@ -95,6 +55,17 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -120,11 +91,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>pertest</forkMode>
- <excludes>
- <exclude>**/JmsPerformanceTest.*</exclude>
- <exclude>**/JmsIntegrationTest.*</exclude>
- <exclude>**/JmsMediumQueuePerformanceTest.*</exclude>
- </excludes>
</configuration>
</plugin>
Modified:
activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java?rev=674384&r1=674383&r2=674384&view=diff
==============================================================================
---
activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java
(original)
+++
activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java
Sun Jul 6 19:40:15 2008
@@ -21,6 +21,7 @@
import javax.naming.Context;
+import org.apache.activemq.broker.Broker;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.util.jndi.JndiContext;
@@ -96,6 +97,9 @@
protected void tearDown() throws Exception {
super.tearDown();
if (applicationContext != null) {
+ Object broker = applicationContext.getBean("broker");
+ System.out.println("broker is " + broker.getClass());
+
applicationContext.stop();
}
}
Modified: activemq/camel/trunk/tests/camel-itest/src/test/resources/activemq.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/tests/camel-itest/src/test/resources/activemq.xml?rev=674384&r1=674383&r2=674384&view=diff
==============================================================================
--- activemq/camel/trunk/tests/camel-itest/src/test/resources/activemq.xml
(original)
+++ activemq/camel/trunk/tests/camel-itest/src/test/resources/activemq.xml Sun
Jul 6 19:40:15 2008
@@ -17,18 +17,16 @@
<!-- START SNIPPET: example -->
<beans
xmlns="http://www.springframework.org/schema/beans";
- xmlns:amq="http://activemq.org/config/1.0";
+ xmlns:broker="http://activemq.apache.org/schema/core";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://activemq.org/config/1.0
http://activemq.apache.org/schema/activemq-core.xsd";>
+ http://activemq.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core-5.1.0.xsd";>
- <broker xmlns="http://activemq.org/config/1.0";
dataDirectory="target/activemq">
-
- <transportConnectors>
- <transportConnector name="openwire" uri="tcp://localhost:61616"/>
- </transportConnectors>
-
- </broker>
+ <broker:broker id="broker" useJmx="false" persistent="false"
dataDirectory="target/activemq">
+ <broker:transportConnectors>
+ <broker:transportConnector name="openwire" uri="tcp://localhost:61616"/>
+ </broker:transportConnectors>
+ </broker:broker>
</beans>
