CAMEL-8038: Fixed @UriPath
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/09385f17 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/09385f17 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/09385f17 Branch: refs/heads/master Commit: 09385f17c9cf5a050e73c83ab011483e58b1c8fb Parents: 7bcd8db Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Nov 26 08:32:53 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Nov 26 08:32:53 2014 +0100 ---------------------------------------------------------------------- .../util/component/AbstractApiComponent.java | 2 - .../util/component/AbstractApiEndpoint.java | 1 - .../atmosphere/websocket/WebsocketEndpoint.java | 2 +- .../camel/component/box/BoxComponent.java | 4 +- .../camel/component/box/BoxConfiguration.java | 28 ++- .../apache/camel/component/box/BoxEndpoint.java | 8 +- .../camel-box/src/main/resources/LICENSE.txt | 203 ------------------- .../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++ .../src/main/resources/META-INF/NOTICE.txt | 11 + .../camel-box/src/main/resources/NOTICE.txt | 11 - .../calendar/GoogleCalendarComponent.java | 4 +- .../calendar/GoogleCalendarConfiguration.java | 29 ++- .../google/calendar/GoogleCalendarEndpoint.java | 9 +- .../google/drive/GoogleDriveComponent.java | 5 +- .../google/drive/GoogleDriveConfiguration.java | 29 ++- .../google/drive/GoogleDriveEndpoint.java | 10 +- .../src/main/resources/log4j.properties | 79 -------- 17 files changed, 318 insertions(+), 320 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/09385f17/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiComponent.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiComponent.java b/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiComponent.java index 93803cd..6b39d95 100644 --- a/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiComponent.java +++ b/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiComponent.java @@ -30,7 +30,6 @@ import org.apache.camel.ComponentConfiguration; import org.apache.camel.Endpoint; import org.apache.camel.impl.UriEndpointComponent; import org.apache.camel.spi.EndpointCompleter; -import org.apache.camel.spi.UriParam; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -40,7 +39,6 @@ import org.apache.camel.util.ObjectHelper; public abstract class AbstractApiComponent<E extends Enum<E> & ApiName, T, S extends ApiCollection<E, T>> extends UriEndpointComponent implements EndpointCompleter { - @UriParam protected T configuration; // API collection http://git-wip-us.apache.org/repos/asf/camel/blob/09385f17/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiEndpoint.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiEndpoint.java b/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiEndpoint.java index a36cd70..3e4514e 100644 --- a/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiEndpoint.java +++ b/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiEndpoint.java @@ -59,7 +59,6 @@ public abstract class AbstractApiEndpoint<E extends ApiName, T> protected final ApiMethodHelper<? extends ApiMethod> methodHelper; // endpoint configuration - @UriParam protected final T configuration; // property name for Exchange 'In' message body http://git-wip-us.apache.org/repos/asf/camel/blob/09385f17/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java index 7d16e31..f3d3d13 100644 --- a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java +++ b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java @@ -33,7 +33,7 @@ import org.apache.commons.httpclient.params.HttpClientParams; /** * */ -@UriEndpoint(scheme = "atmosphere-websocket", consumerClass = WebsocketConsumer.class) +@UriEndpoint(scheme = "atmosphere-websocket", consumerClass = WebsocketConsumer.class, label = "http,websocket") public class WebsocketEndpoint extends ServletEndpoint { @UriPath http://git-wip-us.apache.org/repos/asf/camel/blob/09385f17/components/camel-box/src/main/java/org/apache/camel/component/box/BoxComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-box/src/main/java/org/apache/camel/component/box/BoxComponent.java b/components/camel-box/src/main/java/org/apache/camel/component/box/BoxComponent.java index aa48337..fd4b646 100644 --- a/components/camel-box/src/main/java/org/apache/camel/component/box/BoxComponent.java +++ b/components/camel-box/src/main/java/org/apache/camel/component/box/BoxComponent.java @@ -22,13 +22,11 @@ import org.apache.camel.component.box.internal.BoxApiCollection; import org.apache.camel.component.box.internal.BoxApiName; import org.apache.camel.component.box.internal.BoxClientHelper; import org.apache.camel.component.box.internal.CachedBoxClient; -import org.apache.camel.spi.UriEndpoint; import org.apache.camel.util.component.AbstractApiComponent; /** * Represents the component that manages {@link BoxEndpoint}. */ -@UriEndpoint(scheme = "box", consumerClass = BoxConsumer.class, consumerPrefix = "consumer") public class BoxComponent extends AbstractApiComponent<BoxApiName, BoxConfiguration, BoxApiCollection> { private CachedBoxClient cachedBoxClient; @@ -49,6 +47,8 @@ public class BoxComponent extends AbstractApiComponent<BoxApiName, BoxConfigurat @Override protected Endpoint createEndpoint(String uri, String methodName, BoxApiName apiName, BoxConfiguration endpointConfiguration) { + endpointConfiguration.setApiName(apiName); + endpointConfiguration.setMethodName(methodName); return new BoxEndpoint(uri, this, apiName, methodName, endpointConfiguration); } http://git-wip-us.apache.org/repos/asf/camel/blob/09385f17/components/camel-box/src/main/java/org/apache/camel/component/box/BoxConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-box/src/main/java/org/apache/camel/component/box/BoxConfiguration.java b/components/camel-box/src/main/java/org/apache/camel/component/box/BoxConfiguration.java index 2fabf7f..f626713 100644 --- a/components/camel-box/src/main/java/org/apache/camel/component/box/BoxConfiguration.java +++ b/components/camel-box/src/main/java/org/apache/camel/component/box/BoxConfiguration.java @@ -22,8 +22,10 @@ import com.box.boxjavalibv2.BoxConnectionManagerBuilder; import com.box.boxjavalibv2.IBoxConfig; import com.box.boxjavalibv2.authorization.IAuthSecureStorage; import com.box.boxjavalibv2.authorization.OAuthRefreshListener; +import org.apache.camel.component.box.internal.BoxApiName; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriParams; +import org.apache.camel.spi.UriPath; import org.apache.camel.util.jsse.SSLContextParameters; /** @@ -32,6 +34,12 @@ import org.apache.camel.util.jsse.SSLContextParameters; @UriParams public class BoxConfiguration { + @UriPath + private BoxApiName apiName; + + @UriPath + private String methodName; + @UriParam private String clientId; @@ -50,7 +58,7 @@ public class BoxConfiguration { @UriParam private OAuthRefreshListener refreshListener; - @UriParam + @UriParam(defaultValue = "false") private boolean revokeOnShutdown; @UriParam @@ -74,9 +82,25 @@ public class BoxConfiguration { /** * Box.com login timeout in seconds, defaults to 30. */ - @UriParam + @UriParam(defaultValue = "30") private int loginTimeout = 30; + public BoxApiName getApiName() { + return apiName; + } + + public void setApiName(BoxApiName apiName) { + this.apiName = apiName; + } + + public String getMethodName() { + return methodName; + } + + public void setMethodName(String methodName) { + this.methodName = methodName; + } + public String getClientId() { return clientId; } http://git-wip-us.apache.org/repos/asf/camel/blob/09385f17/components/camel-box/src/main/java/org/apache/camel/component/box/BoxEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-box/src/main/java/org/apache/camel/component/box/BoxEndpoint.java b/components/camel-box/src/main/java/org/apache/camel/component/box/BoxEndpoint.java index 01c2678..c468944 100644 --- a/components/camel-box/src/main/java/org/apache/camel/component/box/BoxEndpoint.java +++ b/components/camel-box/src/main/java/org/apache/camel/component/box/BoxEndpoint.java @@ -30,6 +30,7 @@ import org.apache.camel.component.box.internal.BoxConstants; import org.apache.camel.component.box.internal.BoxPropertiesHelper; import org.apache.camel.component.box.internal.CachedBoxClient; import org.apache.camel.spi.UriEndpoint; +import org.apache.camel.spi.UriParam; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.component.AbstractApiEndpoint; import org.apache.camel.util.component.ApiMethod; @@ -38,12 +39,15 @@ import org.apache.camel.util.component.ApiMethodPropertiesHelper; /** * Represents a Box endpoint. */ -@UriEndpoint(scheme = "box", consumerClass = BoxConsumer.class, consumerPrefix = "consumer") +@UriEndpoint(scheme = "box", consumerClass = BoxConsumer.class, consumerPrefix = "consumer", label = "api,file,cloud") public class BoxEndpoint extends AbstractApiEndpoint<BoxApiName, BoxConfiguration> { private static final String SHARED_LINK_PROPERTY = "sharedLink"; private static final String SHARED_PASSWORD_PROPERTY = "sharedPassword"; + @UriParam + private BoxConfiguration configuration; + // cached client private CachedBoxClient cachedBoxClient; @@ -53,12 +57,12 @@ public class BoxEndpoint extends AbstractApiEndpoint<BoxApiName, BoxConfiguratio // configuration values for shared links private String sharedLink; private String sharedPassword; - private boolean boxClientShared; public BoxEndpoint(String uri, BoxComponent component, BoxApiName apiName, String methodName, BoxConfiguration endpointConfiguration) { super(uri, component, apiName, methodName, BoxApiCollection.getCollection().getHelper(apiName), endpointConfiguration); + this.configuration = endpointConfiguration; } public Producer createProducer() throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/09385f17/components/camel-box/src/main/resources/LICENSE.txt ---------------------------------------------------------------------- diff --git a/components/camel-box/src/main/resources/LICENSE.txt b/components/camel-box/src/main/resources/LICENSE.txt deleted file mode 100644 index 6b0b127..0000000 --- a/components/camel-box/src/main/resources/LICENSE.txt +++ /dev/null @@ -1,203 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed 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. - http://git-wip-us.apache.org/repos/asf/camel/blob/09385f17/components/camel-box/src/main/resources/META-INF/LICENSE.txt ---------------------------------------------------------------------- diff --git a/components/camel-box/src/main/resources/META-INF/LICENSE.txt b/components/camel-box/src/main/resources/META-INF/LICENSE.txt new file mode 100644 index 0000000..6b0b127 --- /dev/null +++ b/components/camel-box/src/main/resources/META-INF/LICENSE.txt @@ -0,0 +1,203 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. + http://git-wip-us.apache.org/repos/asf/camel/blob/09385f17/components/camel-box/src/main/resources/META-INF/NOTICE.txt ---------------------------------------------------------------------- diff --git a/components/camel-box/src/main/resources/META-INF/NOTICE.txt b/components/camel-box/src/main/resources/META-INF/NOTICE.txt new file mode 100644 index 0000000..2e215bf --- /dev/null +++ b/components/camel-box/src/main/resources/META-INF/NOTICE.txt @@ -0,0 +1,11 @@ + ========================================================================= + == NOTICE file corresponding to the section 4 d of == + == the Apache License, Version 2.0, == + == in this case for the Apache Camel distribution. == + ========================================================================= + + This product includes software developed by + The Apache Software Foundation (http://www.apache.org/). + + Please read the different LICENSE files present in the licenses directory of + this distribution. http://git-wip-us.apache.org/repos/asf/camel/blob/09385f17/components/camel-box/src/main/resources/NOTICE.txt ---------------------------------------------------------------------- diff --git a/components/camel-box/src/main/resources/NOTICE.txt b/components/camel-box/src/main/resources/NOTICE.txt deleted file mode 100644 index 2e215bf..0000000 --- a/components/camel-box/src/main/resources/NOTICE.txt +++ /dev/null @@ -1,11 +0,0 @@ - ========================================================================= - == NOTICE file corresponding to the section 4 d of == - == the Apache License, Version 2.0, == - == in this case for the Apache Camel distribution. == - ========================================================================= - - This product includes software developed by - The Apache Software Foundation (http://www.apache.org/). - - Please read the different LICENSE files present in the licenses directory of - this distribution. http://git-wip-us.apache.org/repos/asf/camel/blob/09385f17/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java index c5fe412..7fb2ca2 100644 --- a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java +++ b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java @@ -22,13 +22,11 @@ import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; import org.apache.camel.component.google.calendar.internal.GoogleCalendarApiCollection; import org.apache.camel.component.google.calendar.internal.GoogleCalendarApiName; -import org.apache.camel.spi.UriEndpoint; import org.apache.camel.util.component.AbstractApiComponent; /** * Represents the component that manages {@link GoogleCalendarEndpoint}. */ -@UriEndpoint(scheme = "google-calendar", consumerClass = GoogleCalendarConsumer.class, consumerPrefix = "consumer") public class GoogleCalendarComponent extends AbstractApiComponent<GoogleCalendarApiName, GoogleCalendarConfiguration, GoogleCalendarApiCollection> { private Calendar client; @@ -69,6 +67,8 @@ public class GoogleCalendarComponent extends AbstractApiComponent<GoogleCalendar @Override protected Endpoint createEndpoint(String uri, String methodName, GoogleCalendarApiName apiName, GoogleCalendarConfiguration endpointConfiguration) { + endpointConfiguration.setApiName(apiName); + endpointConfiguration.setMethodName(methodName); return new GoogleCalendarEndpoint(uri, this, apiName, methodName, endpointConfiguration); } } http://git-wip-us.apache.org/repos/asf/camel/blob/09385f17/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarConfiguration.java b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarConfiguration.java index c31c89b..a527a41 100644 --- a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarConfiguration.java +++ b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarConfiguration.java @@ -20,9 +20,10 @@ import java.util.Arrays; import java.util.List; import com.google.api.services.calendar.CalendarScopes; - +import org.apache.camel.component.google.calendar.internal.GoogleCalendarApiName; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriParams; +import org.apache.camel.spi.UriPath; /** * Component configuration for GoogleCalendar component. @@ -30,7 +31,13 @@ import org.apache.camel.spi.UriParams; @UriParams public class GoogleCalendarConfiguration { private static final List<String> DEFAULT_SCOPES = Arrays.asList(CalendarScopes.CALENDAR); - + + @UriPath + private GoogleCalendarApiName apiName; + + @UriPath + private String methodName; + @UriParam private List<String> scopes = DEFAULT_SCOPES; @@ -48,7 +55,23 @@ public class GoogleCalendarConfiguration { @UriParam private String applicationName; - + + public GoogleCalendarApiName getApiName() { + return apiName; + } + + public void setApiName(GoogleCalendarApiName apiName) { + this.apiName = apiName; + } + + public String getMethodName() { + return methodName; + } + + public void setMethodName(String methodName) { + this.methodName = methodName; + } + public String getClientId() { return clientId; } http://git-wip-us.apache.org/repos/asf/camel/blob/09385f17/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java index 317eb16..e37db68 100644 --- a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java +++ b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java @@ -19,7 +19,6 @@ package org.apache.camel.component.google.calendar; import java.util.Map; import com.google.api.services.calendar.Calendar; - import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.Producer; @@ -28,6 +27,7 @@ import org.apache.camel.component.google.calendar.internal.GoogleCalendarApiName import org.apache.camel.component.google.calendar.internal.GoogleCalendarConstants; import org.apache.camel.component.google.calendar.internal.GoogleCalendarPropertiesHelper; import org.apache.camel.spi.UriEndpoint; +import org.apache.camel.spi.UriParam; import org.apache.camel.util.component.AbstractApiEndpoint; import org.apache.camel.util.component.ApiMethod; import org.apache.camel.util.component.ApiMethodPropertiesHelper; @@ -35,15 +35,18 @@ import org.apache.camel.util.component.ApiMethodPropertiesHelper; /** * Represents a GoogleCalendar endpoint. */ -@UriEndpoint(scheme = "google-calendar", consumerClass = GoogleCalendarConsumer.class, consumerPrefix = "consumer") +@UriEndpoint(scheme = "google-calendar", consumerClass = GoogleCalendarConsumer.class, consumerPrefix = "consumer", label = "api,cloud") public class GoogleCalendarEndpoint extends AbstractApiEndpoint<GoogleCalendarApiName, GoogleCalendarConfiguration> { + @UriParam + private GoogleCalendarConfiguration configuration; + private Object apiProxy; public GoogleCalendarEndpoint(String uri, GoogleCalendarComponent component, GoogleCalendarApiName apiName, String methodName, GoogleCalendarConfiguration endpointConfiguration) { super(uri, component, apiName, methodName, GoogleCalendarApiCollection.getCollection().getHelper(apiName), endpointConfiguration); - + this.configuration = endpointConfiguration; } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/09385f17/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java index d4918f5..20bbd91 100644 --- a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java +++ b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java @@ -17,18 +17,15 @@ package org.apache.camel.component.google.drive; import com.google.api.services.drive.Drive; - import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection; import org.apache.camel.component.google.drive.internal.GoogleDriveApiName; -import org.apache.camel.spi.UriEndpoint; import org.apache.camel.util.component.AbstractApiComponent; /** * Represents the component that manages {@link GoogleDriveEndpoint}. */ -@UriEndpoint(scheme = "google-drive", consumerClass = GoogleDriveConsumer.class, consumerPrefix = "consumer") public class GoogleDriveComponent extends AbstractApiComponent<GoogleDriveApiName, GoogleDriveConfiguration, GoogleDriveApiCollection> { private Drive client; @@ -69,6 +66,8 @@ public class GoogleDriveComponent extends AbstractApiComponent<GoogleDriveApiNam @Override protected Endpoint createEndpoint(String uri, String methodName, GoogleDriveApiName apiName, GoogleDriveConfiguration endpointConfiguration) { + endpointConfiguration.setApiName(apiName); + endpointConfiguration.setMethodName(methodName); return new GoogleDriveEndpoint(uri, this, apiName, methodName, endpointConfiguration); } } http://git-wip-us.apache.org/repos/asf/camel/blob/09385f17/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConfiguration.java b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConfiguration.java index dcc8205..23b4227 100644 --- a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConfiguration.java +++ b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConfiguration.java @@ -20,9 +20,10 @@ import java.util.Arrays; import java.util.List; import com.google.api.services.drive.DriveScopes; - +import org.apache.camel.component.google.drive.internal.GoogleDriveApiName; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriParams; +import org.apache.camel.spi.UriPath; /** * Component configuration for GoogleDrive component. @@ -30,7 +31,13 @@ import org.apache.camel.spi.UriParams; @UriParams public class GoogleDriveConfiguration { private static final List<String> DEFAULT_SCOPES = Arrays.asList(DriveScopes.DRIVE_FILE, DriveScopes.DRIVE_APPS_READONLY, DriveScopes.DRIVE_METADATA_READONLY, - DriveScopes.DRIVE); + DriveScopes.DRIVE); + + @UriPath + private GoogleDriveApiName apiName; + + @UriPath + private String methodName; @UriParam private List<String> scopes = DEFAULT_SCOPES; @@ -49,7 +56,23 @@ public class GoogleDriveConfiguration { @UriParam private String applicationName; - + + public GoogleDriveApiName getApiName() { + return apiName; + } + + public void setApiName(GoogleDriveApiName apiName) { + this.apiName = apiName; + } + + public String getMethodName() { + return methodName; + } + + public void setMethodName(String methodName) { + this.methodName = methodName; + } + public String getClientId() { return clientId; } http://git-wip-us.apache.org/repos/asf/camel/blob/09385f17/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java index f7ee052..b7133cf 100644 --- a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java +++ b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java @@ -19,7 +19,6 @@ package org.apache.camel.component.google.drive; import java.util.Map; import com.google.api.services.drive.Drive; - import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.Producer; @@ -28,6 +27,7 @@ import org.apache.camel.component.google.drive.internal.GoogleDriveApiName; import org.apache.camel.component.google.drive.internal.GoogleDriveConstants; import org.apache.camel.component.google.drive.internal.GoogleDrivePropertiesHelper; import org.apache.camel.spi.UriEndpoint; +import org.apache.camel.spi.UriParam; import org.apache.camel.util.component.AbstractApiEndpoint; import org.apache.camel.util.component.ApiMethod; import org.apache.camel.util.component.ApiMethodPropertiesHelper; @@ -35,13 +35,17 @@ import org.apache.camel.util.component.ApiMethodPropertiesHelper; /** * Represents a GoogleDrive endpoint. */ -@UriEndpoint(scheme = "google-drive", consumerClass = GoogleDriveConsumer.class, consumerPrefix = "consumer") +@UriEndpoint(scheme = "google-drive", consumerClass = GoogleDriveConsumer.class, consumerPrefix = "consumer", label = "api,cloud,file") public class GoogleDriveEndpoint extends AbstractApiEndpoint<GoogleDriveApiName, GoogleDriveConfiguration> { private Object apiProxy; - + + @UriParam + private GoogleDriveConfiguration configuration; + public GoogleDriveEndpoint(String uri, GoogleDriveComponent component, GoogleDriveApiName apiName, String methodName, GoogleDriveConfiguration endpointConfiguration) { super(uri, component, apiName, methodName, GoogleDriveApiCollection.getCollection().getHelper(apiName), endpointConfiguration); + this.configuration = endpointConfiguration; } public Producer createProducer() throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/09385f17/components/camel-google-drive/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-google-drive/src/main/resources/log4j.properties b/components/camel-google-drive/src/main/resources/log4j.properties deleted file mode 100644 index c3eb9f7..0000000 --- a/components/camel-google-drive/src/main/resources/log4j.properties +++ /dev/null @@ -1,79 +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. -## --------------------------------------------------------------------------- - -# -# The logging properties used during tests.. -# -log4j.rootLogger=INFO, file -log4j.logger.org.apache.camel.customlogger=TRACE, file2 - -#log4j.logger.org.apache.camel.impl.converter=WARN -#log4j.logger.org.apache.camel.management=WARN -log4j.logger.org.apache.camel.impl.DefaultPackageScanClassResolver=WARN -#log4j.logger.org.apache.camel.impl.converter.DefaultTypeConverter=TRACE -#log4j.logger.org.apache.camel.impl.converter=DEBUG - -#log4j.logger.org.apache.camel=DEBUG -#log4j.logger.org.apache.camel.builder=TRACE -#log4j.logger.org.apache.camel.language.simple=TRACE -#log4j.logger.org.apache.camel.component=TRACE -#log4j.logger.org.apache.camel.component.seda=TRACE -#log4j.logger.org.apache.camel.component.file=TRACE -#log4j.logger.org.apache.camel.impl.DefaultUnitOfWork=TRACE -#log4j.logger.org.apache.camel.impl.DefaultExecutorServiceManager=TRACE -#log4j.logger.org.apache.camel.component.mock=DEBUG -#log4j.logger.org.apache.camel.component.file=TRACE -#log4j.logger.org.apache.camel.processor.DefaultErrorHandler=TRACE -#log4j.logger.org.apache.camel.processor.DeadLetterChannel=TRACE -#log4j.logger.org.apache.camel.processor.Pipeline=TRACE -#log4j.logger.org.apache.camel.processor.MulticastProcessor=TRACE -#log4j.logger.org.apache.camel.processor.RecipientList=TRACE -#log4j.logger.org.apache.camel.processor.RecipientListProcessor=TRACE -#log4j.logger.org.apache.camel.processor.RoutingSlip=TRACE -#log4j.logger.org.apache.camel.processor.TryProcessor=TRACE -#log4j.logger.org.apache.camel.processor.loadbalancer=TRACE -#log4j.logger.org.apache.camel.processor.Delayer=TRACE -#log4j.logger.org.apache.camel.processor.Throttler=TRACE -#log4j.logger.org.apache.camel.processor.aggregate.AggregateProcessor=DEBUG -#log4j.logger.org.apache.camel.impl=TRACE -#log4j.logger.org.apache.camel.util.FileUtil=TRACE -#log4j.logger.org.apache.camel.util.AsyncProcessorHelper=TRACE -#log4j.logger.org.apache.camel.util.ServiceHelper=TRACE -#log4j.logger.org.apache.camel.util.jsse=TRACE - -# CONSOLE appender not used by default -log4j.appender.out=org.apache.log4j.ConsoleAppender -log4j.appender.out.layout=org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -# MDC -#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %-10.10X{camel.breadcrumbId} - %-10.10X{camel.exchangeId} - %-10.10X{camel.correlationId} - %-10.10X{camel.routeId} - %m%n - -# File appender -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.file=target/camel-core-test.log -log4j.appender.file.append=true -log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -# MDC -#log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %-10.10X{camel.breadcrumbId} - %-10.10X{camel.exchangeId} - %-10.10X{camel.correlationId} - %-10.10X{camel.routeId} - %m%n - -# File appender for logging with provided logger -log4j.appender.file2=org.apache.log4j.FileAppender -log4j.appender.file2.layout=org.apache.log4j.PatternLayout -log4j.appender.file2.file=target/custom-logger-test.log -log4j.appender.file2.append=false -log4j.appender.file2.layout.ConversionPattern=%-5p %c{1} %m%n
