camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r555601 - in /activemq/camel/trunk: camel-core/src/main/java/org/apache/camel/model/ camel-core/src/main/java/org/apache/camel/model/language/ components/camel-spring/ components/camel-spring/src/test/java/org/apache/camel/spring/example/
Date Thu, 12 Jul 2007 11:52:35 GMT
Author: jstrachan
Date: Thu Jul 12 04:52:34 2007
New Revision: 555601

URL: http://svn.apache.org/viewvc?view=rev&rev=555601
Log:
minor refactor to fix the generated XSD for resequencer and splitter (using a temporary hack
to work around a bug in schemagen)

Added:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
Modified:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterType.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdentifiedType.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListType.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesType.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/package-info.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/package-info.java
    activemq/camel/trunk/components/camel-spring/pom.xml
    activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/ContentBasedRouteTest.java

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java?view=diff&rev=555601&r1=555600&r2=555601
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java Thu
Jul 12 04:52:34 2007
@@ -19,15 +19,15 @@
 
 import org.apache.camel.Processor;
 import org.apache.camel.impl.RouteContext;
-import org.apache.camel.processor.FilterProcessor;
 import org.apache.camel.processor.ChoiceProcessor;
+import org.apache.camel.processor.FilterProcessor;
 
+import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlElement;
-import java.util.List;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 
 /**
  * @version $Revision: 1.1 $

Added: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java?view=auto&rev=555601
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
(added)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
Thu Jul 12 04:52:34 2007
@@ -0,0 +1,74 @@
+/*
+ * 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.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementRef;
+import javax.xml.bind.annotation.XmlTransient;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * A base class for nodes which contain an expression and a number of outputs
+ *
+ * @version $Revision: $
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+//@XmlType(propOrder = {"interceptors", "expression", "outputs"})
+public class ExpressionNode extends ProcessorType {
+    @XmlElement(required = false)
+    private List<InterceptorRef> interceptors = new ArrayList<InterceptorRef>();//
TODO can we zap this hack to get schemagen to generate the correct schema?
+    @XmlElementRef
+    private List<ExpressionType> expressions;
+    @XmlTransient
+    private ExpressionType expression;
+    @XmlElementRef
+    private List<ProcessorType> outputs = new ArrayList<ProcessorType>();
+
+    public List<InterceptorRef> getInterceptors() {
+        return interceptors;
+    }
+
+    public void setInterceptors(List<InterceptorRef> interceptors) {
+        this.interceptors = interceptors;
+    }
+
+    public ExpressionType getExpression() {
+        if (expression == null && expressions != null && !expressions.isEmpty())
{
+            expression = expressions.get(0);
+        }
+        return expression;
+    }
+
+    public void setExpression(ExpressionType expression) {
+        this.expression = expression;
+        this.expressions = Collections.singletonList(expression);
+    }
+
+    public List<ProcessorType> getOutputs() {
+        return outputs;
+    }
+
+    public void setOutputs(List<ProcessorType> outputs) {
+        this.outputs = outputs;
+    }
+}

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterType.java?view=diff&rev=555601&r1=555600&r2=555601
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterType.java Thu
Jul 12 04:52:34 2007
@@ -17,39 +17,17 @@
  */
 package org.apache.camel.model;
 
-import org.apache.camel.model.language.ExpressionType;
-import org.apache.camel.processor.FilterProcessor;
 import org.apache.camel.Processor;
 import org.apache.camel.impl.RouteContext;
+import org.apache.camel.processor.FilterProcessor;
 
-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.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
-import java.util.List;
-import java.util.ArrayList;
 
 /**
  * @version $Revision: 1.1 $
  */
 @XmlRootElement(name = "filter")
-@XmlAccessorType(XmlAccessType.FIELD)
-//@XmlType(propOrder = {"interceptors", "expression", "outputs"})
-public class FilterType extends ProcessorType {
-
-    @XmlElement(required = false)
-    private List<InterceptorRef> interceptors = new ArrayList<InterceptorRef>();
-
-    // TODO can we zap this hack to get schemagen to generate the correct schema?
-    @XmlElementRef
-    private List<ExpressionType> expressions;
-    @XmlTransient
-    private ExpressionType expression;
-
-    @XmlElementRef
-    private List<ProcessorType> outputs = new ArrayList<ProcessorType>();
+public class FilterType extends ExpressionNode {
 
     @Override
     public String toString() {
@@ -60,33 +38,6 @@
     public FilterProcessor createProcessor(RouteContext routeContext) {
         Processor childProcessor = routeContext.createProcessor(getOutputs());
         return new FilterProcessor(getExpression().createPredicate(routeContext), childProcessor);
-    }
-
-    public List<InterceptorRef> getInterceptors() {
-        return interceptors;
-    }
-
-    public void setInterceptors(List<InterceptorRef> interceptors) {
-        this.interceptors = interceptors;
-    }
-
-    public ExpressionType getExpression() {
-        if (expression == null && expressions != null && !expressions.isEmpty())
{
-            expression = expressions.get(0);
-        }
-        return expression;
-    }
-
-    public void setExpression(ExpressionType expression) {
-        this.expression = expression;
-    }
-
-    public List<ProcessorType> getOutputs() {
-        return outputs;
-    }
-
-    public void setOutputs(List<ProcessorType> outputs) {
-        this.outputs = outputs;
     }
 
 }

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdentifiedType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdentifiedType.java?view=diff&rev=555601&r1=555600&r2=555601
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdentifiedType.java
(original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdentifiedType.java
Thu Jul 12 04:52:34 2007
@@ -17,22 +17,21 @@
  */
 package org.apache.camel.model;
 
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlID;
 import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 /**
- *
- * 	The unique identifier for a bean. The scope of the identifier
- * 	is the enclosing bean factory.
- *
- *
+ * The unique identifier for a bean. The scope of the identifier
+ * is the enclosing bean factory.
+ * <p/>
+ * <p/>
  * <p>Java class for identifiedType complex type.
- *
+ * <p/>
  * <p>The following schema fragment specifies the expected content contained within
this class.
- *
+ * <p/>
  * <pre>
  * &lt;complexType name="identifiedType">
  *   &lt;complexContent>
@@ -53,10 +52,8 @@
     /**
      * Gets the value of the id property.
      *
-     * @return
-     *     possible object is
-     *     {@link String }
-     *
+     * @return possible object is
+     *         {@link String }
      */
     @XmlAttribute
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
@@ -68,10 +65,8 @@
     /**
      * Sets the value of the id property.
      *
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *
+     * @param value allowed object is
+     *              {@link String }
      */
     public void setId(String value) {
         this.id = value;

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java?view=diff&rev=555601&r1=555600&r2=555601
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java Thu
Jul 12 04:52:34 2007
@@ -17,8 +17,8 @@
  */
 package org.apache.camel.model;
 
-import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlType;
 import java.util.ArrayList;
 import java.util.List;
@@ -28,7 +28,7 @@
  *
  * @version $Revision: 1.1 $
  */
-@XmlType(name="outputType")
+@XmlType(name = "outputType")
 public abstract class OutputType extends ProcessorType {
     protected List<ProcessorType> outputs = new ArrayList<ProcessorType>();
     private List<InterceptorRef> interceptors = new ArrayList<InterceptorRef>();

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java?view=diff&rev=555601&r1=555600&r2=555601
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
(original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
Thu Jul 12 04:52:34 2007
@@ -17,15 +17,15 @@
  */
 package org.apache.camel.model;
 
-import org.apache.camel.model.language.ExpressionType;
-import org.apache.camel.model.language.LanguageExpression;
 import org.apache.camel.Processor;
 import org.apache.camel.Route;
-import org.apache.camel.impl.RouteContext;
 import org.apache.camel.impl.EventDrivenConsumerRoute;
+import org.apache.camel.impl.RouteContext;
+import org.apache.camel.model.language.ExpressionType;
+import org.apache.camel.model.language.LanguageExpression;
 
-import java.util.List;
 import java.util.Collection;
+import java.util.List;
 
 /**
  * @version $Revision: 1.1 $
@@ -33,6 +33,7 @@
 public abstract class ProcessorType {
 
     public abstract List<ProcessorType> getOutputs();
+
     public abstract List<InterceptorRef> getInterceptors();
 
     public ProcessorType interceptor(String ref) {

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListType.java?view=diff&rev=555601&r1=555600&r2=555601
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListType.java
(original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListType.java
Thu Jul 12 04:52:34 2007
@@ -17,11 +17,8 @@
  */
 package org.apache.camel.model;
 
-import org.apache.camel.model.language.ExpressionType;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlRootElement;
 
 /**
@@ -29,20 +26,11 @@
  */
 @XmlRootElement(name = "recipientList")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class RecipientListType extends OutputType {
-    @XmlElementRef
-    private ExpressionType expression;
+public class RecipientListType extends ExpressionNode {
 
     @Override
     public String toString() {
-        return "RecipientList[ " + getExpression()  + "]";
-    }
-
-    public ExpressionType getExpression() {
-        return expression;
+        return "RecipientList[ " + getExpression() + "]";
     }
 
-    public void setExpression(ExpressionType expression) {
-        this.expression = expression;
-    }
 }

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java?view=diff&rev=555601&r1=555600&r2=555601
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java
(original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java
Thu Jul 12 04:52:34 2007
@@ -23,13 +23,9 @@
 import org.apache.camel.Route;
 import org.apache.camel.Service;
 import org.apache.camel.impl.RouteContext;
-import org.apache.camel.model.language.ExpressionType;
 import org.apache.camel.processor.Resequencer;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlRootElement;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
@@ -37,11 +33,7 @@
  * @version $Revision: 1.1 $
  */
 @XmlRootElement(name = "resequencer")
-public class ResequencerType extends ProcessorType {
-    private ExpressionType expression;
-
-    protected List<ProcessorType> outputs = new ArrayList<ProcessorType>();
-    private List<InterceptorRef> interceptors = new ArrayList<InterceptorRef>();
+public class ResequencerType extends ExpressionNode {
 
     @Override
     public String toString() {
@@ -64,33 +56,6 @@
             }
         };
         routes.add(route);
-    }
-
-    @XmlElementRef
-    public ExpressionType getExpression() {
-        return expression;
-    }
-
-    public void setExpression(ExpressionType expression) {
-        this.expression = expression;
-    }
-
-    @XmlElementRef
-    public List<ProcessorType> getOutputs() {
-        return outputs;
-    }
-
-    public void setOutputs(List<ProcessorType> outputs) {
-        this.outputs = outputs;
-    }
-
-    @XmlElement(required = false)
-    public List<InterceptorRef> getInterceptors() {
-        return interceptors;
-    }
-
-    public void setInterceptors(List<InterceptorRef> interceptors) {
-        this.interceptors = interceptors;
     }
 
 }

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java?view=diff&rev=555601&r1=555600&r2=555601
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java Thu
Jul 12 04:52:34 2007
@@ -20,7 +20,6 @@
 import org.apache.camel.CamelContextAware;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Route;
-import org.apache.camel.impl.EventDrivenConsumerRoute;
 import org.apache.camel.impl.RouteContext;
 
 import javax.xml.bind.annotation.XmlElement;
@@ -73,7 +72,6 @@
         }
         return answer;
     }
-
 
     // Properties
     //-----------------------------------------------------------------------

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesType.java?view=diff&rev=555601&r1=555600&r2=555601
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesType.java Thu
Jul 12 04:52:34 2007
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.model;
 
-import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlElementRef;
+import javax.xml.bind.annotation.XmlRootElement;
 import java.util.ArrayList;
 import java.util.List;
 

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java?view=diff&rev=555601&r1=555600&r2=555601
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java
(original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java
Thu Jul 12 04:52:34 2007
@@ -19,12 +19,10 @@
 
 import org.apache.camel.Processor;
 import org.apache.camel.impl.RouteContext;
-import org.apache.camel.model.language.ExpressionType;
 import org.apache.camel.processor.Splitter;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlRootElement;
 
 /**
@@ -32,9 +30,7 @@
  */
 @XmlRootElement(name = "splitter")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class SplitterType extends OutputType {
-    @XmlElementRef
-    private ExpressionType expression;
+public class SplitterType extends ExpressionNode {
 
     @Override
     public String toString() {
@@ -45,13 +41,5 @@
     public Processor createProcessor(RouteContext routeContext) {
         Processor childProcessor = routeContext.createProcessor(getOutputs());
         return new Splitter(getExpression().createExpression(routeContext), childProcessor);
-    }
-
-    public ExpressionType getExpression() {
-        return expression;
-    }
-
-    public void setExpression(ExpressionType expression) {
-        this.expression = expression;
     }
 }

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java?view=diff&rev=555601&r1=555600&r2=555601
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java Thu Jul
12 04:52:34 2007
@@ -21,10 +21,10 @@
 import org.apache.camel.processor.SendProcessor;
 
 import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlElement;
-import java.util.List;
+import javax.xml.bind.annotation.XmlRootElement;
 import java.util.Collections;
+import java.util.List;
 
 /**
  * Represents an XML &lt;to/&gt; element
@@ -56,7 +56,7 @@
     public void setUri(String uri) {
         this.uri = uri;
     }
-    
+
     public List<ProcessorType> getOutputs() {
         return Collections.EMPTY_LIST;
     }

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/package-info.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/package-info.java?view=diff&rev=555601&r1=555600&r2=555601
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/package-info.java
(original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/package-info.java
Thu Jul 12 04:52:34 2007
@@ -1,2 +1 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://activemq.apache.org/camel/schema/spring",
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.apache.camel.model.language;
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://activemq.apache.org/camel/schema/spring",
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.model.language;

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/package-info.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/package-info.java?view=diff&rev=555601&r1=555600&r2=555601
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/package-info.java
(original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/package-info.java
Thu Jul 12 04:52:34 2007
@@ -1,2 +1 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://activemq.apache.org/camel/schema/spring",
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.apache.camel.model;
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://activemq.apache.org/camel/schema/spring",
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.model;

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=555601&r1=555600&r2=555601
==============================================================================
--- activemq/camel/trunk/components/camel-spring/pom.xml (original)
+++ activemq/camel/trunk/components/camel-spring/pom.xml Thu Jul 12 04:52:34 2007
@@ -116,7 +116,6 @@
           <useFile>true</useFile>
           <excludes>
             <!-- TODO - FIXME ASAP -->
-            <exclude>**/SpringResequencerTest.*</exclude>
             <exclude>**/ContentBasedRouteTest.*</exclude>
             <exclude>**/SpringXmlRouteBuilderTest.*</exclude>
             <exclude>**/InjectedBeanTest.*</exclude>

Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/ContentBasedRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/ContentBasedRouteTest.java?view=diff&rev=555601&r1=555600&r2=555601
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/ContentBasedRouteTest.java
(original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/ContentBasedRouteTest.java
Thu Jul 12 04:52:34 2007
@@ -58,6 +58,6 @@
     }
 
     protected ClassPathXmlApplicationContext createApplicationContext() {
-        return new ClassPathXmlApplicationContext("../../../../../../resources/org/apache/camel/spring/example/contentBasedRoute.xml");
+        return new ClassPathXmlApplicationContext("org/apache/camel/spring/example/contentBasedRoute.xml");
     }
 }



Mime
View raw message