Author: joed Date: Tue Feb 22 20:41:41 2011 New Revision: 1073493 URL: http://svn.apache.org/viewvc?rev=1073493&view=rev Log: Fix broken build from : CAMEL-3696: Removed list of Expression for Resequencer.
Validated with camel-itest-osgi Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.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=1073493&r1=1073492&r2=1073493&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 Tue Feb 22 20:41:41 2011 @@ -25,11 +25,9 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.concurrent.Callable; - import javax.xml.bind.Binder; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; - import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -89,7 +87,6 @@ import org.osgi.service.blueprint.reflec import org.slf4j.Logger; import org.slf4j.LoggerFactory; - public class CamelNamespaceHandler implements NamespaceHandler { private static final String CAMEL_CONTEXT = "camelContext"; @@ -121,9 +118,7 @@ public class CamelNamespaceHandler imple @SuppressWarnings("unchecked") public Set<Class> getManagedClasses() { - return new HashSet<Class>(Arrays.asList( - BlueprintCamelContext.class - )); + return new HashSet<Class>(Arrays.asList(BlueprintCamelContext.class)); } public Metadata parse(Element element, ParserContext context) { @@ -588,13 +583,12 @@ public class CamelNamespaceHandler imple } } catch (UnsupportedOperationException e) { LOG.warn("Unable to add dependencies on to camel components OSGi services. " - + "The Apache Aries blueprint implementation used it too old and the blueprint bundle can not see the org.apache.camel.spi package."); + + "The Apache Aries blueprint implementation used it too old and the blueprint bundle can not see the org.apache.camel.spi package."); components.clear(); languages.clear(); dataformats.clear(); } - } public <T extends org.osgi.service.blueprint.reflect.Metadata> T createMetadata(java.lang.Class<T> tClass) { @@ -626,7 +620,7 @@ public class CamelNamespaceHandler imple findLanguage(((ExpressionNode) def).getExpression(), languages); } if (def instanceof ResequenceDefinition) { - findLanguage(((ResequenceDefinition) def).getExpressions(), languages); + findLanguage(((ResequenceDefinition) def).getExpression(), languages); } if (def instanceof AggregateDefinition) { findLanguage(((AggregateDefinition) def).getExpression(), languages);