camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/2] camel git commit: Upgraded roaster code changes
Date Sat, 16 Jul 2016 06:38:02 GMT
Repository: camel
Updated Branches:
  refs/heads/master 7e15cf58d -> 71e83c6c4


Upgraded roaster code changes


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

Branch: refs/heads/master
Commit: be3523fbf176c771f4b90a986244bf54ad8d482e
Parents: 7e15cf5
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Sat Jul 16 08:34:36 2016 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Sat Jul 16 08:34:36 2016 +0200

----------------------------------------------------------------------
 .../seda/springboot/SedaComponentConfiguration.java          | 2 +-
 .../stub/springboot/StubComponentConfiguration.java          | 2 +-
 .../component/vm/springboot/VmComponentConfiguration.java    | 2 +-
 .../cometd/springboot/CometdComponentConfiguration.java      | 2 +-
 .../csv/springboot/CsvDataFormatConfiguration.java           | 2 +-
 .../jclouds/springboot/JcloudsComponentConfiguration.java    | 4 ++--
 .../jetty9/springboot/JettyHttpComponentConfiguration9.java  | 8 ++++----
 .../springboot/QuickfixjComponentConfiguration.java          | 2 +-
 .../restlet/springboot/RestletComponentConfiguration.java    | 2 +-
 .../springboot/SalesforceComponentConfiguration.java         | 6 +++---
 .../springboot/WebsocketComponentConfiguration.java          | 2 +-
 .../xmljson/springboot/XmlJsonDataFormatConfiguration.java   | 2 +-
 .../xstream/springboot/XStreamDataFormatConfiguration.java   | 8 ++++----
 13 files changed, 22 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/be3523fb/camel-core/src/main/java/org/apache/camel/component/seda/springboot/SedaComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/seda/springboot/SedaComponentConfiguration.java
b/camel-core/src/main/java/org/apache/camel/component/seda/springboot/SedaComponentConfiguration.java
index 1f4ec64..888baf6 100644
--- a/camel-core/src/main/java/org/apache/camel/component/seda/springboot/SedaComponentConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/component/seda/springboot/SedaComponentConfiguration.java
@@ -41,7 +41,7 @@ public class SedaComponentConfiguration {
     /**
      * Sets the default queue factory.
      */
-    private BlockingQueueFactory<org.apache.camel.Exchange> defaultQueueFactory;
+    private BlockingQueueFactory<Exchange> defaultQueueFactory;
 
     public int getQueueSize() {
         return queueSize;

http://git-wip-us.apache.org/repos/asf/camel/blob/be3523fb/camel-core/src/main/java/org/apache/camel/component/stub/springboot/StubComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/stub/springboot/StubComponentConfiguration.java
b/camel-core/src/main/java/org/apache/camel/component/stub/springboot/StubComponentConfiguration.java
index f40268c..ae8dcad 100644
--- a/camel-core/src/main/java/org/apache/camel/component/stub/springboot/StubComponentConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/component/stub/springboot/StubComponentConfiguration.java
@@ -41,7 +41,7 @@ public class StubComponentConfiguration {
     /**
      * Sets the default queue factory.
      */
-    private BlockingQueueFactory<org.apache.camel.Exchange> defaultQueueFactory;
+    private BlockingQueueFactory<Exchange> defaultQueueFactory;
 
     public int getQueueSize() {
         return queueSize;

http://git-wip-us.apache.org/repos/asf/camel/blob/be3523fb/camel-core/src/main/java/org/apache/camel/component/vm/springboot/VmComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/vm/springboot/VmComponentConfiguration.java
b/camel-core/src/main/java/org/apache/camel/component/vm/springboot/VmComponentConfiguration.java
index 106cf89..1900510 100644
--- a/camel-core/src/main/java/org/apache/camel/component/vm/springboot/VmComponentConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/component/vm/springboot/VmComponentConfiguration.java
@@ -41,7 +41,7 @@ public class VmComponentConfiguration {
     /**
      * Sets the default queue factory.
      */
-    private BlockingQueueFactory<org.apache.camel.Exchange> defaultQueueFactory;
+    private BlockingQueueFactory<Exchange> defaultQueueFactory;
 
     public int getQueueSize() {
         return queueSize;

http://git-wip-us.apache.org/repos/asf/camel/blob/be3523fb/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentConfiguration.java
b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentConfiguration.java
index c499e61..b232398 100644
--- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentConfiguration.java
+++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentConfiguration.java
@@ -51,7 +51,7 @@ public class CometdComponentConfiguration {
      * To use a list of custom BayeuxServer.Extension that allows modifying
      * incoming and outgoing requests.
      */
-    private List<org.cometd.bayeux.server.BayeuxServer.Extension> extensions;
+    private List<Extension> extensions;
     /**
      * To configure security using SSLContextParameters
      */

http://git-wip-us.apache.org/repos/asf/camel/blob/be3523fb/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatConfiguration.java
b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatConfiguration.java
index 49ae019..705275f 100644
--- a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatConfiguration.java
+++ b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatConfiguration.java
@@ -63,7 +63,7 @@ public class CsvDataFormatConfiguration {
     /**
      * To configure the CSV headers
      */
-    private List<java.lang.String> header;
+    private List<String> header;
     /**
      * Whether to allow missing column names.
      */

http://git-wip-us.apache.org/repos/asf/camel/blob/be3523fb/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/springboot/JcloudsComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/springboot/JcloudsComponentConfiguration.java
b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/springboot/JcloudsComponentConfiguration.java
index 8aa3fc1..34164ec 100644
--- a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/springboot/JcloudsComponentConfiguration.java
+++ b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/springboot/JcloudsComponentConfiguration.java
@@ -32,12 +32,12 @@ public class JcloudsComponentConfiguration {
     /**
      * To use the given BlobStore which must be configured when using blobstore.
      */
-    private List<org.jclouds.blobstore.BlobStore> blobStores;
+    private List<BlobStore> blobStores;
     /**
      * To use the given ComputeService which must be configured when use
      * compute.
      */
-    private List<org.jclouds.compute.ComputeService> computeServices;
+    private List<ComputeService> computeServices;
 
     public List<BlobStore> getBlobStores() {
         return blobStores;

http://git-wip-us.apache.org/repos/asf/camel/blob/be3523fb/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java
b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java
index a81cff5..f6f115d 100644
--- a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java
+++ b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java
@@ -61,12 +61,12 @@ public class JettyHttpComponentConfiguration9 {
     /**
      * A map which contains per port number specific SSL connectors.
      */
-    private Map<java.lang.Integer, org.eclipse.jetty.server.Connector> sslSocketConnectors;
+    private Map<Integer, Connector> sslSocketConnectors;
     /**
      * A map which contains per port number specific HTTP connectors. Uses the
      * same principle as sslSocketConnectors.
      */
-    private Map<java.lang.Integer, org.eclipse.jetty.server.Connector> socketConnectors;
+    private Map<Integer, Connector> socketConnectors;
     /**
      * To set a value for minimum number of threads in HttpClient thread pool.
      * Notice that both a min and max size must be configured.
@@ -118,12 +118,12 @@ public class JettyHttpComponentConfiguration9 {
     /**
      * A map which contains general SSL connector properties.
      */
-    private Map<java.lang.String, java.lang.Object> sslSocketConnectorProperties;
+    private Map<String, Object> sslSocketConnectorProperties;
     /**
      * A map which contains general HTTP connector properties. Uses the same
      * principle as sslSocketConnectorProperties.
      */
-    private Map<java.lang.String, java.lang.Object> socketConnectorProperties;
+    private Map<String, Object> socketConnectorProperties;
     /**
      * Allows to set a timeout in millis when using Jetty as consumer (server).
      * By default Jetty uses 30000. You can use a value of = 0 to never expire.

http://git-wip-us.apache.org/repos/asf/camel/blob/be3523fb/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/springboot/QuickfixjComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/springboot/QuickfixjComponentConfiguration.java
b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/springboot/QuickfixjComponentConfiguration.java
index ea72088..6440310 100644
--- a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/springboot/QuickfixjComponentConfiguration.java
+++ b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/springboot/QuickfixjComponentConfiguration.java
@@ -48,7 +48,7 @@ public class QuickfixjComponentConfiguration {
      * To use the given map of pre configured QuickFix configurations mapped to
      * the key
      */
-    private Map<java.lang.String, org.apache.camel.component.quickfixj.QuickfixjConfiguration>
configurations;
+    private Map<String, QuickfixjConfiguration> configurations;
     /**
      * If set to true the engines will be created and started when needed (when
      * first message is send)

http://git-wip-us.apache.org/repos/asf/camel/blob/be3523fb/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/springboot/RestletComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/springboot/RestletComponentConfiguration.java
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/springboot/RestletComponentConfiguration.java
index cb65d97..86d8770 100644
--- a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/springboot/RestletComponentConfiguration.java
+++ b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/springboot/RestletComponentConfiguration.java
@@ -126,7 +126,7 @@ public class RestletComponentConfiguration {
      * A list of converters to enable as full class name or simple class name.
      * All the converters automatically registered are enabled if empty or null
      */
-    private List<java.lang.String> enabledConverters;
+    private List<String> enabledConverters;
     /**
      * To use a custom HeaderFilterStrategy to filter header to and from Camel
      * message.

http://git-wip-us.apache.org/repos/asf/camel/blob/be3523fb/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
index 1b88a01..0c1dcea 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
@@ -43,7 +43,7 @@ public class SalesforceComponentConfiguration {
     /**
      * Used for configuring HTTP client properties as key/value pairs
      */
-    private Map<java.lang.String, java.lang.Object> httpClientProperties;
+    private Map<String, Object> httpClientProperties;
     /**
      * To configure security using SSLContextParameters
      */
@@ -75,11 +75,11 @@ public class SalesforceComponentConfiguration {
     /**
      * HTTP proxy included addresses
      */
-    private Set<java.lang.String> httpProxyIncludedAddresses;
+    private Set<String> httpProxyIncludedAddresses;
     /**
      * HTTP proxy excluded addresses
      */
-    private Set<java.lang.String> httpProxyExcludedAddresses;
+    private Set<String> httpProxyExcludedAddresses;
     /**
      * HTTP proxy authentication URI
      */

http://git-wip-us.apache.org/repos/asf/camel/blob/be3523fb/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java
b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java
index a40d156..61c5034 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java
@@ -91,7 +91,7 @@ public class WebsocketComponentConfiguration {
      * protocols. The key in the map is the sub protocol. The default key is
      * reserved for the default implementation.
      */
-    private Map<java.lang.String, org.apache.camel.component.websocket.WebSocketFactory>
socketFactory;
+    private Map<String, WebSocketFactory> socketFactory;
 
     public String getStaticResources() {
         return staticResources;

http://git-wip-us.apache.org/repos/asf/camel/blob/be3523fb/components/camel-xmljson/src/main/java/org/apache/camel/dataformat/xmljson/springboot/XmlJsonDataFormatConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-xmljson/src/main/java/org/apache/camel/dataformat/xmljson/springboot/XmlJsonDataFormatConfiguration.java
b/components/camel-xmljson/src/main/java/org/apache/camel/dataformat/xmljson/springboot/XmlJsonDataFormatConfiguration.java
index b656df6..891e303 100644
--- a/components/camel-xmljson/src/main/java/org/apache/camel/dataformat/xmljson/springboot/XmlJsonDataFormatConfiguration.java
+++ b/components/camel-xmljson/src/main/java/org/apache/camel/dataformat/xmljson/springboot/XmlJsonDataFormatConfiguration.java
@@ -96,7 +96,7 @@ public class XmlJsonDataFormatConfiguration {
      * is set as an expandable property Used for unmarshalling (JSON to XML
      * conversion).
      */
-    private List<java.lang.String> expandableProperties;
+    private List<String> expandableProperties;
     /**
      * Adds type hints to the resulting XML to aid conversion back to JSON. Used
      * for unmarshalling (JSON to XML conversion).

http://git-wip-us.apache.org/repos/asf/camel/blob/be3523fb/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/XStreamDataFormatConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/XStreamDataFormatConfiguration.java
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/XStreamDataFormatConfiguration.java
index a8236e0..53a2ce0 100644
--- a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/XStreamDataFormatConfiguration.java
+++ b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/XStreamDataFormatConfiguration.java
@@ -68,22 +68,22 @@ public class XStreamDataFormatConfiguration {
      * List of class names for using custom XStream converters. The classes must
      * be of type com.thoughtworks.xstream.converters.Converter
      */
-    private List<java.lang.String> converters;
+    private List<String> converters;
     /**
      * Alias a Class to a shorter name to be used in XML elements.
      */
-    private Map<java.lang.String, java.lang.String> aliases;
+    private Map<String, String> aliases;
     /**
      * Prevents a field from being serialized. To omit a field you must always
      * provide the declaring type and not necessarily the type that is
      * converted.
      */
-    private Map<java.lang.String, java.lang.String[]> omitFields;
+    private Map<String, String[]> omitFields;
     /**
      * Adds a default implicit collection which is used for any unmapped XML
      * tag.
      */
-    private Map<java.lang.String, java.lang.String[]> implicitCollections;
+    private Map<String, String[]> implicitCollections;
 
     public String getPermissions() {
         return permissions;


Mime
View raw message