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 2017/03/09 07:42:36 UTC
[1/3] camel git commit: camel-catalog-connector - Improved
Repository: camel
Updated Branches:
refs/heads/master 6dfed0914 -> 966bec5f1
camel-catalog-connector - Improved
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/966bec5f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/966bec5f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/966bec5f
Branch: refs/heads/master
Commit: 966bec5f17b9e8e2e63aaae83b242d0f08658af3
Parents: d4b5cbc
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Mar 9 08:36:02 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Mar 9 08:42:29 2017 +0100
----------------------------------------------------------------------
.../camel/catalog/nexus/LocalFileConnectorNexusRepository.java | 4 ++--
.../apache/camel/catalog/rest/CamelConnectorCatalogRestTest.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/966bec5f/platforms/camel-catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalFileConnectorNexusRepository.java
----------------------------------------------------------------------
diff --git a/platforms/camel-catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalFileConnectorNexusRepository.java b/platforms/camel-catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalFileConnectorNexusRepository.java
index ad697e7..2276576 100644
--- a/platforms/camel-catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalFileConnectorNexusRepository.java
+++ b/platforms/camel-catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalFileConnectorNexusRepository.java
@@ -45,8 +45,8 @@ public class LocalFileConnectorNexusRepository extends ConnectorCatalogNexusRepo
}
@Override
- protected void addConnector(NexusArtifactDto dto, String name, String description, String labels, String connectorJson, String connectorSchemaJson) {
- super.addConnector(dto, name, description, labels, connectorJson, connectorSchemaJson);
+ protected void addConnector(NexusArtifactDto dto, String name, String scheme, String description, String labels, String connectorJson, String connectorSchemaJson) {
+ super.addConnector(dto, name, scheme, description, labels, connectorJson, connectorSchemaJson);
if (onAddConnector != null) {
onAddConnector.run();
http://git-wip-us.apache.org/repos/asf/camel/blob/966bec5f/platforms/camel-catalog-rest/src/test/java/org/apache/camel/catalog/rest/CamelConnectorCatalogRestTest.java
----------------------------------------------------------------------
diff --git a/platforms/camel-catalog-rest/src/test/java/org/apache/camel/catalog/rest/CamelConnectorCatalogRestTest.java b/platforms/camel-catalog-rest/src/test/java/org/apache/camel/catalog/rest/CamelConnectorCatalogRestTest.java
index 04dfc22..df6b2d9 100644
--- a/platforms/camel-catalog-rest/src/test/java/org/apache/camel/catalog/rest/CamelConnectorCatalogRestTest.java
+++ b/platforms/camel-catalog-rest/src/test/java/org/apache/camel/catalog/rest/CamelConnectorCatalogRestTest.java
@@ -73,7 +73,7 @@ public class CamelConnectorCatalogRestTest {
@Test
public void testFindConnectors() throws Exception {
- catalog.getCatalog().addConnector("org.apache.camel", "myfoo-connector", "2.19.0", "MyFoo", "Something cool", "foo,timer", null, null);
+ catalog.getCatalog().addConnector("org.apache.camel", "myfoo-connector", "2.19.0", "MyFoo", "my-foo","Something cool", "foo,timer", null, null);
given().
baseUri("http://localhost:" + port).
[3/3] camel git commit: camel-catalog-connector - Improved
Posted by da...@apache.org.
camel-catalog-connector - Improved
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7df53c24
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7df53c24
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7df53c24
Branch: refs/heads/master
Commit: 7df53c246fcae5349ef8052a18ce1a47bfdf051b
Parents: 6dfed09
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Mar 9 08:25:45 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Mar 9 08:42:29 2017 +0100
----------------------------------------------------------------------
.../camel/catalog/nexus/ConnectorCatalogNexusRepository.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7df53c24/platforms/camel-catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/ConnectorCatalogNexusRepository.java
----------------------------------------------------------------------
diff --git a/platforms/camel-catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/ConnectorCatalogNexusRepository.java b/platforms/camel-catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/ConnectorCatalogNexusRepository.java
index b7ce96b..ce03701 100644
--- a/platforms/camel-catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/ConnectorCatalogNexusRepository.java
+++ b/platforms/camel-catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/ConnectorCatalogNexusRepository.java
@@ -81,19 +81,20 @@ public class ConnectorCatalogNexusRepository extends BaseNexusRepository {
*
* @param dto the artifact
* @param name the name of connector
+ * @param scheme the connector scheme
* @param description the description of connector
* @param labels the labels of connector
* @param connectorJson camel-connector JSon
* @param connectorSchemaJson camel-connector-schema JSon
*/
- protected void addConnector(NexusArtifactDto dto, String name, String description, String labels,
+ protected void addConnector(NexusArtifactDto dto, String name, String scheme, String description, String labels,
String connectorJson, String connectorSchemaJson) {
String groupId = dto.getGroupId();
String artifactId = dto.getArtifactId();
String version = dto.getVersion();
- camelConnectorCatalog.addConnector(groupId, artifactId, version, name, description, labels, connectorJson, connectorSchemaJson);
+ camelConnectorCatalog.addConnector(groupId, artifactId, version, name, scheme, description, labels, connectorJson, connectorSchemaJson);
log.info("Added connector: {}:{}:{}", dto.getGroupId(), dto.getArtifactId(), dto.getVersion());
}
@@ -108,6 +109,7 @@ public class ConnectorCatalogNexusRepository extends BaseNexusRepository {
ObjectMapper mapper = new ObjectMapper();
JsonNode tree = mapper.readTree(json[0]);
String name = tree.get("name").textValue();
+ String scheme = tree.get("scheme").textValue();
String description = tree.get("description").textValue();
Iterator<JsonNode> it = tree.withArray("labels").iterator();
@@ -117,7 +119,7 @@ public class ConnectorCatalogNexusRepository extends BaseNexusRepository {
csb.append(text);
}
- addConnector(dto, name, description, csb.toString(), json[0], json[1]);
+ addConnector(dto, name, scheme, description, csb.toString(), json[0], json[1]);
}
} catch (IOException e) {
log.warn("Error scanning JAR for custom Camel components", e);
[2/3] camel git commit: CAMEL-10973: Deprecate some languages that
are either EOL or can expose security issues or other issues and there is
better alternatives like javascript, groovy etc.
Posted by da...@apache.org.
CAMEL-10973: Deprecate some languages that are either EOL or can expose security issues or other issues and there is better alternatives like javascript, groovy etc.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d4b5cbc2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d4b5cbc2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d4b5cbc2
Branch: refs/heads/master
Commit: d4b5cbc2b263759162b055f373f96b08e6554320
Parents: 7df53c2
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Mar 9 08:30:48 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Mar 9 08:42:29 2017 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/model/language/ELExpression.java | 1 +
.../main/java/org/apache/camel/model/language/JXPathExpression.java | 1 +
.../main/java/org/apache/camel/model/language/PhpExpression.java | 1 +
.../main/java/org/apache/camel/model/language/PythonExpression.java | 1 +
.../main/java/org/apache/camel/model/language/RubyExpression.java | 1 +
.../main/java/org/apache/camel/model/language/SqlExpression.java | 1 +
6 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d4b5cbc2/camel-core/src/main/java/org/apache/camel/model/language/ELExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/ELExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/ELExpression.java
index f907e6a..ba47bf5 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/ELExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/ELExpression.java
@@ -30,6 +30,7 @@ import org.apache.camel.spi.Metadata;
@Metadata(firstVersion = "1.1.0", label = "language,script", title = "EL")
@XmlRootElement(name = "el")
@XmlAccessorType(XmlAccessType.FIELD)
+@Deprecated
public class ELExpression extends ExpressionDefinition {
public ELExpression() {
http://git-wip-us.apache.org/repos/asf/camel/blob/d4b5cbc2/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java
index 52fdb97..f742442 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java
@@ -34,6 +34,7 @@ import org.apache.camel.spi.Metadata;
@Metadata(firstVersion = "1.3.0", label = "language,java", title = "JXPath")
@XmlRootElement(name = "jxpath")
@XmlAccessorType(XmlAccessType.FIELD)
+@Deprecated
public class JXPathExpression extends ExpressionDefinition {
@XmlAttribute
http://git-wip-us.apache.org/repos/asf/camel/blob/d4b5cbc2/camel-core/src/main/java/org/apache/camel/model/language/PhpExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/PhpExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/PhpExpression.java
index 0d106b4..4ca036c 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/PhpExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/PhpExpression.java
@@ -30,6 +30,7 @@ import org.apache.camel.spi.Metadata;
@Metadata(firstVersion = "1.0.0", label = "language,script", title = "PHP")
@XmlRootElement(name = "php")
@XmlAccessorType(XmlAccessType.FIELD)
+@Deprecated
public class PhpExpression extends ExpressionDefinition {
public PhpExpression() {
http://git-wip-us.apache.org/repos/asf/camel/blob/d4b5cbc2/camel-core/src/main/java/org/apache/camel/model/language/PythonExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/PythonExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/PythonExpression.java
index 8032a21..837286a 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/PythonExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/PythonExpression.java
@@ -30,6 +30,7 @@ import org.apache.camel.spi.Metadata;
@Metadata(firstVersion = "1.0.0", label = "language,script", title = "Python")
@XmlRootElement(name = "python")
@XmlAccessorType(XmlAccessType.FIELD)
+@Deprecated
public class PythonExpression extends ExpressionDefinition {
public PythonExpression() {
http://git-wip-us.apache.org/repos/asf/camel/blob/d4b5cbc2/camel-core/src/main/java/org/apache/camel/model/language/RubyExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/RubyExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/RubyExpression.java
index 32b675f..f9304b6 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/RubyExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/RubyExpression.java
@@ -30,6 +30,7 @@ import org.apache.camel.spi.Metadata;
@Metadata(firstVersion = "1.0.0", label = "language,script", title = "Ruby")
@XmlRootElement(name = "ruby")
@XmlAccessorType(XmlAccessType.FIELD)
+@Deprecated
public class RubyExpression extends ExpressionDefinition {
public RubyExpression() {
http://git-wip-us.apache.org/repos/asf/camel/blob/d4b5cbc2/camel-core/src/main/java/org/apache/camel/model/language/SqlExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/SqlExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/SqlExpression.java
index 8209798..8e00d5f 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/SqlExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/SqlExpression.java
@@ -30,6 +30,7 @@ import org.apache.camel.spi.Metadata;
@Metadata(firstVersion = "1.0.0", label = "language", title = "SQL")
@XmlRootElement(name = "sql")
@XmlAccessorType(XmlAccessType.FIELD)
+@Deprecated
public class SqlExpression extends ExpressionDefinition {
public SqlExpression() {