Updated Branches: refs/heads/camel-2.10.x eb74917c0 -> 8d2e138b9 refs/heads/camel-2.11.x 3b3e4728e -> b739a43cf refs/heads/master 68af5745b -> 8aa6aa6c3
Polished Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/87357e87 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/87357e87 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/87357e87 Branch: refs/heads/master Commit: 87357e87a5e42d2b4c5356632932ec1ef9eb7bd8 Parents: 68af574 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Jun 4 08:57:58 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Jun 4 08:57:58 2013 +0200 ---------------------------------------------------------------------- .../camel/blueprint/BlueprintCamelContext.java | 4 ---- .../camel/blueprint/CamelEndpointFactoryBean.java | 1 - .../blueprint/SSLContextParametersFactoryBean.java | 5 ----- 3 files changed, 0 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/87357e87/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java ---------------------------------------------------------------------- diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java index 33798ec..cded338 100644 --- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java +++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java @@ -25,17 +25,13 @@ import org.apache.camel.core.osgi.utils.BundleDelegatingClassLoader; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.spi.FactoryFinder; import org.apache.camel.spi.Registry; -import org.apache.camel.util.ObjectHelper; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceEvent; import org.osgi.framework.ServiceListener; -import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceRegistration; import org.osgi.service.blueprint.container.BlueprintContainer; import org.osgi.service.blueprint.container.BlueprintEvent; import org.osgi.service.blueprint.container.BlueprintListener; -import org.osgi.service.cm.Configuration; -import org.osgi.service.cm.ConfigurationAdmin; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/camel/blob/87357e87/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelEndpointFactoryBean.java ---------------------------------------------------------------------- diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelEndpointFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelEndpointFactoryBean.java index 9306bd4..8aa95c8 100644 --- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelEndpointFactoryBean.java +++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelEndpointFactoryBean.java @@ -16,7 +16,6 @@ */ package org.apache.camel.blueprint; - import java.util.Set; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; http://git-wip-us.apache.org/repos/asf/camel/blob/87357e87/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/SSLContextParametersFactoryBean.java ---------------------------------------------------------------------- diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/SSLContextParametersFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/SSLContextParametersFactoryBean.java index 3fa9af9..8879bbb 100644 --- a/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/SSLContextParametersFactoryBean.java +++ b/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/SSLContextParametersFactoryBean.java @@ -31,15 +31,10 @@ import org.osgi.service.blueprint.container.BlueprintContainer; public class SSLContextParametersFactoryBean extends AbstractSSLContextParametersFactoryBean { private KeyManagersParametersFactoryBean keyManagers; - private TrustManagersParametersFactoryBean trustManagers; - private SecureRandomParametersFactoryBean secureRandom; - private SSLContextClientParametersFactoryBean clientParameters; - private SSLContextServerParametersFactoryBean serverParameters; - @XmlTransient private BlueprintContainer blueprintContainer;
