svn commit: r734134 - in /activemq/camel/branches/camel-1.x: ./ components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java components/camel-osgi/src/test/java/org/apache/camel/osgi/test/

[ningjiang]

Author: ningjiang
Date: Tue Jan 13 05:56:42 2009
New Revision: 734134

URL: http://svn.apache.org/viewvc?rev=734134&view=rev
Log:
Merged revisions 734130 via svnmerge from 
https://svn.apache.org/repos/asf/activemq/camel/trunk

........
  r734130 | ningjiang | 2009-01-13 21:44:40 +0800 (Tue, 13 Jan 2009) | 1 line
  
  Fixed the CS error of camel-mail
........

Modified:
    activemq/camel/branches/camel-1.x/   (props changed)
    
activemq/camel/branches/camel-1.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java
    
activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/test/
   (props changed)

Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 13 05:56:42 2009
@@ -1 +1 @@
-/activemq/camel/trunk:732943,733749,734053,734057-734058,734064
+/activemq/camel/trunk:732943,733749,734053,734057-734058,734064,734130

Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
activemq/camel/branches/camel-1.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java?rev=734134&r1=734133&r2=734134&view=diff
==============================================================================
--- 
activemq/camel/branches/camel-1.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java
 (original)
+++ 
activemq/camel/branches/camel-1.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java
 Tue Jan 13 05:56:42 2009
@@ -20,8 +20,6 @@
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
-import org.apache.camel.component.mail.MailComponent;
-import org.apache.camel.component.mail.MailConfiguration;
 import org.jvnet.mock_javamail.Mailbox;
 
 /**

Propchange: 
activemq/camel/branches/camel-1.x/components/camel-osgi/src/test/java/org/apache/camel/osgi/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 13 05:56:42 2009
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/test:734130