You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2011/06/09 03:50:48 UTC
svn commit: r1133625 - in /camel/trunk/components:
camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/
camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/
camel-jetty/src/test/java/org/apache/camel/component/jetty/
Author: hadrian
Date: Thu Jun 9 01:50:48 2011
New Revision: 1133625
URL: http://svn.apache.org/viewvc?rev=1133625&view=rev
Log:
CAMEL-4072. Patch applied with thanks to Dan Kulp
Modified:
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/EndpointDefinitionParser.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsSslContextParametersRouteTest.java
Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java?rev=1133625&r1=1133624&r2=1133625&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java Thu Jun 9 01:50:48 2011
@@ -458,12 +458,6 @@ public class CamelNamespaceHandler imple
return classes;
}
- private ValueMetadata createValue(ParserContext context, String value) {
- MutableValueMetadata v = context.createMetadata(MutableValueMetadata.class);
- v.setStringValue(value);
- return v;
- }
-
private RefMetadata createRef(ParserContext context, String value) {
MutableRefMetadata r = context.createMetadata(MutableRefMetadata.class);
r.setComponentId(value);
@@ -790,14 +784,6 @@ public class CamelNamespaceHandler imple
}
}
- private void findLanguage(List<ExpressionDefinition> expressions, Set<String> languages) {
- if (expressions != null) {
- for (ExpressionDefinition e : expressions) {
- findLanguage(e, languages);
- }
- }
- }
-
private void findLanguage(ExpressionSubElementDefinition expression, Set<String> languages) {
if (expression != null) {
findLanguage(expression.getExpressionType(), languages);
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/EndpointDefinitionParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/EndpointDefinitionParser.java?rev=1133625&r1=1133624&r2=1133625&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/EndpointDefinitionParser.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/EndpointDefinitionParser.java Thu Jun 9 01:50:48 2011
@@ -142,17 +142,6 @@ public class EndpointDefinitionParser ex
return endpointConfig;
}
- private Bundle getBlueprintBundle(ParserContext context) {
- PassThroughMetadata metadata = (PassThroughMetadata) context.getComponentDefinitionRegistry().getComponentDefinition("blueprintBundle");
-
- Bundle result = null;
- if (metadata != null) {
- result = (Bundle) metadata.getObject();
- }
-
- return result;
- }
-
public static class PassThroughCallable<T> implements Callable<T> {
private T value;
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsSslContextParametersRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsSslContextParametersRouteTest.java?rev=1133625&r1=1133624&r2=1133625&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsSslContextParametersRouteTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsSslContextParametersRouteTest.java Thu Jun 9 01:50:48 2011
@@ -45,7 +45,7 @@ public class ExplicitHttpsSslContextPara
// From Camel 2.5.0 Camel-Jetty is using SslSelectChannelConnector instead of SslSocketConnector
SslSelectChannelConnector sslSocketConnector = new SslSelectChannelConnector();
- sslSocketConnector.setSslContext(sslContextParameters.createSSLContext());
+ sslSocketConnector.getSslContextFactory().setSslContext(sslContextParameters.createSSLContext());
return sslSocketConnector;
}