You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2007/09/08 09:25:12 UTC

svn commit: r573793 - in /activemq/camel/trunk: apache-camel/ camel-core/src/main/java/org/apache/camel/impl/converter/ camel-core/src/main/java/org/apache/camel/util/ tooling/maven/ tooling/maven/maven-camel-converters/ tooling/maven/maven-camel-conve...

Author: jstrachan
Date: Sat Sep  8 00:25:08 2007
New Revision: 573793

URL: http://svn.apache.org/viewvc?rev=573793&view=rev
Log:
applied patch from Hadrian for CAMEL-11

Added:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ReportingTypeConverterLoader.java   (with props)
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ReportingTypeConverterRegistry.java   (with props)
    activemq/camel/trunk/tooling/maven/maven-camel-converters/
    activemq/camel/trunk/tooling/maven/maven-camel-converters/pom.xml   (with props)
    activemq/camel/trunk/tooling/maven/maven-camel-converters/src/
    activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/
    activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/java/
    activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/java/org/
    activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/java/org/apache/
    activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/java/org/apache/camel/
    activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/java/org/apache/camel/maven/
    activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/java/org/apache/camel/maven/ConvertersMojo.java   (with props)
    activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/resources/
    activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/resources/META-INF/
    activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/resources/META-INF/LICENSE.txt   (with props)
    activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/resources/META-INF/NOTICE.txt   (with props)
    activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/resources/maven-camel-converters.properties   (with props)
Modified:
    activemq/camel/trunk/apache-camel/pom.xml
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
    activemq/camel/trunk/tooling/maven/pom.xml

Modified: activemq/camel/trunk/apache-camel/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/pom.xml?rev=573793&r1=573792&r2=573793&view=diff
==============================================================================
--- activemq/camel/trunk/apache-camel/pom.xml (original)
+++ activemq/camel/trunk/apache-camel/pom.xml Sat Sep  8 00:25:08 2007
@@ -276,6 +276,18 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>maven-camel-converters</artifactId>
+        <executions>
+          <execution>
+            <id>camel-converters</id>
+            <goals>
+              <goal>report</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <profiles>

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java?rev=573793&r1=573792&r2=573793&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java Sat Sep  8 00:25:08 2007
@@ -17,6 +17,7 @@
 package org.apache.camel.impl.converter;
 
 import org.apache.camel.Converter;
+import org.apache.camel.TypeConverter;
 import org.apache.camel.impl.CachingInjector;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.ResolverUtil;
@@ -153,14 +154,14 @@
                             else {
                                 Class fromType = parameterTypes[0];
                                 if (isStatic(modifiers)) {
-                                    registry.addTypeConverter(toType, fromType,
+                                	registerTypeConverter(registry, method, toType, fromType,
                                             new StaticMethodTypeConverter(method));
                                 }
                                 else {
                                     if (injector == null) {
                                         injector = new CachingInjector(registry, type);
                                     }
-                                    registry.addTypeConverter(toType, fromType,
+                                    registerTypeConverter(registry, method, toType, fromType,
                                             new InstanceMethodTypeConverter(injector, method));
                                 }
                             }
@@ -176,5 +177,11 @@
         catch (NoClassDefFoundError e) {
             LOG.debug("Ignoring converter type: " + type.getName() + " as a dependent class could not be found: " + e, e);
         }
+    }
+    
+    protected void registerTypeConverter(TypeConverterRegistry registry, Method method, 
+    		Class toType, Class fromType, TypeConverter typeConverter) {
+    	
+        registry.addTypeConverter(toType, fromType, typeConverter);
     }
 }

Added: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ReportingTypeConverterLoader.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ReportingTypeConverterLoader.java?rev=573793&view=auto
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ReportingTypeConverterLoader.java (added)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ReportingTypeConverterLoader.java Sat Sep  8 00:25:08 2007
@@ -0,0 +1,122 @@
+/**
+ * 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.util;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import org.apache.camel.TypeConverter;
+import org.apache.camel.impl.converter.AnnotationTypeConverterLoader;
+import org.apache.camel.impl.converter.TypeConverterRegistry;
+
+public class ReportingTypeConverterLoader extends AnnotationTypeConverterLoader {
+	
+    private List<TypeMapping> typeMappings = new ArrayList<TypeMapping>();
+	private static final Comparator<TypeMapping> COMPARE_LAST_LOADED_FIRST =
+        new Comparator<TypeMapping>() {
+			public int compare(TypeMapping t1, TypeMapping t2) {
+				if (ObjectHelper.equals(t1.fromType, t2.fromType)) {
+					return ObjectHelper.equals(t1.toType, t2.toType) ? t1.index - t2.index :
+						ObjectHelper.compare(getTypeName(t1.toType), getTypeName(t2.toType));
+				}
+				return ObjectHelper.compare(getTypeName(t1.fromType), getTypeName(t2.fromType));
+			}
+			
+		};
+    
+    public TypeMapping[] getTypeConversions() {
+    	Collections.sort(typeMappings, COMPARE_LAST_LOADED_FIRST);
+    	return typeMappings.toArray(new TypeMapping[typeMappings.size()]);
+    }
+    
+    protected void registerTypeConverter(TypeConverterRegistry registry, Method method, 
+    		Class toType, Class fromType, TypeConverter typeConverter) {
+    	
+        TypeMapping mapping = new TypeMapping(toType, fromType, typeConverter.getClass(), method);
+        typeMappings.add(mapping);
+    }
+    
+	static private String getTypeName(Class type) {
+		return type != null ? type.getName() : null;
+	}
+	
+    /**
+     * Represents a mapping from one type (which can be null) to another
+     */
+    public static class TypeMapping {
+    	private static int counter = 0;
+        Class toType;
+        Class fromType;
+        Class converterType;
+        Method method;
+        int index = 0;
+        
+        public TypeMapping(Class toType, Class fromType, Class converterType, Method method) {
+            this.toType = toType;
+            this.fromType = fromType;
+            this.converterType = converterType;
+            this.method = method;
+            this.index = counter++;
+        }
+        
+        public Class getFromType() {
+            return fromType;
+        }
+
+        public Class getToType() {
+            return toType;
+        }
+
+        public Class getConverterType() {
+            return converterType;
+        }
+
+        public Method getMethod() {
+        	return method;
+        }
+        
+        public int getIndex() {
+        	return index;
+        }
+        
+        @Override
+        public boolean equals(Object object) {
+            if (object instanceof TypeMapping) {
+                TypeMapping that = (TypeMapping)object;
+                return this.index == that.index;
+            }
+            return false;
+        }
+
+        @Override
+        public int hashCode() {
+            int answer = toType.hashCode();
+            if (fromType != null) {
+                answer *= 37 + fromType.hashCode();
+            }
+            return answer;
+        }
+
+        @Override
+        public String toString() {
+            return "[" + fromType.getSimpleName() + "=>" + toType.getSimpleName() + "]";
+        }
+    }    
+}

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ReportingTypeConverterLoader.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ReportingTypeConverterRegistry.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ReportingTypeConverterRegistry.java?rev=573793&view=auto
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ReportingTypeConverterRegistry.java (added)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ReportingTypeConverterRegistry.java Sat Sep  8 00:25:08 2007
@@ -0,0 +1,45 @@
+/**
+ * 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.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.camel.TypeConverter;
+import org.apache.camel.impl.converter.TypeConverterRegistry;
+import org.apache.camel.spi.Injector;
+
+public class ReportingTypeConverterRegistry implements TypeConverterRegistry {
+    private List<String> errors = new ArrayList<String>();
+
+	public String[] getErrors() {
+		return errors.toArray(new String[errors.size()]);
+	}
+	
+    public void addTypeConverter(Class toType, Class fromType,
+			TypeConverter typeConverter) {
+
+    	if (errors.size() == 0) {
+    		errors.add("Method should not be invoked.");
+    	}
+	}
+
+	public Injector getInjector() {
+		return null;
+	}
+
+}

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ReportingTypeConverterRegistry.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/tooling/maven/maven-camel-converters/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/tooling/maven/maven-camel-converters/pom.xml?rev=573793&view=auto
==============================================================================
--- activemq/camel/trunk/tooling/maven/maven-camel-converters/pom.xml (added)
+++ activemq/camel/trunk/tooling/maven/maven-camel-converters/pom.xml Sat Sep  8 00:25:08 2007
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<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">
+<!--
+  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.
+-->
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <artifactId>maven-plugins</artifactId>
+    <groupId>org.apache.camel</groupId>
+    <version>1.1-SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>maven-camel-converters</artifactId>
+  <packaging>maven-plugin</packaging>
+  <name>Camel :: Maven Camel Converters Plugin</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

Propchange: activemq/camel/trunk/tooling/maven/maven-camel-converters/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/java/org/apache/camel/maven/ConvertersMojo.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/java/org/apache/camel/maven/ConvertersMojo.java?rev=573793&view=auto
==============================================================================
--- activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/java/org/apache/camel/maven/ConvertersMojo.java (added)
+++ activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/java/org/apache/camel/maven/ConvertersMojo.java Sat Sep  8 00:25:08 2007
@@ -0,0 +1,152 @@
+/**
+ * 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.maven;
+
+import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.ReportingTypeConverterLoader;
+import org.apache.camel.util.ReportingTypeConverterRegistry;
+import org.apache.camel.util.ReportingTypeConverterLoader.TypeMapping;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Generate report of available type converstions.
+ *
+ * @goal report
+ * 
+ * @phase verify
+ */
+public class ConvertersMojo
+    extends AbstractMojo
+{
+    /**
+     * Base directory where all reports are written to.
+     * 
+     * @parameter expression="${project.build.directory}/camel-reports"
+     */
+    private File reportsDirectory;
+
+    /**
+     * Convenience parameter that allows you to disable report generation.
+     *
+     * @parameter expression="${generateReports}" default-value="true"
+     */
+    private boolean generateReports;
+
+    private static final String LINE_SEPARATOR = 
+    	"-------------------------------------------------------------------------------\n";
+    
+    public void execute() throws MojoExecutionException {
+        getLog().info( "Camel report directory: " + reportsDirectory );
+        
+        ReportingTypeConverterLoader loader = new ReportingTypeConverterLoader();
+        ReportingTypeConverterRegistry registry = new ReportingTypeConverterRegistry();
+        try {
+        	loader.load(registry);
+        	
+        	String[] errors = registry.getErrors();
+        	for (String error : errors) {
+        		getLog().error(error);
+        	}
+        }
+        catch (Exception e) {
+        	throw new MojoExecutionException(e.getMessage());
+        }
+
+    	if (generateReports) {
+        	generateReport(loader.getTypeConversions());
+    	}
+    }
+    
+    protected void generateReport(TypeMapping[] mappings) throws MojoExecutionException {
+    	
+    	File f = reportsDirectory;
+        if (!f.exists()) {
+            f.mkdirs();
+        }
+
+        File report = new File(f, "camel-converters.txt" );
+        FileWriter fw = null;
+        try
+        {
+            fw = new FileWriter(report);
+
+            fw.write("Camel Type Converter definitions\n");
+            fw.write(LINE_SEPARATOR);
+
+            Set<String> packages = new HashSet<String>();
+            Set<String> classes = new HashSet<String>();
+            
+            StringBuffer buffer = new StringBuffer();
+            Class prevFrom = null;
+            Class prevTo = null;
+            for (TypeMapping mapping : mappings) {
+            	boolean ignored = false;
+            	Class from = mapping.getFromType();
+            	Class to = mapping.getToType();
+            	if (ObjectHelper.equals(from, prevFrom) &&
+            		ObjectHelper.equals(to, prevTo)) {
+            		
+            		ignored = true;
+            		buffer.append(" ");
+            	}
+            	prevFrom = from;
+            	prevTo = to;
+            	Method method = mapping.getMethod();
+            	Class methodClass = method.getDeclaringClass();
+            	packages.add(methodClass.getPackage().getName());
+            	classes.add(methodClass.getName());
+            	
+            	buffer.append(from.getSimpleName() + "=>" + to.getSimpleName());
+            	buffer.append(" [" + mapping.getConverterType().getSimpleName());
+            	buffer.append("(" + methodClass.getName() + "." + method.getName() + "())]");
+            	if (ignored) {
+                	buffer.append(" - IGNORED replaced by conversion method above");
+            	}
+            	
+                fw.write(buffer.toString() + "\n");
+                buffer.setLength(0);
+            }
+            
+            String summary = "Found " + mappings.length + " type conversion methods in " 
+            		+ classes.size() + " classes from " + packages.size() + " packages."; 
+            fw.write(LINE_SEPARATOR);
+            fw.write(summary + "\n");
+    		getLog().info(summary);
+        }
+        catch (IOException e ) {
+            throw new MojoExecutionException( "Error creating report file " + report, e);
+        }
+        finally {
+            if (fw != null) {
+                try {
+                    fw.close();
+                }
+                catch (IOException e) {
+                    // ignore
+                }
+            }
+        }
+    }
+}

Propchange: activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/java/org/apache/camel/maven/ConvertersMojo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/resources/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/resources/META-INF/LICENSE.txt?rev=573793&view=auto
==============================================================================
--- activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/resources/META-INF/LICENSE.txt (added)
+++ activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/resources/META-INF/LICENSE.txt Sat Sep  8 00:25:08 2007
@@ -0,0 +1,203 @@
+
+                                 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.
+

Propchange: activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/resources/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/resources/META-INF/NOTICE.txt?rev=573793&view=auto
==============================================================================
--- activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/resources/META-INF/NOTICE.txt (added)
+++ activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/resources/META-INF/NOTICE.txt Sat Sep  8 00:25:08 2007
@@ -0,0 +1,11 @@
+   =========================================================================
+   ==  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.

Propchange: activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/resources/maven-camel-converters.properties
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/resources/maven-camel-converters.properties?rev=573793&view=auto
==============================================================================
--- activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/resources/maven-camel-converters.properties (added)
+++ activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/resources/maven-camel-converters.properties Sat Sep  8 00:25:08 2007
@@ -0,0 +1,17 @@
+# 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.
+

Propchange: activemq/camel/trunk/tooling/maven/maven-camel-converters/src/main/resources/maven-camel-converters.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: activemq/camel/trunk/tooling/maven/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/tooling/maven/pom.xml?rev=573793&r1=573792&r2=573793&view=diff
==============================================================================
--- activemq/camel/trunk/tooling/maven/pom.xml (original)
+++ activemq/camel/trunk/tooling/maven/pom.xml Sat Sep  8 00:25:08 2007
@@ -15,8 +15,8 @@
   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">
+<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>
 
@@ -32,8 +32,9 @@
   <packaging>pom</packaging>
 
   <modules>
-    <module>maven-html-to-pdf</module>
     <module>camel-maven-plugin</module>
+    <module>maven-html-to-pdf</module>
+    <module>maven-camel-converters</module>
   </modules>
 
   <dependencies>
@@ -79,4 +80,4 @@
       </plugin>
     </plugins>
   </reporting>
-</project>
+</project>
\ No newline at end of file