svn commit: r1003538 - in /camel/trunk/components/camel-blueprint: ./ src/main/java/org/apache/camel/blueprint/

[da...@apache.org]

Author: davsclaus
Date: Fri Oct  1 13:45:50 2010
New Revision: 1003538

URL: http://svn.apache.org/viewvc?rev=1003538&view=rev
Log:
Added errorHandler in camel-blueprint XSD.

Added:
    camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/ErrorHandlerDefinition.java
    camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/ErrorHandlerType.java
Modified:
    camel/trunk/components/camel-blueprint/pom.xml
    camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
    camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java

Modified: camel/trunk/components/camel-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/pom.xml?rev=1003538&r1=1003537&r2=1003538&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/pom.xml (original)
+++ camel/trunk/components/camel-blueprint/pom.xml Fri Oct  1 13:45:50 2010
@@ -327,6 +327,7 @@
                                   <copy todir="${project.build.directory}/schema-src">
                                       <fileset dir="${basedir}/src/main/java">
                                           <include name="org/apache/camel/blueprint/Camel*.java" />
+                                          <include name="org/apache/camel/blueprint/ErrorHandler*.java" />
                                           <include name="org/apache/camel/blueprint/package-info.java" />
                                       </fileset>
                                       <fileset dir="${basedir}/../camel-core-xml/src/main/java">

Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java?rev=1003538&r1=1003537&r2=1003538&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java Fri Oct  1 13:45:50 2010
@@ -22,9 +22,7 @@ import org.apache.camel.core.osgi.OsgiCa
 import org.apache.camel.core.osgi.OsgiClassResolver;
 import org.apache.camel.core.osgi.OsgiFactoryFinderResolver;
 import org.apache.camel.core.osgi.OsgiPackageScanClassResolver;
-import org.apache.camel.core.osgi.OsgiServiceRegistry;
 import org.apache.camel.core.osgi.OsgiTypeConverter;
-import org.apache.camel.impl.CompositeRegistry;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.spi.Registry;
 import org.apache.commons.logging.Log;

Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java?rev=1003538&r1=1003537&r2=1003538&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java Fri Oct  1 13:45:50 2010
@@ -100,8 +100,8 @@ public class CamelContextFactoryBean ext
         @XmlElement(name = "template", type = CamelProducerTemplateFactoryBean.class, required = false),
         @XmlElement(name = "consumerTemplate", type = CamelConsumerTemplateFactoryBean.class, required = false),
         @XmlElement(name = "proxy", type = CamelProxyFactoryDefinition.class, required = false),
-        @XmlElement(name = "export", type = CamelServiceExporterDefinition.class, required = false) //,
-//        @XmlElement(name = "errorHandler", type = ErrorHandlerDefinition.class, required = false)
+        @XmlElement(name = "export", type = CamelServiceExporterDefinition.class, required = false),
+        @XmlElement(name = "errorHandler", type = ErrorHandlerDefinition.class, required = false)
     })
     private List beans;
     @XmlElement(name = "routeBuilder", required = false)

Added: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/ErrorHandlerDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/ErrorHandlerDefinition.java?rev=1003538&view=auto
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/ErrorHandlerDefinition.java (added)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/ErrorHandlerDefinition.java Fri Oct  1 13:45:50 2010
@@ -0,0 +1,55 @@
+/**
+ * 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.blueprint;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.apache.camel.LoggingLevel;
+import org.apache.camel.model.IdentifiedType;
+import org.apache.camel.model.RedeliveryPolicyDefinition;
+
+/**
+ * The &lt;errorHandler&gt; tag element.
+ *
+ * @version $Revision$
+ */
+@XmlRootElement(name = "errorHandler")
+@XmlAccessorType(XmlAccessType.FIELD)
+@SuppressWarnings("unused")
+public class ErrorHandlerDefinition extends IdentifiedType {
+    @XmlAttribute
+    private ErrorHandlerType type = ErrorHandlerType.DefaultErrorHandler;
+    @XmlAttribute
+    private String deadLetterUri;
+    @XmlAttribute
+    private LoggingLevel level = LoggingLevel.ERROR;
+    @XmlAttribute
+    private Boolean useOriginalMessage;
+    @XmlAttribute
+    private String transactionTemplateRef;
+    @XmlAttribute
+    private String transactionManagerRef;
+    @XmlAttribute
+    private String onRedeliveryRef;
+    @XmlElement
+    private RedeliveryPolicyDefinition redeliveryPolicy;
+
+}

Added: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/ErrorHandlerType.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/ErrorHandlerType.java?rev=1003538&view=auto
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/ErrorHandlerType.java (added)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/ErrorHandlerType.java Fri Oct  1 13:45:50 2010
@@ -0,0 +1,58 @@
+/**
+ * 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.blueprint;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
+
+import org.apache.camel.builder.DeadLetterChannelBuilder;
+import org.apache.camel.builder.DefaultErrorHandlerBuilder;
+import org.apache.camel.builder.LoggingErrorHandlerBuilder;
+import org.apache.camel.builder.NoErrorHandlerBuilder;
+
+/**
+ * Used to configure the errorHandler type
+ *
+ * @version $Revision$
+ */
+@XmlType
+@XmlEnum(String.class)
+public enum ErrorHandlerType {
+
+    DefaultErrorHandler, DeadLetterChannel, LoggingErrorHandler, NoErrorHandler;
+
+    /**
+     * Get the type as class.
+     *
+     * @return the class which represents the selected type.
+     */
+    public Class getTypeAsClass() {
+        switch (this) {
+        case DefaultErrorHandler:
+            return DefaultErrorHandlerBuilder.class;
+        case DeadLetterChannel:
+            return DeadLetterChannelBuilder.class;
+        case LoggingErrorHandler:
+            return LoggingErrorHandlerBuilder.class;
+        case NoErrorHandler:
+            return NoErrorHandlerBuilder.class;
+        default:
+            throw new IllegalArgumentException("Unknown error handler: " + this);
+        }
+    }
+
+}