camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject camel git commit: CAMEL-7999: apt plugin should support schema alias when a component/endpoint supports multiple schemas such as mail/ftp and a few others do.
Date Wed, 12 Nov 2014 19:51:18 GMT
Repository: camel
Updated Branches:
  refs/heads/master b3ce3dbfb -> bddf183bd


CAMEL-7999: apt plugin should support schema alias when a component/endpoint supports multiple
schemas such as mail/ftp and a few others do.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bddf183b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bddf183b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bddf183b

Branch: refs/heads/master
Commit: bddf183bdb670b0329cc28bf87e8875db4874f6b
Parents: b3ce3db
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Wed Nov 12 20:51:04 2014 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Wed Nov 12 20:51:04 2014 +0100

----------------------------------------------------------------------
 .../camel/component/http/HttpEndpoint.java      |  2 +-
 .../camel/component/http/HttpsComponent.java    | 39 --------------
 .../camel/component/http/HttpsEndpoint.java     | 57 --------------------
 .../services/org/apache/camel/component/https   |  2 +-
 4 files changed, 2 insertions(+), 98 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/bddf183b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
index 5971cbc..b660629 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
  *
  * @version 
  */
-@UriEndpoint(scheme = "http", consumerClass = HttpConsumer.class)
+@UriEndpoint(scheme = "http,https", consumerClass = HttpConsumer.class)
 public class HttpEndpoint extends DefaultPollingEndpoint implements HeaderFilterStrategyAware
{
 
     private static final Logger LOG = LoggerFactory.getLogger(HttpEndpoint.class);

http://git-wip-us.apache.org/repos/asf/camel/blob/bddf183b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpsComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpsComponent.java
b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpsComponent.java
deleted file mode 100644
index 3e83e52..0000000
--- a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpsComponent.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.http;
-
-import java.net.URISyntaxException;
-
-import org.apache.commons.httpclient.HttpConnectionManager;
-import org.apache.commons.httpclient.params.HttpClientParams;
-
-/**
- * The <a href="http://camel.apache.org/http.html">HTTPS Component</a>
- */
-public class HttpsComponent extends HttpComponent {
-
-    public HttpsComponent() {
-        super(HttpsEndpoint.class);
-    }
-
-    @Override
-    protected HttpEndpoint createHttpEndpoint(String uri, HttpComponent component, HttpClientParams
clientParams,
-                                              HttpConnectionManager connectionManager, HttpClientConfigurer
configurer) throws URISyntaxException {
-        return new HttpsEndpoint(uri, component, clientParams, connectionManager, configurer);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/bddf183b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpsEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpsEndpoint.java
b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpsEndpoint.java
deleted file mode 100644
index 2ebb3a5..0000000
--- a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpsEndpoint.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.http;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import org.apache.camel.spi.UriEndpoint;
-import org.apache.commons.httpclient.HttpConnectionManager;
-import org.apache.commons.httpclient.params.HttpClientParams;
-
-@UriEndpoint(scheme = "https", consumerClass = HttpConsumer.class)
-public class HttpsEndpoint extends HttpEndpoint {
-
-    public HttpsEndpoint() {
-    }
-
-    public HttpsEndpoint(String endPointURI, HttpComponent component, URI httpURI) throws
URISyntaxException {
-        super(endPointURI, component, httpURI);
-    }
-
-    public HttpsEndpoint(String endPointURI, HttpComponent component, URI httpURI, HttpConnectionManager
httpConnectionManager) throws URISyntaxException {
-        super(endPointURI, component, httpURI, httpConnectionManager);
-    }
-
-    public HttpsEndpoint(String uri, HttpComponent component, HttpClientParams clientParams,
-                         HttpConnectionManager connectionManager, HttpClientConfigurer configurer)
throws URISyntaxException {
-        super(uri, component, clientParams, connectionManager, configurer);
-    }
-
-    public HttpsEndpoint(String endPointURI, HttpComponent component, URI httpURI, HttpClientParams
clientParams,
-                         HttpConnectionManager httpConnectionManager, HttpClientConfigurer
clientConfigurer) throws URISyntaxException {
-        super(endPointURI, component, httpURI, clientParams, httpConnectionManager, clientConfigurer);
-    }
-
-    /**
-     * The url of the HTTPS endpoint to call.
-     */
-    @Override
-    public void setHttpUri(URI httpUri) {
-        super.setHttpUri(httpUri);
-    }
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/bddf183b/components/camel-http/src/main/resources/META-INF/services/org/apache/camel/component/https
----------------------------------------------------------------------
diff --git a/components/camel-http/src/main/resources/META-INF/services/org/apache/camel/component/https
b/components/camel-http/src/main/resources/META-INF/services/org/apache/camel/component/https
index af1bb0c..4efb7cf 100644
--- a/components/camel-http/src/main/resources/META-INF/services/org/apache/camel/component/https
+++ b/components/camel-http/src/main/resources/META-INF/services/org/apache/camel/component/https
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-class=org.apache.camel.component.http.HttpsComponent
+class=org.apache.camel.component.http.HttpComponent


Mime
View raw message