Repository: camel Updated Branches: refs/heads/master 189980693 -> 374a2c41a
CAMEL-7386: camel-openshift component. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/374a2c41 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/374a2c41 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/374a2c41 Branch: refs/heads/master Commit: 374a2c41afbc8e7cf681da22f79c0e0d2914d891 Parents: 1899806 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Apr 22 18:38:17 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Apr 22 18:38:17 2014 +0200 ---------------------------------------------------------------------- .../camel/component/openshift/OpenShiftComponent.java | 9 +++++++++ .../apache/camel/component/openshift/OpenShiftEndpoint.java | 9 +++++++++ .../apache/camel/component/openshift/OpenShiftProducer.java | 7 ++++++- 3 files changed, 24 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/374a2c41/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftComponent.java b/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftComponent.java index 2883c5d..fd4747b 100644 --- a/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftComponent.java +++ b/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftComponent.java @@ -26,6 +26,7 @@ public class OpenShiftComponent extends UriEndpointComponent { private String username; private String password; private String domain; + private String server; public OpenShiftComponent() { super(OpenShiftEndpoint.class); @@ -66,4 +67,12 @@ public class OpenShiftComponent extends UriEndpointComponent { public void setDomain(String domain) { this.domain = domain; } + + public String getServer() { + return server; + } + + public void setServer(String server) { + this.server = server; + } } http://git-wip-us.apache.org/repos/asf/camel/blob/374a2c41/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftEndpoint.java b/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftEndpoint.java index a583cf6..3bdd1a6 100644 --- a/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftEndpoint.java +++ b/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftEndpoint.java @@ -31,6 +31,7 @@ public class OpenShiftEndpoint extends DefaultEndpoint { private String password; private String clientId; private String domain; + private String server; private OpenShiftOperation operation; private String application; @@ -88,6 +89,14 @@ public class OpenShiftEndpoint extends DefaultEndpoint { this.domain = domain; } + public String getServer() { + return server; + } + + public void setServer(String server) { + this.server = server; + } + public OpenShiftOperation getOperation() { return operation; } http://git-wip-us.apache.org/repos/asf/camel/blob/374a2c41/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftProducer.java b/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftProducer.java index 74e35a2..ae218ff 100644 --- a/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftProducer.java +++ b/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftProducer.java @@ -50,7 +50,12 @@ public class OpenShiftProducer extends DefaultProducer { @Override public void process(Exchange exchange) throws Exception { - String openshiftServer = new OpenShiftConfiguration().getLibraServer(); + String openshiftServer; + if (getEndpoint().getServer() != null) { + openshiftServer = getEndpoint().getServer(); + } else { + openshiftServer = new OpenShiftConfiguration().getLibraServer(); + } IOpenShiftConnection connection = new OpenShiftConnectionFactory().getConnection(getEndpoint().getClientId(), getEndpoint().getUsername(), getEndpoint().getPassword(), openshiftServer);
