camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r555222 - in /activemq/camel/trunk: camel-core/ camel-core/src/main/resources/org/ camel-core/src/main/resources/org/apache/ camel-core/src/main/resources/org/apache/camel/ camel-core/src/main/resources/org/apache/camel/model/ camel-core/sr...
Date Wed, 11 Jul 2007 09:20:48 GMT
Author: jstrachan
Date: Wed Jul 11 02:20:46 2007
New Revision: 555222

URL: http://svn.apache.org/viewvc?view=rev&rev=555222
Log:
refactor to move the JAXB2 POJOs into camel-core so that they can be merged with the DSL camel.builder package; as they are pretty much the same kinds of objects. For CAMEL-71

Added:
    activemq/camel/trunk/camel-core/src/main/resources/org/
    activemq/camel/trunk/camel-core/src/main/resources/org/apache/
    activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/
    activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/
    activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/jaxb.index
    activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/language/
    activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/language/jaxb.index
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/GenerateXmlTest.java   (with props)
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java   (with props)
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlTestSupport.java   (with props)
    activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/
    activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/dynamicRecipientList.xml   (with props)
    activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processor.xml   (with props)
    activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processorWithElFilter.xml   (with props)
    activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processorWithFilter.xml   (with props)
    activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processorWithGroovyFilter.xml   (with props)
    activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processorWithHeaderFilter.xml   (with props)
    activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routeWithChoice.xml   (with props)
    activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routeWithInterceptor.xml   (with props)
    activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/simpleRoute.xml   (with props)
    activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/splitter.xml   (with props)
    activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/staticRecipientList.xml   (with props)
    activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/wireTap.xml   (with props)
Removed:
    activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/model/
Modified:
    activemq/camel/trunk/camel-core/pom.xml
    activemq/camel/trunk/components/camel-spring/pom.xml
    activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
    activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java

Modified: activemq/camel/trunk/camel-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/pom.xml?view=diff&rev=555222&r1=555221&r2=555222
==============================================================================
--- activemq/camel/trunk/camel-core/pom.xml (original)
+++ activemq/camel/trunk/camel-core/pom.xml Wed Jul 11 02:20:46 2007
@@ -45,6 +45,11 @@
 
     <!-- testing -->
     <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>

Added: activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/jaxb.index
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/jaxb.index?view=auto&rev=555222
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/jaxb.index (added)
+++ activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/jaxb.index Wed Jul 11 02:20:46 2007
@@ -0,0 +1,11 @@
+ChoiceType
+FilterType
+FromType
+OtherwiseType
+ProcessorRef
+RecipientListType
+RouteType
+RoutesType
+SplitterType
+ToType
+WhenType
\ No newline at end of file

Added: activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/language/jaxb.index
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/language/jaxb.index?view=auto&rev=555222
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/language/jaxb.index (added)
+++ activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/language/jaxb.index Wed Jul 11 02:20:46 2007
@@ -0,0 +1,12 @@
+ELExpression
+GroovyExpression
+HeaderExpression
+JavaScriptExpression
+LanguageExpression
+OgnlExpression
+PhpExpression
+PythonExpression
+RubyExpression
+SqlExpression
+XPathExpression
+XQueryExpression
\ No newline at end of file

Added: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/GenerateXmlTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/GenerateXmlTest.java?view=auto&rev=555222
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/GenerateXmlTest.java (added)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/GenerateXmlTest.java Wed Jul 11 02:20:46 2007
@@ -0,0 +1,61 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.model;
+
+import org.apache.camel.model.language.GroovyExpression;
+
+import javax.xml.bind.Marshaller;
+import java.io.StringWriter;
+import java.util.List;
+
+/**
+ * @version $Revision: 1.1 $
+ */
+public class GenerateXmlTest extends XmlTestSupport {
+    public void testCreateSimpleXml() throws Exception {
+        RoutesType context = new RoutesType();
+        RouteType route = context.route();
+        route.from("seda:a");
+        route.filter("juel", "in.header.foo == 'bar'").
+                to("seda:b");
+
+        dump(context);
+    }
+
+    public void testGroovyFilterXml() throws Exception {
+        RoutesType context = new RoutesType();
+        RouteType route = context.route();
+        route.from("seda:a");
+        route.interceptors("interceptor1", "interceptor2");
+        route.filter(new GroovyExpression("in.headers.any { h -> h.startsWith('foo') }")).
+                to("seda:b");
+
+        List<ProcessorType> list = route.getOutputs();
+        assertEquals("Size of list: " + list, 1, list.size());
+
+        dump(context);
+    }
+
+    protected void dump(RouteContainer context) throws Exception {
+        Marshaller marshaller = jaxbContext.createMarshaller();
+        marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
+        StringWriter buffer = new StringWriter();
+        marshaller.marshal(context, buffer);
+        log.info("Created: " + buffer);
+    }
+}

Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/GenerateXmlTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java?view=auto&rev=555222
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java (added)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java Wed Jul 11 02:20:46 2007
@@ -0,0 +1,192 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.model;
+
+import org.apache.camel.model.language.ExpressionType;
+
+import javax.xml.bind.JAXBException;
+import java.util.List;
+
+/**
+ * @version $Revision: 1.1 $
+ */
+public class XmlParseTest extends XmlTestSupport {
+    public void testParseSimpleRouteXml() throws Exception {
+        RouteType route = assertOneRoute("simpleRoute.xml");
+        assertFrom(route, "seda:a");
+        assertChildTo("to", route, "seda:b");
+    }
+
+    public void testParseProcessorXml() throws Exception {
+        RouteType route = assertOneRoute("processor.xml");
+        assertFrom(route, "seda:a");
+        assertProcessor(route, "myProcessor");
+    }
+
+    public void testParseProcessorWithFilterXml() throws Exception {
+        RouteType route = assertOneRoute("processorWithFilter.xml");
+        assertFrom(route, "seda:a");
+        FilterType filter = assertFilter(route);
+        assertExpression(filter.getExpression(), "juel", "in.header.foo == 'bar'");
+    }
+
+    public void testParseProcessorWithHeaderFilterXml() throws Exception {
+        RouteType route = assertOneRoute("processorWithHeaderFilter.xml");
+        assertFrom(route, "seda:a");
+        FilterType filter = assertFilter(route);
+        assertExpression(filter.getExpression(), "header", "foo");
+    }
+
+    public void testParseProcessorWithElFilterXml() throws Exception {
+        RouteType route = assertOneRoute("processorWithElFilter.xml");
+        assertFrom(route, "seda:a");
+        FilterType filter = assertFilter(route);
+        assertExpression(filter.getExpression(), "el", "$in.header.foo == 'bar'");
+    }
+
+    public void testParseProcessorWithGroovyFilterXml() throws Exception {
+        RouteType route = assertOneRoute("processorWithGroovyFilter.xml");
+        assertFrom(route, "seda:a");
+        FilterType filter = assertFilter(route);
+        assertExpression(filter.getExpression(), "groovy", "in.headers.any { h -> h.startsWith('foo')}");
+    }
+
+    public void testParseRecipientListXml() throws Exception {
+        RouteType route = assertOneRoute("dynamicRecipientList.xml");
+        assertFrom(route, "seda:a");
+        RecipientListType node = assertRecipientList(route);
+        assertExpression(node.getExpression(), "header", "foo");
+    }
+
+    public void testParseStaticRecipientListXml() throws Exception {
+        RouteType route = assertOneRoute("staticRecipientList.xml");
+        assertFrom(route, "seda:a");
+        assertChildTo(route, "seda:b", "seda:c", "seda:d");
+    }
+
+    public void testParseRouteWithInterceptorXml() throws Exception {
+        RouteType route = assertOneRoute("routeWithInterceptor.xml");
+        assertFrom(route, "seda:a");
+        assertChildTo("to", route, "seda:d");
+        assertInterceptorRefs(route, "interceptor1", "interceptor2");
+    }
+
+    public void testParseRouteWithChoiceXml() throws Exception {
+        RouteType route = assertOneRoute("routeWithChoice.xml");
+        assertFrom(route, "seda:a");
+
+        ChoiceType choice = assertChoice(route);
+        List<WhenType> whens = assertListSize(choice.getWhenClauses(), 2);
+        assertChildTo("when(0)", whens.get(0), "seda:b");
+        assertChildTo("when(1)", whens.get(1), "seda:c");
+
+        OtherwiseType otherwise = choice.getOtherwise();
+        assertNotNull("Otherwise is null", otherwise);
+        assertChildTo("otherwise", otherwise, "seda:d");
+    }
+
+    public void testParseSplitterXml() throws Exception {
+        RouteType route = assertOneRoute("splitter.xml");
+        assertFrom(route, "seda:a");
+
+        SplitterType splitter = assertSplitter(route);
+        assertExpression(splitter.getExpression(), "xpath", "/foo/bar");
+        assertChildTo("to", splitter, "seda:b");
+    }
+
+    // Implementation methods
+    //-------------------------------------------------------------------------
+
+    protected RouteType assertOneRoute(String uri) throws JAXBException {
+        RouteContainer context = assertParseAsJaxb(uri);
+        RouteType route = assertOneElement(context.getRoutes());
+        return route;
+    }
+
+    protected void assertFrom(RouteType route, String uri) {
+        FromType from = assertOneElement(route.getInputs());
+        assertEquals("From URI", uri, from.getUri());
+    }
+
+    protected void assertChildTo(String message, ProcessorType route, String uri) {
+        ProcessorType processor = assertOneElement(route.getOutputs());
+        ToType value = assertIsInstanceOf(ToType.class, processor);
+        String text = message + "To URI";
+        log.info("Testing: " + text + " is equal to: " + uri + " for processor: " + processor);
+        assertEquals(text, uri, value.getUri());
+    }
+
+    protected void assertTo(String message, ProcessorType processor, String uri) {
+        ToType value = assertIsInstanceOf(ToType.class, processor);
+        String text = message + "To URI";
+        log.info("Testing: " + text + " is equal to: " + uri + " for processor: " + processor);
+        assertEquals(text, uri, value.getUri());
+    }
+
+    protected void assertChildTo(ProcessorType route, String... uris) {
+        List<ProcessorType> list = assertListSize(route.getOutputs(), uris.length);
+        int idx = 0;
+        for (String uri : uris) {
+            assertTo("output[" + idx + "] ", list.get(idx++), uri);
+        }
+    }
+
+    protected void assertProcessor(ProcessorType route, String processorRef) {
+        ProcessorType processor = assertOneElement(route.getOutputs());
+        ProcessorRef to = assertIsInstanceOf(ProcessorRef.class, processor);
+        assertEquals("Processor ref", processorRef, to.getRef());
+    }
+
+    protected FilterType assertFilter(ProcessorType route) {
+        ProcessorType processor = assertOneElement(route.getOutputs());
+        return assertIsInstanceOf(FilterType.class, processor);
+    }
+
+    protected RecipientListType assertRecipientList(ProcessorType route) {
+        ProcessorType processor = assertOneElement(route.getOutputs());
+        return assertIsInstanceOf(RecipientListType.class, processor);
+    }
+
+    protected ChoiceType assertChoice(ProcessorType route) {
+        ProcessorType processor = assertOneElement(route.getOutputs());
+        return assertIsInstanceOf(ChoiceType.class, processor);
+    }
+
+    protected SplitterType assertSplitter(ProcessorType route) {
+        ProcessorType processor = assertOneElement(route.getOutputs());
+        return assertIsInstanceOf(SplitterType.class, processor);
+    }
+
+    protected void assertExpression(ExpressionType expression, String language, String languageExpression) {
+        assertNotNull("Expression should not be null!", expression);
+        assertEquals("Expression language", language, expression.getLanguage());
+        assertEquals("Expression", languageExpression, expression.getExpression());
+    }
+
+    protected void assertInterceptorRefs(ProcessorType route, String... names) {
+        int idx = 0;
+        List<InterceptorRef> interceptors = route.getInterceptors();
+        for (String name : names) {
+            int nextIdx = idx + 1;
+            assertTrue("Not enough interceptors! Expected: " + nextIdx + " but have: " + interceptors, nextIdx <= interceptors.size());
+
+            InterceptorRef interceptor = interceptors.get(idx++);
+            assertEquals("Interceptor: " + idx, name, interceptor.getRef());
+        }
+    }
+}

Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlTestSupport.java?view=auto&rev=555222
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlTestSupport.java (added)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlTestSupport.java Wed Jul 11 02:20:46 2007
@@ -0,0 +1,56 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.model;
+
+import org.apache.camel.TestSupport;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+import java.net.URL;
+
+/**
+ * @version $Revision: 1.1 $
+ */
+public class XmlTestSupport extends TestSupport {
+    protected final transient Log log = LogFactory.getLog(getClass());
+    protected JAXBContext jaxbContext;
+
+    protected RouteContainer assertParseAsJaxb(String uri) throws JAXBException {
+        Object value = parseUri(uri);
+        RouteContainer context = assertIsInstanceOf(RouteContainer.class, value);
+        log.info("Found: " + context);
+        return context;
+    }
+
+    protected Object parseUri(String uri) throws JAXBException {
+        Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
+        URL resource = getClass().getResource(uri);
+        assertNotNull("Cannot find resource on the classpath: " + uri, resource);
+        Object value = unmarshaller.unmarshal(resource);
+        return value;
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        jaxbContext = JAXBContext.newInstance("org.apache.camel.model:org.apache.camel.model.language");
+    }
+}

Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlTestSupport.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/dynamicRecipientList.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/dynamicRecipientList.xml?view=auto&rev=555222
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/dynamicRecipientList.xml (added)
+++ activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/dynamicRecipientList.xml Wed Jul 11 02:20:46 2007
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+   
+    http://www.apache.org/licenses/LICENSE-2.0
+   
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<routes id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
+  <route>
+    <from uri="seda:a"/>
+    <recipientList>
+      <header>foo</header>
+    </recipientList>
+  </route>
+</routes>

Propchange: activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/dynamicRecipientList.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processor.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processor.xml?view=auto&rev=555222
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processor.xml (added)
+++ activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processor.xml Wed Jul 11 02:20:46 2007
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+   
+    http://www.apache.org/licenses/LICENSE-2.0
+   
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<routes id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
+  <route>
+    <from uri="seda:a"/>
+    <process ref="myProcessor"/>
+  </route>
+</routes>

Propchange: activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processor.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processorWithElFilter.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processorWithElFilter.xml?view=auto&rev=555222
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processorWithElFilter.xml (added)
+++ activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processorWithElFilter.xml Wed Jul 11 02:20:46 2007
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+   
+    http://www.apache.org/licenses/LICENSE-2.0
+   
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<routes id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
+  <route>
+    <from uri="seda:a"/>
+    <filter>
+      <el>$in.header.foo == 'bar'</el>
+      <process ref="myProcessor"/>
+    </filter>
+  </route>
+</routes>

Propchange: activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processorWithElFilter.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processorWithFilter.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processorWithFilter.xml?view=auto&rev=555222
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processorWithFilter.xml (added)
+++ activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processorWithFilter.xml Wed Jul 11 02:20:46 2007
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+   
+    http://www.apache.org/licenses/LICENSE-2.0
+   
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<routes id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
+  <route>
+    <from uri="seda:a"/>
+    <filter>
+      <expression language="juel">in.header.foo == 'bar'</expression>
+      <process ref="myProcessor"/>
+    </filter>
+  </route>
+</routes>

Propchange: activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processorWithFilter.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processorWithGroovyFilter.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processorWithGroovyFilter.xml?view=auto&rev=555222
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processorWithGroovyFilter.xml (added)
+++ activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processorWithGroovyFilter.xml Wed Jul 11 02:20:46 2007
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+   
+    http://www.apache.org/licenses/LICENSE-2.0
+   
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<routes id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
+  <route>
+    <from uri="seda:a"/>
+    <filter>
+      <groovy>in.headers.any { h -> h.startsWith('foo')}</groovy>
+      <process ref="myProcessor"/>
+    </filter>
+  </route>
+</routes>

Propchange: activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processorWithGroovyFilter.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processorWithHeaderFilter.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processorWithHeaderFilter.xml?view=auto&rev=555222
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processorWithHeaderFilter.xml (added)
+++ activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processorWithHeaderFilter.xml Wed Jul 11 02:20:46 2007
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+   
+    http://www.apache.org/licenses/LICENSE-2.0
+   
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<routes id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
+  <route>
+    <from uri="seda:a"/>
+    <filter>
+      <header>foo</header>
+      <process ref="myProcessor"/>
+    </filter>
+  </route>
+</routes>

Propchange: activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/processorWithHeaderFilter.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routeWithChoice.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routeWithChoice.xml?view=auto&rev=555222
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routeWithChoice.xml (added)
+++ activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routeWithChoice.xml Wed Jul 11 02:20:46 2007
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+   
+    http://www.apache.org/licenses/LICENSE-2.0
+   
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<routes id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
+  <route>
+    <from uri="seda:a"/>
+    <choice>
+      <when>
+        <javaScript>in.header == 'bar'</javaScript>
+        <to uri="seda:b"/>
+      </when>
+      <when>
+        <ognl>in.header == 'cheese'</ognl>
+        <to uri="seda:c"/>
+      </when>
+      <otherwise>
+        <to uri="seda:d"/>
+      </otherwise>
+    </choice>
+  </route>
+</routes>

Propchange: activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routeWithChoice.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routeWithInterceptor.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routeWithInterceptor.xml?view=auto&rev=555222
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routeWithInterceptor.xml (added)
+++ activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routeWithInterceptor.xml Wed Jul 11 02:20:46 2007
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+   
+    http://www.apache.org/licenses/LICENSE-2.0
+   
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<routes id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
+  <route>
+    <from uri="seda:a"/>
+    <interceptor ref="interceptor1"/>
+    <interceptor ref="interceptor2"/>
+    <to uri="seda:d"/>
+  </route>
+</routes>

Propchange: activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routeWithInterceptor.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/simpleRoute.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/simpleRoute.xml?view=auto&rev=555222
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/simpleRoute.xml (added)
+++ activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/simpleRoute.xml Wed Jul 11 02:20:46 2007
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<routes xmlns="http://activemq.apache.org/camel/schema/spring"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+  <!--
+       xsi:schemaLocation="http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd"
+  -->
+
+  <route>
+    <from uri="seda:a"/>
+    <to uri="seda:b"/>
+  </route>
+</routes>

Propchange: activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/simpleRoute.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/splitter.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/splitter.xml?view=auto&rev=555222
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/splitter.xml (added)
+++ activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/splitter.xml Wed Jul 11 02:20:46 2007
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+   
+    http://www.apache.org/licenses/LICENSE-2.0
+   
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+  <routes id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
+    <route>
+      <from uri="seda:a"/>
+      <splitter>
+        <xpath>/foo/bar</xpath>
+        <to uri="seda:b"/>
+      </splitter>
+    </route>
+  </routes>

Propchange: activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/splitter.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/staticRecipientList.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/staticRecipientList.xml?view=auto&rev=555222
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/staticRecipientList.xml (added)
+++ activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/staticRecipientList.xml Wed Jul 11 02:20:46 2007
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+   
+    http://www.apache.org/licenses/LICENSE-2.0
+   
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<routes id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
+  <route>
+    <from uri="seda:a"/>
+    <to uri="seda:b"/>
+    <to uri="seda:c"/>
+    <to uri="seda:d"/>
+  </route>
+</routes>
\ No newline at end of file

Propchange: activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/staticRecipientList.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/wireTap.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/wireTap.xml?view=auto&rev=555222
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/wireTap.xml (added)
+++ activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/wireTap.xml Wed Jul 11 02:20:46 2007
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+   
+    http://www.apache.org/licenses/LICENSE-2.0
+   
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
+    ">
+
+  <!--
+        from("seda:a").to("seda:tap", "seda:b");
+  -->
+  <!-- START SNIPPET: example -->
+  <routes id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
+    <route>
+      <from uri="seda:a"/>
+      <to>
+        <endpoint uri="seda:tap"/>
+        <endpoint uri="seda:b"/>
+      </to>
+    </route>
+  </routes>
+  <!-- END SNIPPET: example -->
+
+
+</beans>

Propchange: activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/wireTap.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: activemq/camel/trunk/components/camel-spring/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/pom.xml?view=diff&rev=555222&r1=555221&r2=555222
==============================================================================
--- activemq/camel/trunk/components/camel-spring/pom.xml (original)
+++ activemq/camel/trunk/components/camel-spring/pom.xml Wed Jul 11 02:20:46 2007
@@ -52,7 +52,6 @@
     <dependency>
       <groupId>com.sun.xml.bind</groupId>
       <artifactId>jaxb-impl</artifactId>
-      <optional>true</optional>
     </dependency>
 
     <!-- for testing -->
@@ -148,6 +147,30 @@
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
+          <id>process-sources</id>
+          <phase>process-sources</phase>
+            <configuration>
+              <tasks>
+                <echo>Copying to code together for the XSD generation</echo>
+
+                <mkdir dir="${project.build.directory}/schema-src"/>
+                <copy todir="${project.build.directory}/schema-src">
+                  <fileset dir="${basedir}/src/main/java">
+                    <include name="org/apache/camel/spring/Camel*.java"/>
+                    <include name="org/apache/camel/spring/package-info.java"/>
+                  </fileset>
+                  <fileset dir="${basedir}/../../camel-core/src/main/java">
+                    <include name="org/apache/camel/model/**/*.java"/>
+                  </fileset>
+                </copy>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+
+          <execution>
             <id>site</id>
             <phase>site</phase>
             <configuration>
@@ -181,29 +204,6 @@
       </plugin>
 
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-artifacts</id>
-            <phase>package</phase>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${project.build.directory}/schema/camel-spring.xsd</file>
-                  <type>xsd</type>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-
-      <plugin>
         <groupId>com.sun.tools.jxc.maven2</groupId>
         <artifactId>maven-jaxb-schemagen-plugin</artifactId>
         <executions>
@@ -211,18 +211,29 @@
             <phase>process-sources</phase>
             <configuration>
               <destdir>${project.build.directory}/schema</destdir>
+              <srcdir>${project.build.directory}/schema-src</srcdir>
+<!--
+              <includes>
+                <include>org/apache/camel/spring/package-info*</include>
+                <include>org/apache/camel/spring/Camel*</include>
+                <include>${project.build.sourceDirectory}/../../../../../camel-core/src/main/java/org/apache/camel/model/**</include>
+              </includes>
+-->
+<!--
+              <destdir>${project.build.directory}/schema</destdir>
+              <srcdir>${project.build.sourceDirectory}</srcdir>
               <includes>
                 <include>org/apache/camel/spring/package-info*</include>
                 <include>org/apache/camel/spring/Camel*</include>
-                <include>org/apache/camel/spring/model/**</include>
+                <include>${project.build.sourceDirectory}/../../../../../camel-core/src/main/java/org/apache/camel/model/**</include>
               </includes>
+-->
               <schemas>
                 <schema>
                   <namespace>http://activemq.apache.org/camel/schema/spring</namespace>
                   <file>camel-spring.xsd</file>
                 </schema>
               </schemas>
-              <srcdir>${project.build.sourceDirectory}</srcdir>
               <!--<verbose>false</verbose>-->
             </configuration>
             <goals>
@@ -231,6 +242,29 @@
           </execution>
         </executions>
       </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-artifacts</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attach-artifact</goal>
+            </goals>
+            <configuration>
+              <artifacts>
+                <artifact>
+                  <file>${project.build.directory}/schema/camel-spring.xsd</file>
+                  <type>xsd</type>
+                </artifact>
+              </artifacts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
 
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

Modified: activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java?view=diff&rev=555222&r1=555221&r2=555222
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java Wed Jul 11 02:20:46 2007
@@ -18,9 +18,9 @@
 package org.apache.camel.spring;
 
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.spring.model.IdentifiedType;
-import org.apache.camel.spring.model.RouteContainer;
-import org.apache.camel.spring.model.RouteType;
+import org.apache.camel.model.IdentifiedType;
+import org.apache.camel.model.RouteContainer;
+import org.apache.camel.model.RouteType;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.DisposableBean;
@@ -33,7 +33,6 @@
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlElement;

Modified: activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java?view=diff&rev=555222&r1=555221&r2=555222
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java Wed Jul 11 02:20:46 2007
@@ -21,21 +21,14 @@
 import org.apache.camel.spring.CamelBeanPostProcessor;
 import org.apache.camel.spring.CamelContextFactoryBean;
 import org.apache.camel.spring.EndpointFactoryBean;
-import org.apache.camel.spring.model.RouteType;
-import org.apache.camel.spring.xml.CamelBeanDefinitionParser;
 import org.apache.camel.spring.xml.BeanDefinitionParser;
 import org.apache.camel.spring.xml.ScriptDefinitionParser;
 import org.apache.camel.util.ObjectHelper;
-import static org.apache.camel.util.ObjectHelper.isNotNullAndNonEmpty;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
-import org.springframework.beans.factory.config.BeanDefinitionHolder;
-import org.springframework.beans.factory.parsing.BeanComponentDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.beans.factory.xml.NamespaceHandler;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;
@@ -49,7 +42,7 @@
 import java.util.Set;
 
 public class CamelNamespaceHandler extends NamespaceHandlerSupport {
-    public static final String JAXB_PACKAGES = "org.apache.camel.spring:org.apache.camel.spring.model:org.apache.camel.spring.model.language";
+    public static final String JAXB_PACKAGES = "org.apache.camel.spring:org.apache.camel.model:org.apache.camel.model.language";
 
     protected BeanDefinitionParser endpointParser = new BeanDefinitionParser(EndpointFactoryBean.class);
     protected BeanDefinitionParser beanPostProcessorParser = new BeanDefinitionParser(CamelBeanPostProcessor.class);



Mime
View raw message