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 2008/11/11 19:59:31 UTC
svn commit: r713109 - in /activemq/camel/branches/camel-1.x: ./
components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
Author: davsclaus
Date: Tue Nov 11 10:59:31 2008
New Revision: 713109
URL: http://svn.apache.org/viewvc?rev=713109&view=rev
Log:
Merged revisions 713107 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r713107 | davsclaus | 2008-11-11 19:56:17 +0100 (ti, 11 nov 2008) | 1 line
CAMEL-656: polished code and marked methods for @deprecation
........
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 11 10:59:31 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Nov 11 10:59:31 2008
@@ -1 +1 @@
-/activemq/camel/trunk:1-708421,708553-709447,709449-709612,709614-709634,709636-710013,711200,711206,711219-711220,711523,711531,711599,711655-711656,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712712,712925,713013
+/activemq/camel/trunk:1-708421,708553-709447,709449-709612,709614-709634,709636-710013,711200,711206,711219-711220,711523,711531,711599,711655-711656,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712712,712925,713013,713107
Modified: activemq/camel/branches/camel-1.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java?rev=713109&r1=713108&r2=713109&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java (original)
+++ activemq/camel/branches/camel-1.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java Tue Nov 11 10:59:31 2008
@@ -50,6 +50,8 @@
/**
* Static builder method
+ *
+ * @deprecated will be removed in Camel 2.0
*/
public static MailComponent mailComponent() {
return new MailComponent();
@@ -57,6 +59,8 @@
/**
* Static builder method
+ *
+ * @deprecated will be removed in Camel 2.0
*/
public static MailComponent mailComponent(MailConfiguration configuration) {
return new MailComponent(configuration);
@@ -64,7 +68,6 @@
@Override
protected Endpoint<MailExchange> createEndpoint(String uri, String remaining, Map parameters) throws Exception {
-
URI url = new URI(uri);
if ("nntp".equalsIgnoreCase(url.getScheme())) {
throw new UnsupportedOperationException("nntp protocol is not supported");
@@ -107,6 +110,5 @@
public void setHeaderFilterStrategy(HeaderFilterStrategy strategy) {
headerFilterStrategy = strategy;
-
}
}