Repository: camel Updated Branches: refs/heads/master 1e9a3b432 -> d135f1483
CAMEL-9585: Add mvn coordinate to grape. Thanks to Jorg Kasteleiner for the patch. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d135f148 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d135f148 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d135f148 Branch: refs/heads/master Commit: d135f1483b6a1117cca1a43d3f5015d9e3309f8f Parents: 1e9a3b4 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Apr 13 09:59:32 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Apr 13 09:59:32 2016 +0200 ---------------------------------------------------------------------- .../apache/camel/component/grape/GrapeEndpoint.groovy | 2 +- .../apache/camel/component/grape/GrapeProducer.groovy | 4 ++-- .../camel/component/grape/MavenCoordinates.groovy | 13 +++++++++++-- 3 files changed, 14 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d135f148/components/camel-grape/src/main/groovy/org/apache/camel/component/grape/GrapeEndpoint.groovy ---------------------------------------------------------------------- diff --git a/components/camel-grape/src/main/groovy/org/apache/camel/component/grape/GrapeEndpoint.groovy b/components/camel-grape/src/main/groovy/org/apache/camel/component/grape/GrapeEndpoint.groovy index e845f0c..4ab600f 100644 --- a/components/camel-grape/src/main/groovy/org/apache/camel/component/grape/GrapeEndpoint.groovy +++ b/components/camel-grape/src/main/groovy/org/apache/camel/component/grape/GrapeEndpoint.groovy @@ -45,7 +45,7 @@ class GrapeEndpoint extends DefaultEndpoint { patchesRepository.listPatches().each { def coordinates = parseMavenCoordinates(it) grab(classLoader: classLoader, - group: coordinates.groupId, module: coordinates.artifactId, version: coordinates.version) + group: coordinates.groupId, module: coordinates.artifactId, version: coordinates.version, classifier: coordinates.classifier) } } http://git-wip-us.apache.org/repos/asf/camel/blob/d135f148/components/camel-grape/src/main/groovy/org/apache/camel/component/grape/GrapeProducer.groovy ---------------------------------------------------------------------- diff --git a/components/camel-grape/src/main/groovy/org/apache/camel/component/grape/GrapeProducer.groovy b/components/camel-grape/src/main/groovy/org/apache/camel/component/grape/GrapeProducer.groovy index 1e0f521..a303149 100644 --- a/components/camel-grape/src/main/groovy/org/apache/camel/component/grape/GrapeProducer.groovy +++ b/components/camel-grape/src/main/groovy/org/apache/camel/component/grape/GrapeProducer.groovy @@ -40,11 +40,11 @@ class GrapeProducer extends DefaultProducer { def rawCoordinates = exchange.in.getBody(String.class) try { def coordinates = MavenCoordinates.parseMavenCoordinates(rawCoordinates) - Grape.grab(classLoader: classLoader, group: coordinates.groupId, module: coordinates.artifactId, version: coordinates.version) + Grape.grab(classLoader: classLoader, group: coordinates.groupId, module: coordinates.artifactId, version: coordinates.version, classifier: coordinates.classifier) endpoint.component.patchesRepository.install(rawCoordinates) } catch (IllegalArgumentException ex) { def coordinates = MavenCoordinates.parseMavenCoordinates(getEndpoint().defaultCoordinates) - Grape.grab(classLoader: classLoader, group: coordinates.groupId, module: coordinates.artifactId, version: coordinates.version) + Grape.grab(classLoader: classLoader, group: coordinates.groupId, module: coordinates.artifactId, version: coordinates.version, classifier: coordinates.classifier) endpoint.component.patchesRepository.install(getEndpoint().defaultCoordinates) } break http://git-wip-us.apache.org/repos/asf/camel/blob/d135f148/components/camel-grape/src/main/groovy/org/apache/camel/component/grape/MavenCoordinates.groovy ---------------------------------------------------------------------- diff --git a/components/camel-grape/src/main/groovy/org/apache/camel/component/grape/MavenCoordinates.groovy b/components/camel-grape/src/main/groovy/org/apache/camel/component/grape/MavenCoordinates.groovy index 7959675..11296c4 100644 --- a/components/camel-grape/src/main/groovy/org/apache/camel/component/grape/MavenCoordinates.groovy +++ b/components/camel-grape/src/main/groovy/org/apache/camel/component/grape/MavenCoordinates.groovy @@ -27,12 +27,18 @@ class MavenCoordinates { private final String version + private final String classifier + static MavenCoordinates parseMavenCoordinates(String coordinates) { def coordinatesParts = coordinates.split('/') - if(coordinatesParts.length != 3) { + def clazzifier = '' + if (coordinatesParts.length < 3 || coordinatesParts.length > 4) { throw new IllegalArgumentException("Invalid coordinates: ${coordinates}") } - new MavenCoordinates(groupId: coordinatesParts[0], artifactId: coordinatesParts[1], version: coordinatesParts[2]) + if (coordinatesParts.length == 4) { + clazzifier = coordinatesParts[3] + } + new MavenCoordinates(groupId: coordinatesParts[0], artifactId: coordinatesParts[1], version: coordinatesParts[2], classifier: clazzifier) } String getGroupId() { @@ -47,4 +53,7 @@ class MavenCoordinates { return version } + String getClassifier() { + return classifier + } }
