This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13947
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 24e29d6def49a7e13e91d5129bef2d9d9f9d0276
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Sep 26 11:00:06 2019 +0200
CAMEL-13947: PropertiesComponent should be a static service and resolved
like other similar features.
---
apache-camel/pom.xml | 10 -----
apache-camel/src/main/descriptors/common-bin.xml | 2 -
components/camel-properties/pom.xml | 49 ----------------------
components/pom.xml | 1 -
.../src/main/docs/properties-component.adoc | 0
.../AbstractLocationPropertiesSource.java | 0
.../properties/ClasspathPropertiesSource.java | 0
.../properties/DefaultPropertiesLookup.java | 0
.../properties/DefaultPropertiesParser.java | 0
.../properties/EnvPropertiesFunction.java | 0
.../component/properties/FilePropertiesSource.java | 0
.../properties/LocationPropertiesSource.java | 0
.../component/properties/PropertiesComponent.java | 0
.../component/properties/PropertiesFunction.java | 0
.../component/properties/PropertiesLocation.java | 0
.../component/properties/PropertiesLookup.java | 0
.../component/properties/PropertiesParser.java | 0
.../component/properties/RefPropertiesSource.java | 0
.../properties/ServiceHostPropertiesFunction.java | 0
.../properties/ServicePortPropertiesFunction.java | 0
.../properties/ServicePropertiesFunction.java | 0
.../properties/SysPropertiesFunction.java | 0
.../apache/camel/component/properties/package.html | 0
.../org/apache/camel/properties-component-factory | 0
24 files changed, 62 deletions(-)
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 9ac79f8..f0279da 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -1153,11 +1153,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-properties</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-protobuf</artifactId>
<version>${project.version}</version>
</dependency>
@@ -2677,11 +2672,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-properties-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-protobuf-starter</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/apache-camel/src/main/descriptors/common-bin.xml
b/apache-camel/src/main/descriptors/common-bin.xml
index adb73c0..6438386 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -251,7 +251,6 @@
<include>org.apache.camel:camel-pg-replication-slot</include>
<include>org.apache.camel:camel-pgevent</include>
<include>org.apache.camel:camel-printer</include>
- <include>org.apache.camel:camel-properties</include>
<include>org.apache.camel:camel-protobuf</include>
<include>org.apache.camel:camel-pubnub</include>
<include>org.apache.camel:camel-pulsar</include>
@@ -595,7 +594,6 @@
<include>org.apache.camel:camel-pg-replication-slot-starter</include>
<include>org.apache.camel:camel-pgevent-starter</include>
<include>org.apache.camel:camel-printer-starter</include>
- <include>org.apache.camel:camel-properties-starter</include>
<include>org.apache.camel:camel-protobuf-starter</include>
<include>org.apache.camel:camel-pubnub-starter</include>
<include>org.apache.camel:camel-pulsar-starter</include>
diff --git a/components/camel-properties/pom.xml
b/components/camel-properties/pom.xml
deleted file mode 100644
index c9245c9..0000000
--- a/components/camel-properties/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";
- 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>
-
- <parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>components</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>camel-properties</artifactId>
- <packaging>jar</packaging>
-
- <name>Camel :: Properties</name>
- <description>Camel Properties component</description>
- <properties>
- <firstVersion>2.3.0</firstVersion>
- <label>core</label>
- </properties>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-support</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- </dependencies>
-</project>
diff --git a/components/pom.xml b/components/pom.xml
index 1a0d396..a4133d1 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -47,7 +47,6 @@
<module>camel-language</module>
<module>camel-log</module>
<module>camel-mock</module>
- <module>camel-properties</module>
<module>camel-ref</module>
<module>camel-rest</module>
<module>camel-seda</module>
diff --git
a/components/camel-properties/src/main/docs/properties-component.adoc
b/core/camel-base/src/main/docs/properties-component.adoc
similarity index 100%
rename from components/camel-properties/src/main/docs/properties-component.adoc
rename to core/camel-base/src/main/docs/properties-component.adoc
diff --git
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/AbstractLocationPropertiesSource.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/AbstractLocationPropertiesSource.java
similarity index 100%
rename from
components/camel-properties/src/main/java/org/apache/camel/component/properties/AbstractLocationPropertiesSource.java
rename to
core/camel-base/src/main/java/org/apache/camel/component/properties/AbstractLocationPropertiesSource.java
diff --git
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/ClasspathPropertiesSource.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/ClasspathPropertiesSource.java
similarity index 100%
rename from
components/camel-properties/src/main/java/org/apache/camel/component/properties/ClasspathPropertiesSource.java
rename to
core/camel-base/src/main/java/org/apache/camel/component/properties/ClasspathPropertiesSource.java
diff --git
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/DefaultPropertiesLookup.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesLookup.java
similarity index 100%
rename from
components/camel-properties/src/main/java/org/apache/camel/component/properties/DefaultPropertiesLookup.java
rename to
core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesLookup.java
diff --git
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java
similarity index 100%
rename from
components/camel-properties/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java
rename to
core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java
diff --git
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/EnvPropertiesFunction.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/EnvPropertiesFunction.java
similarity index 100%
rename from
components/camel-properties/src/main/java/org/apache/camel/component/properties/EnvPropertiesFunction.java
rename to
core/camel-base/src/main/java/org/apache/camel/component/properties/EnvPropertiesFunction.java
diff --git
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/FilePropertiesSource.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/FilePropertiesSource.java
similarity index 100%
rename from
components/camel-properties/src/main/java/org/apache/camel/component/properties/FilePropertiesSource.java
rename to
core/camel-base/src/main/java/org/apache/camel/component/properties/FilePropertiesSource.java
diff --git
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/LocationPropertiesSource.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/LocationPropertiesSource.java
similarity index 100%
rename from
components/camel-properties/src/main/java/org/apache/camel/component/properties/LocationPropertiesSource.java
rename to
core/camel-base/src/main/java/org/apache/camel/component/properties/LocationPropertiesSource.java
diff --git
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
similarity index 100%
rename from
components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
rename to
core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
diff --git
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesFunction.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesFunction.java
similarity index 100%
rename from
components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesFunction.java
rename to
core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesFunction.java
diff --git
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesLocation.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesLocation.java
similarity index 100%
rename from
components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesLocation.java
rename to
core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesLocation.java
diff --git
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesLookup.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesLookup.java
similarity index 100%
rename from
components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesLookup.java
rename to
core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesLookup.java
diff --git
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesParser.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesParser.java
similarity index 100%
rename from
components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesParser.java
rename to
core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesParser.java
diff --git
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/RefPropertiesSource.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/RefPropertiesSource.java
similarity index 100%
rename from
components/camel-properties/src/main/java/org/apache/camel/component/properties/RefPropertiesSource.java
rename to
core/camel-base/src/main/java/org/apache/camel/component/properties/RefPropertiesSource.java
diff --git
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/ServiceHostPropertiesFunction.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/ServiceHostPropertiesFunction.java
similarity index 100%
rename from
components/camel-properties/src/main/java/org/apache/camel/component/properties/ServiceHostPropertiesFunction.java
rename to
core/camel-base/src/main/java/org/apache/camel/component/properties/ServiceHostPropertiesFunction.java
diff --git
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/ServicePortPropertiesFunction.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/ServicePortPropertiesFunction.java
similarity index 100%
rename from
components/camel-properties/src/main/java/org/apache/camel/component/properties/ServicePortPropertiesFunction.java
rename to
core/camel-base/src/main/java/org/apache/camel/component/properties/ServicePortPropertiesFunction.java
diff --git
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/ServicePropertiesFunction.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/ServicePropertiesFunction.java
similarity index 100%
rename from
components/camel-properties/src/main/java/org/apache/camel/component/properties/ServicePropertiesFunction.java
rename to
core/camel-base/src/main/java/org/apache/camel/component/properties/ServicePropertiesFunction.java
diff --git
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/SysPropertiesFunction.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/SysPropertiesFunction.java
similarity index 100%
rename from
components/camel-properties/src/main/java/org/apache/camel/component/properties/SysPropertiesFunction.java
rename to
core/camel-base/src/main/java/org/apache/camel/component/properties/SysPropertiesFunction.java
diff --git
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/package.html
b/core/camel-base/src/main/java/org/apache/camel/component/properties/package.html
similarity index 100%
rename from
components/camel-properties/src/main/java/org/apache/camel/component/properties/package.html
rename to
core/camel-base/src/main/java/org/apache/camel/component/properties/package.html
diff --git
a/components/camel-properties/src/main/resources/META-INF/services/org/apache/camel/properties-component-factory
b/core/camel-base/src/main/resources/META-INF/services/org/apache/camel/properties-component-factory
similarity index 100%
rename from
components/camel-properties/src/main/resources/META-INF/services/org/apache/camel/properties-component-factory
rename to
core/camel-base/src/main/resources/META-INF/services/org/apache/camel/properties-component-factory
