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 2019/05/27 15:36:26 UTC
[camel] branch master updated (098df3f -> e484a66)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 098df3f Removing unused jdom dependency
new 6ee23cf camel3 - Fixed so fallback type converter is from url3
new e484a66 CAMEL-13581: Avoid generating TypeConverter files for core JARs as they are loaded via TypeConverterLoaded files instead.
The 2 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:
.../src/main/java/org/apache/camel/core/osgi/impl/Activator.java | 2 +-
.../java/org/apache/camel/tools/apt/TypeConverterProcessor.java | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
[camel] 01/02: camel3 - Fixed so fallback type converter is from
url3
Posted by da...@apache.org.
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 6ee23cf9e0aa553bf293af91f592c9fac499f7b3
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon May 27 16:59:44 2019 +0200
camel3 - Fixed so fallback type converter is from url3
---
.../src/main/java/org/apache/camel/core/osgi/impl/Activator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java
index dd105b0..ac1e0f5 100644
--- a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java
+++ b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java
@@ -235,7 +235,7 @@ public class Activator implements BundleActivator, BundleTrackerCustomizer<Objec
URL url3 = bundle.getEntry(META_INF_FALLBACK_TYPE_CONVERTER);
if (url1 != null || url2 != null || url3 != null) {
LOG.debug("Found TypeConverter in bundle {}", bundle.getSymbolicName());
- resolvers.add(new BundleTypeConverterLoader(bundle, url2 != null));
+ resolvers.add(new BundleTypeConverterLoader(bundle, url3 != null));
}
}
}
[camel] 02/02: CAMEL-13581: Avoid generating TypeConverter files
for core JARs as they are loaded via TypeConverterLoaded files instead.
Posted by da...@apache.org.
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 e484a66003b58bd08873e6483f8b415d85097f50
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon May 27 17:36:07 2019 +0200
CAMEL-13581: Avoid generating TypeConverter files for core JARs as they are loaded via TypeConverterLoaded files instead.
---
.../java/org/apache/camel/tools/apt/TypeConverterProcessor.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/TypeConverterProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/TypeConverterProcessor.java
index c53b7e0..909551c 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/TypeConverterProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/TypeConverterProcessor.java
@@ -51,9 +51,13 @@ public class TypeConverterProcessor extends AbstractCamelAnnotationProcessor {
}
}
}
+ // skip all converter classes from core as we just want to use the optimized TypeConverterLoader files
if (!converterClasses.isEmpty()
&& !converterClasses.containsKey("org.apache.camel.converter.IOConverter")
- && !converterClasses.containsKey("org.apache.camel.converter.jaxp.DomConverter")) {
+ && !converterClasses.containsKey("org.apache.camel.converter.jaxp.DomConverter")
+ && !converterClasses.containsKey("org.apache.camel.converter.jaxp.XmlConverter")
+ && !converterClasses.containsKey("org.apache.camel.util.xml.StreamSourceConverter")
+ && !converterClasses.containsKey("org.apache.camel.converter.stream.StreamCacheConverter")) {
Filer filer = processingEnv.getFiler();
FileObject resource = filer.createResource(StandardLocation.CLASS_OUTPUT,
"", "META-INF/services/org/apache/camel/TypeConverter",