camel git commit: CAMEL-8647: Fix duplicated import-package statement for org.osgi.framework in camel-cxf manifest
Repository: camel Updated Branches: refs/heads/master f627cdf95 - d947a3824 CAMEL-8647: Fix duplicated import-package statement for org.osgi.framework in camel-cxf manifest Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d947a382 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d947a382 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d947a382 Branch: refs/heads/master Commit: d947a382435e90a50d1dd1eadffaca7c455c17b8 Parents: f627cdf Author: Manuel Holzleitner manuel.holzleit...@gmail.com Authored: Mon May 18 16:36:07 2015 +0200 Committer: Claus Ibsen davscl...@apache.org Committed: Tue May 19 08:02:49 2015 +0200 -- components/camel-cxf/pom.xml | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/d947a382/components/camel-cxf/pom.xml -- diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml index 630e809..e8787ca 100644 --- a/components/camel-cxf/pom.xml +++ b/components/camel-cxf/pom.xml @@ -58,7 +58,6 @@ org.apache.aries.blueprint.reflect;version=[1.0,2.0);resolution:=optional, org.apache.aries.blueprint.mutable;version=[1.0,2.0);resolution:=optional, org.apache.camel.blueprint;resolution:=optional, - org.osgi.framework;resolution:=optional, * /camel.osgi.import
camel git commit: CAMEL-8647: Fix duplicated import-package statement for org.osgi.framework in camel-cxf manifest
Repository: camel
Updated Branches:
refs/heads/master d947a3824 - a8e18c209
CAMEL-8647: Fix duplicated import-package statement for org.osgi.framework in
camel-cxf manifest
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a8e18c20
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a8e18c20
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a8e18c20
Branch: refs/heads/master
Commit: a8e18c2095110c92faeb4b47d67f8141d7c3869a
Parents: d947a38
Author: Claus Ibsen davscl...@apache.org
Authored: Tue May 19 08:07:42 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Tue May 19 08:07:42 2015 +0200
--
components/camel-cxf-transport/pom.xml | 1 -
1 file changed, 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/a8e18c20/components/camel-cxf-transport/pom.xml
--
diff --git a/components/camel-cxf-transport/pom.xml
b/components/camel-cxf-transport/pom.xml
index 03ed120..e67e15a 100644
--- a/components/camel-cxf-transport/pom.xml
+++ b/components/camel-cxf-transport/pom.xml
@@ -44,7 +44,6 @@
org.springframework*;version=${spring-version-range};resolution:=optional,
${camel.osgi.import.defaults},
${camel.osgi.import.additional},
- org.osgi.framework;resolution:=optional,
org.apache.aries.blueprint*;resolution:=optional,
org.osgi.service.blueprint*;resolution:=optional,
*
[1/2] camel git commit: resolving rest todos
Repository: camel
Updated Branches:
refs/heads/master 5fca7ac4d - 69abfd77a
resolving rest todos
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b3efc44e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b3efc44e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b3efc44e
Branch: refs/heads/master
Commit: b3efc44ef9059b14c16942c92cfad051a2c67547
Parents: 5fca7ac
Author: sebi s...@softvision.ro
Authored: Tue May 19 09:23:03 2015 +0300
Committer: Claus Ibsen davscl...@apache.org
Committed: Tue May 19 08:57:05 2015 +0200
--
.../apache/camel/model/rest/RestDefinition.java | 34 ++-
.../camel/model/rest/RestOperationParam.java| 143 ---
.../rest/RestOperationParamDefinition.java | 241 +++
.../camel/model/rest/RestParamDefinition.java | 94
.../apache/camel/model/rest/VerbDefinition.java | 37 +--
.../component/swagger/RestSwaggerReader.scala | 4 +-
6 files changed, 279 insertions(+), 274 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/b3efc44e/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
index 385cbdc..f3729d5 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
@@ -32,6 +32,7 @@ import org.apache.camel.model.OptionalIdentifiedDefinition;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.ToDefinition;
import org.apache.camel.spi.Metadata;
+import org.apache.camel.util.FileUtil;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
@@ -267,12 +268,12 @@ public class RestDefinition extends
OptionalIdentifiedDefinitionRestDefinition
return this;
}
-public RestParamDefinition restParam() {
+public RestOperationParamDefinition restParam() {
if (getVerbs().isEmpty()) {
throw new IllegalArgumentException(Must add verb first, such as
get/post/delete);
}
VerbDefinition verb = getVerbs().get(getVerbs().size() - 1);
-return new RestParamDefinition(verb);
+return new RestOperationParamDefinition(verb);
}
public RestDefinition produces(String mediaType) {
@@ -540,6 +541,35 @@ public class RestDefinition extends
OptionalIdentifiedDefinitionRestDefinition
from = from + ? + query;
}
+String path = getPath();
+String s1 = FileUtil.stripTrailingSeparator(path);
+String s2 = FileUtil.stripLeadingSeparator(verb.getUri());
+String allPath;
+if (s1 != null s2 != null) {
+allPath = s1 + / + s2;
+} else if (path != null) {
+allPath = path;
+} else {
+allPath = verb.getUri();
+}
+
+// each {} is a parameter
+String[] arr = allPath.split(\\/);
+for (String a : arr) {
+if (a.startsWith({) a.endsWith(})) {
+String key = a.substring(1, a.length() - 1);
+restParam().name(key).type(RestParamType.path).endParam();
+}
+}
+
+if( verb.getType() != null ) {
+String bodyType = verb.getType();
+if (bodyType.endsWith([])) {
+bodyType = List[ + bodyType.substring(0,
bodyType.length() - 2) + ];
+}
+
restParam().name(RestParamType.body.name()).type(RestParamType.body).dataType(bodyType).endParam();
+}
+
// the route should be from this rest endpoint
route.fromRest(from);
route.setRestDefinition(this);
http://git-wip-us.apache.org/repos/asf/camel/blob/b3efc44e/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationParam.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationParam.java
b/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationParam.java
deleted file mode 100644
index 1a9c437..000
---
a/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationParam.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/**
- * 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
[1/2] camel git commit: Maven plugins: m2e compatibility
Repository: camel
Updated Branches:
refs/heads/master a8e18c209 - 5fca7ac4d
Maven plugins: m2e compatibility
- Uses BuildContext to support m2e and improve user experience in Eclipse
- Only trigger execution when input has changed
- Notify eclipse of change of output
- Only support the following goals in camel-package-maven-plugin (the others
are not really meant to be used by non-Camel developers)
- generate-components-list
- generate-dataformats-list
- generate-languages-list
- prepare-components
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/35c14d2f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/35c14d2f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/35c14d2f
Branch: refs/heads/master
Commit: 35c14d2fc1ed19ed53b3819bd8d6b1a1f131bda7
Parents: a8e18c2
Author: Victor Noël victor.n...@linagora.com
Authored: Mon May 18 12:43:04 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Tue May 19 08:20:40 2015 +0200
--
parent/pom.xml | 2 +-
.../maven/camel-package-maven-plugin/pom.xml| 5
.../maven/packaging/PackageComponentMojo.java | 27 --
.../maven/packaging/PackageDataFormatMojo.java | 29 ++--
.../maven/packaging/PackageLanguageMojo.java| 25 +
.../maven/packaging/PrepareComponentMojo.java | 24 +++-
.../META-INF/m2e/lifecycle-mapping-metadata.xml | 2 ++
7 files changed, 95 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/35c14d2f/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index c6902b7..c42ab3c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -386,7 +386,7 @@
pdfbox-version1.8.9/pdfbox-version
pgjdbc-ng-driver-version0.4/pgjdbc-ng-driver-version
plexus-container-default-version1.0-alpha-48/plexus-container-default-version
-plexus-utils-version1.5.6/plexus-utils-version
+plexus-utils-version1.5.8/plexus-utils-version
pojosr-version0.2.1/pojosr-version
powermock-version1.6.1/powermock-version
protobuf-version2.6.1/protobuf-version
http://git-wip-us.apache.org/repos/asf/camel/blob/35c14d2f/tooling/maven/camel-package-maven-plugin/pom.xml
--
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml
b/tooling/maven/camel-package-maven-plugin/pom.xml
index 2a95401..f5f9b06 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -59,6 +59,11 @@
version2.2.1/version
/dependency
dependency
+ groupIdorg.sonatype.plexus/groupId
+ artifactIdplexus-build-api/artifactId
+ version0.0.7/version
+/dependency
+dependency
groupIdorg.apache.maven.reporting/groupId
artifactIdmaven-reporting-api/artifactId
/dependency
http://git-wip-us.apache.org/repos/asf/camel/blob/35c14d2f/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
--
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
index 5e935fc..e46d63d 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
@@ -30,6 +30,7 @@ import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
+import org.sonatype.plexus.build.incremental.BuildContext;
/**
* Analyses the Camel plugins in a project and generates extra descriptor
information for easier auto-discovery in Camel.
@@ -63,6 +64,15 @@ public class PackageComponentMojo extends AbstractMojo {
private MavenProjectHelper projectHelper;
/**
+ * build context to check changed files and mark them for refresh (used for
+ * m2e compatibility)
+ *
+ * @component
+ * @readonly
+ */
+private BuildContext buildContext;
+
+/**
* Execute goal.
*
* @throws MojoExecutionException execution of the main class or one of the
@@ -70,12 +80,23 @@ public class PackageComponentMojo extends AbstractMojo {
* @throws MojoFailureException something bad happened...
*/
public void execute() throws
[2/2] camel git commit: Refactor and fixes m2e integration
Refactor and fixes m2e integration
The delta check wasn't properly working (because of absolute paths).
Factorised the checking method.
Added debug logs.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5fca7ac4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5fca7ac4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5fca7ac4
Branch: refs/heads/master
Commit: 5fca7ac4d670427c2dae7c8cf19fd40a87c6c10f
Parents: 35c14d2
Author: Victor Noël victor.n...@linagora.com
Authored: Mon May 18 13:28:21 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Tue May 19 08:20:41 2015 +0200
--
.../maven/packaging/PackageComponentMojo.java | 15 +
.../maven/packaging/PackageDataFormatMojo.java | 11 ++
.../camel/maven/packaging/PackageHelper.java| 22
.../maven/packaging/PackageLanguageMojo.java| 5 +
4 files changed, 34 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/5fca7ac4/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
--
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
index e46d63d..92ed09d 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
@@ -84,19 +84,13 @@ public class PackageComponentMojo extends AbstractMojo {
}
public static void prepareComponent(Log log, MavenProject project,
MavenProjectHelper projectHelper, File componentOutDir, BuildContext
buildContext) throws MojoExecutionException {
-File camelMetaDir = new File(componentOutDir,
META-INF/services/org/apache/camel/);
-
-boolean changed = false;
-for (Resource r : project.getBuild().getResources()) {
-if (buildContext.hasDelta(r.getDirectory() +
/META-INF/services/org/apache/camel/component)) {
-changed = true;
-}
-}
-
-if (!changed) {
+
+if (!PackageHelper.haveResourcesChanged(log, project, buildContext,
META-INF/services/org/apache/camel/component)) {
return;
}
+File camelMetaDir = new File(componentOutDir,
META-INF/services/org/apache/camel/);
+
StringBuilder buffer = new StringBuilder();
int count = 0;
for (Resource r : project.getBuild().getResources()) {
@@ -145,6 +139,7 @@ public class PackageComponentMojo extends AbstractMojo {
properties.store(new FileWriter(outFile), Generated by
camel-package-maven-plugin);
buildContext.refresh(outFile);
log.info(Generated + outFile + containing + count +
Camel + (count 1 ? components: : component: ) + names);
+
if (projectHelper != null) {
ListString includes = new ArrayListString();
includes.add(**/component.properties);
http://git-wip-us.apache.org/repos/asf/camel/blob/5fca7ac4/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
--
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
index ee022d4..9ddfe28 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
@@ -105,17 +105,10 @@ public class PackageDataFormatMojo extends AbstractMojo {
public static void prepareDataFormat(Log log, MavenProject project,
MavenProjectHelper projectHelper, File dataFormatOutDir, File schemaOutDir,
BuildContext buildContext) throws MojoExecutionException {
-boolean changed = false;
-for (Resource r : project.getBuild().getResources()) {
-if (buildContext.hasDelta(r.getDirectory() +
/META-INF/services/org/apache/camel/dataformat)) {
-changed = true;
-}
-}
-
-if (!changed) {
+if (!PackageHelper.haveResourcesChanged(log, project, buildContext,
META-INF/services/org/apache/camel/dataformat)) {
camel git commit: Improved RAT checks.
Repository: camel Updated Branches: refs/heads/camel-2.14.x e95e191b0 - 98ba97b1f Improved RAT checks. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/98ba97b1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/98ba97b1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/98ba97b1 Branch: refs/heads/camel-2.14.x Commit: 98ba97b1f8c7a3f11c7881a7194935d2760793ce Parents: e95e191 Author: Henryk Konsek hekon...@gmail.com Authored: Wed May 20 07:58:19 2015 +0200 Committer: Henryk Konsek hekon...@gmail.com Committed: Wed May 20 07:58:19 2015 +0200 -- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/98ba97b1/pom.xml -- diff --git a/pom.xml b/pom.xml index 3f00b5d..aa13f41 100755 --- a/pom.xml +++ b/pom.xml @@ -182,7 +182,7 @@ exclude**/src/signatures/*.txt/exclude exclude**/file-sig-api.txt/exclude exclude**/MerchandiseRestResource.apxc/exclude - excludecomponents/camel-dropbox/src/main/resources/META-INF/Dropbox_API_Terms_and_Conditions.txt/exclude + exclude**/META-INF/Dropbox_API_Terms_and_Conditions.txt/exclude !-- generated files -- exclude**/target/**/*/exclude exclude**/eclipse-classes/**/*/exclude @@ -193,7 +193,7 @@ exclude**/avro/**/*.avpr/exclude exclude**/OSGI-INF/bundle.info/exclude exclude**/test_rsa*/exclude -exclude**/examples/*/src/**/data/**/*.xml/exclude +exclude**/src/**/data/**/*.xml/exclude /excludes /configuration /plugin
camel git commit: Added myself to the KEYS.
Repository: camel Updated Branches: refs/heads/camel-2.14.x 8050e1e6d - e95e191b0 Added myself to the KEYS. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e95e191b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e95e191b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e95e191b Branch: refs/heads/camel-2.14.x Commit: e95e191b0357feee47febe4a9b6e6fa3a5f598e5 Parents: 8050e1e Author: Henryk Konsek hekon...@gmail.com Authored: Wed May 20 07:29:30 2015 +0200 Committer: Henryk Konsek hekon...@gmail.com Committed: Wed May 20 07:29:48 2015 +0200 -- KEYS | 34 ++ 1 file changed, 34 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/e95e191b/KEYS -- diff --git a/KEYS b/KEYS index cf65015..0174020 100644 --- a/KEYS +++ b/KEYS @@ -1014,3 +1014,37 @@ ly+0IqM8hQmA113GdFh8FPs9PuOvln7gp1Lqn4f7JKBZHHQbLkD/ppn3sLlZb/Xq S0maYlA= =OANb -END PGP PUBLIC KEY BLOCK- +pub 2048R/9C8D3B59 2012-10-10 +uid Henryk Konsek hekon...@apache.com +sub 2048R/4DF29C4A 2012-10-10 + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1 + +mQENBFB05RYBCAC5Gvz0zm/upu2XNyiDCxGe62vCjRWGo+lLRmlAYxYLm9iMI7Tf +8Vh32TlgVCn0D0fKsFzz/7cmPCXjaTNH/8wc+cJrZVPgO4+9h9DKPADjtpbaYIgR +toHMSLHH+jzcIJ4Q3uCXR0CoM7tDvybCfHGInkUTECYGEa6Owbl6yJ/KBfUqXxGk +hayAnNXO3kQXWutqkCEfUmGbXHq7YYcPf2jQc3a1oIB1BQcMSGOlsko3Dvf/kOrr +7tiEOAlpdkQRc5oSnw4wmWwU+Sij9kTdymka5lCBxhrgsnv4YhFgn4tXyhn405pR +l4MBcvDanM3KpVHYzNKfb2SMgpVdqk1A8hxRABEBAAG0I0hlbnJ5ayBLb25zZWsg +PGhla29uc2VrQGFwYWNoZS5jb20+iQE4BBMBAgAiBQJQdOUWAhsDBgsJCAcDAgYV +CAIJCgsEFgIDAQIeAQIXgAAKCRBo2rMmnI07WYAiB/46HxLhPNNRQ0O1sThZZiXz +OrELs0KePIDMb2Y++N/iRiR5qi/sCXmLD1AvHaknCN7fucWiVnRepGAgogC2rt8P ++Cnfa+aFo+Cck8OXX915GS5uUoWJhdMWRAAgVBNg5LdiAQD0dkG2v8uzfAW1n/eR +dvnSGTGzxAJ2kTQ9zRuljOKYn639w/ErfzN88jNpVNe658xHRgwxVOxxRuWHW5EF +Z5YWZZDAkhmbKPk8nnbdqJGXI/mGbczGYIZt9CJcy5dbELmFoz6aFL1dYMwzHFjv +LKZSrxLi52vXny3gNOCOki21cJWqnDYrlZTXoHteb3dftJvuf+yW5SjTRc0lx1me +uQENBFB05RYBCAC8oKi2jJ39OAtRC7BTeaTIcTtTeoZel1xTL6jxOt5ijF8md2ra +VL5lVhrthCWuWXanypT3Gc0lcn14RcFy3zXdEamRmihpKfSsMzbmvd2BD7PCzwk7 +6My8XRHXuwWCsjdn2RmtwUMNlkOVSMAMOiUEQg2nUOIQkzblMmzlYH+3aTrYxdn+ +y6J2/odY/SVrOH2crmImh/pPB3Q9u5LA+G3wXWsyccIBQgPqTtMLpEZyyL4/1MiX +cjnpA90ICyhC0AYSAwNe0yshKy702ucGO3OwpNPEm5L6hprw0TUZDKCcQORr5sI9 +teR2rauC8Q582mIiB9WMN2vJ2MMUO6kGJtkpABEBAAGJAR8EGAECAAkFAlB05RYC +GwwACgkQaNqzJpyNO1mFegf/bTN0NFDem3bGMSlEZedOTUMSRsEGZY7/nD0sfmLe +gSsAoxKQg48/MnSFRGgWkSCSkerZRtjmLi0JguP0ufxcV/t5dd0nbYrIC/YrYHNu +hijWCHSd+XY67RD9sQ3AV+SA0/4y8vZlnudrDz6SvP5EV3bZ+p8TBE7ch7OgyLM9 +zisG9BugFPsD5S7Zy0+ES2x4E+IxVYzZrUiajfT1PLrAgLfQ2TOwCggvSRU17xu8 +VcGkOXenZaUgBAp1p1GyxGlmFa8/VJAhsMzUvOUVU2T3nVKb/moMk7kZ34L11Ycm +O89+mqkE1TM0W6OF2aHV+RbQgyyufR/gsvKBfIKxEDATew== +=eNwt +-END PGP PUBLIC KEY BLOCK-
[4/4] camel git commit: Fixed rest-dsl after recent changes
Fixed rest-dsl after recent changes
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/45a3c047
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/45a3c047
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/45a3c047
Branch: refs/heads/master
Commit: 45a3c047b5096b4039d206d5b25ac770ba5251de
Parents: 6aaec82
Author: Claus Ibsen davscl...@apache.org
Authored: Tue May 19 22:28:48 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Tue May 19 22:28:48 2015 +0200
--
.../main/java/org/apache/camel/model/rest/VerbDefinition.java | 7 +++
1 file changed, 7 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/45a3c047/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
b/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
index 45b950f..ee7a615 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
@@ -102,6 +102,13 @@ public class VerbDefinition extends
OptionalIdentifiedDefinitionVerbDefinition
return params;
}
+/**
+ * To specify the REST operation parameters using Swagger.
+ */
+public void setParams(ListRestOperationParamDefinition params) {
+this.params = params;
+}
+
public String getMethod() {
return method;
}
[3/4] camel git commit: CAMEL-8782: Configuring endpoints using reference lookup may fail with matching primitive types with their Object counterpart types
CAMEL-8782: Configuring endpoints using reference lookup may fail with matching
primitive types with their Object counterpart types
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6aaec822
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6aaec822
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6aaec822
Branch: refs/heads/master
Commit: 6aaec82213c0a9eefe0675d57ad6f8d8dff0aa4d
Parents: 2bd2331
Author: Claus Ibsen davscl...@apache.org
Authored: Tue May 19 21:49:34 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Tue May 19 21:54:31 2015 +0200
--
.../org/apache/camel/util/IntrospectionSupport.java | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/6aaec822/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
b/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
index d04c310..13ceba9 100755
--- a/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
@@ -43,6 +43,8 @@ import org.apache.camel.TypeConverter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.util.ObjectHelper.isAssignableFrom;
+
/**
* Helper for introspections of beans.
* p/
@@ -502,16 +504,20 @@ public final class IntrospectionSupport {
if (ref == null) {
// try the next method if nothing was found
continue;
-} else if (!parameterType.isAssignableFrom(ref.getClass())) {
+} else {
// setter method has not the correct type
-continue;
+// (must use ObjectHelper.isAssignableFrom which takes
primitive types into account)
+boolean assignable = isAssignableFrom(parameterType,
ref.getClass());
+if (!assignable) {
+continue;
+}
}
}
try {
try {
// If the type is null or it matches the needed type, just
use the value directly
-if (value == null ||
parameterType.isAssignableFrom(ref.getClass())) {
+if (value == null || isAssignableFrom(parameterType,
ref.getClass())) {
// we may want to set options on classes that has
package view visibility, so override the accessible
setter.setAccessible(true);
setter.invoke(target, ref);
[2/2] camel git commit: CAMEL-8782: Configuring endpoints using reference lookup may fail with matching primitive types with their Object counterpart types
CAMEL-8782: Configuring endpoints using reference lookup may fail with matching
primitive types with their Object counterpart types
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/568ce2b1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/568ce2b1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/568ce2b1
Branch: refs/heads/camel-2.15.x
Commit: 568ce2b13ebe9c67627f8f0e403e9ac49b60c742
Parents: a696a46
Author: Claus Ibsen davscl...@apache.org
Authored: Tue May 19 21:49:34 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Tue May 19 22:30:00 2015 +0200
--
.../org/apache/camel/util/IntrospectionSupport.java | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/568ce2b1/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
b/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
index d04c310..13ceba9 100755
--- a/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
@@ -43,6 +43,8 @@ import org.apache.camel.TypeConverter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.util.ObjectHelper.isAssignableFrom;
+
/**
* Helper for introspections of beans.
* p/
@@ -502,16 +504,20 @@ public final class IntrospectionSupport {
if (ref == null) {
// try the next method if nothing was found
continue;
-} else if (!parameterType.isAssignableFrom(ref.getClass())) {
+} else {
// setter method has not the correct type
-continue;
+// (must use ObjectHelper.isAssignableFrom which takes
primitive types into account)
+boolean assignable = isAssignableFrom(parameterType,
ref.getClass());
+if (!assignable) {
+continue;
+}
}
}
try {
try {
// If the type is null or it matches the needed type, just
use the value directly
-if (value == null ||
parameterType.isAssignableFrom(ref.getClass())) {
+if (value == null || isAssignableFrom(parameterType,
ref.getClass())) {
// we may want to set options on classes that has
package view visibility, so override the accessible
setter.setAccessible(true);
setter.invoke(target, ref);
[2/4] camel git commit: Polished
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2bd23319
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2bd23319
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2bd23319
Branch: refs/heads/master
Commit: 2bd23319fe527b9165a5e20f0d06d4d57a667d25
Parents: 6f5bee1
Author: Claus Ibsen davscl...@apache.org
Authored: Tue May 19 21:49:04 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Tue May 19 21:49:04 2015 +0200
--
.../src/main/java/org/apache/camel/util/ObjectHelper.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/2bd23319/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
b/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
index 7367d1e..4e9ad05 100644
--- a/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
@@ -1825,7 +1825,7 @@ public final class ObjectHelper {
}
/**
- * Calling the Callable with the setting of TCCL with the camel context
application classloader;
+ * Calling the Callable with the setting of TCCL with the camel context
application classloader.
*
* @param call the Callable instance
* @param exchange the exchange
@@ -1840,10 +1840,10 @@ public final class ObjectHelper {
}
/**
- * Calling the Callable with the setting of TCCL with a given classloader;
- *
- * @param call the Callable instance
- * @param the exchange
+ * Calling the Callable with the setting of TCCL with a given classloader.
+ *
+ * @param callthe Callable instance
+ * @param classloader the class loader
* @return the result of Callable return
*/
public static Object callWithTCCL(Callable? call, ClassLoader
classloader) throws Exception {
[1/4] camel git commit: Bean component should use try .. catch to ensure the callback is invoked. Polished
Repository: camel
Updated Branches:
refs/heads/master 7d36d5260 - 45a3c047b
Bean component should use try .. catch to ensure the callback is invoked.
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6f5bee10
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6f5bee10
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6f5bee10
Branch: refs/heads/master
Commit: 6f5bee10d09467d36a005044592fa4a853849532
Parents: 7d36d52
Author: Claus Ibsen davscl...@apache.org
Authored: Tue May 19 20:34:10 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Tue May 19 20:34:10 2015 +0200
--
.../apache/camel/component/bean/BeanProcessor.java| 14 ++
.../apache/camel/component/bean/PojoProxyHelper.java | 1 +
2 files changed, 11 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/6f5bee10/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
b/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
index bf8ddbe..a273162 100644
---
a/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
+++
b/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
@@ -94,7 +94,7 @@ public class BeanProcessor extends ServiceSupport implements
AsyncProcessor {
Processor processor = getProcessor();
if (processor == null) {
// so if there is a custom type converter for the bean to
processor
-processor =
exchange.getContext().getTypeConverter().convertTo(Processor.class, exchange,
bean);
+processor =
exchange.getContext().getTypeConverter().tryConvertTo(Processor.class,
exchange, bean);
}
if (processor != null) {
LOG.trace(Using a custom adapter as bean invocation: {},
processor);
@@ -131,9 +131,15 @@ public class BeanProcessor extends ServiceSupport
implements AsyncProcessor {
LOG.debug(BeanHolder bean: {} and beanInvocation bean: {} is
same instance: {}, new Object[]{bean.getClass(), clazz, sameBean});
}
if (sameBean) {
-beanInvoke.invoke(bean, exchange);
-// propagate headers
-
exchange.getOut().getHeaders().putAll(exchange.getIn().getHeaders());
+try {
+beanInvoke.invoke(bean, exchange);
+if (exchange.hasOut()) {
+// propagate headers
+
exchange.getOut().getHeaders().putAll(exchange.getIn().getHeaders());
+}
+} catch (Throwable e) {
+exchange.setException(e);
+}
callback.done(true);
return true;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6f5bee10/camel-core/src/main/java/org/apache/camel/component/bean/PojoProxyHelper.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/bean/PojoProxyHelper.java
b/camel-core/src/main/java/org/apache/camel/component/bean/PojoProxyHelper.java
index 8a3d6aa..98964e6 100644
---
a/camel-core/src/main/java/org/apache/camel/component/bean/PojoProxyHelper.java
+++
b/camel-core/src/main/java/org/apache/camel/component/bean/PojoProxyHelper.java
@@ -27,6 +27,7 @@ import org.apache.camel.util.ServiceHelper;
* receives a reply. Unlike the ProxyHelper this works only with methods that
have only one parameter.
*/
public final class PojoProxyHelper {
+
private PojoProxyHelper() {
}
camel git commit: Added extra RAT exclusions.
Repository: camel Updated Branches: refs/heads/camel-2.14.x ea9d95f06 - 96a6e4ec4 Added extra RAT exclusions. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/96a6e4ec Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/96a6e4ec Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/96a6e4ec Branch: refs/heads/camel-2.14.x Commit: 96a6e4ec4c940da64f0db5fb7980d2b78f07648f Parents: ea9d95f Author: Henryk Konsek hekon...@gmail.com Authored: Tue May 19 21:29:14 2015 +0200 Committer: Henryk Konsek hekon...@gmail.com Committed: Tue May 19 21:29:14 2015 +0200 -- pom.xml | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/96a6e4ec/pom.xml -- diff --git a/pom.xml b/pom.xml index b7c1705..3f00b5d 100755 --- a/pom.xml +++ b/pom.xml @@ -180,6 +180,9 @@ excludes**/src/main/resources/META-INF/cxf/cxf.extension/excludes excludes**/src/main/resources/META-INF/cxf/bus-extensions.txt/excludes exclude**/src/signatures/*.txt/exclude +exclude**/file-sig-api.txt/exclude +exclude**/MerchandiseRestResource.apxc/exclude + excludecomponents/camel-dropbox/src/main/resources/META-INF/Dropbox_API_Terms_and_Conditions.txt/exclude !-- generated files -- exclude**/target/**/*/exclude exclude**/eclipse-classes/**/*/exclude
