[maven-release-plugin]  copy for tag camel-2.8.0

git-svn-id: https://svn.apache.org/repos/asf/camel/tags/camel-2.8.0@1148091 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/apache-camel/src/main/release/NOTICE.txt b/apache-camel/src/main/release/NOTICE.txt
index 29d92a9..eb089d3 100644
--- a/apache-camel/src/main/release/NOTICE.txt
+++ b/apache-camel/src/main/release/NOTICE.txt
@@ -5,7 +5,7 @@
 =========================================================================
 
 Apache Camel
-Copyright 2007-2010 The Apache Software Foundation
+Copyright 2007-2011 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/camel-core/src/main/java/org/apache/camel/NoSuchBeanException.java b/camel-core/src/main/java/org/apache/camel/NoSuchBeanException.java
index 0130ecc..461f705 100644
--- a/camel-core/src/main/java/org/apache/camel/NoSuchBeanException.java
+++ b/camel-core/src/main/java/org/apache/camel/NoSuchBeanException.java
@@ -40,6 +40,11 @@
         this.name = name;
     }
 
+    public NoSuchBeanException(String name, String message, Throwable cause) {
+        super(message, cause);
+        this.name = name;
+    }
+
     public String getName() {
         return name;
     }
diff --git a/camel-core/src/main/java/org/apache/camel/impl/CompositeRegistry.java b/camel-core/src/main/java/org/apache/camel/impl/CompositeRegistry.java
index e67662a..4eb9c22 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/CompositeRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/CompositeRegistry.java
@@ -21,6 +21,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.camel.NoSuchBeanException;
 import org.apache.camel.spi.Registry;
 
 /**
@@ -44,9 +45,18 @@
     public <T> T lookup(String name, Class<T> type) {
         T answer = null;
         for (Registry registry : registryList) {
-            answer = registry.lookup(name, type);
-            if (answer != null) {
-                break;
+            try {
+                answer = registry.lookup(name, type);
+                if (answer != null) {
+                    break;
+                }
+            } catch (Throwable e) {
+                // do not double wrap the exception
+                if (e instanceof NoSuchBeanException) {
+                    throw (NoSuchBeanException) e;
+                }
+                throw new NoSuchBeanException(name, "Cannot lookup: " + name + " from registry: " + registry
+                        + " with expected type: " + type + " due: " + e.getMessage(), e);
             }
         }
         return answer;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java b/camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java
index d5f5ffa..f49860f 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java
@@ -24,6 +24,7 @@
 import javax.naming.NameNotFoundException;
 import javax.naming.NamingException;
 
+import org.apache.camel.NoSuchBeanException;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.Registry;
 
@@ -43,8 +44,20 @@
     }
 
     public <T> T lookup(String name, Class<T> type) {
-        Object value = lookup(name);
-        return type.cast(value);
+        Object answer = lookup(name);
+
+        // just to be safe
+        if (answer == null) {
+            return null;
+        }
+
+        try {
+            return type.cast(answer);
+        } catch (Throwable e) {
+            String msg = "Found bean: " + name + " in JNDI Context: " + context
+                    + " of type: " + answer.getClass().getName() + " expected type was: " + type;
+            throw new NoSuchBeanException(name, msg, e);
+        }
     }
 
     public Object lookup(String name) {
diff --git a/camel-core/src/main/java/org/apache/camel/impl/SimpleRegistry.java b/camel-core/src/main/java/org/apache/camel/impl/SimpleRegistry.java
index 20cbd63..7d74565 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/SimpleRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/SimpleRegistry.java
@@ -19,6 +19,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.camel.NoSuchBeanException;
 import org.apache.camel.spi.Registry;
 
 /**
@@ -33,8 +34,20 @@
     }
 
     public <T> T lookup(String name, Class<T> type) {
-        Object o = lookup(name);
-        return type.cast(o);
+        Object answer = lookup(name);
+
+        // just to be safe
+        if (answer == null) {
+            return null;
+        }
+
+        try {
+            return type.cast(answer);
+        } catch (Throwable e) {
+            String msg = "Found bean: " + name + " in SimpleRegistry: " + this
+                    + " of type: " + answer.getClass().getName() + " expected type was: " + type;
+            throw new NoSuchBeanException(name, msg, e);
+        }
     }
 
     public <T> Map<String, T> lookupByType(Class<T> type) {
diff --git a/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java b/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
index 83d26ae..3957011 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
@@ -21,9 +21,11 @@
 import java.io.InputStreamReader;
 import java.lang.reflect.Method;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.StringTokenizer;
 import static java.lang.reflect.Modifier.isAbstract;
@@ -41,12 +43,23 @@
 import org.apache.camel.util.CastUtils;
 import org.apache.camel.util.IOHelper;
 import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * A class which will auto-discover converter objects and methods to pre-load
- * the registry of converters on startup
+ * A class which will auto-discover {@link Converter} objects and methods to pre-load
+ * the {@link TypeConverterRegistry} of converters on startup.
+ * <p/>
+ * This implementation supports scanning for type converters in JAR files. The {@link #META_INF_SERVICES}
+ * contains a list of packages or FQN class names for {@link Converter} classes. The FQN class names
+ * is loaded first and directly by the class loader.
+ * <p/>
+ * The {@link PackageScanClassResolver} is being used to scan packages for {@link Converter} classes and
+ * this procedure is slower than loading the {@link Converter} classes directly by its FQN class name.
+ * Therefore its recommended to specify FQN class names in the {@link #META_INF_SERVICES} file.
+ * Likewise the procedure for scanning using {@link PackageScanClassResolver} may require custom implementations
+ * to work in various containers such as JBoss, OSGi, etc.
  *
  * @version 
  */
@@ -77,21 +90,36 @@
         // if we only have camel-core on the classpath then we have already pre-loaded all its type converters
         // but we exposed the "org.apache.camel.core" package in camel-core. This ensures there is at least one
         // packageName to scan, which triggers the scanning process. That allows us to ensure that we look for
-        // type converters in all the JARs.
+        // META-INF/services in all the JARs.
         if (packageNames.length == 1 && "org.apache.camel.core".equals(packageNames[0])) {
             LOG.debug("No additional package names found in classpath for annotated type converters.");
             // no additional package names found to load type converters so break out
             return;
         }
 
-        LOG.trace("Found converter packages to scan: {}", packageNames);
-        Set<Class<?>> classes = resolver.findAnnotated(Converter.class, packageNames);
-        if (classes == null || classes.isEmpty()) {
-            throw new TypeConverterLoaderException("Cannot find any type converter classes from the following packages: " + Arrays.asList(packageNames));
+        // now filter out org.apache.camel.core as its not needed anymore (it was just a dummy)
+        packageNames = filterUnwantedPackage("org.apache.camel.core", packageNames);
+
+        // filter out package names which can be loaded as a class directly so we avoid package scanning which
+        // is much slower and does not work 100% in all runtime containers
+        Set<Class<?>> classes = new HashSet<Class<?>>();
+        packageNames = filterPackageNamesOnly(resolver, packageNames, classes);
+        if (!classes.isEmpty()) {
+            LOG.info("Loaded " + classes.size() + " @Converter classes");
         }
 
-        LOG.info("Found " + packageNames.length + " packages with " + classes.size() + " @Converter classes to load");
+        // if there is any packages to scan and load @Converter classes, then do it
+        if (packageNames != null && packageNames.length > 0) {
+            LOG.trace("Found converter packages to scan: {}", packageNames);
+            Set<Class<?>> scannedClasses = resolver.findAnnotated(Converter.class, packageNames);
+            if (scannedClasses.isEmpty()) {
+                throw new TypeConverterLoaderException("Cannot find any type converter classes from the following packages: " + Arrays.asList(packageNames));
+            }
+            LOG.info("Found " + packageNames.length + " packages with " + scannedClasses.size() + " @Converter classes to load");
+            classes.addAll(scannedClasses);
+        }
 
+        // load all the found classes into the type converter registry
         for (Class type : classes) {
             if (LOG.isTraceEnabled()) {
                 LOG.trace("Loading converter class: {}", ObjectHelper.name(type));
@@ -105,6 +133,57 @@
     }
 
     /**
+     * Filters the given list of packages and returns an array of <b>only</b> package names.
+     * <p/>
+     * This implementation will check the given list of packages, and if it contains a class name,
+     * that class will be loaded directly and added to the list of classes. This optimizes the
+     * type converter to avoid excessive file scanning for .class files.
+     *
+     * @param resolver the class resolver
+     * @param packageNames the package names
+     * @param classes to add loaded @Converter classes
+     * @return the filtered package names
+     */
+    protected String[] filterPackageNamesOnly(PackageScanClassResolver resolver, String[] packageNames, Set<Class<?>> classes) {
+        if (packageNames == null || packageNames.length == 0) {
+            return packageNames;
+        }
+
+        // optimize for CorePackageScanClassResolver
+        if (resolver.getClassLoaders().isEmpty()) {
+            return packageNames;
+        }
+
+        // the filtered packages to return
+        List<String> packages = new ArrayList<String>();
+
+        // try to load it as a class first
+        for (String name : packageNames) {
+            // must be a FQN class name by having an upper case letter
+            if (StringHelper.hasUpperCase(name)) {
+                for (ClassLoader loader : resolver.getClassLoaders()) {
+                    try {
+                        Class<?> clazz = loader.loadClass(name);
+                        LOG.trace("Loaded {} as class {}", name, clazz);
+                        classes.add(clazz);
+                        // class founder, so no need to load it with another class loader
+                        break;
+                    } catch (Throwable e) {
+                        // ignore as its not a class (will be package scan afterwards)
+                        packages.add(name);
+                    }
+                }
+            } else {
+                // ignore as its not a class (will be package scan afterwards)
+                packages.add(name);
+            }
+        }
+
+        // return the packages which is not FQN classes
+        return packages.toArray(new String[packages.size()]);
+    }
+
+    /**
      * Finds the names of the packages to search for on the classpath looking
      * for text files on the classpath at the {@link #META_INF_SERVICES} location.
      *
@@ -282,4 +361,25 @@
                 || (parameterTypes.length == 4 && Exchange.class.isAssignableFrom(parameterTypes[1]))
                 && (TypeConverterRegistry.class.isAssignableFrom(parameterTypes[parameterTypes.length - 1])));
     }
+
+    /**
+     * Filters the given list of packages
+     *
+     * @param name  the name to filter out
+     * @param packageNames the packages
+     * @return he packages without the given name
+     */
+    protected static String[] filterUnwantedPackage(String name, String[] packageNames) {
+        // the filtered packages to return
+        List<String> packages = new ArrayList<String>();
+
+        for (String s : packageNames) {
+            if (!name.equals(s)) {
+                packages.add(s);
+            }
+        }
+
+        return packages.toArray(new String[packages.size()]);
+    }
+
 }
diff --git a/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java b/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
index 8d16c0e..a124d28 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
@@ -383,7 +383,7 @@
     /**
      * Loads the core type converters which is mandatory to use Camel
      */
-    protected void loadCoreTypeConverters() throws Exception {
+    public void loadCoreTypeConverters() throws Exception {
         int before = typeMappings.size();
 
         // load all the type converters from camel-core
diff --git a/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java b/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
index 006bbe1..bfa2d08 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
@@ -56,6 +56,7 @@
 import org.apache.camel.spi.TypeConverterRegistry;
 import org.apache.camel.util.IOHelper;
 import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
@@ -295,34 +296,76 @@
                 PackageScanFilter test = new AnnotatedWithPackageScanFilter(Converter.class, true);
                 Set<Class<?>> classes = new LinkedHashSet<Class<?>>();
                 Set<String> packages = getConverterPackages(bundle.getEntry(META_INF_TYPE_CONVERTER));
+
+                if (LOG.isTraceEnabled()) {
+                    LOG.trace("Found {} {} packages: {}", new Object[]{packages.size(), META_INF_TYPE_CONVERTER, packages});
+                }
+                // if we only have camel-core on the classpath then we have already pre-loaded all its type converters
+                // but we exposed the "org.apache.camel.core" package in camel-core. This ensures there is at least one
+                // packageName to scan, which triggers the scanning process. That allows us to ensure that we look for
+                // META-INF/services in all the JARs.
+                if (packages.size() == 1 && "org.apache.camel.core".equals(packages.iterator().next())) {
+                    LOG.debug("No additional package names found in classpath for annotated type converters.");
+                    // no additional package names found to load type converters so break out
+                    return;
+                }
+
+                // now filter out org.apache.camel.core as its not needed anymore (it was just a dummy)
+                packages.remove("org.apache.camel.core");
+
                 for (String pkg : packages) {
+
+                    if (StringHelper.hasUpperCase(pkg)) {
+                        // its a FQN class name so load it directly
+                        LOG.trace("Loading {} class", pkg);
+                        try {
+                            Class clazz = bundle.loadClass(pkg);
+                            if (test.matches(clazz)) {
+                                classes.add(clazz);
+                            }
+                            // the class could be found and loaded so continue to next
+                            continue;
+                        } catch (Throwable t) {
+                            // Ignore
+                            LOG.trace("Failed to load " + pkg + " class due " + t.getMessage() + ". This exception will be ignored.", t);
+                        }
+                    }
+
+                    // its not a FQN but a package name so scan for classes in the bundle
                     Enumeration<URL> e = bundle.findEntries("/" + pkg.replace('.', '/'), "*.class", true);
                     while (e != null && e.hasMoreElements()) {
                         String path = e.nextElement().getPath();
                         String externalName = path.substring(path.charAt(0) == '/' ? 1 : 0, path.indexOf('.')).replace('/', '.');
+                        LOG.trace("Loading {} class", externalName);
                         try {
                             Class clazz = bundle.loadClass(externalName);
                             if (test.matches(clazz)) {
-                                classes.add(bundle.loadClass(externalName));
+                                classes.add(clazz);
                             }
                         } catch (Throwable t) {
                             // Ignore
+                            LOG.trace("Failed to load " + externalName + " class due " + t.getMessage() + ". This exception will be ignored.", t);
                         }
                     }
                 }
+
+                // load the classes into type converter registry
                 LOG.info("Found {} @Converter classes to load", classes.size());
                 for (Class type : classes) {
-                    if (LOG.isDebugEnabled()) {
-                        LOG.debug("Loading converter class: {}", ObjectHelper.name(type));
+                    if (LOG.isTraceEnabled()) {
+                        LOG.trace("Loading converter class: {}", ObjectHelper.name(type));
                     }
                     loadConverterMethods(registry, type);
                 }
+
+                // register fallback converters
                 URL fallbackUrl = bundle.getEntry(META_INF_FALLBACK_TYPE_CONVERTER);
                 if (fallbackUrl != null) {
                     TypeConverter tc = createInstance("FallbackTypeConverter", fallbackUrl, registry.getInjector());
                     registry.addFallbackTypeConverter(tc, false);
                 }
-                // Clear info
+
+                // now clear the maps so we do not hold references
                 visitedClasses.clear();
                 visitedURIs.clear();
             }
diff --git a/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java b/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
index 32e0391..fc5058c 100644
--- a/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
@@ -309,4 +309,26 @@
         return sb.toString();
     }
 
+    /**
+     * Copies the headers from the source to the target message.
+     *
+     * @param source the source message
+     * @param target the target message
+     * @param override whether to override existing headers
+     */
+    public static void copyHeaders(Message source, Message target, boolean override) {
+        if (!source.hasHeaders()) {
+            return;
+        }
+
+        for (Map.Entry<String, Object> entry : source.getHeaders().entrySet()) {
+            String key = entry.getKey();
+            Object value = entry.getValue();
+
+            if (target.getHeader(key) == null || override) {
+                target.setHeader(key, value);
+            }
+        }
+    }
+
 }
diff --git a/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java b/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
index 1ed413a..65e8791 100644
--- a/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
@@ -507,7 +507,7 @@
 
             // this code is optimized to only use a Scanner if needed, eg there is a delimiter
 
-            if (s.contains(delimiter)) {
+            if (delimiter != null && s.contains(delimiter)) {
                 // use a scanner if it contains the delimiter
                 Scanner scanner = new Scanner((String)value);
                 scanner.useDelimiter(delimiter);
diff --git a/camel-core/src/main/java/org/apache/camel/util/StringHelper.java b/camel-core/src/main/java/org/apache/camel/util/StringHelper.java
index e1c36c2..ee26b5d 100644
--- a/camel-core/src/main/java/org/apache/camel/util/StringHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/StringHelper.java
@@ -90,4 +90,24 @@
         return text.replaceAll("&", "&amp;").replaceAll("\"", "&quot;").replaceAll("<", "&lt;").replaceAll(">", "&gt;");
     }
 
+    /**
+     * Determines if the string has at least one letter in upper case
+     * @param text the text
+     * @return <tt>true</tt> if at least one letter is upper case, <tt>false</tt> otherwise
+     */
+    public static boolean hasUpperCase(String text) {
+        if (text == null) {
+            return false;
+        }
+
+        for (int i = 0; i < text.length(); i++) {
+            char ch = text.charAt(i);
+            if (Character.isUpperCase(ch)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
 }
diff --git a/trunk/camel-core/src/test/java/org/apache/camel/builder/ProxyBuilderTest.java b/camel-core/src/test/java/org/apache/camel/builder/ProxyBuilderTest.java
similarity index 100%
rename from trunk/camel-core/src/test/java/org/apache/camel/builder/ProxyBuilderTest.java
rename to camel-core/src/test/java/org/apache/camel/builder/ProxyBuilderTest.java
diff --git a/trunk/camel-core/src/test/java/org/apache/camel/component/vm/VmDifferentOptionsOnConsumerAndProducerTest.java b/camel-core/src/test/java/org/apache/camel/component/vm/VmDifferentOptionsOnConsumerAndProducerTest.java
similarity index 100%
rename from trunk/camel-core/src/test/java/org/apache/camel/component/vm/VmDifferentOptionsOnConsumerAndProducerTest.java
rename to camel-core/src/test/java/org/apache/camel/component/vm/VmDifferentOptionsOnConsumerAndProducerTest.java
diff --git a/trunk/camel-core/src/test/java/org/apache/camel/impl/RegistryLookupTypeClassCastExceptionTest.java b/camel-core/src/test/java/org/apache/camel/impl/RegistryLookupTypeClassCastExceptionTest.java
similarity index 100%
rename from trunk/camel-core/src/test/java/org/apache/camel/impl/RegistryLookupTypeClassCastExceptionTest.java
rename to camel-core/src/test/java/org/apache/camel/impl/RegistryLookupTypeClassCastExceptionTest.java
diff --git a/camel-core/src/test/java/org/apache/camel/impl/SimpleRegistryTest.java b/camel-core/src/test/java/org/apache/camel/impl/SimpleRegistryTest.java
index ff874d8..3332edb 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/SimpleRegistryTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/SimpleRegistryTest.java
@@ -19,6 +19,7 @@
 import java.util.Map;
 
 import junit.framework.TestCase;
+import org.apache.camel.NoSuchBeanException;
 
 public class SimpleRegistryTest extends TestCase {
 
@@ -46,8 +47,10 @@
         try {
             registry.lookup("a", Float.class);
             fail();
-        } catch (ClassCastException e) {
+        } catch (NoSuchBeanException e) {
             // expected
+            assertEquals("a", e.getName());
+            assertTrue(e.getMessage().endsWith("of type: java.lang.String expected type was: class java.lang.Float"));
         }
     }
     
diff --git a/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithTwoRoutesOnExceptionIssueTest.java b/camel-core/src/test/java/org/apache/camel/issues/AdviceWithTwoRoutesOnExceptionIssueTest.java
similarity index 100%
rename from trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithTwoRoutesOnExceptionIssueTest.java
rename to camel-core/src/test/java/org/apache/camel/issues/AdviceWithTwoRoutesOnExceptionIssueTest.java
diff --git a/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java b/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java
index b7e8ddc..874f037 100644
--- a/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java
@@ -71,4 +71,32 @@
         assertEquals("iso-8859-1", MessageHelper.getContentEncoding(message));
     }
 
+    public void testCopyHeaders() throws Exception {
+        Message source = message;
+        Message target = new DefaultMessage();
+
+        source.setHeader("foo", 123);
+        source.setHeader("bar", 456);
+        target.setHeader("bar", "yes");
+
+        MessageHelper.copyHeaders(source, target, false);
+
+        assertEquals(123, target.getHeader("foo"));
+        assertEquals("yes", target.getHeader("bar"));
+    }
+
+    public void testCopyHeadersOverride() throws Exception {
+        Message source = message;
+        Message target = new DefaultMessage();
+
+        source.setHeader("foo", 123);
+        source.setHeader("bar", 456);
+        target.setHeader("bar", "yes");
+
+        MessageHelper.copyHeaders(source, target, true);
+
+        assertEquals(123, target.getHeader("foo"));
+        assertEquals(456, target.getHeader("bar"));
+    }
+
 }
diff --git a/camel-core/src/test/java/org/apache/camel/util/StringHelperTest.java b/camel-core/src/test/java/org/apache/camel/util/StringHelperTest.java
index 3c7b46e..4c578ce 100644
--- a/camel-core/src/test/java/org/apache/camel/util/StringHelperTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/StringHelperTest.java
@@ -58,4 +58,15 @@
         assertEquals("foo", StringHelper.removeQuotes("'foo\""));
     }
 
+    public void testHasUpper() throws Exception {
+        assertEquals(false, StringHelper.hasUpperCase(null));
+        assertEquals(false, StringHelper.hasUpperCase(""));
+        assertEquals(false, StringHelper.hasUpperCase(" "));
+        assertEquals(false, StringHelper.hasUpperCase("com.foo"));
+        assertEquals(false, StringHelper.hasUpperCase("com.foo.123"));
+
+        assertEquals(true, StringHelper.hasUpperCase("com.foo.MyClass"));
+        assertEquals(true, StringHelper.hasUpperCase("com.foo.My"));
+    }
+
 }
diff --git a/trunk/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerTwoParametersWithSameKeyTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerTwoParametersWithSameKeyTest.java
similarity index 100%
rename from trunk/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerTwoParametersWithSameKeyTest.java
rename to components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerTwoParametersWithSameKeyTest.java
diff --git a/components/camel-ahc/src/test/resources/log4j.properties b/components/camel-ahc/src/test/resources/log4j.properties
index 0b5ca67..6e6d3a2 100644
--- a/components/camel-ahc/src/test/resources/log4j.properties
+++ b/components/camel-ahc/src/test/resources/log4j.properties
@@ -22,6 +22,7 @@
 
 # uncomment the following to enable camel debugging
 #log4j.logger.org.apache.camel.component.ahc=TRACE
+#log4j.logger.com.ning=TRACE
 
 # CONSOLE appender not used by default
 log4j.appender.out=org.apache.log4j.ConsoleAppender
diff --git a/components/camel-atom/src/main/resources/META-INF/services/org/apache/camel/TypeConverter b/components/camel-atom/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
index 837c2db..954ab54 100644
--- a/components/camel-atom/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
+++ b/components/camel-atom/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.camel.component.atom
\ No newline at end of file
+org.apache.camel.component.atom.AtomConverter
\ No newline at end of file
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java
index 8689f64..051133e 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java
@@ -21,6 +21,7 @@
 
 import org.apache.aries.blueprint.ExtendedBeanMetadata;
 import org.apache.aries.blueprint.mutable.MutableReferenceMetadata;
+import org.apache.camel.NoSuchBeanException;
 import org.apache.camel.spi.Registry;
 import org.osgi.framework.Bundle;
 import org.osgi.service.blueprint.container.BlueprintContainer;
@@ -39,11 +40,25 @@
     }
 
     public <T> T lookup(String name, Class<T> type) {
+        Object answer;
         try {
-            return type.cast(blueprintContainer.getComponentInstance(name));
+            answer = blueprintContainer.getComponentInstance(name);
         } catch (NoSuchComponentException e) {
             return null;
         }
+
+        // just to be safe
+        if (answer == null) {
+            return null;
+        }
+
+        try {
+            return type.cast(answer);
+        } catch (Throwable e) {
+            String msg = "Found bean: " + name + " in BlueprintContainer: " + blueprintContainer
+                    + " of type: " + answer.getClass().getName() + " expected type was: " + type;
+            throw new NoSuchBeanException(name, msg, e);
+        }
     }
 
     public <T> Map<String, T> lookupByType(Class<T> type) {
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
index b894956..73cedb1 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
@@ -178,7 +178,7 @@
 
         CamelContextFactoryBean ccfb = (CamelContextFactoryBean) value;
         ccfb.setImplicitId(implicitId);
-
+        
         MutablePassThroughMetadata factory = context.createMetadata(MutablePassThroughMetadata.class);
         factory.setId(".camelBlueprint.passThrough." + contextId);
         factory.setObject(new PassThroughCallable<Object>(value));
@@ -404,6 +404,7 @@
         e.setRuntimeClass(fact.getObjectType());
         e.setFactoryComponent(ef);
         e.setFactoryMethod("getObject");
+        e.addDependsOn(".camelBlueprint.processor.bean." + contextId);
 
         context.getComponentDefinitionRegistry().registerComponentDefinition(e);
     }
diff --git a/components/camel-cache/src/main/resources/META-INF/services/org/apache/camel/TypeConverter b/components/camel-cache/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
index 1f3a3ac..45ee6bd 100644
--- a/components/camel-cache/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
+++ b/components/camel-cache/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.camel.component.cache
\ No newline at end of file
+org.apache.camel.component.cache.CacheConverter
\ No newline at end of file
diff --git a/components/camel-context/src/main/resources/META-INF/services/org/apache/camel/TypeConverter b/components/camel-context/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
index a9a83b2..908c1d2 100644
--- a/components/camel-context/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
+++ b/components/camel-context/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
@@ -1 +1,18 @@
-org.apache.camel.component.context
\ No newline at end of file
+#
+# 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.
+#
+
+org.apache.camel.component.context.ContextConverters
\ No newline at end of file
diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
index 7f4a752..a274243 100644
--- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
+++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
@@ -147,6 +147,14 @@
             }
         }, injector, factoryFinder);
 
+        try {
+            // only load the core type converters, as osgi activator will keep track on bundles
+            // being installed/uninstalled and load type converters as part of that process
+            answer.loadCoreTypeConverters();
+        } catch (Exception e) {
+            throw new RuntimeCamelException("Error loading CoreTypeConverter due: " + e.getMessage(), e);
+        }
+
         // load the type converters the tracker has been tracking
         Object[] services = this.tracker.getServices();
         if (services != null) {
@@ -159,12 +167,6 @@
             }
         }
 
-        try {
-            ServiceHelper.startService(answer);
-        } catch (Exception e) {
-            throw new RuntimeCamelException("Error staring OSGiTypeConverter due: " + e.getMessage(), e);
-        }
-
         LOG.trace("Created TypeConverter: {}", answer);
         return answer;
     }
diff --git a/components/camel-cxf/src/main/resources/META-INF/services/org/apache/camel/TypeConverter b/components/camel-cxf/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
index 28d27da..a703961 100644
--- a/components/camel-cxf/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
+++ b/components/camel-cxf/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
@@ -15,4 +15,5 @@
 # limitations under the License.

 #

 

-org.apache.camel.component.cxf.converter
\ No newline at end of file
+org.apache.camel.component.cxf.converter.CxfConverter

+org.apache.camel.component.cxf.converter.CxfPayloadConverter

diff --git a/components/camel-dns/src/main/resources/META-INF/services/org/apache/camel/TypeConverter b/components/camel-dns/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
index 31ff773..7253ef2 100644
--- a/components/camel-dns/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
+++ b/components/camel-dns/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
@@ -1 +1,19 @@
-org.apache.camel.component.dns.types
\ No newline at end of file
+#
+# 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.
+#
+
+org.apache.camel.component.dns.types.DnsConverter
+org.apache.camel.component.dns.types.DnsRecordConverter
\ No newline at end of file
diff --git a/components/camel-exec/src/main/resources/META-INF/services/org/apache/camel/TypeConverter b/components/camel-exec/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
index 3d700b0..a943e8d 100644
--- a/components/camel-exec/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
+++ b/components/camel-exec/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
@@ -15,4 +15,4 @@
 # limitations under the License.

 #

 

-org.apache.camel.component.exec

+org.apache.camel.component.exec.ExecResultConverter

diff --git a/components/camel-flatpack/src/main/resources/META-INF/services/org/apache/camel/TypeConverter b/components/camel-flatpack/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
index 282dfb5..f9a244f 100644
--- a/components/camel-flatpack/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
+++ b/components/camel-flatpack/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.camel.component.flatpack
\ No newline at end of file
+org.apache.camel.component.flatpack.FlatpackConverter
\ No newline at end of file
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsComponent.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsComponent.java
index f8df2c5..a700091 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsComponent.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsComponent.java
@@ -23,18 +23,20 @@
 import org.apache.camel.Endpoint;
 import org.apache.camel.impl.DefaultComponent;
 import org.apache.hadoop.fs.FsUrlStreamHandlerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class HdfsComponent extends DefaultComponent {
 
-    static {
-        URL.setURLStreamHandlerFactory(new FsUrlStreamHandlerFactory());
-    }
+    private static final Logger LOG = LoggerFactory.getLogger(HdfsComponent.class);
 
     public HdfsComponent() {
+        initHdfs();
     }
 
     public HdfsComponent(CamelContext context) {
         super(context);
+        initHdfs();
     }
 
     @SuppressWarnings("unchecked")
@@ -44,4 +46,13 @@
         return hdfsEndpoint;
     }
 
+    protected void initHdfs() {
+        try {
+            URL.setURLStreamHandlerFactory(new FsUrlStreamHandlerFactory());
+        } catch (Throwable e) {
+            // ignore as its most likely already set
+            LOG.debug("Cannot set URLStreamHandlerFactory due " + e.getMessage() + ". This exception will be ignored.", e);
+        }
+    }
+
 }
diff --git a/components/camel-hl7/src/main/resources/META-INF/services/org/apache/camel/TypeConverter b/components/camel-hl7/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
index 8755a32..b823fde 100644
--- a/components/camel-hl7/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
+++ b/components/camel-hl7/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.camel.component.hl7
\ No newline at end of file
+org.apache.camel.component.hl7.HL7Converter
\ No newline at end of file
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java b/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java
index 08fc8fd..8841427 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java
@@ -23,6 +23,7 @@
 import java.io.Serializable;
 import java.net.URLDecoder;
 import java.util.Enumeration;
+import java.util.Iterator;
 import java.util.Map;
 import javax.activation.DataHandler;
 import javax.servlet.ServletOutputStream;
@@ -83,14 +84,16 @@
         Enumeration names = request.getHeaderNames();
         while (names.hasMoreElements()) {
             String name = (String)names.nextElement();
-            Object value = request.getHeader(name);
-            // mapping the content-type 
+            String value = request.getHeader(name);
+            // use http helper to extract parameter value as it may contain multiple values
+            Object extracted = HttpHelper.extractHttpParameterValue(value);
+            // mapping the content-type
             if (name.toLowerCase().equals("content-type")) {
                 name = Exchange.CONTENT_TYPE;
             }
             if (headerFilterStrategy != null
-                && !headerFilterStrategy.applyFilterToExternalHeaders(name, value, message.getExchange())) {
-                headers.put(name, value);
+                && !headerFilterStrategy.applyFilterToExternalHeaders(name, extracted, message.getExchange())) {
+                HttpHelper.appendHeader(headers, name, extracted);
             }
         }
                 
@@ -143,18 +146,24 @@
         
         populateAttachments(request, message);
     }
-    
+
     protected void populateRequestParameters(HttpServletRequest request, HttpMessage message) throws Exception {
         //we populate the http request parameters without checking the request method
         Map<String, Object> headers = message.getHeaders();
         Enumeration names = request.getParameterNames();
         while (names.hasMoreElements()) {
             String name = (String)names.nextElement();
-            Object value = request.getParameter(name);
-            LOG.trace("HTTP header {} = {}", name, value);
-            if (headerFilterStrategy != null
-                && !headerFilterStrategy.applyFilterToExternalHeaders(name, value, message.getExchange())) {
-                headers.put(name, value);
+            // there may be multiple values for the same name
+            String[] values = request.getParameterValues(name);
+            LOG.trace("HTTP parameter {} = {}", name, values);
+
+            if (values != null) {
+                for (String value : values) {
+                    if (headerFilterStrategy != null
+                        && !headerFilterStrategy.applyFilterToExternalHeaders(name, value, message.getExchange())) {
+                        HttpHelper.appendHeader(headers, name, value);
+                    }
+                }
             }
         }
 
@@ -175,7 +184,7 @@
                     String value = URLDecoder.decode(pair[1], charset);
                     if (headerFilterStrategy != null
                         && !headerFilterStrategy.applyFilterToExternalHeaders(name, value, message.getExchange())) {
-                        headers.put(name, value);
+                        HttpHelper.appendHeader(headers, name, value);
                     }
                 } else {
                     throw new IllegalArgumentException("Invalid parameter, expected to be a pair but was " + param);
@@ -263,9 +272,14 @@
         for (Map.Entry<String, Object> entry : message.getHeaders().entrySet()) {
             String key = entry.getKey();
             Object value = entry.getValue();
-            if (value != null && headerFilterStrategy != null
-                    && !headerFilterStrategy.applyFilterToCamelHeaders(key, value, exchange)) {
-                response.setHeader(key, value.toString());
+            // use an iterator as there can be multiple values. (must not use a delimiter)
+            final Iterator it = ObjectHelper.createIterator(value, null);
+            while (it.hasNext()) {
+                String headerValue = exchange.getContext().getTypeConverter().convertTo(String.class, it.next());
+                if (headerValue != null && headerFilterStrategy != null
+                        && !headerFilterStrategy.applyFilterToCamelHeaders(key, headerValue, exchange)) {
+                    response.addHeader(key, headerValue);
+                }
             }
         }
 
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
index 8d9606d..ac2cb2c 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
@@ -22,7 +22,10 @@
 import java.io.InputStream;
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.camel.CamelExchangeException;
@@ -37,6 +40,9 @@
 import org.apache.camel.util.ExchangeHelper;
 import org.apache.camel.util.GZIPHelper;
 import org.apache.camel.util.IOHelper;
+import org.apache.camel.util.MessageHelper;
+import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.URISupport;
 import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpMethod;
@@ -68,8 +74,16 @@
     }
 
     public void process(Exchange exchange) throws Exception {
+        // if we bridge endpoint then we need to skip matching headers with the HTTP_QUERY to avoid sending
+        // duplicated headers to the receiver, so use this skipRequestHeaders as the list of headers to skip
+        Map<String, Object> skipRequestHeaders = null;
+
         if (getEndpoint().isBridgeEndpoint()) {
             exchange.setProperty(Exchange.SKIP_GZIP_ENCODING, Boolean.TRUE);
+            String queryString = exchange.getIn().getHeader(Exchange.HTTP_QUERY, String.class);
+            if (queryString != null) {
+                skipRequestHeaders = URISupport.parseQuery(queryString);
+            }
         }
         HttpMethod method = createMethod(exchange);
         Message in = exchange.getIn();
@@ -84,9 +98,41 @@
 
         // propagate headers as HTTP headers
         for (Map.Entry<String, Object> entry : in.getHeaders().entrySet()) {
-            String headerValue = in.getHeader(entry.getKey(), String.class);
-            if (strategy != null && !strategy.applyFilterToCamelHeaders(entry.getKey(), headerValue, exchange)) {
-                method.addRequestHeader(entry.getKey(), headerValue);
+            String key = entry.getKey();
+            Object headerValue = in.getHeader(key);
+
+            if (headerValue != null) {
+                // use an iterator as there can be multiple values. (must not use a delimiter)
+                final Iterator it = ObjectHelper.createIterator(headerValue, null);
+
+                // the value to add as request header
+                final List<String> values = new ArrayList<String>();
+
+                // if its a multi value then check each value if we can add it and for multi values they
+                // should be combined into a single value
+                while (it.hasNext()) {
+                    String value = exchange.getContext().getTypeConverter().convertTo(String.class, it.next());
+
+                    // we should not add headers for the parameters in the uri if we bridge the endpoint
+                    // as then we would duplicate headers on both the endpoint uri, and in HTTP headers as well
+                    if (skipRequestHeaders != null && skipRequestHeaders.containsKey(key)) {
+                        Object skipValue = skipRequestHeaders.get(key);
+                        if (ObjectHelper.equal(skipValue, value)) {
+                            continue;
+                        }
+                    }
+                    if (value != null && strategy != null && !strategy.applyFilterToCamelHeaders(key, value, exchange)) {
+                        values.add(value);
+                    }
+                }
+
+                // add the value(s) as a http request header
+                if (values.size() > 0) {
+                    // use the default toString of a ArrayList to create in the form [xxx, yyy]
+                    // if multi valued, for a single value, then just output the value as is
+                    String s =  values.size() > 1 ? values.toString() : values.get(0);
+                    method.addRequestHeader(key, s);
+                }
             }
         }
 
@@ -125,7 +171,6 @@
         Object response = extractResponseBody(method, exchange);
         Message answer = exchange.getOut();
 
-        answer.setHeaders(in.getHeaders());
         answer.setHeader(Exchange.HTTP_RESPONSE_CODE, responseCode);
         answer.setBody(response);
 
@@ -137,10 +182,16 @@
             if (name.toLowerCase().equals("content-type")) {
                 name = Exchange.CONTENT_TYPE;
             }
-            if (strategy != null && !strategy.applyFilterToExternalHeaders(name, value, exchange)) {
-                answer.setHeader(name, value);
+            // use http helper to extract parameter value as it may contain multiple values
+            Object extracted = HttpHelper.extractHttpParameterValue(value);
+            if (strategy != null && !strategy.applyFilterToExternalHeaders(name, extracted, exchange)) {
+                HttpHelper.appendHeader(answer.getHeaders(), name, extracted);
             }
         }
+
+        // preserve headers from in by copying any non existing headers
+        // to avoid overriding existing headers with old values
+        MessageHelper.copyHeaders(exchange.getIn(), answer, false);
     }
 
     protected Exception populateHttpOperationFailedException(Exchange exchange, HttpMethod method, int responseCode) throws IOException, ClassNotFoundException {
@@ -293,6 +344,12 @@
             }
         }
 
+        // there must be a host on the method
+        if (method.getHostConfiguration().getHost() == null) {
+            throw new IllegalArgumentException("Invalid uri: " + url
+                    + ". If you are forwarding/bridging http endpoints, then enable the bridgeEndpoint option on the endpoint: " + getEndpoint());
+        }
+
         return method;
     }
 
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java b/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java
index c1730af..89fd15f 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java
@@ -22,6 +22,9 @@
 import java.io.ObjectOutputStream;
 import java.io.OutputStream;
 import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 
@@ -34,6 +37,7 @@
 import org.apache.camel.converter.IOConverter;
 import org.apache.camel.converter.stream.CachedOutputStream;
 import org.apache.camel.util.IOHelper;
+import org.apache.camel.util.ObjectHelper;
 
 public final class HttpHelper {
 
@@ -234,4 +238,68 @@
 
         return answer;
     }
+
+    /**
+     * Appends the key/value to the headers.
+     * <p/>
+     * This implementation supports keys with multiple values. In such situations the value
+     * will be a {@link java.util.List} that contains the multiple values.
+     *
+     * @param headers  headers
+     * @param key      the key
+     * @param value    the value
+     */
+    @SuppressWarnings("unchecked")
+    public static void appendHeader(Map headers, String key, Object value) {
+        if (headers.containsKey(key)) {
+            Object existing = headers.get(key);
+            List list;
+            if (existing instanceof List) {
+                list = (List) existing;
+            } else {
+                list = new ArrayList();
+                list.add(existing);
+            }
+            list.add(value);
+            value = list;
+        }
+
+        headers.put(key, value);
+    }
+
+    /**
+     * Extracts the parameter value.
+     * <p/>
+     * This implementation supports HTTP multi value parameters which
+     * is based on the syntax of <tt>[value1, value2, value3]</tt> by returning
+     * a {@link List} containing the values.
+     * <p/>
+     * If the value is not a HTTP mulit value the value is returned as is.
+     *
+     * @param value the parameter value
+     * @return the extracted parameter value, see more details in javadoc.
+     */
+    @SuppressWarnings("unchecked")
+    public static Object extractHttpParameterValue(String value) {
+        if (value == null || ObjectHelper.isEmpty(value)) {
+            return value;
+        }
+
+        // trim value before checking for multiple parameters
+        String trimmed = value.trim();
+
+        if (trimmed.startsWith("[") && trimmed.endsWith("]")) {
+            // remove the [ ] markers
+            trimmed = trimmed.substring(1, trimmed.length() - 1);
+            List list = new ArrayList<String>();
+            String[] values = trimmed.split(",");
+            for (String s : values) {
+                list.add(s.trim());
+            }
+            return list;
+        }
+
+        return value;
+    }
+
 }
diff --git a/components/camel-http/src/main/resources/META-INF/services/org/apache/camel/TypeConverter b/components/camel-http/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
index 99a79a2..db3d92e 100644
--- a/components/camel-http/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
+++ b/components/camel-http/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
@@ -15,4 +15,5 @@
 # limitations under the License.
 #
 
-org.apache.camel.component.http
\ No newline at end of file
+org.apache.camel.component.http.HttpConverter
+org.apache.camel.component.http.RequestEntityConverter
\ No newline at end of file
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http/helper/HttpHelperTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/helper/HttpHelperTest.java
index d69f83e..0cd5ffa 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http/helper/HttpHelperTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/helper/HttpHelperTest.java
@@ -18,6 +18,9 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
@@ -29,10 +32,41 @@
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 public class HttpHelperTest {
 
     @Test
+    public void testAppendHeader() throws Exception {
+        Map headers = new HashMap();
+        HttpHelper.appendHeader(headers, "foo", "a");
+        HttpHelper.appendHeader(headers, "bar", "b");
+        HttpHelper.appendHeader(headers, "baz", "c");
+
+        assertEquals(3, headers.size());
+        assertEquals("a", headers.get("foo"));
+        assertEquals("b", headers.get("bar"));
+        assertEquals("c", headers.get("baz"));
+    }
+
+    @Test
+    public void testAppendHeaderMultipleValues() throws Exception {
+        Map headers = new HashMap();
+        HttpHelper.appendHeader(headers, "foo", "a");
+        HttpHelper.appendHeader(headers, "bar", "b");
+        HttpHelper.appendHeader(headers, "bar", "c");
+
+        assertEquals(2, headers.size());
+        assertEquals("a", headers.get("foo"));
+
+        List list = (List) headers.get("bar");
+        assertNotNull(list);
+        assertEquals(2, list.size());
+        assertEquals("b", list.get(0));
+        assertEquals("c", list.get(1));
+    }
+
+    @Test
     public void createURLShouldReturnTheHeaderURIIfNotBridgeEndpoint() throws URISyntaxException {
         String url = HttpHelper.createURL(
                 createExchangeWithOptionalCamelHttpUriHeader("http://apache.org", null),
diff --git a/components/camel-http4/src/main/java/org/apache/camel/component/http4/DefaultHttpBinding.java b/components/camel-http4/src/main/java/org/apache/camel/component/http4/DefaultHttpBinding.java
index 6dbb6a1..d9edc0d 100644
--- a/components/camel-http4/src/main/java/org/apache/camel/component/http4/DefaultHttpBinding.java
+++ b/components/camel-http4/src/main/java/org/apache/camel/component/http4/DefaultHttpBinding.java
@@ -23,6 +23,7 @@
 import java.io.Serializable;
 import java.net.URLDecoder;
 import java.util.Enumeration;
+import java.util.Iterator;
 import java.util.Map;
 
 import javax.activation.DataHandler;
@@ -43,6 +44,8 @@
 import org.apache.camel.util.IOHelper;
 import org.apache.camel.util.MessageHelper;
 import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Binding between {@link HttpMessage} and {@link HttpServletResponse}.
@@ -51,6 +54,7 @@
  */
 public class DefaultHttpBinding implements HttpBinding {
 
+    private static final transient Logger LOG = LoggerFactory.getLogger(DefaultHttpBinding.class);
     private boolean useReaderForPayload;
     private HeaderFilterStrategy headerFilterStrategy = new HttpHeaderFilterStrategy();
     private HttpEndpoint endpoint;
@@ -86,7 +90,7 @@
             }
             if (headerFilterStrategy != null
                     && !headerFilterStrategy.applyFilterToExternalHeaders(name, value, message.getExchange())) {
-                headers.put(name, value);
+                HttpHelper.appendHeader(headers, name, value);
             }
         }
 
@@ -137,10 +141,17 @@
         Enumeration names = request.getParameterNames();
         while (names.hasMoreElements()) {
             String name = (String) names.nextElement();
-            Object value = request.getParameter(name);
-            if (headerFilterStrategy != null
-                    && !headerFilterStrategy.applyFilterToExternalHeaders(name, value, message.getExchange())) {
-                headers.put(name, value);
+            // there may be multiple values for the same name
+            String[] values = request.getParameterValues(name);
+            LOG.trace("HTTP parameter {} = {}", name, values);
+
+            if (values != null) {
+                for (String value : values) {
+                    if (headerFilterStrategy != null
+                        && !headerFilterStrategy.applyFilterToExternalHeaders(name, value, message.getExchange())) {
+                        HttpHelper.appendHeader(headers, name, value);
+                    }
+                }
             }
         }
         if (request.getMethod().equals("POST") && request.getContentType() != null
@@ -240,11 +251,18 @@
         }
 
         // append headers
-        for (String key : message.getHeaders().keySet()) {
-            String value = message.getHeader(key, String.class);
-            if (headerFilterStrategy != null
-                    && !headerFilterStrategy.applyFilterToCamelHeaders(key, value, exchange)) {
-                response.setHeader(key, value);
+        // must use entrySet to ensure case of keys is preserved
+        for (Map.Entry<String, Object> entry : message.getHeaders().entrySet()) {
+            String key = entry.getKey();
+            Object value = entry.getValue();
+            // use an iterator as there can be multiple values. (must not use a delimiter)
+            final Iterator it = ObjectHelper.createIterator(value, null);
+            while (it.hasNext()) {
+                String headerValue = exchange.getContext().getTypeConverter().convertTo(String.class, it.next());
+                if (headerValue != null && headerFilterStrategy != null
+                        && !headerFilterStrategy.applyFilterToCamelHeaders(key, headerValue, exchange)) {
+                    response.addHeader(key, headerValue);
+                }
             }
         }
 
diff --git a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
index d90a257..493efa1 100644
--- a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
+++ b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
@@ -91,8 +91,9 @@
      * @param parameters the map of parameters
      * @param secure whether the endpoint is secure (eg https4)
      * @return the configurer
+     * @throws Exception is thrown if error creating configurer
      */
-    protected HttpClientConfigurer createHttpClientConfigurer(Map<String, Object> parameters, boolean secure) {
+    protected HttpClientConfigurer createHttpClientConfigurer(Map<String, Object> parameters, boolean secure) throws Exception {
         // prefer to use endpoint configured over component configured
         HttpClientConfigurer configurer = resolveAndRemoveReferenceParameter(parameters, "httpClientConfigurerRef", HttpClientConfigurer.class);
         if (configurer == null) {
@@ -125,7 +126,7 @@
         return configurer;
     }
 
-    private HttpClientConfigurer configureHttpProxy(Map<String, Object> parameters, HttpClientConfigurer configurer, boolean secure) {
+    private HttpClientConfigurer configureHttpProxy(Map<String, Object> parameters, HttpClientConfigurer configurer, boolean secure) throws Exception {
         String proxyAuthScheme = getAndRemoveParameter(parameters, "proxyAuthScheme", String.class);
         if (proxyAuthScheme == null) {
             // fallback and use either http4 or https4 depending on secure
@@ -139,6 +140,10 @@
             String proxyAuthPassword = getAndRemoveParameter(parameters, "proxyAuthPassword", String.class);
             String proxyAuthDomain = getAndRemoveParameter(parameters, "proxyAuthDomain", String.class);
             String proxyAuthNtHost = getAndRemoveParameter(parameters, "proxyAuthNtHost", String.class);
+            boolean secureProxy = HttpHelper.isSecureConnection(proxyAuthScheme);
+
+            // register scheme for proxy
+            registerPort(secureProxy, x509HostnameVerifier, proxyAuthPort, sslContextParameters);
 
             if (proxyAuthUsername != null && proxyAuthPassword != null) {
                 return CompositeHttpConfigurer.combineConfigurers(
diff --git a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java
index 75d0113..0384c04 100644
--- a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java
+++ b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java
@@ -24,7 +24,10 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.camel.CamelExchangeException;
@@ -39,6 +42,9 @@
 import org.apache.camel.util.ExchangeHelper;
 import org.apache.camel.util.GZIPHelper;
 import org.apache.camel.util.IOHelper;
+import org.apache.camel.util.MessageHelper;
+import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.URISupport;
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
@@ -72,8 +78,16 @@
     }
 
     public void process(Exchange exchange) throws Exception {
+        // if we bridge endpoint then we need to skip matching headers with the HTTP_QUERY to avoid sending
+        // duplicated headers to the receiver, so use this skipRequestHeaders as the list of headers to skip
+        Map<String, Object> skipRequestHeaders = null;
+
         if (getEndpoint().isBridgeEndpoint()) {
             exchange.setProperty(Exchange.SKIP_GZIP_ENCODING, Boolean.TRUE);
+            String queryString = exchange.getIn().getHeader(Exchange.HTTP_QUERY, String.class);
+            if (queryString != null) {
+                skipRequestHeaders = URISupport.parseQuery(queryString);
+            }
         }
         HttpRequestBase httpRequest = createMethod(exchange);
         Message in = exchange.getIn();
@@ -86,9 +100,41 @@
 
         // propagate headers as HTTP headers
         for (Map.Entry<String, Object> entry : in.getHeaders().entrySet()) {
-            String headerValue = in.getHeader(entry.getKey(), String.class);
-            if (strategy != null && !strategy.applyFilterToCamelHeaders(entry.getKey(), headerValue, exchange)) {
-                httpRequest.addHeader(entry.getKey(), headerValue);
+            String key = entry.getKey();
+            Object headerValue = in.getHeader(key);
+
+            if (headerValue != null) {
+                // use an iterator as there can be multiple values. (must not use a delimiter)
+                final Iterator it = ObjectHelper.createIterator(headerValue, null);
+
+                // the value to add as request header
+                final List<String> values = new ArrayList<String>();
+
+                // if its a multi value then check each value if we can add it and for multi values they
+                // should be combined into a single value
+                while (it.hasNext()) {
+                    String value = exchange.getContext().getTypeConverter().convertTo(String.class, it.next());
+
+                    // we should not add headers for the parameters in the uri if we bridge the endpoint
+                    // as then we would duplicate headers on both the endpoint uri, and in HTTP headers as well
+                    if (skipRequestHeaders != null && skipRequestHeaders.containsKey(key)) {
+                        Object skipValue = skipRequestHeaders.get(key);
+                        if (ObjectHelper.equal(skipValue, value)) {
+                            continue;
+                        }
+                    }
+                    if (value != null && strategy != null && !strategy.applyFilterToCamelHeaders(key, value, exchange)) {
+                        values.add(value);
+                    }
+                }
+
+                // add the value(s) as a http request header
+                if (values.size() > 0) {
+                    // use the default toString of a ArrayList to create in the form [xxx, yyy]
+                    // if multi valued, for a single value, then just output the value as is
+                    String s =  values.size() > 1 ? values.toString() : values.get(0);
+                    httpRequest.addHeader(key, s);
+                }
             }
         }
 
@@ -129,7 +175,6 @@
         Object response = extractResponseBody(httpRequest, httpResponse, exchange);
         Message answer = exchange.getOut();
 
-        answer.setHeaders(in.getHeaders());
         answer.setHeader(Exchange.HTTP_RESPONSE_CODE, responseCode);
         answer.setBody(response);
 
@@ -141,10 +186,16 @@
             if (name.toLowerCase().equals("content-type")) {
                 name = Exchange.CONTENT_TYPE;
             }
-            if (strategy != null && !strategy.applyFilterToExternalHeaders(name, value, exchange)) {
-                answer.setHeader(name, value);
+            // use http helper to extract parameter value as it may contain multiple values
+            Object extracted = HttpHelper.extractHttpParameterValue(value);
+            if (strategy != null && !strategy.applyFilterToExternalHeaders(name, extracted, exchange)) {
+                HttpHelper.appendHeader(answer.getHeaders(), name, extracted);
             }
         }
+
+        // preserve headers from in by copying any non existing headers
+        // to avoid overriding existing headers with old values
+        MessageHelper.copyHeaders(exchange.getIn(), answer, false);
     }
 
     protected Exception populateHttpOperationFailedException(Exchange exchange, HttpRequestBase httpRequest, HttpResponse httpResponse, int responseCode) throws IOException, ClassNotFoundException {
@@ -282,6 +333,11 @@
             queryString = getEndpoint().getHttpUri().getRawQuery();
         }
 
+        if (uri.getScheme() == null || uri.getHost() == null) {
+            throw new IllegalArgumentException("Invalid uri: " + uri
+                    + ". If you are forwarding/bridging http endpoints, then enable the bridgeEndpoint option on the endpoint: " + getEndpoint());
+        }
+
         StringBuilder builder = new StringBuilder(uri.getScheme()).append("://").append(uri.getHost());
 
         if (uri.getPort() != -1) {
diff --git a/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java b/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java
index 775d25a..af8deb5 100644
--- a/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java
+++ b/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java
@@ -22,6 +22,9 @@
 import java.io.ObjectOutputStream;
 import java.io.OutputStream;
 import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 
@@ -34,6 +37,7 @@
 import org.apache.camel.converter.IOConverter;
 import org.apache.camel.converter.stream.CachedOutputStream;
 import org.apache.camel.util.IOHelper;
+import org.apache.camel.util.ObjectHelper;
 import org.apache.http.HttpVersion;
 import org.apache.http.ProtocolException;
 
@@ -271,4 +275,67 @@
         return uri.startsWith("https");
     }
 
+    /**
+     * Appends the key/value to the headers.
+     * <p/>
+     * This implementation supports keys with multiple values. In such situations the value
+     * will be a {@link java.util.List} that contains the multiple values.
+     *
+     * @param headers  headers
+     * @param key      the key
+     * @param value    the value
+     */
+    @SuppressWarnings("unchecked")
+    public static void appendHeader(Map headers, String key, Object value) {
+        if (headers.containsKey(key)) {
+            Object existing = headers.get(key);
+            List list;
+            if (existing instanceof List) {
+                list = (List) existing;
+            } else {
+                list = new ArrayList();
+                list.add(existing);
+            }
+            list.add(value);
+            value = list;
+        }
+
+        headers.put(key, value);
+    }
+
+    /**
+     * Extracts the parameter value.
+     * <p/>
+     * This implementation supports HTTP multi value parameters which
+     * is based on the syntax of <tt>[value1, value2, value3]</tt> by returning
+     * a {@link List} containing the values.
+     * <p/>
+     * If the value is not a HTTP mulit value the value is returned as is.
+     *
+     * @param value the parameter value
+     * @return the extracted parameter value, see more details in javadoc.
+     */
+    @SuppressWarnings("unchecked")
+    public static Object extractHttpParameterValue(String value) {
+        if (value == null || ObjectHelper.isEmpty(value)) {
+            return value;
+        }
+
+        // trim value before checking for multiple parameters
+        String trimmed = value.trim();
+
+        if (trimmed.startsWith("[") && trimmed.endsWith("]")) {
+            // remove the [ ] markers
+            trimmed = trimmed.substring(1, trimmed.length() - 1);
+            List list = new ArrayList<String>();
+            String[] values = trimmed.split(",");
+            for (String s : values) {
+                list.add(s.trim());
+            }
+            return list;
+        }
+
+        return value;
+    }
+
 }
diff --git a/components/camel-http4/src/main/resources/META-INF/services/org/apache/camel/TypeConverter b/components/camel-http4/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
index fe202c3..de0d742 100644
--- a/components/camel-http4/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
+++ b/components/camel-http4/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
@@ -15,4 +15,5 @@
 # limitations under the License.
 #
 
-org.apache.camel.component.http4
\ No newline at end of file
+org.apache.camel.component.http4.HttpConverter
+org.apache.camel.component.http4.HttpEntityConverter
diff --git a/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerTwoHeadersWithSameKeyTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerTwoHeadersWithSameKeyTest.java
similarity index 100%
rename from trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerTwoHeadersWithSameKeyTest.java
rename to components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerTwoHeadersWithSameKeyTest.java
diff --git a/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerTwoParametersWithSameKeyTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerTwoParametersWithSameKeyTest.java
similarity index 100%
rename from trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerTwoParametersWithSameKeyTest.java
rename to components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerTwoParametersWithSameKeyTest.java
diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/helper/HttpHelperTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/helper/HttpHelperTest.java
index c2d7ced..362d0e3 100644
--- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/helper/HttpHelperTest.java
+++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/helper/HttpHelperTest.java
@@ -18,6 +18,9 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
@@ -29,10 +32,41 @@
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 public class HttpHelperTest {
 
     @Test
+    public void testAppendHeader() throws Exception {
+        Map headers = new HashMap();
+        HttpHelper.appendHeader(headers, "foo", "a");
+        HttpHelper.appendHeader(headers, "bar", "b");
+        HttpHelper.appendHeader(headers, "baz", "c");
+
+        assertEquals(3, headers.size());
+        assertEquals("a", headers.get("foo"));
+        assertEquals("b", headers.get("bar"));
+        assertEquals("c", headers.get("baz"));
+    }
+
+    @Test
+    public void testAppendHeaderMultipleValues() throws Exception {
+        Map headers = new HashMap();
+        HttpHelper.appendHeader(headers, "foo", "a");
+        HttpHelper.appendHeader(headers, "bar", "b");
+        HttpHelper.appendHeader(headers, "bar", "c");
+
+        assertEquals(2, headers.size());
+        assertEquals("a", headers.get("foo"));
+
+        List list = (List) headers.get("bar");
+        assertNotNull(list);
+        assertEquals(2, list.size());
+        assertEquals("b", list.get(0));
+        assertEquals("c", list.get(1));
+    }
+
+    @Test
     public void createURLShouldReturnTheHeaderURIIfNotBridgeEndpoint() throws URISyntaxException {
         String url = HttpHelper.createURL(
                 createExchangeWithOptionalCamelHttpUriHeader("http://apache.org", null),
diff --git a/components/camel-jcr/src/main/resources/META-INF/services/org/apache/camel/TypeConverter b/components/camel-jcr/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
index 67274c5..4e8487a 100644
--- a/components/camel-jcr/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
+++ b/components/camel-jcr/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.camel.component.jcr
\ No newline at end of file
+org.apache.camel.component.jcr.JcrConverter
\ No newline at end of file
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/DefaultJettyHttpBinding.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/DefaultJettyHttpBinding.java
index eedf5e8..fcf31ef 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/DefaultJettyHttpBinding.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/DefaultJettyHttpBinding.java
@@ -18,6 +18,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Enumeration;
 import java.util.Map;
 
 import org.apache.camel.Exchange;
@@ -28,6 +29,7 @@
 import org.apache.camel.component.http.HttpOperationFailedException;
 import org.apache.camel.component.http.helper.HttpHelper;
 import org.apache.camel.spi.HeaderFilterStrategy;
+import org.apache.camel.util.MessageHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -89,22 +91,30 @@
                                     Message in, HeaderFilterStrategy strategy, int responseCode) throws IOException {
         Message answer = exchange.getOut();
 
-        answer.setHeaders(in.getHeaders());
         answer.setHeader(Exchange.HTTP_RESPONSE_CODE, responseCode);
 
-        // propagate HTTP response headers
-        // must use entrySet to ensure case of keys is preserved
-        for (Map.Entry<String, String> entry : httpExchange.getHeaders().entrySet()) {
-            String name = entry.getKey();
-            String value = entry.getValue();
-            if (name.toLowerCase().equals("content-type")) {
-                name = Exchange.CONTENT_TYPE;
-            }
-            if (strategy != null && !strategy.applyFilterToExternalHeaders(name, value, exchange)) {
-                answer.setHeader(name, value);
+        // must use response fields to get the http headers as
+        // httpExchange.getHeaders() does not work well with multi valued headers
+        Enumeration<String> names = httpExchange.getResponseFields().getFieldNames();
+        while (names.hasMoreElements()) {
+            String name = names.nextElement();
+            Enumeration<String> values = httpExchange.getResponseFields().getValues(name);
+            while (values.hasMoreElements()) {
+                String value = values.nextElement();
+
+                if (name.toLowerCase().equals("content-type")) {
+                    name = Exchange.CONTENT_TYPE;
+                }
+                if (strategy != null && !strategy.applyFilterToExternalHeaders(name, value, exchange)) {
+                    HttpHelper.appendHeader(answer.getHeaders(), name, value);
+                }
             }
         }
 
+        // preserve headers from in by copying any non existing headers
+        // to avoid overriding existing headers with old values
+        MessageHelper.copyHeaders(exchange.getIn(), answer, false);
+
         // extract body after headers has been set as we want to ensure content-type from Jetty HttpExchange
         // has been populated first
         answer.setBody(extractResponseBody(exchange, httpExchange));
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
index 5dbef41..5f13c1d 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
@@ -22,6 +22,9 @@
 import java.io.Serializable;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.camel.AsyncCallback;
@@ -55,6 +58,7 @@
     public JettyHttpProducer(Endpoint endpoint, HttpClient client) {
         super(endpoint);
         this.client = client;
+        ObjectHelper.notNull(client, "HttpClient", this);
     }
 
     @Override
@@ -68,9 +72,6 @@
 
     public boolean process(Exchange exchange, final AsyncCallback callback) {
         try {
-            // TODO - Why does this use the endpoint client and not the one we were handed during construction?
-            HttpClient client = getEndpoint().getClient();
-            
             JettyContentExchange httpExchange = createHttpExchange(exchange, callback);
             doSendExchange(client, httpExchange);
         } catch (Exception e) {
@@ -131,15 +132,56 @@
             }
         }
 
-        // and copy headers from IN message
-        Message in = exchange.getIn();
-        HeaderFilterStrategy strategy = getEndpoint().getHeaderFilterStrategy();
+        // if we bridge endpoint then we need to skip matching headers with the HTTP_QUERY to avoid sending
+        // duplicated headers to the receiver, so use this skipRequestHeaders as the list of headers to skip
+        Map<String, Object> skipRequestHeaders = null;
+        if (getEndpoint().isBridgeEndpoint()) {
+            exchange.setProperty(Exchange.SKIP_GZIP_ENCODING, Boolean.TRUE);
+            String queryString = exchange.getIn().getHeader(Exchange.HTTP_QUERY, String.class);
+            if (queryString != null) {
+                skipRequestHeaders = URISupport.parseQuery(queryString);
+            }
+        }
 
         // propagate headers as HTTP headers
-        for (String headerName : in.getHeaders().keySet()) {
-            String headerValue = in.getHeader(headerName, String.class);
-            if (strategy != null && !strategy.applyFilterToCamelHeaders(headerName, headerValue, exchange)) {
-                httpExchange.addRequestHeader(headerName, headerValue);
+        Message in = exchange.getIn();
+        HeaderFilterStrategy strategy = getEndpoint().getHeaderFilterStrategy();
+        for (Map.Entry<String, Object> entry : in.getHeaders().entrySet()) {
+            String key = entry.getKey();
+            Object headerValue = in.getHeader(key);
+
+            if (headerValue != null) {
+                // use an iterator as there can be multiple values. (must not use a delimiter)
+                final Iterator it = ObjectHelper.createIterator(headerValue, null);
+
+                // the values to add as a request header
+                final List<String> values = new ArrayList<String>();
+
+                // if its a multi value then check each value if we can add it and for multi values they
+                // should be combined into a single value
+                while (it.hasNext()) {
+                    String value = exchange.getContext().getTypeConverter().convertTo(String.class, it.next());
+
+                    // we should not add headers for the parameters in the uri if we bridge the endpoint
+                    // as then we would duplicate headers on both the endpoint uri, and in HTTP headers as well
+                    if (skipRequestHeaders != null && skipRequestHeaders.containsKey(key)) {
+                        Object skipValue = skipRequestHeaders.get(key);
+                        if (ObjectHelper.equal(skipValue, value)) {
+                            continue;
+                        }
+                    }
+                    if (value != null && strategy != null && !strategy.applyFilterToCamelHeaders(key, value, exchange)) {
+                        values.add(value);
+                    }
+                }
+
+                // add the value(s) as a http request header
+                if (values.size() > 0) {
+                    // use the default toString of a ArrayList to create in the form [xxx, yyy]
+                    // if multi valued, for a single value, then just output the value as is
+                    String s = values.size() > 1 ? values.toString() : values.get(0);
+                    httpExchange.addRequestHeader(key, s);
+                }
             }
         }
 
diff --git a/components/camel-jetty/src/main/resources/META-INF/services/org/apache/camel/TypeConverter b/components/camel-jetty/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
index 993361a..aa69a0f 100644
--- a/components/camel-jetty/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
+++ b/components/camel-jetty/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.camel.component.jetty
+org.apache.camel.component.jetty.JettyConverter
diff --git a/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerTwoParametersWithSameKeyTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerTwoParametersWithSameKeyTest.java
similarity index 100%
rename from trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerTwoParametersWithSameKeyTest.java
rename to components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerTwoParametersWithSameKeyTest.java
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/HttpJettyProducerTwoParametersWithSameKeyTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/HttpJettyProducerTwoParametersWithSameKeyTest.java
index 6201fae..26f9f2f 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/HttpJettyProducerTwoParametersWithSameKeyTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/HttpJettyProducerTwoParametersWithSameKeyTest.java
@@ -16,12 +16,12 @@
  */
 package org.apache.camel.component.jetty.jettyproducer;
 
-import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.http.HttpMessage;
 import org.apache.camel.component.jetty.BaseJettyTest;
 import org.junit.Test;
 
@@ -40,8 +40,50 @@
         // give Jetty time to startup properly
         Thread.sleep(1000);
 
-        Exchange a = template.request("jetty:http://localhost:{{port}}/myapp?from=me&to=foo&to=bar", null);
-        assertNotNull(a);
+        Exchange out = template.request("jetty:http://localhost:{{port}}/myapp?from=me&to=foo&to=bar", null);
+
+        assertNotNull(out);
+        assertFalse("Should not fail", out.isFailed());
+        assertEquals("OK", out.getOut().getBody(String.class));
+        assertEquals("yes", out.getOut().getHeader("bar"));
+
+        List foo = out.getOut().getHeader("foo", List.class);
+        assertEquals(2, foo.size());
+        assertEquals("123", foo.get(0));
+        assertEquals("456", foo.get(1));
+    }
+
+    @Test
+    public void testTwoHeadersWithSameKeyHeader() throws Exception {
+        // these tests does not run well on Windows
+        if (isPlatform("windows")) {
+            return;
+        }
+
+        // give Jetty time to startup properly
+        Thread.sleep(1000);
+
+        Exchange out = template.request("jetty:http://localhost:{{port}}/myapp", new Processor() {
+            public void process(Exchange exchange) throws Exception {
+                exchange.getIn().setBody(null);
+                exchange.getIn().setHeader("from", "me");
+                List<String> list = new ArrayList<String>();
+                list.add("foo");
+                list.add("bar");
+                exchange.getIn().setHeader("to", list);
+            }
+        });
+
+        assertNotNull(out);
+        assertFalse("Should not fail", out.isFailed());
+        assertEquals("OK", out.getOut().getBody(String.class));
+        assertEquals("yes", out.getOut().getHeader("bar"));
+
+        List foo = out.getOut().getHeader("foo", List.class);
+        assertNotNull(foo);
+        assertEquals(2, foo.size());
+        assertEquals("123", foo.get(0));
+        assertEquals("456", foo.get(1));
     }
 
     @Override
@@ -54,16 +96,20 @@
                         String from = exchange.getIn().getHeader("from", String.class);
                         assertEquals("me", from);
 
-                        HttpServletRequest req = exchange.getIn(HttpMessage.class).getRequest();
-
-                        // TODO: Http/Jetty should support headers with multiple values
-                        String[] values = req.getParameterValues("to");
+                        List values = exchange.getIn().getHeader("to", List.class);
                         assertNotNull(values);
-                        assertEquals(2, values.length);
-                        assertEquals("foo", values[0]);
-                        assertEquals("bar", values[1]);
+                        assertEquals(2, values.size());
+                        assertEquals("foo", values.get(0));
+                        assertEquals("bar", values.get(1));
 
+                        // response
                         exchange.getOut().setBody("OK");
+                        // use multiple values for the foo header in the reply
+                        List list = new ArrayList();
+                        list.add(123);
+                        list.add(456);
+                        exchange.getOut().setHeader("foo", list);
+                        exchange.getOut().setHeader("bar", "yes");
                     }
                 });
             }
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConnectionFailureTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConnectionFailureTest.java
index ecb33e1..afadc21 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConnectionFailureTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConnectionFailureTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.jetty.jettyproducer;
 
-import java.net.ConnectException;
+import java.io.IOException;
 
 import org.apache.camel.CamelExchangeException;
 import org.apache.camel.builder.RouteBuilder;
@@ -50,7 +50,7 @@
             fail("Should have thrown an exception");
         } catch (Exception e) {
             CamelExchangeException cause = assertIsInstanceOf(CamelExchangeException.class, e.getCause());
-            assertIsInstanceOf(ConnectException.class, cause.getCause());
+            assertIsInstanceOf(IOException.class, cause.getCause());
         }
 
         assertMockEndpointsSatisfied();
diff --git a/components/camel-jetty/src/test/resources/log4j.properties b/components/camel-jetty/src/test/resources/log4j.properties
index 9384da0..bd82927 100644
--- a/components/camel-jetty/src/test/resources/log4j.properties
+++ b/components/camel-jetty/src/test/resources/log4j.properties
@@ -31,6 +31,8 @@
 #log4j.logger.org.apache.camel=DEBUG
 #log4j.logger.org.apache.camel.impl.converter.PropertyEditorTypeConverter=TRACE
 
+#log4j.logger.org.eclipse.jetty=TRACE
+
 # CONSOLE appender not used by default
 log4j.appender.out=org.apache.log4j.ConsoleAppender
 log4j.appender.out.layout=org.apache.log4j.PatternLayout
diff --git a/components/camel-mail/src/main/resources/META-INF/services/org/apache/camel/TypeConverter b/components/camel-mail/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
index 094d9f3..93462ce 100644
--- a/components/camel-mail/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
+++ b/components/camel-mail/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.camel.component.mail
\ No newline at end of file
+org.apache.camel.component.mail.MailConverters
\ No newline at end of file
diff --git a/components/camel-mina/src/main/resources/META-INF/services/org/apache/camel/TypeConverter b/components/camel-mina/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
index 6133069..0d6128e 100644
--- a/components/camel-mina/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
+++ b/components/camel-mina/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.camel.component.mina
\ No newline at end of file
+org.apache.camel.component.mina.MinaConverter
\ No newline at end of file
diff --git a/components/camel-netty/src/main/resources/META-INF/services/org/apache/camel/TypeConverter b/components/camel-netty/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
index 5c10d2d..6a33d33 100644
--- a/components/camel-netty/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
+++ b/components/camel-netty/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.camel.component.netty
\ No newline at end of file
+org.apache.camel.component.netty.NettyConverter
\ No newline at end of file
diff --git a/components/camel-quickfix/src/main/resources/META-INF/services/org/apache/camel/TypeConverter b/components/camel-quickfix/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
index 0dec349..d06dcfd 100644
--- a/components/camel-quickfix/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
+++ b/components/camel-quickfix/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.camel.component.quickfixj.converter
\ No newline at end of file
+org.apache.camel.component.quickfixj.converter.QuickfixjConverters
\ No newline at end of file
diff --git a/components/camel-restlet/src/main/resources/META-INF/services/org/apache/camel/TypeConverter b/components/camel-restlet/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
index 08a42a4..ea807d4 100644
--- a/components/camel-restlet/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
+++ b/components/camel-restlet/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.camel.component.restlet.converter
\ No newline at end of file
+org.apache.camel.component.restlet.converter.RestletConverter
\ No newline at end of file
diff --git a/components/camel-rss/src/main/resources/META-INF/services/org/apache/camel/TypeConverter b/components/camel-rss/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
index e4ac6c1..c0909db 100644
--- a/components/camel-rss/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
+++ b/components/camel-rss/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.camel.dataformat.rss
\ No newline at end of file
+org.apache.camel.dataformat.rss.RssConverter
\ No newline at end of file
diff --git a/components/camel-scala/pom.xml b/components/camel-scala/pom.xml
index 3c0c351..92fe4b2 100644
--- a/components/camel-scala/pom.xml
+++ b/components/camel-scala/pom.xml
@@ -79,6 +79,11 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
diff --git a/components/camel-scala/src/main/resources/META-INF/services/org/apache/camel/TypeConverter b/components/camel-scala/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
index edfc087..4308df7 100644
--- a/components/camel-scala/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
+++ b/components/camel-scala/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.camel.scala.converter
\ No newline at end of file
+org.apache.camel.scala.converter.ScalaTypeConverter
\ No newline at end of file
diff --git a/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/CamelTestSupportTest.scala b/components/camel-scala/src/test/scala/org/apache/camel/scala/CamelTestSupportTest.scala
similarity index 100%
rename from trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/CamelTestSupportTest.scala
rename to components/camel-scala/src/test/scala/org/apache/camel/scala/CamelTestSupportTest.scala
diff --git a/components/camel-snmp/src/main/resources/META-INF/services/org/apache/camel/TypeConverter b/components/camel-snmp/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
index a34814a..7b9e6d7 100644
--- a/components/camel-snmp/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
+++ b/components/camel-snmp/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
@@ -1 +1,18 @@
-org.apache.camel.component.snmp
+#
+# 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.
+#
+
+org.apache.camel.component.snmp.SnmpConverters
diff --git a/components/camel-spring-integration/src/main/resources/META-INF/services/org/apache/camel/TypeConverter b/components/camel-spring-integration/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
index 288e967..71cc9d8 100644
--- a/components/camel-spring-integration/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
+++ b/components/camel-spring-integration/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
@@ -15,4 +15,4 @@
 # limitations under the License.

 #

 

-org.apache.camel.component.spring.integration.converter
\ No newline at end of file
+org.apache.camel.component.spring.integration.converter.SpringIntegrationConverter
\ No newline at end of file
diff --git a/components/camel-spring-ws/src/main/resources/META-INF/services/org/apache/camel/TypeConverter b/components/camel-spring-ws/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
index 78a0e13..8a32c5f 100644
--- a/components/camel-spring-ws/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
+++ b/components/camel-spring-ws/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.camel.component.spring.ws.converter
\ No newline at end of file
+org.apache.camel.component.spring.ws.converter.StringSourceConverter
\ No newline at end of file
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/ApplicationContextRegistry.java b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/ApplicationContextRegistry.java
index 85cc5ce..7609643 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/ApplicationContextRegistry.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/ApplicationContextRegistry.java
@@ -18,6 +18,7 @@
 
 import java.util.Map;
 
+import org.apache.camel.NoSuchBeanException;
 import org.apache.camel.spi.Registry;
 import org.springframework.beans.factory.BeanNotOfRequiredTypeException;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
@@ -37,14 +38,27 @@
     }
 
     public <T> T lookup(String name, Class<T> type) {
+        Object answer;
         try {
-            Object value = applicationContext.getBean(name, type);
-            return type.cast(value);
+            answer = applicationContext.getBean(name, type);
         } catch (NoSuchBeanDefinitionException e) {
             return null;
         } catch (BeanNotOfRequiredTypeException e) {
             return null;
         }
+
+        // just to be safe
+        if (answer == null) {
+            return null;
+        }
+
+        try {
+            return type.cast(answer);
+        } catch (Throwable e) {
+            String msg = "Found bean: " + name + " in ApplicationContext: " + applicationContext
+                    + " of type: " + answer.getClass().getName() + " expected type was: " + type;
+            throw new NoSuchBeanException(name, msg, e);
+        }
     }
 
     public Object lookup(String name) {
diff --git a/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithTwoRoutesOnExceptionIssueTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithTwoRoutesOnExceptionIssueTest.java
similarity index 100%
rename from trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithTwoRoutesOnExceptionIssueTest.java
rename to components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithTwoRoutesOnExceptionIssueTest.java
diff --git a/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithTwoRoutesOnExceptionIssueTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithTwoRoutesOnExceptionIssueTest.xml
similarity index 100%
rename from trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithTwoRoutesOnExceptionIssueTest.xml
rename to components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithTwoRoutesOnExceptionIssueTest.xml
diff --git a/components/camel-syslog/src/main/resources/META-INF/services/org/apache/camel/TypeConverter b/components/camel-syslog/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
index 406906b..2ce7fd2 100644
--- a/components/camel-syslog/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
+++ b/components/camel-syslog/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.camel.component.syslog
\ No newline at end of file
+org.apache.camel.component.syslog.Rfc3164SyslogConverter
\ No newline at end of file
diff --git a/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java b/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
index 7628dd2..d44963e 100644
--- a/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
+++ b/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
@@ -117,6 +117,22 @@
     public Service getCamelContextService() {
         return camelContextService;
     }
+    
+    public Service camelContextService() {
+        return camelContextService;
+    }
+    
+    public CamelContext context() {
+        return context;
+    }
+    
+    public ProducerTemplate template() {
+        return template;
+    }
+    
+    public ConsumerTemplate consumer() {
+        return consumer;
+    }
 
     /**
      * Allows a service to be registered a separate lifecycle service to start
diff --git a/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java b/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java
index 6cd3c35..e352931 100644
--- a/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java
+++ b/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java
@@ -296,6 +296,22 @@
             template = null;
         }
     }
+    
+    public Service camelContextService() {
+        return camelContextService;
+    }
+    
+    public CamelContext context() {
+        return context;
+    }
+    
+    public ProducerTemplate template() {
+        return template;
+    }
+    
+    public ConsumerTemplate consumer() {
+        return consumer;
+    }
 
     protected void startCamelContext() throws Exception {
         if (camelContextService != null) {
diff --git a/components/camel-web/pom.xml b/components/camel-web/pom.xml
index f0aa97c..df6716f 100644
--- a/components/camel-web/pom.xml
+++ b/components/camel-web/pom.xml
@@ -104,10 +104,52 @@
             <artifactId>spring-web</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-json</artifactId>
-            <version>${jersey-version}</version>
+          <groupId>com.sun.jersey</groupId>
+          <artifactId>jersey-json</artifactId>
+          <version>${jersey-version}</version>
+          <exclusions>
+            <!-- exclude jackson so we can use the version by camel-jackson -->
+            <exclusion>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-core-asl</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-mapper-asl</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-jaxrs</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-xc</artifactId>
+            </exclusion>
+          </exclusions>
         </dependency>
+
+        <!-- jackson for jersey-json -->
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-core-asl</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-jaxrs</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-xc</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-atom</artifactId>
@@ -628,15 +670,15 @@
                     javax.xml.bind.util;resolution:=optional,
                     javax.xml.namespace;resolution:=optional,
                     javax.xml.parsers;resolution:=optional,
-                    org.apache.camel;version="[2.6, 3.0)",
-                    org.apache.camel.builder;version="[2.6, 3.0)",
-                    org.apache.camel.impl;version="[2.6, 3.0)",
-                    org.apache.camel.impl.converter;version="[2.6, 3.0)",
-                    org.apache.camel.model;version="[2.6, 3.0)",
-                    org.apache.camel.spi;version="[2.6, 3.0)",
-                    org.apache.camel.spring;version="[2.6, 3.0)",
-                    org.apache.camel.osgi;version="[2.6, 3.0)",
-                    org.apache.camel.util;version="[2.6, 3.0)",
+                    org.apache.camel;version="[2.8, 3.0)",
+                    org.apache.camel.builder;version="[2.8, 3.0)",
+                    org.apache.camel.impl;version="[2.8, 3.0)",
+                    org.apache.camel.impl.converter;version="[2.8, 3.0)",
+                    org.apache.camel.model;version="[2.8, 3.0)",
+                    org.apache.camel.spi;version="[2.8, 3.0)",
+                    org.apache.camel.spring;version="[2.8, 3.0)",
+                    org.apache.camel.osgi;version="[2.8, 3.0)",
+                    org.apache.camel.util;version="[2.8, 3.0)",
                     org.apache.camel.web.resources;resolution:=optional,
                     org.apache.commons.logging;resolution:=optional,
                     org.osgi.service.http;version="[1.0.0,2.0.0)",
@@ -780,6 +822,7 @@
                         </exclusion>
                     </exclusions>
                 </dependency>
+
                 <dependency>
                     <groupId>com.sun.jersey</groupId>
                     <artifactId>jersey-json</artifactId>
@@ -801,8 +844,46 @@
                             <groupId>org.apache.servicemix.bundles</groupId>
                             <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
                         </exclusion>
+                        <exclusion>
+                            <groupId>org.codehaus.jackson</groupId>
+                            <artifactId>jackson-core-asl</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.codehaus.jackson</groupId>
+                            <artifactId>jackson-mapper-asl</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.codehaus.jackson</groupId>
+                            <artifactId>jackson-jaxrs</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.codehaus.jackson</groupId>
+                            <artifactId>jackson-xc</artifactId>
+                        </exclusion>
                     </exclusions>
                 </dependency>
+		        <!-- jackson for jersey-json -->
+		        <dependency>
+		            <groupId>org.codehaus.jackson</groupId>
+		            <artifactId>jackson-core-asl</artifactId>
+		            <version>${jackson-version}</version>
+		        </dependency>
+		        <dependency>
+		            <groupId>org.codehaus.jackson</groupId>
+		            <artifactId>jackson-mapper-asl</artifactId>
+		            <version>${jackson-version}</version>
+		        </dependency>
+		        <dependency>
+		            <groupId>org.codehaus.jackson</groupId>
+		            <artifactId>jackson-jaxrs</artifactId>
+		            <version>${jackson-version}</version>
+		        </dependency>
+		        <dependency>
+		            <groupId>org.codehaus.jackson</groupId>
+		            <artifactId>jackson-xc</artifactId>
+		            <version>${jackson-version}</version>
+		        </dependency>
+
                 <dependency>
                     <groupId>com.sun.jersey</groupId>
                     <artifactId>jersey-atom</artifactId>
diff --git a/components/camel-xmlbeans/src/main/resources/META-INF/services/org/apache/camel/TypeConverter b/components/camel-xmlbeans/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
index 0ab2bae..5cb1896 100644
--- a/components/camel-xmlbeans/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
+++ b/components/camel-xmlbeans/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.camel.converter.xmlbeans
\ No newline at end of file
+org.apache.camel.converter.xmlbeans.XmlBeansConverter
\ No newline at end of file
diff --git a/examples/camel-example-axis/src/main/java/org/apache/camel/example/axis/AxisReportIncidentService.java b/examples/camel-example-axis/src/main/java/org/apache/camel/example/axis/AxisReportIncidentService.java
index 0a1a19b..ceda141 100644
--- a/examples/camel-example-axis/src/main/java/org/apache/camel/example/axis/AxisReportIncidentService.java
+++ b/examples/camel-example-axis/src/main/java/org/apache/camel/example/axis/AxisReportIncidentService.java
@@ -17,7 +17,6 @@
 package org.apache.camel.example.axis;
 
 import java.rmi.RemoteException;
-
 import javax.xml.rpc.ServiceException;
 
 import org.apache.camel.example.reportincident.InputReportIncident;
diff --git a/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/MyActivities.java b/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/MyActivities.java
index 9c19d7d..8cc728a 100644
--- a/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/MyActivities.java
+++ b/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/MyActivities.java
@@ -21,7 +21,6 @@
 import org.springframework.orm.jpa.JpaTemplate;
 import org.springframework.transaction.support.TransactionTemplate;
 
-import static org.apache.camel.builder.xml.XPathBuilder.xpath;
 import static org.apache.camel.util.Time.seconds;
 
 /**
diff --git a/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/stuff/Waiter.java b/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/stuff/Waiter.java
index 3acc76f..a7ae8f2 100644
--- a/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/stuff/Waiter.java
+++ b/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/stuff/Waiter.java
@@ -18,7 +18,6 @@
 
 import java.util.List;
 
-import org.apache.camel.Exchange;
 import org.apache.camel.example.cafe.Delivery;
 import org.apache.camel.example.cafe.Drink;
 
diff --git a/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringIntegrationTest.java b/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringIntegrationTest.java
index e007f27..192df13 100644
--- a/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringIntegrationTest.java
+++ b/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringIntegrationTest.java
@@ -16,9 +16,6 @@
  */
 package org.apache.camel.example.cafe;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.impl.DefaultCamelContext;
diff --git a/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringTest.java b/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringTest.java
index 68e4828..a38574f 100644
--- a/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringTest.java
+++ b/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.example.cafe;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.ProducerTemplate;
 import org.apache.camel.example.cafe.test.TestDrinkRouter;
 import org.apache.camel.example.cafe.test.TestWaiter;
 import org.junit.After;
diff --git a/examples/camel-example-cxf-osgi/README.txt b/examples/camel-example-cxf-osgi/README.txt
index c24098b..4ef5a3d 100644
--- a/examples/camel-example-cxf-osgi/README.txt
+++ b/examples/camel-example-cxf-osgi/README.txt
@@ -37,14 +37,11 @@
   features:install camel-jaxb
   features:install camel-cxf
   
-  if you want to test the example with blueprint, you should install 
-  features:install camel-blueprint
-
   Note: In this example we use Apache Camel 2.8.0 as the version. You should of course use the
         version number of Camel you are using.
 
   3) Deploy our example
-  osgi:install -s mvn:org.apache.camel/camel-example-cxf-osgi
+  osgi:install -s mvn:org.apache.camel/camel-example-cxf-osgi/2.8.0
   
   4) Verify that your service is available using in the browser the following url. We assume you
   use the default PAX Web configuration which use the port 8181 for http. If you would like to use
diff --git a/examples/camel-example-cxf-proxy/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java b/examples/camel-example-cxf-proxy/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java
index 3605758..b401e71 100755
--- a/examples/camel-example-cxf-proxy/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java
+++ b/examples/camel-example-cxf-proxy/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java
@@ -20,6 +20,7 @@
 import org.apache.camel.spring.Main;
 import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
 import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/Client.java b/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/Client.java
index f8839da..0bb3b13 100644
--- a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/Client.java
+++ b/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/Client.java
@@ -17,7 +17,6 @@
 package org.apache.camel.example.camel.transport;
 
 import java.net.MalformedURLException;
-
 import javax.xml.namespace.QName;
 import javax.xml.ws.Service;
 
diff --git a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/GreeterImpl.java b/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/GreeterImpl.java
index 34441d6..e2362a8 100644
--- a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/GreeterImpl.java
+++ b/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/GreeterImpl.java
@@ -17,6 +17,7 @@
 package org.apache.camel.example.camel.transport;
 
 import java.util.logging.Logger;
+
 import org.apache.hello_world_soap_http.Greeter;
 import org.apache.hello_world_soap_http.PingMeFault;
 import org.apache.hello_world_soap_http.types.FaultDetail;
diff --git a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/Client.java b/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/Client.java
index 0f6e7b1..f2585a3 100644
--- a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/Client.java
+++ b/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/Client.java
@@ -19,7 +19,6 @@
 import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
-
 import javax.xml.namespace.QName;
 
 import org.apache.hello_world_soap_http.Greeter;
diff --git a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/GreeterImpl.java b/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/GreeterImpl.java
index d32ab96..42f330b 100644
--- a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/GreeterImpl.java
+++ b/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/GreeterImpl.java
@@ -17,6 +17,7 @@
 package org.apache.camel.example.cxf;
 
 import java.util.logging.Logger;
+
 import org.apache.hello_world_soap_http.Greeter;
 import org.apache.hello_world_soap_http.PingMeFault;
 import org.apache.hello_world_soap_http.types.FaultDetail;
diff --git a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/JAXRSClient.java b/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/JAXRSClient.java
index 078c0c8..5066705 100644
--- a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/JAXRSClient.java
+++ b/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/JAXRSClient.java
@@ -17,7 +17,6 @@
 package org.apache.camel.example.cxf.jaxrs;
 
 import java.util.Collections;
-
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response;
 
diff --git a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/resources/BookStoreImpl.java b/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/resources/BookStoreImpl.java
index 4be599b..e5061d7 100644
--- a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/resources/BookStoreImpl.java
+++ b/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/resources/BookStoreImpl.java
@@ -18,7 +18,6 @@
 
 import java.util.HashMap;
 import java.util.Map;
-
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response;
 
diff --git a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/TesterBean.java b/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/TesterBean.java
index aa331f7..c2f4869 100644
--- a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/TesterBean.java
+++ b/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/TesterBean.java
@@ -17,7 +17,6 @@
 package org.apache.camel.example.cxf.provider;
 
 import java.util.List;
-
 import javax.xml.namespace.QName;
 import javax.xml.soap.MessageFactory;
 import javax.xml.soap.SOAPBody;
diff --git a/examples/camel-example-cxf/src/test/java/org/apache/camel/example/camel/transport/CamelTransportClientServerTest.java b/examples/camel-example-cxf/src/test/java/org/apache/camel/example/camel/transport/CamelTransportClientServerTest.java
index 179c8ff..4217507 100644
--- a/examples/camel-example-cxf/src/test/java/org/apache/camel/example/camel/transport/CamelTransportClientServerTest.java
+++ b/examples/camel-example-cxf/src/test/java/org/apache/camel/example/camel/transport/CamelTransportClientServerTest.java
@@ -21,12 +21,10 @@
 import org.apache.hello_world_soap_http.Greeter;
 import org.apache.hello_world_soap_http.PingMeFault;
 import org.apache.hello_world_soap_http.types.FaultDetail;
-
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
-
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/CxfHttpJmsClientServerTest.java b/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/CxfHttpJmsClientServerTest.java
index 4fc0bdc..ebf2bfc 100644
--- a/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/CxfHttpJmsClientServerTest.java
+++ b/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/CxfHttpJmsClientServerTest.java
@@ -22,7 +22,6 @@
 import org.apache.hello_world_soap_http.Greeter;
 import org.apache.hello_world_soap_http.PingMeFault;
 import org.apache.hello_world_soap_http.types.FaultDetail;
-
 import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/jaxrs/JAXRSClientServerTest.java b/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/jaxrs/JAXRSClientServerTest.java
index 4288dbf..7e1f5e9 100644
--- a/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/jaxrs/JAXRSClientServerTest.java
+++ b/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/jaxrs/JAXRSClientServerTest.java
@@ -21,9 +21,7 @@
 import org.apache.camel.example.cxf.jaxrs.resources.BookStore;
 import org.apache.camel.test.junit4.CamelSpringTestSupport;
 import org.apache.cxf.BusFactory;
-
 import org.junit.Test;
-
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/examples/camel-example-docs/src/main/java/org/apache/camel/example/docs/ContentBasedRouteRoute.java b/examples/camel-example-docs/src/main/java/org/apache/camel/example/docs/ContentBasedRouteRoute.java
index 24d3bc8..f565026 100644
--- a/examples/camel-example-docs/src/main/java/org/apache/camel/example/docs/ContentBasedRouteRoute.java
+++ b/examples/camel-example-docs/src/main/java/org/apache/camel/example/docs/ContentBasedRouteRoute.java
@@ -17,7 +17,6 @@
 package org.apache.camel.example.docs;
 
 import org.apache.camel.builder.RouteBuilder;
-import static org.apache.camel.builder.xml.XPathBuilder.xpath;
 
 /**
  * A simple content based router example
diff --git a/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java b/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java
index 019cb76..040d662 100644
--- a/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java
+++ b/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java
@@ -24,7 +24,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.orm.jpa.JpaTemplate;
-import org.springframework.util.ClassUtils;
 
 /**
  * A Message Transformer of an XML document to a Customer entity bean
diff --git a/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/EtlRoutes.java b/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/EtlRoutes.java
index 45c9e18..d597e91 100644
--- a/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/EtlRoutes.java
+++ b/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/EtlRoutes.java
@@ -18,6 +18,7 @@
 
 import org.apache.camel.Exchange;
 import org.apache.camel.spring.SpringRouteBuilder;
+
 import static org.apache.camel.language.juel.JuelExpression.el;
 
 /**
diff --git a/examples/camel-example-etl/src/main/resources/META-INF/services/org/apache/camel/TypeConverter b/examples/camel-example-etl/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
index 3b8768b..ee9c0fa 100644
--- a/examples/camel-example-etl/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
+++ b/examples/camel-example-etl/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.camel.example.etl
\ No newline at end of file
+org.apache.camel.example.etl.CustomerTransformer
\ No newline at end of file
diff --git a/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/RequestProcessor.java b/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/RequestProcessor.java
index 5e5fcdb..01d3851 100644
--- a/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/RequestProcessor.java
+++ b/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/RequestProcessor.java
@@ -20,7 +20,6 @@
 

 import com.google.appengine.api.users.UserService;

 import com.google.appengine.api.users.UserServiceFactory;

-

 import org.apache.camel.Exchange;

 import org.apache.camel.Processor;

 

diff --git a/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/ResponseProcessor.java b/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/ResponseProcessor.java
index acb522f..3486a87 100644
--- a/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/ResponseProcessor.java
+++ b/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/ResponseProcessor.java
@@ -17,7 +17,6 @@
 package org.apache.camel.example.gae;

 

 import com.google.appengine.api.users.UserServiceFactory;

-

 import org.apache.camel.Exchange;

 import org.apache.camel.Processor;

 

diff --git a/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyActivator.java b/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyActivator.java
index faf6eb4..c8e386a 100644
--- a/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyActivator.java
+++ b/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyActivator.java
@@ -18,7 +18,6 @@
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.osgi.framework.BundleActivator;
diff --git a/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/OSGiCamelContextProvider.java b/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/OSGiCamelContextProvider.java
index 6a62548..7deba25 100644
--- a/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/OSGiCamelContextProvider.java
+++ b/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/OSGiCamelContextProvider.java
@@ -18,14 +18,12 @@
 
 import java.util.Properties;
 import java.util.Set;
-
 import javax.naming.Context;
 
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.Provider;
 import com.google.inject.ProvisionException;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.RoutesBuilder;
 import org.apache.camel.impl.DefaultCamelContext;
diff --git a/examples/camel-example-jmx/src/main/java/org/apache/camel/example/jmx/SimpleBean.java b/examples/camel-example-jmx/src/main/java/org/apache/camel/example/jmx/SimpleBean.java
index cdb7008..308387c 100644
--- a/examples/camel-example-jmx/src/main/java/org/apache/camel/example/jmx/SimpleBean.java
+++ b/examples/camel-example-jmx/src/main/java/org/apache/camel/example/jmx/SimpleBean.java
@@ -26,6 +26,8 @@
  * such as an attribute being changed.
  */
 public class SimpleBean extends NotificationBroadcasterSupport implements ISimpleMXBean {
+
+    private static final long serialVersionUID = 1L;
     private int sequence;
     private int tick;
 
diff --git a/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/Bank.java b/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/Bank.java
index 9126a2a..1cbba49 100644
--- a/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/Bank.java
+++ b/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/Bank.java
@@ -18,7 +18,6 @@
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerQueueContainerTestClient.java b/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerQueueContainerTestClient.java
index f83b161..0a58791 100644
--- a/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerQueueContainerTestClient.java
+++ b/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerQueueContainerTestClient.java
@@ -19,8 +19,6 @@
 import javax.jms.ConnectionFactory;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.jms.JmsComponent;
 import org.apache.camel.impl.DefaultCamelContext;
diff --git a/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/webservice/version/LoanBrokerWSTest.java b/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/webservice/version/LoanBrokerWSTest.java
index 395365b..0abeeaa 100644
--- a/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/webservice/version/LoanBrokerWSTest.java
+++ b/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/webservice/version/LoanBrokerWSTest.java
@@ -20,7 +20,6 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/examples/camel-example-reportincident-wssecurity/src/main/java/org/apache/camel/example/reportincident/UTPasswordCallback.java b/examples/camel-example-reportincident-wssecurity/src/main/java/org/apache/camel/example/reportincident/UTPasswordCallback.java
index 78042a0..a31e845 100644
--- a/examples/camel-example-reportincident-wssecurity/src/main/java/org/apache/camel/example/reportincident/UTPasswordCallback.java
+++ b/examples/camel-example-reportincident-wssecurity/src/main/java/org/apache/camel/example/reportincident/UTPasswordCallback.java
@@ -19,7 +19,6 @@
 import java.io.IOException;

 import java.util.HashMap;

 import java.util.Map;

-

 import javax.security.auth.callback.Callback;

 import javax.security.auth.callback.CallbackHandler;

 import javax.security.auth.callback.UnsupportedCallbackException;

diff --git a/examples/camel-example-reportincident/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java b/examples/camel-example-reportincident/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java
index 8ecb760..c1be161 100755
--- a/examples/camel-example-reportincident/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java
+++ b/examples/camel-example-reportincident/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.example.reportincident;
 
-import junit.framework.TestCase;
 import org.apache.camel.CamelContext;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
diff --git a/examples/camel-example-servlet-tomcat/src/main/webapp/index.html b/examples/camel-example-servlet-tomcat/src/main/webapp/index.html
index b3a8122..2ae589b 100644
--- a/examples/camel-example-servlet-tomcat/src/main/webapp/index.html
+++ b/examples/camel-example-servlet-tomcat/src/main/webapp/index.html
@@ -9,9 +9,9 @@
 To get started click <a href="camel/hello">this link</a>.
 <br/>
 <br/>
-For the latest & greatest documentation on how to use this example please see:
+This example is documented at
 <a href="http://camel.apache.org/servlet-tomcat-example.html">servlet tomcat example</a>
-<br/>
+
 <br/>
 If you hit any problems please let us know on the
 <a href="http://camel.apache.org/discussion-forums.html">Camel Forums</a>
diff --git a/examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/MyRouteConfig.java b/examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/MyRouteConfig.java
index feeb202..404ce81 100644
--- a/examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/MyRouteConfig.java
+++ b/examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/MyRouteConfig.java
@@ -16,16 +16,11 @@
  */
 package org.apache.camel.example.spring.javaconfig;
 
-import java.util.List;
-
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.camel.CamelContext;
-import org.apache.camel.RoutesBuilder;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.jms.JmsComponent;
-
 import org.apache.camel.osgi.SpringCamelContextFactory;
-import org.apache.camel.spring.SpringCamelContext;
 import org.apache.camel.spring.javaconfig.Main;
 import org.apache.camel.spring.javaconfig.SingleRouteCamelConfiguration;
 import org.osgi.framework.BundleContext;
diff --git a/examples/camel-example-spring-javaconfig/src/test/java/org/apache/camel/example/spring/javaconfig/IntegrationTest.java b/examples/camel-example-spring-javaconfig/src/test/java/org/apache/camel/example/spring/javaconfig/IntegrationTest.java
index cf362b1..0432e44 100644
--- a/examples/camel-example-spring-javaconfig/src/test/java/org/apache/camel/example/spring/javaconfig/IntegrationTest.java
+++ b/examples/camel-example-spring-javaconfig/src/test/java/org/apache/camel/example/spring/javaconfig/IntegrationTest.java
@@ -18,10 +18,8 @@
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.spring.javaconfig.Main;
-
 import org.junit.Assert;
 import org.junit.Test;
-
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/platforms/karaf/commands/pom.xml b/platforms/karaf/commands/pom.xml
index ea28244..5b2eb2a 100644
--- a/platforms/karaf/commands/pom.xml
+++ b/platforms/karaf/commands/pom.xml
@@ -85,4 +85,4 @@
     </plugins>
   </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index cabe485..32d4862 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -16,7 +16,7 @@
       See the License for the specific language governing permissions and
       limitations under the License.
 -->
-<features>
+<features name='camel-${pom.version}'>
   <feature name='camel' version='${pom.version}' resolver='(obr)' start-level='50'>
     <feature version='${pom.version}'>camel-core</feature>
     <feature version='${pom.version}'>camel-spring</feature>
diff --git a/tests/camel-itest-karaf/pom.xml b/tests/camel-itest-karaf/pom.xml
index 8f55c1d..5cad882 100644
--- a/tests/camel-itest-karaf/pom.xml
+++ b/tests/camel-itest-karaf/pom.xml
@@ -26,7 +26,7 @@
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-parent</artifactId>
         <version>2.8-SNAPSHOT</version>
-         <relativePath>../../parent</relativePath>
+        <relativePath>../../parent</relativePath>
     </parent>
 
     <artifactId>camel-itest-karaf</artifactId>
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
index 692426a..a55cdbb 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.itest.osgi;
-
+import java.net.URL;
 import org.apache.camel.CamelContext;
 import org.apache.camel.osgi.CamelContextFactory;
 import org.apache.camel.test.junit4.CamelTestSupport;
@@ -87,13 +87,30 @@
             artifactId("standard").version(karafVersion).type(type);
     }
     
+    private static URL getResource(String location) {
+        URL url = null;
+        if (Thread.currentThread().getContextClassLoader() != null) {
+            url = Thread.currentThread().getContextClassLoader().getResource(location);
+        }
+        if (url == null) {
+            url = Helper.class.getResource(location);
+        }
+        if (url == null) {
+            throw new RuntimeException("Unable to find resource " + location);
+        }
+        return url;
+    }
+    
     public static Option[] getDefaultCamelKarafOptions() {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel("WARN")),
-                                         
+            // Set the karaf environment with some customer configuration
+            combine(
+                Helper.getDefaultConfigOptions(
+                    Helper.getDefaultSystemOptions(),
+                    getResource("/org/apache/camel/itest/karaf/config.properties"),
+                    // this is how you set the default log level when using pax logging (logProfile)
+                    Helper.setLogLevel("WARN")),
+                Helper.getDefaultProvisioningOptions()),                             
             // install the spring, http features first
             scanFeatures(getKarafFeatureUrl(), "spring", "spring-dm", "jetty"),
 
@@ -101,10 +118,10 @@
             scanFeatures(getCamelKarafFeatureUrl(),                         
                 "camel-core", "camel-spring", "camel-test"),
                                    
-            workingDirectory("target/paxrunner/"),
+            workingDirectory("target/paxrunner/"));
 
-            equinox(),
-            felix());
+            //equinox(),
+            //felix());
         return options;
     }
 
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java
index 75a20aa..199b9c3 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java
@@ -78,29 +78,16 @@
     public static Option[] configure() throws Exception {
 
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-                // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel("INFO")),
-                
-            // install blueprint requirements
-            mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
-
+            getDefaultCamelKarafOptions(),
+            
             bundle(newBundle()
                 .add("OSGI-INF/blueprint/test.xml", BlueprintExplicitPropertiesRouteTest.class.getResource("blueprint-16.xml"))
                 .set(Constants.BUNDLE_SYMBOLICNAME, BlueprintExplicitPropertiesRouteTest.class.getName())
                 .build()).noStart(),
-
-                // install the spring, http features first
-                scanFeatures(getKarafFeatureUrl(), "spring", "spring-dm", "jetty"),
                 
-                // using the features to install the camel components
-                scanFeatures(getCamelKarafFeatureUrl(),
-                        "camel-core", "camel-blueprint", "camel-test"),
-
-                workingDirectory("target/paxrunner/"),
-
-                felix());
+            // using the features to install the camel components
+            scanFeatures(getCamelKarafFeatureUrl(),
+                        "camel-blueprint"));
 
         return options;
     }
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesRouteTest.java
index 378875c..f696b88 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesRouteTest.java
@@ -74,31 +74,16 @@
     public static Option[] configure() throws Exception {
 
         Option[] options = combine(
-                // Default karaf environment
-                Helper.getDefaultOptions(
-                    // this is how you set the default log level when using pax logging (logProfile)
-                    Helper.setLogLevel("INFO")),
+                getDefaultCamelKarafOptions(),
+
                 bundle(newBundle()
                         .add("OSGI-INF/blueprint/test.xml", BlueprintPropertiesRouteTest.class.getResource("blueprint-17.xml"))
                         .set(Constants.BUNDLE_SYMBOLICNAME, BlueprintPropertiesRouteTest.class.getName())
                         .build()).noStart(),
 
-                // install the spring dm profile
-                profile("spring.dm").version("1.2.0"),
-                mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint", "0.2-incubating"),
-
-                // install blueprint requirements
-                mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
-
-                // install the spring, http features first
-                scanFeatures(getKarafFeatureUrl(), "spring", "spring-dm", "jetty"),
                 // using the features to install the camel components
                 scanFeatures(getCamelKarafFeatureUrl(),
-                        "camel-core", "camel-blueprint", "camel-test"),
-
-                workingDirectory("target/paxrunner/"),
-
-                felix()/*, equinox()*/);
+                                    "camel-blueprint"));
 
         return options;
     }
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java
index b557b1f..9b040d6 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java
@@ -142,10 +142,7 @@
     public static Option[] configure() throws Exception {
 
         Option[] options = combine(
-                // Default karaf environment
-                Helper.getDefaultOptions(
-                    // this is how you set the default log level when using pax logging (logProfile)
-                    Helper.setLogLevel("WARN")),
+                getDefaultCamelKarafOptions(),
 
                 bundle(newBundle()
                         .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-10.xml"))
@@ -187,18 +184,10 @@
                        .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle18")
                        .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
                        .build()).noStart(),
-                        
-                // install the spring, http features first
-                scanFeatures(getKarafFeatureUrl(), "jetty"),
+                       
                 // using the features to install the camel components
                 scanFeatures(getCamelKarafFeatureUrl(),
-                        "camel-core", "camel-blueprint", "camel-test", "camel-mail", "camel-jaxb", "camel-jms"),
-
-                workingDirectory("target/paxrunner/"),
-
-
-                felix(),
-                equinox());
+                        "camel-blueprint", "camel-test", "camel-mail", "camel-jaxb", "camel-jms"));
                 
                 // for remote debugging
                 // vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5008"));
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint3Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint3Test.java
index 1f6a279..5866053 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint3Test.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint3Test.java
@@ -81,10 +81,7 @@
     public static Option[] configure() throws Exception {
 
         Option[] options = combine(
-                // Default karaf environment
-                Helper.getDefaultOptions(
-                // this is how you set the default log level when using pax logging (logProfile)
-                     Helper.setLogLevel("WARN")),
+                getDefaultCamelKarafOptions(),
 
                 bundle(newBundle()
                         .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-6.xml"))
@@ -113,17 +110,9 @@
                         .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
                         .build()).noStart(),
                         
-                // install the spring, http features first
-                scanFeatures(getKarafFeatureUrl(), "spring", "jetty"),
-
                 // using the features to install the camel components
                 scanFeatures(getCamelKarafFeatureUrl(),
-                        "camel-core", "camel-blueprint", "camel-test", "camel-ftp", "camel-jackson", "camel-jms"),
-
-                workingDirectory("target/paxrunner/"),
-
-                felix(),
-                equinox());
+                        "camel-blueprint", "camel-ftp", "camel-jackson", "camel-jms"));
 
         return options;
     }
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java
index ba5d36c..ed84608 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java
@@ -75,10 +75,7 @@
     public static Option[] configure() throws Exception {
 
         Option[] options = combine(
-                // Default karaf environment
-                Helper.getDefaultOptions(
-                        // this is how you set the default log level when using pax logging (logProfile)
-                        Helper.setLogLevel("WARN")),
+                getDefaultCamelKarafOptions(),
 
                 bundle(newBundle()
                         .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-19.xml"))
@@ -91,18 +88,10 @@
                         .add("org/apache/camel/itest/osgi/blueprint/example.vm", OSGiBlueprintTestSupport.class.getResource("example.vm"))
                         .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle20")
                         .build()).noStart(),
-                        
-                // install the spring, http features first
-                scanFeatures(getKarafFeatureUrl(), "spring", "jetty"),
-
+                
                 // using the features to install the camel components
                 scanFeatures(getCamelKarafFeatureUrl(),
-                        "camel-core", "camel-test", "camel-blueprint", "camel-spring", "camel-velocity"),
-
-                workingDirectory("target/paxrunner/"),
-
-                felix(),
-                equinox());
+                        "camel-blueprint", "camel-velocity"));
 
         return options;
     }
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTest.java
index 1600985..8d50f05 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTest.java
@@ -112,10 +112,7 @@
 
         
         Option[] options = combine(
-             // Default karaf environment
-            Helper.getDefaultOptions(
-                  // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel("WARN")),
+                getDefaultCamelKarafOptions(),
 
 
                 bundle(newBundle()
@@ -146,20 +143,10 @@
                         .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle5")
                         .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
                         .build()).noStart(),
-                        
-                // install the spring, http features first
-                scanFeatures(getKarafFeatureUrl(), "spring", "spring-dm", "jetty"),
-
+                
                  // using the features to install the camel components
                 scanFeatures(getCamelKarafFeatureUrl(),
-                        "camel-core", "camel-blueprint", "camel-test", "camel-ftp", "camel-jackson", "camel-jms"),
-
-                workingDirectory("target/paxrunner/"),
-
-
-
-                felix(),
-                equinox());
+                        "camel-blueprint", "camel-test", "camel-ftp", "camel-jackson", "camel-jms"));
 
         return options;
     }
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java
index 83e3b46..fdb997f 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java
@@ -77,26 +77,16 @@
     public static Option[] configure() throws Exception {
 
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-                // this is how you set the default log level when using pax logging (logProfile)
-                Helper.setLogLevel("WARN")),
+                getDefaultCamelKarafOptions(),
 
                 bundle(newBundle()
                         .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-13.xml"))
                         .set(Constants.BUNDLE_SYMBOLICNAME, OSGiBlueprintHelloWorldTest.class.getName())
                         .build()).noStart(),
-                        
-                // install the http features first
-                scanFeatures(getKarafFeatureUrl(), "jetty"),
-
+                
                 // using the features to install the camel components
                 scanFeatures(getCamelKarafFeatureUrl(),
-                        "camel-core", "camel-blueprint", "camel-test"),
-
-                workingDirectory("target/paxrunner/"),
-
-                felix(), equinox());
+                        "camel-blueprint"));
 
         return options;
     }
diff --git a/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/vm/VmTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/vm/VmTest.java
similarity index 100%
rename from trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/vm/VmTest.java
rename to tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/vm/VmTest.java
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfProxyExampleTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfProxyExampleTest.java
index 69f41bc..f0bb186 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfProxyExampleTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfProxyExampleTest.java
@@ -50,8 +50,7 @@
         factory.setAddress("http://localhost:9080/camel-itest-osgi/webservices/incident");
         return (ReportIncidentEndpoint) factory.create();
     }
-
-    @Ignore("CXF bundle can't be installed in Karaf")
+    
     @Test
     public void testCxfProxy() throws Exception {
         // create input parameter
@@ -71,6 +70,7 @@
 
         // assert we got a OK back
         assertEquals("OK;456", out.getCode());
+        LOG.warn("Finish the testing");
     }
 
     @Override
@@ -84,17 +84,11 @@
     @Configuration
     public static Option[] configure() throws Exception {
         Option[] options = combine(
-            // Default karaf environment
-            Helper.getDefaultOptions(
-            // this is how you set the default log level when using pax logging (logProfile)
-                  Helper.setLogLevel("WARN")),
-                  
-            // install the spring, http features first
-            scanFeatures(getKarafFeatureUrl(), "spring", "spring-dm", "jetty"),
+            getDefaultCamelKarafOptions(),
            
             // using the features to install the camel components
             scanFeatures(getCamelKarafFeatureUrl(),
-                                "spring", "spring-dm", "camel-core", "camel-spring", "camel-http", "camel-test", "camel-cxf"),
+                         "camel-http", "camel-cxf"),
                                         
             // need to install the generated src as the pax-exam doesn't wrap this bundles
             provision(newBundle()
@@ -103,11 +97,7 @@
                             .add(org.apache.camel.example.reportincident.ReportIncidentEndpoint.class)
                             .add(org.apache.camel.example.reportincident.ReportIncidentEndpointService.class)
                             .add(org.apache.camel.example.reportincident.ObjectFactory.class)
-                            .build(withBnd())),
-                            
-            workingDirectory("target/paxrunner/"),
-                  
-            felix(), equinox());
+                            .build(withBnd())));
           
         return options;
     }
diff --git a/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/config.properties b/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/config.properties
similarity index 100%
rename from trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/config.properties
rename to tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/config.properties
diff --git a/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/custom.properties b/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/custom.properties
similarity index 100%
rename from trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/custom.properties
rename to tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/custom.properties
diff --git a/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/jre.properties b/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/jre.properties
similarity index 100%
rename from trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/jre.properties
rename to tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/jre.properties
diff --git a/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/camel-config.xml b/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/camel-config.xml
index 48dfef7..b2594b4 100644
--- a/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/camel-config.xml
+++ b/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/camel-config.xml
@@ -27,9 +27,7 @@
 
     <!-- needed cxf imports -->
     <import resource="classpath:META-INF/cxf/cxf.xml"/>
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml"/>
-    <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml"/>
-
+    
     <!-- use a bean to start and stop the real web service (is not Camel specific) -->
     <!-- in a real use-case the real web service would be located on another server
          but we simulate this in the same JVM -->
@@ -45,8 +43,7 @@
     <!-- this is the CXF webservice we use as front end -->
     <cxf:cxfEndpoint id="reportIncident"
                      address="http://localhost:9080/camel-itest-osgi/webservices/incident"
-                     serviceClass="org.apache.camel.example.reportincident.ReportIncidentEndpoint"
-                     wsdlURL="report_incident.wsdl"/>
+                     serviceClass="org.apache.camel.example.reportincident.ReportIncidentEndpoint"/>
 
     <!-- this is the camel route which proxy the web service and forward it to the real web service -->
     <camelContext xmlns="http://camel.apache.org/schema/spring">
diff --git a/trunk/tests/camel-typeconverterscan-test/pom.xml b/tests/camel-typeconverterscan-test/pom.xml
similarity index 100%
rename from trunk/tests/camel-typeconverterscan-test/pom.xml
rename to tests/camel-typeconverterscan-test/pom.xml
diff --git a/trunk/tests/camel-typeconverterscan-test/src/main/resources/META-INF/LICENSE.txt b/tests/camel-typeconverterscan-test/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from trunk/tests/camel-typeconverterscan-test/src/main/resources/META-INF/LICENSE.txt
rename to tests/camel-typeconverterscan-test/src/main/resources/META-INF/LICENSE.txt
diff --git a/trunk/tests/camel-typeconverterscan-test/src/main/resources/META-INF/NOTICE.txt b/tests/camel-typeconverterscan-test/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from trunk/tests/camel-typeconverterscan-test/src/main/resources/META-INF/NOTICE.txt
rename to tests/camel-typeconverterscan-test/src/main/resources/META-INF/NOTICE.txt
diff --git a/trunk/tests/camel-typeconverterscan-test/src/test/java/org/apache/camel/tests/typeconverterscan/MyBean.java b/tests/camel-typeconverterscan-test/src/test/java/org/apache/camel/tests/typeconverterscan/MyBean.java
similarity index 100%
rename from trunk/tests/camel-typeconverterscan-test/src/test/java/org/apache/camel/tests/typeconverterscan/MyBean.java
rename to tests/camel-typeconverterscan-test/src/test/java/org/apache/camel/tests/typeconverterscan/MyBean.java
diff --git a/trunk/tests/camel-typeconverterscan-test/src/test/java/org/apache/camel/tests/typeconverterscan/MyConverter.java b/tests/camel-typeconverterscan-test/src/test/java/org/apache/camel/tests/typeconverterscan/MyConverter.java
similarity index 100%
rename from trunk/tests/camel-typeconverterscan-test/src/test/java/org/apache/camel/tests/typeconverterscan/MyConverter.java
rename to tests/camel-typeconverterscan-test/src/test/java/org/apache/camel/tests/typeconverterscan/MyConverter.java
diff --git a/trunk/tests/camel-typeconverterscan-test/src/test/java/org/apache/camel/tests/typeconverterscan/RouteTest.java b/tests/camel-typeconverterscan-test/src/test/java/org/apache/camel/tests/typeconverterscan/RouteTest.java
similarity index 100%
rename from trunk/tests/camel-typeconverterscan-test/src/test/java/org/apache/camel/tests/typeconverterscan/RouteTest.java
rename to tests/camel-typeconverterscan-test/src/test/java/org/apache/camel/tests/typeconverterscan/RouteTest.java
diff --git a/trunk/tests/camel-typeconverterscan-test/src/test/resources/META-INF/services/org/apache/camel/TypeConverter b/tests/camel-typeconverterscan-test/src/test/resources/META-INF/services/org/apache/camel/TypeConverter
similarity index 100%
rename from trunk/tests/camel-typeconverterscan-test/src/test/resources/META-INF/services/org/apache/camel/TypeConverter
rename to tests/camel-typeconverterscan-test/src/test/resources/META-INF/services/org/apache/camel/TypeConverter
diff --git a/trunk/tests/camel-typeconverterscan-test/src/test/resources/log4j.properties b/tests/camel-typeconverterscan-test/src/test/resources/log4j.properties
similarity index 100%
rename from trunk/tests/camel-typeconverterscan-test/src/test/resources/log4j.properties
rename to tests/camel-typeconverterscan-test/src/test/resources/log4j.properties
diff --git a/tests/pom.xml b/tests/pom.xml
index 423ec94..33a76dc 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -36,6 +36,7 @@
     <module>camel-itest-standalone</module>
     <module>camel-itest</module>
     <module>camel-partial-classpath-test</module>
+    <module>camel-typeconverterscan-test</module>
     <module>camel-itest-osgi</module>
   </modules>
 
diff --git a/tooling/archetypes/camel-archetype-activemq/pom.xml b/tooling/archetypes/camel-archetype-activemq/pom.xml
index f3103fe..e67d6c5 100644
--- a/tooling/archetypes/camel-archetype-activemq/pom.xml
+++ b/tooling/archetypes/camel-archetype-activemq/pom.xml
@@ -38,6 +38,7 @@
       <extension>
         <groupId>org.apache.maven.archetype</groupId>
         <artifactId>archetype-packaging</artifactId>
+        <version>2.0</version>
       </extension>
     </extensions>
 
diff --git a/tooling/archetypes/camel-archetype-blueprint/pom.xml b/tooling/archetypes/camel-archetype-blueprint/pom.xml
index 3945f5c..3e469fc 100644
--- a/tooling/archetypes/camel-archetype-blueprint/pom.xml
+++ b/tooling/archetypes/camel-archetype-blueprint/pom.xml
@@ -38,6 +38,7 @@
       <extension>
         <groupId>org.apache.maven.archetype</groupId>
         <artifactId>archetype-packaging</artifactId>
+        <version>2.0</version>
       </extension>
     </extensions>
 
diff --git a/tooling/archetypes/camel-archetype-component/pom.xml b/tooling/archetypes/camel-archetype-component/pom.xml
index 4176dff..959595c 100644
--- a/tooling/archetypes/camel-archetype-component/pom.xml
+++ b/tooling/archetypes/camel-archetype-component/pom.xml
@@ -38,6 +38,7 @@
       <extension>
         <groupId>org.apache.maven.archetype</groupId>
         <artifactId>archetype-packaging</artifactId>
+        <version>2.0</version>
       </extension>
     </extensions>
 
diff --git a/tooling/archetypes/camel-archetype-java/pom.xml b/tooling/archetypes/camel-archetype-java/pom.xml
index 57a8e1b..d01e78a 100644
--- a/tooling/archetypes/camel-archetype-java/pom.xml
+++ b/tooling/archetypes/camel-archetype-java/pom.xml
@@ -38,6 +38,7 @@
       <extension>
         <groupId>org.apache.maven.archetype</groupId>
         <artifactId>archetype-packaging</artifactId>
+        <version>2.0</version>
       </extension>
     </extensions>
 
diff --git a/tooling/archetypes/camel-archetype-scala/pom.xml b/tooling/archetypes/camel-archetype-scala/pom.xml
index 93b95d4..f169025 100644
--- a/tooling/archetypes/camel-archetype-scala/pom.xml
+++ b/tooling/archetypes/camel-archetype-scala/pom.xml
@@ -38,6 +38,7 @@
       <extension>
         <groupId>org.apache.maven.archetype</groupId>
         <artifactId>archetype-packaging</artifactId>
+        <version>2.0</version>
       </extension>
     </extensions>
 
diff --git a/tooling/archetypes/camel-archetype-spring-dm/pom.xml b/tooling/archetypes/camel-archetype-spring-dm/pom.xml
index 22125a4..ea73464 100644
--- a/tooling/archetypes/camel-archetype-spring-dm/pom.xml
+++ b/tooling/archetypes/camel-archetype-spring-dm/pom.xml
@@ -38,6 +38,7 @@
       <extension>
         <groupId>org.apache.maven.archetype</groupId>
         <artifactId>archetype-packaging</artifactId>
+        <version>2.0</version>
       </extension>
     </extensions>
 
diff --git a/tooling/archetypes/camel-archetype-spring/pom.xml b/tooling/archetypes/camel-archetype-spring/pom.xml
index 570ae5d..98a7309 100644
--- a/tooling/archetypes/camel-archetype-spring/pom.xml
+++ b/tooling/archetypes/camel-archetype-spring/pom.xml
@@ -38,6 +38,7 @@
       <extension>
         <groupId>org.apache.maven.archetype</groupId>
         <artifactId>archetype-packaging</artifactId>
+        <version>2.0</version>
       </extension>
     </extensions>
 
diff --git a/tooling/archetypes/camel-archetype-web/pom.xml b/tooling/archetypes/camel-archetype-web/pom.xml
index 878160f..d7df126 100644
--- a/tooling/archetypes/camel-archetype-web/pom.xml
+++ b/tooling/archetypes/camel-archetype-web/pom.xml
@@ -38,6 +38,7 @@
       <extension>
         <groupId>org.apache.maven.archetype</groupId>
         <artifactId>archetype-packaging</artifactId>
+        <version>2.0</version>
       </extension>
     </extensions>
 
diff --git a/tooling/archetypes/camel-archetype-webconsole/pom.xml b/tooling/archetypes/camel-archetype-webconsole/pom.xml
index 3565c04..1714867 100644
--- a/tooling/archetypes/camel-archetype-webconsole/pom.xml
+++ b/tooling/archetypes/camel-archetype-webconsole/pom.xml
@@ -38,6 +38,7 @@
       <extension>
         <groupId>org.apache.maven.archetype</groupId>
         <artifactId>archetype-packaging</artifactId>
+        <version>2.0</version>
       </extension>
     </extensions>
 
diff --git a/trunk/.gitignore b/trunk/.gitignore
deleted file mode 100644
index c1cb7ea..0000000
--- a/trunk/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-target
-*.i??
-.DS_Store
-.classpath
-.project
-.settings
-.checkstyle
-*.log
diff --git a/trunk/KEYS b/trunk/KEYS
deleted file mode 100644
index 7b2c16c..0000000
--- a/trunk/KEYS
+++ /dev/null
@@ -1,644 +0,0 @@
-pub   1024D/F5BA7E4F 2006-02-10
-uid                  Hiram Chirino <hiram@hiramchirino.com>
-sig 3        F5BA7E4F 2006-02-10  Hiram Chirino <hiram@hiramchirino.com>
-sub   1024g/6733C080 2006-02-10
-sig          F5BA7E4F 2006-02-10  Hiram Chirino <hiram@hiramchirino.com>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.1 (Darwin)
-
-mQGiBEPspSsRBADdguKAxMQbA32vTQrCyONR6Zs/YGdvau2Zrr3SSSSR0Ge4FMjZ
-4tzwpf6+32m4Bsf7YIwdLl0H5hI1CgT5gDl9kXvfaFUehFnwR+FDyiBRiyHjUpGF
-4dgkQfWy9diYeWGtsvszsvWHXtED4SXb322StX4MfJj+YesA1iEdTiXK6wCg1QDa
-RucfjC+kx4zPsJwkJOgYpyMEAMTiXtNwQcke6nIFb/lb5374NjwwVAuuMTrRWLyq
-5HodugEIHaw3EitQWtnFfXNkXTJZzS6t2HAGv29UTfhiBzKdkydgCkOk2MLWISOV
-fqcg0tNIp5ZJCmUHg3s+OFNSH4oUi65u+FyDseUid3OKtPI+ZhIk8N+DjOIg2Kvo
-/UALA/9q+WfBd7re+W3iUtU7TutUcwbKsjP+jpaJeUHg2ChOBxVfQKt4YlPHVdrR
-iCrfNi90Z8qbsZ0iAXuqexrfMq20pAPmpHRpe54mmP1CMT5m+Gq71eKIfkUrb3LC
-/zv08dLG2vm9oghd242wbcifaX+t7AhNAIpe/WTvQsB0gpdO4LQmSGlyYW0gQ2hp
-cmlubyA8aGlyYW1AaGlyYW1jaGlyaW5vLmNvbT6IWwQTEQIAGwUCQ+ylKwYLCQgH
-AwIDFQIDAxYCAQIeAQIXgAAKCRCf8lmA9bp+T/G/AKDM1QDs7il/CJhTycgDvE3c
-EOgUBwCfelsVK4sgBCooZptoaCCDgVtt71G5AQ0EQ+ylLhAEAJD25AWgwcNgBFKY
-svExQaGIojIGJyn4Cf/5U30cui/K7fIU7JtyNhKcfZdCrh2hKx+x3H/dTF6e0SrR
-hzKV7Dx0j76yhHHB1Ak25kjRxoU4Jk+CG0m+bRNTF9xz9k1ALSm3Y+A5RqNU10K6
-e/5KsPuXMGSGoQgJ1H6g/i80Wf8PAAMFA/9mIxu7lMaqE1OE7EeAsHgLslNbi0h9
-pjDUVNv8bc1Os2gBPaJD8B89EeheTHw6NMNIe75HVOpKk4UA0gvOBrxJqCr18yFJ
-BM5sIlaEmuJwZOW4dDGOR1oS5qgE9NzpmyKhE+fu/S1wmy0coL667+1xZcnrPbUF
-D4i7/aD1r8qJhohGBBgRAgAGBQJD7KUuAAoJEJ/yWYD1un5Pth0An0QEUs5cxpl8
-zL5kZCj7c8MN8YZDAKDR9LTb6woveul50+uGtUl2fIH1uA==
-=RBPl
------END PGP PUBLIC KEY BLOCK-----
-pub   1024D/E31AF533 2007-12-17 [expires: 2009-06-09]
-uid                  Hadrian Zbarcea (Apache) <hadrian@apache.org>
-sig 3        E31AF533 2007-12-17  Hadrian Zbarcea (Apache) <hadrian@apache.org>
-sig          B4493B94 2007-12-17  Guillaume Nodet <gnodet@apache.org>
-sig          BB550746 2007-12-17  J. Daniel Kulp <dan@kulp.com>
-sub   2048g/6180521C 2007-12-17 [expires: 2009-06-09]
-sig          E31AF533 2007-12-17  Hadrian Zbarcea (Apache) <hadrian@apache.org>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-mQGiBEdmrcgRBADzy0H/OIT7ASGfTj4JDdnBiJCQfSZpeY2n3r5yW0tzMtb1jik/
-TyAwGyWvXMUCrRHlw33dVKNLztFQcNDfprmZxxORyTphhf6MMDhp3nAk56KT0vSF
-i/D8Kh4ERb86/bjveJDZJf0oPIaiwTz6Rdr5YxJCkR58cW/xpxBayb858wCgoex4
-1/1wipbpe7mGp9H2g8r/8WcEAOkm7S8gcg3NLZ62+RCwUZOJuIKCnq/UlwPEfIEL
-WwnOFVn3rL+y8U1560U3LYIAykBko+aCa7ZvqwvrW4OPUXJi+6MR1dKBAPiOQYkW
-NCtcGLa/Wdrxo5wjrP/XBFpSabvmxv19LUW8SJr/vH3XWQRYm5SJlnBaDgAzSBp3
-Cb7CBACj8wi9tJ8k5U/VV74ORRBJltlqaWBtMm3q9zf5WN/Rb1fxnfpZjvvpDQjQ
-PY6W0RNufE8V27558aTfuniBAVBOvxn4xedS91L7PMB2D/32J09/ICYFT9ekYGTA
-5Yl2pcTLd8PZu8MjFUssa8k/oxG9XrM4Zd764eIOAT+FmrZX9bQtSGFkcmlhbiBa
-YmFyY2VhIChBcGFjaGUpIDxoYWRyaWFuQGFwYWNoZS5vcmc+iGYEExECACYFAkdm
-rcgCGwMFCQLH6gAGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAINWtR4xr1Mzuu
-AJ9mQdn6z2+gh5dDi6/fX7k1tISp7wCeON1lHB3RaQfJrabz63bLkKzROeOIRgQQ
-EQIABgUCR2a94wAKCRDs3+o8tEk7lJzcAJ9qAzsu1SoLekNJboMzJbsuQxrgNgCg
-vZcr6fHEXJajUejbOkd8caQQFQyIRgQQEQIABgUCR2a9SAAKCRCryO45u1UHRgf6
-AJ9BCGTjrCOQsrIfLYoIVxTVDT9pCACeMYK/6kaf80OHvBwlM3BwQbXBF065Ag0E
-R2at1xAIALiA44fG70XTj+XnlAbqq705B/yTCOTkOJh/Jayof9Rp78cok2eeCKOO
-HZ+YupiWcp6shdmyXAQGcfxyqcyskPIG42wwoDBONWj5kMvGbuJgooZRwDhbaPaY
-PRAHhPlCj+QTrzTsTJmy94bzYkkbfqNI3TOyvKUzmgYy9TLfLku7dLzncmSs+W/d
-bzjRpeoyLxQ+t7aeHPjxG93tIVvNrFHgAYGgvof5sWl0h0MitSVI7PHvVlHTHhNG
-dJ/quacr+xYLdF95eXDXGPvM0Jl/+UJk1GFdoDd1LXdzo0d4OzEMv2mWPZy+HVnB
-MFjTsrZp7+YIJj3WXU0WVgX0p+AYjE8AAwUH/ieONEnadpYN9bShfJKOiSNxlZ8L
-Y6L1nrWIhXtfibPIJsaW5AkFugVZfpMqvODV+ccildADJRQRvoRP7xUedztedeLw
-3ZsK5ApIoEVeEx9oSaS06QgQ8CFRptb3hRFAAmb9tzWalxpghXUR63fMO0bpaKDI
-VgFykuJyLjcW5RQsSHqfNk4LbfaSq3qCGL/3iVZlFtk4dbo70NLzFC7MnG27CWKK
-NPLjldTQXDU388GTzYqQTdy+SyPj9TzBFTlOATg+4a6KQsL9KMMMJQ56VX1c5Hyp
-WYkcDV9c/38/zVV80BfqYuX1DAJty3uRKn9+d86SYHDQ2YN4wDE/UtQpwsaITwQY
-EQIADwUCR2at1wIbDAUJAsfqAAAKCRAINWtR4xr1M27MAJ0VEQ9j2h5cgdhbrXnB
-bMLb26TK5ACgjeCxQDIepWB96CZMGDPb2CMdeFg=
-=2f9B
------END PGP PUBLIC KEY BLOCK-----
-
-pub  4096R/6A70C608 2009-06-10
-         Fingerprint=4AAC 7338 D125 F866 4167  6AF6 1522 6672 6A70 C608
-
-uid Hadrian Zbarcea <hadrian@apache.org>
-sig  sig3  6A70C608 2009-06-10 __________ __________ [selfsig]
-sig  sig   B4493B94 2009-06-10 __________ __________ Guillaume Nodet <gnodet@apache.org>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: SKS 1.1.0
-
-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
-HzSpeZz97HtFnC/bNqM=
-=H3nh
------END PGP PUBLIC KEY BLOCK-----
-
-pub   4096R/F43856A3 2009-08-22
-      Key fingerprint = 51B5 2DC5 DD45 2F92 BE34  2CC2 858F C4C4 F438 56A3
-uid                  J. Daniel Kulp <dan@kulp.com>
-uid                  J. Daniel Kulp <dkulp@apache.org>
-uid                  J. Daniel Kulp <dkulp@progress.com>
-uid                  J. Daniel Kulp <dan.kulp@sopera.com>
-uid                  J. Daniel Kulp <dkulp@talend.com>
-sub   4096R/6A36A392 2009-08-22
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-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
-=xhT3
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/trunk/LICENSE.txt b/trunk/LICENSE.txt
deleted file mode 100755
index 6b0b127..0000000
--- a/trunk/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
diff --git a/trunk/NOTICE.txt b/trunk/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/trunk/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-   =========================================================================
-   ==  NOTICE file corresponding to the section 4 d of                    ==
-   ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache Camel distribution.                    ==
-   =========================================================================
-
-   This product includes software developed by
-   The Apache Software Foundation (http://www.apache.org/).
-
-   Please read the different LICENSE files present in the licenses directory of
-   this distribution.
diff --git a/trunk/README.txt b/trunk/README.txt
deleted file mode 100755
index 5b4ff84..0000000
--- a/trunk/README.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-Welcome to Apache Camel
-=============================================================================== 
-
-Apache Camel is a powerful Spring based Integration Framework.
-
-Camel implements the Enterprise Integration Patterns allowing you to configure
-routing and mediation rules in either a Java based Domain Specific Language
-(or Fluent API) or via Spring based XML Configuration files. Either approaches
-mean you get smart completion of routing rules in your IDE whether in your
-Java or XML editor.
-
-Apache Camel uses URIs so that it can easily work directly with any kind of
-transport or messaging model such as HTTP, ActiveMQ, JMS, JBI, SCA, MINA
-or CXF Bus API together with and working with pluggable Data Format options.
-Apache Camel is a small library which has minimal dependencies for easy
-embedding in any Java application.
-
-Apache Camel can be used as a routing and mediation engine for the
-following projects:
-
-    * Apache ActiveMQ which is the most popular and powerful open
-      source message broker
-    * Apache CXF which is a smart web services suite (JAX-WS and JAX-RS)
-    * Apache MINA a networking framework
-    * Apache ServiceMix which is the most popular and powerful distributed
-      open source ESB, JBI and OSGi container
-
-
-Getting Started
-=============================================================================== 
-
-To help you get started, try the following links:
-
-Getting Started
-  http://camel.apache.org/getting-started.html
-
-Building
-  http://camel.apache.org/building.html
-
-We welcome contributions of all kinds, for details of how you can help
-  http://camel.apache.org/contributing.html
-
-Please refer to the website for details of finding the issue tracker, 
-email lists, wiki or IRC channel
-  http://camel.apache.org/
-
-If you hit any problems please talk to us on the Camel Forums
-  http://camel.apache.org/discussion-forums.html
-
-Please help us make Apache Camel better - we appreciate any feedback 
-you may have.
-
-Enjoy!
-
------------------
-The Camel riders!
-
-Licensing
-=============================================================================== 
-
-This software is licensed under the terms you may find in the file
-named "LICENSE.txt" in this directory.
-   
-This distribution includes cryptographic software.  The country in
-which you currently reside may have restrictions on the import,
-possession, use, and/or re-export to another country, of
-encryption software.  BEFORE using any encryption software, please
-check your country's laws, regulations and policies concerning the
-import, possession, or use, and re-export of encryption software, to
-see if this is permitted.  See <http://www.wassenaar.org/> for more
-information.
-
-The U.S. Government Department of Commerce, Bureau of Industry and
-Security (BIS), has classified this software as Export Commodity
-Control Number (ECCN) 5D002.C.1, which includes information security
-software using or performing cryptographic functions with asymmetric
-algorithms.  The form and manner of this Apache Software Foundation
-distribution makes it eligible for export under the License Exception
-ENC Technology Software Unrestricted (TSU) exception (see the BIS
-Export Administration Regulations, Section 740.13) for both object
-code and source code.
-
-The following provides more details on the included cryptographic
-software:
-   * camel-ftp can be configured for secure file transfers
-   * camel-mail can be configured for secure email communications
-   * camel-cxf can be configured for secure web service communications
-   * camel-crypto can be used for secure communications
-   * camel-jasypt can be used for secure communications
-   * camel-jetty can be configured to use https
-   * camel-http can be configured to use https
-   * camel-http4 can be configured to use https
-   * camel-gae can be configured for secure communications
-   * camel-xmlsecurity can be configured for secure communications
-
diff --git a/trunk/apache-camel/pom.xml b/trunk/apache-camel/pom.xml
deleted file mode 100644
index dfcc3c3..0000000
--- a/trunk/apache-camel/pom.xml
+++ /dev/null
@@ -1,627 +0,0 @@
-<?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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.camel</groupId>
-    <artifactId>camel-parent</artifactId>
-    <version>2.8.0</version>
-    <relativePath>../parent</relativePath>
-  </parent>
-
-  <artifactId>apache-camel</artifactId>
-  <name>Camel :: Assembly</name>
-  <description>Apache Camel Assembly</description>
-  <packaging>pom</packaging>
-
-  <properties>
-    <maven.test.skip>true</maven.test.skip>
-    <createSourcesJar>false</createSourcesJar>
-    <shade.version>1.0.1</shade.version>
-  </properties>
-
-  <dependencies>
-	<!-- camel components -->
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-core-osgi</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-core-xml</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-ahc</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-amqp</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-apns</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-atom</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-aws</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-bam</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-bean-validator</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-bindy</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-blueprint</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-cache</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-castor</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-cometd</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-context</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-crypto</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-csv</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-cxf</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-dns</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-dozer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-eclipse</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-ejb</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-eventadmin</artifactId>    
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-exec</artifactId>    
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-flatpack</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-ftp</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-freemarker</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-gae</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-groovy</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-guice</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-hawtdb</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-hazelcast</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-hdfs</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-http</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-http4</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-hl7</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-ibatis</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-irc</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jackson</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jasypt</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-javaspace</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jaxb</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jcr</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jdbc</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jetty</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jibx</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jing</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jms</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jmx</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-josql</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jpa</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-juel</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jt400</artifactId>
-      <!-- avoid the WARINING message -->
-      <exclusions>
-         <exclusion>
-            <groupId>net.sf.jt400</groupId>
-	    <artifactId>jt400-full</artifactId> 
-         </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jxpath</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-kestrel</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-lucene</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-ldap</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-mail</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-mina</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-msv</artifactId>
-      <!--Avoid the WARNING message -->
-      <exclusions>
-         <exclusion>
-           <groupId>org.iso_relax.verifier.jaxp.validation</groupId>
-           <artifactId>isorelax-jaxp-bridge</artifactId> 
-         </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-mvel</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-mybatis</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-netty</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-nagios</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-ognl</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-paxlogging</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-printer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-protobuf</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-quartz</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-quickfix</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-restlet</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-rmi</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-routebox</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-rss</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-ruby</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-saxon</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-scala</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-script</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-servlet</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-shiro</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-sip</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-smpp</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-snmp</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-soap</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-spring</artifactId>
-    </dependency>	
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-spring-integration</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-spring-javaconfig</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-spring-security</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-spring-ws</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-syslog</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-sql</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-stream</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-stringtemplate</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-tagsoup</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-test</artifactId>
-    </dependency>    
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-testng</artifactId>
-    </dependency>    
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-velocity</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-xmlbeans</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-xmlsecurity</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-xmpp</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-xstream</artifactId>
-    </dependency>
-
-    <!-- camel karaf -->
-    <dependency>
-      <groupId>org.apache.camel.karaf</groupId>
-      <artifactId>camel-karaf-commands</artifactId>
-    </dependency>
-
-    <!-- camel examples -->
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-example-aggregate</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-example-bam</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-example-cxf</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-example-docs</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-example-etl</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-example-loan-broker</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-example-management</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-example-jms-file</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-example-osgi</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-example-osgi-rmi</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-example-spring</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-example-spring-xquery</artifactId>
-    </dependency>
-
-
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jms_1.1_spec</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.fusesource.commonman</groupId>
-      <artifactId>commons-management</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <optional>true</optional>      
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-core</artifactId>
-      <optional>true</optional>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-	  <artifactId>geronimo-jta_1.1_spec</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
-      <optional>true</optional>
-    </dependency>
-  </dependencies>
-
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>bin</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-                <configuration>
-                  <descriptors>
-                    <descriptor>src/main/descriptors/unix-bin.xml</descriptor>
-                    <descriptor>src/main/descriptors/windows-bin.xml</descriptor>
-                  </descriptors>
-                  <finalName>${project.artifactId}-${project.version}</finalName>
-                  <appendAssemblyId>false</appendAssemblyId>
-	          <tarLongFileMode>gnu</tarLongFileMode>
-                </configuration>
-              </execution>
-              <execution>
-                <id>src</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-                <configuration>
-                  <descriptors>
-                    <descriptor>src/main/descriptors/src.xml</descriptor>
-	              </descriptors>
-                  <tarLongFileMode>gnu</tarLongFileMode> 
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-
-  <reporting>
-    <plugins>
-      <!-- let's generate nice PNG / SVG diagrams from our routes -->
-      <plugin>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-maven-plugin</artifactId>
-        <version>${project.version}</version>
-        <reportSets>
-          <reportSet>
-            <configuration />
-            <reports>
-              <report>converters-report</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-    </plugins>
-  </reporting>
-
-</project>
diff --git a/trunk/apache-camel/src/main/descriptors/common-bin.xml b/trunk/apache-camel/src/main/descriptors/common-bin.xml
deleted file mode 100644
index 544c990..0000000
--- a/trunk/apache-camel/src/main/descriptors/common-bin.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?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.
--->
-<component>
-  <!--<id>common-bin</id>-->
-  <fileSets>
-
-    <!-- copy the website docs
-    <fileSet>
-      <directory>${basedir}/target/website</directory>
-      <outputDirectory>/doc/website</outputDirectory>
-    </fileSet>
-    -->
-  </fileSets>
-
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>/lib</outputDirectory>
-      <unpack>false</unpack>
-      <scope>runtime</scope>
-      <includes>
-        <include>org.apache.camel:camel-ahc</include>
-        <include>org.apache.camel:camel-amqp</include>
-        <include>org.apache.camel:camel-apns</include>
-        <include>org.apache.camel:camel-atom</include>
-        <include>org.apache.camel:camel-aws</include>
-        <include>org.apache.camel:camel-bam</include>
-        <include>org.apache.camel:camel-bean-validator</include>
-        <include>org.apache.camel:camel-bindy</include>
-        <include>org.apache.camel:camel-blueprint</include>
-        <include>org.apache.camel:camel-cache</include>
-        <include>org.apache.camel:camel-castor</include>
-        <include>org.apache.camel:camel-core</include>
-        <include>org.apache.camel:camel-core-osgi</include>
-        <include>org.apache.camel:camel-cometd</include>
-        <include>org.apache.camel:camel-context</include>
-        <include>org.apache.camel:camel-crypto</include>
-        <include>org.apache.camel:camel-csv</include>
-        <include>org.apache.camel:camel-cxf</include>
-        <include>org.apache.camel:camel-cxf-transport</include>
-        <include>org.apache.camel:camel-dns</include>
-        <include>org.apache.camel:camel-dozer</include>
-        <include>org.apache.camel:camel-eclipse</include>
-        <include>org.apache.camel:camel-ejb</include>
-        <include>org.apache.camel:camel-eventadmin</include>
-        <include>org.apache.camel:camel-exec</include>
-        <include>org.apache.camel:camel-flatpack</include>
-        <include>org.apache.camel:camel-freemarker</include>
-        <include>org.apache.camel:camel-ftp</include>
-        <include>org.apache.camel:camel-gae</include>
-        <include>org.apache.camel:camel-groovy</include>
-        <include>org.apache.camel:camel-guice</include>
-        <include>org.apache.camel:camel-hl7</include>
-        <include>org.apache.camel:camel-hawtdb</include>
-        <include>org.apache.camel:camel-hazelcast</include>
-        <include>org.apache.camel:camel-hdfs</include>
-        <include>org.apache.camel:camel-http</include>
-        <include>org.apache.camel:camel-http4</include>
-        <include>org.apache.camel:camel-ibatis</include>
-        <include>org.apache.camel:camel-irc</include>
-        <include>org.apache.camel:camel-jackson</include>
-        <include>org.apache.camel:camel-jasypt</include>
-        <include>org.apache.camel:camel-javaspace</include>
-        <include>org.apache.camel:camel-jaxb</include>
-        <include>org.apache.camel:camel-jcr</include>
-        <include>org.apache.camel:camel-jdbc</include>
-        <include>org.apache.camel:camel-jetty</include>
-        <include>org.apache.camel:camel-jibx</include>
-        <include>org.apache.camel:camel-jing</include>
-        <include>org.apache.camel:camel-jms</include>
-        <include>org.apache.camel:camel-jmx</include>
-        <include>org.apache.camel:camel-josql</include>
-        <include>org.apache.camel:camel-jpa</include>
-        <include>org.apache.camel:camel-jt400</include>
-        <include>org.apache.camel:camel-juel</include>
-        <include>org.apache.camel:camel-jxpath</include>
-        <include>org.apache.camel:camel-kestrel</include>
-        <include>org.apache.camel:camel-ldap</include>
-        <include>org.apache.camel:camel-lucene</include>
-        <include>org.apache.camel:camel-mail</include>
-        <include>org.apache.camel:camel-mina</include>
-        <include>org.apache.camel:camel-msv</include>
-        <include>org.apache.camel:camel-mvel</include>
-        <include>org.apache.camel:camel-mybatis</include>
-        <include>org.apache.camel:camel-nagios</include>
-        <include>org.apache.camel:camel-netty</include>
-        <include>org.apache.camel:camel-ognl</include>
-        <include>org.apache.camel:camel-paxlogging</include>
-        <include>org.apache.camel:camel-printer</include>
-        <include>org.apache.camel:camel-protobuf</include>
-        <include>org.apache.camel:camel-quartz</include>
-        <include>org.apache.camel:camel-quickfix</include>
-        <include>org.apache.camel:camel-restlet</include>
-        <include>org.apache.camel:camel-rmi</include>
-        <include>org.apache.camel:camel-routebox</include>
-        <include>org.apache.camel:camel-rss</include>
-        <include>org.apache.camel:camel-ruby</include>
-        <include>org.apache.camel:camel-saxon</include>
-        <include>org.apache.camel:camel-scala</include>
-        <include>org.apache.camel:camel-script</include>
-        <include>org.apache.camel:camel-servlet</include>
-        <include>org.apache.camel:camel-shiro</include>
-        <include>org.apache.camel:camel-sip</include>
-        <include>org.apache.camel:camel-smpp</include>
-        <include>org.apache.camel:camel-snmp</include>
-        <include>org.apache.camel:camel-soap</include>
-        <include>org.apache.camel:camel-spring</include>
-        <include>org.apache.camel:camel-spring-integration</include>
-        <include>org.apache.camel:camel-spring-javaconfig</include>
-        <include>org.apache.camel:camel-spring-security</include>
-        <include>org.apache.camel:camel-spring-ws</include>
-        <include>org.apache.camel:camel-sql</include>
-        <include>org.apache.camel:camel-stream</include>
-        <include>org.apache.camel:camel-stringtemplate</include>
-        <include>org.apache.camel:camel-syslog</include>
-        <include>org.apache.camel:camel-test</include>
-        <include>org.apache.camel:camel-testng</include>
-        <include>org.apache.camel:camel-tagsoup</include>
-        <include>org.apache.camel:camel-velocity</include>
-        <include>org.apache.camel:camel-xmlbeans</include>
-        <include>org.apache.camel:camel-xmlsecurity</include>
-        <include>org.apache.camel:camel-xmpp</include>
-        <include>org.apache.camel:camel-xstream</include>
-        <include>org.apache.camel.karaf:camel-karaf-commands</include>
-        <!-- these two jars are mandatory -->
-        <include>org.slf4j:slf4j-api</include>
-        <include>org.fusesource.commonman:commons-management</include>
-      </includes>
-    </dependencySet>
-    <dependencySet>
-      <outputDirectory>/lib/spring</outputDirectory>
-      <unpack>false</unpack>
-      <scope>runtime</scope>
-      <includes>
-        <!-- spring is used by several camel components -->
-        <include>commons-logging:commons-logging</include>
-        <include>aopalliance:aopalliance</include>
-        <include>org.springframework:spring-aop</include>
-        <include>org.springframework:spring-asm</include>
-        <include>org.springframework:spring-beans</include>
-        <include>org.springframework:spring-context</include>
-        <include>org.springframework:spring-context-support</include>
-        <include>org.springframework:spring-core</include>
-        <include>org.springframework:spring-expression</include>
-        <include>org.springframework:spring-jdbc</include>
-        <include>org.springframework:spring-jms</include>
-        <include>org.springframework:spring-orm</include>
-        <include>org.springframework:spring-test</include>
-        <include>org.springframework:spring-tx</include>
-        <include>org.springframework:spring-web</include>
-      </includes>
-    </dependencySet>
-    <dependencySet>
-      <outputDirectory>/lib/optional</outputDirectory>
-      <unpack>false</unpack>
-      <scope>runtime</scope>
-      <includes>
-        <include>log4j:log4j</include>
-        <include>org.slf4j:slf4j-log4j12</include>
-        <include>commons-beanutils:commons-beanutils</include>
-        <include>commons-collections:commons-collections</include>
-        <include>commons-dbcp:commons-dbcp</include>
-        <include>commons-pool:commons-pool</include>
-        <include>commons-lang:commons-lang</include>
-        <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
-        <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
-        <include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
-        <include>org.jasypt:jasypt</include>
-      </includes>
-    </dependencySet>
-  </dependencySets>
-
-</component>
diff --git a/trunk/apache-camel/src/main/descriptors/src.xml b/trunk/apache-camel/src/main/descriptors/src.xml
deleted file mode 100644
index beb9610..0000000
--- a/trunk/apache-camel/src/main/descriptors/src.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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.
--->
-<assembly>
-  <id>src</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <fileSets>
-    <!-- Binary Files -->
-    <fileSet>
-      <directory>..</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-      <excludes>
-        <exclude>**/eclipse-classes/**</exclude>
-        <exclude>**/target/**</exclude>
-
-        <exclude>**/build/**</exclude>
-        <!-- exclude>data/**</exclude>
-        <exclude>*/data/**</exclude -->
-        <exclude>activemq-data/**</exclude>
-        <exclude>*/activemq-data/**</exclude>
-        <exclude>**/eclipse-classes/**</exclude>
-        <exclude>**/.*</exclude>
-        <exclude>**/.*/**</exclude>
-
-        <exclude>**/surefire*</exclude>
-        <exclude>**/svn-commit*</exclude>
-
-        <exclude>**/*.iml</exclude>
-        <exclude>**/*.ipr</exclude>
-        <exclude>**/*.iws</exclude>
-
-        <exclude>**/cobertura.ser</exclude>
-      </excludes>
-    </fileSet>
-
-  </fileSets>
-</assembly>
diff --git a/trunk/apache-camel/src/main/descriptors/unix-bin.xml b/trunk/apache-camel/src/main/descriptors/unix-bin.xml
deleted file mode 100644
index bae8ff7..0000000
--- a/trunk/apache-camel/src/main/descriptors/unix-bin.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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.
--->
-<assembly>
-  <id>unix-bin</id>
-  <formats>
-    <format>tar.gz</format>
-  </formats>
-  
-  <fileSets>
-    <!-- Copy over everything that needs to get unix line endings -->
-    <fileSet>
-      <directory>src/main/release</directory>
-      <outputDirectory>/</outputDirectory>
-      <excludes>
-        <!--<exclude>bin/**</exclude>-->
-      </excludes>
-      <lineEnding>unix</lineEnding>
-    </fileSet>
-
-    <!-- copy the examples -->
-    <fileSet>
-      <directory>../examples</directory>
-      <outputDirectory>/examples</outputDirectory>
-      <excludes>
-        <!-- disable build, IDEA and Eclipse files -->
-        <exclude>**/*.i*</exclude>
-        <exclude>**/eclipse-classes/**</exclude>
-        <exclude>**/.project</exclude>
-        <exclude>**/.classpath</exclude>
-        <exclude>**/target/</exclude>
-        <exclude>**/target/*</exclude>
-        <exclude>**/*.ser</exclude>
-        <exclude>**/*.log</exclude>
-      </excludes>
-      <lineEnding>unix</lineEnding>
-    </fileSet>
-
-    <!-- copy the manual docs -->
-    <fileSet>
-      <directory>${basedir}/../tooling/camel-manual/target/site/manual/</directory>
-      <outputDirectory>/doc/manual</outputDirectory>
-      <includes>
-        <include>*.pdf</include>
-        <include>*.html</include>
-      </includes>
-    </fileSet>
-
-   <!-- copy the java docs -->
-   <fileSet>
-    <directory>${basedir}/target/javadoc/</directory>
-      <outputDirectory>/doc/javadoc</outputDirectory>
-      <includes>
-        <include>**/**</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-
-  <componentDescriptors>
-    <componentDescriptor>src/main/descriptors/common-bin.xml</componentDescriptor>
-  </componentDescriptors>
-
-</assembly>
diff --git a/trunk/apache-camel/src/main/descriptors/windows-bin.xml b/trunk/apache-camel/src/main/descriptors/windows-bin.xml
deleted file mode 100644
index ab4fce2..0000000
--- a/trunk/apache-camel/src/main/descriptors/windows-bin.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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.
--->
-<assembly>
-  <id>windows-bin</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  
-  <fileSets>
-    <!-- Copy over everything that needs to get dos line endings -->
-    <fileSet>
-      <directory>src/main/release</directory>
-      <outputDirectory>/</outputDirectory>
-      <excludes>
-        <!--<exclude>bin/**</exclude>-->
-      </excludes>
-      <lineEnding>dos</lineEnding>
-    </fileSet>
-
-    <!-- copy the examples -->
-    <fileSet>
-      <directory>../examples</directory>
-      <outputDirectory>/examples</outputDirectory>
-      <excludes>
-        <!-- disable build, IDEA and Eclipse files -->
-        <exclude>**/*.i*</exclude>
-        <exclude>**/eclipse-classes/**</exclude>
-        <exclude>**/.project</exclude>
-        <exclude>**/.classpath</exclude>
-        <exclude>**/target/</exclude>
-        <exclude>**/target/*</exclude>
-        <exclude>**/*.ser</exclude>
-        <exclude>**/*.log</exclude>
-      </excludes>
-      <lineEnding>dos</lineEnding>
-    </fileSet>
-
-    <!-- copy the manual docs -->
-    <fileSet>
-      <directory>${basedir}/../tooling/camel-manual/target/site/manual/</directory>
-      <outputDirectory>/doc/manual</outputDirectory>
-      <includes>
-        <include>*.pdf</include>
-        <include>*.html</include>
-      </includes>
-    </fileSet>
-
-   <!-- copy the java docs -->
-   <fileSet>
-    <directory>${basedir}/target/javadoc/</directory>
-      <outputDirectory>/doc/javadoc</outputDirectory>
-      <includes>
-        <include>**/**</include>
-      </includes>
-   </fileSet>
-  </fileSets>
-
-  <componentDescriptors>
-    <componentDescriptor>src/main/descriptors/common-bin.xml</componentDescriptor>
-  </componentDescriptors>  
-    
-</assembly>
diff --git a/trunk/apache-camel/src/main/release/LICENSE.txt b/trunk/apache-camel/src/main/release/LICENSE.txt
deleted file mode 100755
index d645695..0000000
--- a/trunk/apache-camel/src/main/release/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
diff --git a/trunk/apache-camel/src/main/release/NOTICE.txt b/trunk/apache-camel/src/main/release/NOTICE.txt
deleted file mode 100644
index eb089d3..0000000
--- a/trunk/apache-camel/src/main/release/NOTICE.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-=========================================================================
-==  NOTICE file corresponding to the section 4 d of                    ==
-==  the Apache License, Version 2.0,                                   ==
-==  in this case for the Apache Camel distribution.                    ==
-=========================================================================
-
-Apache Camel
-Copyright 2007-2011 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-=========================================================================
-==  Spring Notice                                                      ==
-=========================================================================
-
-This product includes software developed by
-the Apache Software Foundation (http://www.apache.org).
-
-This product also includes software developed by
-Clinton Begin (http://www.ibatis.com).
-
-The end-user documentation included with a redistribution, if any,
-must include the following acknowledgement:
-
- "This product includes software developed by the Spring Framework
-  Project (http://www.springframework.org)."
-
-Alternately, this acknowledgement may appear in the software itself,
-if and wherever such third-party acknowledgements normally appear.
-
-The names "Spring" and "Spring Framework" must not be used to
-endorse or promote products derived from this software without
-prior written permission. For written permission, please contact
-rod.johnson@interface21.com or juergen.hoeller@interface21.com.
-
diff --git a/trunk/apache-camel/src/main/release/README.txt b/trunk/apache-camel/src/main/release/README.txt
deleted file mode 100755
index 5167302..0000000
--- a/trunk/apache-camel/src/main/release/README.txt
+++ /dev/null
@@ -1,102 +0,0 @@
-Welcome to Apache Camel
-=============================================================================== 
-
-Apache Camel is a powerful open source integration framework based on
-known Enterprise Integration Patterns with powerful Bean Integration.
-
-Camel lets you create the Enterprise Integration Patterns to implement routing
-and mediation rules in either a Java based Domain Specific Language
-(or Fluent API), via Spring based Xml Configuration files or via the Scala DSL.
-This means you get smart completion of routing rules in your IDE whether in
-your Java, Scala or XML editor.
-
-Apache Camel uses URIs so that it can easily work directly with any kind of
-Transport or messaging model such as HTTP, ActiveMQ, JMS, JBI, SCA, MINA
-or CXF Bus API together with working with pluggable Data Format options.
-Apache Camel is a small library which has minimal dependencies for easy
-embedding in any Java application. Apache Camel lets you work with the same
-API regardless which kind of Transport used, so learn the API once and you
-will be able to interact with all the Components that is provided
-out-of-the-box.
-
-Apache Camel has powerful Bean Binding and integrated seamless with popular
-frameworks such as Spring and Guice.
-
-Apache Camel has extensive Testing support allowing you to easily
-unit test your routes.
-
-Apache Camel can be used as a routing and mediation engine for the
-following projects:
-
-    * Apache ServiceMix which is the most popular and powerful distributed
-      open source ESB, JBI and OSGi container
-    * Apache ActiveMQ which is the most popular and powerful open
-      source message broker
-    * Apache CXF which is a smart web services suite (JAX-WS and JAX-RS)
-    * Apache MINA a networking framework
-
-
-Getting Started
-=============================================================================== 
-
-To help you get started, try the following links:
-
-Getting Started
-  http://camel.apache.org/getting-started.html
-
-Building
-  http://camel.apache.org/building.html
-
-We welcome contributions of all kinds, for details of how you can help
-  http://camel.apache.org/contributing.html
-
-Please refer to the website for details of finding the issue tracker, 
-email lists, wiki or IRC channel
-  http://camel.apache.org/
-
-If you hit any problems please talk to us on the Camel Forums
-  http://camel.apache.org/discussion-forums.html
-
-Please help us make Apache Camel better - we appreciate any feedback 
-you may have.
-
-Enjoy!
-
------------------
-The Camel riders!
-
-Licensing
-=============================================================================== 
-
-This software is licensed under the terms you may find in the file
-named "LICENSE.txt" in this directory.
-   
-This distribution includes cryptographic software.  The country in
-which you currently reside may have restrictions on the import,
-possession, use, and/or re-export to another country, of
-encryption software.  BEFORE using any encryption software, please
-check your country's laws, regulations and policies concerning the
-import, possession, or use, and re-export of encryption software, to
-see if this is permitted.  See <http://www.wassenaar.org/> for more
-information.
-
-The U.S. Government Department of Commerce, Bureau of Industry and
-Security (BIS), has classified this software as Export Commodity
-Control Number (ECCN) 5D002.C.1, which includes information security
-software using or performing cryptographic functions with asymmetric
-algorithms.  The form and manner of this Apache Software Foundation
-distribution makes it eligible for export under the License Exception
-ENC Technology Software Unrestricted (TSU) exception (see the BIS
-Export Administration Regulations, Section 740.13) for both object
-code and source code.
-
-The following provides more details on the included cryptographic
-software:
-   * camel-ftp can be configured for secure file transfers
-   * camel-mail can be configured for secure email communications
-   * camel-cxf can be configured for secure web service communications
-   * camel-jetty can be configured to use https
-   * camel-http can be configured to use https
-   * camel-gae can be configured for secure communications
-   * camel-xmlsecurity can be configured for secure communications
-
diff --git a/trunk/apache-camel/src/main/resources/META-INF/LICENSE.txt b/trunk/apache-camel/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100755
index 6b0b127..0000000
--- a/trunk/apache-camel/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
diff --git a/trunk/apache-camel/src/main/resources/META-INF/NOTICE.txt b/trunk/apache-camel/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index e246a2d..0000000
--- a/trunk/apache-camel/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-=========================================================================
-==  NOTICE file corresponding to the section 4 d of                    ==
-==  the Apache License, Version 2.0,                                   ==
-==  in this case for the Apache Camel distribution.                    ==
-=========================================================================
-
-Apache Camel
-Copyright 2005-2006 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/trunk/buildingtools/META-INF/LICENSE b/trunk/buildingtools/META-INF/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/trunk/buildingtools/META-INF/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
diff --git a/trunk/buildingtools/META-INF/NOTICE b/trunk/buildingtools/META-INF/NOTICE
deleted file mode 100644
index 064a0fe..0000000
--- a/trunk/buildingtools/META-INF/NOTICE
+++ /dev/null
@@ -1,70 +0,0 @@
-// ------------------------------------------------------------------
-// NOTICE file corresponding to the section 4d of The Apache License,
-// Version 2.0, in this case for Apache CXF Buildtools
-// ------------------------------------------------------------------
-
-Apache CXF Buildtools
-Copyright 2006-2007 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-
-This product includes/uses software, Maven Profile Model (http://maven.apache.org/maven-profile),
-developed by Apache Software Foundation  (http://www.apache.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Unnamed - junit:junit:jar:3.8.1
-
-This product includes/uses software, Default Plexus Container,
-developed by Codehaus  (http://www.codehaus.org/)
-
-This product includes/uses software, Maven Project Builder (http://maven.apache.org/maven-project),
-developed by Apache Software Foundation  (http://www.apache.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Maven Local Settings Model (http://maven.apache.org/maven-settings),
-developed by Apache Software Foundation  (http://www.apache.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, classworlds (http://classworlds.codehaus.org/),
-developed by The Codehaus  (http://codehaus.org/)
-
-This product includes/uses software, Plexus Common Utilities,
-developed by Codehaus  (http://www.codehaus.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Maven Repository Metadata Model (http://maven.apache.org/maven-repository-metadata),
-developed by Apache Software Foundation  (http://www.apache.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Unnamed - jdom:jdom:jar:1.0
-
-This product includes/uses software, Maven Model (http://maven.apache.org/maven-model),
-developed by Apache Software Foundation  (http://www.apache.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, ASM All (http://asm.objectweb.org/asm-all),
-developed by ObjectWeb  (http://www.objectweb.org/)
-
-This product includes/uses software, Maven Artifact (http://maven.apache.org/maven-artifact),
-developed by Apache Software Foundation  (http://www.apache.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Maven Artifact Manager (http://maven.apache.org/maven-artifact-manager),
-developed by Apache Software Foundation  (http://www.apache.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Maven Plugin API (http://maven.apache.org/maven-plugin-api),
-developed by Apache Software Foundation  (http://www.apache.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, shade-maven-plugin (http://mojo.codehaus.org/shade-maven-plugin),
-developed by Codehaus  (http://codehaus.org)
-
-This product includes/uses software, Maven Wagon API (http://maven.apache.org/wagon/wagon-provider-api),
-developed by Apache Software Foundation  (http://www.apache.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-
-
diff --git a/trunk/buildingtools/camel-checkstyle-suppressions.xml b/trunk/buildingtools/camel-checkstyle-suppressions.xml
deleted file mode 100644
index 8875d4e..0000000
--- a/trunk/buildingtools/camel-checkstyle-suppressions.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE suppressions PUBLIC
-    "-//Puppy Crawl//DTD Suppressions 1.0//EN"
-    "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
-<!--
-  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.
--->
-<suppressions>
-    <suppress checks=".*"
-              files=".+[\\\/]generated[\\\/].+\.java"
-              />
-    <suppress checks=".*"
-              files=".+[\\\/]build[\\\/]src[\\\/].+\.java"
-              />
-    <suppress checks=".*"
-              files=".+[\\\/]target[\\\/].+\.java"
-              />              
-    <suppress checks=".*"
-              files=".+[\\\/]contrib[\\\/].+\.java"
-              />
-</suppressions>
\ No newline at end of file
diff --git a/trunk/buildingtools/camel-checkstyle.xml b/trunk/buildingtools/camel-checkstyle.xml
deleted file mode 100644
index ed63ec3..0000000
--- a/trunk/buildingtools/camel-checkstyle.xml
+++ /dev/null
@@ -1,343 +0,0 @@
-<?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.
--->
-<!DOCTYPE module PUBLIC
-    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<!--
-Checks to make sure the code meets the ActiveMQ coding guidelines which
-
-It also enforces a bunch of other "BestPractices like method
-lengths, if/try depths, etc...
--->
-
-<module name="Checker">
-    <!-- Checks whether files end with a new line.                        -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
-    <!--
-    <module name="NewlineAtEndOfFile"/>
-    -->
-
-    <!-- Checks that property files contain the same keys.         -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
-    <module name="Translation"/>
-
-    <!--<module name="StrictDuplicateCode"/>-->
-    
-    <!-- Header checks -->
-    <module name="Header">
-    	<property name="header"
-        	value="/**\n * Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements.  See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the &quot;License&quot;); you may not use this file except in compliance with\n * the License.  You may obtain a copy of the License at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an &quot;AS IS&quot; BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n"/>
-    </module>
-    
-    <module name="RegexpMultiline">
-        <property name="format" value="(\bgpl\b)|(\bgplv2\b)|(\bgnu\sgeneral\spublic\s*license\b)|(\bwww\.gnu\.org\/licenses\/gpl\.txt\b)"/>
-        <property name="ignoreCase"  value="true"/>
-    </module>
-    
-    <module name="FileLength">
-        <property name="max" value="3500"/>
-    </module>
-    
-    <module name="FileTabCharacter">
-        <property name="fileExtensions" value="java"/>
-    </module>
-    
-    <!-- 
-	<module name="RegexpSingleline">
-		<property name="format" value="\s+$"/>
-		<property name="minimum" value="0"/>
-		<property name="maximum" value="0"/>
-	</module>
-	 -->
-
-    <module name="TreeWalker">
-
-        <!-- Checks for Javadoc comments.                     -->
-        <!-- See http://checkstyle.sf.net/config_javadoc.html -->
-        <!--
-        <module name="PackageHtml"/>
-        <module name="JavadocMethod"/>
-        <module name="JavadocType"/>
-        <module name="JavadocVariable"/>
-        <module name="JavadocStyle"/>
-        -->
-
-
-        <!-- Checks for Naming Conventions.                  -->
-        <!-- See http://checkstyle.sf.net/config_naming.html -->
-        <module name="ConstantName"/>
-        <module name="LocalFinalVariableName"/>
-        <module name="LocalVariableName"/>
-        <module name="MemberName"/>
-        <module name="MethodName"/>
-        <module name="PackageName"/>
-        <module name="ParameterName"/>
-        <module name="StaticVariableName"/>
-        <module name="TypeName"/>
-
-        <!-- <module name="RegexpHeader"/> -->
-
-
-        <!-- Checks for imports                              -->
-        <!-- See http://checkstyle.sf.net/config_import.html -->
-        <module name="AvoidStarImport">
-            <property name="excludes" value="java.io,java.util,java.net,java.nio,java.nio.channels,java.lang.reflect,org.w3c.dom,org.xml.sax,java.awt,javax.swing,junit.framework"/>
-        </module>
-        <!-- 
-        <module name="ConstantName"/>
-         -->
-        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
-        <module name="RedundantImport"/>
-        <!-- When you javadoc {@link } an import is added that checkstyle thinks is unused import.
-        <module name="UnusedImports"/>
-        -->
-        <module name="ImportOrder">
-            <property name="groups" value="java,javax,org.w3c,org.xml,junit"/>
-            <property name="ordered" value="true"/>
-        </module>
-        <!--
-        <module name="ImportControl">
-            <property name="file" value="etc/import-control.xml"/>
-        </module>
-        -->
-
-        <!-- Checks for Size Violations.                    -->
-        <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="AnonInnerLength">
-            <property name="max" value="200"/>
-        </module>
-        <module name="ExecutableStatementCount">
-            <property name="max" value="100"/>
-        </module>
-        <module name="LineLength">
-            <property name="max" value="200"/>
-        </module>
-        <module name="MethodLength">
-            <property name="max" value="200"/>
-            <property name="countEmpty" value="false"/>
-        </module>
-        <!-- We should try to get this enabled soon..
-        <module name="ParameterNumber">
-            <property name="max" value="7"/>
-        </module>
-        -->
-
-        <!-- Checks for whitespace                               -->
-        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-        <module name="EmptyForIteratorPad"/>
-        <module name="EmptyForInitializerPad"/>
-        <module name="MethodParamPad"/>
-        <module name="NoWhitespaceAfter">
-            <property name="tokens" value="ARRAY_INIT,BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
-        </module>
-        <module name="NoWhitespaceBefore"/>
-        <module name="OperatorWrap"/>
-        <module name="ParenPad"/>
-        <module name="TypecastParenPad"/>
-        <module name="WhitespaceAfter">
-            <property name="tokens" value="COMMA, SEMI"/>
-        </module>
-        <module name="WhitespaceAround">
-            <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN,TYPE_EXTENSION_AND"/>
-            <!-- <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN,TYPE_EXTENSION_AND"/>-->
-        </module>
-
-		<!-- 
-		<module name="GenericWhitespace"/>
-		 -->
-
-        <!-- Modifier Checks                                    -->
-        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
-        <module name="ModifierOrder"/>
-        <module name="RedundantModifier"/>
-
-
-        <!-- Checks for blocks. You know, those {}'s         -->
-        <!-- See http://checkstyle.sf.net/config_blocks.html -->
-        <!--
-        <module name="AvoidNestedBlocks">
-            <property name="allowInSwitchCase" value="true"/>
-        </module>
-        -->
-        <!-- We use alot of emply blocks..  they can be good too.
-        <module name="EmptyBlock">
-            <property name="option" value="text"/>
-        </module>
-        -->
-        <module name="LeftCurly"/>
-        <module name="NeedBraces"/>
-        <module name="RightCurly"/>
-        
-        <!-- 
-        <module name="OuterTypeNumber"/>
-         -->
-
-
-        <!-- Checks for common coding problems               -->
-        <!-- See http://checkstyle.sf.net/config_coding.html -->
-        <!--<module name="ArrayTrailingComma"/>-->
-        <!--<module name="AvoidInlineConditionals"/>-->
-        <module name="CovariantEquals"/>
-        <module name="DoubleCheckedLocking"/>
-        <module name="EmptyStatement"/>
-        <module name="EqualsHashCode"/>
-        <!--<module name="FinalLocalVariable"/>-->
-        <!--
-        <module name="HiddenField">
-            <property name="ignoreConstructorParameter" value="true"/>
-            <property name="ignoreSetter" value="true"/>
-        </module>
-        -->
-        <!-- 
-        <module name="EqualsAvoidNull"/>
-         -->
-        <module name="IllegalInstantiation"/>
-        <!--<module name="IllegalToken"/>-->
-        <!--<module name="IllegalTokenText"/>-->
-        <!--<module name="InnerAssignment"/>-->
-        <!--<module name="MagicNumber"/>-->
-        <module name="MissingSwitchDefault"/>
-        <!--module name="ModifiedControlVariable"/-->
-        <module name="SimplifyBooleanExpression"/>
-        <module name="SimplifyBooleanReturn"/>
-        <module name="StringLiteralEquality"/>
-        <module name="NestedIfDepth">
-            <property name="max" value="8"/>
-        </module>
-        <module name="NestedTryDepth">
-            <property name="max" value="8"/>
-        </module>
-        <!--<module name="SuperClone"/>-->
-        <module name="SuperFinalize"/>
-        <!--<module name="IllegalCatch"/>-->
-    	<module name="IllegalThrows">
-      		<property name="illegalClassNames" value="java.lang.Error,java.lang.RuntimeException"/>
-    	</module>
-        <!--<module name="RedundantThrows"/>-->
-        <module name="PackageDeclaration"/>
-        <!--
-        <module name="JUnitTestCase"/>
-        -->
-        <module name="ReturnCount">
-            <property name="max" value="20"/>
-        </module>
-
-        <!-- Um.. we tend to use these alot.. perhaps enable this check later.
-        <module name="IllegalType">
-            <property name="format" value="^xxx$"/>
-            <property name="illegalClassNames" value="java.util.GregorianCalendar, java.util.Hashtable, java.util.HashSet, java.util.HashMap, java.util.ArrayList, java.util.LinkedList, java.util.LinkedHashMap, java.util.LinkedHashSet, java.util.TreeSet, java.util.TreeMap"/> We use alot of emply blocks..  they can be good too.
-        </module>
-        -->
-        <module name="DeclarationOrder"/>
-        <!--<module name="ParameterAssignment"/>-->
-        <module name="ExplicitInitialization"/>
-        <!-- <module name="AnnotationUseStyle"/> -->
-        <!-- <module name="MissingDeprecated"/> -->
-        <!-- 
-		<module name="MissingOverride">
-			<property name="javaFiveCompatibility" value="true"/>
-		</module>
-         -->
-         <!-- <module name="PackageAnnotation"/> -->
-         <!-- <module name="SuppressWarnings"/> -->
-        <module name="DefaultComesLast"/>
-        <!--<module name="MissingCtor"/>-->
-        <module name="FallThrough"/>
-        <!--<module name="MultipleStringLiterals"/>-->
-        <module name="MultipleVariableDeclarations"/>
-        <!--<module name="RequireThis"/>-->
-        <module name="UnnecessaryParentheses"/>
-
-
-
-        <!-- Checks for class design                         -->
-        <!-- See http://checkstyle.sf.net/config_design.html -->
-        <!--<module name="DesignForExtension"/>-->
-        <module name="FinalClass"/>
-        <module name="HideUtilityClassConstructor"/>
-        <!-- We still do enum style interfaces
-        <module name="InterfaceIsType"/>
-        -->
-        <module name="MutableException"/>
-        <module name="ThrowsCount">
-            <property name="max" value="5"/>
-        </module>
-
-        <!-- Ah we do a fair bit of using a class like a struct.. so
-             we are not so strict on requirin encapsulation
-        <module name="VisibilityModifier">
-            <property name="protectedAllowed" value="true"/>
-            <property name="packageAllowed" value="true"/>
-            <property name="publicMemberPattern" value="resource[12].*"/>
-        </module>
-        -->
-
-
-        <!-- Metrics checks.                   -->
-        <!-- See http://checkstyle.sf.net/config_metrics.html -->
-        <module name="BooleanExpressionComplexity">
-            <property name="max" value="6"/>
-        </module>
-        <!--<module name="ClassDataAbstractionCoupling"/>-->
-        <!--<module name="ClassFanOutComplexity"/>-->
-        <!--<module name="CyclomaticComplexity"/>-->
-        <!--<module name="NPathComplexity"/>-->
-        <!-- Ah big methods aint so bad! :)
-        <module name="JavaNCSS">
-            <property name="methodMaximum" value="75"/>
-        </module>
-        -->
-
-
-        <!-- Miscellaneous other checks.                   -->
-        <!-- See http://checkstyle.sf.net/config_misc.html -->
-        <!--
-        <module name="ArrayTypeStyle"/>
-        <module name="FinalParameters"/>
-        -->
-        <!--
-        <module name="GenericIllegalRegexp">
-            <property name="format" value="\s+$"/>
-            <property name="message" value="Line has trailing spaces."/>
-        </module>
-        -->
-        <module name="TodoComment">
-            <property name="format" value="WARNING"/>
-        </module>
-
-        <module name="UpperEll"/>
-
-        <!--Assert statement may have side effects:-->
-        <module name="DescendantToken">
-            <property name="tokens" value="LITERAL_ASSERT"/>
-            <property name="limitedTokens" value="ASSIGN,DEC,INC,POST_DEC,POST_INC,PLUS_ASSIGN,MINUS_ASSIGN,STAR_ASSIGN,DIV_ASSIGN,MOD_ASSIGN,BSR_ASSIGN,SR_ASSIGN,SL_ASSIGN,BAND_ASSIGN,BXOR_ASSIGN,BOR_ASSIGN"/>
-            <property name="maximumNumber" value="0"/>
-        </module>
-
-        <!--<module name="UncommentedMain"/>-->
-        <!--module name="TrailingComment"/-->
-        <module name="Indentation">
-            <property name="caseIndent" value="0"/>
-        </module>
-        <!--<module name="RequiredRegexp">-->
-    </module>
-	<module name="SuppressionCommentFilter"/>
-</module>
diff --git a/trunk/buildingtools/camel-eclipse-checkstyle b/trunk/buildingtools/camel-eclipse-checkstyle
deleted file mode 100644
index 81c067e..0000000
--- a/trunk/buildingtools/camel-eclipse-checkstyle
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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.
--->
-<fileset-config file-format-version="1.1.0" simple-config="false">
-    <fileset name="all" enabled="true" check-config-name="Camel Checks" type="external" description="">
-        <file-match-pattern match-pattern="^src[/\\]." include-pattern="true"/>
-        <file-match-pattern match-pattern="^src[/\\]main[/\\]generated[/\\]." include-pattern="false"/>
-        <file-match-pattern match-pattern="^src[/\\]test[/\\]generated[/\\]." include-pattern="false"/>
-        <file-match-pattern match-pattern="^src[/\\]main[/\\]resources[/\\]archetype-resources[/\\]." include-pattern="false"/>
-    </fileset>
-    <filter name="FileTypesFilter" enabled="true">
-        <filter-data value="java"/>
-    </filter>
-</fileset-config>
diff --git a/trunk/buildingtools/camel-eclipse-pmd b/trunk/buildingtools/camel-eclipse-pmd
deleted file mode 100644
index f1bd7be..0000000
--- a/trunk/buildingtools/camel-eclipse-pmd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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.
--->
-<pmd>
-    <useProjectRuleSet>true</useProjectRuleSet>
-    <rules/>
-</pmd>
\ No newline at end of file
diff --git a/trunk/buildingtools/camel-pmd-ruleset.xml b/trunk/buildingtools/camel-pmd-ruleset.xml
deleted file mode 100644
index bd58d84..0000000
--- a/trunk/buildingtools/camel-pmd-ruleset.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-<?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.
--->
-<ruleset name="pmd-eclipse">
-    <description>PMD Plugin preferences rule set</description>
-
-
-    <rule ref="rulesets/basic.xml/BooleanInstantiation"/>
-    <rule ref="rulesets/basic.xml/CollapsibleIfStatements"/>
-    <rule ref="rulesets/basic.xml/DoubleCheckedLocking"/>
-    <!--<rule ref="rulesets/basic.xml/EmptyCatchBlock"/>-->
-    <!--<rule ref="rulesets/basic.xml/EmptyFinallyBlock"/>-->
-    <!--<rule ref="rulesets/basic.xml/EmptyIfStmt"/>-->
-    <rule ref="rulesets/basic.xml/EmptyStatementNotInLoop"/>
-    <!--<rule ref="rulesets/basic.xml/EmptyStaticInitializer"/>-->
-    <!--<rule ref="rulesets/basic.xml/EmptySwitchStatements"/>-->
-    <!--<rule ref="rulesets/basic.xml/EmptySynchronizedBlock"/>-->
-    <!--<rule ref="rulesets/basic.xml/EmptyTryBlock"/>-->
-    <!--<rule ref="rulesets/basic.xml/EmptyWhileStmt"/>-->
-    <rule ref="rulesets/basic.xml/ForLoopShouldBeWhileLoop"/>
-    <rule ref="rulesets/basic.xml/JumbledIncrementer"/>
-    <!--<rule ref="rulesets/basic.xml/OverrideBothEqualsAndHashcode"/>-->
-    <rule ref="rulesets/basic.xml/ReturnFromFinallyBlock"/>
-    <rule ref="rulesets/basic.xml/UnconditionalIfStatement"/>
-    <rule ref="rulesets/basic.xml/UnnecessaryConversionTemporary"/>
-    <rule ref="rulesets/basic.xml/UnnecessaryFinalModifier"/>
-    <rule ref="rulesets/basic.xml/UnnecessaryReturn"/>
-    <!--<rule ref="rulesets/basic.xml/UselessOverridingMethod"/>-->
-
-    <!--<rule ref="rulesets/braces.xml/ForLoopsMustUseBraces"/>-->
-    <!--<rule ref="rulesets/braces.xml/IfElseStmtsMustUseBraces"/>-->
-    <!--<rule ref="rulesets/braces.xml/IfStmtsMustUseBraces"/>-->
-    <!--<rule ref="rulesets/braces.xml/WhileLoopsMustUseBraces"/>-->
-
-    <!--<rule ref="rulesets/clone.xml/CloneMethodMustImplementCloneable"/>-->
-    <!--<rule ref="rulesets/clone.xml/CloneThrowsCloneNotSupportedException"/>-->
-    <!--<rule ref="rulesets/clone.xml/ProperCloneImplementation"/>-->
-
-    <!--<rule ref="rulesets/codesize.xml/CyclomaticComplexity"/>-->
-    <!--<rule ref="rulesets/codesize.xml/ExcessiveClassLength"/>-->
-    <!--<rule ref="rulesets/codesize.xml/ExcessiveMethodLength"/>-->
-    <!--<rule ref="rulesets/codesize.xml/ExcessiveParameterList"/>-->
-    <!--<rule ref="rulesets/codesize.xml/ExcessivePublicCount"/>-->
-    <!--<rule ref="rulesets/codesize.xml/TooManyFields"/>-->
-
-    <!--<rule ref="rulesets/controversial.xml/AssignmentInOperand"/>-->
-    <!--<rule ref="rulesets/controversial.xml/AtLeastOneConstructor"/>-->
-    <!--<rule ref="rulesets/controversial.xml/CallSuperInConstructor"/>-->
-    <!--<rule ref="rulesets/controversial.xml/DontImportSun"/>-->
-    <!--<rule ref="rulesets/controversial.xml/NullAssignment"/>-->
-    <!--<rule ref="rulesets/controversial.xml/OnlyOneReturn"/>-->
-    <!--<rule ref="rulesets/controversial.xml/SingularField"/>-->
-    <!--<rule ref="rulesets/controversial.xml/SuspiciousOctalEscape"/>-->
-    <!--<rule ref="rulesets/controversial.xml/UnnecessaryConstructor"/>-->
-    <!--<rule ref="rulesets/controversial.xml/UnnecessaryParentheses"/>-->
-    <!--<rule ref="rulesets/controversial.xml/UnusedModifier"/>-->
-
-    <!--<rule ref="rulesets/coupling.xml/CouplingBetweenObjects"/>-->
-    <!--<rule ref="rulesets/coupling.xml/ExcessiveImports"/>-->
-    <!--<rule ref="rulesets/coupling.xml/LooseCoupling"/>-->
-
-    <!--<rule ref="rulesets/design.xml/AbstractClassWithoutAbstractMethod"/>-->
-    <!--<rule ref="rulesets/design.xml/AccessorClassGeneration"/>-->
-    <!--<rule ref="rulesets/design.xml/AssignmentToNonFinalStatic"/>-->
-    <!--<rule ref="rulesets/design.xml/AvoidDeeplyNestedIfStmts"/>-->
-    <!--<rule ref="rulesets/design.xml/AvoidInstanceofChecksInCatchClause"/>-->
-    <rule ref="rulesets/design.xml/AvoidProtectedFieldInFinalClass"/>
-    <!--<rule ref="rulesets/design.xml/AvoidReassigningParameters"/>-->
-    <!--<rule ref="rulesets/design.xml/AvoidSynchronizedAtMethodLevel"/>-->
-    <!--<rule ref="rulesets/design.xml/BadComparison"/>-->
-    <!--<rule ref="rulesets/design.xml/CloseConnection"/>-->
-    <!--<rule ref="rulesets/design.xml/CompareObjectsWithEquals"/>-->
-    <!--<rule ref="rulesets/design.xml/ConfusingTernary"/>-->
-    <rule ref="rulesets/design.xml/ConstructorCallsOverridableMethod"/>
-    <!--<rule ref="rulesets/design.xml/DefaultLabelNotLastInSwitchStmt"/>-->
-    <!--<rule ref="rulesets/design.xml/FinalFieldCouldBeStatic"/>-->
-    <rule ref="rulesets/design.xml/IdempotentOperations"/>
-    <!--<rule ref="rulesets/design.xml/ImmutableField"/>-->
-    <!--<rule ref="rulesets/design.xml/InstantiationToGetClass"/>-->
-    <!--<rule ref="rulesets/design.xml/MissingBreakInSwitch"/>-->
-    <!--<rule ref="rulesets/design.xml/MissingStaticMethodInNonInstantiatableClass"/>-->
-    <!--<rule ref="rulesets/design.xml/NonCaseLabelInSwitchStatement"/>-->
-    <!--<rule ref="rulesets/design.xml/NonStaticInitializer"/>-->
-    <rule ref="rulesets/design.xml/OptimizableToArrayCall"/>
-    <rule ref="rulesets/design.xml/PositionLiteralsFirstInComparisons"/>
-    <rule ref="rulesets/design.xml/SimplifyBooleanExpressions"/>
-    <rule ref="rulesets/design.xml/SimplifyBooleanReturns"/>
-    <rule ref="rulesets/design.xml/SimplifyConditional"/>
-    <!--<rule ref="rulesets/design.xml/SwitchDensity"/>-->
-    <!--<rule ref="rulesets/design.xml/SwitchStmtsShouldHaveDefault"/>-->
-    <rule ref="rulesets/design.xml/UnnecessaryLocalBeforeReturn"/>
-    <!--<rule ref="rulesets/design.xml/UseLocaleWithCaseConversions"/>-->
-    <!--<rule ref="rulesets/design.xml/UseNotifyAllInsteadOfNotify"/>-->
-    <!--<rule ref="rulesets/design.xml/UseSingleton"/>-->
-
-    <!--<rule ref="rulesets/finalizers.xml/EmptyFinalizer"/>-->
-    <!--<rule ref="rulesets/finalizers.xml/FinalizeOnlyCallsSuperFinalize"/>-->
-    <!--<rule ref="rulesets/finalizers.xml/FinalizeOverloaded"/>-->
-    <!--<rule ref="rulesets/finalizers.xml/FinalizeDoesNotCallSuperFinalize"/>-->
-    <!--<rule ref="rulesets/finalizers.xml/FinalizeShouldBeProtected"/>-->
-    <!--<rule ref="rulesets/finalizers.xml/AvoidCallingFinalize"/>-->
-
-    <!--<rule ref="rulesets/imports.xml/DuplicateImports"/>-->
-    <!--<rule ref="rulesets/imports.xml/DontImportJavaLang"/>-->
-    <!--<rule ref="rulesets/imports.xml/UnusedImports"/>-->
-    <!--<rule ref="rulesets/imports.xml/ImportFromSamePackage"/>-->
-
-    <!--<rule ref="rulesets/javabeans.xml/BeanMembersShouldSerialize"/>-->
-    <!--<rule ref="rulesets/javabeans.xml/MissingSerialVersionUID"/>-->
-
-    <!--<rule ref="rulesets/junit.xml/JUnitStaticSuite"/>-->
-    <!--<rule ref="rulesets/junit.xml/JUnitSpelling"/>-->
-    <!--<rule ref="rulesets/junit.xml/JUnitAssertionsShouldIncludeMessage"/>-->
-    <!--<rule ref="rulesets/junit.xml/JUnitTestsShouldIncludeAssert"/>-->
-    <!--<rule ref="rulesets/junit.xml/TestClassWithoutTestCases"/>-->
-    <!--<rule ref="rulesets/junit.xml/UnnecessaryBooleanAssertion"/>-->
-    <!--<rule ref="rulesets/junit.xml/UseAssertEqualsInsteadOfAssertTrue"/>-->
-    <!--<rule ref="rulesets/junit.xml/UseAssertSameInsteadOfAssertTrue"/>-->
-
-    <!--<rule ref="rulesets/logging-java.xml/AvoidPrintStackTrace"/>-->
-    <rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>
-    <!--<rule ref="rulesets/logging-java.xml/MoreThanOneLogger"/>-->
-    <!--<rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>-->
-    <!--<rule ref="rulesets/logging-java.xml/LogBlockWithoutIf"/>-->
-    <!--<rule ref="rulesets/logging-java.xml/SystemPrintln"/>-->
-    <!--<rule ref="rulesets/logging-jakarta-commons.xml/UseCorrectExceptionLogging"/>-->
-    <!--<rule ref="rulesets/logging-jakarta-commons.xml/ProperLogger"/>-->
-
-    <!--<rule ref="rulesets/naming.xml/ShortVariable"/>-->
-    <!--<rule ref="rulesets/naming.xml/LongVariable"/>-->
-    <!--<rule ref="rulesets/naming.xml/ShortMethodName"/>-->
-    <!--<rule ref="rulesets/naming.xml/VariableNamingConventions"/>-->
-    <!--<rule ref="rulesets/naming.xml/MethodNamingConventions"/>-->
-    <!--<rule ref="rulesets/naming.xml/ClassNamingConventions"/>-->
-    <!--<rule ref="rulesets/naming.xml/AbstractNaming"/>-->
-    <!--<rule ref="rulesets/naming.xml/AvoidDollarSigns"/>-->
-    <!--<rule ref="rulesets/naming.xml/MethodWithSameNameAsEnclosingClass"/>-->
-    <!--<rule ref="rulesets/naming.xml/SuspiciousHashcodeMethodName"/>-->
-    <!--<rule ref="rulesets/naming.xml/SuspiciousConstantFieldName"/>-->
-    <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingTypeName"/>-->
-    <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingMethodName"/>-->
-    <!--<rule ref="rulesets/naming.xml/AvoidNonConstructorMethodsWithClassName"/>-->
-    <!--<rule ref="rulesets/naming.xml/NoPackage"/>-->
-    <!--<rule ref="rulesets/naming.xml/PackageCase"/>-->
-
-    <!--<rule ref="rulesets/optimizations.xml/LocalVariableCouldBeFinal"/>-->
-    <!--<rule ref="rulesets/optimizations.xml/MethodArgumentCouldBeFinal"/>-->
-    <!--<rule ref="rulesets/optimizations.xml/AvoidInstantiatingObjectsInLoops"/>-->
-    <!--<rule ref="rulesets/optimizations.xml/UseArrayListInsteadOfVector"/>-->
-    <!--<rule ref="rulesets/optimizations.xml/SimplifyStartsWith"/>-->
-    <!--<rule ref="rulesets/optimizations.xml/UseStringBufferForStringAppends"/>-->
-
-    <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingThrowable"/>-->
-    <!--<rule ref="rulesets/strictexception.xml/SignatureDeclareThrowsException"/>-->
-    <!--<rule ref="rulesets/strictexception.xml/ExceptionAsFlowControl"/>-->
-    <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingNPE"/>-->
-    <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingRawExceptionTypes"/>-->
-    <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingNullPointerException"/>-->
-
-    <!--<rule ref="rulesets/strings.xml/AvoidDuplicateLiterals"/>-->
-    <!--<rule ref="rulesets/strings.xml/StringInstantiation"/>-->
-    <!--<rule ref="rulesets/strings.xml/StringToString"/>-->
-    <!--<rule ref="rulesets/strings.xml/AvoidConcatenatingNonLiteralsInStringBuffer"/>-->
-    <!--<rule ref="rulesets/strings.xml/UnnecessaryCaseChange"/>-->
-
-    <!--<rule ref="rulesets/sunsecure.xml/MethodReturnsInternalArray"/>-->
-    <!--<rule ref="rulesets/sunsecure.xml/ArrayIsStoredDirectly"/>-->
-
-    <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable"/>
-    <rule ref="rulesets/unusedcode.xml/UnusedPrivateField"/>
-    <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod"/>
-    <!--<rule ref="rulesets/unusedcode.xml/UnusedFormalParameter"/>-->
-
-    <rule name="DontUseLoggerGetLogger"
-          message="Don't use Logger.getLogger(...), use LogUtils.getL7dLogger(....) instead"
-          class="net.sourceforge.pmd.rules.XPathRule">
-        <priority>2</priority>
-        <description>Don't use Logger.getLogger(...), use LogUtils.getL7dLogger(....) instead</description>
-        <properties>
-            <property name="xpath">
-                <value>
-<![CDATA[
-//PrimaryPrefix/Name[ends-with(@Image, 'Logger.getLogger') and //PackageDeclaration/Name[starts-with(@Image, 'org.apache.cxf')]]
-]]>
-                </value>
-            </property>
-        </properties>
-    </rule>
-
-</ruleset>
diff --git a/trunk/buildingtools/pom.xml b/trunk/buildingtools/pom.xml
deleted file mode 100644
index 16ee4dc..0000000
--- a/trunk/buildingtools/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--
-  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.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel</artifactId>
-      <version>2.8.0</version>
-    </parent>
-       
-    <artifactId>camel-buildtools</artifactId>
-    <version>2.8.0</version>
-    <name>Apache :: Camel Buildtools</name>
-    <description>The build tools for the Camel project</description>    
-    <packaging>jar</packaging>
-
-
-    <properties>
-        <maven.test.skip>true</maven.test.skip>
-    </properties>
-    
-</project>
diff --git a/trunk/buildingtools/src/main/resources/META-INF/LICENSE b/trunk/buildingtools/src/main/resources/META-INF/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/trunk/buildingtools/src/main/resources/META-INF/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
diff --git a/trunk/buildingtools/src/main/resources/META-INF/NOTICE b/trunk/buildingtools/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 064a0fe..0000000
--- a/trunk/buildingtools/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,70 +0,0 @@
-// ------------------------------------------------------------------
-// NOTICE file corresponding to the section 4d of The Apache License,
-// Version 2.0, in this case for Apache CXF Buildtools
-// ------------------------------------------------------------------
-
-Apache CXF Buildtools
-Copyright 2006-2007 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-
-This product includes/uses software, Maven Profile Model (http://maven.apache.org/maven-profile),
-developed by Apache Software Foundation  (http://www.apache.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Unnamed - junit:junit:jar:3.8.1
-
-This product includes/uses software, Default Plexus Container,
-developed by Codehaus  (http://www.codehaus.org/)
-
-This product includes/uses software, Maven Project Builder (http://maven.apache.org/maven-project),
-developed by Apache Software Foundation  (http://www.apache.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Maven Local Settings Model (http://maven.apache.org/maven-settings),
-developed by Apache Software Foundation  (http://www.apache.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, classworlds (http://classworlds.codehaus.org/),
-developed by The Codehaus  (http://codehaus.org/)
-
-This product includes/uses software, Plexus Common Utilities,
-developed by Codehaus  (http://www.codehaus.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Maven Repository Metadata Model (http://maven.apache.org/maven-repository-metadata),
-developed by Apache Software Foundation  (http://www.apache.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Unnamed - jdom:jdom:jar:1.0
-
-This product includes/uses software, Maven Model (http://maven.apache.org/maven-model),
-developed by Apache Software Foundation  (http://www.apache.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, ASM All (http://asm.objectweb.org/asm-all),
-developed by ObjectWeb  (http://www.objectweb.org/)
-
-This product includes/uses software, Maven Artifact (http://maven.apache.org/maven-artifact),
-developed by Apache Software Foundation  (http://www.apache.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Maven Artifact Manager (http://maven.apache.org/maven-artifact-manager),
-developed by Apache Software Foundation  (http://www.apache.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Maven Plugin API (http://maven.apache.org/maven-plugin-api),
-developed by Apache Software Foundation  (http://www.apache.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, shade-maven-plugin (http://mojo.codehaus.org/shade-maven-plugin),
-developed by Codehaus  (http://codehaus.org)
-
-This product includes/uses software, Maven Wagon API (http://maven.apache.org/wagon/wagon-provider-api),
-developed by Apache Software Foundation  (http://www.apache.org/)
-License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-
-
diff --git a/trunk/buildingtools/src/main/resources/camel-checkstyle-suppressions.xml b/trunk/buildingtools/src/main/resources/camel-checkstyle-suppressions.xml
deleted file mode 100644
index 8875d4e..0000000
--- a/trunk/buildingtools/src/main/resources/camel-checkstyle-suppressions.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE suppressions PUBLIC
-    "-//Puppy Crawl//DTD Suppressions 1.0//EN"
-    "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
-<!--
-  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.
--->
-<suppressions>
-    <suppress checks=".*"
-              files=".+[\\\/]generated[\\\/].+\.java"
-              />
-    <suppress checks=".*"
-              files=".+[\\\/]build[\\\/]src[\\\/].+\.java"
-              />
-    <suppress checks=".*"
-              files=".+[\\\/]target[\\\/].+\.java"
-              />              
-    <suppress checks=".*"
-              files=".+[\\\/]contrib[\\\/].+\.java"
-              />
-</suppressions>
\ No newline at end of file
diff --git a/trunk/buildingtools/src/main/resources/camel-checkstyle.xml b/trunk/buildingtools/src/main/resources/camel-checkstyle.xml
deleted file mode 100644
index 6a156a2..0000000
--- a/trunk/buildingtools/src/main/resources/camel-checkstyle.xml
+++ /dev/null
@@ -1,346 +0,0 @@
-<?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.
--->
-<!DOCTYPE module PUBLIC
-    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<!--
-Checks to make sure the code meets the Camel coding guidelines which
-
-It also enforces a bunch of other "BestPractices like method
-lengths, if/try depths, etc...
--->
-
-<module name="Checker">
-    <!-- Checks whether files end with a new line.                        -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
-    <!--
-    <module name="NewlineAtEndOfFile"/>
-    -->
-
-    <!-- Checks that property files contain the same keys.         -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
-    <module name="Translation"/>
-
-    <!--<module name="StrictDuplicateCode"/>-->
-    
-    <!-- Header checks -->
-    <module name="Header">
-    	<property name="header"
-        	value="/**\n * Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements.  See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the &quot;License&quot;); you may not use this file except in compliance with\n * the License.  You may obtain a copy of the License at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an &quot;AS IS&quot; BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n"/>
-    </module>
-    
-    <module name="RegexpMultiline">
-        <property name="format" value="(\bgpl\b)|(\bgplv2\b)|(\bgnu\sgeneral\spublic\s*license\b)|(\bwww\.gnu\.org\/licenses\/gpl\.txt\b)"/>
-        <property name="ignoreCase"  value="true"/>
-    </module>
-    
-    <module name="FileLength">
-        <property name="max" value="3500"/>
-    </module>
-    
-    <module name="FileTabCharacter">
-        <property name="fileExtensions" value="java"/>
-    </module>
-    
-    <!-- 
-	<module name="RegexpSingleline">
-		<property name="format" value="\s+$"/>
-		<property name="minimum" value="0"/>
-		<property name="maximum" value="0"/>
-	</module>
-	 -->
-
-    <module name="TreeWalker">
-        <!-- Enable FileContentsHolder to allow us to in turn turn on suppression comments -->
-        <module name="FileContentsHolder" />
-
-        <!-- Checks for Javadoc comments.                     -->
-        <!-- See http://checkstyle.sf.net/config_javadoc.html -->
-        <!--
-        <module name="PackageHtml"/>
-        <module name="JavadocMethod"/>
-        <module name="JavadocType"/>
-        <module name="JavadocVariable"/>
-        <module name="JavadocStyle"/>
-        -->
-
-
-        <!-- Checks for Naming Conventions.                  -->
-        <!-- See http://checkstyle.sf.net/config_naming.html -->
-        <module name="ConstantName"/>
-        <module name="LocalFinalVariableName"/>
-        <module name="LocalVariableName"/>
-        <module name="MemberName"/>
-        <module name="MethodName"/>
-        <module name="PackageName"/>
-        <module name="ParameterName"/>
-        <module name="StaticVariableName"/>
-        <module name="TypeName"/>
-
-        <!-- <module name="RegexpHeader"/> -->
-
-
-        <!-- Checks for imports                              -->
-        <!-- See http://checkstyle.sf.net/config_import.html -->
-        <module name="AvoidStarImport">
-            <property name="excludes" value="java.io,java.util,java.net,java.nio,java.nio.channels,java.lang.reflect,org.w3c.dom,org.xml.sax,java.awt,javax.swing,junit.framework"/>
-            <property name="allowStaticMemberImports" value="true"/>
-        </module>
-        <!-- 
-        <module name="ConstantName"/>
-         -->
-        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
-        <module name="RedundantImport"/>
-        <!-- When you javadoc {@link } an import is added that checkstyle thinks is unused import.
-        <module name="UnusedImports"/>
-        -->
-        <module name="ImportOrder">
-            <property name="groups" value="java,javax,org.w3c,org.xml,junit"/>
-            <property name="ordered" value="true"/>
-        </module>
-        <!--
-        <module name="ImportControl">
-            <property name="file" value="etc/import-control.xml"/>
-        </module>
-        -->
-
-        <!-- Checks for Size Violations.                    -->
-        <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="AnonInnerLength">
-            <property name="max" value="200"/>
-        </module>
-        <module name="ExecutableStatementCount">
-            <property name="max" value="100"/>
-        </module>
-        <module name="LineLength">
-            <property name="max" value="200"/>
-        </module>
-        <module name="MethodLength">
-            <property name="max" value="200"/>
-            <property name="countEmpty" value="false"/>
-        </module>
-        <!-- We should try to get this enabled soon..
-        <module name="ParameterNumber">
-            <property name="max" value="7"/>
-        </module>
-        -->
-
-        <!-- Checks for whitespace                               -->
-        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-        <module name="EmptyForIteratorPad"/>
-        <module name="EmptyForInitializerPad"/>
-        <module name="MethodParamPad"/>
-        <module name="NoWhitespaceAfter">
-            <property name="tokens" value="ARRAY_INIT,BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
-        </module>
-        <module name="NoWhitespaceBefore"/>
-        <module name="OperatorWrap"/>
-        <module name="ParenPad"/>
-        <module name="TypecastParenPad"/>
-        <module name="WhitespaceAfter">
-            <property name="tokens" value="COMMA, SEMI"/>
-        </module>
-        <module name="WhitespaceAround">
-            <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN,TYPE_EXTENSION_AND"/>
-            <!-- <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN,TYPE_EXTENSION_AND"/>-->
-        </module>
-
-		<!-- 
-		<module name="GenericWhitespace"/>
-		 -->
-
-        <!-- Modifier Checks                                    -->
-        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
-        <module name="ModifierOrder"/>
-        <module name="RedundantModifier"/>
-
-
-        <!-- Checks for blocks. You know, those {}'s         -->
-        <!-- See http://checkstyle.sf.net/config_blocks.html -->
-        <!--
-        <module name="AvoidNestedBlocks">
-            <property name="allowInSwitchCase" value="true"/>
-        </module>
-        -->
-        <!-- We use alot of emply blocks..  they can be good too.
-        <module name="EmptyBlock">
-            <property name="option" value="text"/>
-        </module>
-        -->
-        <module name="LeftCurly"/>
-        <module name="NeedBraces"/>
-        <module name="RightCurly"/>
-        
-        <!-- 
-        <module name="OuterTypeNumber"/>
-         -->
-
-
-        <!-- Checks for common coding problems               -->
-        <!-- See http://checkstyle.sf.net/config_coding.html -->
-        <!--<module name="ArrayTrailingComma"/>-->
-        <!--<module name="AvoidInlineConditionals"/>-->
-        <module name="CovariantEquals"/>
-        <module name="DoubleCheckedLocking"/>
-        <module name="EmptyStatement"/>
-        <module name="EqualsHashCode"/>
-        <!--<module name="FinalLocalVariable"/>-->
-        <!--
-        <module name="HiddenField">
-            <property name="ignoreConstructorParameter" value="true"/>
-            <property name="ignoreSetter" value="true"/>
-        </module>
-        -->
-        <!-- 
-        <module name="EqualsAvoidNull"/>
-         -->
-        <module name="IllegalInstantiation"/>
-        <!--<module name="IllegalToken"/>-->
-        <!--<module name="IllegalTokenText"/>-->
-        <!--<module name="InnerAssignment"/>-->
-        <!--<module name="MagicNumber"/>-->
-        <module name="MissingSwitchDefault"/>
-        <!--module name="ModifiedControlVariable"/-->
-        <module name="SimplifyBooleanExpression"/>
-        <module name="SimplifyBooleanReturn"/>
-        <module name="StringLiteralEquality"/>
-        <module name="NestedIfDepth">
-            <property name="max" value="8"/>
-        </module>
-        <module name="NestedTryDepth">
-            <property name="max" value="8"/>
-        </module>
-        <!--<module name="SuperClone"/>-->
-        <module name="SuperFinalize"/>
-        <!--<module name="IllegalCatch"/>-->
-    	<module name="IllegalThrows">
-      		<property name="illegalClassNames" value="java.lang.Error,java.lang.RuntimeException"/>
-    	</module>
-        <!--<module name="RedundantThrows"/>-->
-        <module name="PackageDeclaration"/>
-        <!--
-        <module name="JUnitTestCase"/>
-        -->
-        <module name="ReturnCount">
-            <property name="max" value="20"/>
-        </module>
-
-        <!-- Um.. we tend to use these alot.. perhaps enable this check later.
-        <module name="IllegalType">
-            <property name="format" value="^xxx$"/>
-            <property name="illegalClassNames" value="java.util.GregorianCalendar, java.util.Hashtable, java.util.HashSet, java.util.HashMap, java.util.ArrayList, java.util.LinkedList, java.util.LinkedHashMap, java.util.LinkedHashSet, java.util.TreeSet, java.util.TreeMap"/> We use alot of emply blocks..  they can be good too.
-        </module>
-        -->
-        <module name="DeclarationOrder"/>
-        <!--<module name="ParameterAssignment"/>-->
-        <module name="ExplicitInitialization"/>
-        <!-- <module name="AnnotationUseStyle"/> -->
-        <!-- <module name="MissingDeprecated"/> -->
-        <!-- 
-		<module name="MissingOverride">
-			<property name="javaFiveCompatibility" value="true"/>
-		</module>
-         -->
-         <!-- <module name="PackageAnnotation"/> -->
-         <!-- <module name="SuppressWarnings"/> -->
-        <module name="DefaultComesLast"/>
-        <!--<module name="MissingCtor"/>-->
-        <module name="FallThrough"/>
-        <!--<module name="MultipleStringLiterals"/>-->
-        <module name="MultipleVariableDeclarations"/>
-        <!--<module name="RequireThis"/>-->
-        <module name="UnnecessaryParentheses"/>
-
-
-
-        <!-- Checks for class design                         -->
-        <!-- See http://checkstyle.sf.net/config_design.html -->
-        <!--<module name="DesignForExtension"/>-->
-        <module name="FinalClass"/>
-        <module name="HideUtilityClassConstructor"/>
-        <!-- We still do enum style interfaces
-        <module name="InterfaceIsType"/>
-        -->
-        <module name="MutableException"/>
-        <module name="ThrowsCount">
-            <property name="max" value="5"/>
-        </module>
-
-        <!-- Ah we do a fair bit of using a class like a struct.. so
-             we are not so strict on requirin encapsulation
-        <module name="VisibilityModifier">
-            <property name="protectedAllowed" value="true"/>
-            <property name="packageAllowed" value="true"/>
-            <property name="publicMemberPattern" value="resource[12].*"/>
-        </module>
-        -->
-
-
-        <!-- Metrics checks.                   -->
-        <!-- See http://checkstyle.sf.net/config_metrics.html -->
-        <module name="BooleanExpressionComplexity">
-            <property name="max" value="6"/>
-        </module>
-        <!--<module name="ClassDataAbstractionCoupling"/>-->
-        <!--<module name="ClassFanOutComplexity"/>-->
-        <!--<module name="CyclomaticComplexity"/>-->
-        <!--<module name="NPathComplexity"/>-->
-        <!-- Ah big methods aint so bad! :)
-        <module name="JavaNCSS">
-            <property name="methodMaximum" value="75"/>
-        </module>
-        -->
-
-
-        <!-- Miscellaneous other checks.                   -->
-        <!-- See http://checkstyle.sf.net/config_misc.html -->
-        <!--
-        <module name="ArrayTypeStyle"/>
-        <module name="FinalParameters"/>
-        -->
-        <!--
-        <module name="GenericIllegalRegexp">
-            <property name="format" value="\s+$"/>
-            <property name="message" value="Line has trailing spaces."/>
-        </module>
-        -->
-        <module name="TodoComment">
-            <property name="format" value="WARNING"/>
-        </module>
-
-        <module name="UpperEll"/>
-
-        <!--Assert statement may have side effects:-->
-        <module name="DescendantToken">
-            <property name="tokens" value="LITERAL_ASSERT"/>
-            <property name="limitedTokens" value="ASSIGN,DEC,INC,POST_DEC,POST_INC,PLUS_ASSIGN,MINUS_ASSIGN,STAR_ASSIGN,DIV_ASSIGN,MOD_ASSIGN,BSR_ASSIGN,SR_ASSIGN,SL_ASSIGN,BAND_ASSIGN,BXOR_ASSIGN,BOR_ASSIGN"/>
-            <property name="maximumNumber" value="0"/>
-        </module>
-
-        <!--<module name="UncommentedMain"/>-->
-        <!--module name="TrailingComment"/-->
-        <module name="Indentation">
-            <property name="caseIndent" value="0"/>
-        </module>
-        <!--<module name="RequiredRegexp">-->
-    </module>
-	<module name="SuppressionCommentFilter"/>
-</module>
\ No newline at end of file
diff --git a/trunk/buildingtools/src/main/resources/camel-eclipse-checkstyle b/trunk/buildingtools/src/main/resources/camel-eclipse-checkstyle
deleted file mode 100644
index 81c067e..0000000
--- a/trunk/buildingtools/src/main/resources/camel-eclipse-checkstyle
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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.
--->
-<fileset-config file-format-version="1.1.0" simple-config="false">
-    <fileset name="all" enabled="true" check-config-name="Camel Checks" type="external" description="">
-        <file-match-pattern match-pattern="^src[/\\]." include-pattern="true"/>
-        <file-match-pattern match-pattern="^src[/\\]main[/\\]generated[/\\]." include-pattern="false"/>
-        <file-match-pattern match-pattern="^src[/\\]test[/\\]generated[/\\]." include-pattern="false"/>
-        <file-match-pattern match-pattern="^src[/\\]main[/\\]resources[/\\]archetype-resources[/\\]." include-pattern="false"/>
-    </fileset>
-    <filter name="FileTypesFilter" enabled="true">
-        <filter-data value="java"/>
-    </filter>
-</fileset-config>
diff --git a/trunk/buildingtools/src/main/resources/camel-eclipse-pmd b/trunk/buildingtools/src/main/resources/camel-eclipse-pmd
deleted file mode 100644
index f1bd7be..0000000
--- a/trunk/buildingtools/src/main/resources/camel-eclipse-pmd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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.
--->
-<pmd>
-    <useProjectRuleSet>true</useProjectRuleSet>
-    <rules/>
-</pmd>
\ No newline at end of file
diff --git a/trunk/buildingtools/src/main/resources/camel-pmd-ruleset.xml b/trunk/buildingtools/src/main/resources/camel-pmd-ruleset.xml
deleted file mode 100644
index bd58d84..0000000
--- a/trunk/buildingtools/src/main/resources/camel-pmd-ruleset.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-<?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.
--->
-<ruleset name="pmd-eclipse">
-    <description>PMD Plugin preferences rule set</description>
-
-
-    <rule ref="rulesets/basic.xml/BooleanInstantiation"/>
-    <rule ref="rulesets/basic.xml/CollapsibleIfStatements"/>
-    <rule ref="rulesets/basic.xml/DoubleCheckedLocking"/>
-    <!--<rule ref="rulesets/basic.xml/EmptyCatchBlock"/>-->
-    <!--<rule ref="rulesets/basic.xml/EmptyFinallyBlock"/>-->
-    <!--<rule ref="rulesets/basic.xml/EmptyIfStmt"/>-->
-    <rule ref="rulesets/basic.xml/EmptyStatementNotInLoop"/>
-    <!--<rule ref="rulesets/basic.xml/EmptyStaticInitializer"/>-->
-    <!--<rule ref="rulesets/basic.xml/EmptySwitchStatements"/>-->
-    <!--<rule ref="rulesets/basic.xml/EmptySynchronizedBlock"/>-->
-    <!--<rule ref="rulesets/basic.xml/EmptyTryBlock"/>-->
-    <!--<rule ref="rulesets/basic.xml/EmptyWhileStmt"/>-->
-    <rule ref="rulesets/basic.xml/ForLoopShouldBeWhileLoop"/>
-    <rule ref="rulesets/basic.xml/JumbledIncrementer"/>
-    <!--<rule ref="rulesets/basic.xml/OverrideBothEqualsAndHashcode"/>-->
-    <rule ref="rulesets/basic.xml/ReturnFromFinallyBlock"/>
-    <rule ref="rulesets/basic.xml/UnconditionalIfStatement"/>
-    <rule ref="rulesets/basic.xml/UnnecessaryConversionTemporary"/>
-    <rule ref="rulesets/basic.xml/UnnecessaryFinalModifier"/>
-    <rule ref="rulesets/basic.xml/UnnecessaryReturn"/>
-    <!--<rule ref="rulesets/basic.xml/UselessOverridingMethod"/>-->
-
-    <!--<rule ref="rulesets/braces.xml/ForLoopsMustUseBraces"/>-->
-    <!--<rule ref="rulesets/braces.xml/IfElseStmtsMustUseBraces"/>-->
-    <!--<rule ref="rulesets/braces.xml/IfStmtsMustUseBraces"/>-->
-    <!--<rule ref="rulesets/braces.xml/WhileLoopsMustUseBraces"/>-->
-
-    <!--<rule ref="rulesets/clone.xml/CloneMethodMustImplementCloneable"/>-->
-    <!--<rule ref="rulesets/clone.xml/CloneThrowsCloneNotSupportedException"/>-->
-    <!--<rule ref="rulesets/clone.xml/ProperCloneImplementation"/>-->
-
-    <!--<rule ref="rulesets/codesize.xml/CyclomaticComplexity"/>-->
-    <!--<rule ref="rulesets/codesize.xml/ExcessiveClassLength"/>-->
-    <!--<rule ref="rulesets/codesize.xml/ExcessiveMethodLength"/>-->
-    <!--<rule ref="rulesets/codesize.xml/ExcessiveParameterList"/>-->
-    <!--<rule ref="rulesets/codesize.xml/ExcessivePublicCount"/>-->
-    <!--<rule ref="rulesets/codesize.xml/TooManyFields"/>-->
-
-    <!--<rule ref="rulesets/controversial.xml/AssignmentInOperand"/>-->
-    <!--<rule ref="rulesets/controversial.xml/AtLeastOneConstructor"/>-->
-    <!--<rule ref="rulesets/controversial.xml/CallSuperInConstructor"/>-->
-    <!--<rule ref="rulesets/controversial.xml/DontImportSun"/>-->
-    <!--<rule ref="rulesets/controversial.xml/NullAssignment"/>-->
-    <!--<rule ref="rulesets/controversial.xml/OnlyOneReturn"/>-->
-    <!--<rule ref="rulesets/controversial.xml/SingularField"/>-->
-    <!--<rule ref="rulesets/controversial.xml/SuspiciousOctalEscape"/>-->
-    <!--<rule ref="rulesets/controversial.xml/UnnecessaryConstructor"/>-->
-    <!--<rule ref="rulesets/controversial.xml/UnnecessaryParentheses"/>-->
-    <!--<rule ref="rulesets/controversial.xml/UnusedModifier"/>-->
-
-    <!--<rule ref="rulesets/coupling.xml/CouplingBetweenObjects"/>-->
-    <!--<rule ref="rulesets/coupling.xml/ExcessiveImports"/>-->
-    <!--<rule ref="rulesets/coupling.xml/LooseCoupling"/>-->
-
-    <!--<rule ref="rulesets/design.xml/AbstractClassWithoutAbstractMethod"/>-->
-    <!--<rule ref="rulesets/design.xml/AccessorClassGeneration"/>-->
-    <!--<rule ref="rulesets/design.xml/AssignmentToNonFinalStatic"/>-->
-    <!--<rule ref="rulesets/design.xml/AvoidDeeplyNestedIfStmts"/>-->
-    <!--<rule ref="rulesets/design.xml/AvoidInstanceofChecksInCatchClause"/>-->
-    <rule ref="rulesets/design.xml/AvoidProtectedFieldInFinalClass"/>
-    <!--<rule ref="rulesets/design.xml/AvoidReassigningParameters"/>-->
-    <!--<rule ref="rulesets/design.xml/AvoidSynchronizedAtMethodLevel"/>-->
-    <!--<rule ref="rulesets/design.xml/BadComparison"/>-->
-    <!--<rule ref="rulesets/design.xml/CloseConnection"/>-->
-    <!--<rule ref="rulesets/design.xml/CompareObjectsWithEquals"/>-->
-    <!--<rule ref="rulesets/design.xml/ConfusingTernary"/>-->
-    <rule ref="rulesets/design.xml/ConstructorCallsOverridableMethod"/>
-    <!--<rule ref="rulesets/design.xml/DefaultLabelNotLastInSwitchStmt"/>-->
-    <!--<rule ref="rulesets/design.xml/FinalFieldCouldBeStatic"/>-->
-    <rule ref="rulesets/design.xml/IdempotentOperations"/>
-    <!--<rule ref="rulesets/design.xml/ImmutableField"/>-->
-    <!--<rule ref="rulesets/design.xml/InstantiationToGetClass"/>-->
-    <!--<rule ref="rulesets/design.xml/MissingBreakInSwitch"/>-->
-    <!--<rule ref="rulesets/design.xml/MissingStaticMethodInNonInstantiatableClass"/>-->
-    <!--<rule ref="rulesets/design.xml/NonCaseLabelInSwitchStatement"/>-->
-    <!--<rule ref="rulesets/design.xml/NonStaticInitializer"/>-->
-    <rule ref="rulesets/design.xml/OptimizableToArrayCall"/>
-    <rule ref="rulesets/design.xml/PositionLiteralsFirstInComparisons"/>
-    <rule ref="rulesets/design.xml/SimplifyBooleanExpressions"/>
-    <rule ref="rulesets/design.xml/SimplifyBooleanReturns"/>
-    <rule ref="rulesets/design.xml/SimplifyConditional"/>
-    <!--<rule ref="rulesets/design.xml/SwitchDensity"/>-->
-    <!--<rule ref="rulesets/design.xml/SwitchStmtsShouldHaveDefault"/>-->
-    <rule ref="rulesets/design.xml/UnnecessaryLocalBeforeReturn"/>
-    <!--<rule ref="rulesets/design.xml/UseLocaleWithCaseConversions"/>-->
-    <!--<rule ref="rulesets/design.xml/UseNotifyAllInsteadOfNotify"/>-->
-    <!--<rule ref="rulesets/design.xml/UseSingleton"/>-->
-
-    <!--<rule ref="rulesets/finalizers.xml/EmptyFinalizer"/>-->
-    <!--<rule ref="rulesets/finalizers.xml/FinalizeOnlyCallsSuperFinalize"/>-->
-    <!--<rule ref="rulesets/finalizers.xml/FinalizeOverloaded"/>-->
-    <!--<rule ref="rulesets/finalizers.xml/FinalizeDoesNotCallSuperFinalize"/>-->
-    <!--<rule ref="rulesets/finalizers.xml/FinalizeShouldBeProtected"/>-->
-    <!--<rule ref="rulesets/finalizers.xml/AvoidCallingFinalize"/>-->
-
-    <!--<rule ref="rulesets/imports.xml/DuplicateImports"/>-->
-    <!--<rule ref="rulesets/imports.xml/DontImportJavaLang"/>-->
-    <!--<rule ref="rulesets/imports.xml/UnusedImports"/>-->
-    <!--<rule ref="rulesets/imports.xml/ImportFromSamePackage"/>-->
-
-    <!--<rule ref="rulesets/javabeans.xml/BeanMembersShouldSerialize"/>-->
-    <!--<rule ref="rulesets/javabeans.xml/MissingSerialVersionUID"/>-->
-
-    <!--<rule ref="rulesets/junit.xml/JUnitStaticSuite"/>-->
-    <!--<rule ref="rulesets/junit.xml/JUnitSpelling"/>-->
-    <!--<rule ref="rulesets/junit.xml/JUnitAssertionsShouldIncludeMessage"/>-->
-    <!--<rule ref="rulesets/junit.xml/JUnitTestsShouldIncludeAssert"/>-->
-    <!--<rule ref="rulesets/junit.xml/TestClassWithoutTestCases"/>-->
-    <!--<rule ref="rulesets/junit.xml/UnnecessaryBooleanAssertion"/>-->
-    <!--<rule ref="rulesets/junit.xml/UseAssertEqualsInsteadOfAssertTrue"/>-->
-    <!--<rule ref="rulesets/junit.xml/UseAssertSameInsteadOfAssertTrue"/>-->
-
-    <!--<rule ref="rulesets/logging-java.xml/AvoidPrintStackTrace"/>-->
-    <rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>
-    <!--<rule ref="rulesets/logging-java.xml/MoreThanOneLogger"/>-->
-    <!--<rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>-->
-    <!--<rule ref="rulesets/logging-java.xml/LogBlockWithoutIf"/>-->
-    <!--<rule ref="rulesets/logging-java.xml/SystemPrintln"/>-->
-    <!--<rule ref="rulesets/logging-jakarta-commons.xml/UseCorrectExceptionLogging"/>-->
-    <!--<rule ref="rulesets/logging-jakarta-commons.xml/ProperLogger"/>-->
-
-    <!--<rule ref="rulesets/naming.xml/ShortVariable"/>-->
-    <!--<rule ref="rulesets/naming.xml/LongVariable"/>-->
-    <!--<rule ref="rulesets/naming.xml/ShortMethodName"/>-->
-    <!--<rule ref="rulesets/naming.xml/VariableNamingConventions"/>-->
-    <!--<rule ref="rulesets/naming.xml/MethodNamingConventions"/>-->
-    <!--<rule ref="rulesets/naming.xml/ClassNamingConventions"/>-->
-    <!--<rule ref="rulesets/naming.xml/AbstractNaming"/>-->
-    <!--<rule ref="rulesets/naming.xml/AvoidDollarSigns"/>-->
-    <!--<rule ref="rulesets/naming.xml/MethodWithSameNameAsEnclosingClass"/>-->
-    <!--<rule ref="rulesets/naming.xml/SuspiciousHashcodeMethodName"/>-->
-    <!--<rule ref="rulesets/naming.xml/SuspiciousConstantFieldName"/>-->
-    <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingTypeName"/>-->
-    <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingMethodName"/>-->
-    <!--<rule ref="rulesets/naming.xml/AvoidNonConstructorMethodsWithClassName"/>-->
-    <!--<rule ref="rulesets/naming.xml/NoPackage"/>-->
-    <!--<rule ref="rulesets/naming.xml/PackageCase"/>-->
-
-    <!--<rule ref="rulesets/optimizations.xml/LocalVariableCouldBeFinal"/>-->
-    <!--<rule ref="rulesets/optimizations.xml/MethodArgumentCouldBeFinal"/>-->
-    <!--<rule ref="rulesets/optimizations.xml/AvoidInstantiatingObjectsInLoops"/>-->
-    <!--<rule ref="rulesets/optimizations.xml/UseArrayListInsteadOfVector"/>-->
-    <!--<rule ref="rulesets/optimizations.xml/SimplifyStartsWith"/>-->
-    <!--<rule ref="rulesets/optimizations.xml/UseStringBufferForStringAppends"/>-->
-
-    <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingThrowable"/>-->
-    <!--<rule ref="rulesets/strictexception.xml/SignatureDeclareThrowsException"/>-->
-    <!--<rule ref="rulesets/strictexception.xml/ExceptionAsFlowControl"/>-->
-    <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingNPE"/>-->
-    <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingRawExceptionTypes"/>-->
-    <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingNullPointerException"/>-->
-
-    <!--<rule ref="rulesets/strings.xml/AvoidDuplicateLiterals"/>-->
-    <!--<rule ref="rulesets/strings.xml/StringInstantiation"/>-->
-    <!--<rule ref="rulesets/strings.xml/StringToString"/>-->
-    <!--<rule ref="rulesets/strings.xml/AvoidConcatenatingNonLiteralsInStringBuffer"/>-->
-    <!--<rule ref="rulesets/strings.xml/UnnecessaryCaseChange"/>-->
-
-    <!--<rule ref="rulesets/sunsecure.xml/MethodReturnsInternalArray"/>-->
-    <!--<rule ref="rulesets/sunsecure.xml/ArrayIsStoredDirectly"/>-->
-
-    <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable"/>
-    <rule ref="rulesets/unusedcode.xml/UnusedPrivateField"/>
-    <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod"/>
-    <!--<rule ref="rulesets/unusedcode.xml/UnusedFormalParameter"/>-->
-
-    <rule name="DontUseLoggerGetLogger"
-          message="Don't use Logger.getLogger(...), use LogUtils.getL7dLogger(....) instead"
-          class="net.sourceforge.pmd.rules.XPathRule">
-        <priority>2</priority>
-        <description>Don't use Logger.getLogger(...), use LogUtils.getL7dLogger(....) instead</description>
-        <properties>
-            <property name="xpath">
-                <value>
-<![CDATA[
-//PrimaryPrefix/Name[ends-with(@Image, 'Logger.getLogger') and //PackageDeclaration/Name[starts-with(@Image, 'org.apache.cxf')]]
-]]>
-                </value>
-            </property>
-        </properties>
-    </rule>
-
-</ruleset>
diff --git a/trunk/buildingtools/src/main/resources/notice-supplements.xml b/trunk/buildingtools/src/main/resources/notice-supplements.xml
deleted file mode 100644
index 6da46a0..0000000
--- a/trunk/buildingtools/src/main/resources/notice-supplements.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<supplementalDataModels>
-  <supplement>
-    <project>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-impl</artifactId>
-      <name>Sun JAXB Reference Implementation Runtime</name>
-      <organization>
-        <name>Sun Microsystems</name>
-        <url>http://www.sun.com/</url>
-      </organization>
-      <licenses>
-        <license>
-          <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
-          <url>http://www.sun.com/cddl/cddl.html</url>
-        </license>
-      </licenses>
-    </project>
-  </supplement>
-  <supplement>
-    <project>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-xjc</artifactId>
-      <name>Sun JAXB Reference Implementation Tools</name>
-      <organization>
-        <name>Sun Microsystems</name>
-        <url>http://www.sun.com/</url>
-      </organization>
-      <licenses>
-        <license>
-          <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
-          <url>http://www.sun.com/cddl/cddl.html</url>
-        </license>
-      </licenses>
-    </project>
-  </supplement>
-  <supplement>
-    <project>
-      <groupId>com.sun.xml.fastinfoset</groupId>
-      <artifactId>FastInfoset</artifactId>
-      <name>Sun FastInfoset Implementation</name>
-      <organization>
-        <name>Sun Microsystems</name>
-        <url>http://www.sun.com/</url>
-      </organization>
-      <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-        </license>
-      </licenses>
-    </project>
-  </supplement>
-  <supplement>
-    <project>
-      <groupId>com.sun.xml.messaging.saaj</groupId>
-      <artifactId>saaj-impl</artifactId>
-      <name>Sun SAAJ Reference Implementation</name>
-      <organization>
-        <name>Sun Microsystems</name>
-        <url>http://www.sun.com/</url>
-      </organization>
-      <licenses>
-        <license>
-          <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
-          <url>http://www.sun.com/cddl/cddl.html</url>
-        </license>
-      </licenses>
-    </project>
-  </supplement>
-  <supplement>
-    <project>
-      <groupId>javax.xml.soap</groupId>
-      <artifactId>saaj-api</artifactId>
-      <name>Sun SAAJ API</name>
-      <organization>
-        <name>Sun Microsystems</name>
-        <url>http://www.sun.com/</url>
-      </organization>
-      <licenses>
-        <license>
-          <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
-          <url>http://www.sun.com/cddl/cddl.html</url>
-        </license>
-      </licenses>
-    </project>
-  </supplement>
-  <supplement>
-    <project>
-      <groupId>org.apache.ws.security</groupId>
-      <artifactId>wss4j</artifactId>
-      <name>Apache WSS4J</name>
-      <organization>
-        <name>The Apache Software Foundation</name>
-        <url>http://www.apache.org/</url>
-      </organization>
-      <licenses>
-        <license>
-          <name>The Apache Software License, Version 2.0</name>
-          <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-        </license>
-      </licenses>
-    </project>
-  </supplement>
-  <supplement>
-    <project>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
-      <name>Java Architecture for XML Binding (JAXB API)</name>
-      <organization>
-        <name>Sun Microsystems</name>
-        <url>http://www.sun.com/</url>
-      </organization>
-      <licenses>
-        <license>
-          <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
-          <url>http://www.sun.com/cddl/cddl.html</url>
-        </license>
-      </licenses>
-    </project>
-  </supplement>
-  <supplement>
-    <project>
-      <groupId>xalan</groupId>
-      <artifactId>xalan</artifactId>
-      <name>Apache Xalan-Java</name>
-      <organization>
-        <name>The Apache Software Foundation</name>
-        <url>http://www.apache.org</url>
-      </organization>
-      <licenses>
-        <license>
-          <name>The Apache Software License, Version 2.0</name>
-          <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-        </license>
-      </licenses>
-    </project>
-  </supplement>
-  <supplement>
-    <project>
-      <groupId>net.java.dev.stax-utils</groupId>
-      <artifactId>stax-utils</artifactId>
-      <name>StAX Utilities</name>
-    </project>
-  </supplement>
-  <supplement>
-    <project>
-      <groupId>jdom</groupId>
-      <artifactId>jdom</artifactId>
-      <name>JDOM</name>
-      <organization>
-        <name>jdom.org</name>
-        <url>http://www.jdom.org</url>
-      </organization>
-      <licenses>
-        <license>
-          <name>Modified Apache Software License</name>
-          <url>licenses/jdom.txt</url>
-        </license>
-      </licenses>
-    </project>
-  </supplement>
-  <supplement>
-    <project>
-      <groupId>xml-security</groupId>
-      <artifactId>xmlsec</artifactId>
-      <name>XML Security</name>
-      <organization>
-        <name>The Apache Software Foundation</name>
-        <url>http://www.apache.org</url>
-      </organization>
-      <licenses>
-        <license>
-          <name>The Apache Software License, Version 2.0</name>
-          <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-        </license>
-      </licenses>
-    </project>
-  </supplement>
-  <supplement>
-    <project>
-      <groupId>org.codehaus.jettison</groupId>
-      <artifactId>jettison</artifactId>
-      <name>Jettison</name>
-      <organization>
-        <name>Envoi Solutions LLC</name>
-        <url>http://www.envoisolutions.com</url>
-      </organization>
-      <licenses>
-        <license>
-          <name>The Apache Software License, Version 2.0</name>
-          <url>http://jettison.codehaus.org/License</url>
-        </license>
-      </licenses>
-    </project>
-  </supplement>
-</supplementalDataModels>
diff --git a/trunk/camel-core/pom.xml b/trunk/camel-core/pom.xml
deleted file mode 100755
index a538635..0000000
--- a/trunk/camel-core/pom.xml
+++ /dev/null
@@ -1,312 +0,0 @@
-<?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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.camel</groupId>
-    <artifactId>camel-parent</artifactId>
-    <version>2.8.0</version>
-    <relativePath>../parent</relativePath>
-  </parent>
-
-  <artifactId>camel-core</artifactId>
-  <packaging>bundle</packaging>
-  <name>Camel :: Core</name>
-  <description>The Core Camel Java DSL based router</description>
-
-  <properties>
-    <camel.osgi.export.pkg>
-        org.apache.camel.*
-    </camel.osgi.export.pkg>
-    <camel.osgi.import>
-        !org.apache.camel.*,
-        org.apache.xalan.xsltc.trax;resolution:=optional,
-        javax.activation;resolution:=optional,
-        javax.xml.bind;resolution:=optional,
-        javax.xml.bind.annotation;resolution:=optional,
-        javax.xml.bind.annotation.adapters;resolution:=optional,
-        javax.xml.stream;resolution:=optional,
-        org.springframework.jmx.export.annotation;resolution:=optional;version="[3,4)",
-        org.springframework.jmx.export.assembler;resolution:=optional;version="[3,4)",
-        org.springframework.jmx.export.metadata;resolution:=optional;version="[3,4)",
-        *
-    </camel.osgi.import>
-    <camel.osgi.dynamic>
-        org.apache.camel.spring.util;${camel.osgi.import.strict.version},org.apache.camel.processor.interceptor.jpa;${camel.osgi.import.strict.version}
-    </camel.osgi.dynamic>
-    <camel.osgi.activator>
-        org.apache.camel.impl.osgi.Activator
-    </camel.osgi.activator>
-  </properties>
-
-  <dependencies>
-
-    <!-- required dependencies by camel-core -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-
-    <!-- required dependencies by camel-core -->
-    <dependency>
-      <groupId>org.fusesource.commonman</groupId>
-      <artifactId>commons-management</artifactId>
-    </dependency>
-
-    <!-- to allow Spring annotations to be used for management -->
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <optional>true</optional>
-      <scope>compile</scope>
-      <exclusions>
-        <!-- we only need spring-context.jar as optional as we need the JMX export annotations -->
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-beans</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>aopalliance</groupId>
-          <artifactId>aopalliance</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <!-- osgi support -->
-    <dependency>
-        <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.core</artifactId>
-        <version>4.1.0</version>
-        <scope>provided</scope>
-        <optional>true</optional>
-    </dependency>
-
-    <!-- testing -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit-version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- logging -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- needed for jmx testing -->
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-aop</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-  </dependencies>
-
-
-  <build>
-    <plugins>
-      <!-- generate the attached tests jar -->
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.2</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <excludes>
-            <exclude>log4j.properties</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <forkMode>once</forkMode>
-          <excludes>
-            <!-- TODO FIXME ASAP -->
-            <exclude>**/XXXTest.*</exclude>            
-            <exclude>**/LRUSoftCacheTest.*</exclude>  <!-- CAMEL-4069 -->          
-          </excludes>
-        </configuration>
-      </plugin>
-
-    </plugins>
-  </build>
-
-
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <links>
-            <link>http://download.oracle.com/javase/6/docs/api/</link>
-            <link>http://download.oracle.com/javaee/6/api/</link>
-            <link>http://static.springsource.org/spring/docs/3.0.5.RELEASE/api/</link>
-          </links>
-          <stylesheetfile>${basedir}/../etc/css/stylesheet.css</stylesheetfile>
-          <linksource>true</linksource>
-          <maxmemory>256m</maxmemory>
-          <source>1.6</source>
-
-          <groups>
-            <group>
-              <title>Camel API</title>
-              <packages>org.apache.camel</packages>
-            </group>
-            <group>
-              <title>Fluent API (DSL) for building EIP rules</title>
-              <packages>org.apache.camel.builder:org.apache.camel.builder.*</packages>
-            </group>
-            <group>
-              <title>The bean and JAXB2 model for EIP rule definitions</title>
-              <packages>org.apache.camel.model:org.apache.camel.model.*</packages>
-            </group>
-            <group>
-              <title>Strategy APIs for implementors extending Camel</title>
-              <packages>org.apache.camel.spi</packages>
-            </group>
-            <group>
-              <title>Language APIs and plugins for Expressions and Predicates</title>
-              <packages>org.apache.camel.language:org.apache.camel.language.*</packages>
-            </group>
-            <group>
-              <title>Processors to implement the Enterprise Integration Patterns</title>
-              <packages>org.apache.camel.processor:org.apache.camel.processor.*</packages>
-            </group>
-            <group>
-              <title>Camel Components</title>
-              <packages>org.apache.camel.component.*</packages>
-            </group>
-            <group>
-              <title>Camel Runtime</title>
-              <packages>org.apache.camel.impl:org.apache.camel.impl.*</packages>
-            </group>
-            <group>
-              <title>Type conversion helper classes</title>
-              <packages>org.apache.camel.converter:org.apache.camel.converter.*</packages>
-            </group>
-            <group>
-              <title>Utility classes</title>
-              <packages>org.apache.camel.util:org.apache.camel.util.*:org.apache.camel.view</packages>
-            </group>
-          </groups>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-
-
-  <profiles>
-    <profile>
-      <id>release</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>package</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <links>
-                <link>http://download.oracle.com/javase/6/docs/api/</link>
-                <link>http://download.oracle.com/javaee/6/api/</link>
-                <link>http://static.springsource.org/spring/docs/3.0.5.RELEASE/api/</link>
-              </links>
-              <stylesheetfile>${basedir}/../etc/css/stylesheet.css</stylesheetfile>
-              <linksource>true</linksource>
-              <maxmemory>256m</maxmemory>
-              <source>1.6</source>
-
-              <groups>
-                <group>
-                  <title>Camel API</title>
-                  <packages>org.apache.camel</packages>
-                </group>
-                <group>
-                  <title>Fluent API (DSL) for building EIP rules</title>
-                  <packages>org.apache.camel.builder:org.apache.camel.builder.*</packages>
-                </group>
-                <group>
-                  <title>The bean and JAXB2 model for EIP rule definitions</title>
-                  <packages>org.apache.camel.model:org.apache.camel.model.*</packages>
-                </group>
-                <group>
-                  <title>Strategy APIs for implementors extending Camel</title>
-                  <packages>org.apache.camel.spi</packages>
-                </group>
-                <group>
-                  <title>Language APIs and plugins for Expressions and Predicates</title>
-                  <packages>org.apache.camel.language:org.apache.camel.language.*</packages>
-                </group>
-                <group>
-                  <title>Processors to implement the Enterprise Integration Patterns</title>
-                  <packages>org.apache.camel.processor:org.apache.camel.processor.*</packages>
-                </group>
-                <group>
-                  <title>Camel Components</title>
-                  <packages>org.apache.camel.component.*</packages>
-                </group>
-                <group>
-                  <title>Camel Runtime</title>
-                  <packages>org.apache.camel.impl:org.apache.camel.impl.*</packages>
-                </group>
-                <group>
-                  <title>Type conversion helper classes</title>
-                  <packages>org.apache.camel.converter:org.apache.camel.converter.*</packages>
-                </group>
-                <group>
-                  <title>Utility classes</title>
-                  <packages>org.apache.camel.util:org.apache.camel.util.*:org.apache.camel.view</packages>
-                </group>
-              </groups>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
-</project>
diff --git a/trunk/camel-core/src/main/data/bar.xml b/trunk/camel-core/src/main/data/bar.xml
deleted file mode 100644
index 1e171c4..0000000
--- a/trunk/camel-core/src/main/data/bar.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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.
--->
-<hello>bar</hello>
diff --git a/trunk/camel-core/src/main/data/foo.xml b/trunk/camel-core/src/main/data/foo.xml
deleted file mode 100644
index c119688..0000000
--- a/trunk/camel-core/src/main/data/foo.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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.
--->
-<hello>foo</hello>
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/AlreadyStoppedException.java b/trunk/camel-core/src/main/java/org/apache/camel/AlreadyStoppedException.java
deleted file mode 100644
index 285348d..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/AlreadyStoppedException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * 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;
-
-/**
- * Exception thrown in situations when a {@link Service} has already been stopped.
- *
- * @version 
- */
-public class AlreadyStoppedException extends CamelException {
-    private static final long serialVersionUID = -8721487434390572639L;
-
-    public AlreadyStoppedException() {
-        super("Already stopped");
-    }
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/AsyncCallback.java b/trunk/camel-core/src/main/java/org/apache/camel/AsyncCallback.java
deleted file mode 100644
index cb14029..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/AsyncCallback.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * 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;
-
-/**
- * The callback interface for an {@link AsyncProcessor} so that it can
- * notify you when an {@link Exchange} is done.
- * <p/>
- * For example a {@link AsyncProcessor} should invoke the done method when the {@link Exchange} is ready
- * to be continued routed. This allows to implement asynchronous {@link Producer} which can continue
- * routing {@link Exchange} when all the data has been gathered. This allows to build non blocking
- * request/reply communication.
- *
- * @version 
- */
-public interface AsyncCallback {
-
-    /**
-     * This method is invoked once the {@link Exchange is done}.
-     * <p/>
-     * If an exception occurred while processing the exchange, the exception field of the
-     * {@link Exchange} being processed will hold the caused exception.
-     *
-     * @param doneSync is <tt>true</tt> if the processing of the {@link Exchange} was completed by the synchronously thread.
-     *                 Otherwise its <tt>false</tt> to indicate it was completed by the asynchronously thread.
-     */
-    void done(boolean doneSync);
-
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/AsyncProcessor.java b/trunk/camel-core/src/main/java/org/apache/camel/AsyncProcessor.java
deleted file mode 100644
index bb5797b..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/AsyncProcessor.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * 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;
-
-/**
- * An <b>asynchronous</b> processor which can process an {@link Exchange} in an asynchronous fashion
- * and signal completion by invoking the {@link AsyncCallback}.
- * <p/>
- * Any processor can be coerced to have an {@link AsyncProcessor} interface by using the
- * {@link org.apache.camel.impl.converter.AsyncProcessorTypeConverter#convert AsyncProcessorTypeConverter.covert}
- * method.
- * <p/>
- * <b>Important:<b/> Use the {@link org.apache.camel.util.AsyncProcessorHelper#process(AsyncProcessor, Exchange, AsyncCallback)}
- * method to invoke the process method, which ensure Camel have a chance to interweave and invoke it in a reliable manner.
- * For example when using transactions all the invocations has to occur in synchronous manner to ensure the transaction
- * work is done in the same thread, which is required by Spring TransactionManager.
- *
- * @version 
- */
-public interface AsyncProcessor extends Processor {
-
-    /**
-     * Processes the message exchange.
-     * Similar to {@link Processor#process}, but the caller supports having the exchange asynchronously processed.
-     * <p/>
-     * If there was a failure processing then the caused {@link Exception} would be set on the {@link Exchange}.
-     *
-     * @param exchange the message exchange
-     * @param callback the {@link AsyncCallback} will be invoked when the processing of the exchange is completed.
-     *                 If the exchange is completed synchronously, then the callback is also invoked synchronously.
-     *                 The callback should therefore be careful of starting recursive loop.
-     * @return (doneSync) <tt>true</tt> to continue execute synchronously, <tt>false</tt> to continue being executed asynchronously
-     * @see org.apache.camel.util.AsyncProcessorHelper#process(AsyncProcessor, Exchange, AsyncCallback)
-     */
-    boolean process(Exchange exchange, AsyncCallback callback);
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/AsyncProducerCallback.java b/trunk/camel-core/src/main/java/org/apache/camel/AsyncProducerCallback.java
deleted file mode 100644
index 391408f..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/AsyncProducerCallback.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * 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;
-
-/**
- * Callback for sending a exchange message to a endpoint using an {@link AsyncProcessor} capable producer.
- * <p/>
- * Using this callback as a template pattern ensures that Camel handles the resource handling and will
- * start and stop the given producer, to avoid resource leaks.
- *
- * @version 
- */
-public interface AsyncProducerCallback {
-
-    /**
-     * Performs operation on the given producer to send the given exchange.
-     *
-     * @param producer        the producer, is newer <tt>null</tt>
-     * @param asyncProducer   the async producer, is newer <tt>null</tt>
-     * @param exchange        the exchange, can be <tt>null</tt> if so then create a new exchange from the producer
-     * @param exchangePattern the exchange pattern, can be <tt>null</tt>
-     * @param callback        the async callback
-     * @return (doneSync) <tt>true</tt> to continue execute synchronously, <tt>false</tt> to continue being executed asynchronously
-     */
-    boolean doInAsyncProducer(Producer producer, AsyncProcessor asyncProducer, Exchange exchange,
-                              ExchangePattern exchangePattern, AsyncCallback callback);
-}
\ No newline at end of file
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/Attachments.java b/trunk/camel-core/src/main/java/org/apache/camel/Attachments.java
deleted file mode 100644
index df363ea..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/Attachments.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * 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;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Marks a parameter as being Map of attachments of an inbound {@link Message}
- * 
- * @version 
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Target({ElementType.PARAMETER })
-public @interface Attachments {
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/BatchConsumer.java b/trunk/camel-core/src/main/java/org/apache/camel/BatchConsumer.java
deleted file mode 100644
index 40e4058..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/BatchConsumer.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * 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;
-
-import java.util.Queue;
-
-/**
- * A consumer of a batch of message exchanges from an {@link Endpoint}
- *
- * @version 
- */
-public interface BatchConsumer extends Consumer {
-
-    /**
-     * Sets a maximum number of messages as a limit to poll at each polling.
-     * <p/>
-     * Can be used to limit eg to 100 to avoid when starting and there are millions
-     * of messages for you in the first poll.
-     * <p/>
-     * Is default unlimited, but use 0 or negative number to disable it as unlimited.
-     *
-     * @param maxMessagesPerPoll  maximum messages to poll.
-     */
-    void setMaxMessagesPerPoll(int maxMessagesPerPoll);
-
-    /**
-     * Processes the list of {@link org.apache.camel.Exchange} in a batch. 
-     * <p/>
-     * Each message exchange will be processed individually but the batch
-     * consumer will add properties with the current index and total in the batch.
-     * The items in the Queue may actually be Holder objects that store other 
-     * data alongside the Exchange.
-     *
-     * @param exchanges list of items in this batch
-     * @return number of messages actually processed
-     * @throws Exception if an internal processing error has occurred.
-     */
-    int processBatch(Queue<Object> exchanges) throws Exception;
-
-    /**
-     * Whether processing the batch is still allowed.
-     * <p/>
-     * This is used during shutdown to help indicate whether to complete the pending
-     * exchanges or stop after current exchange has been processed.
-     *
-     * @return <tt>true</tt> to continue processing from the batch, or <tt>false</tt> to stop.
-     * @see org.apache.camel.ShutdownRunningTask
-     */
-    boolean isBatchAllowed();
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/BinaryPredicate.java b/trunk/camel-core/src/main/java/org/apache/camel/BinaryPredicate.java
deleted file mode 100644
index d6a921a..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/BinaryPredicate.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * 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;
-
-/**
- * A predicate which is evaluating a binary expression.
- * <p/>
- * The predicate has a left and right hand side expressions which
- * is matched based on an operator.
- * <p/>
- * This predicate offers the {@link #matchesReturningFailureMessage} method
- * which evaluates and return a detailed failure message if the predicate did not match.
- *
- * @version 
- */
-public interface BinaryPredicate extends Predicate {
-
-    /**
-     * Gets the operator
-     *
-     * @return the operator text
-     */
-    String getOperator();
-
-    /**
-     * Gets the left hand side expression
-     *
-     * @return the left expression
-     */
-    Expression getLeft();
-
-    /**
-     * Gets the right hand side expression
-     *
-     * @return the right expression
-     */
-    Expression getRight();
-
-    /**
-     * Evaluates the predicate on the message exchange and returns <tt>null</tt> if this
-     * exchange matches the predicate. If it did <b>not</b> match, then a failure message
-     * is returned detailing why it did not fail, which can be used for end users to understand
-     * the failure.
-     *
-     * @param exchange the message exchange
-     * @return <tt>null</tt> if the predicate matches.
-     */
-    String matchesReturningFailureMessage(Exchange exchange);
-
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/Body.java b/trunk/camel-core/src/main/java/org/apache/camel/Body.java
deleted file mode 100644
index 4a87a4d..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/Body.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * 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;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Marks a parameter as being the body of an inbound {@link Message}
- * 
- * @version 
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Target({ElementType.PARAMETER })
-public @interface Body {
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/CamelAuthorizationException.java b/trunk/camel-core/src/main/java/org/apache/camel/CamelAuthorizationException.java
deleted file mode 100644
index 17f6f3a..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/CamelAuthorizationException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * 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;
-
-public class CamelAuthorizationException extends CamelExchangeException {
-    private final String policyId;
-    
-    public CamelAuthorizationException(String message, Exchange exchange) {
-        super(message, exchange);
-        policyId = exchange.getIn().getHeader(Exchange.AUTHENTICATION_FAILURE_POLICY_ID, String.class);        
-    }
-    
-    public CamelAuthorizationException(String message, Exchange exchange, Throwable cause) {
-        super(message, exchange, cause);
-        policyId = exchange.getIn().getHeader(Exchange.AUTHENTICATION_FAILURE_POLICY_ID, String.class);
-    }
-    
-    public String getPolicyId() {
-        return policyId;
-    }
-
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java b/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
deleted file mode 100644
index 21e656b..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
+++ /dev/null
@@ -1,1012 +0,0 @@
-/**
- * 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;
-
-import java.io.InputStream;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.camel.builder.ErrorHandlerBuilder;
-import org.apache.camel.model.DataFormatDefinition;
-import org.apache.camel.model.RouteDefinition;
-import org.apache.camel.model.RoutesDefinition;
-import org.apache.camel.spi.CamelContextNameStrategy;
-import org.apache.camel.spi.ClassResolver;
-import org.apache.camel.spi.DataFormat;
-import org.apache.camel.spi.DataFormatResolver;
-import org.apache.camel.spi.Debugger;
-import org.apache.camel.spi.EndpointStrategy;
-import org.apache.camel.spi.ExecutorServiceStrategy;
-import org.apache.camel.spi.FactoryFinder;
-import org.apache.camel.spi.FactoryFinderResolver;
-import org.apache.camel.spi.InflightRepository;
-import org.apache.camel.spi.Injector;
-import org.apache.camel.spi.InterceptStrategy;
-import org.apache.camel.spi.Language;
-import org.apache.camel.spi.LifecycleStrategy;
-import org.apache.camel.spi.ManagementStrategy;
-import org.apache.camel.spi.NodeIdFactory;
-import org.apache.camel.spi.PackageScanClassResolver;
-import org.apache.camel.spi.ProcessorFactory;
-import org.apache.camel.spi.Registry;
-import org.apache.camel.spi.ServicePool;
-import org.apache.camel.spi.ShutdownStrategy;
-import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.camel.spi.UuidGenerator;
-
-/**
- * Interface used to represent the context used to configure routes and the
- * policies to use during message exchanges between endpoints.
- * <p/>
- * The context offers the following methods to control the lifecycle:
- * <ul>
- *   <li>{@link #start()}  - to start</li>
- *   <li>{@link #stop()} - to shutdown (will stop all routes/components/endpoints etc and clear internal state/cache)</li>
- *   <li>{@link #suspend()} - to pause routing messages</li>
- *   <li>{@link #resume()} - to resume after a suspend</li>
- * </ul>
- * <p/>
- * <b>Notice:</b> that {@link #stop()} and {@link #suspend()} will graceful stop/suspend routs ensuring any in progress
- * messages is given time to complete. See more details at {@link org.apache.camel.spi.ShutdownStrategy}.
- * <p/>
- * If you are doing a hot restart then its adviced to use the suspend/resume methods which ensures a faster
- * restart but also allows any internal state to be kept as is.
- * The stop/start approach will do a <i>cold</i> restart of Camel, where all internal state is reset.
- * <p/>
- * End users is adviced to use suspend/resume. Using stop is for shutting down Camel and its not guaranteed that
- * when its being started again using the start method that everything works out of the box.
- *
- * @version 
- */
-public interface CamelContext extends SuspendableService, RuntimeConfiguration {
-
-    /**
-     * Gets the name (id) of the this context.
-     *
-     * @return the name
-     */
-    String getName();
-
-    /**
-     * Gets the current name strategy
-     *
-     * @return name strategy
-     */
-    CamelContextNameStrategy getNameStrategy();
-
-    /**
-     * Sets a custom name strategy
-     *
-     * @param nameStrategy name strategy
-     */
-    void setNameStrategy(CamelContextNameStrategy nameStrategy);
-
-    /**
-     * Gets the name this {@link CamelContext} was registered in JMX.
-     * <p/>
-     * The reason that a {@link CamelContext} can have a different name in JMX is the fact to remedy for name clash
-     * in JMX when having multiple {@link CamelContext}s in the same JVM. Camel will automatic reassign and use
-     * a free name to avoid failing to start.
-     *
-     * @return the management name
-     */
-    String getManagementName();
-
-    /**
-     * Sets the name this {@link CamelContext} was registered in JMX.
-     *
-     * @param name  the actual name used when registering this {@link CamelContext} in JMX
-     */
-    void setManagementName(String name);
-
-    /**
-     * Gets the version of the this context.
-     *
-     * @return the version
-     */
-    String getVersion();
-
-    /**
-     * Get the status of this context
-     *
-     * @return the status
-     */
-    ServiceStatus getStatus();
-
-    /**
-     * Gets the uptime in a human readable format
-     *
-     * @return the uptime in days/hours/minutes
-     */
-    String getUptime();
-
-    // Service Methods
-    //-----------------------------------------------------------------------
-
-    /**
-     * Adds a service to this context, which allows this context to control the lifecycle, ensuring
-     * the service is stopped when the context stops.
-     * <p/>
-     * The service will also have {@link CamelContext} injected if its {@link CamelContextAware}.
-     * The service will also be enlisted in JMX for management (if JMX is enabled).
-     * The service will be started, if its not already started.
-     *
-     * @param object the service
-     * @throws Exception can be thrown when starting the service
-     */
-    void addService(Object object) throws Exception;
-
-    /**
-     * Has the given service already been added to this context?
-     *
-     * @param object the service
-     * @return <tt>true</tt> if already added, <tt>false</tt> if not.
-     */
-    boolean hasService(Object object);
-
-    /**
-     * Adds the given listener to be invoked when {@link CamelContext} have just been started.
-     * <p/>
-     * This allows listeners to do any custom work after the routes and other services have been started and are running.
-     * <p/><b>Important:</b> The listener will always be invoked, also if the {@link CamelContext} has already been
-     * started, see the {@link org.apache.camel.StartupListener#onCamelContextStarted(CamelContext, boolean)} method.
-     *
-     * @param listener the listener
-     * @throws Exception can be thrown if {@link CamelContext} is already started and the listener is invoked
-     *                   and cause an exception to be thrown
-     */
-    void addStartupListener(StartupListener listener) throws Exception;
-
-    // Component Management Methods
-    //-----------------------------------------------------------------------
-
-    /**
-     * Adds a component to the context.
-     *
-     * @param componentName the name the component is registered as
-     * @param component     the component
-     */
-    void addComponent(String componentName, Component component);
-
-    /**
-     * Is the given component already registered?
-     *
-     * @param componentName the name of the component
-     * @return the registered Component or <tt>null</tt> if not registered
-     */
-    Component hasComponent(String componentName);
-
-    /**
-     * Gets a component from the context by name.
-     *
-     * @param componentName the name of the component
-     * @return the component
-     */
-    Component getComponent(String componentName);
-
-    /**
-     * Gets a component from the context by name and specifying the expected type of component.
-     *
-     * @param name          the name to lookup
-     * @param componentType the expected type
-     * @return the component
-     */
-    <T extends Component> T getComponent(String name, Class<T> componentType);
-
-    /**
-     * Gets a readonly list of names of the components currently registered
-     *
-     * @return a readonly list with the names of the the components
-     */
-    List<String> getComponentNames();
-
-    /**
-     * Removes a previously added component.
-     *
-     * @param componentName the component name to remove
-     * @return the previously added component or null if it had not been previously added.
-     */
-    Component removeComponent(String componentName);
-
-    // Endpoint Management Methods
-    //-----------------------------------------------------------------------
-
-    /**
-     * Resolves the given name to an {@link Endpoint} of the specified type.
-     * If the name has a singleton endpoint registered, then the singleton is returned.
-     * Otherwise, a new {@link Endpoint} is created and registered.
-     *
-     * @param uri the URI of the endpoint
-     * @return the endpoint
-     */
-    Endpoint getEndpoint(String uri);
-
-    /**
-     * Resolves the given name to an {@link Endpoint} of the specified type.
-     * If the name has a singleton endpoint registered, then the singleton is returned.
-     * Otherwise, a new {@link Endpoint} is created and registered.
-     *
-     * @param name         the name of the endpoint
-     * @param endpointType the expected type
-     * @return the endpoint
-     */
-    <T extends Endpoint> T getEndpoint(String name, Class<T> endpointType);
-
-    /**
-     * Returns the collection of all registered endpoints.
-     *
-     * @return all endpoints
-     */
-    Collection<Endpoint> getEndpoints();
-
-    /**
-     * Returns a new Map containing all of the active endpoints with the key of the map being their
-     * unique key.
-     *
-     * @return map of active endpoints
-     */
-    Map<String, Endpoint> getEndpointMap();
-
-    /**
-     * Is the given endpoint already registered?
-     *
-     * @param uri the URI of the endpoint
-     * @return the registered endpoint or <tt>null</tt> if not registered
-     */
-    Endpoint hasEndpoint(String uri);
-
-    /**
-     * Adds the endpoint to the context using the given URI.
-     *
-     * @param uri      the URI to be used to resolve this endpoint
-     * @param endpoint the endpoint to be added to the context
-     * @return the old endpoint that was previously registered or <tt>null</tt> if none was registered
-     * @throws Exception if the new endpoint could not be started or the old endpoint could not be stopped
-     */
-    Endpoint addEndpoint(String uri, Endpoint endpoint) throws Exception;
-
-    /**
-     * Removes all endpoints with the given URI.
-     *
-     * @param pattern an uri or pattern to match
-     * @return a collection of endpoints removed or null if there are no endpoints for this URI
-     * @throws Exception if at least one endpoint could not be stopped
-     * @see org.apache.camel.util.EndpointHelper#matchEndpoint(String, String) for pattern
-     */
-    Collection<Endpoint> removeEndpoints(String pattern) throws Exception;
-
-    /**
-     * Registers a {@link org.apache.camel.spi.EndpointStrategy callback} to allow you to do custom
-     * logic when an {@link Endpoint} is about to be registered to the {@link CamelContext} endpoint registry.
-     * <p/>
-     * When a callback is added it will be executed on the already registered endpoints allowing you to catch-up
-     *
-     * @param strategy callback to be invoked
-     */
-    void addRegisterEndpointCallback(EndpointStrategy strategy);
-
-    // Route Management Methods
-    //-----------------------------------------------------------------------
-
-    /**
-     * Returns a list of the current route definitions
-     *
-     * @return list of the current route definitions
-     */
-    List<RouteDefinition> getRouteDefinitions();
-
-    /**
-     * Gets the route definition with the given id
-     *
-     * @param id id of the route
-     * @return the route definition or <tt>null</tt> if not found
-     */
-    RouteDefinition getRouteDefinition(String id);
-
-    /**
-     * Returns the current routes in this context
-     *
-     * @return the current routes
-     */
-    List<Route> getRoutes();
-
-    /**
-     * Gets the route with the given id
-     *
-     * @param id id of the route
-     * @return the route or <tt>null</tt> if not found
-     */
-    Route getRoute(String id);
-
-    /**
-     * Adds a collection of routes to this context using the given builder
-     * to build them
-     *
-     * @param builder the builder which will create the routes and add them to this context
-     * @throws Exception if the routes could not be created for whatever reason
-     */
-    void addRoutes(RoutesBuilder builder) throws Exception;
-
-    /**
-     * Loads a collection of route definitions from the given {@link java.io.InputStream}.
-     *
-     * @param is input stream with the route(s) definition to add
-     * @throws Exception if the route definitions could not be loaded for whatever reason
-     * @return the route definitions
-     */
-    RoutesDefinition loadRoutesDefinition(InputStream is) throws Exception;
-
-    /**
-     * Adds a collection of route definitions to the context
-     *
-     * @param routeDefinitions the route(s) definition to add
-     * @throws Exception if the route definitions could not be created for whatever reason
-     */
-    void addRouteDefinitions(Collection<RouteDefinition> routeDefinitions) throws Exception;
-
-    /**
-     * Add a route definition to the context
-     *
-     * @param routeDefinition the route definition to add
-     * @throws Exception if the route definition could not be created for whatever reason
-     */
-    void addRouteDefinition(RouteDefinition routeDefinition) throws Exception;
-
-    /**
-     * Removes a collection of route definitions from the context - stopping any previously running
-     * routes if any of them are actively running
-     *
-     * @param routeDefinitions route(s) definitions to remove
-     * @throws Exception if the route definitions could not be removed for whatever reason
-     */
-    void removeRouteDefinitions(Collection<RouteDefinition> routeDefinitions) throws Exception;
-
-    /**
-     * Removes a route definition from the context - stopping any previously running
-     * routes if any of them are actively running
-     *
-     * @param routeDefinition route definition to remove
-     * @throws Exception if the route definition could not be removed for whatever reason
-     */
-    void removeRouteDefinition(RouteDefinition routeDefinition) throws Exception;
-
-    /**
-     * Starts the given route if it has been previously stopped
-     *
-     * @param route the route to start
-     * @throws Exception is thrown if the route could not be started for whatever reason
-     */
-    void startRoute(RouteDefinition route) throws Exception;
-
-    /**
-     * Starts the given route if it has been previously stopped
-     *
-     * @param routeId the route id
-     * @throws Exception is thrown if the route could not be started for whatever reason
-     */
-    void startRoute(String routeId) throws Exception;
-
-    /**
-     * Stops the given route.
-     *
-     * @param route the route to stop
-     * @throws Exception is thrown if the route could not be stopped for whatever reason
-     */
-    void stopRoute(RouteDefinition route) throws Exception;
-
-    /**
-     * Stops the given route using {@link org.apache.camel.spi.ShutdownStrategy}.
-     *
-     * @param routeId the route id
-     * @throws Exception is thrown if the route could not be stopped for whatever reason
-     * @see #suspendRoute(String)
-     */
-    void stopRoute(String routeId) throws Exception;
-
-    /**
-     * Stops the given route using {@link org.apache.camel.spi.ShutdownStrategy} with a specified timeout.
-     *
-     * @param routeId the route id
-     * @param timeout  timeout
-     * @param timeUnit the unit to use
-     * @throws Exception is thrown if the route could not be stopped for whatever reason
-     * @see #suspendRoute(String, long, java.util.concurrent.TimeUnit)
-     */
-    void stopRoute(String routeId, long timeout, TimeUnit timeUnit) throws Exception;
-
-    /**
-     * Stops the given route using {@link org.apache.camel.spi.ShutdownStrategy} with a specified timeout 
-     * and optional abortAfterTimeout mode.
-     *
-     * @param routeId the route id
-     * @param timeout  timeout
-     * @param timeUnit the unit to use
-     * @param abortAfterTimeout should abort shutdown after timeout
-     * @return <tt>true</tt> if the route is stopped before the timeout
-     * @throws Exception is thrown if the route could not be stopped for whatever reason
-     * @see #suspendRoute(String, long, java.util.concurrent.TimeUnit)
-     */
-    boolean stopRoute(String routeId, long timeout, TimeUnit timeUnit, boolean abortAfterTimeout) throws Exception;
-    
-    /**
-     * Shutdown and <b>removes</b> the given route using {@link org.apache.camel.spi.ShutdownStrategy}.
-     *
-     * @param routeId the route id
-     * @throws Exception is thrown if the route could not be shutdown for whatever reason
-     * @deprecated use {@link #stopRoute(String)} and {@link #removeRoute(String)}
-     */
-    @Deprecated
-    void shutdownRoute(String routeId) throws Exception;
-
-    /**
-     * Shutdown and <b>removes</b> the given route using {@link org.apache.camel.spi.ShutdownStrategy} with a specified timeout.
-     *
-     * @param routeId  the route id
-     * @param timeout  timeout
-     * @param timeUnit the unit to use
-     * @throws Exception is thrown if the route could not be shutdown for whatever reason
-     * @deprecated use {@link #stopRoute(String, long, java.util.concurrent.TimeUnit)} and {@link #removeRoute(String)}
-     */
-    @Deprecated
-    void shutdownRoute(String routeId, long timeout, TimeUnit timeUnit) throws Exception;
-
-    /**
-     * Removes the given route (the route <b>must</b> be stopped before it can be removed).
-     * <p/>
-     * <br/>A route which is removed will be unregistered from JMX, have its services stopped/shutdown and the route
-     * definition etc. will also be removed. All the resources related to the route will be stopped and cleared.
-     * <p/>
-     * <br/>End users can use this method to remove unwanted routes or temporary routes which no longer is in demand.
-     *
-     * @param routeId the route id
-     * @return <tt>true</tt> if the route was removed, <tt>false</tt> if the route could not be removed because its not stopped
-     * @throws Exception is thrown if the route could not be shutdown for whatever reason
-     */
-    boolean removeRoute(String routeId) throws Exception;
-
-    /**
-     * Resumes the given route if it has been previously suspended
-     * <p/>
-     * If the route does <b>not</b> support suspension the route will be started instead
-     *
-     * @param routeId the route id
-     * @throws Exception is thrown if the route could not be resumed for whatever reason
-     */
-    void resumeRoute(String routeId) throws Exception;
-
-    /**
-     * Suspends the given route using {@link org.apache.camel.spi.ShutdownStrategy}.
-     * <p/>
-     * Suspending a route is more gently than stopping, as the route consumers will be suspended (if they support)
-     * otherwise the consumers will be stopped.
-     * <p/>
-     * By suspending the route services will be kept running (if possible) and therefore its faster to resume the route.
-     * <p/>
-     * If the route does <b>not</b> support suspension the route will be stopped instead
-     *
-     * @param routeId the route id
-     * @throws Exception is thrown if the route could not be suspended for whatever reason
-     */
-    void suspendRoute(String routeId) throws Exception;
-
-    /**
-     * Suspends the given route using {@link org.apache.camel.spi.ShutdownStrategy} with a specified timeout.
-     * <p/>
-     * Suspending a route is more gently than stopping, as the route consumers will be suspended (if they support)
-     * otherwise the consumers will be stopped.
-     * <p/>
-     * By suspending the route services will be kept running (if possible) and therefore its faster to resume the route.
-     * <p/>
-     * If the route does <b>not</b> support suspension the route will be stopped instead
-     *
-     * @param routeId  the route id
-     * @param timeout  timeout
-     * @param timeUnit the unit to use
-     * @throws Exception is thrown if the route could not be suspended for whatever reason
-     */
-    void suspendRoute(String routeId, long timeout, TimeUnit timeUnit) throws Exception;
-
-    /**
-     * Returns the current status of the given route
-     *
-     * @param routeId the route id
-     * @return the status for the route
-     */
-    ServiceStatus getRouteStatus(String routeId);
-
-    /**
-     * Indicates whether current thread is starting route(s).
-     * <p/>
-     * This can be useful to know by {@link LifecycleStrategy} or the likes, in case
-     * they need to react differently.
-     *
-     * @return <tt>true</tt> if current thread is starting route(s), or <tt>false</tt> if not.
-     */
-    boolean isStartingRoutes();
-
-    // Properties
-    //-----------------------------------------------------------------------
-
-    /**
-     * Returns the type converter used to coerce types from one type to another
-     *
-     * @return the converter
-     */
-    TypeConverter getTypeConverter();
-
-    /**
-     * Returns the type converter registry where type converters can be added or looked up
-     *
-     * @return the type converter registry
-     */
-    TypeConverterRegistry getTypeConverterRegistry();
-
-    /**
-     * Returns the registry used to lookup components by name and type such as the Spring ApplicationContext,
-     * JNDI or the OSGi Service Registry
-     *
-     * @return the registry
-     */
-    Registry getRegistry();
-
-    /**
-     * Returns the injector used to instantiate objects by type
-     *
-     * @return the injector
-     */
-    Injector getInjector();
-
-    /**
-     * Returns the lifecycle strategies used to handle lifecycle notifications
-     *
-     * @return the lifecycle strategies
-     */
-    List<LifecycleStrategy> getLifecycleStrategies();
-
-    /**
-     * Adds the given lifecycle strategy to be used.
-     *
-     * @param lifecycleStrategy the strategy
-     */
-    void addLifecycleStrategy(LifecycleStrategy lifecycleStrategy);
-
-    /**
-     * Resolves a language for creating expressions
-     *
-     * @param language name of the language
-     * @return the resolved language
-     */
-    Language resolveLanguage(String language);
-
-    /**
-     * Parses the given text and resolve any property placeholders - using {{key}}.
-     *
-     * @param text the text such as an endpoint uri or the likes
-     * @return the text with resolved property placeholders
-     * @throws Exception is thrown if property placeholders was used and there was an error resolving them
-     */
-    String resolvePropertyPlaceholders(String text) throws Exception;
-
-    /**
-     * Gets a readonly list with the names of the languages currently registered.
-     *
-     * @return a readonly list with the names of the the languages
-     */
-    List<String> getLanguageNames();
-
-    /**
-     * Creates a new {@link ProducerTemplate} which is <b>started</b> and therefore ready to use right away.
-     * <p/>
-     * See this FAQ before use: <a href="http://camel.apache.org/why-does-camel-use-too-many-threads-with-producertemplate.html">
-     * Why does Camel use too many threads with ProducerTemplate?</a>
-     * <p/>
-     * Will use cache size defined in Camel property with key {@link Exchange#MAXIMUM_CACHE_POOL_SIZE}.
-     * If no key was defined then it will fallback to a default size of 1000.
-     * You can also use the {@link org.apache.camel.ProducerTemplate#setMaximumCacheSize(int)} method to use a custom value
-     * before starting the template.
-     *
-     * @return the template
-     * @throws RuntimeCamelException is thrown if error starting the template
-     */
-    ProducerTemplate createProducerTemplate();
-
-    /**
-     * Creates a new {@link ProducerTemplate} which is <b>started</b> and therefore ready to use right away.
-     * <p/>
-     * See this FAQ before use: <a href="http://camel.apache.org/why-does-camel-use-too-many-threads-with-producertemplate.html">
-     * Why does Camel use too many threads with ProducerTemplate?</a>
-     *
-     * @param maximumCacheSize the maximum cache size
-     * @return the template
-     * @throws RuntimeCamelException is thrown if error starting the template
-     */
-    ProducerTemplate createProducerTemplate(int maximumCacheSize);
-
-    /**
-     * Creates a new {@link ConsumerTemplate} which is <b>started</b> and therefore ready to use right away.
-     * <p/>
-     * See this FAQ before use: <a href="http://camel.apache.org/why-does-camel-use-too-many-threads-with-producertemplate.html">
-     * Why does Camel use too many threads with ProducerTemplate?</a> as it also applies for ConsumerTemplate.
-     * <p/>
-     * Will use cache size defined in Camel property with key {@link Exchange#MAXIMUM_CACHE_POOL_SIZE}.
-     * If no key was defined then it will fallback to a default size of 1000.
-     * You can also use the {@link org.apache.camel.ConsumerTemplate#setMaximumCacheSize(int)} method to use a custom value
-     * before starting the template.
-     *
-     * @return the template
-     * @throws RuntimeCamelException is thrown if error starting the template
-     */
-    ConsumerTemplate createConsumerTemplate();
-
-    /**
-     * Creates a new {@link ConsumerTemplate} which is <b>started</b> and therefore ready to use right away.
-     * <p/>
-     * See this FAQ before use: <a href="http://camel.apache.org/why-does-camel-use-too-many-threads-with-producertemplate.html">
-     * Why does Camel use too many threads with ProducerTemplate?</a> as it also applies for ConsumerTemplate.
-     *
-     * @param maximumCacheSize the maximum cache size
-     * @return the template
-     * @throws RuntimeCamelException is thrown if error starting the template
-     */
-    ConsumerTemplate createConsumerTemplate(int maximumCacheSize);
-
-    /**
-     * Adds the given interceptor strategy
-     *
-     * @param interceptStrategy the strategy
-     */
-    void addInterceptStrategy(InterceptStrategy interceptStrategy);
-
-    /**
-     * Gets the interceptor strategies
-     *
-     * @return the list of current interceptor strategies
-     */
-    List<InterceptStrategy> getInterceptStrategies();
-
-    /**
-     * Gets the default error handler builder which is inherited by the routes
-     *
-     * @return the builder
-     */
-    ErrorHandlerBuilder getErrorHandlerBuilder();
-
-    /**
-     * Sets the default error handler builder which is inherited by the routes
-     *
-     * @param errorHandlerBuilder the builder
-     */
-    void setErrorHandlerBuilder(ErrorHandlerBuilder errorHandlerBuilder);
-
-    /**
-     * Sets the data formats that can be referenced in the routes.
-     *
-     * @param dataFormats the data formats
-     */
-    void setDataFormats(Map<String, DataFormatDefinition> dataFormats);
-
-    /**
-     * Gets the data formats that can be referenced in the routes.
-     *
-     * @return the data formats available
-     */
-    Map<String, DataFormatDefinition> getDataFormats();
-
-    /**
-     * Resolve a data format given its name
-     *
-     * @param name the data format name or a reference to it in the {@link Registry}
-     * @return the resolved data format, or <tt>null</tt> if not found
-     */
-    DataFormat resolveDataFormat(String name);
-
-    /**
-     * Resolve a data format definition given its name
-     *
-     * @param name the data format definition name or a reference to it in the {@link Registry}
-     * @return the resolved data format definition, or <tt>null</tt> if not found
-     */
-    DataFormatDefinition resolveDataFormatDefinition(String name);
-
-    /**
-     * Gets the current data format resolver
-     *
-     * @return the resolver
-     */
-    DataFormatResolver getDataFormatResolver();
-
-    /**
-     * Sets a custom data format resolver
-     *
-     * @param dataFormatResolver the resolver
-     */
-    void setDataFormatResolver(DataFormatResolver dataFormatResolver);
-
-    /**
-     * Sets the properties that can be referenced in the camel context
-     *
-     * @param properties properties
-     */
-    void setProperties(Map<String, String> properties);
-
-    /**
-     * Gets the properties that can be referenced in the camel context
-     *
-     * @return the properties
-     */
-    Map<String, String> getProperties();
-
-    /**
-     * Gets the default FactoryFinder which will be used for the loading the factory class from META-INF
-     *
-     * @return the default factory finder
-     */
-    FactoryFinder getDefaultFactoryFinder();
-
-    /**
-     * Sets the factory finder resolver to use.
-     *
-     * @param resolver the factory finder resolver
-     */
-    void setFactoryFinderResolver(FactoryFinderResolver resolver);
-
-    /**
-     * Gets the FactoryFinder which will be used for the loading the factory class from META-INF in the given path
-     *
-     * @param path the META-INF path
-     * @return the factory finder
-     * @throws NoFactoryAvailableException is thrown if a factory could not be found
-     */
-    FactoryFinder getFactoryFinder(String path) throws NoFactoryAvailableException;
-
-    /**
-     * Returns the class resolver to be used for loading/lookup of classes.
-     *
-     * @return the resolver
-     */
-    ClassResolver getClassResolver();
-
-    /**
-     * Returns the package scanning class resolver
-     *
-     * @return the resolver
-     */
-    PackageScanClassResolver getPackageScanClassResolver();
-
-    /**
-     * Sets the class resolver to be use
-     *
-     * @param resolver the resolver
-     */
-    void setClassResolver(ClassResolver resolver);
-
-    /**
-     * Sets the package scanning class resolver to use
-     *
-     * @param resolver the resolver
-     */
-    void setPackageScanClassResolver(PackageScanClassResolver resolver);
-
-    /**
-     * Sets a pluggable service pool to use for {@link Producer} pooling.
-     *
-     * @param servicePool the pool
-     */
-    void setProducerServicePool(ServicePool<Endpoint, Producer> servicePool);
-
-    /**
-     * Gets the service pool for {@link Producer} pooling.
-     *
-     * @return the service pool
-     */
-    ServicePool<Endpoint, Producer> getProducerServicePool();
-
-    /**
-     * Uses a custom node id factory when generating auto assigned ids to the nodes in the route definitions
-     *
-     * @param factory custom factory to use
-     */
-    void setNodeIdFactory(NodeIdFactory factory);
-
-    /**
-     * Gets the node id factory
-     *
-     * @return the node id factory
-     */
-    NodeIdFactory getNodeIdFactory();
-
-    /**
-     * Gets the management strategy
-     *
-     * @return the management strategy
-     */
-    ManagementStrategy getManagementStrategy();
-
-    /**
-     * Sets the management strategy to use
-     *
-     * @param strategy the management strategy
-     */
-    void setManagementStrategy(ManagementStrategy strategy);
-
-    /**
-     * Gets the default tracer
-     *
-     * @return the default tracer
-     */
-    InterceptStrategy getDefaultTracer();
-
-    /**
-     * Sets a custom tracer to be used as the default tracer.
-     * <p/>
-     * <b>Note:</b> This must be set before any routes are created,
-     * changing the defaultTracer for existing routes is not supported.
-     *
-     * @param tracer the custom tracer to use as default tracer
-     */
-    void setDefaultTracer(InterceptStrategy tracer);
-
-    /**
-     * Disables using JMX as {@link org.apache.camel.spi.ManagementStrategy}.
-     */
-    void disableJMX();
-
-    /**
-     * Gets the inflight repository
-     *
-     * @return the repository
-     */
-    InflightRepository getInflightRepository();
-
-    /**
-     * Sets a custom inflight repository to use
-     *
-     * @param repository the repository
-     */
-    void setInflightRepository(InflightRepository repository);
-
-    /**
-     * Gets the the application context class loader which may be helpful for running camel in other containers
-     *
-     * @return the application context class loader
-     */
-    ClassLoader getApplicationContextClassLoader();
-
-    /**
-     * Sets the application context class loader
-     *
-     * @param classLoader the class loader
-     */
-    void setApplicationContextClassLoader(ClassLoader classLoader);
-
-    /**
-     * Gets the current shutdown strategy
-     *
-     * @return the strategy
-     */
-    ShutdownStrategy getShutdownStrategy();
-
-    /**
-     * Sets a custom shutdown strategy
-     *
-     * @param shutdownStrategy the custom strategy
-     */
-    void setShutdownStrategy(ShutdownStrategy shutdownStrategy);
-
-    /**
-     * Gets the current {@link org.apache.camel.spi.ExecutorServiceStrategy}
-     *
-     * @return the strategy
-     */
-    ExecutorServiceStrategy getExecutorServiceStrategy();
-
-    /**
-     * Sets a custom {@link org.apache.camel.spi.ExecutorServiceStrategy}
-     *
-     * @param executorServiceStrategy the custom strategy
-     */
-    void setExecutorServiceStrategy(ExecutorServiceStrategy executorServiceStrategy);
-
-    /**
-     * Gets the current {@link org.apache.camel.spi.ProcessorFactory}
-     *
-     * @return the factory, can be <tt>null</tt> if no custom factory has been set
-     */
-    ProcessorFactory getProcessorFactory();
-
-    /**
-     * Sets a custom {@link org.apache.camel.spi.ProcessorFactory}
-     *
-     * @param processorFactory the custom factory
-     */
-    void setProcessorFactory(ProcessorFactory processorFactory);
-
-    /**
-     * Gets the current {@link Debugger}
-     *
-     * @return the debugger
-     */
-    Debugger getDebugger();
-
-    /**
-     * Sets a custom {@link Debugger}
-     *
-     * @param debugger the debugger
-     */
-    void setDebugger(Debugger debugger);
-
-    /**
-     * Gets the current {@link UuidGenerator}
-     *
-     * @return the uuidGenerator
-     */
-    UuidGenerator getUuidGenerator();
-    
-    /**
-     * Sets a custom {@link UuidGenerator} (should only be set once) 
-     *
-     * @param uuidGenerator the UUID Generator
-     */
-    void setUuidGenerator(UuidGenerator uuidGenerator);
-
-    /**
-     * Whether or not type converters should be loaded lazy
-     *
-     * @return <tt>true</tt> to load lazy, <tt>false</tt> to load on startup
-     */
-    Boolean isLazyLoadTypeConverters();
-
-    /**
-     * Sets whether type converters should be loaded lazy
-     *
-     * @param lazyLoadTypeConverters <tt>true</tt> to load lazy, <tt>false</tt> to load on startup
-     */
-    void setLazyLoadTypeConverters(Boolean lazyLoadTypeConverters);
-
-    /**
-     * Whether or not <a href="http://www.slf4j.org/api/org/slf4j/MDC.html">MDC</a> logging is being enabled.
-     *
-     * @return <tt>true</tt> if MDC logging is enabled
-     */
-    Boolean isUseMDCLogging();
-
-    /**
-     * Set whether <a href="http://www.slf4j.org/api/org/slf4j/MDC.html">MDC</a> is enabled.
-     *
-     * @param useMDCLogging <tt>true</tt> to enable MDC logging, <tt>false</tt> to disable
-     */
-    void setUseMDCLogging(Boolean useMDCLogging);
-
-    /**
-     * Whether or not breadcrumb is enabled.
-     *
-     * @return <tt>true</tt> if breadcrumb is enabled
-     */
-    Boolean isUseBreadcrumb();
-
-    /**
-     * Set whether breadcrumb is enabled.
-     *
-     * @param useBreadcrumb <tt>true</tt> to enable breadcrumb, <tt>false</tt> to disable
-     */
-    void setUseBreadcrumb(Boolean useBreadcrumb);
-
-
-
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/CamelContextAware.java b/trunk/camel-core/src/main/java/org/apache/camel/CamelContextAware.java
deleted file mode 100644
index 6118e7f..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/CamelContextAware.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * 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;
-
-/**
- * An interface to represent an object which wishes to be injected with
- * a {@link CamelContext} such as when working with Spring or Guice
- *
- * @version 
- */
-public interface CamelContextAware {
-
-    /**
-     * Injects the {@link CamelContext}
-     *
-     * @param camelContext the Camel context
-     */
-    void setCamelContext(CamelContext camelContext);
-    
-    /**
-     * Get the {@link CamelContext}
-     *
-     * @return camelContext the Camel context
-     */
-    CamelContext getCamelContext();
-    
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/CamelException.java b/trunk/camel-core/src/main/java/org/apache/camel/CamelException.java
deleted file mode 100644
index 971e059..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/CamelException.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * 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;
-
-/**
- * Base class for all Camel checked exceptions typically thrown by a {@link Processor}
- *
- * @version 
- */
-public class CamelException extends Exception {
-    private static final long serialVersionUID = -8721487434390572630L;
-
-    public CamelException() {
-    }
-
-    public CamelException(String message) {
-        super(message);
-    }
-
-    public CamelException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public CamelException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/CamelExchangeException.java b/trunk/camel-core/src/main/java/org/apache/camel/CamelExchangeException.java
deleted file mode 100644
index e043915..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/CamelExchangeException.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * 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;
-
-import org.apache.camel.util.ExchangeHelper;
-
-/**
- * An exception caused by a specific message {@link Exchange}
- *
- * @version 
- */
-public class CamelExchangeException extends CamelException {
-    private static final long serialVersionUID = -8721487431101572630L;
-    // exchange is not guaranteed to be serializable so we set it as transient
-    private final transient Exchange exchange;
-
-    public CamelExchangeException(String message, Exchange exchange) {
-        super(ExchangeHelper.createExceptionMessage(message, exchange, null));
-        this.exchange = exchange;
-    }
-
-    public CamelExchangeException(String message, Exchange exchange, Throwable cause) {
-        super(ExchangeHelper.createExceptionMessage(message, exchange, cause), cause);
-        this.exchange = exchange;
-    }
-
-    /**
-     * Returns the exchange which caused the exception
-     */
-    public Exchange getExchange() {
-        return exchange;
-    }
-
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/CamelExecutionException.java b/trunk/camel-core/src/main/java/org/apache/camel/CamelExecutionException.java
deleted file mode 100644
index 5d8c66a..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/CamelExecutionException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * 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;
-
-/**
- * Exception occurred during execution/processing of an {@link Exchange}.
- * <p/>
- * Is usually thrown to the caller when using the {@link org.apache.camel.ProducerTemplate}
- * to send messages to Camel.
- *
- * @version 
- */
-public class CamelExecutionException extends RuntimeExchangeException {
-    private static final long serialVersionUID = -5821095325248904305L;
-
-    public CamelExecutionException(String message, Exchange exchange) {
-        super(message, exchange);
-    }
-
-    public CamelExecutionException(String message, Exchange exchange, Throwable cause) {
-        super(message, exchange, cause);
-    }
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/CamelUnitOfWorkException.java b/trunk/camel-core/src/main/java/org/apache/camel/CamelUnitOfWorkException.java
deleted file mode 100644
index 8048ccb..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/CamelUnitOfWorkException.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * 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;
-
-import java.util.List;
-
-/**
- * A {@link org.apache.camel.spi.UnitOfWork} failed with a number of caused exceptions.
- * <p/>
- * This implementation will provide the first exception from the list in its cause, so its shown
- * in the stacktrace etc when logging this exception. But the remainder exceptions is only available
- * from the {@link #getCauses()} method.
- */
-public class CamelUnitOfWorkException extends CamelExchangeException {
-
-    private final List<Exception> causes;
-
-    public CamelUnitOfWorkException(Exchange exchange, List<Exception> causes) {
-        // just provide the first exception as cause, as it will be logged in the stacktraces
-        super("Unit of work failed on exchange with " + causes.size()
-                + " caused exceptions. First exception provided as cause to this exception.", exchange, causes.get(0));
-        this.causes = causes;
-    }
-
-    public List<Exception> getCauses() {
-        return causes;
-    }
-
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/Channel.java b/trunk/camel-core/src/main/java/org/apache/camel/Channel.java
deleted file mode 100644
index 89b737e..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/Channel.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/**
- * 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;
-
-import java.util.List;
-
-import org.apache.camel.model.ProcessorDefinition;
-import org.apache.camel.spi.InterceptStrategy;
-import org.apache.camel.spi.RouteContext;
-
-/**
- * Channel acts as a channel between {@link Processor}s in the route graph.
- * <p/>
- * The channel is responsible for routing the {@link Exchange} to the next {@link Processor} in the route graph.
- *
- * @version 
- */
-public interface Channel extends AsyncProcessor, Navigate<Processor> {
-
-    /**
-     * Sets the processor that the channel should route the {@link Exchange} to.
-     *
-     * @param next  the next processor
-     */
-    void setNextProcessor(Processor next);
-
-    /**
-     * Sets the {@link org.apache.camel.processor.ErrorHandler} this Channel uses.
-     *
-     * @param errorHandler the error handler
-     */
-    void setErrorHandler(Processor errorHandler);
-
-    /**
-     * Gets the {@link org.apache.camel.processor.ErrorHandler} this Channel uses.
-     *
-     * @return the error handler, or <tt>null</tt> if no error handler is used.
-     */
-    Processor getErrorHandler();
-
-    /**
-     * Adds a {@link org.apache.camel.spi.InterceptStrategy} to apply each {@link Exchange} before
-     * its routed to the next {@link Processor}.
-     *
-     * @param strategy  the intercept strategy
-     */
-    void addInterceptStrategy(InterceptStrategy strategy);
-
-    /**
-     * Adds a list of {@link org.apache.camel.spi.InterceptStrategy} to apply each {@link Exchange} before
-     * its routed to the next {@link Processor}.
-     *
-     * @param strategy  list of strategies
-     */
-    void addInterceptStrategies(List<InterceptStrategy> strategy);
-
-    /**
-     * Gets the list of {@link org.apache.camel.spi.InterceptStrategy} registered to this Channel.
-     *
-     * @return list of strategies, returns an empty list if no strategies is registered.
-     */
-    List<InterceptStrategy> getInterceptStrategies();
-
-    /**
-     * Initializes the channel.
-     *
-     * @param outputDefinition  the route definition the {@link Channel} represents
-     * @param routeContext      the route context
-     * @throws Exception is thrown if some error occurred
-     */
-    void initChannel(ProcessorDefinition<?> outputDefinition, RouteContext routeContext) throws Exception;
-
-    /**
-     * Post initializes the channel.
-     *
-     * @param outputDefinition  the route definition the {@link Channel} represents
-     * @param routeContext      the route context
-     * @throws Exception is thrown if some error occurred
-     */
-    void postInitChannel(ProcessorDefinition<?> outputDefinition, RouteContext routeContext) throws Exception;
-
-    /**
-     * If the initialized output definition contained outputs (children) then we need to
-     * set the child so we can leverage fine grained tracing
-     *
-     * @param child the child
-     */
-    void setChildDefinition(ProcessorDefinition<?> child);
-
-    /**
-     * Gets the wrapped output that at runtime should be delegated to.
-     *
-     * @return the output to route the {@link Exchange} to
-     */
-    Processor getOutput();
-
-    /**
-     * Sets the wrapped output that at runtime should be delegated to.
-     *
-     * @param output the output to route the {@link Exchange} to
-     */
-    void setOutput(Processor output);
-
-    /**
-     * Gets the next {@link Processor} to route to (not wrapped)
-     *
-     * @return  the next processor
-     */
-    Processor getNextProcessor();
-
-    /**
-     * Gets the definition of the next processor
-     *
-     * @return the processor definition
-     */
-    ProcessorDefinition<?> getProcessorDefinition();
-
-    /**
-     * Gets the {@link RouteContext}
-     *
-     * @return the route context
-     */
-    RouteContext getRouteContext();
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/Component.java b/trunk/camel-core/src/main/java/org/apache/camel/Component.java
deleted file mode 100644
index fa190ed..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/Component.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * 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;
-
-/**
- * A <a href="http://camel.apache.org/component.html">component</a> is
- * a factory of {@link Endpoint} objects.
- * 
- * @version 
- */
-public interface Component extends CamelContextAware {
-
-    /**
-     * Attempt to resolve an endpoint for the given URI if the component is
-     * capable of handling the URI
-     * 
-     * @param uri the URI to create
-     * @return a newly created endpoint or null if this component cannot create
-     *         instances of the given uri
-     * @throws Exception is thrown if error creating the endpoint
-     */
-    Endpoint createEndpoint(String uri) throws Exception;
-    
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/Consume.java b/trunk/camel-core/src/main/java/org/apache/camel/Consume.java
deleted file mode 100644
index e24370b..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/Consume.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * 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;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Subscribes a method to an {@link Endpoint} either via its
- * <a href="http://camel.apache.org/uris.html">URI</a> or via the name of the endpoint reference
- * which is then resolved in a registry such as the Spring Application Context.
- *
- * When a message {@link Exchange} is received from the {@link Endpoint} then the
- * <a href="http://camel.apache.org/bean-integration.html">Bean Integration</a>
- * mechanism is used to map the incoming {@link Message} to the method parameters.
- * 
- * @version 
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Target({ElementType.FIELD, ElementType.METHOD, ElementType.CONSTRUCTOR })
-public @interface Consume {
-    String uri() default "";
-    String ref() default "";
-    String context() default "";
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/Consumer.java b/trunk/camel-core/src/main/java/org/apache/camel/Consumer.java
deleted file mode 100644
index ee47729..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/Consumer.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * 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;
-
-/**
- * A consumer of message exchanges from an {@link Endpoint}
- *
- * @version 
- */
-public interface Consumer extends Service {
-
-    /**
-     * Gets the endpoint this {@link Consumer} consumes from.
-     *
-     * @return the endpoint
-     */
-    Endpoint getEndpoint();
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/ConsumerTemplate.java b/trunk/camel-core/src/main/java/org/apache/camel/ConsumerTemplate.java
deleted file mode 100644
index 40c7131..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/ConsumerTemplate.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/**
- * 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;
-
-/**
- * Template (named like Spring's TransactionTemplate & JmsTemplate
- * et al) for working with Camel and consuming {@link Message} instances in an
- * {@link Exchange} from an {@link Endpoint}.
- * <p/>
- * This template is an implementation of the
- * <a href="http://camel.apache.org/polling-consumer.html">Polling Consumer EIP</a>.
- * This is <b>not</b> the <a href="http://camel.apache.org/event-driven-consumer.html">Event Driven Consumer EIP</a>.
- * <p/>
- * <b>All</b> methods throws {@link RuntimeCamelException} if consuming of
- * the {@link Exchange} failed and an Exception occurred. The <tt>getCause</tt>
- * method on {@link RuntimeCamelException} returns the wrapper original caused
- * exception.
- * <p/>
- * All the receive<b>Body</b> methods will return the content according to this strategy
- * <ul>
- * <li>throws {@link RuntimeCamelException} as stated above</li>
- * <li>The <tt>fault.body</tt> if there is a fault message set and its not <tt>null</tt></li>
- * <li>The <tt>out.body<tt> if there is a out message set and its not <tt>null<tt></li>
- * <li>The <tt>in.body<tt></li>
- * </ul>
- * <p/>
- * <b>Important note on usage:</b> See this
- * <a href="http://camel.apache.org/why-does-camel-use-too-many-threads-with-producertemplate.html">FAQ entry</a>
- * before using, it applies to ConsumerTemplate as well.
- *
- * @version 
- */
-public interface ConsumerTemplate extends Service {
-
-    // Configuration methods
-    // -----------------------------------------------------------------------
-
-    /**
-     * Gets the maximum cache size used.
-     *
-     * @return the maximum cache size
-     */
-    int getMaximumCacheSize();
-
-    /**
-     * Sets a custom maximum cache size.
-     *
-     * @param maximumCacheSize the custom maximum cache size
-     */
-    void setMaximumCacheSize(int maximumCacheSize);
-
-    /**
-     * Gets an approximated size of the current cached resources in the backing cache pools.
-     *
-     * @return the size of current cached resources
-     */
-    int getCurrentCacheSize();
-
-    // Synchronous methods
-    // -----------------------------------------------------------------------
-
-    /**
-     * Receives from the endpoint, waiting until there is a response
-     * <p/>
-     * <b>Important:</b> See {@link #doneUoW(Exchange)}
-     *
-     * @param endpointUri the endpoint to receive from
-     * @return the returned exchange
-     */
-    Exchange receive(String endpointUri);
-
-    /**
-     * Receives from the endpoint, waiting until there is a response.
-     * <p/>
-     * <b>Important:</b> See {@link #doneUoW(Exchange)}
-     *
-     * @param endpoint the endpoint to receive from
-     * @return the returned exchange
-     * @see #doneUoW(Exchange)
-     */
-    Exchange receive(Endpoint endpoint);
-
-    /**
-     * Receives from the endpoint, waiting until there is a response
-     * or the timeout occurs
-     * <p/>
-     * <b>Important:</b> See {@link #doneUoW(Exchange)}
-     *
-     * @param endpointUri the endpoint to receive from
-     * @param timeout     timeout in millis to wait for a response
-     * @return the returned exchange, or <tt>null</tt> if no response
-     * @see #doneUoW(Exchange)
-     */
-    Exchange receive(String endpointUri, long timeout);
-
-    /**
-     * Receives from the endpoint, waiting until there is a response
-     * or the timeout occurs
-     * <p/>
-     * <b>Important:</b> See {@link #doneUoW(Exchange)}
-     *
-     * @param endpoint the endpoint to receive from
-     * @param timeout  timeout in millis to wait for a response
-     * @return the returned exchange, or <tt>null</tt> if no response
-     * @see #doneUoW(Exchange)
-     */
-    Exchange receive(Endpoint endpoint, long timeout);
-
-    /**
-     * Receives from the endpoint, not waiting for a response if non exists.
-     * <p/>
-     * <b>Important:</b> See {@link #doneUoW(Exchange)}
-     *
-     * @param endpointUri the endpoint to receive from
-     * @return the returned exchange, or <tt>null</tt> if no response
-     */
-    Exchange receiveNoWait(String endpointUri);
-
-    /**
-     * Receives from the endpoint, not waiting for a response if non exists.
-     * <p/>
-     * <b>Important:</b> See {@link #doneUoW(Exchange)}
-     *
-     * @param endpoint the endpoint to receive from
-     * @return the returned exchange, or <tt>null</tt> if no response
-     */
-    Exchange receiveNoWait(Endpoint endpoint);
-
-    /**
-     * Receives from the endpoint, waiting until there is a response
-     *
-     * @param endpointUri the endpoint to receive from
-     * @return the returned response body
-     */
-    Object receiveBody(String endpointUri);
-
-    /**
-     * Receives from the endpoint, waiting until there is a response
-     *
-     * @param endpoint the endpoint to receive from
-     * @return the returned response body
-     */
-    Object receiveBody(Endpoint endpoint);
-
-    /**
-     * Receives from the endpoint, waiting until there is a response
-     * or the timeout occurs
-     *
-     * @param endpointUri the endpoint to receive from
-     * @param timeout     timeout in millis to wait for a response
-     * @return the returned response body, or <tt>null</tt> if no response
-     */
-    Object receiveBody(String endpointUri, long timeout);
-
-    /**
-     * Receives from the endpoint, waiting until there is a response
-     * or the timeout occurs
-     *
-     * @param endpoint the endpoint to receive from
-     * @param timeout  timeout in millis to wait for a response
-     * @return the returned response body, or <tt>null</tt> if no response
-     */
-    Object receiveBody(Endpoint endpoint, long timeout);
-
-    /**
-     * Receives from the endpoint, not waiting for a response if non exists.
-     *
-     * @param endpointUri the endpoint to receive from
-     * @return the returned response body, or <tt>null</tt> if no response
-     */
-    Object receiveBodyNoWait(String endpointUri);
-
-    /**
-     * Receives from the endpoint, not waiting for a response if non exists.
-     *
-     * @param endpoint the endpoint to receive from
-     * @return the returned response body, or <tt>null</tt> if no response
-     */
-    Object receiveBodyNoWait(Endpoint endpoint);
-
-    /**
-     * Receives from the endpoint, waiting until there is a response
-     *
-     * @param endpointUri the endpoint to receive from
-     * @param type        the expected response type
-     * @return the returned response body
-     */
-    <T> T receiveBody(String endpointUri, Class<T> type);
-
-    /**
-     * Receives from the endpoint, waiting until there is a response
-     *
-     * @param endpoint the endpoint to receive from
-     * @param type     the expected response type
-     * @return the returned response body
-     */
-    <T> T receiveBody(Endpoint endpoint, Class<T> type);
-
-    /**
-     * Receives from the endpoint, waiting until there is a response
-     * or the timeout occurs
-     *
-     * @param endpointUri the endpoint to receive from
-     * @param timeout     timeout in millis to wait for a response
-     * @param type        the expected response type
-     * @return the returned response body, or <tt>null</tt> if no response
-     */
-    <T> T receiveBody(String endpointUri, long timeout, Class<T> type);
-
-    /**
-     * Receives from the endpoint, waiting until there is a response
-     * or the timeout occurs
-     *
-     * @param endpoint the endpoint to receive from
-     * @param timeout  timeout in millis to wait for a response
-     * @param type     the expected response type
-     * @return the returned response body, or <tt>null</tt> if no response
-     */
-    <T> T receiveBody(Endpoint endpoint, long timeout, Class<T> type);
-
-    /**
-     * Receives from the endpoint, not waiting for a response if non exists.
-     *
-     * @param endpointUri the endpoint to receive from
-     * @param type        the expected response type
-     * @return the returned response body, or <tt>null</tt> if no response
-     */
-    <T> T receiveBodyNoWait(String endpointUri, Class<T> type);
-
-    /**
-     * Receives from the endpoint, not waiting for a response if non exists.
-     *
-     * @param endpoint the endpoint to receive from
-     * @param type     the expected response type
-     * @return the returned response body, or <tt>null</tt> if no response
-     */
-    <T> T receiveBodyNoWait(Endpoint endpoint, Class<T> type);
-
-    /**
-     * If you have used any of the <tt>receive</tt> methods which returns a {@link Exchange} type
-     * then you need to invoke this method when you are done using the returned {@link Exchange}.
-     * <p/>
-     * This is needed to ensure any {@link org.apache.camel.spi.Synchronization} works is being executed.
-     * For example if you consumed from a file endpoint, then the consumed file is only moved/delete when
-     * you done the {@link Exchange}.
-     * <p/>
-     * Note for all the other <tt>receive</tt> methods which does <b>not</b> return a {@link Exchange} type,
-     * the done has been executed automatic by Camel itself.
-     *
-     * @param exchange  the exchange
-     */
-    void doneUoW(Exchange exchange);
-
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/Converter.java b/trunk/camel-core/src/main/java/org/apache/camel/Converter.java
deleted file mode 100644
index 0a0a1b2..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/Converter.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * 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;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * An annotation used to mark classes and methods to indicate code capable of
- * converting from a type to another type which are then auto-discovered using
- * the <a href="http://camel.apache.org/type-converter.html">Type
- * Conversion Support</a>
- * 
- * @version 
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Target({ElementType.TYPE, ElementType.METHOD })
-public @interface Converter {
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/DynamicRouter.java b/trunk/camel-core/src/main/java/org/apache/camel/DynamicRouter.java
deleted file mode 100644
index b76df9a..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/DynamicRouter.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * 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;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Indicates that this method is to be used as a 
- * <a href="http://camel.apache.org/dynamic-router.html">Dynamic Router</a> routing the incoming message
- * through a series of processing steps.
- *
- * When a message {@link Exchange} is received from an {@link Endpoint} then the
- * <a href="http://camel.apache.org/bean-integration.html">Bean Integration</a>
- * mechanism is used to map the incoming {@link Message} to the method parameters.
- *
- * The return value of the method is then converted to either a {@link java.util.Collection} or array of objects where each
- * element is converted to an {@link org.apache.camel.Endpoint} or a {@link String}, or if it is not a collection/array then it is converted
- * to an {@link org.apache.camel.Endpoint} or {@link String}.
- *
- * Then for each endpoint or URI the message is routed in a pipes and filter fashion.
- *
- * @see org.apache.camel.RoutingSlip
- * @version 
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Target({ElementType.FIELD, ElementType.METHOD, ElementType.CONSTRUCTOR})
-public @interface DynamicRouter {
-    String context() default "";
-    String delimiter() default ",";
-    boolean ignoreInvalidEndpoints() default false;
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/Endpoint.java b/trunk/camel-core/src/main/java/org/apache/camel/Endpoint.java
deleted file mode 100644
index 25de3d1..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/Endpoint.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * 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;
-
-import java.util.Map;
-
-/**
- * An <a href="http://camel.apache.org/endpoint.html">endpoint</a>
- * implements the <a
- * href="http://camel.apache.org/message-endpoint.html">Message
- * Endpoint</a> pattern and represents an endpoint that can send and receive
- * message exchanges
- *
- * @see Exchange
- * @see Message
- * @version 
- */
-public interface Endpoint extends IsSingleton, Service {
-
-    /**
-     * Returns the string representation of the endpoint URI
-     *
-     * @return the endpoint URI
-     */
-    String getEndpointUri();
-
-    /**
-     * Returns a string key of this endpoint.
-     * <p/>
-     * This key is used by {@link org.apache.camel.spi.LifecycleStrategy} when registering endpoint.
-     * This allows to register different instances of endpoints with the same key.
-     * <p/>
-     * For JMX mbeans this allows us to use the same JMX Mbean for all endpoints that are logical
-     * the same but have different parameters. For instance the http endpoint.
-     *
-     * @return the endpoint key
-     */
-    String getEndpointKey();
-
-    /**
-     * Create a new exchange for communicating with this endpoint
-     *
-     * @return a new exchange
-     */
-    Exchange createExchange();
-
-    /**
-     * Create a new exchange for communicating with this endpoint
-     * with the specified {@link ExchangePattern} such as whether its going
-     * to be an {@link ExchangePattern#InOnly} or {@link ExchangePattern#InOut} exchange
-     *
-     * @param pattern the message exchange pattern for the exchange
-     * @return a new exchange
-     */
-    Exchange createExchange(ExchangePattern pattern);
-
-    /**
-     * Creates a new exchange for communicating with this exchange using the
-     * given exchange to pre-populate the values of the headers and messages
-     *
-     * @param exchange given exchange to use for pre-populate
-     * @return a new exchange
-     */
-    Exchange createExchange(Exchange exchange);
-
-    /**
-     * Returns the context which created the endpoint
-     *
-     * @return the context which created the endpoint
-     */
-    CamelContext getCamelContext();
-
-    /**
-     * Creates a new producer which is used send messages into the endpoint
-     *
-     * @return a newly created producer
-     * @throws Exception can be thrown
-     */
-    Producer createProducer() throws Exception;
-
-    /**
-     * Creates a new <a
-     * href="http://camel.apache.org/event-driven-consumer.html">Event
-     * Driven Consumer</a> which consumes messages from the endpoint using the
-     * given processor
-     *
-     * @param processor  the given processor
-     * @return a newly created consumer
-     * @throws Exception can be thrown
-     */
-    Consumer createConsumer(Processor processor) throws Exception;
-
-    /**
-     * Creates a new <a
-     * href="http://camel.apache.org/polling-consumer.html">Polling
-     * Consumer</a> so that the caller can poll message exchanges from the
-     * consumer using {@link PollingConsumer#receive()},
-     * {@link PollingConsumer#receiveNoWait()} or
-     * {@link PollingConsumer#receive(long)} whenever it is ready to do so
-     * rather than using the <a
-     * href="http://camel.apache.org/event-driven-consumer.html">Event
-     * Based Consumer</a> returned by {@link #createConsumer(Processor)}
-     *
-     * @return a newly created pull consumer
-     * @throws Exception if the pull consumer could not be created
-     */
-    PollingConsumer createPollingConsumer() throws Exception;
-
-    /**
-     * Configure properties on this endpoint.
-     * 
-     * @param options  the options (properties)
-     */
-    void configureProperties(Map<String, Object> options);
-
-    /**
-     * Sets the camel context.
-     *
-     * @param context the camel context
-     */
-    void setCamelContext(CamelContext context);
-
-    /**
-     * Should all properties be known or does the endpoint allow unknown options?
-     * <p/>
-     * <tt>lenient = false</tt> means that the endpoint should validate that all
-     * given options is known and configured properly.
-     * <tt>lenient = true</tt> means that the endpoint allows additional unknown options to
-     * be passed to it but does not throw a ResolveEndpointFailedException when creating
-     * the endpoint.
-     * <p/>
-     * This options is used by a few components for instance the HTTP based that can have
-     * dynamic URI options appended that is targeted for an external system.
-     * <p/>
-     * Most endpoints is configured to be <b>not</b> lenient.
-     *
-     * @return whether properties is lenient or not
-     */
-    boolean isLenientProperties();
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/EndpointInject.java b/trunk/camel-core/src/main/java/org/apache/camel/EndpointInject.java
deleted file mode 100644
index fdb2870..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/EndpointInject.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * 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;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Used to indicate an injection point of an {@link Endpoint}, {@link Producer} or
- * {@link ProducerTemplate} into a POJO.
- *
- * A <a href="http://camel.apache.org/uris.html">URI</a> for an endpoint
- * can be specified on this annotation, or a name can be specified which is resolved in the
- * {@link org.apache.camel.spi.Registry} such as in your Spring ApplicationContext.
- *
- * If no ref or uri is specified then the ref is defaulted from the field, property or method name.
- *
- * @version 
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Target({ElementType.FIELD, ElementType.METHOD, ElementType.CONSTRUCTOR })
-public @interface EndpointInject {
-    String uri() default "";
-    String ref() default "";
-    String context() default "";
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java b/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
deleted file mode 100644
index a53251e..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
+++ /dev/null
@@ -1,485 +0,0 @@
-/**
- * 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;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.camel.spi.Synchronization;
-import org.apache.camel.spi.UnitOfWork;
-
-/**
- * An Exchange is the message container holding the information during the entire routing of
- * a {@link  Message} received by a {@link Consumer}. 
- * <p/>
- * During processing down the {@link Processor} chain, the {@link Exchange} provides access to the 
- * current (not the original) request and response {@link Message} messages. The {@link Exchange} 
- * also holds meta-data during its entire lifetime stored as properties accessible using the 
- * various {@link #getProperty(String)} methods. The {@link #setProperty(String, Object)} is 
- * used to store a property. For example you can use this to store security, SLA related 
- * data or any other information deemed useful throughout processing. If an {@link Exchange} 
- * failed during routing the {@link Exception} that caused the failure is stored and accessible 
- * via the {@link #getException()} method.
- * <p/>
- * An Exchange is created when a {@link Consumer} receives a request. A new {@link Message} is
- * created, the request is set as the body of the {@link Message} and depending on the {@link Consumer}
- * other {@link Endpoint} and protocol related information is added as headers on the {@link Message}.
- * Then an Exchange is created and the newly created {@link Message} is set as the in on the Exchange.
- * Therefore an Exchange starts its life in a {@link Consumer}. The Exchange is then sent down the
- * {@link Route} for processing along a {@link Processor} chain. The {@link Processor} as the name
- * suggests is what processes the {@link Message} in the Exchange and Camel, in addition to 
- * providing out-of-the-box a large number of useful processors, it also allows you to create your own. 
- * The rule Camel uses is to take the out {@link Message} produced by the previous {@link Processor} 
- * and set it as the in for the next {@link Processor}. If the previous {@link Processor} did not
- * produce an out, then the in of the previous {@link Processor} is sent as the next in. At the
- * end of the processing chain, depending on the {@link ExchangePattern Message Exchange Pattern} (or MEP)
- * the last out (or in of no out available) is sent by the {@link Consumer} back to the original caller.
- * <p/>
- * Camel, in addition to providing out-of-the-box a large number of useful processors, it also allows 
- * you to implement and use your own. When the Exchange is passed to a {@link Processor}, it always 
- * contains an in {@link Message} and no out {@link Message}. The {@link Processor} <b>may</b> produce 
- * an out, depending on the nature of the {@link Processor}. The in {@link Message} can be accessed 
- * using the {@link #getIn()} method. Since the out message is null when entering the {@link Processor}, 
- * the {@link #getOut()} method is actually a convenient factory method that will lazily instantiate a 
- * {@link org.apache.camel.impl.DefaultMessage} which you could populate. As an alternative you could 
- * also instantiate your specialized  {@link Message} and set it on the exchange using the 
- * {@link #setOut(org.apache.camel.Message)} method. Please note that a {@link Message} contains not only 
- * the body but also headers and attachments. If you are creating a new {@link Message} the headers and 
- * attachments of the in {@link Message} are not automatically copied to the out by Camel and you'll have 
- * to set the headers and attachments you need yourself. If your {@link Processor} is not producing a 
- * different {@link Message} but only needs to slightly  modify the in, you can simply update the in 
- * {@link Message} returned by {@link #getIn()}. 
- * <p/>
- * See this <a href="http://camel.apache.org/using-getin-or-getout-methods-on-exchange.html">FAQ entry</a> 
- * for more details.
- * 
- */
-public interface Exchange {
-
-    String AUTHENTICATION                   = "CamelAuthentication";
-    String AUTHENTICATION_FAILURE_POLICY_ID = "CamelAuthenticationFailurePolicyId";
-    String ACCEPT_CONTENT_TYPE              = "CamelAcceptContentType";
-    String AGGREGATED_SIZE                  = "CamelAggregatedSize";
-    String AGGREGATED_TIMEOUT               = "CamelAggregatedTimeout";
-    String AGGREGATED_COMPLETED_BY          = "CamelAggregatedCompletedBy";
-    String AGGREGATED_CORRELATION_KEY       = "CamelAggregatedCorrelationKey";
-    String AGGREGATION_STRATEGY             = "CamelAggregationStrategy";
-    String ASYNC_WAIT                       = "CamelAsyncWait";
-
-    String BATCH_INDEX                = "CamelBatchIndex";
-    String BATCH_SIZE                 = "CamelBatchSize";
-    String BATCH_COMPLETE             = "CamelBatchComplete";
-    String BEAN_METHOD_NAME           = "CamelBeanMethodName";
-    String BEAN_MULTI_PARAMETER_ARRAY = "CamelBeanMultiParameterArray";
-    String BINDING                    = "CamelBinding";
-    // do not prefix with Camel and use lower-case starting letter as its a shared key
-    // used across other Apache products such as AMQ, SMX etc.
-    String BREADCRUMB_ID              = "breadcrumbId";
-
-    String CHARSET_NAME      = "CamelCharsetName";
-    String CREATED_TIMESTAMP = "CamelCreatedTimestamp";
-    String CONTENT_ENCODING  = "Content-Encoding";
-    String CONTENT_LENGTH    = "Content-Length";
-    String CONTENT_TYPE      = "Content-Type";
-    String CORRELATION_ID    = "CamelCorrelationId";
-
-    String DATASET_INDEX             = "CamelDataSetIndex";
-    String DEFAULT_CHARSET_PROPERTY  = "org.apache.camel.default.charset";
-    String DESTINATION_OVERRIDE_URL = "CamelDestinationOverrideUrl";
-    String DISABLE_HTTP_STREAM_CACHE = "CamelDisableHttpStreamCache";
-    String DUPLICATE_MESSAGE         = "CamelDuplicateMessage";
-
-    String ERRORHANDLER_HANDLED = "CamelErrorHandlerHandled";
-    String EXCEPTION_CAUGHT     = "CamelExceptionCaught";
-
-    String FAILURE_HANDLED      = "CamelFailureHandled";
-    String FAILURE_ENDPOINT     = "CamelFailureEndpoint";
-    String FILTER_NON_XML_CHARS = "CamelFilterNonXmlChars";
-    String FILE_LOCAL_WORK_PATH = "CamelFileLocalWorkPath";
-    String FILE_NAME            = "CamelFileName";
-    String FILE_NAME_ONLY       = "CamelFileNameOnly";
-    String FILE_NAME_PRODUCED   = "CamelFileNameProduced";
-    String FILE_PATH            = "CamelFilePath";
-    String FILE_PARENT          = "CamelFileParent";
-    String FILE_LAST_MODIFIED   = "CamelFileLastModified";
-    String FILTER_MATCHED       = "CamelFilterMatched";
-
-    String GROUPED_EXCHANGE = "CamelGroupedExchange";
-    
-    String HTTP_BASE_URI           = "CamelHttpBaseUri";
-    String HTTP_CHARACTER_ENCODING = "CamelHttpCharacterEncoding";
-    String HTTP_METHOD             = "CamelHttpMethod";
-    String HTTP_PATH               = "CamelHttpPath";
-    String HTTP_PROTOCOL_VERSION   = "CamelHttpProtocolVersion";
-    String HTTP_QUERY              = "CamelHttpQuery";
-    String HTTP_RESPONSE_CODE      = "CamelHttpResponseCode";
-    String HTTP_URI                = "CamelHttpUri";
-    String HTTP_URL                = "CamelHttpUrl";
-    String HTTP_CHUNKED            = "CamelHttpChunked";
-    String HTTP_SERVLET_REQUEST    = "CamelHttpServletRequest";
-    String HTTP_SERVLET_RESPONSE   = "CamelHttpServletResponse";
-
-    String INTERCEPTED_ENDPOINT = "CamelInterceptedEndpoint";
-
-    String LANGUAGE_SCRIPT          = "CamelLanguageScript";
-    String LOG_DEBUG_BODY_MAX_CHARS = "CamelLogDebugBodyMaxChars";
-    String LOG_DEBUG_BODY_STREAMS   = "CamelLogDebugStreams";
-    String LOOP_INDEX               = "CamelLoopIndex";
-    String LOOP_SIZE                = "CamelLoopSize";
-
-    String MAXIMUM_CACHE_POOL_SIZE     = "CamelMaximumCachePoolSize";
-    String MAXIMUM_ENDPOINT_CACHE_SIZE = "CamelMaximumEndpointCacheSize";
-    String MULTICAST_INDEX             = "CamelMulticastIndex";
-    String MULTICAST_COMPLETE          = "CamelMulticastComplete";
-
-    String NOTIFY_EVENT = "CamelNotifyEvent";
-
-    String ON_COMPLETION = "CamelOnCompletion";
-
-    String PARENT_UNIT_OF_WORK = "CamelParentUnitOfWork";
-
-    String RECEIVED_TIMESTAMP      = "CamelReceivedTimestamp";
-    String REDELIVERED             = "CamelRedelivered";
-    String REDELIVERY_COUNTER      = "CamelRedeliveryCounter";
-    String REDELIVERY_MAX_COUNTER  = "CamelRedeliveryMaxCounter";
-    String REDELIVERY_EXHAUSTED    = "CamelRedeliveryExhausted";
-    String ROLLBACK_ONLY           = "CamelRollbackOnly";
-    String ROLLBACK_ONLY_LAST      = "CamelRollbackOnlyLast";
-    String ROUTE_STOP              = "CamelRouteStop";
-
-    String SOAP_ACTION        = "CamelSoapAction";
-    String SKIP_GZIP_ENCODING = "CamelSkipGzipEncoding";
-    String SLIP_ENDPOINT      = "CamelSlipEndpoint";
-    String SPLIT_INDEX        = "CamelSplitIndex";
-    String SPLIT_COMPLETE     = "CamelSplitComplete";
-    String SPLIT_SIZE         = "CamelSplitSize";
-
-    String TIMER_COUNTER         = "CamelTimerCounter";
-    String TIMER_FIRED_TIME      = "CamelTimerFiredTime";
-    String TIMER_NAME            = "CamelTimerName";
-    String TIMER_PERIOD          = "CamelTimerPeriod";
-    String TIMER_TIME            = "CamelTimerTime";
-    String TO_ENDPOINT           = "CamelToEndpoint";
-    String TRACE_EVENT           = "CamelTraceEvent";
-    String TRACE_EVENT_NODE_ID   = "CamelTraceEventNodeId";
-    String TRACE_EVENT_TIMESTAMP = "CamelTraceEventTimestamp";
-    String TRACE_EVENT_EXCHANGE  = "CamelTraceEventExchange";
-    String TRANSFER_ENCODING     = "Transfer-Encoding";
-
-    String UNIT_OF_WORK_EXHAUSTED = "CamelUnitOfWorkExhausted";
-
-    String XSLT_FILE_NAME = "CamelXsltFileName";
-
-    /**
-     * Returns the {@link ExchangePattern} (MEP) of this exchange.
-     *
-     * @return the message exchange pattern of this exchange
-     */
-    ExchangePattern getPattern();
-
-    /**
-     * Allows the {@link ExchangePattern} (MEP) of this exchange to be customized.
-     *
-     * This typically won't be required as an exchange can be created with a specific MEP
-     * by calling {@link Endpoint#createExchange(ExchangePattern)} but it is here just in case
-     * it is needed.
-     *
-     * @param pattern  the pattern 
-     */
-    void setPattern(ExchangePattern pattern);
-
-    /**
-     * Returns a property associated with this exchange by name
-     *
-     * @param name the name of the property
-     * @return the value of the given property or <tt>null</tt> if there is no property for
-     *         the given name
-     */
-    Object getProperty(String name);
-
-    /**
-     * Returns a property associated with this exchange by name
-     *
-     * @param name the name of the property
-     * @param defaultValue the default value to return if property was absent
-     * @return the value of the given property or <tt>defaultValue</tt> if there is no
-     *         property for the given name
-     */
-    Object getProperty(String name, Object defaultValue);
-
-    /**
-     * Returns a property associated with this exchange by name and specifying
-     * the type required
-     *
-     * @param name the name of the property
-     * @param type the type of the property
-     * @return the value of the given property or <tt>null</tt> if there is no property for
-     *         the given name or <tt>null</tt> if it cannot be converted to the given type
-     */
-    <T> T getProperty(String name, Class<T> type);
-
-    /**
-     * Returns a property associated with this exchange by name and specifying
-     * the type required
-     *
-     * @param name the name of the property
-     * @param defaultValue the default value to return if property was absent
-     * @param type the type of the property
-     * @return the value of the given property or <tt>defaultValue</tt> if there is no property for
-     *         the given name or <tt>null</tt> if it cannot be converted to the given type
-     */
-    <T> T getProperty(String name, Object defaultValue, Class<T> type);
-
-    /**
-     * Sets a property on the exchange
-     *
-     * @param name  of the property
-     * @param value to associate with the name
-     */
-    void setProperty(String name, Object value);
-
-    /**
-     * Removes the given property on the exchange
-     *
-     * @param name of the property
-     * @return the old value of the property
-     */
-    Object removeProperty(String name);
-
-    /**
-     * Returns all of the properties associated with the exchange
-     *
-     * @return all the headers in a Map
-     */
-    Map<String, Object> getProperties();
-
-    /**
-     * Returns whether any properties has been set
-     *
-     * @return <tt>true</tt> if any properties has been set
-     */
-    boolean hasProperties();
-
-    /**
-     * Returns the inbound request message
-     *
-     * @return the message
-     */
-    Message getIn();
-
-    /**
-     * Returns the inbound request message as the given type
-     *
-     * @param type the given type
-     * @return the message as the given type or <tt>null</tt> if not possible to covert to given type
-     */
-    <T> T getIn(Class<T> type);
-
-    /**
-     * Sets the inbound message instance
-     *
-     * @param in the inbound message
-     */
-    void setIn(Message in);
-
-    /**
-     * Returns the outbound message, lazily creating one if one has not already
-     * been associated with this exchange.
-     * <p/>
-     * <br/><b>Important:</b> If you want to change the current message, then use {@link #getIn()} instead as it will
-     * ensure headers etc. is kept and propagated when routing continues. Bottom line end users should rarely use
-     * this method.
-     * <p/>
-     * <br/>If you want to test whether an OUT message have been set or not, use the {@link #hasOut()} method.
-     * <p/>
-     * See also the class java doc for this {@link Exchange} for more details and this
-     * <a href="http://camel.apache.org/using-getin-or-getout-methods-on-exchange.html">FAQ entry</a>.
-     *
-     * @return the response
-     * @see #getIn()
-     */
-    Message getOut();
-
-    /**
-     * Returns the outbound request message as the given type
-     * <p/>
-     * <br/><b>Important:</b> If you want to change the current message, then use {@link #getIn()} instead as it will
-     * ensure headers etc. is kept and propagated when routing continues. Bottom line end users should rarely use
-     * this method.
-     * <p/>
-     * <br/>If you want to test whether an OUT message have been set or not, use the {@link #hasOut()} method.
-     * <p/>
-     * See also the class java doc for this {@link Exchange} for more details and this
-     * <a href="http://camel.apache.org/using-getin-or-getout-methods-on-exchange.html">FAQ entry</a>.
-     *
-     * @param type the given type
-     * @return the message as the given type or <tt>null</tt> if not possible to covert to given type
-     * @see #getIn(Class)
-     */
-    <T> T getOut(Class<T> type);
-
-    /**
-     * Returns whether an OUT message has been set or not.
-     *
-     * @return <tt>true</tt> if an OUT message exists, <tt>false</tt> otherwise.
-     */
-    boolean hasOut();
-
-    /**
-     * Sets the outbound message
-     *
-     * @param out the outbound message
-     */
-    void setOut(Message out);
-
-    /**
-     * Returns the exception associated with this exchange
-     *
-     * @return the exception (or null if no faults)
-     */
-    Exception getException();
-
-    /**
-     * Returns the exception associated with this exchange.
-     * <p/>
-     * Is used to get the caused exception that typically have been wrapped in some sort
-     * of Camel wrapper exception
-     * <p/>
-     * The strategy is to look in the exception hierarchy to find the first given cause that matches the type.
-     * Will start from the bottom (the real cause) and walk upwards.
-     *
-     * @param type the exception type
-     * @return the exception (or <tt>null</tt> if no caused exception matched)
-     */
-    <T> T getException(Class<T> type);
-
-    /**
-     * Sets the exception associated with this exchange
-     * <p/>
-     * Camel will wrap {@link Throwable} into {@link Exception} type to
-     * accommodate for the {@link #getException()} method returning a plain {@link Exception} type.
-     *
-     * @param t  the caused exception
-     */
-    void setException(Throwable t);
-
-    /**
-     * Returns true if this exchange failed due to either an exception or fault
-     *
-     * @return true if this exchange failed due to either an exception or fault
-     * @see Exchange#getException()
-     * @see Message#setFault(boolean)
-     * @see Message#isFault()
-     */
-    boolean isFailed();
-
-    /**
-     * Returns true if this exchange is transacted
-     */
-    boolean isTransacted();
-
-    /**
-     * Returns true if this exchange is marked for rollback
-     */
-    boolean isRollbackOnly();
-
-    /**
-     * Returns the container so that a processor can resolve endpoints from URIs
-     *
-     * @return the container which owns this exchange
-     */
-    CamelContext getContext();
-
-    /**
-     * Creates a copy of the current message exchange so that it can be
-     * forwarded to another destination
-     */
-    Exchange copy();
-
-    /**
-     * Returns the endpoint which originated this message exchange if a consumer on an endpoint
-     * created the message exchange, otherwise this property will be <tt>null</tt>
-     */
-    Endpoint getFromEndpoint();
-
-    /**
-     * Sets the endpoint which originated this message exchange. This method
-     * should typically only be called by {@link org.apache.camel.Endpoint} implementations
-     *
-     * @param fromEndpoint the endpoint which is originating this message exchange
-     */
-    void setFromEndpoint(Endpoint fromEndpoint);
-    
-    /**
-     * Returns the route id which originated this message exchange if a route consumer on an endpoint
-     * created the message exchange, otherwise this property will be <tt>null</tt>
-     */
-    String getFromRouteId();
-
-    /**
-     * Sets the route id which originated this message exchange. This method
-     * should typically only be called by the internal framework.
-     *
-     * @param fromRouteId the from route id
-     */
-    void setFromRouteId(String fromRouteId);
-
-    /**
-     * Returns the unit of work that this exchange belongs to; which may map to
-     * zero, one or more physical transactions
-     */
-    UnitOfWork getUnitOfWork();
-
-    /**
-     * Sets the unit of work that this exchange belongs to; which may map to
-     * zero, one or more physical transactions
-     */
-    void setUnitOfWork(UnitOfWork unitOfWork);
-
-    /**
-     * Returns the exchange id (unique)
-     */
-    String getExchangeId();
-
-    /**
-     * Set the exchange id
-     */
-    void setExchangeId(String id);
-
-    /**
-     * Adds a {@link org.apache.camel.spi.Synchronization} to be invoked as callback when
-     * this exchange is completed.
-     *
-     * @param onCompletion  the callback to invoke on completion of this exchange
-     */
-    void addOnCompletion(Synchronization onCompletion);
-
-    /**
-     * Handover all the on completions from this exchange to the target exchange.
-     *
-     * @param target the target exchange
-     */
-    void handoverCompletions(Exchange target);
-
-    /**
-     * Handover all the on completions from this exchange
-     *
-     * @return the on completions
-     */
-    List<Synchronization> handoverCompletions();
-
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/ExchangeException.java b/trunk/camel-core/src/main/java/org/apache/camel/ExchangeException.java
deleted file mode 100644
index bc7557c..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/ExchangeException.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * 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;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Marks a parameter as being the exception set on an exchange
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Target({ElementType.PARAMETER })
-public @interface ExchangeException {
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/ExchangePattern.java b/trunk/camel-core/src/main/java/org/apache/camel/ExchangePattern.java
deleted file mode 100644
index bec9d5f..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/ExchangePattern.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/**
- * 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;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Represents the kind of message exchange pattern
- *
- * @version 
- */
-@XmlType
-@XmlEnum(String.class)
-public enum ExchangePattern {
-    InOnly, RobustInOnly, InOut, InOptionalOut, OutOnly, RobustOutOnly, OutIn, OutOptionalIn;
-
-    protected static final Map<String, ExchangePattern> MAP = new HashMap<String, ExchangePattern>();
-
-    /**
-     * Returns the WSDL URI for this message exchange pattern
-     */
-    public String getWsdlUri() {
-        switch (this) {
-        case InOnly:
-            return "http://www.w3.org/ns/wsdl/in-only";
-        case InOptionalOut:
-            return "http://www.w3.org/ns/wsdl/in-optional-out";
-        case InOut:
-            return "http://www.w3.org/ns/wsdl/in-out";
-        case OutIn:
-            return "http://www.w3.org/ns/wsdl/out-in";
-        case OutOnly:
-            return "http://www.w3.org/ns/wsdl/out-only";
-        case OutOptionalIn:
-            return "http://www.w3.org/ns/wsdl/out-optional_in";
-        case RobustInOnly:
-            return "http://www.w3.org/ns/wsdl/robust-in-only";
-        case RobustOutOnly:
-            return "http://www.w3.org/ns/wsdl/robust-out-only";
-        default:
-            throw new IllegalArgumentException("Unknown message exchange pattern: " + this);
-        }
-    }
-
-    /**
-     * Return true if there can be an IN message
-     */
-    public boolean isInCapable() {
-        switch (this) {
-        case OutOnly:
-        case RobustOutOnly:
-            return false;
-        default:
-            return true;
-        }
-    }
-
-    /**
-     * Return true if there can be an OUT message
-     */
-    public boolean isOutCapable() {
-        switch (this) {
-        case InOnly:
-        case RobustInOnly:
-            return false;
-        default:
-            return true;
-        }
-    }
-
-    /**
-     * Return true if there can be a FAULT message
-     */
-    public boolean isFaultCapable() {
-        switch (this) {
-        case InOnly:
-        case OutOnly:
-            return false;
-        default:
-            return true;
-        }
-    }
-
-    /**
-     * Converts the WSDL URI into a {@link ExchangePattern} instance
-     */
-    public static ExchangePattern fromWsdlUri(String wsdlUri) {
-        return MAP.get(wsdlUri);
-    }
-    
-    public static ExchangePattern asEnum(String value) {
-        try {
-            return valueOf(value);
-        } catch (Exception e) {
-            throw new IllegalArgumentException("Unknown message exchange pattern: " + value, e);
-        }
-    }
-
-    static {
-        for (ExchangePattern mep : values()) {
-            String uri = mep.getWsdlUri();
-            MAP.put(uri, mep);
-            String name = uri.substring(uri.lastIndexOf('/') + 1);
-            MAP.put("http://www.w3.org/2004/08/wsdl/" + name, mep);
-            MAP.put("http://www.w3.org/2006/01/wsdl/" + name, mep);
-        }
-    }
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/ExchangeTimedOutException.java b/trunk/camel-core/src/main/java/org/apache/camel/ExchangeTimedOutException.java
deleted file mode 100644
index d0c98f5..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/ExchangeTimedOutException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * 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;
-
-/**
- * An exception thrown if an InOut exchange times out receiving the OUT message
- *
- * @version 
- */
-public class ExchangeTimedOutException extends CamelExchangeException {
-    private static final long serialVersionUID = -7899162905421788853L;
-
-    private final long timeout;
-
-    public ExchangeTimedOutException(Exchange exchange, long timeout) {
-        super("The OUT message was not received within: " + timeout + " millis", exchange);
-        this.timeout = timeout;
-    }
-
-    /**
-     * Return the timeout which expired in milliseconds
-     */
-    public long getTimeout() {
-        return timeout;
-    }
-}
\ No newline at end of file
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/ExecutorServiceAware.java b/trunk/camel-core/src/main/java/org/apache/camel/ExecutorServiceAware.java
deleted file mode 100644
index e7d9f8a..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/ExecutorServiceAware.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * 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;
-
-import java.util.concurrent.ExecutorService;
-
-/**
- * Is used for easy configuration of {@link ExecutorService}.
- *
- * @version 
- */
-public interface ExecutorServiceAware {
-
-    /**
-     * Gets the executor service
-     *
-     * @return the executor
-     */
-    ExecutorService getExecutorService();
-
-    /**
-     * Sets the executor service to be used.
-     *
-     * @param executorService the executor
-     */
-    void setExecutorService(ExecutorService executorService);
-
-    /**
-     * Gets the reference to lookup in the {@link org.apache.camel.spi.Registry} for the executor service to be used.
-     *
-     * @return the reference, or <tt>null</tt> if the executor was set directly
-     */
-    String getExecutorServiceRef();
-
-    /**
-     * Sets a reference to lookup in the {@link org.apache.camel.spi.Registry} for the executor service to be used.
-     *
-     * @param executorServiceRef reference for the executor
-     */
-    void setExecutorServiceRef(String executorServiceRef);
-
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/ExpectedBodyTypeException.java b/trunk/camel-core/src/main/java/org/apache/camel/ExpectedBodyTypeException.java
deleted file mode 100644
index 9c30660..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/ExpectedBodyTypeException.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * 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;
-
-/**
- * Thrown if the body could not be converted to the required type
- * 
- * @version 
- */
-public class ExpectedBodyTypeException extends RuntimeCamelException {
-    private static final long serialVersionUID = -7121445152234363768L;
-    private final transient Exchange exchange;
-    private final transient Class<?> expectedBodyType;
-
-    public ExpectedBodyTypeException(Exchange exchange, Class<?> expectedBodyType) {
-        super("Could not extract IN message body as type: " + expectedBodyType + " body is: "
-              + exchange.getIn().getBody());
-        this.exchange = exchange;
-        this.expectedBodyType = expectedBodyType;
-    }
-
-    public Exchange getExchange() {
-        return exchange;
-    }
-
-    public Class<?> getExpectedBodyType() {
-        return expectedBodyType;
-    }
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/Expression.java b/trunk/camel-core/src/main/java/org/apache/camel/Expression.java
deleted file mode 100644
index 950e07a8..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/Expression.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * 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;
-
-/**
- * An <a href="http://camel.apache.org/expression.html">expression</a>
- * provides a plugin strategy for evaluating expressions on a message exchange to support things like
- * <a href="http://camel.apache.org/scripting-languages.html">scripting languages</a>,
- * <a href="http://camel.apache.org/xquery.html">XQuery</a>
- * or <a href="http://camel.apache.org/sql.html">SQL</a> as well
- * as any arbitrary Java expression.
- *
- * @version 
- */
-public interface Expression {
-
-    /**
-     * Returns the value of the expression on the given exchange
-     *
-     * @param exchange the message exchange on which to evaluate the expression
-     * @param type the expected type of the evaluation result
-     * @return the value of the expression
-     */
-    <T> T evaluate(Exchange exchange, Class<T> type);
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/ExpressionEvaluationException.java b/trunk/camel-core/src/main/java/org/apache/camel/ExpressionEvaluationException.java
deleted file mode 100644
index a5b856d..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/ExpressionEvaluationException.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * 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;
-
-/**
- * An exception thrown if evaluation of the expression failed.
- *
- * @version 
- */
-public class ExpressionEvaluationException extends RuntimeCamelException {
-
-    private static final long serialVersionUID = 2939802714638174540L;
-    
-    private final transient Expression expression;
-    private final transient Exchange exchange;
-
-    public ExpressionEvaluationException(Expression expression, Exchange exchange, Throwable cause) {
-        super(cause);
-        this.expression = expression;
-        this.exchange = exchange;
-    }
-
-    public Expression getExpression() {
-        return expression;
-    }
-
-    public Exchange getExchange() {
-        return exchange;
-    }
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/ExpressionIllegalSyntaxException.java b/trunk/camel-core/src/main/java/org/apache/camel/ExpressionIllegalSyntaxException.java
deleted file mode 100644
index d88def5..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/ExpressionIllegalSyntaxException.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * 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;
-
-/**
- * An exception thrown if the expression contains illegal syntax.
- *
- * @version 
- */
-public class ExpressionIllegalSyntaxException extends RuntimeCamelException {
-    private static final long serialVersionUID = 6545652894842621836L;
-
-    private final String expression;
-
-    public ExpressionIllegalSyntaxException(String expression) {
-        this(expression, null);
-    }
-
-    public ExpressionIllegalSyntaxException(String expression, Throwable cause) {
-        super("Illegal syntax: " + expression, cause);
-        this.expression = expression;
-    }
-
-    public String getExpression() {
-        return expression;
-    }
-
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/FailedToCreateConsumerException.java b/trunk/camel-core/src/main/java/org/apache/camel/FailedToCreateConsumerException.java
deleted file mode 100644
index 821e7e2..0000000
--- a/trunk/camel-core/src/main/java/org/apache/camel/FailedToCreateConsumerException.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * 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;
-
-/**
- * Thrown if Camel failed to create a consumer for a given endpoint.
- *
- * @version 
- */
-public class FailedToCreateConsumerException extends RuntimeCamelException {
-    private static final long serialVersionUID = 1916718168052020246L;
-
-    private final String uri;
-
-    public FailedToCreateConsumerException(String endpointURI, Throwable cause) {
-        super("Failed to create Consumer for endpoint for: " + endpointURI + ". Reason: " + cause, cause);
-        this.uri = endpointURI;
-    }
-
-    public FailedToCreateConsumerException(Endpoint endpoint, Throwable cause) {
-        super("Failed to create Consumer for endpoint: " + endpoint + ". Reason: " + cause, cause);
-        this.uri = endpoint.getEndpointUri();
-    }
-
-    public FailedToCreateConsumerException(Endpoint endpoint, String message, Throwable cause) {
-        super("Failed to create Consumer for endpoint: " + endpoint + ". Reason: " + message, cause);
-        this.uri = endpoint.getEndpointUri();
-    }
-
-    public String getUri() {
-        return uri;
-    }
-}
diff --git a/trunk/camel-core/src/main/java/org/apache/camel/FailedToCreateProducerException.java b/trunk/camel-core/src/main/java/org/apache/camel/FailedToCreateProduc