You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/12/02 10:30:17 UTC
[camel] branch master updated (c83db4d -> aa59017)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from c83db4d Fixed test after XML DSL model change to use strings for attributes
new d6cd9bc Camel-Core-Engine: Fixed CS
new ae20a8e Camel-Core: Fixed CS
new aa59017 Camel-Spring: Fixed CS
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel-spring/src/test/resources/custom.properties | 16 ++++++++++++++++
.../apache/camel/model/dataformat/Any23DataFormat.java | 2 +-
.../java/org/apache/camel/reifier/AbstractReifier.java | 16 ++++++++++++++++
.../org/apache/camel/model/OnFallbackDefinitionTest.java | 16 ++++++++++++++++
4 files changed, 49 insertions(+), 1 deletion(-)
[camel] 02/03: Camel-Core: Fixed CS
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ae20a8e9a58ce6bd730dc5fc35ca2bc4b08a7710
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Dec 2 11:25:34 2019 +0100
Camel-Core: Fixed CS
---
.../org/apache/camel/model/OnFallbackDefinitionTest.java | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/core/camel-core/src/test/java/org/apache/camel/model/OnFallbackDefinitionTest.java b/core/camel-core/src/test/java/org/apache/camel/model/OnFallbackDefinitionTest.java
index 2d6447e..ef53961 100644
--- a/core/camel-core/src/test/java/org/apache/camel/model/OnFallbackDefinitionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/model/OnFallbackDefinitionTest.java
@@ -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.
+ */
package org.apache.camel.model;
import org.junit.Assert;
[camel] 03/03: Camel-Spring: Fixed CS
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit aa59017c3a0b3fffcb7f38582296d7fafaeff160
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Dec 2 11:29:53 2019 +0100
Camel-Spring: Fixed CS
---
.../camel-spring/src/test/resources/custom.properties | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/components/camel-spring/src/test/resources/custom.properties b/components/camel-spring/src/test/resources/custom.properties
index 7244431..167bfe0 100644
--- a/components/camel-spring/src/test/resources/custom.properties
+++ b/components/camel-spring/src/test/resources/custom.properties
@@ -1 +1,17 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
aggregation.timeout=1000
[camel] 01/03: Camel-Core-Engine: Fixed CS
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d6cd9bc9a319d279e1aafd22f900c8c21186a869
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Dec 2 11:01:02 2019 +0100
Camel-Core-Engine: Fixed CS
---
.../apache/camel/model/dataformat/Any23DataFormat.java | 2 +-
.../java/org/apache/camel/reifier/AbstractReifier.java | 16 ++++++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java
index 97676a2..cb73d9a 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java
@@ -41,7 +41,7 @@ public class Any23DataFormat extends DataFormatDefinition {
@XmlAttribute
@Metadata(defaultValue = "RDF4JMODEL", enums = "NTRIPLES,TURTLE,NQUADS,RDFXML,JSONLD,RDFJSON,RDF4JMODEL",
- javaType="org.apache.camel.model.dataformat.Any23Type")
+ javaType = "org.apache.camel.model.dataformat.Any23Type")
private String outputFormat;
@XmlJavaTypeAdapter(PropertyDescriptionsAdapter.class)
private Map<String, String> configuration = new HashMap<>();
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/AbstractReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/AbstractReifier.java
index eb16998..1fde253 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/AbstractReifier.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/AbstractReifier.java
@@ -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.
+ */
package org.apache.camel.reifier;
import org.apache.camel.spi.RouteContext;