You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/07/18 10:44:24 UTC
[2/3] camel git commit: Add missing licenses and polished
Add missing licenses and polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e078da8d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e078da8d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e078da8d
Branch: refs/heads/master
Commit: e078da8dc0c62b4c0ae188b0eac3d1b4bcfabf49
Parents: 7c6a077
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Jul 18 10:45:56 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Jul 18 10:45:56 2015 +0200
----------------------------------------------------------------------
components/camel-coap/pom.xml | 40 ++++++++++----------
.../src/test/resources/log4j.properties | 39 ++++++++++++++++---
.../services/org/apache/camel/component/paho | 19 +++++++++-
parent/pom.xml | 1 +
pom.xml | 8 ++++
5 files changed, 81 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e078da8d/components/camel-coap/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-coap/pom.xml b/components/camel-coap/pom.xml
index fe51b5e..f70ab85 100644
--- a/components/camel-coap/pom.xml
+++ b/components/camel-coap/pom.xml
@@ -1,36 +1,38 @@
<?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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>components</artifactId>
<groupId>org.apache.camel</groupId>
+ <artifactId>components</artifactId>
<version>2.16-SNAPSHOT</version>
</parent>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-coap</artifactId>
<packaging>bundle</packaging>
- <version>2.16-SNAPSHOT</version>
-
<name>Camel :: CoAP</name>
- <url>http://www.myorganization.org</url>
+ <description>Camel CoAP support</description>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <camel.osgi.export>
- org.apache.camel.component.coap;${camel.osgi.version},
- </camel.osgi.export>
- <camel.osgi.import>
- !org.apache.camel.component.coap,
- *
- </camel.osgi.import>
- <camel.osgi.export.service>
- org.apache.camel.spi.ComponentResolver;component=coap
- </camel.osgi.export.service>
-
+ <camel.osgi.export.pkg>org.apache.camel.component.coap.*</camel.osgi.export.pkg>
+ <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=coap</camel.osgi.export.service>
</properties>
<dependencies>
@@ -41,7 +43,7 @@
<dependency>
<groupId>org.eclipse.californium</groupId>
<artifactId>californium-core</artifactId>
- <version>1.0.0-M3</version>
+ <version>${californium-version}</version>
</dependency>
<!-- logging -->
http://git-wip-us.apache.org/repos/asf/camel/blob/e078da8d/components/camel-coap/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/components/camel-coap/src/test/resources/log4j.properties b/components/camel-coap/src/test/resources/log4j.properties
index 3b1bd38..4848ee7 100644
--- a/components/camel-coap/src/test/resources/log4j.properties
+++ b/components/camel-coap/src/test/resources/log4j.properties
@@ -1,14 +1,41 @@
+## ------------------------------------------------------------------------
+## 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
+# The logging properties used for testing.
#
-log4j.rootLogger=INFO, out
+log4j.rootLogger=INFO, file
-# uncomment the following line to turn on Camel debugging
-#log4j.logger.org.apache.camel=DEBUG
+# uncomment the following to enable camel debugging
+#log4j.logger.org.apache.camel.component.coap=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=[%30.30t] %-30.30c{1} %-5p %m%n
-#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+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{camelexchangeId} - %-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-coap-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
http://git-wip-us.apache.org/repos/asf/camel/blob/e078da8d/components/camel-paho/src/main/resources/META-INF/services/org/apache/camel/component/paho
----------------------------------------------------------------------
diff --git a/components/camel-paho/src/main/resources/META-INF/services/org/apache/camel/component/paho b/components/camel-paho/src/main/resources/META-INF/services/org/apache/camel/component/paho
index 2b88b5a..90ffb27 100644
--- a/components/camel-paho/src/main/resources/META-INF/services/org/apache/camel/component/paho
+++ b/components/camel-paho/src/main/resources/META-INF/services/org/apache/camel/component/paho
@@ -1 +1,18 @@
-class=org.apache.camel.component.paho.PahoComponent
\ No newline at end of file
+#
+# 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.
+#
+
+class=org.apache.camel.component.paho.PahoComponent
http://git-wip-us.apache.org/repos/asf/camel/blob/e078da8d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 1c6081e..44dce47 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -77,6 +77,7 @@
<boxjavalibv2.version>3.2.1</boxjavalibv2.version>
<build-helper-maven-plugin-version>1.8</build-helper-maven-plugin-version>
<c3p0-version>0.9.1.2</c3p0-version>
+ <californium-version>1.0.0-M3</californium-version>
<camel-test-spring-artifactId>camel-test-spring</camel-test-spring-artifactId>
<cassandra-driver-version>2.1.7</cassandra-driver-version>
<cassandra-driver-guava-version>16.0.1</cassandra-driver-guava-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/e078da8d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f3da5c9..ee5e5f6 100755
--- a/pom.xml
+++ b/pom.xml
@@ -239,6 +239,14 @@
<exclude>**/test_rsa*</exclude>
<exclude>**/examples/*/src/**/data/**/*.xml</exclude>
<exlucde>**/*.log</exlucde>
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <exclude>**/camel-grape/src/main/resources/org/apache/camel/component/grape/grape.json</exclude>
+ <exclude>**/Dropbox_API_Terms_and_Conditions.txt</exclude>
+ <exclude>**/camel-salesforce/camel-salesforce-component/MerchandiseRestResource.apxc</exclude>
+ <exclude>tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/signatures/file-sig-api.txt</exclude>
+ <exclude>tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/src/main/resources/default.properties</exclude>
+ <exclude>tooling/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/resources/application.yml</exclude>
+ <exclude>tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/index.html</exclude>
</excludes>
</configuration>
</plugin>