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 2009/06/01 10:49:13 UTC
svn commit: r780594 - in /camel/trunk: ./ apache-camel/ apache-camel/bundle/
apache-camel/src/main/descriptors/ components/
components/camel-activemq-web/ components/camel-flatpack/
components/camel-hamcrest/ components/camel-jhc/ components/camel-spri...
Author: davsclaus
Date: Mon Jun 1 08:49:12 2009
New Revision: 780594
URL: http://svn.apache.org/viewvc?rev=780594&view=rev
Log:
Moved some unusued camel components to sandbox.
Removed:
camel/trunk/components/camel-activemq-web/
camel/trunk/components/camel-hamcrest/
camel/trunk/components/camel-jhc/
camel/trunk/components/camel-supercsv/
camel/trunk/components/camel-swing/
camel/trunk/components/camel-testng/
camel/trunk/components/camel-uface/
Modified:
camel/trunk/apache-camel/bundle/pom.xml
camel/trunk/apache-camel/pom.xml
camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
camel/trunk/components/camel-flatpack/pom.xml
camel/trunk/components/camel-spring/pom.xml
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/StreamCachingInterceptorTest.java
camel/trunk/components/pom.xml
camel/trunk/pom.xml
Modified: camel/trunk/apache-camel/bundle/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/bundle/pom.xml?rev=780594&r1=780593&r2=780594&view=diff
==============================================================================
--- camel/trunk/apache-camel/bundle/pom.xml (original)
+++ camel/trunk/apache-camel/bundle/pom.xml Mon Jun 1 08:49:12 2009
@@ -39,14 +39,6 @@
<shade.version>1.0.1</shade.version>
</properties>
- <repositories>
- <repository>
- <id>uface.m2</id>
- <url>http://uface.googlecode.com/svn/maven/</url>
- <name>UFace Maven Repository</name>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -127,10 +119,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jhc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-jing</artifactId>
</dependency>
<dependency>
@@ -221,36 +209,14 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-stringtemplate</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-supercsv</artifactId>
- </dependency>
- -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-swing</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.ufacekit</groupId>
- <artifactId>org.ufacekit.ui.swing</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-tagsoup</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-uface</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-velocity</artifactId>
Modified: camel/trunk/apache-camel/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/pom.xml?rev=780594&r1=780593&r2=780594&view=diff
==============================================================================
--- camel/trunk/apache-camel/pom.xml (original)
+++ camel/trunk/apache-camel/pom.xml Mon Jun 1 08:49:12 2009
@@ -105,10 +105,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-hamcrest</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-http</artifactId>
</dependency>
<dependency>
@@ -141,10 +137,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jhc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-jing</artifactId>
</dependency>
<dependency>
@@ -231,34 +223,14 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-stringtemplate</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-supercsv</artifactId>
- </dependency>
- -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-swing</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-tagsoup</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-testng</artifactId>
- </dependency>
- -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-uface</artifactId>
- </dependency>
+ <artifactId>camel-test</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-velocity</artifactId>
Modified: camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml?rev=780594&r1=780593&r2=780594&view=diff
==============================================================================
--- camel/trunk/apache-camel/src/main/descriptors/common-bin.xml (original)
+++ camel/trunk/apache-camel/src/main/descriptors/common-bin.xml Mon Jun 1 08:49:12 2009
@@ -53,7 +53,6 @@
<include>org.apache.camel:camel-ftp</include>
<include>org.apache.camel:camel-groovy</include>
<include>org.apache.camel:camel-guice</include>
- <include>org.apache.camel:camel-hamcrest</include>
<include>org.apache.camel:camel-hl7</include>
<include>org.apache.camel:camel-http</include>
<include>org.apache.camel:camel-ibatis</include>
@@ -62,7 +61,6 @@
<include>org.apache.camel:camel-jcr</include>
<include>org.apache.camel:camel-jdbc</include>
<include>org.apache.camel:camel-jetty</include>
- <include>org.apache.camel:camel-jhc</include>
<include>org.apache.camel:camel-jing</include>
<include>org.apache.camel:camel-jms</include>
<include>org.apache.camel:camel-josql</include>
@@ -87,10 +85,8 @@
<include>org.apache.camel:camel-sql</include>
<include>org.apache.camel:camel-stream</include>
<include>org.apache.camel:camel-stringtemplate</include>
- <include>org.apache.camel:camel-swing</include>
<include>org.apache.camel:camel-test</include>
<include>org.apache.camel:camel-tagsoup</include>
- <include>org.apache.camel:camel-uface</include>
<include>org.apache.camel:camel-velocity</include>
<include>org.apache.camel:camel-xmlbeans</include>
<include>org.apache.camel:camel-xmlsecurity</include>
Modified: camel/trunk/components/camel-flatpack/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/pom.xml?rev=780594&r1=780593&r2=780594&view=diff
==============================================================================
--- camel/trunk/components/camel-flatpack/pom.xml (original)
+++ camel/trunk/components/camel-flatpack/pom.xml Mon Jun 1 08:49:12 2009
@@ -53,7 +53,6 @@
<version>3.1.1</version>
</dependency>
-
<!-- testing -->
<dependency>
<groupId>commons-logging</groupId>
@@ -72,15 +71,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-hamcrest</artifactId>
+ <artifactId>camel-core</artifactId>
<scope>test</scope>
+ <type>test-jar</type>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
@@ -88,5 +82,4 @@
</dependency>
</dependencies>
-
</project>
Modified: camel/trunk/components/camel-spring/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/pom.xml?rev=780594&r1=780593&r2=780594&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/pom.xml (original)
+++ camel/trunk/components/camel-spring/pom.xml Mon Jun 1 08:49:12 2009
@@ -80,11 +80,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-hamcrest</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java?rev=780594&r1=780593&r2=780594&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java Mon Jun 1 08:49:12 2009
@@ -25,7 +25,6 @@
import org.apache.camel.TestSupport;
import org.apache.camel.component.file.FileEndpoint;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.hamcrest.Assertions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
@@ -45,7 +44,7 @@
public void testMocksAreValid() throws Exception {
// lets check that our injected endpoint is valid
- FileEndpoint fileEndpoint = Assertions.assertInstanceOf(inputFile, FileEndpoint.class);
+ FileEndpoint fileEndpoint = TestSupport.assertIsInstanceOf(FileEndpoint.class, inputFile);
assertEquals("File", new File("target/test-default-inbox"), fileEndpoint.getFile());
result.expectedBodiesReceived(expectedBody);
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/StreamCachingInterceptorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/StreamCachingInterceptorTest.java?rev=780594&r1=780593&r2=780594&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/StreamCachingInterceptorTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/StreamCachingInterceptorTest.java Mon Jun 1 08:49:12 2009
@@ -17,7 +17,6 @@
package org.apache.camel.spring.interceptor;
import java.io.StringReader;
-
import javax.xml.transform.stream.StreamSource;
import org.apache.camel.CamelContext;
@@ -25,11 +24,9 @@
import org.apache.camel.Exchange;
import org.apache.camel.StreamCache;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.hamcrest.Assertions;
import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
-
/**
* Test case for enabling stream caching through XML
*/
@@ -44,7 +41,7 @@
assertMockEndpointsSatisfied();
Exchange exchange = a.getExchanges().get(0);
- StreamCache streamCache = Assertions.assertInstanceOf(exchange.getIn().getBody(), StreamCache.class);
+ StreamCache streamCache = assertIsInstanceOf(StreamCache.class, exchange.getIn().getBody());
assertNotNull(streamCache);
}
Modified: camel/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=780594&r1=780593&r2=780594&view=diff
==============================================================================
--- camel/trunk/components/pom.xml (original)
+++ camel/trunk/components/pom.xml Mon Jun 1 08:49:12 2009
@@ -46,7 +46,6 @@
<module>camel-ftp</module>
<module>camel-guice</module>
<module>camel-groovy</module>
- <module>camel-hamcrest</module>
<module>camel-http</module>
<module>camel-hl7</module>
<module>camel-ibatis</module>
@@ -54,8 +53,6 @@
<module>camel-jaxb</module>
<module>camel-jdbc</module>
<module>camel-jetty</module>
- <!--<module>camel-jface</module>-->
- <module>camel-jhc</module>
<module>camel-jing</module>
<module>camel-jms</module>
<module>camel-ldap</module>
@@ -86,11 +83,8 @@
<module>camel-sql</module>
<module>camel-stringtemplate</module>
<module>camel-stream</module>
- <!--<module>camel-supercsv</module>-->
- <module>camel-swing</module>
<module>camel-tagsoup</module>
<module>camel-test</module>
- <module>camel-uface</module>
<module>camel-velocity</module>
<module>camel-xmlbeans</module>
<module>camel-xmlsecurity</module>
Modified: camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=780594&r1=780593&r2=780594&view=diff
==============================================================================
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Mon Jun 1 08:49:12 2009
@@ -58,7 +58,6 @@
<spring-version>2.5.6</spring-version>
<spring-osgi-version>1.2.0</spring-osgi-version>
<mina-version>1.1.7</mina-version>
- <uface-version>1.0-m1</uface-version>
<jaxb-version>2.1.10</jaxb-version>
<jaxb-api-version>2.1</jaxb-api-version>
<stax-api-version>1.0.1</stax-api-version>
@@ -249,11 +248,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-hamcrest</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-hl7</artifactId>
<version>${project.version}</version>
</dependency>
@@ -294,11 +288,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jhc</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-jing</artifactId>
<version>${project.version}</version>
</dependency>
@@ -424,16 +413,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-supercsv</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-swing</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-tagsoup</artifactId>
<version>${project.version}</version>
</dependency>
@@ -444,16 +423,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-testng</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-uface</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-velocity</artifactId>
<version>${project.version}</version>
</dependency>
@@ -556,7 +525,7 @@
<version>${commons-logging-api-version}</version>
</dependency>
- <!-- optional dependencies -->
+ <!-- optional dependencies -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
@@ -935,7 +904,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.4</version>
+ <version>${javamail-version}</version>
</dependency>
<!-- optional XStream -->