You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/09/21 14:02:03 UTC
[2/5] git commit: CAMEL-7792 Fixed the CS errors
CAMEL-7792 Fixed the CS errors
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6aa728bd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6aa728bd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6aa728bd
Branch: refs/heads/master
Commit: 6aa728bd88ed563daf7c2c70f8bcaf097ffc5c77
Parents: f261f61
Author: Willem Jiang <wi...@gmail.com>
Authored: Sun Sep 21 16:26:09 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Sun Sep 21 20:01:36 2014 +0800
----------------------------------------------------------------------
.../camel/component/jira/JIRAComponent.java | 4 +-
.../camel/component/jira/JIRAEndpoint.java | 66 +++---
.../camel/component/jira/JIRAProducer.java | 6 +-
.../jira/consumer/AbstractJIRAConsumer.java | 80 +++++---
.../jira/consumer/NewCommentConsumer.java | 63 +++---
.../jira/consumer/NewIssueConsumer.java | 103 ++++++----
.../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../src/main/resources/log4j.properties | 16 --
.../src/test/resources/log4j.properties | 39 ++++
10 files changed, 440 insertions(+), 151 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6aa728bd/components/camel-jira/src/main/java/org/apache/camel/component/jira/JIRAComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-jira/src/main/java/org/apache/camel/component/jira/JIRAComponent.java b/components/camel-jira/src/main/java/org/apache/camel/component/jira/JIRAComponent.java
index 022f8b5..d0430ec 100644
--- a/components/camel-jira/src/main/java/org/apache/camel/component/jira/JIRAComponent.java
+++ b/components/camel-jira/src/main/java/org/apache/camel/component/jira/JIRAComponent.java
@@ -26,7 +26,9 @@ import org.apache.camel.impl.DefaultComponent;
*/
public class JIRAComponent extends DefaultComponent {
- protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
+ protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters)
+ throws Exception {
+
Endpoint endpoint = new JIRAEndpoint(uri, this);
setProperties(endpoint, parameters);
return endpoint;
http://git-wip-us.apache.org/repos/asf/camel/blob/6aa728bd/components/camel-jira/src/main/java/org/apache/camel/component/jira/JIRAEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-jira/src/main/java/org/apache/camel/component/jira/JIRAEndpoint.java b/components/camel-jira/src/main/java/org/apache/camel/component/jira/JIRAEndpoint.java
index 1aa2e2e..1365a73 100644
--- a/components/camel-jira/src/main/java/org/apache/camel/component/jira/JIRAEndpoint.java
+++ b/components/camel-jira/src/main/java/org/apache/camel/component/jira/JIRAEndpoint.java
@@ -42,16 +42,16 @@ import org.apache.camel.impl.DefaultEndpoint;
* - need to support apps running somewhere not publicly accessible where a webhook would fail
*/
public class JIRAEndpoint extends DefaultEndpoint {
-
- private String serverUrl = null;
-
- private String username = null;
-
- private String password = null;
-
- private String jql = null;
-
- public JIRAEndpoint(String uri, JIRAComponent component) {
+
+ private String serverUrl;
+
+ private String username;
+
+ private String password;
+
+ private String jql;
+
+ public JIRAEndpoint(String uri, JIRAComponent component) {
super(uri, component);
}
@@ -93,34 +93,34 @@ public class JIRAEndpoint extends DefaultEndpoint {
}
public String getServerUrl() {
- return serverUrl;
- }
+ return serverUrl;
+ }
- public void setServerUrl(String serverUrl) {
- this.serverUrl = serverUrl;
- }
+ public void setServerUrl(String serverUrl) {
+ this.serverUrl = serverUrl;
+ }
- public String getUsername() {
- return username;
- }
+ public String getUsername() {
+ return username;
+ }
- public void setUsername(String username) {
- this.username = username;
- }
+ public void setUsername(String username) {
+ this.username = username;
+ }
- public String getPassword() {
- return password;
- }
+ public String getPassword() {
+ return password;
+ }
- public void setPassword(String password) {
- this.password = password;
- }
+ public void setPassword(String password) {
+ this.password = password;
+ }
- public String getJql() {
- return jql;
- }
+ public String getJql() {
+ return jql;
+ }
- public void setJql(String jql) {
- this.jql = jql;
- }
+ public void setJql(String jql) {
+ this.jql = jql;
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6aa728bd/components/camel-jira/src/main/java/org/apache/camel/component/jira/JIRAProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-jira/src/main/java/org/apache/camel/component/jira/JIRAProducer.java b/components/camel-jira/src/main/java/org/apache/camel/component/jira/JIRAProducer.java
index 9f54bc2..55d11c2 100644
--- a/components/camel-jira/src/main/java/org/apache/camel/component/jira/JIRAProducer.java
+++ b/components/camel-jira/src/main/java/org/apache/camel/component/jira/JIRAProducer.java
@@ -23,12 +23,12 @@ import org.apache.camel.impl.DefaultProducer;
* The Camel :: JIRA producer.
*/
public class JIRAProducer extends DefaultProducer {
-
- public JIRAProducer(JIRAEndpoint endpoint) {
+
+ public JIRAProducer(final JIRAEndpoint endpoint) {
super(endpoint);
}
- public void process(Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) throws Exception {
// nothing to do, yet
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6aa728bd/components/camel-jira/src/main/java/org/apache/camel/component/jira/consumer/AbstractJIRAConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-jira/src/main/java/org/apache/camel/component/jira/consumer/AbstractJIRAConsumer.java b/components/camel-jira/src/main/java/org/apache/camel/component/jira/consumer/AbstractJIRAConsumer.java
index 90bf6d4..3d2c3bb 100644
--- a/components/camel-jira/src/main/java/org/apache/camel/component/jira/consumer/AbstractJIRAConsumer.java
+++ b/components/camel-jira/src/main/java/org/apache/camel/component/jira/consumer/AbstractJIRAConsumer.java
@@ -1,25 +1,42 @@
+/**
+ * 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.jira.consumer;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
+import com.atlassian.jira.rest.client.JiraRestClient;
+import com.atlassian.jira.rest.client.domain.BasicIssue;
+import com.atlassian.jira.rest.client.domain.SearchResult;
+import com.atlassian.jira.rest.client.internal.jersey.JerseyJiraRestClientFactory;
+
+
import org.apache.camel.Processor;
import org.apache.camel.component.jira.JIRAEndpoint;
import org.apache.camel.impl.ScheduledPollConsumer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.atlassian.jira.rest.client.JiraRestClient;
-import com.atlassian.jira.rest.client.domain.BasicIssue;
-import com.atlassian.jira.rest.client.domain.SearchResult;
-import com.atlassian.jira.rest.client.internal.jersey.JerseyJiraRestClientFactory;
-
public abstract class AbstractJIRAConsumer extends ScheduledPollConsumer {
-
- private static final transient Logger LOG = LoggerFactory.getLogger(AbstractJIRAConsumer.class);
-
- private final JIRAEndpoint endpoint;
+
+ private static final transient Logger LOG = LoggerFactory.getLogger(AbstractJIRAConsumer.class);
+
+ private final JIRAEndpoint endpoint;
private final JiraRestClient client;
@@ -31,39 +48,38 @@ public abstract class AbstractJIRAConsumer extends ScheduledPollConsumer {
setDelay(6000);
final JerseyJiraRestClientFactory factory = new JerseyJiraRestClientFactory();
- final URI jiraServerUri = URI.create(endpoint.getServerUrl());
- client = factory.createWithBasicHttpAuthentication(
- jiraServerUri, endpoint.getUsername(), endpoint.getPassword());
+ final URI jiraServerUri = URI.create(endpoint.getServerUrl());
+ client = factory.createWithBasicHttpAuthentication(jiraServerUri, endpoint.getUsername(),
+ endpoint.getPassword());
}
protected List<BasicIssue> getIssues() {
- return getIssues(endpoint.getJql(), 0, 0, 500);
+ return getIssues(endpoint.getJql(), 0, 0, 500);
}
// Ignore maxResults if it's <= 0.
protected List<BasicIssue> getIssues(String jql, int start, int maxResults, int maxPerQuery) {
- LOG.info("Indexing current JIRA issues...");
-
- List<BasicIssue> issues = new ArrayList<BasicIssue>();
- while ( true ) {
- SearchResult searchResult = client.getSearchClient().searchJqlWithFullIssues(
- jql, maxPerQuery, start, null );
+ LOG.info("Indexing current JIRA issues...");
+
+ List<BasicIssue> issues = new ArrayList<BasicIssue>();
+ while (true) {
+ SearchResult searchResult = client.getSearchClient().searchJqlWithFullIssues(jql, maxPerQuery,
+ start, null);
+
+ for (BasicIssue issue : searchResult.getIssues()) {
+ issues.add(issue);
+ }
- for (BasicIssue issue : searchResult.getIssues()) {
- issues.add(issue);
- }
+ // Note: #getTotal == the total # the query would return *without* pagination, effectively telling us
+ // we've reached the end. Also exit early if we're limiting the # of results.
+ if (start >= searchResult.getTotal() || (maxResults > 0 && issues.size() >= maxResults)) {
+ break;
+ }
- // Note: #getTotal == the total # the query would return *without* pagination, effectively telling us
- // we've reached the end. Also exit early if we're limiting the # of results.
- if ( start >= searchResult.getTotal() ||
- (maxResults > 0 && issues.size() >= maxResults)) {
- break;
- }
+ start += maxPerQuery;
+ }
- start += maxPerQuery;
- }
-
- return issues;
+ return issues;
}
protected JiraRestClient client() {
http://git-wip-us.apache.org/repos/asf/camel/blob/6aa728bd/components/camel-jira/src/main/java/org/apache/camel/component/jira/consumer/NewCommentConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-jira/src/main/java/org/apache/camel/component/jira/consumer/NewCommentConsumer.java b/components/camel-jira/src/main/java/org/apache/camel/component/jira/consumer/NewCommentConsumer.java
index 80e8b21..04c2314 100644
--- a/components/camel-jira/src/main/java/org/apache/camel/component/jira/consumer/NewCommentConsumer.java
+++ b/components/camel-jira/src/main/java/org/apache/camel/component/jira/consumer/NewCommentConsumer.java
@@ -1,18 +1,35 @@
+/**
+ * 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.jira.consumer;
import java.util.ArrayList;
import java.util.List;
import java.util.Stack;
+import com.atlassian.jira.rest.client.domain.BasicIssue;
+import com.atlassian.jira.rest.client.domain.Comment;
+import com.atlassian.jira.rest.client.domain.Issue;
+
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.jira.JIRAEndpoint;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.atlassian.jira.rest.client.domain.BasicIssue;
-import com.atlassian.jira.rest.client.domain.Comment;
-import com.atlassian.jira.rest.client.domain.Issue;
/**
* Consumes new comments on JIRA issues.
@@ -23,31 +40,31 @@ import com.atlassian.jira.rest.client.domain.Issue;
* ticket in order to load its comments! For large organizations, the JIRA API can be significantly slow.
*/
public class NewCommentConsumer extends AbstractJIRAConsumer {
- private static final transient Logger LOG = LoggerFactory.getLogger(NewCommentConsumer.class);
-
+ private static final transient Logger LOG = LoggerFactory.getLogger(NewCommentConsumer.class);
+
private List<Long> commentIds = new ArrayList<Long>();
- public NewCommentConsumer(JIRAEndpoint endpoint, Processor processor) {
- super(endpoint, processor);
- LOG.info("JIRA NewCommentConsumer: Indexing current issue comments...");
+ public NewCommentConsumer(JIRAEndpoint endpoint, Processor processor) {
+ super(endpoint, processor);
+ LOG.info("JIRA NewCommentConsumer: Indexing current issue comments...");
getComments();
- }
-
- @Override
- protected int poll() throws Exception {
- Stack<Comment> newComments = getComments();
- while(!newComments.empty()) {
- Comment newComment = newComments.pop();
- Exchange e = getEndpoint().createExchange();
+ }
+
+ @Override
+ protected int poll() throws Exception {
+ Stack<Comment> newComments = getComments();
+ while (!newComments.empty()) {
+ Comment newComment = newComments.pop();
+ Exchange e = getEndpoint().createExchange();
e.getIn().setBody(newComment);
getProcessor().process(e);
}
- return newComments.size();
- }
-
- // In the end, we want *new* comments oldest to newest.
- private Stack<Comment> getComments() {
- Stack<Comment> newComments = new Stack<Comment>();
+ return newComments.size();
+ }
+
+ // In the end, we want *new* comments oldest to newest.
+ private Stack<Comment> getComments() {
+ Stack<Comment> newComments = new Stack<Comment>();
List<BasicIssue> issues = getIssues();
for (BasicIssue issue : issues) {
Issue fullIssue = client().getIssueClient().getIssue(issue.getKey(), null);
@@ -59,5 +76,5 @@ public class NewCommentConsumer extends AbstractJIRAConsumer {
}
}
return newComments;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6aa728bd/components/camel-jira/src/main/java/org/apache/camel/component/jira/consumer/NewIssueConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-jira/src/main/java/org/apache/camel/component/jira/consumer/NewIssueConsumer.java b/components/camel-jira/src/main/java/org/apache/camel/component/jira/consumer/NewIssueConsumer.java
index a858be7..237a9a2 100644
--- a/components/camel-jira/src/main/java/org/apache/camel/component/jira/consumer/NewIssueConsumer.java
+++ b/components/camel-jira/src/main/java/org/apache/camel/component/jira/consumer/NewIssueConsumer.java
@@ -1,13 +1,30 @@
+/**
+ * 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.jira.consumer;
import java.util.List;
import java.util.Stack;
+import com.atlassian.jira.rest.client.domain.BasicIssue;
+
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.jira.JIRAEndpoint;
-import com.atlassian.jira.rest.client.domain.BasicIssue;
/**
* Consumes new JIRA issues.
@@ -16,51 +33,51 @@ import com.atlassian.jira.rest.client.domain.BasicIssue;
* rather than having to index everything.
*/
public class NewIssueConsumer extends AbstractJIRAConsumer {
-
- private final String jql;
-
- private long latestIssueId = -1;
- public NewIssueConsumer(JIRAEndpoint endpoint, Processor processor) {
- super(endpoint, processor);
-
- jql = endpoint.getJql() + " ORDER BY key desc";
-
- // grab only the top
- List<BasicIssue> issues = getIssues(jql, 0, 1, 1);
- // in case there aren't any issues...
- if (issues.size() >= 1) {
- latestIssueId = issues.get(0).getId();
- }
- }
+ private final String jql;
+
+ private long latestIssueId = -1;
- @Override
- protected int poll() throws Exception {
- Stack<BasicIssue> newIssues = new Stack<BasicIssue>();
- getNewIssues(0, newIssues);
- while(!newIssues.empty()) {
- BasicIssue newIssue = newIssues.pop();
- Exchange e = getEndpoint().createExchange();
+ public NewIssueConsumer(JIRAEndpoint endpoint, Processor processor) {
+ super(endpoint, processor);
+
+ jql = endpoint.getJql() + " ORDER BY key desc";
+
+ // grab only the top
+ List<BasicIssue> issues = getIssues(jql, 0, 1, 1);
+ // in case there aren't any issues...
+ if (issues.size() >= 1) {
+ latestIssueId = issues.get(0).getId();
+ }
+ }
+
+ @Override
+ protected int poll() throws Exception {
+ Stack<BasicIssue> newIssues = new Stack<BasicIssue>();
+ getNewIssues(0, newIssues);
+ while (!newIssues.empty()) {
+ BasicIssue newIssue = newIssues.pop();
+ Exchange e = getEndpoint().createExchange();
e.getIn().setBody(newIssue);
getProcessor().process(e);
}
- return newIssues.size();
- }
-
- // In the end, we want *new* issues oldest to newest.
- private void getNewIssues(int start, Stack<BasicIssue> stack) {
- // grab only the top
- List<BasicIssue> issues = getIssues(jql, start, 1, 1);
- // in case there aren't any issues...
- if (issues.size() >= 1) {
- long id = issues.get(0).getId();
- if (id > latestIssueId) {
- stack.push(issues.get(0));
- // try again in case multiple new issues exist
- getNewIssues(start + 1, stack);
- // make sure this happens now, rather than before calling #getNewIssues
- latestIssueId = id;
- }
- }
- }
+ return newIssues.size();
+ }
+
+ // In the end, we want *new* issues oldest to newest.
+ private void getNewIssues(int start, Stack<BasicIssue> stack) {
+ // grab only the top
+ List<BasicIssue> issues = getIssues(jql, start, 1, 1);
+ // in case there aren't any issues...
+ if (issues.size() >= 1) {
+ long id = issues.get(0).getId();
+ if (id > latestIssueId) {
+ stack.push(issues.get(0));
+ // try again in case multiple new issues exist
+ getNewIssues(start + 1, stack);
+ // make sure this happens now, rather than before calling #getNewIssues
+ latestIssueId = id;
+ }
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6aa728bd/components/camel-jira/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/components/camel-jira/src/main/resources/META-INF/LICENSE.txt b/components/camel-jira/src/main/resources/META-INF/LICENSE.txt
new file mode 100755
index 0000000..6b0b127
--- /dev/null
+++ b/components/camel-jira/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/6aa728bd/components/camel-jira/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/components/camel-jira/src/main/resources/META-INF/NOTICE.txt b/components/camel-jira/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/components/camel-jira/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/6aa728bd/components/camel-jira/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/components/camel-jira/src/main/resources/log4j.properties b/components/camel-jira/src/main/resources/log4j.properties
deleted file mode 100644
index 4621723..0000000
--- a/components/camel-jira/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# The logging properties used
-#
-log4j.rootLogger=INFO, out
-
-# uncomment the following line to turn on Camel debugging
-#log4j.logger.org.apache.camel=DEBUG
-
-# 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=[%30.30t] %-30.30c{1} %-5p %m%n
-#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-
-log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/6aa728bd/components/camel-jira/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/components/camel-jira/src/test/resources/log4j.properties b/components/camel-jira/src/test/resources/log4j.properties
new file mode 100644
index 0000000..a1e94aa
--- /dev/null
+++ b/components/camel-jira/src/test/resources/log4j.properties
@@ -0,0 +1,39 @@
+## ------------------------------------------------------------------------
+## 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 for eclipse testing, We want to see debug output on the console.
+#
+log4j.rootLogger=INFO, file
+
+# uncomment the next line to debug Camel
+#log4j.logger.org.apache.camel=DEBUG
+
+log4j.logger.org.springframework=WARN
+
+# 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=[%30.30t] %-30.30c{1} %-5p %m%n
+#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+# File appender
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+log4j.appender.file.file=target/camel-jira-test.log
+log4j.appender.file.append=true
\ No newline at end of file