This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 869482cb3e274c2050ee149080c430a431140104
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Jun 19 11:38:02 2019 +0200
CAMEL-13663: camel-main-maven-plugin to generte spring-boot tooling
metadata to fool Java editors to have code completions for Camel Main
application.properties files.
---
.../maven}/camel-main-parser/pom.xml | 2 +-
.../camel/main/parser/ConfigurationModel.java | 0
.../camel/main/parser/MainConfigurationParser.java | 0
.../src/main/resources/META-INF/LICENSE.txt | 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../apache/camel/main/parser/MyConfiguration.java | 22 ++--------------------
.../main/parser/MyConfigurationParserTest.java | 2 +-
.../src/test/resources/log4j2.properties | 0
tooling/maven/pom.xml | 1 +
9 files changed, 5 insertions(+), 22 deletions(-)
diff --git a/catalog/camel-main-parser/pom.xml
b/tooling/maven/camel-main-parser/pom.xml
similarity index 98%
rename from catalog/camel-main-parser/pom.xml
rename to tooling/maven/camel-main-parser/pom.xml
index 55ac7e3..711f243 100644
--- a/catalog/camel-main-parser/pom.xml
+++ b/tooling/maven/camel-main-parser/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel</groupId>
- <artifactId>catalog</artifactId>
+ <artifactId>maven-plugins</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
diff --git
a/catalog/camel-main-parser/src/main/java/org/apache/camel/main/parser/ConfigurationModel.java
b/tooling/maven/camel-main-parser/src/main/java/org/apache/camel/main/parser/ConfigurationModel.java
similarity index 100%
rename from
catalog/camel-main-parser/src/main/java/org/apache/camel/main/parser/ConfigurationModel.java
rename to
tooling/maven/camel-main-parser/src/main/java/org/apache/camel/main/parser/ConfigurationModel.java
diff --git
a/catalog/camel-main-parser/src/main/java/org/apache/camel/main/parser/MainConfigurationParser.java
b/tooling/maven/camel-main-parser/src/main/java/org/apache/camel/main/parser/MainConfigurationParser.java
similarity index 100%
rename from
catalog/camel-main-parser/src/main/java/org/apache/camel/main/parser/MainConfigurationParser.java
rename to
tooling/maven/camel-main-parser/src/main/java/org/apache/camel/main/parser/MainConfigurationParser.java
diff --git a/catalog/camel-main-parser/src/main/resources/META-INF/LICENSE.txt
b/tooling/maven/camel-main-parser/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from catalog/camel-main-parser/src/main/resources/META-INF/LICENSE.txt
rename to
tooling/maven/camel-main-parser/src/main/resources/META-INF/LICENSE.txt
diff --git a/catalog/camel-main-parser/src/main/resources/META-INF/NOTICE.txt
b/tooling/maven/camel-main-parser/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from catalog/camel-main-parser/src/main/resources/META-INF/NOTICE.txt
rename to tooling/maven/camel-main-parser/src/main/resources/META-INF/NOTICE.txt
diff --git
a/catalog/camel-main-parser/src/test/java/org/apache/camel/main/parser/MyConfiguration.java
b/tooling/maven/camel-main-parser/src/test/java/org/apache/camel/main/parser/MyConfiguration.java
similarity index 96%
rename from
catalog/camel-main-parser/src/test/java/org/apache/camel/main/parser/MyConfiguration.java
rename to
tooling/maven/camel-main-parser/src/test/java/org/apache/camel/main/parser/MyConfiguration.java
index 55da275..28bf4a3 100644
---
a/catalog/camel-main-parser/src/test/java/org/apache/camel/main/parser/MyConfiguration.java
+++
b/tooling/maven/camel-main-parser/src/test/java/org/apache/camel/main/parser/MyConfiguration.java
@@ -16,9 +16,6 @@
*/
package org.apache.camel.main.parser;
-import org.apache.camel.ManagementStatisticsLevel;
-import org.apache.camel.support.PatternHelper;
-
/**
* Common set of configuration options used by Camel Main, Camel Spring Boot
and other runtimes.
*/
@@ -59,7 +56,6 @@ public class MyConfiguration {
private boolean endpointRuntimeStatisticsEnabled;
private boolean useDataType;
private boolean useBreadcrumb;
- private ManagementStatisticsLevel jmxManagementStatisticsLevel =
ManagementStatisticsLevel.Default;
private String jmxManagementNamePattern = "#name#";
private boolean jmxCreateConnector;
private boolean useMdcLogging;
@@ -523,20 +519,6 @@ public class MyConfiguration {
this.useBreadcrumb = useBreadcrumb;
}
- public ManagementStatisticsLevel getJmxManagementStatisticsLevel() {
- return jmxManagementStatisticsLevel;
- }
-
- /**
- * Sets the JMX statistics level
- * The level can be set to Extended to gather additional information
- *
- * The default value is Default.
- */
- public void setJmxManagementStatisticsLevel(ManagementStatisticsLevel
jmxManagementStatisticsLevel) {
- this.jmxManagementStatisticsLevel = jmxManagementStatisticsLevel;
- }
-
public String getJmxManagementNamePattern() {
return jmxManagementNamePattern;
}
@@ -603,7 +585,7 @@ public class MyConfiguration {
* - Match by route id
* - Match by route input endpoint uri
*
- * The matching is using exact match, by wildcard and regular expression
as documented by {@link PatternHelper#matchPattern(String, String)}.
+ * The matching is using exact match, by wildcard and regular expression
as documented by PatternHelper#matchPattern(String, String).
*
* For example to only include routes which starts with foo in their route
id's, use: include=foo*
* And to exclude routes which starts from JMS endpoints, use:
exclude=jms:*
@@ -626,7 +608,7 @@ public class MyConfiguration {
* - Match by route id
* - Match by route input endpoint uri
*
- * The matching is using exact match, by wildcard and regular expression
as documented by {@link PatternHelper#matchPattern(String, String)}.
+ * The matching is using exact match, by wildcard and regular expression
as documented by PatternHelper#matchPattern(String, String).
*
* For example to only include routes which starts with foo in their route
id's, use: include=foo*
* And to exclude routes which starts from JMS endpoints, use:
exclude=jms:*
diff --git
a/catalog/camel-main-parser/src/test/java/org/apache/camel/main/parser/MyConfigurationParserTest.java
b/tooling/maven/camel-main-parser/src/test/java/org/apache/camel/main/parser/MyConfigurationParserTest.java
similarity index 97%
rename from
catalog/camel-main-parser/src/test/java/org/apache/camel/main/parser/MyConfigurationParserTest.java
rename to
tooling/maven/camel-main-parser/src/test/java/org/apache/camel/main/parser/MyConfigurationParserTest.java
index 452a6b0..6ccc14d 100644
---
a/catalog/camel-main-parser/src/test/java/org/apache/camel/main/parser/MyConfigurationParserTest.java
+++
b/tooling/maven/camel-main-parser/src/test/java/org/apache/camel/main/parser/MyConfigurationParserTest.java
@@ -30,7 +30,7 @@ public class MyConfigurationParserTest extends TestCase {
MainConfigurationParser parser = new MainConfigurationParser();
List<ConfigurationModel> list =
parser.parseConfigurationSource(fileName);
assertNotNull(list);
- assertEquals(42, list.size());
+ assertEquals(41, list.size());
assertEquals("name", list.get(0).getName());
assertEquals("java.lang.String", list.get(0).getJavaType());
diff --git a/catalog/camel-main-parser/src/test/resources/log4j2.properties
b/tooling/maven/camel-main-parser/src/test/resources/log4j2.properties
similarity index 100%
rename from catalog/camel-main-parser/src/test/resources/log4j2.properties
rename to tooling/maven/camel-main-parser/src/test/resources/log4j2.properties
diff --git a/tooling/maven/pom.xml b/tooling/maven/pom.xml
index 1d2fa52..29b89aa 100644
--- a/tooling/maven/pom.xml
+++ b/tooling/maven/pom.xml
@@ -34,6 +34,7 @@
<description>Camel Maven Plugins</description>
<modules>
+ <module>camel-main-parser</module>
<module>camel-package-maven-plugin</module>
<module>camel-maven-plugin</module>
<module>camel-eip-documentation-enricher-maven-plugin</module>
