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/05/08 04:18:56 UTC
[1/2] git commit: Fixed the Rat check errors
Repository: camel
Updated Branches:
refs/heads/master 985834148 -> a25dbec5c
Fixed the Rat check errors
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ec405208
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ec405208
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ec405208
Branch: refs/heads/master
Commit: ec405208627e95f508e839826146c3a958b13402
Parents: 9858341
Author: Ubuntu <wi...@gmail.com>
Authored: Wed May 7 03:26:04 2014 +0000
Committer: Willem Jiang <wi...@gmail.com>
Committed: Thu May 8 10:16:49 2014 +0800
----------------------------------------------------------------------
.../src/it/simple-it/pom.xml | 16 ++++++++++++++++
.../src/it/simple-it/verify.groovy | 16 ++++++++++++++++
.../src/main/resources/sobject-picklist.vm | 18 +++++++++++++++++-
.../src/main/resources/sobject-pojo.vm | 18 +++++++++++++++++-
.../src/main/resources/sobject-query-records.vm | 16 ++++++++++++++++
.../src/main/resources/create-derby.sql | 18 +++++++++++++++++-
.../archetype-resources/src/main/resources/ok.xml | 18 +++++++++++++++++-
.../META-INF/m2e/lifecycle-mapping-metadata.xml | 16 ++++++++++++++++
8 files changed, 132 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ec405208/components/camel-salesforce/camel-salesforce-maven-plugin/src/it/simple-it/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/it/simple-it/pom.xml b/components/camel-salesforce/camel-salesforce-maven-plugin/src/it/simple-it/pom.xml
index 08142dd..0f24037 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/it/simple-it/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/it/simple-it/pom.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/camel/blob/ec405208/components/camel-salesforce/camel-salesforce-maven-plugin/src/it/simple-it/verify.groovy
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/it/simple-it/verify.groovy b/components/camel-salesforce/camel-salesforce-maven-plugin/src/it/simple-it/verify.groovy
index 7153082..1436d6b 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/it/simple-it/verify.groovy
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/it/simple-it/verify.groovy
@@ -1,3 +1,19 @@
+/**
+ * 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.
+ */
// assert that the generated files directory exists
File sourceDir = new File( basedir, "target/generated-sources/camel-salesforce" );
http://git-wip-us.apache.org/repos/asf/camel/blob/ec405208/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-picklist.vm
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-picklist.vm b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-picklist.vm
index 0aed2a7..8e23fdb 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-picklist.vm
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-picklist.vm
@@ -1,3 +1,19 @@
+## ------------------------------------------------------------------------
+## 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.
+## ------------------------------------------------------------------------
## sobject-picklist.vm
/*
* Salesforce DTO generated by camel-salesforce-maven-plugin
@@ -49,4 +65,4 @@ public enum $enumName {
throw new IllegalArgumentException(value);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/ec405208/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-pojo.vm
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-pojo.vm b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-pojo.vm
index b240d46..bbce083 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-pojo.vm
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-pojo.vm
@@ -1,3 +1,19 @@
+## ------------------------------------------------------------------------
+## 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.
+## ------------------------------------------------------------------------
## sobject-pojo.vm
/*
* Salesforce DTO generated by camel-salesforce-maven-plugin
@@ -57,4 +73,4 @@ public class $desc.Name extends AbstractSObjectBase {
#end
#end
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/ec405208/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-query-records.vm
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-query-records.vm b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-query-records.vm
index 40f1ac1..d17468a 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-query-records.vm
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-query-records.vm
@@ -1,3 +1,19 @@
+## ------------------------------------------------------------------------
+## 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.
+## ------------------------------------------------------------------------
## sobject-query-records.vm
/*
* Salesforce Query DTO generated by camel-salesforce-maven-plugin
http://git-wip-us.apache.org/repos/asf/camel/blob/ec405208/examples/camel-example-jdbc/src/main/resources/create-derby.sql
----------------------------------------------------------------------
diff --git a/examples/camel-example-jdbc/src/main/resources/create-derby.sql b/examples/camel-example-jdbc/src/main/resources/create-derby.sql
index 2f75cb1..671d9e6 100644
--- a/examples/camel-example-jdbc/src/main/resources/create-derby.sql
+++ b/examples/camel-example-jdbc/src/main/resources/create-derby.sql
@@ -1,4 +1,20 @@
/*
+ 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.
+*/
+/*
STATUS : 'NEW', 'DONE'
*/
CREATE TABLE CAMEL_TEST (
@@ -6,4 +22,4 @@ CREATE TABLE CAMEL_TEST (
MSG VARCHAR(10240),
STATUS CHAR(4) DEFAULT 'NEW',
CREATE_TS TIMESTAMP DEFAULT CURRENT_TIMESTAMP
-);
\ No newline at end of file
+);
http://git-wip-us.apache.org/repos/asf/camel/blob/ec405208/tooling/archetypes/camel-archetype-cxf-contract-first-blueprint/src/main/resources/archetype-resources/src/main/resources/ok.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-cxf-contract-first-blueprint/src/main/resources/archetype-resources/src/main/resources/ok.xml b/tooling/archetypes/camel-archetype-cxf-contract-first-blueprint/src/main/resources/archetype-resources/src/main/resources/ok.xml
index 70800d1..ed3e194 100644
--- a/tooling/archetypes/camel-archetype-cxf-contract-first-blueprint/src/main/resources/archetype-resources/src/main/resources/ok.xml
+++ b/tooling/archetypes/camel-archetype-cxf-contract-first-blueprint/src/main/resources/archetype-resources/src/main/resources/ok.xml
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
<ns2:outputReportIncident xmlns:ns2="http://reportincident.example.camel.apache.org">
<code>Accepted</code>
-</ns2:outputReportIncident>
\ No newline at end of file
+</ns2:outputReportIncident>
http://git-wip-us.apache.org/repos/asf/camel/blob/ec405208/tooling/maven/camel-package-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml b/tooling/maven/camel-package-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
index 565f8d4..56f2169 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
+++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
[2/2] git commit: Fixed the CS error of camel-sql
Posted by ni...@apache.org.
Fixed the CS error of camel-sql
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a25dbec5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a25dbec5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a25dbec5
Branch: refs/heads/master
Commit: a25dbec5ca862549e91bf0d365bb231240c4b6f4
Parents: ec40520
Author: Willem Jiang <wi...@gmail.com>
Authored: Wed May 7 13:07:57 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Thu May 8 10:18:35 2014 +0800
----------------------------------------------------------------------
.../java/org/apache/camel/component/sql/SqlGeneratedKeysTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a25dbec5/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlGeneratedKeysTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlGeneratedKeysTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlGeneratedKeysTest.java
index 6a381ab..8b6fa7f 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlGeneratedKeysTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlGeneratedKeysTest.java
@@ -158,7 +158,7 @@ public class SqlGeneratedKeysTest extends CamelTestSupport {
assertEquals(4, generatedKeys.size());
int id = 3;
- for (Map<String, Object> row: generatedKeys) {
+ for (Map<String, Object> row : generatedKeys) {
assertEquals("auto increment value should be " + id, Integer.valueOf(id++), row.get("ID"));
}