svn commit: r1309887 - in /camel/trunk/components/camel-jaxb/src: main/java/org/apache/camel/converter/jaxb/ test/java/org/apache/camel/converter/jaxb/ test/java/org/apache/camel/example/

[dkulp]

Author: dkulp
Date: Thu Apr  5 14:47:46 2012
New Revision: 1309887

URL: http://svn.apache.org/viewvc?rev=1309887&view=rev
Log:
[CAMEL-3776] Change from pooling to using XMLStreamReaders for
everything which removes all the locks and much of the casting.
NOTE: right now, this REQUIRES woodstox as the StAX parser as the in-jdk
version is not thread safe in how StaxConverter uses it right now.

Modified:

camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java

camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java

camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatTest.java

camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatConcurrentTest.java

Modified: 
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java?rev=1309887&r1=1309886&r2=1309887&view=diff
==
--- 
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
 (original)
+++ 
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
 Thu Apr  5 14:47:46 2012
@@ -26,7 +26,6 @@ import java.io.UnsupportedEncodingExcept
 import java.io.Writer;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.locks.ReentrantLock;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
@@ -34,7 +33,6 @@ import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
@@ -46,6 +44,7 @@ import org.apache.camel.Processor;
 import org.apache.camel.StreamCache;
 import org.apache.camel.TypeConverter;
 import org.apache.camel.component.bean.BeanInvocation;
+import org.apache.camel.converter.jaxp.StaxConverter;
 import org.apache.camel.spi.TypeConverterAware;
 import org.apache.camel.util.IOHelper;
 import org.slf4j.Logger;
@@ -57,13 +56,10 @@ import org.slf4j.LoggerFactory;
 public class FallbackTypeConverter implements TypeConverter, 
TypeConverterAware {
 private static final transient Logger LOG = 
LoggerFactory.getLogger(FallbackTypeConverter.class);
 private Map, JAXBContext> contexts = new HashMap, 
JAXBContext>();
-private Map, Unmarshaller> unmarshallers = new HashMap, 
Unmarshaller>();
-private XMLOutputFactory outputFactory;
 private TypeConverter parentTypeConverter;
+private StaxConverter staxConverter = new StaxConverter();
 private boolean prettyPrint = true;
 
-private ReentrantLock unmarshallerLock = new ReentrantLock();
-
 public boolean isPrettyPrint() {
 return prettyPrint;
 }
@@ -193,7 +189,7 @@ public class FallbackTypeConverter imple
 marshaller.setProperty(Marshaller.JAXB_ENCODING, 
exchange.getProperty(Exchange.CHARSET_NAME, String.class));
 }
 if (needFiltering(exchange)) {
-XMLStreamWriter writer = 
getOutputFactory().createXMLStreamWriter(buffer);
+XMLStreamWriter writer = 
exchange.getContext().getTypeConverter().convertTo(XMLStreamWriter.class, 
buffer);
 FilteringXmlStreamWriter filteringWriter = new 
FilteringXmlStreamWriter(writer);
 marshaller.marshal(value, filteringWriter);
 } else {
@@ -206,16 +202,16 @@ public class FallbackTypeConverter imple
 }
 
 protected Object unmarshal(Unmarshaller unmarshaller, Exchange exchange, 
Object value) throws JAXBException, UnsupportedEncodingException, 
XMLStreamException {
-unmarshallerLock.lock();
 try {
+XMLStreamReader xmlReader = null;
 if (value instanceof XMLStreamReader) {
-XMLStreamReader xmlReader = (XMLStreamReader) value;
-return unmarshaller.unmarshal(xmlReader);
+xmlReader = (XMLStreamReader) value;
 } else if (value instanceof InputStream) {
 if (needFiltering(exchange)) {
-return unmarshaller.unmarshal(new NonXmlFilterReader(new 
InputStreamReader((InputStream)value, IOHelper.getCharsetName(exchange;
+xmlReader = staxConverter.createXMLStreamReader(new 
NonXmlFilterReader(new InputStreamReader((InputStream)value, 
IOHelper.getCharsetName(exchange;
+} else {
+xmlReader = 
staxConverter.createXMLStreamReader(

svn commit: r1309926 - /camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java

[dkulp]

Author: dkulp
Date: Thu Apr  5 16:23:32 2012
New Revision: 1309926

URL: http://svn.apache.org/viewvc?rev=1309926&view=rev
Log:
[CAMEL-5142] Use a pool of input/output factories in StaxConverter to
allow it to work better with the in-jdk parsers.   Log some info entries
for things that are known to sometimes be problematic.

Modified:

camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java?rev=1309926&r1=1309925&r2=1309926&view=diff
==
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java
 Thu Apr  5 16:23:32 2012
@@ -17,20 +17,29 @@
 package org.apache.camel.converter.jaxp;
 
 import java.io.*;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
 
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLEventWriter;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLResolver;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
 
 import org.apache.camel.Converter;
 import org.apache.camel.Exchange;
 import org.apache.camel.util.IOHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A converter of StAX objects
@@ -39,37 +48,104 @@ import org.apache.camel.util.IOHelper;
  */
 @Converter
 public class StaxConverter {
+private static final transient Logger LOG = 
LoggerFactory.getLogger(XmlErrorListener.class);
+
+private static final BlockingQueue INPUT_FACTORY_POOL;
+private static final BlockingQueue OUTPUT_FACTORY_POOL;
+static {
+int i = 20;
+try {
+String s = AccessController.doPrivileged(new 
PrivilegedAction() {
+@Override
+public String run() {
+return 
System.getProperty("org.apache.cxf.staxutils.pool-size", "-1");
+}
+});
+i = Integer.parseInt(s);
+} catch (Throwable t) {
+//ignore 
+i = 20;
+}
+if (i <= 0) {
+i = 20;
+}
+INPUT_FACTORY_POOL = new LinkedBlockingQueue(i);
+OUTPUT_FACTORY_POOL = new LinkedBlockingQueue(i);
+}
+
 private XMLInputFactory inputFactory;
 private XMLOutputFactory outputFactory;
 
 @Converter
 public XMLEventWriter createXMLEventWriter(OutputStream out, Exchange 
exchange) throws XMLStreamException {
-return getOutputFactory().createXMLEventWriter(IOHelper.buffered(out), 
IOHelper.getCharsetName(exchange));
+XMLOutputFactory factory = getOutputFactory();
+try {
+return factory.createXMLEventWriter(IOHelper.buffered(out), 
IOHelper.getCharsetName(exchange));
+} finally {
+returnXMLOutputFactory(factory);
+}
 }
 
 @Converter
 public XMLEventWriter createXMLEventWriter(Writer writer) throws 
XMLStreamException {
-return 
getOutputFactory().createXMLEventWriter(IOHelper.buffered(writer));
+XMLOutputFactory factory = getOutputFactory();
+try {
+return factory.createXMLEventWriter(IOHelper.buffered(writer));
+} finally {
+returnXMLOutputFactory(factory);
+}
 }
 
 @Converter
 public XMLEventWriter createXMLEventWriter(Result result) throws 
XMLStreamException {
-return getOutputFactory().createXMLEventWriter(result);
+XMLOutputFactory factory = getOutputFactory();
+try {
+if (result instanceof DOMResult && !isWoodstox(factory)) {
+//FIXME - if not woodstox, this will likely not work well
+//likely should copy CXF's W3CDOM stuff
+LOG.info("DOMResult is known to have issues with {0}. We 
suggest using Woodstox",
+ factory.getClass());
+}
+return factory.createXMLEventWriter(result);
+} finally {
+returnXMLOutputFactory(factory);
+}
 }
 
 @Converter
 public XMLStreamWriter createXMLStreamWriter(OutputStream outputStream, 
Exchange exchange) throws XMLStreamException {
-return 
getOutputFactory().createXMLStreamWriter(IOHe

svn commit: r1309950 - in /camel/branches/camel-2.9.x: ./ components/camel-cxf/ components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/ components/camel-cxf/src/test/java/org/apache/c

[dkulp]

Author: dkulp
Date: Thu Apr  5 17:10:02 2012
New Revision: 1309950

URL: http://svn.apache.org/viewvc?rev=1309950&view=rev
Log:
Pull some stuff back from trunk to allow testing 2.9.x with CXF 2.6.0-SNAPSHOT

Added:

camel/branches/camel-2.9.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointBeans-2.6.xml
  - copied unchanged from r1305505, 
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointBeans-2.6.xml
Modified:
camel/branches/camel-2.9.x/   (props changed)
camel/branches/camel-2.9.x/components/camel-cxf/pom.xml

camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java

camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java

Propchange: camel/branches/camel-2.9.x/
--
  Reverse-merged /camel/trunk:r1309945
  Merged /camel/trunk:r1230710,1305505

Propchange: camel/branches/camel-2.9.x/
--
Binary property 'svnmerge-blocked' - no diff available.

Propchange: camel/branches/camel-2.9.x/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.9.x/components/camel-cxf/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/pom.xml?rev=1309950&r1=1309949&r2=1309950&view=diff
==
--- camel/branches/camel-2.9.x/components/camel-cxf/pom.xml (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/pom.xml Thu Apr  5 17:10:02 
2012
@@ -157,6 +157,11 @@
   ${cxf-version}
   test
 
+
+  org.apache.cxf
+  cxf-rt-bindings-soap
+  ${cxf-version}
+
 
 
   org.apache.camel
@@ -311,6 +316,26 @@
   
 
   
+  
+cxf-2.6
+
+2.6.0-SNAPSHOT
+
+
+
+  org.apache.cxf
+  cxf-rt-rs-extension-providers
+  ${cxf-version}
+  test
+  
+  
+org.codehaus.jettison
+jettison
+test
+
+
+
+  
 
   fastinstall
   

Modified: 
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java?rev=1309950&r1=1309949&r2=1309950&view=diff
==
--- 
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java
 (original)
+++ 
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java
 Thu Apr  5 17:10:02 2012
@@ -20,6 +20,8 @@ import org.apache.camel.component.cxf.ja
 import org.apache.camel.component.cxf.spring.SpringJAXRSClientFactoryBean;
 import org.apache.camel.component.cxf.spring.SpringJAXRSServerFactoryBean;
 import org.apache.camel.test.junit4.CamelSpringTestSupport;
+import org.apache.cxf.version.Version;
+
 import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -57,7 +59,11 @@ public class CxfRsSpringEndpointTest ext
 
 @Override
 protected AbstractXmlApplicationContext createApplicationContext() {
-return new ClassPathXmlApplicationContext(new 
String("org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointBeans.xml")); 
+String version = Version.getCurrentVersion();
+if (version.contains("2.5") || version.contains("2.4")) {
+return new ClassPathXmlApplicationContext(new 
String("org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointBeans.xml"));
+}
+return new ClassPathXmlApplicationContext(new 
String("org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointBeans-2.6.xml"));
 }
 
 }

Modified: 
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java?rev=1309950&r1=1309949&r2=1309950&view=diff
==
--- 
camel/branches/camel-

svn commit: r1310150 - /camel/trunk/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java

[dkulp]

Author: dkulp
Date: Fri Apr  6 01:37:01 2012
New Revision: 1310150

URL: http://svn.apache.org/viewvc?rev=1310150&view=rev
Log:
Fix an eclipse warning

Modified:

camel/trunk/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java?rev=1310150&r1=1310149&r2=1310150&view=diff
==
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
 Fri Apr  6 01:37:01 2012
@@ -58,7 +58,6 @@ public class DataFormatDefinition extend
  * @param ref  reference to lookup for a data format
  * @return the data format or null if not possible to create
  */
-@SuppressWarnings("deprecation")
 public static DataFormat getDataFormat(RouteContext routeContext, 
DataFormatDefinition type, String ref) {
 if (type == null) {
 ObjectHelper.notNull(ref, "ref or type");

svn commit: r1310151 - /camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java

[dkulp]

Author: dkulp
Date: Fri Apr  6 01:37:05 2012
New Revision: 1310151

URL: http://svn.apache.org/viewvc?rev=1310151&view=rev
Log:
The getUnmarshaller call no longer needs to be synchronized

Modified:

camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java

Modified: 
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java?rev=1310151&r1=1310150&r2=1310151&view=diff
==
--- 
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
 (original)
+++ 
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
 Fri Apr  6 01:37:05 2012
@@ -247,7 +247,7 @@ public class FallbackTypeConverter imple
 return context;
 }
 
-protected synchronized  Unmarshaller getUnmarshaller(Class type) 
throws JAXBException {
+protected  Unmarshaller getUnmarshaller(Class type) throws 
JAXBException {
 JAXBContext context = createContext(type);
 return context.createUnmarshaller();
 }

svn commit: r1310152 - in /camel/trunk/camel-core/src/main/java/org/apache/camel: builder/DataFormatClause.java model/dataformat/XmlJsonDataFormat.java

[dkulp]

Author: dkulp
Date: Fri Apr  6 01:43:35 2012
New Revision: 1310152

URL: http://svn.apache.org/viewvc?rev=1310152&view=rev
Log:
Checkstyle fixes

Modified:

camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java

camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java?rev=1310152&r1=1310151&r2=1310152&view=diff
==
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
 Fri Apr  6 01:43:35 2012
@@ -21,7 +21,6 @@ import java.util.zip.Deflater;
 
 import org.w3c.dom.Node;
 
-import org.apache.camel.model.dataformat.XmlJsonDataFormat;
 
 import org.apache.camel.model.DataFormatDefinition;
 import org.apache.camel.model.ProcessorDefinition;
@@ -48,6 +47,7 @@ import org.apache.camel.model.dataformat
 import org.apache.camel.model.dataformat.XMLBeansDataFormat;
 import org.apache.camel.model.dataformat.XMLSecurityDataFormat;
 import org.apache.camel.model.dataformat.XStreamDataFormat;
+import org.apache.camel.model.dataformat.XmlJsonDataFormat;
 import org.apache.camel.model.dataformat.ZipDataFormat;
 import org.apache.camel.util.jsse.KeyStoreParameters;
 

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java?rev=1310152&r1=1310151&r2=1310152&view=diff
==
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java
 Fri Apr  6 01:43:35 2012
@@ -38,48 +38,48 @@ import org.apache.camel.spi.DataFormat;
 @XmlAccessorType(XmlAccessType.FIELD)
 public class XmlJsonDataFormat extends DataFormatDefinition {
 
-   public static final String TYPE_HINTS = "typeHints";
-   public static final String REMOVE_NAMESPACE_PREFIXES = 
"removeNamespacePrefixes";
-   public static final String SKIP_NAMESPACES = "skipNamespaces";
-   public static final String TRIM_SPACES = "trimSpaces";
-   public static final String SKIP_WHITESPACE = "skipWhitespace";
-   public static final String EXPANDABLE_PROPERTIES = 
"expandableProperties";
-   public static final String ARRAY_NAME = "arrayName";
-   public static final String ELEMENT_NAME = "elementName";
-   public static final String ROOT_NAME = "rootName";
-   public static final String NAMESPACE_LENIENT = "namespaceLenient";
-   public static final String FORCE_TOP_LEVEL_OBJECT = 
"forceTopLevelObject";
-   public static final String ENCODING = "encoding";
+public static final String TYPE_HINTS = "typeHints";
+public static final String REMOVE_NAMESPACE_PREFIXES = 
"removeNamespacePrefixes";
+public static final String SKIP_NAMESPACES = "skipNamespaces";
+public static final String TRIM_SPACES = "trimSpaces";
+public static final String SKIP_WHITESPACE = "skipWhitespace";
+public static final String EXPANDABLE_PROPERTIES = "expandableProperties";
+public static final String ARRAY_NAME = "arrayName";
+public static final String ELEMENT_NAME = "elementName";
+public static final String ROOT_NAME = "rootName";
+public static final String NAMESPACE_LENIENT = "namespaceLenient";
+public static final String FORCE_TOP_LEVEL_OBJECT = "forceTopLevelObject";
+public static final String ENCODING = "encoding";
 
 @XmlAttribute
-   private String encoding;
-   @XmlAttribute
-   private String elementName;
-   @XmlAttribute
-   private String arrayName;
-   @XmlAttribute
-   private Boolean forceTopLevelObject;
-   @XmlAttribute
-   private Boolean namespaceLenient;
-   @XmlAttribute
-   private String rootName;
-   @XmlAttribute
-   private Boolean skipWhitespace;
-   @XmlAttribute
-   private Boolean trimSpaces;
-   @XmlAttribute
-   private Boolean skipNamespaces;
-   @XmlAttribute
-   private Boolean removeNamespacePrefixes;
-   @XmlAttribute @XmlList
-   private List expandableProperties;
-   @XmlAttribute
-   private String typeHints;
-   
+

svn commit: r1310319 - in /camel/branches/camel-2.9.x: ./ camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java

[dkulp]

Author: dkulp
Date: Fri Apr  6 13:38:11 2012
New Revision: 1310319

URL: http://svn.apache.org/viewvc?rev=1310319&view=rev
Log:
Merged revisions 1309926 via  svn merge from
https://svn.apache.org/repos/asf/camel/trunk


  r1309926 | dkulp | 2012-04-05 12:23:32 -0400 (Thu, 05 Apr 2012) | 3 lines
  
  [CAMEL-5142] Use a pool of input/output factories in StaxConverter to
  allow it to work better with the in-jdk parsers.   Log some info entries
  for things that are known to sometimes be problematic.


Modified:
camel/branches/camel-2.9.x/   (props changed)

camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java

Propchange: camel/branches/camel-2.9.x/
('svn:mergeinfo' removed)

Propchange: camel/branches/camel-2.9.x/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java?rev=1310319&r1=1310318&r2=1310319&view=diff
==
--- 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java
 (original)
+++ 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java
 Fri Apr  6 13:38:11 2012
@@ -16,27 +16,30 @@
  */
 package org.apache.camel.converter.jaxp;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.Writer;
+import java.io.*;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
 
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLEventWriter;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLResolver;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
 
 import org.apache.camel.Converter;
 import org.apache.camel.Exchange;
 import org.apache.camel.util.IOHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A converter of StAX objects
@@ -45,37 +48,104 @@ import org.apache.camel.util.IOHelper;
  */
 @Converter
 public class StaxConverter {
+private static final transient Logger LOG = 
LoggerFactory.getLogger(XmlErrorListener.class);
+
+private static final BlockingQueue INPUT_FACTORY_POOL;
+private static final BlockingQueue OUTPUT_FACTORY_POOL;
+static {
+int i = 20;
+try {
+String s = AccessController.doPrivileged(new 
PrivilegedAction() {
+@Override
+public String run() {
+return 
System.getProperty("org.apache.cxf.staxutils.pool-size", "-1");
+}
+});
+i = Integer.parseInt(s);
+} catch (Throwable t) {
+//ignore 
+i = 20;
+}
+if (i <= 0) {
+i = 20;
+}
+INPUT_FACTORY_POOL = new LinkedBlockingQueue(i);
+OUTPUT_FACTORY_POOL = new LinkedBlockingQueue(i);
+}
+
 private XMLInputFactory inputFactory;
 private XMLOutputFactory outputFactory;
 
 @Converter
 public XMLEventWriter createXMLEventWriter(OutputStream out, Exchange 
exchange) throws XMLStreamException {
-return getOutputFactory().createXMLEventWriter(IOHelper.buffered(out), 
IOHelper.getCharsetName(exchange));
+XMLOutputFactory factory = getOutputFactory();
+try {
+return factory.createXMLEventWriter(IOHelper.buffered(out), 
IOHelper.getCharsetName(exchange));
+} finally {
+returnXMLOutputFactory(factory);
+}
 }
 
 @Converter
 public XMLEventWriter createXMLEventWriter(Writer writer) throws 
XMLStreamException {
-return 
getOutputFactory().createXMLEventWriter(IOHelper.buffered(writer));
+XMLOutputFactory factory = getOutputFactory();
+try {
+return factory.createXMLEventWriter(IOHelper.buffered(writer));
+} finally {
+returnXMLOutputFactory(factory);
+}
 }
 
 @Converter
 public XMLEventWriter createXMLEventWriter(Result result) throws 
XMLStreamException {
-return getOutputFactory().createXMLEventWriter(result);
+

svn commit: r1310323 - in /camel/branches/camel-2.8.x: ./ camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java

[dkulp]

Author: dkulp
Date: Fri Apr  6 13:42:02 2012
New Revision: 1310323

URL: http://svn.apache.org/viewvc?rev=1310323&view=rev
Log:
Merged revisions 1310319 via  svn merge from
https://svn.apache.org/repos/asf/camel/branches/camel-2.9.x


  r1310319 | dkulp | 2012-04-06 09:38:11 -0400 (Fri, 06 Apr 2012) | 11 lines
  
  Merged revisions 1309926 via  svn merge from
  https://svn.apache.org/repos/asf/camel/trunk
  
  
r1309926 | dkulp | 2012-04-05 12:23:32 -0400 (Thu, 05 Apr 2012) | 3 lines

[CAMEL-5142] Use a pool of input/output factories in StaxConverter to
allow it to work better with the in-jdk parsers.   Log some info entries
for things that are known to sometimes be problematic.
  
  


Modified:
camel/branches/camel-2.8.x/   (props changed)

camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java

Propchange: camel/branches/camel-2.8.x/
('svn:mergeinfo' removed)

Propchange: camel/branches/camel-2.8.x/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java?rev=1310323&r1=1310322&r2=1310323&view=diff
==
--- 
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java
 (original)
+++ 
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java
 Fri Apr  6 13:42:02 2012
@@ -16,28 +16,31 @@
  */
 package org.apache.camel.converter.jaxp;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.Writer;
+import java.io.*;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
 
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLEventWriter;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLResolver;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
 
 import org.apache.camel.Converter;
 import org.apache.camel.Exchange;
 import org.apache.camel.converter.IOConverter;
 import org.apache.camel.util.IOHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A converter of StAX objects
@@ -46,37 +49,104 @@ import org.apache.camel.util.IOHelper;
  */
 @Converter
 public class StaxConverter {
+private static final transient Logger LOG = 
LoggerFactory.getLogger(XmlErrorListener.class);
+
+private static final BlockingQueue INPUT_FACTORY_POOL;
+private static final BlockingQueue OUTPUT_FACTORY_POOL;
+static {
+int i = 20;
+try {
+String s = AccessController.doPrivileged(new 
PrivilegedAction() {
+@Override
+public String run() {
+return 
System.getProperty("org.apache.cxf.staxutils.pool-size", "-1");
+}
+});
+i = Integer.parseInt(s);
+} catch (Throwable t) {
+//ignore 
+i = 20;
+}
+if (i <= 0) {
+i = 20;
+}
+INPUT_FACTORY_POOL = new LinkedBlockingQueue(i);
+OUTPUT_FACTORY_POOL = new LinkedBlockingQueue(i);
+}
+
 private XMLInputFactory inputFactory;
 private XMLOutputFactory outputFactory;
 
 @Converter
 public XMLEventWriter createXMLEventWriter(OutputStream out, Exchange 
exchange) throws XMLStreamException {
-return getOutputFactory().createXMLEventWriter(IOHelper.buffered(out), 
IOHelper.getCharsetName(exchange));
+XMLOutputFactory factory = getOutputFactory();
+try {
+return factory.createXMLEventWriter(IOHelper.buffered(out), 
IOHelper.getCharsetName(exchange));
+} finally {
+returnXMLOutputFactory(factory);
+}
 }
 
 @Converter
 public XMLEventWriter createXMLEventWriter(Writer writer) throws 
XMLStreamException {
-return 
getOutputFactory().createXMLEventWriter(IOHelper.buffered(writer));
+XMLOutputFactory factory = getOutputFactory();
+try {
+return factory.createXMLEventWriter(IOHelper.buffered(writer)

svn commit: r1330102 - in /camel/trunk: components/camel-cxf/pom.xml components/camel-soap/pom.xml parent/pom.xml tests/camel-itest-osgi/pom.xml

[dkulp]

Author: dkulp
Date: Wed Apr 25 05:03:58 2012
New Revision: 1330102

URL: http://svn.apache.org/viewvc?rev=1330102&view=rev
Log:
[CAMEL-5214] Update to CXF 2.6.0

Modified:
camel/trunk/components/camel-cxf/pom.xml
camel/trunk/components/camel-soap/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/tests/camel-itest-osgi/pom.xml

Modified: camel/trunk/components/camel-cxf/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/pom.xml?rev=1330102&r1=1330101&r2=1330102&view=diff
==
--- camel/trunk/components/camel-cxf/pom.xml (original)
+++ camel/trunk/components/camel-cxf/pom.xml Wed Apr 25 05:03:58 2012
@@ -206,6 +206,19 @@
   easymockclassextension
   test
 
+
+
+  org.apache.cxf
+  cxf-rt-rs-extension-providers
+  ${cxf-version}
+  test
+  
+
+  org.codehaus.jettison
+  jettison
+  test
+
+
   
 
   
@@ -317,26 +330,6 @@
   
 
   
-  
-cxf-2.6
-
-2.6.0-SNAPSHOT
-
-
-
-  org.apache.cxf
-  cxf-rt-rs-extension-providers
-  ${cxf-version}
-  test
-  
-  
-org.codehaus.jettison
-jettison
-test
-
-
-
-  
 
   fastinstall
   

Modified: camel/trunk/components/camel-soap/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-soap/pom.xml?rev=1330102&r1=1330101&r2=1330102&view=diff
==
--- camel/trunk/components/camel-soap/pom.xml (original)
+++ camel/trunk/components/camel-soap/pom.xml Wed Apr 25 05:03:58 2012
@@ -72,7 +72,7 @@
 
 
 org.apache.cxf
-cxf-common-utilities
+cxf-api
 ${cxf-version}
 test
 

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1330102&r1=1330101&r2=1330102&view=diff
==
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Apr 25 05:03:58 2012
@@ -61,8 +61,8 @@
 3.1
 1.6
 1.2
-2.5.3
-2.4.0
+2.6.0
+2.6.0
 10.8.2.2
 2.1.1
 5.3.2

Modified: camel/trunk/tests/camel-itest-osgi/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/pom.xml?rev=1330102&r1=1330101&r2=1330102&view=diff
==
--- camel/trunk/tests/camel-itest-osgi/pom.xml (original)
+++ camel/trunk/tests/camel-itest-osgi/pom.xml Wed Apr 25 05:03:58 2012
@@ -344,10 +344,28 @@
   
   
   org.apache.cxf
-  cxf-bundle
+  cxf-rt-rs-extension-providers
   ${cxf-version}
   test
+
+  
+  org.apache.cxf
+  cxf-rt-transports-http-jetty
+  ${cxf-version}
+  test
+
+  
+  org.apache.cxf
+  cxf-rt-ws-security
+  ${cxf-version}
+  test
+
+  
+  org.codehaus.jettison
+  jettison
+  test
   
+
   
 org.apache.ftpserver
 ftpserver-core

svn commit: r1331542 - in /camel/trunk: components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelFilterWrapper.java components/camel-jetty/src/main/java/org/apache/camel/component/je

[dkulp]

Author: dkulp
Date: Fri Apr 27 19:02:33 2012
New Revision: 1331542

URL: http://svn.apache.org/viewvc?rev=1331542&view=rev
Log:
[CAMEL-5016, CAMEL-5228, CAMEL-5227] Update Jetty to use reflection
where needed to allow it to run with Jetty 7.5, 7.6, and 8.1.
Update OSGi version range to match.

Modified:

camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelFilterWrapper.java

camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
camel/trunk/parent/pom.xml

Modified: 
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelFilterWrapper.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelFilterWrapper.java?rev=1331542&r1=1331541&r2=1331542&view=diff
==
--- 
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelFilterWrapper.java
 (original)
+++ 
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelFilterWrapper.java
 Fri Apr 27 19:02:33 2012
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.jetty;
 
+import java.io.File;
 import java.io.IOException;
 
 import javax.servlet.Filter;
@@ -51,6 +52,20 @@ public class CamelFilterWrapper implemen
 }
 
 public void init(FilterConfig config) throws ServletException {
+Object o = 
config.getServletContext().getAttribute("javax.servlet.context.tempdir");
+if (o == null) {
+//when run in embedded mode, Jetty 8 will forget to set this 
property,
+//but the MultiPartFilter requires it (will NPE if not set) so 
we'll 
+//go ahead and set it to the default tmp dir on the system.
+try {
+File file = File.createTempFile("camel", "");
+file.delete();
+
config.getServletContext().setAttribute("javax.servlet.context.tempdir",
+file.getParentFile());
+} catch (IOException e) {
+//ignore
+}
+}
 wrapped.init(config);
 }
 

Modified: 
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java?rev=1331542&r1=1331541&r2=1331542&view=diff
==
--- 
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
 (original)
+++ 
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
 Fri Apr 27 19:02:33 2012
@@ -17,6 +17,7 @@
 package org.apache.camel.component.jetty;
 
 import java.io.File;
+import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URI;
@@ -368,11 +369,15 @@ public class JettyHttpComponent extends 
 if (endpoint.isMatchOnUriPrefix()) {
 pathSpec = pathSpec.endsWith("/") ? pathSpec + "*" : pathSpec 
+ "/*";
 }
-context.addFilter(filterHolder, pathSpec, 0);
+addFilter(context, filterHolder, pathSpec);
 }
 
 }
 
+private void addFilter(ServletContextHandler context, FilterHolder 
filterHolder, String pathSpec) {
+context.getServletHandler().addFilterWithMapping(filterHolder, 
pathSpec, 0);
+}
+
 private void enableMultipartFilter(HttpEndpoint endpoint, Server server, 
String connectorKey) throws Exception {
 ServletContextHandler context = 
server.getChildHandlerByClass(ServletContextHandler.class);
 CamelContext camelContext = this.getCamelContext();
@@ -401,7 +406,7 @@ public class JettyHttpComponent extends 
 if (endpoint.isMatchOnUriPrefix()) {
 pathSpec = pathSpec.endsWith("/") ? pathSpec + "*" : pathSpec + 
"/*";
 }
-context.addFilter(filterHolder, pathSpec, 0);
+addFilter(context, filterHolder, pathSpec);
 LOG.debug("using multipart filter implementation " + 
filter.getClass().getName() + " for path " + pathSpec);
 }
 
@@ -487,12 +492,7 @@ public class JettyHttpComponent extends 
 
 if (endpointSslContextParameters != null) {
 SslContextFactory contextFact = new SslContextFactory() {
-/**
- * We are going to provide the context so none of the 
configuration options
- * matter in the factory.  This method does not a

svn commit: r1331557 - in /camel/branches/camel-2.9.x: ./ components/camel-jetty/src/main/java/org/apache/camel/component/jetty/ parent/

[dkulp]

Author: dkulp
Date: Fri Apr 27 19:48:27 2012
New Revision: 1331557

URL: http://svn.apache.org/viewvc?rev=1331557&view=rev
Log:
Merged revisions 1331542 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk


  r1331542 | dkulp | 2012-04-27 15:02:33 -0400 (Fri, 27 Apr 2012) | 3 lines
  
  [CAMEL-5016, CAMEL-5228, CAMEL-5227] Update Jetty to use reflection
  where needed to allow it to run with Jetty 7.5, 7.6, and 8.1.
  Update OSGi version range to match.


Modified:
camel/branches/camel-2.9.x/   (props changed)

camel/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelFilterWrapper.java

camel/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
camel/branches/camel-2.9.x/parent/pom.xml

Propchange: camel/branches/camel-2.9.x/
--
  Merged /camel/trunk:r1331542

Propchange: camel/branches/camel-2.9.x/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelFilterWrapper.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelFilterWrapper.java?rev=1331557&r1=1331556&r2=1331557&view=diff
==
--- 
camel/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelFilterWrapper.java
 (original)
+++ 
camel/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelFilterWrapper.java
 Fri Apr 27 19:48:27 2012
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.jetty;
 
+import java.io.File;
 import java.io.IOException;
 
 import javax.servlet.Filter;
@@ -51,6 +52,20 @@ public class CamelFilterWrapper implemen
 }
 
 public void init(FilterConfig config) throws ServletException {
+Object o = 
config.getServletContext().getAttribute("javax.servlet.context.tempdir");
+if (o == null) {
+//when run in embedded mode, Jetty 8 will forget to set this 
property,
+//but the MultiPartFilter requires it (will NPE if not set) so 
we'll 
+//go ahead and set it to the default tmp dir on the system.
+try {
+File file = File.createTempFile("camel", "");
+file.delete();
+
config.getServletContext().setAttribute("javax.servlet.context.tempdir",
+file.getParentFile());
+} catch (IOException e) {
+//ignore
+}
+}
 wrapped.init(config);
 }
 

Modified: 
camel/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java?rev=1331557&r1=1331556&r2=1331557&view=diff
==
--- 
camel/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
 (original)
+++ 
camel/branches/camel-2.9.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
 Fri Apr 27 19:48:27 2012
@@ -17,6 +17,7 @@
 package org.apache.camel.component.jetty;
 
 import java.io.File;
+import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URI;
@@ -370,11 +371,15 @@ public class JettyHttpComponent extends 
 if (endpoint.isMatchOnUriPrefix()) {
 pathSpec = pathSpec.endsWith("/") ? pathSpec + "*" : pathSpec 
+ "/*";
 }
-context.addFilter(filterHolder, pathSpec, 0);
+addFilter(context, filterHolder, pathSpec);
 }
 
 }
 
+private void addFilter(ServletContextHandler context, FilterHolder 
filterHolder, String pathSpec) {
+context.getServletHandler().addFilterWithMapping(filterHolder, 
pathSpec, 0);
+}
+
 private void enableMultipartFilter(HttpEndpoint endpoint, Server server, 
String connectorKey) throws Exception {
 ServletContextHandler context = (ServletContextHandler) server
 .getChildHandlerByClass(ServletContextHandler.class);
@@ -404,7 +409,7 @@ public class JettyHttpComponent extends 
 if (endpoint.isMatchOnUriPrefix()) {
 pathSpec = pathSpec.endsWith("/") ? path

svn commit: r1334780 - /camel/branches/camel-2.8.x/

[dkulp]

Author: dkulp
Date: Sun May  6 21:17:35 2012
New Revision: 1334780

URL: http://svn.apache.org/viewvc?rev=1334780&view=rev
Log:
Fix the svnmerge props

Modified:
camel/branches/camel-2.8.x/   (props changed)

Propchange: camel/branches/camel-2.8.x/
--
Binary property 'svnmerge-integrated' - no diff available.

svn commit: r1335314 - in /camel/trunk: parent/pom.xml pom.xml

[dkulp]

Author: dkulp
Date: Tue May  8 01:11:10 2012
New Revision: 1335314

URL: http://svn.apache.org/viewvc?rev=1335314&view=rev
Log:
Use faster version of compiler plugin

Modified:
camel/trunk/parent/pom.xml
camel/trunk/pom.xml

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1335314&r1=1335313&r2=1335314&view=diff
==
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue May  8 01:11:10 2012
@@ -187,7 +187,7 @@
 1.2.5
 3.3.4
 
-2.3.2
+2.4
 
 
 
version="[$(version;==;${camel.osgi.version.clean}),$(version;=+;${camel.osgi.version.clean}))"

Modified: camel/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=1335314&r1=1335313&r2=1335314&view=diff
==
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Tue May  8 01:11:10 2012
@@ -148,7 +148,7 @@
 
   org.apache.maven.plugins
   maven-compiler-plugin
-  2.3.2
+  2.4
   
 1.6
 1.6

svn commit: r1335315 - in /camel/trunk/components/camel-test-blueprint: pom.xml src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java

[dkulp]

Author: dkulp
Date: Tue May  8 01:11:16 2012
New Revision: 1335315

URL: http://svn.apache.org/viewvc?rev=1335315&view=rev
Log:
Make sure we pick up the version of osgi-core that contains the
ServiceReference class we need.

Modified:
camel/trunk/components/camel-test-blueprint/pom.xml

camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java

Modified: camel/trunk/components/camel-test-blueprint/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/pom.xml?rev=1335315&r1=1335314&r2=1335315&view=diff
==
--- camel/trunk/components/camel-test-blueprint/pom.xml (original)
+++ camel/trunk/components/camel-test-blueprint/pom.xml Tue May  8 01:11:16 2012
@@ -36,7 +36,12 @@
 
 
 
-
+
+
+org.osgi
+org.osgi.core
+provided
+
 
 org.apache.camel
 camel-test
@@ -78,6 +83,16 @@
 com.googlecode.pojosr
 de.kalpatec.pojosr.framework
 ${pojosr-version}
+
+
+org.osgi
+org.osgi.core
+
+
+org.osgi
+org.osgi.compendium
+
+
 
 
 org.ops4j.pax.swissbox
@@ -102,6 +117,14 @@
 org.apache.felix
 org.osgi.foundation
 
+
+org.apache.felix
+org.osgi.core
+
+
+org.apache.felix
+org.osgi.compendium
+
 
 
 

Modified: 
camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java?rev=1335315&r1=1335314&r2=1335315&view=diff
==
--- 
camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
 (original)
+++ 
camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
 Tue May  8 01:11:16 2012
@@ -157,11 +157,11 @@ public final class CamelBlueprintHelper 
 Dictionary dic = bundleContext.getBundle().getHeaders();
 System.err.println("Test bundle headers: " + explode(dic));
 
-for (ServiceReference ref : 
asCollection(bundleContext.getAllServiceReferences(null, null))) {
+for (ServiceReference ref : 
asCollection(bundleContext.getAllServiceReferences(null, null))) {
 System.err.println("ServiceReference: " + ref);
 }
 
-for (ServiceReference ref : 
asCollection(bundleContext.getAllServiceReferences(null, flt))) {
+for (ServiceReference ref : 
asCollection(bundleContext.getAllServiceReferences(null, flt))) {
 System.err.println("Filtered ServiceReference: " + ref);
 }
 
@@ -194,8 +194,8 @@ public final class CamelBlueprintHelper 
 /**
  * Provides an iterable collection of references, even if the original 
array is null.
  */
-private static Collection> 
asCollection(ServiceReference[] references) {
-return references  == null ? new ArrayList>(0) : 
Arrays.asList(references);
+private static Collection 
asCollection(ServiceReference[] references) {
+return references  == null ? new ArrayList(0) : 
Arrays.asList(references);
 }
 
 private static TinyBundle createTestBundle(String name, String version, 
String descriptors) throws FileNotFoundException, MalformedURLException {

svn commit: r1335316 - /camel/trunk/pom.xml

[dkulp]

Author: dkulp
Date: Tue May  8 01:11:19 2012
New Revision: 1335316

URL: http://svn.apache.org/viewvc?rev=1335316&view=rev
Log:
Update to latest eclipse plugin to keep classpath in right order

Modified:
camel/trunk/pom.xml

Modified: camel/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=1335316&r1=1335315&r2=1335316&view=diff
==
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Tue May  8 01:11:19 2012
@@ -166,7 +166,7 @@
 
   org.apache.maven.plugins
   maven-eclipse-plugin
-  2.8
+  2.9
   
 
   org.apache.camel

svn commit: r1335317 - /camel/trunk/pom.xml

[dkulp]

Author: dkulp
Date: Tue May  8 01:11:22 2012
New Revision: 1335317

URL: http://svn.apache.org/viewvc?rev=1335317&view=rev
Log:
Update some plugin versions

Modified:
camel/trunk/pom.xml

Modified: camel/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=1335317&r1=1335316&r2=1335317&view=diff
==
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Tue May  8 01:11:22 2012
@@ -49,7 +49,7 @@
 2.1.13
 2.1
 
-2.3.4
+2.3.6
 2.2.0
   
 
@@ -366,7 +366,7 @@
 
  org.apache.maven.plugins
   maven-remote-resources-plugin
-  1.1
+  1.2.1
 
 
   org.apache.maven.plugins
@@ -376,12 +376,7 @@
 
   org.apache.maven.plugins
   maven-dependency-plugin
-  2.1
-
-
-  org.apache.maven.plugins
-  maven-site-plugin
-  2.1
+  2.4
 
 
   org.apache.maven.plugins

svn commit: r1335318 - /camel/trunk/pom.xml

[dkulp]

Author: dkulp
Date: Tue May  8 01:11:26 2012
New Revision: 1335318

URL: http://svn.apache.org/viewvc?rev=1335318&view=rev
Log:
Temporarily add threadsafe version of velocity until rr 1.3 is avail

Modified:
camel/trunk/pom.xml

Modified: camel/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=1335318&r1=1335317&r2=1335318&view=diff
==
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Tue May  8 01:11:26 2012
@@ -367,6 +367,13 @@
  org.apache.maven.plugins
   maven-remote-resources-plugin
   1.2.1
+  
+  
+org.apache.velocity
+velocity
+1.7
+  
+  
 
 
   org.apache.maven.plugins

svn commit: r1335319 - in /camel/trunk/components/camel-twitter: ./ src/test/java/org/apache/camel/component/twitter/ src/test/java/org/apache/camel/component/twitter/mocks/

[dkulp]

Author: dkulp
Date: Tue May  8 01:11:31 2012
New Revision: 1335319

URL: http://svn.apache.org/viewvc?rev=1335319&view=rev
Log:
Use JDK proxies to mock the things so it will build on Java7

Removed:

camel/trunk/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/mocks/StatusMock.java

camel/trunk/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/mocks/TwitterMock.java

camel/trunk/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/mocks/TwitterStreamMock.java
Modified:
camel/trunk/components/camel-twitter/pom.xml

camel/trunk/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchEventTest.java

Modified: camel/trunk/components/camel-twitter/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/pom.xml?rev=1335319&r1=1335318&r2=1335319&view=diff
==
--- camel/trunk/components/camel-twitter/pom.xml (original)
+++ camel/trunk/components/camel-twitter/pom.xml Tue May  8 01:11:31 2012
@@ -66,6 +66,12 @@
  slf4j-log4j12
  test
   
+  
+ org.easymock
+ easymock
+ test
+  
+




Modified: 
camel/trunk/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchEventTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchEventTest.java?rev=1335319&r1=1335318&r2=1335319&view=diff
==
--- 
camel/trunk/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchEventTest.java
 (original)
+++ 
camel/trunk/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchEventTest.java
 Tue May  8 01:11:31 2012
@@ -16,25 +16,37 @@
  */
 package org.apache.camel.component.twitter;
 
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
 import org.apache.camel.EndpointInject;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.component.twitter.mocks.TwitterStreamMock;
 import org.apache.camel.impl.JndiRegistry;
 import org.junit.Test;
 
+import twitter4j.Status;
+import twitter4j.StatusListener;
+import twitter4j.TwitterStream;
+
 public class SearchEventTest extends CamelTwitterTestSupport {
 
 @EndpointInject(uri = "mock:result")
 protected MockEndpoint resultEndpoint;
 
-private TwitterStreamMock twitterStream;
+private TwitterStream twitterStream;
+private StatusListener listener;
 
 @Test
 public void testSearchTimeline() throws Exception {
 resultEndpoint.expectedMinimumMessageCount(1);
+Status status = 
(Status)Proxy.newProxyInstance(getClass().getClassLoader(),
+  new Class[] 
{Status.class},
+  new 
TwitterHandler()); 
 
-twitterStream.updateStatus("#cameltest tweet");
+listener.onStatus(status);
+//"#cameltest tweet");
 resultEndpoint.assertIsSatisfied();
 }
 
@@ -49,9 +61,29 @@ public class SearchEventTest extends Cam
 
 @Override
 protected JndiRegistry createRegistry() throws Exception {
-twitterStream = new TwitterStreamMock();
+twitterStream = 
(TwitterStream)Proxy.newProxyInstance(getClass().getClassLoader(),
+   new Class[] 
{TwitterStream.class},
+   new TwitterHandler()); 
 JndiRegistry registry = super.createRegistry();
 registry.bind("twitterStream", twitterStream);
 return registry;
 }
+
+public class TwitterHandler implements InvocationHandler {
+public Object invoke(Object proxy, Method method, Object[] args) 
throws Throwable {
+//mock some methods
+if ("addListener".equals(method.getName())) {
+listener = (StatusListener)args[0];
+} else if ("toString".equals(method.getName())) {
+return this.toString();
+} else if ("getText".equals(method.getName())) {
+return "#cameltest tweet";
+} else if ("getUser".equals(method.getName())) {
+return Proxy.newProxyInstance(getClass().getClassLoader(),
+  new Class[] 
{twitter4j.User.class},
+  new TwitterHandler());
+}
+return null;
+}
+}
 }

svn commit: r1335320 - /camel/trunk/components/camel-soap/pom.xml

[dkulp]

Author: dkulp
Date: Tue May  8 01:11:35 2012
New Revision: 1335320

URL: http://svn.apache.org/viewvc?rev=1335320&view=rev
Log:
Generate just jaxws2.1 compatible code so it works OK flipping back and
forth between java7 and java6

Modified:
camel/trunk/components/camel-soap/pom.xml

Modified: camel/trunk/components/camel-soap/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-soap/pom.xml?rev=1335320&r1=1335319&r2=1335320&view=diff
==
--- camel/trunk/components/camel-soap/pom.xml (original)
+++ camel/trunk/components/camel-soap/pom.xml Tue May  8 01:11:35 2012
@@ -174,6 +174,9 @@
 generate-sources
 
 
${basedir}/target/generated/src/test/java
+
+jaxws21
+
 
 
 

svn commit: r1335322 - in /camel/trunk: components/camel-jaxb/pom.xml components/camel-soap/pom.xml components/camel-xstream/pom.xml parent/pom.xml

[dkulp]

Author: dkulp
Date: Tue May  8 01:11:43 2012
New Revision: 1335322

URL: http://svn.apache.org/viewvc?rev=1335322&view=rev
Log:
Reduce some dependencies that are not needed

Modified:
camel/trunk/components/camel-jaxb/pom.xml
camel/trunk/components/camel-soap/pom.xml
camel/trunk/components/camel-xstream/pom.xml
camel/trunk/parent/pom.xml

Modified: camel/trunk/components/camel-jaxb/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/pom.xml?rev=1335322&r1=1335321&r2=1335322&view=diff
==
--- camel/trunk/components/camel-jaxb/pom.xml (original)
+++ camel/trunk/components/camel-jaxb/pom.xml Tue May  8 01:11:43 2012
@@ -75,7 +75,6 @@
 
org.codehaus.woodstox
woodstox-core-asl
-   ${woodstox-version}
test
 
 

Modified: camel/trunk/components/camel-soap/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-soap/pom.xml?rev=1335322&r1=1335321&r2=1335322&view=diff
==
--- camel/trunk/components/camel-soap/pom.xml (original)
+++ camel/trunk/components/camel-soap/pom.xml Tue May  8 01:11:43 2012
@@ -49,25 +49,10 @@
 
 
 
-javax.xml.bind
-jaxb-api
-
-
 com.sun.xml.bind
 jaxb-impl
 
 
-
-
-org.apache.geronimo.specs
-geronimo-ws-metadata_2.0_spec
-1.1.2
-
-
-org.apache.geronimo.specs
-geronimo-jaxws_2.2_spec
-1.0
-
 
 
 
@@ -109,7 +94,6 @@
 
 org.codehaus.woodstox
 woodstox-core-asl
-${woodstox-version}
 test
 
 

Modified: camel/trunk/components/camel-xstream/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-xstream/pom.xml?rev=1335322&r1=1335321&r2=1335322&view=diff
==
--- camel/trunk/components/camel-xstream/pom.xml (original)
+++ camel/trunk/components/camel-xstream/pom.xml Tue May  8 01:11:43 2012
@@ -63,7 +63,6 @@
 
   org.codehaus.woodstox
   woodstox-core-asl
-  ${woodstox-version}
 
 
 

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1335322&r1=1335321&r2=1335322&view=diff
==
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue May  8 01:11:43 2012
@@ -1032,6 +1032,14 @@
 javax.xml
 jsr173
   
+  
+javax.xml.stream
+stax-api
+  
+  
+javax.activation
+activation
+  
 
   
   
@@ -1515,6 +1523,17 @@
 xercesImpl
 ${xerces-version}
   
+  
+  org.codehaus.woodstox
+  woodstox-core-asl
+  ${woodstox-version}
+  
+  
+  javax.xml.stream
+  stax-api
+  
+  
+  
 
   
   

svn commit: r1335321 - /camel/trunk/components/pom.xml

[dkulp]

Author: dkulp
Date: Tue May  8 01:11:38 2012
New Revision: 1335321

URL: http://svn.apache.org/viewvc?rev=1335321&view=rev
Log:
Move camel-quickfix into a java6 only profile until we can get a version
of quickfix that is compatible with java7

Modified:
camel/trunk/components/pom.xml

Modified: camel/trunk/components/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=1335321&r1=1335320&r2=1335321&view=diff
==
--- camel/trunk/components/pom.xml (original)
+++ camel/trunk/components/pom.xml Tue May  8 01:11:38 2012
@@ -123,7 +123,6 @@
 camel-printer
 camel-protobuf
 camel-quartz
-camel-quickfix
 camel-restlet
 camel-rmi
 camel-routebox
@@ -159,5 +158,17 @@
 camel-xstream
 camel-zookeeper
   
+
+  
+
+jdk16
+
+1.6
+
+
+camel-quickfix
+
+
+  
   
 

svn commit: r1335327 - /camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java

[dkulp]

Author: dkulp
Date: Tue May  8 02:30:36 2012
New Revision: 1335327

URL: http://svn.apache.org/viewvc?rev=1335327&view=rev
Log:
Work around issue with xjc on java7 that was generating nested types
into a different namespace.

Modified:

camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java?rev=1335327&r1=1335326&r2=1335327&view=diff
==
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
 Tue May  8 02:30:36 2012
@@ -29,6 +29,7 @@ import javax.xml.bind.annotation.XmlAttr
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
@@ -196,6 +197,7 @@ public class XStreamDataFormat extends D
 }
 
 @XmlAccessorType(XmlAccessType.NONE)
+@XmlType(name = "converterList", namespace = 
"http://camel.apache.org/schema/spring";)
 public static class ConverterList {
 @XmlElement(name = "converter")
 private List list;
@@ -210,6 +212,7 @@ public class XStreamDataFormat extends D
 }
 
 @XmlAccessorType(XmlAccessType.NONE)
+@XmlType(name = "converterEntry", namespace = 
"http://camel.apache.org/schema/spring";)
 public static class ConverterEntry {
 @XmlAttribute(name = "class")
 private String clsName;
@@ -260,6 +263,7 @@ public class XStreamDataFormat extends D
 }
 
 @XmlAccessorType(XmlAccessType.NONE)
+@XmlType(name = "implicitCollectionList", namespace = 
"http://camel.apache.org/schema/spring";)
 public static class ImplicitCollectionList {
 @XmlElement(name = "class")
 private List list;
@@ -274,6 +278,7 @@ public class XStreamDataFormat extends D
 }
 
 @XmlAccessorType(XmlAccessType.NONE)
+@XmlType(name = "implicitCollectionEntry", namespace = 
"http://camel.apache.org/schema/spring";)
 public static class ImplicitCollectionEntry {
 @XmlAttribute(name = "name")
 private String clsName;
@@ -344,6 +349,7 @@ public class XStreamDataFormat extends D
 }
 
 @XmlAccessorType(XmlAccessType.NONE)
+@XmlType(name = "aliasList", namespace = 
"http://camel.apache.org/schema/spring";)
 public static class AliasList {
 @XmlElement(name = "alias")
 private List list;
@@ -358,6 +364,7 @@ public class XStreamDataFormat extends D
 }
 
 @XmlAccessorType(XmlAccessType.NONE)
+@XmlType(name = "aliasEntry", namespace = 
"http://camel.apache.org/schema/spring";)
 public static class AliasEntry {
 
 @XmlAttribute
@@ -433,6 +440,7 @@ public class XStreamDataFormat extends D
 }
 
 @XmlAccessorType(XmlAccessType.NONE)
+@XmlType(name = "omitFieldList", namespace = 
"http://camel.apache.org/schema/spring";)
 public static class OmitFieldList {
 @XmlElement(name = "omitField")
 private List list;
@@ -447,6 +455,7 @@ public class XStreamDataFormat extends D
 }
 
 @XmlAccessorType(XmlAccessType.NONE)
+@XmlType(name = "omitFieldEntry", namespace = 
"http://camel.apache.org/schema/spring";)
 public static class OmitFieldEntry {
 
 @XmlAttribute(name = "class")

svn commit: r1335522 - /camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java

[dkulp]

Author: dkulp
Date: Tue May  8 13:54:51 2012
New Revision: 1335522

URL: http://svn.apache.org/viewvc?rev=1335522&view=rev
Log:
Fix jetty test failure with j7

Modified:

camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java

Modified: 
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java?rev=1335522&r1=1335521&r2=1335522&view=diff
==
--- 
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java
 (original)
+++ 
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java
 Tue May  8 13:54:51 2012
@@ -47,7 +47,6 @@ public class HttpAuthMethodPriorityTest 
 jndi.bind("myAuthHandler", getSecurityHandler());
 return jndi;
 }
-
 private SecurityHandler getSecurityHandler() throws IOException {
 Constraint constraint = new Constraint(Constraint.__BASIC_AUTH, 
"user");
 constraint.setAuthenticate(true);
@@ -86,7 +85,10 @@ public class HttpAuthMethodPriorityTest 
 fail("Should have thrown an exception");
 } catch (FailedToCreateProducerException e) {
 IllegalArgumentException cause = 
assertIsInstanceOf(IllegalArgumentException.class, 
e.getCause().getCause().getCause());
-assertEquals("No enum const class 
org.apache.camel.component.http.AuthMethod.foo", cause.getMessage());
+//JAXB 2.2 uses a slightly different message
+boolean b = cause.getMessage().contains("No enum const")
+&& 
cause.getMessage().contains("org.apache.camel.component.http.AuthMethod.foo");
+assertTrue("Bad fault message: " + cause.getMessage(), b);
 }
 }
 

svn commit: r1335635 - in /camel/trunk: components/camel-spring-ws/pom.xml parent/pom.xml

[dkulp]

Author: dkulp
Date: Tue May  8 16:55:03 2012
New Revision: 1335635

URL: http://svn.apache.org/viewvc?rev=1335635&view=rev
Log:
[CAMEL-5253] Upgrade to Spring-WS 2.0.5

Modified:
camel/trunk/components/camel-spring-ws/pom.xml
camel/trunk/parent/pom.xml

Modified: camel/trunk/components/camel-spring-ws/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/pom.xml?rev=1335635&r1=1335634&r2=1335635&view=diff
==
--- camel/trunk/components/camel-spring-ws/pom.xml (original)
+++ camel/trunk/components/camel-spring-ws/pom.xml Tue May  8 16:55:03 2012
@@ -53,6 +53,16 @@
 org.apache.camel
 camel-spring
 
+
+org.springframework
+spring-oxm
+${spring-version}
+
+
+org.springframework
+spring-webmvc
+${spring-version}
+
 
 
 org.springframework.ws

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1335635&r1=1335634&r2=1335635&view=diff
==
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue May  8 16:55:03 2012
@@ -166,7 +166,7 @@
 3.0.7.RELEASE
 1.2.1
 3.1.0.RELEASE
-2.0.3.RELEASE
+2.0.5.RELEASE
 2.8.0
 0.6.0
 1.0.1

svn commit: r1335636 - /camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java

[dkulp]

Author: dkulp
Date: Tue May  8 16:55:07 2012
New Revision: 1335636

URL: http://svn.apache.org/viewvc?rev=1335636&view=rev
Log:
ALso need to qualify the elements so they don't become "unqualified".

Modified:

camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java?rev=1335636&r1=1335635&r2=1335636&view=diff
==
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
 Tue May  8 16:55:07 2012
@@ -199,7 +199,7 @@ public class XStreamDataFormat extends D
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlType(name = "converterList", namespace = 
"http://camel.apache.org/schema/spring";)
 public static class ConverterList {
-@XmlElement(name = "converter")
+@XmlElement(name = "converter", namespace = 
"http://camel.apache.org/schema/spring";)
 private List list;
 
 public List getList() {
@@ -265,7 +265,7 @@ public class XStreamDataFormat extends D
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlType(name = "implicitCollectionList", namespace = 
"http://camel.apache.org/schema/spring";)
 public static class ImplicitCollectionList {
-@XmlElement(name = "class")
+@XmlElement(name = "class", namespace = 
"http://camel.apache.org/schema/spring";)
 private List list;
 
 public List getList() {
@@ -283,7 +283,7 @@ public class XStreamDataFormat extends D
 @XmlAttribute(name = "name")
 private String clsName;
 
-@XmlElement(name = "field")
+@XmlElement(name = "field", namespace = 
"http://camel.apache.org/schema/spring";)
 private String[] fields;
 
 public ImplicitCollectionEntry() {
@@ -351,7 +351,7 @@ public class XStreamDataFormat extends D
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlType(name = "aliasList", namespace = 
"http://camel.apache.org/schema/spring";)
 public static class AliasList {
-@XmlElement(name = "alias")
+@XmlElement(name = "alias", namespace = 
"http://camel.apache.org/schema/spring";)
 private List list;
 
 public List getList() {
@@ -442,7 +442,7 @@ public class XStreamDataFormat extends D
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlType(name = "omitFieldList", namespace = 
"http://camel.apache.org/schema/spring";)
 public static class OmitFieldList {
-@XmlElement(name = "omitField")
+@XmlElement(name = "omitField", namespace = 
"http://camel.apache.org/schema/spring";)
 private List list;
 
 public List getList() {
@@ -461,7 +461,7 @@ public class XStreamDataFormat extends D
 @XmlAttribute(name = "class")
 private String clsName;
 
-@XmlElement(name = "field")
+@XmlElement(name = "field", namespace = 
"http://camel.apache.org/schema/spring";)
 private String[] fields;
 
 public OmitFieldEntry() {

svn commit: r1335637 - /camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeDataTest.java

[dkulp]

Author: dkulp
Date: Tue May  8 16:55:12 2012
New Revision: 1335637

URL: http://svn.apache.org/viewvc?rev=1335637&view=rev
Log:
Make sure node is deleted at end of test so other test doesn't fail if
run after it.

Modified:

camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeDataTest.java

Modified: 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeDataTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeDataTest.java?rev=1335637&r1=1335636&r2=1335637&view=diff
==
--- 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeDataTest.java
 (original)
+++ 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeDataTest.java
 Tue May  8 16:55:12 2012
@@ -91,9 +91,11 @@ public class ConsumeDataTest extends Zoo
 // recreate and update a number of times.
 createCamelNode();
 updateNode(10);
-
+  
 mock.await(5, TimeUnit.SECONDS);
 mock.assertIsSatisfied();
+
+client.delete("/camel");
 }
 
 private void updateNode(int times) throws InterruptedException, Exception {

svn commit: r1335671 - in /camel/trunk: components/camel-spring/pom.xml parent/pom.xml pom.xml

[dkulp]

Author: dkulp
Date: Tue May  8 18:14:18 2012
New Revision: 1335671

URL: http://svn.apache.org/viewvc?rev=1335671&view=rev
Log:
Speed up the build very slightly by not using regexes and antrun to create
the camel.osgi.version.clean property in every module.  (bundle plugin
can create it)  Only create the camel.schema.version property in the one
component that needs it.

Modified:
camel/trunk/components/camel-spring/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/pom.xml

Modified: camel/trunk/components/camel-spring/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/pom.xml?rev=1335671&r1=1335670&r2=1335671&view=diff
==
--- camel/trunk/components/camel-spring/pom.xml (original)
+++ camel/trunk/components/camel-spring/pom.xml Tue May  8 18:14:18 2012
@@ -262,8 +262,8 @@
 
   
   
-process-sources
-process-sources
+generate-sources
+generate-sources
 
   
 
@@ -294,6 +294,20 @@
   
 
 
+
+
+
+
+
+
+
+
+
+
+
+  camel.schema.version = ${camel.schema.version}
+
+
 Generating XSD schema
 
 
@@ -311,7 +325,23 @@
   
   
   
-
+  
+org.codehaus.mojo
+properties-maven-plugin
+
+  
+generate-sources
+
+  read-project-properties
+
+
+  
+target/camel.osgi.version.txt
+  
+
+  
+
+  
   
   
 org.codehaus.mojo

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1335671&r1=1335670&r2=1335671&view=diff
==
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue May  8 18:14:18 2012
@@ -1599,64 +1599,6 @@
   
 
   
-
-  
-org.apache.maven.plugins
-maven-antrun-plugin
-true
-
-  
-create-prop
-initialize
-
-  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  camel.osgi.version.clean = ${ov}
-  camel.schema.version = ${os}
- 
-  
-
-
-  run
-
-  
-
-  
-  
-org.codehaus.mojo
-properties-maven-plugin
-true
-
-  
-initialize
-
-  read-project-properties
-
-
-  
-target/camel.osgi.version.txt
-  
-
-  
-
-  
-
 
   
 

Modified: camel/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=1335671&r1=1335670&r2=1335671&view=diff
==
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Tue May  8 18:14:18 2012
@@ -482,6 +482,20 @@
 <_failok>${camel.osgi.failok}
   

+
+
+versions
+validate
+
+cleanVersions
+
+
+
+
${project.version}
+
+
+
+
   
 
   

svn commit: r1335672 - /camel/trunk/examples/camel-example-ssh/pom.xml

[dkulp]

Author: dkulp
Date: Tue May  8 18:14:22 2012
New Revision: 1335672

URL: http://svn.apache.org/viewvc?rev=1335672&view=rev
Log:
Fix warning with maven 3

Modified:
camel/trunk/examples/camel-example-ssh/pom.xml

Modified: camel/trunk/examples/camel-example-ssh/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-ssh/pom.xml?rev=1335672&r1=1335671&r2=1335672&view=diff
==
--- camel/trunk/examples/camel-example-ssh/pom.xml (original)
+++ camel/trunk/examples/camel-example-ssh/pom.xml Tue May  8 18:14:22 2012
@@ -113,6 +113,7 @@
   
 org.apache.camel
 camel-maven-plugin
+${project.version}
   
 
 

svn commit: r1335673 - in /camel/trunk: components/camel-blueprint/pom.xml components/camel-jaxb/pom.xml components/camel-test-blueprint/pom.xml components/camel-web/pom.xml parent/pom.xml pom.xml

[dkulp]

Author: dkulp
Date: Tue May  8 18:14:26 2012
New Revision: 1335673

URL: http://svn.apache.org/viewvc?rev=1335673&view=rev
Log:
No point defining jaxb-api on Java6 and Java7 as you'll always just get
the version provided by the JDK anyway.

Modified:
camel/trunk/components/camel-blueprint/pom.xml
camel/trunk/components/camel-jaxb/pom.xml
camel/trunk/components/camel-test-blueprint/pom.xml
camel/trunk/components/camel-web/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/pom.xml

Modified: camel/trunk/components/camel-blueprint/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/pom.xml?rev=1335673&r1=1335672&r2=1335673&view=diff
==
--- camel/trunk/components/camel-blueprint/pom.xml (original)
+++ camel/trunk/components/camel-blueprint/pom.xml Tue May  8 18:14:26 2012
@@ -76,10 +76,6 @@
 org.apache.aries.blueprint
 org.apache.aries.blueprint
 
-
-  javax.xml.bind
-  jaxb-api
-
 
 
 

Modified: camel/trunk/components/camel-jaxb/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/pom.xml?rev=1335673&r1=1335672&r2=1335673&view=diff
==
--- camel/trunk/components/camel-jaxb/pom.xml (original)
+++ camel/trunk/components/camel-jaxb/pom.xml Tue May  8 18:14:26 2012
@@ -43,10 +43,6 @@
 
 
 
-javax.xml.bind
-jaxb-api
-
-
 com.sun.xml.bind
 jaxb-impl
 

Modified: camel/trunk/components/camel-test-blueprint/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/pom.xml?rev=1335673&r1=1335672&r2=1335673&view=diff
==
--- camel/trunk/components/camel-test-blueprint/pom.xml (original)
+++ camel/trunk/components/camel-test-blueprint/pom.xml Tue May  8 18:14:26 2012
@@ -49,12 +49,6 @@
 
 org.apache.camel
 camel-blueprint
-
-
-javax.xml.bind
-jaxb-api
-
-
 
 
 
   
-javax.xml.bind
-jaxb-api
-${jaxb-api-version}
-
-  
-javax.xml
-jsr173
-  
-  
-javax.xml.stream
-stax-api
-  
-  
-javax.activation
-activation
-  
-
-  
-  
 stax
 stax-api
 ${stax-api-version}
@@ -1793,16 +1774,11 @@



-   2.2
2.2.5




- javax.xml.bind
- jaxb-api
-   
-   
  com.sun.xml.bind
  jaxb-impl


Modified: camel/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=1335673&r1=1335672&r2=1335673&view=diff
==
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Tue May  8 18:14:26 2012
@@ -47,7 +47,6 @@
 
 
 2.1.13
-2.1
 
 2.3.6
 2.2.0
@@ -283,11 +282,6 @@
   1.6
   
   
-javax.xml.bind
-jaxb-api
-${jaxb-api-version}
-  
-  
 com.sun.xml.bind
 jaxb-impl
 ${jaxb-version}
@@ -769,11 +763,6 @@
 1.6
 
 
-  javax.xml.bind
-  jaxb-api
-  ${jaxb-api-version}
-
-
   com.sun.xml.bind
   jaxb-impl
   ${jaxb-version}

svn commit: r1335758 - in /camel/trunk: components/camel-jms/pom.xml parent/pom.xml tests/camel-itest/pom.xml

[dkulp]

Author: dkulp
Date: Tue May  8 20:46:06 2012
New Revision: 1335758

URL: http://svn.apache.org/viewvc?rev=1335758&view=rev
Log:
Make sure activemq-pool is added as dep so it tests can used the
PooledConnectionFactory

Modified:
camel/trunk/components/camel-jms/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/tests/camel-itest/pom.xml

Modified: camel/trunk/components/camel-jms/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/pom.xml?rev=1335758&r1=1335757&r2=1335758&view=diff
==
--- camel/trunk/components/camel-jms/pom.xml (original)
+++ camel/trunk/components/camel-jms/pom.xml Tue May  8 20:46:06 2012
@@ -105,7 +105,6 @@
   
 org.apache.activemq
 activemq-pool
-${activemq-version}
 test
   
   

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1335758&r1=1335757&r2=1335758&view=diff
==
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue May  8 20:46:06 2012
@@ -1092,6 +1092,11 @@
 ${activemq-version}
   
   
+org.apache.activemq
+activemq-pool
+${activemq-version}
+  
+  
 org.apache.xbean
 xbean-spring
 ${xbean-spring-version}

Modified: camel/trunk/tests/camel-itest/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/pom.xml?rev=1335758&r1=1335757&r2=1335758&view=diff
==
--- camel/trunk/tests/camel-itest/pom.xml (original)
+++ camel/trunk/tests/camel-itest/pom.xml Tue May  8 20:46:06 2012
@@ -255,6 +255,11 @@
 
 
   org.apache.activemq
+  activemq-pool
+  test
+
+
+  org.apache.activemq
   activemq-camel
   test
 

svn commit: r1335786 - /camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/jre.properties

[dkulp]

Author: dkulp
Date: Tue May  8 21:48:41 2012
New Revision: 1335786

URL: http://svn.apache.org/viewvc?rev=1335786&view=rev
Log:
Copy latest karaf jre.properties.cxf which includes a java7 profile

Modified:

camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/jre.properties

Modified: 
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/jre.properties
URL: 
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/jre.properties?rev=1335786&r1=1335785&r2=1335786&view=diff
==
--- 
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/jre.properties
 (original)
+++ 
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/jre.properties
 Tue May  8 21:48:41 2012
@@ -21,9 +21,8 @@
 # Java platform package export properties.
 #
 
-
 # Standard package set.  Note that:
-#   - javax.transaction* is exported with a mandatory attribute 
+#   - javax.transaction* is exported with a mandatory attribute
 jre-1.5= \
  javax.accessibility, \
  javax.activity, \
@@ -149,18 +148,174 @@ jre-1.5= \
  org.xml.sax.helpers
 
 # Standard package set.  Note that:
-#   - javax.transaction* is exported with a mandatory attribute 
-#   - javax.activation, javax.annotation*, javax.jws*, javax.script*, 
javax.xml.bind*, javax.xml.soap, javax.xml.ws* packages are not exported
+#   - javax.transaction* is exported with a mandatory attribute
 jre-1.6= \
- com.sun.org.apache.xalan.internal.xsltc.trax, \
- com.sun.org.apache.xerces.internal.dom, \
- com.sun.org.apache.xerces.internal.jaxp, \
- com.sun.org.apache.xerces.internal.xni, \
- com.sun.jndi.ldap, \
  javax.accessibility, \
 # javax.activation, \
  javax.activity, \
- javax.annotation;version="1.1", \
+# javax.annotation;version="1.1", \
+ javax.annotation.processing;version="1.1", \
+ javax.crypto, \
+ javax.crypto.interfaces, \
+ javax.crypto.spec, \
+ javax.imageio, \
+ javax.imageio.event, \
+ javax.imageio.metadata, \
+ javax.imageio.plugins.bmp, \
+ javax.imageio.plugins.jpeg, \
+ javax.imageio.spi, \
+ javax.imageio.stream, \
+# javax.jws, \
+# javax.jws.soap, \
+ javax.lang.model, \
+ javax.lang.model.element, \
+ javax.lang.model.type, \
+ javax.lang.model.util, \
+ javax.management, \
+ javax.management.loading, \
+ javax.management.modelmbean, \
+ javax.management.monitor, \
+ javax.management.openmbean, \
+ javax.management.relation, \
+ javax.management.remote, \
+ javax.management.remote.rmi, \
+ javax.management.timer, \
+ javax.naming, \
+ javax.naming.directory, \
+ javax.naming.event, \
+ javax.naming.ldap, \
+ javax.naming.spi, \
+ javax.net, \
+ javax.net.ssl, \
+ javax.print, \
+ javax.print.attribute, \
+ javax.print.attribute.standard, \
+ javax.print.event, \
+ javax.rmi, \
+ javax.rmi.CORBA, \
+ javax.rmi.ssl, \
+ javax.script, \
+ javax.security.auth, \
+ javax.security.auth.callback, \
+ javax.security.auth.kerberos, \
+ javax.security.auth.login, \
+ javax.security.auth.spi, \
+ javax.security.auth.x500, \
+ javax.security.cert, \
+ javax.security.sasl, \
+ javax.sound.midi, \
+ javax.sound.midi.spi, \
+ javax.sound.sampled, \
+ javax.sound.sampled.spi, \
+ javax.sql, \
+ javax.sql.rowset, \
+ javax.sql.rowset.serial, \
+ javax.sql.rowset.spi, \
+ javax.swing, \
+ javax.swing.border, \
+ javax.swing.colorchooser, \
+ javax.swing.event, \
+ javax.swing.filechooser, \
+ javax.swing.plaf, \
+ javax.swing.plaf.basic, \
+ javax.swing.plaf.metal, \
+ javax.swing.plaf.multi, \
+ javax.swing.plaf.synth, \
+ javax.swing.table, \
+ javax.swing.text, \
+ javax.swing.text.html, \
+ javax.swing.text.html.parser, \
+ javax.swing.text.rtf, \
+ javax.swing.tree, \
+ javax.swing.undo, \
+ javax.tools, \
+ javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
+ javax.xml, \
+# javax.xml.bind, \
+# javax.xml.bind.annotation, \
+# javax.xml.bind.annotation.adapters, \
+# javax.xml.bind.attachment, \
+# javax.xml.bind.helpers, \
+# javax.xml.bind.util, \
+ javax.xml.crypto, \
+ javax.xml.crypto.dom, \
+ javax.xml.crypto.dsig, \
+ javax.xml.crypto.dsig.dom, \
+ javax.xml.crypto.dsig.keyinfo, \
+ javax.xml.crypto.dsig.spec, \
+ javax.xml.datatype, \
+ javax.xml.namespace, \
+ javax.xml.parsers, \
+# javax.xml.soap, \
+# javax.xml.stream, \
+# javax.xml.stream.events, \
+# javax.xml.stream.util, \
+ javax.xml.transform, \
+ javax.xml.transform.dom, \
+ javax.xml.transform.sax, \
+ javax.xml.transform.stax, \
+ javax.xml.transform.stream, \
+ javax.xml.validation, \
+# javax.xml.ws, \
+# javax.xml.ws.handler, \
+# javax.xml.ws.handler.soap, \
+# javax.xml.ws.http, \
+# javax.xml.ws.soap, \
+# javax.xml.ws.spi, \
+ javax.xml.ws.wsaddressing, \
+ javax.xml.xpath, \
+ org.ietf.jgss, \
+ org.omg.CORBA, \
+ org.omg.CORBA_2_3, \
+ org.omg.CORBA

svn commit: r1335878 - in /camel/trunk/examples: camel-example-management/pom.xml camel-example-pojo-messaging/pom.xml camel-example-spring-jms/pom.xml

[dkulp]

Author: dkulp
Date: Wed May  9 01:08:39 2012
New Revision: 1335878

URL: http://svn.apache.org/viewvc?rev=1335878&view=rev
Log:
Fix test failures from AMQ upgrade

Modified:
camel/trunk/examples/camel-example-management/pom.xml
camel/trunk/examples/camel-example-pojo-messaging/pom.xml
camel/trunk/examples/camel-example-spring-jms/pom.xml

Modified: camel/trunk/examples/camel-example-management/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-management/pom.xml?rev=1335878&r1=1335877&r2=1335878&view=diff
==
--- camel/trunk/examples/camel-example-management/pom.xml (original)
+++ camel/trunk/examples/camel-example-management/pom.xml Wed May  9 01:08:39 
2012
@@ -52,6 +52,10 @@
 org.apache.activemq
 activemq-camel
 
+
+  org.apache.activemq
+  activemq-pool
+
 
 
 

Modified: camel/trunk/examples/camel-example-pojo-messaging/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-pojo-messaging/pom.xml?rev=1335878&r1=1335877&r2=1335878&view=diff
==
--- camel/trunk/examples/camel-example-pojo-messaging/pom.xml (original)
+++ camel/trunk/examples/camel-example-pojo-messaging/pom.xml Wed May  9 
01:08:39 2012
@@ -42,6 +42,10 @@
org.apache.activemq
activemq-core

+
+org.apache.activemq
+activemq-pool
+

org.apache.activemq
activemq-camel

Modified: camel/trunk/examples/camel-example-spring-jms/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-jms/pom.xml?rev=1335878&r1=1335877&r2=1335878&view=diff
==
--- camel/trunk/examples/camel-example-spring-jms/pom.xml (original)
+++ camel/trunk/examples/camel-example-spring-jms/pom.xml Wed May  9 01:08:39 
2012
@@ -56,6 +56,10 @@
 org.apache.activemq
 activemq-camel
 
+
+org.apache.activemq
+activemq-pool
+
 
 
 

svn commit: r1339596 - /camel/trunk/pom.xml

[dkulp]

Author: dkulp
Date: Thu May 17 13:35:06 2012
New Revision: 1339596

URL: http://svn.apache.org/viewvc?rev=1339596&view=rev
Log:
Update to threadsafe version of remote-resources:

Modified:
camel/trunk/pom.xml

Modified: camel/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=1339596&r1=1339595&r2=1339596&view=diff
==
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Thu May 17 13:35:06 2012
@@ -359,14 +359,7 @@
 
  org.apache.maven.plugins
   maven-remote-resources-plugin
-  1.2.1
-  
-  
-org.apache.velocity
-velocity
-1.7
-  
-  
+  1.3
 
 
   org.apache.maven.plugins

svn commit: r1339597 - in /camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf: CxfProducer.java DefaultCxfBinding.java

[dkulp]

Author: dkulp
Date: Thu May 17 13:35:12 2012
New Revision: 1339597

URL: http://svn.apache.org/viewvc?rev=1339597&view=rev
Log:
Fix some eclipse warnings

Modified:

camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java

camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java

Modified: 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java?rev=1339597&r1=1339596&r2=1339597&view=diff
==
--- 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
 Thu May 17 13:35:12 2012
@@ -30,7 +30,6 @@ import javax.xml.ws.handler.MessageConte
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.AsyncProcessor;
 import org.apache.camel.Exchange;
-import org.apache.camel.InvalidPayloadException;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.component.cxf.common.message.CxfConstants;
 import org.apache.camel.impl.DefaultProducer;
@@ -270,7 +269,9 @@ public class CxfProducer extends Default
 /**
  * Get the parameters for the web service operation
  */
-private Object[] getParams(CxfEndpoint endpoint, Exchange exchange) throws 
InvalidPayloadException {
+@SuppressWarnings("deprecation")
+private Object[] getParams(CxfEndpoint endpoint, Exchange exchange) 
+throws org.apache.camel.InvalidPayloadException {
   
 Object[] params = null;
 if (endpoint.getDataFormat() == DataFormat.POJO) {

Modified: 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java?rev=1339597&r1=1339596&r2=1339597&view=diff
==
--- 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
 Thu May 17 13:35:12 2012
@@ -52,7 +52,6 @@ import org.apache.cxf.binding.soap.SoapB
 import org.apache.cxf.binding.soap.SoapHeader;
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.frontend.MethodDispatcher;
 import org.apache.cxf.headers.Header;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.helpers.DOMUtils;
@@ -188,8 +187,10 @@ public class DefaultCxfBinding implement
 if (boi != null) {
 Service service = cxfExchange.get(Service.class); 
 if (service != null) {
-MethodDispatcher md = (MethodDispatcher)service
-.get(MethodDispatcher.class.getName());
+@SuppressWarnings("deprecation")
+org.apache.cxf.frontend.MethodDispatcher md 
+= (org.apache.cxf.frontend.MethodDispatcher)service
+
.get(org.apache.cxf.frontend.MethodDispatcher.class.getName());
 if (md != null) {
 method = md.getMethod(boi);
 }

svn commit: r1339622 - in /camel/trunk/components/camel-cxf/src: main/java/org/apache/camel/component/cxf/ test/java/org/apache/camel/component/cxf/util/

[dkulp]

Author: dkulp
Date: Thu May 17 14:46:48 2012
New Revision: 1339622

URL: http://svn.apache.org/viewvc?rev=1339622&view=rev
Log:
[CAMEL-4641] Part 1 - introduce RAW mode and deprecate MESSAGE mode

Modified:

camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java

camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java

camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DataFormat.java

camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java

camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/util/CxfEndpointUtilsTest.java

camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/util/CxfEndpointUtilsWithSpringTest.java

Modified: 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=1339622&r1=1339621&r2=1339622&view=diff
==
--- 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 Thu May 17 14:46:48 2012
@@ -259,7 +259,7 @@ public class CxfEndpoint extends Default
 if (!CxfEndpointUtils.hasAnnotation(cls, WebServiceProvider.class)) {
 if (getDataFormat() == DataFormat.PAYLOAD) {
 sfb.getFeatures().add(new 
PayLoadDataFormatFeature(allowStreaming));
-} else if (getDataFormat() == DataFormat.MESSAGE) {
+} else if (getDataFormat().dealias() == DataFormat.RAW) {
 MessageDataFormatFeature feature = new 
MessageDataFormatFeature();
 feature.addInIntercepters(getInInterceptors());
 feature.addOutInterceptors(getOutInterceptors());
@@ -418,7 +418,7 @@ public class CxfEndpoint extends Default
 }
 
 // apply feature here
-if (getDataFormat() == DataFormat.MESSAGE) {
+if (getDataFormat().dealias() == DataFormat.RAW) {
 MessageDataFormatFeature feature = new MessageDataFormatFeature();
 feature.addInIntercepters(getInInterceptors());
 feature.addOutInterceptors(getOutInterceptors());

Modified: 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java?rev=1339622&r1=1339621&r2=1339622&view=diff
==
--- 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
 Thu May 17 14:46:48 2012
@@ -179,7 +179,7 @@ public class CxfProducer extends Default
 requestContext.put(DataFormat.class.getName(), dataFormat);
 
 // don't let CXF ClientImpl close the input stream 
-if (dataFormat == DataFormat.MESSAGE) {
+if (dataFormat.dealias() == DataFormat.RAW) {
 cxfExchange.put(Client.KEEP_CONDUIT_ALIVE, true);
 LOG.trace("Set CXF Exchange property: {}={}", 
Client.KEEP_CONDUIT_ALIVE, true);
 }
@@ -303,7 +303,7 @@ public class CxfProducer extends Default
 } else if (endpoint.getDataFormat() == DataFormat.PAYLOAD) {
 params = new Object[1];
 params[0] = exchange.getIn().getMandatoryBody(CxfPayload.class);
-} else if (endpoint.getDataFormat() == DataFormat.MESSAGE) {
+} else if (endpoint.getDataFormat().dealias() == DataFormat.RAW) {
 params = new Object[1];
 params[0] = exchange.getIn().getMandatoryBody(InputStream.class);
 }

Modified: 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DataFormat.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DataFormat.java?rev=1339622&r1=1339621&r2=1339622&view=diff
==
--- 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DataFormat.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DataFormat.java
 Thu May 17 14:46:48 2012
@@ -29,18 +29,43 @@ public enum DataFormat {
  */
 PAYLOAD,
 
+
+/**
+ * RAW is the raw message that is received from the transport layer.
+ * Streaming and non-streaming are both supported.
+ */
+RAW,
+
 /**
 

svn commit: r1339928 - in /camel/trunk/tooling: camel-manual/pom.xml pom.xml

[dkulp]

Author: dkulp
Date: Thu May 17 23:57:12 2012
New Revision: 1339928

URL: http://svn.apache.org/viewvc?rev=1339928&view=rev
Log:
Only build the manual if certain profiles are active.

Modified:
camel/trunk/tooling/camel-manual/pom.xml
camel/trunk/tooling/pom.xml

Modified: camel/trunk/tooling/camel-manual/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/tooling/camel-manual/pom.xml?rev=1339928&r1=1339927&r2=1339928&view=diff
==
--- camel/trunk/tooling/camel-manual/pom.xml (original)
+++ camel/trunk/tooling/camel-manual/pom.xml Thu May 17 23:57:12 2012
@@ -32,75 +32,65 @@
   Camel :: Manual
   The Camel Manual which generates a HTML and PDF representation 
of the manual.
 
-  
-
-  build.manual
-  
-
-  !fastinstall
-
-  
-  
-
- 
-org.apache.camel
-maven-html-to-pdf
-${project.version}
-
-  
-
-  compile
-
-compile
-  
-
+  
+
+ 
+org.apache.camel
+maven-html-to-pdf
+${project.version}
+
+  
+
+  compile
+
+compile
+  
+
+
+  http://camel.apache.org/book-in-one-page.html
+  wiki-content maincontent
+  
+  
+  
+  
org.apache.xalan.xsltc.trax.TransformerFactoryImpl
+
+  
+  
+org.codehaus.mojo
+build-helper-maven-plugin
+
+  
+attach-artifacts
+package
+
+  attach-artifact
+
 
-  http://camel.apache.org/book-in-one-page.html
-  wiki-content maincontent
-  
-  
-  
-  
org.apache.xalan.xsltc.trax.TransformerFactoryImpl
+  
+
+
+  
${project.build.directory}/site/manual/camel-manual-${project.version}.html
+  html
+
+  
 
-  
-  
-org.codehaus.mojo
-build-helper-maven-plugin
-
-  
-attach-artifacts
-package
-
-  attach-artifact
-
-
-  
-
-
-  
${project.build.directory}/site/manual/camel-manual-${project.version}.html
-  html
-
-  
-
-  
-
-
-
-  
-
-  
+  
+
+
+
+  
 
 

Modified: camel/trunk/tooling/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/tooling/pom.xml?rev=1339928&r1=1339927&r2=1339928&view=diff
==
--- camel/trunk/tooling/pom.xml (original)
+++ camel/trunk/tooling/pom.xml Thu May 17 23:57:12 2012
@@ -34,7 +34,33 @@
   
 maven
 archetypes
-camel-manual
   
 
+  
+  
+  build.manual
+  
+  camel-manual
+  
+  
+  
+  assembly
+  
+  camel-manual
+  
+  
+  
+  deploy
+  
+  camel-manual
+  
+  
+  
+  apache-release
+  
+  camel-manual
+  
+  
+  
+
 

svn commit: r1341567 - /camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java

[dkulp]

Author: dkulp
Date: Tue May 22 17:23:43 2012
New Revision: 1341567

URL: http://svn.apache.org/viewvc?rev=1341567&view=rev
Log:
Restore method that Spring tends to use for setting resource classes.

Modified:

camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java

Modified: 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java?rev=1341567&r1=1341566&r2=1341567&view=diff
==
--- 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
 Tue May 22 17:23:43 2012
@@ -17,6 +17,7 @@
 package org.apache.camel.component.cxf.jaxrs;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -151,8 +152,8 @@ public class CxfRsEndpoint extends Defau
 cfb.setAddress(address);
 }
 if (getResourceClasses() != null && !getResourceClasses().isEmpty()) {
-// TODO: a bit odd that this endpoint supports multiple resource 
classes, but cfb only supports one class
 cfb.setResourceClass(getResourceClasses().get(0));
+cfb.getServiceFactory().setResourceClasses(getResourceClasses());
 }
 if (isLoggingFeatureEnabled()) {
 if (getLoggingSizeLimit() > 0) {
@@ -230,7 +231,10 @@ public class CxfRsEndpoint extends Defau
 public void setResourceClasses(List> resourceClasses) {
 this.resourceClasses = resourceClasses;
 }
-
+public void setResourceClasses(Class... classes) {
+setResourceClasses(Arrays.asList(classes));
+}
+
 public void setAddress(String address) {
 this.address = address;
 }

svn commit: r1341951 - in /camel/trunk/components/camel-cxf/src: main/java/org/apache/camel/component/cxf/ main/java/org/apache/camel/component/cxf/feature/ test/java/org/apache/camel/component/cxf/ws

[dkulp]

Author: dkulp
Date: Wed May 23 17:11:57 2012
New Revision: 1341951

URL: http://svn.apache.org/viewvc?rev=1341951&view=rev
Log:
[CAMEL-4641] Part 2 - get a very basic cxf_message mode test working

Added:

camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
   (with props)

camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/RAWDataFormatFeature.java
  - copied, changed from r1341854, 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/MessageDataFormatFeature.java

camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsa/WSAddressingCXFMSGTest.java
   (with props)

camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/WSAddressingCXFMSGTest-context.xml
   (with props)
Modified:

camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java

camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java

camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DataFormat.java

camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java

camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/MessageDataFormatFeature.java

Modified: 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=1341951&r1=1341950&r2=1341951&view=diff
==
--- 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 Wed May 23 17:11:57 2012
@@ -43,8 +43,9 @@ import org.apache.camel.RuntimeCamelExce
 import org.apache.camel.Service;
 import org.apache.camel.component.cxf.common.header.CxfHeaderFilterStrategy;
 import org.apache.camel.component.cxf.common.message.CxfConstants;
-import org.apache.camel.component.cxf.feature.MessageDataFormatFeature;
+import org.apache.camel.component.cxf.feature.CXFMessageDataFormatFeature;
 import org.apache.camel.component.cxf.feature.PayLoadDataFormatFeature;
+import org.apache.camel.component.cxf.feature.RAWDataFormatFeature;
 import org.apache.camel.impl.DefaultEndpoint;
 import org.apache.camel.impl.SynchronousDelegateProducer;
 import org.apache.camel.spi.HeaderFilterStrategy;
@@ -61,6 +62,7 @@ import org.apache.cxf.common.injection.R
 import org.apache.cxf.common.util.ClassHelper;
 import org.apache.cxf.common.util.ModCountCopyOnWriteArrayList;
 import org.apache.cxf.databinding.DataBinding;
+import org.apache.cxf.databinding.source.SourceDataBinding;
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.endpoint.ClientImpl;
 import org.apache.cxf.endpoint.Endpoint;
@@ -207,7 +209,6 @@ public class CxfEndpoint extends Default
 // address
 sfb.setAddress(getAddress());
 
-// service class
 sfb.setServiceClass(cls);
 
 sfb.setInInterceptors(in);
@@ -259,8 +260,11 @@ public class CxfEndpoint extends Default
 if (!CxfEndpointUtils.hasAnnotation(cls, WebServiceProvider.class)) {
 if (getDataFormat() == DataFormat.PAYLOAD) {
 sfb.getFeatures().add(new 
PayLoadDataFormatFeature(allowStreaming));
+} else if (getDataFormat().dealias() == DataFormat.CXF_MESSAGE) {
+sfb.getFeatures().add(new CXFMessageDataFormatFeature());
+sfb.setDataBinding(new SourceDataBinding());
 } else if (getDataFormat().dealias() == DataFormat.RAW) {
-MessageDataFormatFeature feature = new 
MessageDataFormatFeature();
+RAWDataFormatFeature feature = new RAWDataFormatFeature();
 feature.addInIntercepters(getInInterceptors());
 feature.addOutInterceptors(getOutInterceptors());
 sfb.getFeatures().add(feature);
@@ -282,7 +286,7 @@ public class CxfEndpoint extends Default
 }
 
 // set the document-literal wrapped style
-if (getWrappedStyle() != null) {
+if (getWrappedStyle() != null && getDataFormat().dealias() != 
DataFormat.CXF_MESSAGE) {
 sfb.getServiceFactory().setWrapped(getWrappedStyle());
 }
 
@@ -419,10 +423,13 @@ public class CxfEndpoint extends Default
 
 // apply feature here
 if (getDataFormat().dealias() == DataFormat.RAW) {
-MessageDataFormatFeature feature = new MessageDataFormatFeature();
+RAWDataFormatFeature feature = new RAWDataFormatFeature();
 feature.addInInterc

svn commit: r1343823 - in /camel/trunk: parent/pom.xml pom.xml

[dkulp]

Author: dkulp
Date: Tue May 29 16:33:14 2012
New Revision: 1343823

URL: http://svn.apache.org/viewvc?rev=1343823&view=rev
Log:
Update to 2.5 compiler plugin to address issues with parallel builds
with Java6

Modified:
camel/trunk/parent/pom.xml
camel/trunk/pom.xml

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1343823&r1=1343822&r2=1343823&view=diff
==
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue May 29 16:33:14 2012
@@ -192,7 +192,7 @@
 1.2.5
 3.3.5
 
-2.4
+2.5
 
 
 
version="[$(version;==;${camel.osgi.version.clean}),$(version;=+;${camel.osgi.version.clean}))"

Modified: camel/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=1343823&r1=1343822&r2=1343823&view=diff
==
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Tue May 29 16:33:14 2012
@@ -147,7 +147,7 @@
 
   org.apache.maven.plugins
   maven-compiler-plugin
-  2.4
+  2.5
   
 1.6
 1.6

svn commit: r1353651 - in /camel/trunk: components/camel-jibx/pom.xml parent/pom.xml platforms/karaf/features/pom.xml platforms/karaf/features/src/main/resources/features.xml

[dkulp]

Author: dkulp
Date: Mon Jun 25 16:51:44 2012
New Revision: 1353651

URL: http://svn.apache.org/viewvc?rev=1353651&view=rev
Log:
Update to latest jibx that has all deps in Central.

Modified:
camel/trunk/components/camel-jibx/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml

Modified: camel/trunk/components/camel-jibx/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jibx/pom.xml?rev=1353651&r1=1353650&r2=1353651&view=diff
==
--- camel/trunk/components/camel-jibx/pom.xml (original)
+++ camel/trunk/components/camel-jibx/pom.xml Mon Jun 25 16:51:44 2012
@@ -81,14 +81,13 @@
 maven-jibx-plugin
 ${jibx-version}
 
-
src/test/resources
-
-
**/*-jibx.xml
-
+
${basedir}/src/test/resources/org/apache/camel/dataformat/jibx/
+
+purchaseOrder-jibx.xml
+
 
 
 
-process-test-classes
 
 test-bind
 

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1353651&r1=1353650&r2=1353651&view=diff
==
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Mon Jun 25 16:51:44 2012
@@ -117,7 +117,7 @@
 7.5.4.v20111024
 1.3.1
 2.4.2
-1.2.3
+1.2.4.5
 1.6.7
 2.1.0_4
 0.1.48

Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1353651&r1=1353650&r2=1353651&view=diff
==
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Mon Jun 25 16:51:44 2012
@@ -85,6 +85,7 @@
   1.1_4
   20030619_5
   1.6.2
+  2.1
   1.5_5
   0.1.48_1
   1.3.1_3

Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1353651&r1=1353650&r2=1353651&view=diff
==
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml 
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Mon 
Jun 25 16:51:44 2012
@@ -476,7 +476,7 @@
 mvn:org.jibx/jibx-run/${jibx-version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel-bundle-version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}
-mvn:joda-time/joda-time/${jodatime-bundle-version}
+mvn:joda-time/joda-time/${jodatime2-bundle-version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j-bundle-version}
   

svn commit: r1360241 - /camel/trunk/parent/pom.xml

[dkulp]

Author: dkulp
Date: Wed Jul 11 15:52:56 2012
New Revision: 1360241

URL: http://svn.apache.org/viewvc?rev=1360241&view=rev
Log:
Open up the cxf range a bit to allow testing with cxf trunk

Modified:
camel/trunk/parent/pom.xml

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1360241&r1=1360240&r2=1360241&view=diff
==
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Jul 11 15:52:56 2012
@@ -207,7 +207,7 @@
 
   org.springframework.*;version="[3,4)",
   org.apache.commons.logging.*;version="[1.1,2)",
-  org.apache.cxf.*;version="[2.4,2.7)",
+  org.apache.cxf.*;version="[2.4,2.8)",
   org.apache.qpid.*;version="[0.14,1)",
   org.apache.abdera.*;version="[0.4,2)",
   org.apache.commons.httpclient.*;version="[3.1,4.0)",

svn commit: r1360247 - /camel/branches/camel-2.10.x/parent/pom.xml

[dkulp]

Author: dkulp
Date: Wed Jul 11 15:57:39 2012
New Revision: 1360247

URL: http://svn.apache.org/viewvc?rev=1360247&view=rev
Log:
Merged revisions 1359383 via  git cherry-pick from
https://svn.apache.org/repos/asf/camel/trunk


  r1359383 | cmueller | 2012-07-09 16:36:28 -0400 (Mon, 09 Jul 2012) | 2 lines

  upgraded Spring 3.1 profile to 3.1.2.RELEASE



Modified:
camel/branches/camel-2.10.x/parent/pom.xml

Modified: camel/branches/camel-2.10.x/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/parent/pom.xml?rev=1360247&r1=1360246&r2=1360247&view=diff
==
--- camel/branches/camel-2.10.x/parent/pom.xml (original)
+++ camel/branches/camel-2.10.x/parent/pom.xml Wed Jul 11 15:57:39 2012
@@ -1802,7 +1802,7 @@
 
 spring3.1
 
-3.1.1.RELEASE
+3.1.2.RELEASE
 
 
 

svn commit: r1360248 - /camel/branches/camel-2.10.x/parent/pom.xml

[dkulp]

Author: dkulp
Date: Wed Jul 11 15:57:42 2012
New Revision: 1360248

URL: http://svn.apache.org/viewvc?rev=1360248&view=rev
Log:
Merged revisions 1360241 via  git cherry-pick from
https://svn.apache.org/repos/asf/camel/trunk


  r1360241 | dkulp | 2012-07-11 11:52:56 -0400 (Wed, 11 Jul 2012) | 2 lines

  Open up the cxf range a bit to allow testing with cxf trunk



Modified:
camel/branches/camel-2.10.x/parent/pom.xml

Modified: camel/branches/camel-2.10.x/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/parent/pom.xml?rev=1360248&r1=1360247&r2=1360248&view=diff
==
--- camel/branches/camel-2.10.x/parent/pom.xml (original)
+++ camel/branches/camel-2.10.x/parent/pom.xml Wed Jul 11 15:57:42 2012
@@ -207,7 +207,7 @@
 
   org.springframework.*;version="[3,4)",
   org.apache.commons.logging.*;version="[1.1,2)",
-  org.apache.cxf.*;version="[2.4,2.7)",
+  org.apache.cxf.*;version="[2.4,2.8)",
   org.apache.qpid.*;version="[0.14,1)",
   org.apache.abdera.*;version="[0.4,2)",
   org.apache.commons.httpclient.*;version="[3.1,4.0)",

svn commit: r1360249 - /camel/branches/camel-2.10.x/

[dkulp]

Author: dkulp
Date: Wed Jul 11 15:57:47 2012
New Revision: 1360249

URL: http://svn.apache.org/viewvc?rev=1360249&view=rev
Log:
Recording revisions 1359383,1360241 via  git from
https://svn.apache.org/repos/asf/camel/trunk


Modified:
camel/branches/camel-2.10.x/   (props changed)

Propchange: camel/branches/camel-2.10.x/
--
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jul 11 15:57:47 2012
@@ -1 +1 @@
-/camel/trunk:1-1358964,1359013,1359197,1359226,1359265,1359341,1360031
+/camel/trunk:1-1358964,1359013,1359197,1359226,1359265,1359341,1359383,1360031,1360241

svn commit: r1360339 - in /camel/trunk: parent/pom.xml platforms/karaf/features/src/main/resources/features.xml

[dkulp]

Author: dkulp
Date: Wed Jul 11 18:31:32 2012
New Revision: 1360339

URL: http://svn.apache.org/viewvc?rev=1360339&view=rev
Log:
Move cxf feature range to property to only need to set it in one place

Modified:
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1360339&r1=1360338&r2=1360339&view=diff
==
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Jul 11 18:31:32 2012
@@ -63,6 +63,7 @@
 1.6
 1.2
 2.6.1
+[2.4,2.8)
 2.6.0
 10.8.2.2
 2.1.1
@@ -207,7 +208,7 @@
 
   org.springframework.*;version="[3,4)",
   org.apache.commons.logging.*;version="[1.1,2)",
-  org.apache.cxf.*;version="[2.4,2.8)",
+  org.apache.cxf.*;version="${cxf-version-range}",
   org.apache.qpid.*;version="[0.14,1)",
   org.apache.abdera.*;version="[0.4,2)",
   org.apache.commons.httpclient.*;version="[3.1,4.0)",

Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1360339&r1=1360338&r2=1360339&view=diff
==
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml 
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Wed 
Jul 11 18:31:32 2012
@@ -73,13 +73,13 @@
   
 camel-spring
 jetty
-cxf
-cxf-specs
-cxf-core
-cxf-jaxrs
-cxf-jaxws
-cxf-databinding-jaxb
-cxf-bindings-soap
+cxf
+cxf-specs
+cxf-core
+cxf-jaxrs
+cxf-jaxws
+cxf-databinding-jaxb
+cxf-bindings-soap
 
 
mvn:org.apache.camel/camel-cxf-transport/${project.version}
 mvn:org.apache.camel/camel-cxf/${project.version}

svn commit: r1360340 - in /camel/branches/camel-2.10.x: parent/pom.xml platforms/karaf/features/src/main/resources/features.xml

[dkulp]

Author: dkulp
Date: Wed Jul 11 18:32:44 2012
New Revision: 1360340

URL: http://svn.apache.org/viewvc?rev=1360340&view=rev
Log:
Merged revisions 1360339 via  git cherry-pick from
https://svn.apache.org/repos/asf/camel/trunk


  r1360339 | dkulp | 2012-07-11 14:31:32 -0400 (Wed, 11 Jul 2012) | 2 lines

  Move cxf feature range to property to only need to set it in one place



Modified:
camel/branches/camel-2.10.x/parent/pom.xml

camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/features.xml

Modified: camel/branches/camel-2.10.x/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/parent/pom.xml?rev=1360340&r1=1360339&r2=1360340&view=diff
==
--- camel/branches/camel-2.10.x/parent/pom.xml (original)
+++ camel/branches/camel-2.10.x/parent/pom.xml Wed Jul 11 18:32:44 2012
@@ -63,6 +63,7 @@
 1.6
 1.2
 2.6.1
+[2.4,2.8)
 2.6.0
 10.8.2.2
 2.1.1
@@ -207,7 +208,7 @@
 
   org.springframework.*;version="[3,4)",
   org.apache.commons.logging.*;version="[1.1,2)",
-  org.apache.cxf.*;version="[2.4,2.8)",
+  org.apache.cxf.*;version="${cxf-version-range}",
   org.apache.qpid.*;version="[0.14,1)",
   org.apache.abdera.*;version="[0.4,2)",
   org.apache.commons.httpclient.*;version="[3.1,4.0)",

Modified: 
camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/features.xml
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/features.xml?rev=1360340&r1=1360339&r2=1360340&view=diff
==
--- 
camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/features.xml
 (original)
+++ 
camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/features.xml
 Wed Jul 11 18:32:44 2012
@@ -73,13 +73,13 @@
   
 camel-spring
 jetty
-cxf
-cxf-specs
-cxf-core
-cxf-jaxrs
-cxf-jaxws
-cxf-databinding-jaxb
-cxf-bindings-soap
+cxf
+cxf-specs
+cxf-core
+cxf-jaxrs
+cxf-jaxws
+cxf-databinding-jaxb
+cxf-bindings-soap
 
 
mvn:org.apache.camel/camel-cxf-transport/${project.version}
 mvn:org.apache.camel/camel-cxf/${project.version}

svn commit: r1360341 - /camel/branches/camel-2.10.x/

[dkulp]

Author: dkulp
Date: Wed Jul 11 18:32:51 2012
New Revision: 1360341

URL: http://svn.apache.org/viewvc?rev=1360341&view=rev
Log:
Recording revisions 1360339 via  git from
https://svn.apache.org/repos/asf/camel/trunk


Modified:
camel/branches/camel-2.10.x/   (props changed)

Propchange: camel/branches/camel-2.10.x/
--
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jul 11 18:32:51 2012
@@ -1 +1 @@
-/camel/trunk:1-1358964,1359013,1359197,1359226,1359265,1359341,1359383,1360031,1360241
+/camel/trunk:1-1358964,1359013,1359197,1359226,1359265,1359341,1359383,1360031,1360241,1360339

svn commit: r1360389 - /camel/branches/camel-2.9.x/parent/pom.xml

[dkulp]

Author: dkulp
Date: Wed Jul 11 20:50:36 2012
New Revision: 1360389

URL: http://svn.apache.org/viewvc?rev=1360389&view=rev
Log:
Merged revisions 1360248 via  git cherry-pick from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x


  r1360248 | dkulp | 2012-07-11 11:57:42 -0400 (Wed, 11 Jul 2012) | 10 lines

  Merged revisions 1360241 via  git cherry-pick from
  https://svn.apache.org/repos/asf/camel/trunk

  
r1360241 | dkulp | 2012-07-11 11:52:56 -0400 (Wed, 11 Jul 2012) | 2 lines

Open up the cxf range a bit to allow testing with cxf trunk

  



Modified:
camel/branches/camel-2.9.x/parent/pom.xml

Modified: camel/branches/camel-2.9.x/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/parent/pom.xml?rev=1360389&r1=1360388&r2=1360389&view=diff
==
--- camel/branches/camel-2.9.x/parent/pom.xml (original)
+++ camel/branches/camel-2.9.x/parent/pom.xml Wed Jul 11 20:50:36 2012
@@ -177,7 +177,7 @@
 
   org.springframework.*;version="[3,4)",
   org.apache.commons.logging.*;version="[1.1,2)",
-  org.apache.cxf.*;version="[2.4,2.7)",
+  org.apache.cxf.*;version="[2.4,2.8)",
   org.apache.qpid.*;version="[0.12,0.13)",
   org.apache.abdera.*;version="[0.4,2)",
   org.apache.commons.httpclient.*;version="[3.1,4.0)",

svn commit: r1360390 - in /camel/branches/camel-2.9.x: parent/pom.xml platforms/karaf/features/src/main/resources/features.xml

[dkulp]

Author: dkulp
Date: Wed Jul 11 20:50:41 2012
New Revision: 1360390

URL: http://svn.apache.org/viewvc?rev=1360390&view=rev
Log:
Merged revisions 1360340 via  git cherry-pick from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x


  r1360340 | dkulp | 2012-07-11 14:32:44 -0400 (Wed, 11 Jul 2012) | 10 lines

  Merged revisions 1360339 via  git cherry-pick from
  https://svn.apache.org/repos/asf/camel/trunk

  
r1360339 | dkulp | 2012-07-11 14:31:32 -0400 (Wed, 11 Jul 2012) | 2 lines

Move cxf feature range to property to only need to set it in one place

  



Modified:
camel/branches/camel-2.9.x/parent/pom.xml

camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml

Modified: camel/branches/camel-2.9.x/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/parent/pom.xml?rev=1360390&r1=1360389&r2=1360390&view=diff
==
--- camel/branches/camel-2.9.x/parent/pom.xml (original)
+++ camel/branches/camel-2.9.x/parent/pom.xml Wed Jul 11 20:50:41 2012
@@ -58,6 +58,7 @@
 1.5.6
 1.2
 2.5.4
+[2.4,2.8)
 2.4.0
 10.8.2.2
 2.1.1
@@ -177,7 +178,7 @@
 
   org.springframework.*;version="[3,4)",
   org.apache.commons.logging.*;version="[1.1,2)",
-  org.apache.cxf.*;version="[2.4,2.8)",
+  org.apache.cxf.*;version="${cxf-version-range}",
   org.apache.qpid.*;version="[0.12,0.13)",
   org.apache.abdera.*;version="[0.4,2)",
   org.apache.commons.httpclient.*;version="[3.1,4.0)",

Modified: 
camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml?rev=1360390&r1=1360389&r2=1360390&view=diff
==
--- 
camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml
 (original)
+++ 
camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml
 Wed Jul 11 20:50:41 2012
@@ -63,9 +63,9 @@
   
 camel-spring
 jetty
-cxf
+cxf
 
-cxf-specs
+cxf-specs
 
mvn:org.apache.camel/camel-cxf-transport/${project.version}
 mvn:org.apache.camel/camel-cxf/${project.version}
   

svn commit: r1360391 - /camel/branches/camel-2.9.x/

[dkulp]

Author: dkulp
Date: Wed Jul 11 20:50:48 2012
New Revision: 1360391

URL: http://svn.apache.org/viewvc?rev=1360391&view=rev
Log:
Recording revisions 1360248,1360340 via  git from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x


Modified:
camel/branches/camel-2.9.x/   (props changed)

Propchange: camel/branches/camel-2.9.x/
--
Binary property 'svnmerge-integrated' - no diff available.

svn commit: r1360392 - /camel/branches/camel-2.9.x/

[dkulp]

Author: dkulp
Date: Wed Jul 11 20:50:50 2012
New Revision: 1360392

URL: http://svn.apache.org/viewvc?rev=1360392&view=rev
Log:
Blocking revisions 1358965,1358969,1358970,1360249,1360341 via  git from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x


  r1358965 | ningjiang | 2012-07-09 04:27:47 -0400 (Mon, 09 Jul 2012) | 2 lines
  
  create camel-2.10.x branch
  


  r1358969 | ningjiang | 2012-07-09 04:33:46 -0400 (Mon, 09 Jul 2012) | 3 lines
  
  Initialized merge tracking via "svnmerge" with revisions "1-1358964" from
  https://svn.apache.org/repos/asf/camel/trunk
  


  r1358970 | ningjiang | 2012-07-09 04:41:35 -0400 (Mon, 09 Jul 2012) | 2 lines
  
  Updated the project version to 2.10.1-SNAPSHOT
  
....
....
  r1360249 | dkulp | 2012-07-11 11:57:47 -0400 (Wed, 11 Jul 2012) | 3 lines
  
  Recording revisions 1359383,1360241 via  git from
  https://svn.apache.org/repos/asf/camel/trunk
  
....
....
  r1360341 | dkulp | 2012-07-11 14:32:51 -0400 (Wed, 11 Jul 2012) | 3 lines
  
  Recording revisions 1360339 via  git from
  https://svn.apache.org/repos/asf/camel/trunk
  


Modified:
camel/branches/camel-2.9.x/   (props changed)

Propchange: camel/branches/camel-2.9.x/
--
Binary property 'svnmerge-blocked' - no diff available.

svn commit: r1362123 - in /camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf: CxfEndpoint.java converter/CxfPayloadConverter.java

[dkulp]

Author: dkulp
Date: Mon Jul 16 16:53:52 2012
New Revision: 1362123

URL: http://svn.apache.org/viewvc?rev=1362123&view=rev
Log:
[CAMEL-5449] Try converting to Source first

Modified:

camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java

camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java

Modified: 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=1362123&r1=1362122&r2=1362123&view=diff
==
--- 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 Mon Jul 16 16:53:52 2012
@@ -29,6 +29,7 @@ import javax.xml.stream.XMLStreamReader;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stax.StAXSource;
+import javax.xml.transform.stream.StreamSource;
 import javax.xml.ws.WebServiceProvider;
 import javax.xml.ws.handler.Handler;
 
@@ -88,6 +89,7 @@ import org.apache.cxf.service.factory.Re
 import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.service.model.MessagePartInfo;
 import org.apache.cxf.staxutils.StaxSource;
+import org.apache.cxf.staxutils.StaxUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -916,6 +918,19 @@ public class CxfEndpoint extends Default
 }
 }
 return r.getLocalName();
+} else if (source instanceof StreamSource) {
+//flip to stax so we can get the name
+XMLStreamReader reader = 
StaxUtils.createXMLStreamReader(source);
+StaxSource src2 = new StaxSource(reader);
+sources.set(i, src2);
+if (reader.getEventType() == XMLStreamReader.START_DOCUMENT) {
+try {
+reader.nextTag();
+} catch (XMLStreamException e) {
+//ignore
+}
+}
+return reader.getLocalName();
 }
 return null;
 }

Modified: 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java?rev=1362123&r1=1362122&r2=1362123&view=diff
==
--- 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 Mon Jul 16 16:53:52 2012
@@ -20,6 +20,8 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.xml.transform.Source;
+
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -65,6 +67,14 @@ public final class CxfPayloadConverter {
 }
 return new CxfPayload(headers, body);
 }
+
+@Converter
+public static  CxfPayload sourceToCxfPayload(Source src, Exchange 
exchange) {
+List headers = new ArrayList();
+List body = new ArrayList();
+body.add(src);
+return new CxfPayload(headers, body, null);
+}
 
 @Converter
 public static  NodeList cxfPayloadToNodeList(CxfPayload payload, 
Exchange exchange) {
@@ -87,6 +97,13 @@ public final class CxfPayloadConverter {
 // use fallback type converter, so we can probably convert into
 // CxfPayloads from other types
 if (type.isAssignableFrom(CxfPayload.class)) {
+if (!value.getClass().isArray()) {
+TypeConverter tc = registry.lookup(Source.class, 
value.getClass());
+if (tc != null) {
+Source src = tc.convertTo(Source.class, exchange, value);
+return (T) sourceToCxfPayload(src, exchange);
+}
+}
 TypeConverter tc = registry.lookup(NodeList.class, 
value.getClass());
 if (tc != null) {
 NodeList nodeList = tc.convertTo(NodeList.class, exchange, 
value);

svn commit: r1362126 - in /camel/trunk/camel-core/src/main/java/org/apache/camel: builder/xml/XsltBuilder.java component/xslt/XsltComponent.java

[dkulp]

Author: dkulp
Date: Mon Jul 16 16:53:57 2012
New Revision: 1362126

URL: http://svn.apache.org/viewvc?rev=1362126&view=rev
Log:
[CAMEL-5450] Add support to xslt component to cache the transformers
(off by default, but likely could/should be on and set to something like
5 or 10)

Modified:

camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java

camel/trunk/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java?rev=1362126&r1=1362125&r2=1362126&view=diff
==
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
 Mon Jul 16 16:53:57 2012
@@ -23,6 +23,9 @@ import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.ErrorListener;
 import javax.xml.transform.Result;
@@ -69,6 +72,7 @@ public class XsltBuilder implements Proc
 private Map parameters = new HashMap();
 private XmlConverter converter = new XmlConverter();
 private Templates template;
+private volatile BlockingQueue transformers;
 private ResultHandlerFactory resultHandlerFactory = new 
StringResultHandlerFactory();
 private boolean failOnNullBody = true;
 private URIResolver uriResolver;
@@ -97,7 +101,7 @@ public class XsltBuilder implements Proc
 exchange.addOnCompletion(new XsltBuilderOnCompletion(fileName));
 }
 
-Transformer transformer = getTemplate().newTransformer();
+Transformer transformer = getTransformer();
 configureTransformer(transformer, exchange);
 transformer.setErrorListener(new DefaultTransformErrorHandler());
 ResultHandler resultHandler = 
resultHandlerFactory.createResult(exchange);
@@ -124,6 +128,7 @@ public class XsltBuilder implements Proc
 LOG.trace("Transform complete with result {}", result);
 resultHandler.setBody(out);
 } finally {
+releaseTransformer(transformer);
 // IOHelper can handle if is is null
 IOHelper.close(is);
 }
@@ -238,6 +243,16 @@ public class XsltBuilder implements Proc
 setAllowStAX(true);
 return this;
 }
+
+
+public XsltBuilder transformerCacheSize(int numberToCache) {
+if (numberToCache > 0) {
+transformers = new ArrayBlockingQueue(numberToCache);
+} else {
+transformers = null;
+}
+return this;
+}
 
 // Properties
 // 
-
@@ -252,6 +267,9 @@ public class XsltBuilder implements Proc
 
 public void setTemplate(Templates template) {
 this.template = template;
+if (transformers != null) {
+transformers.clear();
+}
 }
 
 public Templates getTemplate() {
@@ -365,6 +383,23 @@ public class XsltBuilder implements Proc
 
 // Implementation methods
 // 
-
+private void releaseTransformer(Transformer transformer) {
+if (transformers != null) {
+transformer.reset();
+transformers.offer(transformer);
+}
+}
+
+private Transformer getTransformer() throws 
TransformerConfigurationException {
+Transformer t = null; 
+if (transformers != null) {
+t = transformers.poll();
+}
+if (t == null) {
+t = getTemplate().newTransformer();
+}
+return t;
+}
 
 /**
  * Checks whether we need an {@link InputStream} to access the message 
body.

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java?rev=1362126&r1=1362125&r2=1362126&view=diff
==
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java
 Mon Jul 16 16:53:57 2012
@@ -110,6 +110,9 @@ public class XsltComponent extends Defau
 }
 String output = getAndRemoveParameter(parameters, "output", 
String.class);
 configureOutput(xslt, output);
+
+  

svn commit: r1362128 - in /camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf: CxfEndpoint.java converter/CxfPayloadConverter.java

[dkulp]

Author: dkulp
Date: Mon Jul 16 16:56:09 2012
New Revision: 1362128

URL: http://svn.apache.org/viewvc?rev=1362128&view=rev
Log:
Merged revisions 1362123 via  git cherry-pick from
https://svn.apache.org/repos/asf/camel/trunk


  r1362123 | dkulp | 2012-07-16 12:53:52 -0400 (Mon, 16 Jul 2012) | 2 lines

  [CAMEL-5449] Try converting to Source first



Modified:

camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java

camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java

Modified: 
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=1362128&r1=1362127&r2=1362128&view=diff
==
--- 
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 (original)
+++ 
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 Mon Jul 16 16:56:09 2012
@@ -29,6 +29,7 @@ import javax.xml.stream.XMLStreamReader;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stax.StAXSource;
+import javax.xml.transform.stream.StreamSource;
 import javax.xml.ws.WebServiceProvider;
 import javax.xml.ws.handler.Handler;
 
@@ -88,6 +89,7 @@ import org.apache.cxf.service.factory.Re
 import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.service.model.MessagePartInfo;
 import org.apache.cxf.staxutils.StaxSource;
+import org.apache.cxf.staxutils.StaxUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -916,6 +918,19 @@ public class CxfEndpoint extends Default
 }
 }
 return r.getLocalName();
+} else if (source instanceof StreamSource) {
+//flip to stax so we can get the name
+XMLStreamReader reader = 
StaxUtils.createXMLStreamReader(source);
+StaxSource src2 = new StaxSource(reader);
+sources.set(i, src2);
+if (reader.getEventType() == XMLStreamReader.START_DOCUMENT) {
+try {
+reader.nextTag();
+} catch (XMLStreamException e) {
+//ignore
+}
+}
+return reader.getLocalName();
 }
 return null;
 }

Modified: 
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java?rev=1362128&r1=1362127&r2=1362128&view=diff
==
--- 
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 (original)
+++ 
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 Mon Jul 16 16:56:09 2012
@@ -20,6 +20,8 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.xml.transform.Source;
+
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -65,6 +67,14 @@ public final class CxfPayloadConverter {
 }
 return new CxfPayload(headers, body);
 }
+
+@Converter
+public static  CxfPayload sourceToCxfPayload(Source src, Exchange 
exchange) {
+List headers = new ArrayList();
+List body = new ArrayList();
+body.add(src);
+return new CxfPayload(headers, body, null);
+}
 
 @Converter
 public static  NodeList cxfPayloadToNodeList(CxfPayload payload, 
Exchange exchange) {
@@ -87,6 +97,13 @@ public final class CxfPayloadConverter {
 // use fallback type converter, so we can probably convert into
 // CxfPayloads from other types
 if (type.isAssignableFrom(CxfPayload.class)) {
+if (!value.getClass().isArray()) {
+TypeConverter tc = registry.lookup(Source.class, 
value.getClass());
+if (tc != null) {
+Source src = tc.convertTo(Source.class, exchange, value);
+return (T) sourceToCxfPayload(src, exchange);
+}
+}
 TypeConverter tc = registry.lookup(NodeList.class, 
value.getClass());
 if (tc != null) {
 NodeList nodeList = tc.conver

svn commit: r1362129 - /camel/branches/camel-2.10.x/

[dkulp]

Author: dkulp
Date: Mon Jul 16 16:56:14 2012
New Revision: 1362129

URL: http://svn.apache.org/viewvc?rev=1362129&view=rev
Log:
Recording revisions 1362123 via  git from
https://svn.apache.org/repos/asf/camel/trunk


Modified:
camel/branches/camel-2.10.x/   (props changed)

Propchange: camel/branches/camel-2.10.x/
--
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jul 16 16:56:14 2012
@@ -1 +1 @@
-/camel/trunk:1-1358964,1359013,1359197,1359226,1359265,1359341,1359383,1360031,1360241,1360339,1360525-1360527,1360581,1360583,1360719,1361116-1361117,1361477,1361919,1361973
+/camel/trunk:1-1358964,1359013,1359197,1359226,1359265,1359341,1359383,1360031,1360241,1360339,1360525-1360527,1360581,1360583,1360719,1361116-1361117,1361477,1361919,1361973,1362123

svn commit: r1362130 - in /camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel: builder/xml/XsltBuilder.java component/xslt/XsltComponent.java

[dkulp]

Author: dkulp
Date: Mon Jul 16 16:56:40 2012
New Revision: 1362130

URL: http://svn.apache.org/viewvc?rev=1362130&view=rev
Log:
Merged revisions 1362126 via  git cherry-pick from
https://svn.apache.org/repos/asf/camel/trunk


  r1362126 | dkulp | 2012-07-16 12:53:57 -0400 (Mon, 16 Jul 2012) | 4 lines

  [CAMEL-5450] Add support to xslt component to cache the transformers
  (off by default, but likely could/should be on and set to something like
  5 or 10)



Modified:

camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java

camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java

Modified: 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java?rev=1362130&r1=1362129&r2=1362130&view=diff
==
--- 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
 (original)
+++ 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
 Mon Jul 16 16:56:40 2012
@@ -23,6 +23,9 @@ import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.ErrorListener;
 import javax.xml.transform.Result;
@@ -69,6 +72,7 @@ public class XsltBuilder implements Proc
 private Map parameters = new HashMap();
 private XmlConverter converter = new XmlConverter();
 private Templates template;
+private volatile BlockingQueue transformers;
 private ResultHandlerFactory resultHandlerFactory = new 
StringResultHandlerFactory();
 private boolean failOnNullBody = true;
 private URIResolver uriResolver;
@@ -97,7 +101,7 @@ public class XsltBuilder implements Proc
 exchange.addOnCompletion(new XsltBuilderOnCompletion(fileName));
 }
 
-Transformer transformer = getTemplate().newTransformer();
+Transformer transformer = getTransformer();
 configureTransformer(transformer, exchange);
 transformer.setErrorListener(new DefaultTransformErrorHandler());
 ResultHandler resultHandler = 
resultHandlerFactory.createResult(exchange);
@@ -124,6 +128,7 @@ public class XsltBuilder implements Proc
 LOG.trace("Transform complete with result {}", result);
 resultHandler.setBody(out);
 } finally {
+releaseTransformer(transformer);
 // IOHelper can handle if is is null
 IOHelper.close(is);
 }
@@ -238,6 +243,16 @@ public class XsltBuilder implements Proc
 setAllowStAX(true);
 return this;
 }
+
+
+public XsltBuilder transformerCacheSize(int numberToCache) {
+if (numberToCache > 0) {
+transformers = new ArrayBlockingQueue(numberToCache);
+} else {
+transformers = null;
+}
+return this;
+}
 
 // Properties
 // 
-
@@ -252,6 +267,9 @@ public class XsltBuilder implements Proc
 
 public void setTemplate(Templates template) {
 this.template = template;
+if (transformers != null) {
+transformers.clear();
+}
 }
 
 public Templates getTemplate() {
@@ -365,6 +383,23 @@ public class XsltBuilder implements Proc
 
 // Implementation methods
 // 
-
+private void releaseTransformer(Transformer transformer) {
+if (transformers != null) {
+transformer.reset();
+transformers.offer(transformer);
+}
+}
+
+private Transformer getTransformer() throws 
TransformerConfigurationException {
+Transformer t = null; 
+if (transformers != null) {
+t = transformers.poll();
+}
+if (t == null) {
+t = getTemplate().newTransformer();
+}
+return t;
+}
 
 /**
  * Checks whether we need an {@link InputStream} to access the message 
body.

Modified: 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java?rev=1362130&r1=1362129&r2=1362130&view=diff
==
--- 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java
 (origina

svn commit: r1362131 - /camel/branches/camel-2.10.x/

[dkulp]

Author: dkulp
Date: Mon Jul 16 16:56:45 2012
New Revision: 1362131

URL: http://svn.apache.org/viewvc?rev=1362131&view=rev
Log:
Recording revisions 1362126 via  git from
https://svn.apache.org/repos/asf/camel/trunk


Modified:
camel/branches/camel-2.10.x/   (props changed)

Propchange: camel/branches/camel-2.10.x/
--
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jul 16 16:56:45 2012
@@ -1 +1 @@
-/camel/trunk:1-1358964,1359013,1359197,1359226,1359265,1359341,1359383,1360031,1360241,1360339,1360525-1360527,1360581,1360583,1360719,1361116-1361117,1361477,1361919,1361973,1362123
+/camel/trunk:1-1358964,1359013,1359197,1359226,1359265,1359341,1359383,1360031,1360241,1360339,1360525-1360527,1360581,1360583,1360719,1361116-1361117,1361477,1361919,1361973,1362123,1362126

svn commit: r1362143 - in /camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf: CxfEndpoint.java converter/CxfPayloadConverter.java

[dkulp]

Author: dkulp
Date: Mon Jul 16 17:16:39 2012
New Revision: 1362143

URL: http://svn.apache.org/viewvc?rev=1362143&view=rev
Log:
Merged revisions 1362128 via  git cherry-pick from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x


  r1362128 | dkulp | 2012-07-16 12:56:09 -0400 (Mon, 16 Jul 2012) | 10 lines

  Merged revisions 1362123 via  git cherry-pick from
  https://svn.apache.org/repos/asf/camel/trunk

  
r1362123 | dkulp | 2012-07-16 12:53:52 -0400 (Mon, 16 Jul 2012) | 2 lines

[CAMEL-5449] Try converting to Source first

  



Modified:

camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java

camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java

Modified: 
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=1362143&r1=1362142&r2=1362143&view=diff
==
--- 
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 (original)
+++ 
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 Mon Jul 16 17:16:39 2012
@@ -29,6 +29,7 @@ import javax.xml.stream.XMLStreamReader;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stax.StAXSource;
+import javax.xml.transform.stream.StreamSource;
 import javax.xml.ws.WebServiceProvider;
 import javax.xml.ws.handler.Handler;
 
@@ -86,6 +87,7 @@ import org.apache.cxf.service.factory.Re
 import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.service.model.MessagePartInfo;
 import org.apache.cxf.staxutils.StaxSource;
+import org.apache.cxf.staxutils.StaxUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -900,6 +902,19 @@ public class CxfEndpoint extends Default
 }
 }
 return r.getLocalName();
+} else if (source instanceof StreamSource) {
+//flip to stax so we can get the name
+XMLStreamReader reader = 
StaxUtils.createXMLStreamReader(source);
+StaxSource src2 = new StaxSource(reader);
+sources.set(i, src2);
+if (reader.getEventType() == XMLStreamReader.START_DOCUMENT) {
+try {
+reader.nextTag();
+} catch (XMLStreamException e) {
+//ignore
+}
+}
+return reader.getLocalName();
 }
 return null;
 }

Modified: 
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java?rev=1362143&r1=1362142&r2=1362143&view=diff
==
--- 
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 (original)
+++ 
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 Mon Jul 16 17:16:39 2012
@@ -20,6 +20,8 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.xml.transform.Source;
+
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -65,6 +67,14 @@ public final class CxfPayloadConverter {
 }
 return new CxfPayload(headers, body);
 }
+
+@Converter
+public static  CxfPayload sourceToCxfPayload(Source src, Exchange 
exchange) {
+List headers = new ArrayList();
+List body = new ArrayList();
+body.add(src);
+return new CxfPayload(headers, body, null);
+}
 
 @Converter
 public static  NodeList cxfPayloadToNodeList(CxfPayload payload, 
Exchange exchange) {
@@ -87,6 +97,13 @@ public final class CxfPayloadConverter {
 // use fallback type converter, so we can probably convert into
 // CxfPayloads from other types
 if (type.isAssignableFrom(CxfPayload.class)) {
+if (!value.getClass().isArray()) {
+TypeConverter tc = registry.lookup(Source.class, 
value.getClass());
+if (tc != null) {
+Source src = tc.convertTo(Source.class, exchange, value);
+return (T) sour

svn commit: r1362144 - in /camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel: builder/xml/XsltBuilder.java component/xslt/XsltComponent.java

[dkulp]

Author: dkulp
Date: Mon Jul 16 17:16:44 2012
New Revision: 1362144

URL: http://svn.apache.org/viewvc?rev=1362144&view=rev
Log:
Merged revisions 1362130 via  git cherry-pick from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x


  r1362130 | dkulp | 2012-07-16 12:56:40 -0400 (Mon, 16 Jul 2012) | 12 lines

  Merged revisions 1362126 via  git cherry-pick from
  https://svn.apache.org/repos/asf/camel/trunk

  
r1362126 | dkulp | 2012-07-16 12:53:57 -0400 (Mon, 16 Jul 2012) | 4 lines

[CAMEL-5450] Add support to xslt component to cache the transformers
(off by default, but likely could/should be on and set to something like
5 or 10)

  



Modified:

camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java

camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java

Modified: 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java?rev=1362144&r1=1362143&r2=1362144&view=diff
==
--- 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
 (original)
+++ 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
 Mon Jul 16 17:16:44 2012
@@ -23,6 +23,9 @@ import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.ErrorListener;
 import javax.xml.transform.Result;
@@ -69,6 +72,7 @@ public class XsltBuilder implements Proc
 private Map parameters = new HashMap();
 private XmlConverter converter = new XmlConverter();
 private Templates template;
+private volatile BlockingQueue transformers;
 private ResultHandlerFactory resultHandlerFactory = new 
StringResultHandlerFactory();
 private boolean failOnNullBody = true;
 private URIResolver uriResolver;
@@ -97,7 +101,7 @@ public class XsltBuilder implements Proc
 exchange.addOnCompletion(new XsltBuilderOnCompletion(fileName));
 }
 
-Transformer transformer = getTemplate().newTransformer();
+Transformer transformer = getTransformer();
 configureTransformer(transformer, exchange);
 transformer.setErrorListener(new DefaultTransformErrorHandler());
 ResultHandler resultHandler = 
resultHandlerFactory.createResult(exchange);
@@ -124,6 +128,7 @@ public class XsltBuilder implements Proc
 LOG.trace("Transform complete with result {}", result);
 resultHandler.setBody(out);
 } finally {
+releaseTransformer(transformer);
 // IOHelper can handle if is is null
 IOHelper.close(is);
 }
@@ -238,6 +243,16 @@ public class XsltBuilder implements Proc
 setAllowStAX(true);
 return this;
 }
+
+
+public XsltBuilder transformerCacheSize(int numberToCache) {
+if (numberToCache > 0) {
+transformers = new ArrayBlockingQueue(numberToCache);
+} else {
+transformers = null;
+}
+return this;
+}
 
 // Properties
 // 
-
@@ -252,6 +267,9 @@ public class XsltBuilder implements Proc
 
 public void setTemplate(Templates template) {
 this.template = template;
+if (transformers != null) {
+transformers.clear();
+}
 }
 
 public Templates getTemplate() {
@@ -365,6 +383,23 @@ public class XsltBuilder implements Proc
 
 // Implementation methods
 // 
-
+private void releaseTransformer(Transformer transformer) {
+if (transformers != null) {
+transformer.reset();
+transformers.offer(transformer);
+}
+}
+
+private Transformer getTransformer() throws 
TransformerConfigurationException {
+Transformer t = null; 
+if (transformers != null) {
+t = transformers.poll();
+}
+if (t == null) {
+t = getTemplate().newTransformer();
+}
+return t;
+}
 
 /**
  * Checks whether we need an {@link InputStream} to access the message 
body.

Modified: 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java?rev=1362144&am

svn commit: r1362145 - /camel/branches/camel-2.9.x/

[dkulp]

Author: dkulp
Date: Mon Jul 16 17:16:49 2012
New Revision: 1362145

URL: http://svn.apache.org/viewvc?rev=1362145&view=rev
Log:
Recording revisions 1359013,1359226,1359265,1359341,1360042,1362128,1362130 via 
 git from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x


Modified:
camel/branches/camel-2.9.x/   (props changed)

Propchange: camel/branches/camel-2.9.x/
--
Binary property 'svnmerge-integrated' - no diff available.

svn commit: r1362146 - /camel/branches/camel-2.9.x/

[dkulp]

Author: dkulp
Date: Mon Jul 16 17:16:51 2012
New Revision: 1362146

URL: http://svn.apache.org/viewvc?rev=1362146&view=rev
Log:
Blocking revisions 1359197,1359200,1362129,1362131 via  git from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x




  r1359200 | davsclaus | 2012-07-09 10:57:57 -0400 (Mon, 09 Jul 2012) | 2 lines
  
  CAMEL-5431: Added trends to camel-twitter. And more javadoc etc. Thanks to 
Brett for the patch.
  


  r1362129 | dkulp | 2012-07-16 12:56:14 -0400 (Mon, 16 Jul 2012) | 3 lines
  
  Recording revisions 1362123 via  git from
  https://svn.apache.org/repos/asf/camel/trunk
  


  r1362131 | dkulp | 2012-07-16 12:56:45 -0400 (Mon, 16 Jul 2012) | 3 lines
  
  Recording revisions 1362126 via  git from
  https://svn.apache.org/repos/asf/camel/trunk
  


Modified:
camel/branches/camel-2.9.x/   (props changed)

Propchange: camel/branches/camel-2.9.x/
--
Binary property 'svnmerge-blocked' - no diff available.

svn commit: r1362156 - /camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java

[dkulp]

Author: dkulp
Date: Mon Jul 16 17:31:25 2012
New Revision: 1362156

URL: http://svn.apache.org/viewvc?rev=1362156&view=rev
Log:
Fix compile failure on 2.9.x

Modified:

camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java

Modified: 
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java?rev=1362156&r1=1362155&r2=1362156&view=diff
==
--- 
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
 (original)
+++ 
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
 Mon Jul 16 17:31:25 2012
@@ -132,16 +132,16 @@ public class CxfRsEndpoint extends Defau
 }
 }
 
-@SuppressWarnings({"rawtypes", "unchecked"})
+@SuppressWarnings({"rawtypes"})
 protected void setupJAXRSServerFactoryBean(JAXRSServerFactoryBean sfb) {
 // address
 if (getAddress() != null) {
 sfb.setAddress(getAddress());
 }
 if (getResourceClasses() != null) {
-List> res = CastUtils.cast(getResourceClasses());
+List res = CastUtils.cast(getResourceClasses());
 // setup the resource providers
-for (Class clazz : res) {
+for (Class clazz : res) {
 sfb.setResourceProvider(clazz, new 
CamelResourceProvider(clazz));
 }
 sfb.setResourceClasses(res);

svn commit: r1362157 - in /camel/branches/camel-2.9.x: camel-core/src/test/java/org/apache/camel/issues/ components/camel-cxf/src/test/java/org/apache/camel/component/cxf/

[dkulp]

Author: dkulp
Date: Mon Jul 16 17:31:30 2012
New Revision: 1362157

URL: http://svn.apache.org/viewvc?rev=1362157&view=rev
Log:
Fix some checkstyle issues on 2.9.x

Modified:

camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/issues/RedeliveryErrorHandlerAsyncDelayedTwoCamelContextIssueTest.java

camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadBareSoapTest.java

Modified: 
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/issues/RedeliveryErrorHandlerAsyncDelayedTwoCamelContextIssueTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/issues/RedeliveryErrorHandlerAsyncDelayedTwoCamelContextIssueTest.java?rev=1362157&r1=1362156&r2=1362157&view=diff
==
--- 
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/issues/RedeliveryErrorHandlerAsyncDelayedTwoCamelContextIssueTest.java
 (original)
+++ 
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/issues/RedeliveryErrorHandlerAsyncDelayedTwoCamelContextIssueTest.java
 Mon Jul 16 17:31:30 2012
@@ -1,3 +1,19 @@
+/**
+ * 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.issues;
 
 import org.apache.camel.ConsumerTemplate;
@@ -59,7 +75,7 @@ public class RedeliveryErrorHandlerAsync
 }
 
 public static class ProblematicBean {
-int counter = 0;
+int counter;
 
 public void doSomething() {
 if (counter++ < 2) {

Modified: 
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadBareSoapTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadBareSoapTest.java?rev=1362157&r1=1362156&r2=1362157&view=diff
==
--- 
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadBareSoapTest.java
 (original)
+++ 
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadBareSoapTest.java
 Mon Jul 16 17:31:30 2012
@@ -16,6 +16,12 @@
  */
 package org.apache.camel.component.cxf;
 
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.ws.Endpoint;
+
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.AvailablePortFinder;
 import org.apache.camel.test.junit4.CamelTestSupport;
@@ -23,10 +29,6 @@ import org.apache.cxf.frontend.ClientPro
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.ws.Endpoint;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import static org.junit.Assert.assertEquals;
 
@@ -78,7 +80,7 @@ public class CxfPayLoadBareSoapTest exte
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
 public interface BareSoapService {
 
-public void doSomething();
+void doSomething();
 
 }
 

svn commit: r1362210 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadCon

[dkulp]

Author: dkulp
Date: Mon Jul 16 19:11:29 2012
New Revision: 1362210

URL: http://svn.apache.org/viewvc?rev=1362210&view=rev
Log:
[CXF-5449] Provide a direct CxfPayload -> Source conversion so XSLT
component can bypass the current CxfPayload(StaxSource) -> NodeList ->
DOMSource -> InputStream -> StreamSource thing it currently does.

Modified:

camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java

camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java?rev=1362210&r1=1362209&r2=1362210&view=diff
==
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
 Mon Jul 16 19:11:29 2012
@@ -47,6 +47,7 @@ import org.apache.camel.ExpectedBodyType
 import org.apache.camel.Message;
 import org.apache.camel.Processor;
 import org.apache.camel.RuntimeTransformException;
+import org.apache.camel.TypeConverter;
 import org.apache.camel.converter.jaxp.XmlConverter;
 import org.apache.camel.converter.jaxp.XmlErrorListener;
 import org.apache.camel.support.SynchronizationAdapter;
@@ -424,8 +425,10 @@ public class XsltBuilder implements Proc
 return false;
 } else if (body instanceof Node) {
 return false;
+} else if 
(exchange.getContext().getTypeConverterRegistry().lookup(Source.class, 
body.getClass()) != null) {
+//there is a direct and hopefully optimized converter to Source 
+return false;
 }
-
 // yes an input stream is needed
 return true;
 }
@@ -446,9 +449,15 @@ public class XsltBuilder implements Proc
 if (body instanceof Source) {
 return (Source) body;
 }
-
 Source source = null;
-if (isAllowStAX()) {
+if (body != null) {
+TypeConverter tc = 
exchange.getContext().getTypeConverterRegistry().lookup(Source.class, 
body.getClass());
+if (tc != null) {
+source = tc.convertTo(Source.class, body);
+}
+}
+
+if (source == null && isAllowStAX()) {
 source = 
exchange.getContext().getTypeConverter().tryConvertTo(StAXSource.class, 
exchange, body);
 }
 if (source == null) {

Modified: 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java?rev=1362210&r1=1362209&r2=1362210&view=diff
==
--- 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 Mon Jul 16 19:11:29 2012
@@ -90,6 +90,16 @@ public final class CxfPayloadConverter {
 }
 return null;
 }
+
+@Converter
+public static  Source cxfPayLoadToSource(CxfPayload payload, 
Exchange exchange) {
+List payloadBody = payload.getBodySources();
+
+if (payloadBody.size() > 0) {
+return payloadBody.get(0);
+}
+return null;
+}
 
 @SuppressWarnings("unchecked")
 @FallbackConverter
@@ -130,6 +140,14 @@ public final class CxfPayloadConverter {
 }
 // Convert a CxfPayload into something else
 if (CxfPayload.class.isAssignableFrom(value.getClass())) {
+CxfPayload payload = (CxfPayload) value;
+
+if (payload.getBodySources().size() == 1) {
+TypeConverter tc = registry.lookup(type, Source.class);
+if (tc != null) {
+return tc.convertTo(type, payload.getBodySources().get(0));
+}
+}
 TypeConverter tc = registry.lookup(type, NodeList.class);
 if (tc != null) {
 return tc.convertTo(type, cxfPayloadToNodeList((CxfPayload) 
value, exchange));

svn commit: r1362211 - in /camel/branches/camel-2.10.x: camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java components/camel-cxf/src/main/java/org/apache/camel/component/cxf/convert

[dkulp]

Author: dkulp
Date: Mon Jul 16 19:12:53 2012
New Revision: 1362211

URL: http://svn.apache.org/viewvc?rev=1362211&view=rev
Log:
Merged revisions 1362210 via  git cherry-pick from
https://svn.apache.org/repos/asf/camel/trunk


  r1362210 | dkulp | 2012-07-16 15:11:29 -0400 (Mon, 16 Jul 2012) | 4 lines

  [CXF-5449] Provide a direct CxfPayload -> Source conversion so XSLT
  component can bypass the current CxfPayload(StaxSource) -> NodeList ->
  DOMSource -> InputStream -> StreamSource thing it currently does.



Modified:

camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java

camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java

Modified: 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java?rev=1362211&r1=1362210&r2=1362211&view=diff
==
--- 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
 (original)
+++ 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
 Mon Jul 16 19:12:53 2012
@@ -47,6 +47,7 @@ import org.apache.camel.ExpectedBodyType
 import org.apache.camel.Message;
 import org.apache.camel.Processor;
 import org.apache.camel.RuntimeTransformException;
+import org.apache.camel.TypeConverter;
 import org.apache.camel.converter.jaxp.XmlConverter;
 import org.apache.camel.converter.jaxp.XmlErrorListener;
 import org.apache.camel.support.SynchronizationAdapter;
@@ -424,8 +425,10 @@ public class XsltBuilder implements Proc
 return false;
 } else if (body instanceof Node) {
 return false;
+} else if 
(exchange.getContext().getTypeConverterRegistry().lookup(Source.class, 
body.getClass()) != null) {
+//there is a direct and hopefully optimized converter to Source 
+return false;
 }
-
 // yes an input stream is needed
 return true;
 }
@@ -446,9 +449,15 @@ public class XsltBuilder implements Proc
 if (body instanceof Source) {
 return (Source) body;
 }
-
 Source source = null;
-if (isAllowStAX()) {
+if (body != null) {
+TypeConverter tc = 
exchange.getContext().getTypeConverterRegistry().lookup(Source.class, 
body.getClass());
+if (tc != null) {
+source = tc.convertTo(Source.class, body);
+}
+}
+
+if (source == null && isAllowStAX()) {
 source = 
exchange.getContext().getTypeConverter().tryConvertTo(StAXSource.class, 
exchange, body);
 }
 if (source == null) {

Modified: 
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java?rev=1362211&r1=1362210&r2=1362211&view=diff
==
--- 
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 (original)
+++ 
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 Mon Jul 16 19:12:53 2012
@@ -90,6 +90,16 @@ public final class CxfPayloadConverter {
 }
 return null;
 }
+
+@Converter
+public static  Source cxfPayLoadToSource(CxfPayload payload, 
Exchange exchange) {
+List payloadBody = payload.getBodySources();
+
+if (payloadBody.size() > 0) {
+return payloadBody.get(0);
+}
+return null;
+}
 
 @SuppressWarnings("unchecked")
 @FallbackConverter
@@ -130,6 +140,14 @@ public final class CxfPayloadConverter {
 }
 // Convert a CxfPayload into something else
 if (CxfPayload.class.isAssignableFrom(value.getClass())) {
+CxfPayload payload = (CxfPayload) value;
+
+if (payload.getBodySources().size() == 1) {
+TypeConverter tc = registry.lookup(type, Source.class);
+if (tc != null) {
+return tc.convertTo(type, payload.getBodySources().get(0));
+}
+}
 TypeConverter tc = registry.lookup(type, NodeList.class);
 if (tc != null) {
 return tc.convertTo(type, cxfPayloadToNodeList((CxfPayload) 
value, exchange));

svn commit: r1362212 - /camel/branches/camel-2.10.x/

[dkulp]

Author: dkulp
Date: Mon Jul 16 19:12:59 2012
New Revision: 1362212

URL: http://svn.apache.org/viewvc?rev=1362212&view=rev
Log:
Recording revisions 1362210 via  git from
https://svn.apache.org/repos/asf/camel/trunk


Modified:
camel/branches/camel-2.10.x/   (props changed)

Propchange: camel/branches/camel-2.10.x/
--
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jul 16 19:12:59 2012
@@ -1 +1 @@
-/camel/trunk:1-1358964,1359013,1359197,1359226,1359265,1359341,1359383,1360031,1360241,1360339,1360525-1360527,1360581,1360583,1360719,1361116-1361117,1361477,1361919,1361973,1362123,1362126
+/camel/trunk:1-1358964,1359013,1359197,1359226,1359265,1359341,1359383,1360031,1360241,1360339,1360525-1360527,1360581,1360583,1360719,1361116-1361117,1361477,1361919,1361973,1362123,1362126,1362210

svn commit: r1362215 - in /camel/branches/camel-2.9.x: camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converte

[dkulp]

Author: dkulp
Date: Mon Jul 16 19:14:14 2012
New Revision: 1362215

URL: http://svn.apache.org/viewvc?rev=1362215&view=rev
Log:
Merged revisions 1362211 via  git cherry-pick from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x


  r1362211 | dkulp | 2012-07-16 15:12:53 -0400 (Mon, 16 Jul 2012) | 12 lines

  Merged revisions 1362210 via  git cherry-pick from
  https://svn.apache.org/repos/asf/camel/trunk

  
r1362210 | dkulp | 2012-07-16 15:11:29 -0400 (Mon, 16 Jul 2012) | 4 lines

[CXF-5449] Provide a direct CxfPayload -> Source conversion so XSLT
component can bypass the current CxfPayload(StaxSource) -> NodeList ->
DOMSource -> InputStream -> StreamSource thing it currently does.

  



Modified:

camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java

camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java

Modified: 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java?rev=1362215&r1=1362214&r2=1362215&view=diff
==
--- 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
 (original)
+++ 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
 Mon Jul 16 19:14:14 2012
@@ -47,6 +47,7 @@ import org.apache.camel.ExpectedBodyType
 import org.apache.camel.Message;
 import org.apache.camel.Processor;
 import org.apache.camel.RuntimeTransformException;
+import org.apache.camel.TypeConverter;
 import org.apache.camel.converter.jaxp.XmlConverter;
 import org.apache.camel.converter.jaxp.XmlErrorListener;
 import org.apache.camel.support.SynchronizationAdapter;
@@ -424,8 +425,10 @@ public class XsltBuilder implements Proc
 return false;
 } else if (body instanceof Node) {
 return false;
+} else if 
(exchange.getContext().getTypeConverterRegistry().lookup(Source.class, 
body.getClass()) != null) {
+//there is a direct and hopefully optimized converter to Source 
+return false;
 }
-
 // yes an input stream is needed
 return true;
 }
@@ -446,9 +449,15 @@ public class XsltBuilder implements Proc
 if (body instanceof Source) {
 return (Source) body;
 }
-
 Source source = null;
-if (isAllowStAX()) {
+if (body != null) {
+TypeConverter tc = 
exchange.getContext().getTypeConverterRegistry().lookup(Source.class, 
body.getClass());
+if (tc != null) {
+source = tc.convertTo(Source.class, body);
+}
+}
+
+if (source == null && isAllowStAX()) {
 source = 
exchange.getContext().getTypeConverter().tryConvertTo(StAXSource.class, 
exchange, body);
 }
 if (source == null) {

Modified: 
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java?rev=1362215&r1=1362214&r2=1362215&view=diff
==
--- 
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 (original)
+++ 
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 Mon Jul 16 19:14:14 2012
@@ -90,6 +90,16 @@ public final class CxfPayloadConverter {
 }
 return null;
 }
+
+@Converter
+public static  Source cxfPayLoadToSource(CxfPayload payload, 
Exchange exchange) {
+List payloadBody = payload.getBodySources();
+
+if (payloadBody.size() > 0) {
+return payloadBody.get(0);
+}
+return null;
+}
 
 @SuppressWarnings("unchecked")
 @FallbackConverter
@@ -130,6 +140,14 @@ public final class CxfPayloadConverter {
 }
 // Convert a CxfPayload into something else
 if (CxfPayload.class.isAssignableFrom(value.getClass())) {
+CxfPayload payload = (CxfPayload) value;
+
+if (payload.getBodySources().size() == 1) {
+TypeConverter tc = registry.lookup(type, Source.class);
+if (tc != null) {
+return tc.convertTo(type, payload.getBodySources().get(0));
+}
+}
 TypeConverter tc = re

svn commit: r1362216 - /camel/branches/camel-2.9.x/

[dkulp]

Author: dkulp
Date: Mon Jul 16 19:14:19 2012
New Revision: 1362216

URL: http://svn.apache.org/viewvc?rev=1362216&view=rev
Log:
Recording revisions 1362211 via  git from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x


Modified:
camel/branches/camel-2.9.x/   (props changed)

Propchange: camel/branches/camel-2.9.x/
--
Binary property 'svnmerge-integrated' - no diff available.

svn commit: r1362589 - in /camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf: CxfEndpoint.java converter/CxfPayloadConverter.java

[dkulp]

Author: dkulp
Date: Tue Jul 17 18:18:10 2012
New Revision: 1362589

URL: http://svn.apache.org/viewvc?rev=1362589&view=rev
Log:
Some optimizations and fixes around getting the name from stax based
payloads

Modified:

camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java

camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java

Modified: 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=1362589&r1=1362588&r2=1362589&view=diff
==
--- 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 Tue Jul 17 18:18:10 2012
@@ -33,7 +33,9 @@ import javax.xml.transform.stream.Stream
 import javax.xml.ws.WebServiceProvider;
 import javax.xml.ws.handler.Handler;
 
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.Node;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.CamelException;
@@ -902,35 +904,37 @@ public class CxfEndpoint extends Default
 
 private String findName(List sources, int i) {
 Source source = sources.get(i);
+XMLStreamReader r = null;
 if (source instanceof DOMSource) {
-return ((Element)((DOMSource)source).getNode()).getLocalName();
+Node nd = ((DOMSource)source).getNode();
+if (nd instanceof Document) {
+nd = ((Document)nd).getDocumentElement();
+}
+return ((Element)nd).getLocalName();
 } else if (source instanceof StaxSource) {
 StaxSource s = (StaxSource)source;
-return s.getXMLStreamReader().getLocalName();
+r = s.getXMLStreamReader();
 } else if (source instanceof StAXSource) {
 StAXSource s = (StAXSource)source;
-XMLStreamReader r = s.getXMLStreamReader();
-if (r.getEventType() != XMLStreamReader.START_ELEMENT) {
-try {
-r.nextTag();
-} catch (XMLStreamException e) {
-//ignore
-}
-}
-return r.getLocalName();
+r = s.getXMLStreamReader();
 } else if (source instanceof StreamSource) {
 //flip to stax so we can get the name
-XMLStreamReader reader = 
StaxUtils.createXMLStreamReader(source);
-StaxSource src2 = new StaxSource(reader);
+r = StaxUtils.createXMLStreamReader(source);
+StaxSource src2 = new StaxSource(r);
 sources.set(i, src2);
-if (reader.getEventType() == XMLStreamReader.START_DOCUMENT) {
-try {
-reader.nextTag();
-} catch (XMLStreamException e) {
-//ignore
+}
+if (r != null) {
+try {
+if (r.getEventType() == XMLStreamReader.START_DOCUMENT) {
+r.next();
+}
+if (r.getEventType() != XMLStreamReader.START_ELEMENT) {
+r.nextTag();
 }
+} catch (XMLStreamException e) {
+//ignore
 }
-return reader.getLocalName();
+return r.getLocalName();
 }
 return null;
 }

Modified: 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java?rev=1362589&r1=1362588&r2=1362589&view=diff
==
--- 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 Tue Jul 17 18:18:10 2012
@@ -21,6 +21,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -145,7 +146,13 @@ public final class CxfPayloadConverter {
 if (payload.getBodySources().size() == 1) {
 TypeConverter tc = registry.lookup(type, Source.class);
   

svn commit: r1362591 - in /camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf: CxfEndpoint.java converter/CxfPayloadConverter.java

[dkulp]

Author: dkulp
Date: Tue Jul 17 18:19:07 2012
New Revision: 1362591

URL: http://svn.apache.org/viewvc?rev=1362591&view=rev
Log:
Merged revisions 1362589 via  git cherry-pick from
https://svn.apache.org/repos/asf/camel/trunk


  r1362589 | dkulp | 2012-07-17 14:18:10 -0400 (Tue, 17 Jul 2012) | 3 lines

  Some optimizations and fixes around getting the name from stax based
  payloads



Modified:

camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java

camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java

Modified: 
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=1362591&r1=1362590&r2=1362591&view=diff
==
--- 
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 (original)
+++ 
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 Tue Jul 17 18:19:07 2012
@@ -33,7 +33,9 @@ import javax.xml.transform.stream.Stream
 import javax.xml.ws.WebServiceProvider;
 import javax.xml.ws.handler.Handler;
 
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.Node;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.CamelException;
@@ -902,35 +904,37 @@ public class CxfEndpoint extends Default
 
 private String findName(List sources, int i) {
 Source source = sources.get(i);
+XMLStreamReader r = null;
 if (source instanceof DOMSource) {
-return ((Element)((DOMSource)source).getNode()).getLocalName();
+Node nd = ((DOMSource)source).getNode();
+if (nd instanceof Document) {
+nd = ((Document)nd).getDocumentElement();
+}
+return ((Element)nd).getLocalName();
 } else if (source instanceof StaxSource) {
 StaxSource s = (StaxSource)source;
-return s.getXMLStreamReader().getLocalName();
+r = s.getXMLStreamReader();
 } else if (source instanceof StAXSource) {
 StAXSource s = (StAXSource)source;
-XMLStreamReader r = s.getXMLStreamReader();
-if (r.getEventType() != XMLStreamReader.START_ELEMENT) {
-try {
-r.nextTag();
-} catch (XMLStreamException e) {
-//ignore
-}
-}
-return r.getLocalName();
+r = s.getXMLStreamReader();
 } else if (source instanceof StreamSource) {
 //flip to stax so we can get the name
-XMLStreamReader reader = 
StaxUtils.createXMLStreamReader(source);
-StaxSource src2 = new StaxSource(reader);
+r = StaxUtils.createXMLStreamReader(source);
+StaxSource src2 = new StaxSource(r);
 sources.set(i, src2);
-if (reader.getEventType() == XMLStreamReader.START_DOCUMENT) {
-try {
-reader.nextTag();
-} catch (XMLStreamException e) {
-//ignore
+}
+if (r != null) {
+try {
+if (r.getEventType() == XMLStreamReader.START_DOCUMENT) {
+r.next();
+}
+if (r.getEventType() != XMLStreamReader.START_ELEMENT) {
+r.nextTag();
 }
+} catch (XMLStreamException e) {
+//ignore
 }
-return reader.getLocalName();
+return r.getLocalName();
 }
 return null;
 }

Modified: 
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java?rev=1362591&r1=1362590&r2=1362591&view=diff
==
--- 
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 (original)
+++ 
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 Tue Jul 17 18:19:07 2012
@@ -21,6 +21,7 @@ import java.util.ArrayList;
 impo

svn commit: r1362592 - /camel/branches/camel-2.10.x/

[dkulp]

Author: dkulp
Date: Tue Jul 17 18:19:14 2012
New Revision: 1362592

URL: http://svn.apache.org/viewvc?rev=1362592&view=rev
Log:
Recording revisions 1362589 via  git from
https://svn.apache.org/repos/asf/camel/trunk


Modified:
camel/branches/camel-2.10.x/   (props changed)

Propchange: camel/branches/camel-2.10.x/
--
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jul 17 18:19:14 2012
@@ -1 +1 @@
-/camel/trunk:1-1358964,1359013,1359197,1359226,1359265,1359341,1359383,1360031,1360241,1360339,1360525-1360527,1360581,1360583,1360719,1361116-1361117,1361477,1361919,1361973,1362123,1362126,1362210
+/camel/trunk:1-1358964,1359013,1359197,1359226,1359265,1359341,1359383,1360031,1360241,1360339,1360525-1360527,1360581,1360583,1360719,1361116-1361117,1361477,1361919,1361973,1362123,1362126,1362210,1362589

svn commit: r1362594 - in /camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf: CxfEndpoint.java converter/CxfPayloadConverter.java

[dkulp]

Author: dkulp
Date: Tue Jul 17 18:20:35 2012
New Revision: 1362594

URL: http://svn.apache.org/viewvc?rev=1362594&view=rev
Log:
Merged revisions 1362591 via  git cherry-pick from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x


  r1362591 | dkulp | 2012-07-17 14:19:07 -0400 (Tue, 17 Jul 2012) | 11 lines

  Merged revisions 1362589 via  git cherry-pick from
  https://svn.apache.org/repos/asf/camel/trunk

  
r1362589 | dkulp | 2012-07-17 14:18:10 -0400 (Tue, 17 Jul 2012) | 3 lines

Some optimizations and fixes around getting the name from stax based
payloads

  



Modified:

camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java

camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java

Modified: 
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=1362594&r1=1362593&r2=1362594&view=diff
==
--- 
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 (original)
+++ 
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 Tue Jul 17 18:20:35 2012
@@ -33,7 +33,9 @@ import javax.xml.transform.stream.Stream
 import javax.xml.ws.WebServiceProvider;
 import javax.xml.ws.handler.Handler;
 
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.Node;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.CamelException;
@@ -886,35 +888,37 @@ public class CxfEndpoint extends Default
 
 private String findName(List sources, int i) {
 Source source = sources.get(i);
+XMLStreamReader r = null;
 if (source instanceof DOMSource) {
-return ((Element)((DOMSource)source).getNode()).getLocalName();
+Node nd = ((DOMSource)source).getNode();
+if (nd instanceof Document) {
+nd = ((Document)nd).getDocumentElement();
+}
+return ((Element)nd).getLocalName();
 } else if (source instanceof StaxSource) {
 StaxSource s = (StaxSource)source;
-return s.getXMLStreamReader().getLocalName();
+r = s.getXMLStreamReader();
 } else if (source instanceof StAXSource) {
 StAXSource s = (StAXSource)source;
-XMLStreamReader r = s.getXMLStreamReader();
-if (r.getEventType() != XMLStreamReader.START_ELEMENT) {
-try {
-r.nextTag();
-} catch (XMLStreamException e) {
-//ignore
-}
-}
-return r.getLocalName();
+r = s.getXMLStreamReader();
 } else if (source instanceof StreamSource) {
 //flip to stax so we can get the name
-XMLStreamReader reader = 
StaxUtils.createXMLStreamReader(source);
-StaxSource src2 = new StaxSource(reader);
+r = StaxUtils.createXMLStreamReader(source);
+StaxSource src2 = new StaxSource(r);
 sources.set(i, src2);
-if (reader.getEventType() == XMLStreamReader.START_DOCUMENT) {
-try {
-reader.nextTag();
-} catch (XMLStreamException e) {
-//ignore
+}
+if (r != null) {
+try {
+if (r.getEventType() == XMLStreamReader.START_DOCUMENT) {
+r.next();
+}
+if (r.getEventType() != XMLStreamReader.START_ELEMENT) {
+r.nextTag();
 }
+} catch (XMLStreamException e) {
+//ignore
 }
-return reader.getLocalName();
+return r.getLocalName();
 }
 return null;
 }

Modified: 
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java?rev=1362594&r1=1362593&r2=1362594&view=diff
==
--- 
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 (origina

svn commit: r1362595 - /camel/branches/camel-2.9.x/

[dkulp]

Author: dkulp
Date: Tue Jul 17 18:20:41 2012
New Revision: 1362595

URL: http://svn.apache.org/viewvc?rev=1362595&view=rev
Log:
Recording revisions 1362591 via  git from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x


Modified:
camel/branches/camel-2.9.x/   (props changed)

Propchange: camel/branches/camel-2.9.x/
--
Binary property 'svnmerge-integrated' - no diff available.

svn commit: r1362624 - /camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java

[dkulp]

Author: dkulp
Date: Tue Jul 17 19:49:52 2012
New Revision: 1362624

URL: http://svn.apache.org/viewvc?rev=1362624&view=rev
Log:
Optimized "to document" for cxf payload

Modified:

camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java

Modified: 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java?rev=1362624&r1=1362623&r2=1362624&view=diff
==
--- 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 Tue Jul 17 19:49:52 2012
@@ -20,6 +20,7 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.xml.stream.XMLStreamException;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 
@@ -34,6 +35,7 @@ import org.apache.camel.FallbackConverte
 import org.apache.camel.TypeConverter;
 import org.apache.camel.component.cxf.CxfPayload;
 import org.apache.camel.spi.TypeConverterRegistry;
+import org.apache.cxf.staxutils.StaxUtils;
 
 @Converter
 public final class CxfPayloadConverter {
@@ -144,6 +146,17 @@ public final class CxfPayloadConverter {
 CxfPayload payload = (CxfPayload) value;
 
 if (payload.getBodySources().size() == 1) {
+if (type.isAssignableFrom(Document.class)) {
+Source s = payload.getBodySources().get(0);
+Document d;
+try {
+d = StaxUtils.read(s);
+} catch (XMLStreamException e) {
+throw new RuntimeException(e);
+}
+payload.getBodySources().set(0, new 
DOMSource(d.getDocumentElement()));
+return type.cast(d);
+}
 TypeConverter tc = registry.lookup(type, Source.class);
 if (tc != null) {
 T t = tc.convertTo(type, payload.getBodySources().get(0));

svn commit: r1362626 - /camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java

[dkulp]

Author: dkulp
Date: Tue Jul 17 19:51:08 2012
New Revision: 1362626

URL: http://svn.apache.org/viewvc?rev=1362626&view=rev
Log:
Merged revisions 1362624 via  git cherry-pick from
https://svn.apache.org/repos/asf/camel/trunk


  r1362624 | dkulp | 2012-07-17 15:49:52 -0400 (Tue, 17 Jul 2012) | 2 lines

  Optimized "to document" for cxf payload



Modified:

camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java

Modified: 
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java?rev=1362626&r1=1362625&r2=1362626&view=diff
==
--- 
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 (original)
+++ 
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 Tue Jul 17 19:51:08 2012
@@ -20,6 +20,7 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.xml.stream.XMLStreamException;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 
@@ -34,6 +35,7 @@ import org.apache.camel.FallbackConverte
 import org.apache.camel.TypeConverter;
 import org.apache.camel.component.cxf.CxfPayload;
 import org.apache.camel.spi.TypeConverterRegistry;
+import org.apache.cxf.staxutils.StaxUtils;
 
 @Converter
 public final class CxfPayloadConverter {
@@ -144,6 +146,17 @@ public final class CxfPayloadConverter {
 CxfPayload payload = (CxfPayload) value;
 
 if (payload.getBodySources().size() == 1) {
+if (type.isAssignableFrom(Document.class)) {
+Source s = payload.getBodySources().get(0);
+Document d;
+try {
+d = StaxUtils.read(s);
+} catch (XMLStreamException e) {
+throw new RuntimeException(e);
+}
+payload.getBodySources().set(0, new 
DOMSource(d.getDocumentElement()));
+return type.cast(d);
+}
 TypeConverter tc = registry.lookup(type, Source.class);
 if (tc != null) {
 T t = tc.convertTo(type, payload.getBodySources().get(0));

svn commit: r1362627 - /camel/branches/camel-2.10.x/

[dkulp]

Author: dkulp
Date: Tue Jul 17 19:51:14 2012
New Revision: 1362627

URL: http://svn.apache.org/viewvc?rev=1362627&view=rev
Log:
Recording revisions 1362624 via  git from
https://svn.apache.org/repos/asf/camel/trunk


Modified:
camel/branches/camel-2.10.x/   (props changed)

Propchange: camel/branches/camel-2.10.x/
--
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jul 17 19:51:14 2012
@@ -1 +1 @@
-/camel/trunk:1-1358964,1359013,1359197,1359226,1359265,1359341,1359383,1360031,1360241,1360339,1360525-1360527,1360581,1360583,1360719,1361116-1361117,1361477,1361919,1361973,1362123,1362126,1362210,1362589
+/camel/trunk:1-1358964,1359013,1359197,1359226,1359265,1359341,1359383,1360031,1360241,1360339,1360525-1360527,1360581,1360583,1360719,1361116-1361117,1361477,1361919,1361973,1362123,1362126,1362210,1362589,1362624

svn commit: r1362629 - /camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java

[dkulp]

Author: dkulp
Date: Tue Jul 17 19:55:26 2012
New Revision: 1362629

URL: http://svn.apache.org/viewvc?rev=1362629&view=rev
Log:
Merged revisions 1362626 via  git cherry-pick from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x


  r1362626 | dkulp | 2012-07-17 15:51:08 -0400 (Tue, 17 Jul 2012) | 10 lines

  Merged revisions 1362624 via  git cherry-pick from
  https://svn.apache.org/repos/asf/camel/trunk

  
r1362624 | dkulp | 2012-07-17 15:49:52 -0400 (Tue, 17 Jul 2012) | 2 lines

Optimized "to document" for cxf payload

  



Modified:

camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java

Modified: 
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java?rev=1362629&r1=1362628&r2=1362629&view=diff
==
--- 
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 (original)
+++ 
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 Tue Jul 17 19:55:26 2012
@@ -20,6 +20,7 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.xml.stream.XMLStreamException;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 
@@ -34,6 +35,7 @@ import org.apache.camel.FallbackConverte
 import org.apache.camel.TypeConverter;
 import org.apache.camel.component.cxf.CxfPayload;
 import org.apache.camel.spi.TypeConverterRegistry;
+import org.apache.cxf.staxutils.StaxUtils;
 
 @Converter
 public final class CxfPayloadConverter {
@@ -144,6 +146,17 @@ public final class CxfPayloadConverter {
 CxfPayload payload = (CxfPayload) value;
 
 if (payload.getBodySources().size() == 1) {
+if (type.isAssignableFrom(Document.class)) {
+Source s = payload.getBodySources().get(0);
+Document d;
+try {
+d = StaxUtils.read(s);
+} catch (XMLStreamException e) {
+throw new RuntimeException(e);
+}
+payload.getBodySources().set(0, new 
DOMSource(d.getDocumentElement()));
+return type.cast(d);
+}
 TypeConverter tc = registry.lookup(type, Source.class);
 if (tc != null) {
 T t = tc.convertTo(type, payload.getBodySources().get(0));

svn commit: r1362630 - /camel/branches/camel-2.9.x/

[dkulp]

Author: dkulp
Date: Tue Jul 17 19:55:33 2012
New Revision: 1362630

URL: http://svn.apache.org/viewvc?rev=1362630&view=rev
Log:
Recording revisions 1362626 via  git from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x


Modified:
camel/branches/camel-2.9.x/   (props changed)

Propchange: camel/branches/camel-2.9.x/
--
Binary property 'svnmerge-integrated' - no diff available.

svn commit: r1363630 - /camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java

[dkulp]

Author: dkulp
Date: Fri Jul 20 03:17:59 2012
New Revision: 1363630

URL: http://svn.apache.org/viewvc?rev=1363630&view=rev
Log:
If body is an inputstream, leave it that way and use a streamsource that
the xslt engine can handle in a way it's most comfortable with

Modified:

camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java?rev=1363630&r1=1363629&r2=1363630&view=diff
==
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
 Fri Jul 20 03:17:59 2012
@@ -417,7 +417,9 @@ public class XsltBuilder implements Proc
 return false;
 }
 
-if (body instanceof Source) {
+if (body instanceof InputStream) {
+return true;
+} else if (body instanceof Source) {
 return false;
 } else if (body instanceof String) {
 return false;
@@ -450,6 +452,9 @@ public class XsltBuilder implements Proc
 return (Source) body;
 }
 Source source = null;
+if (body instanceof InputStream) {
+return new StreamSource((InputStream)body);
+}
 if (body != null) {
 TypeConverter tc = 
exchange.getContext().getTypeConverterRegistry().lookup(Source.class, 
body.getClass());
 if (tc != null) {

svn commit: r1363631 - /camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java

[dkulp]

Author: dkulp
Date: Fri Jul 20 03:18:36 2012
New Revision: 1363631

URL: http://svn.apache.org/viewvc?rev=1363631&view=rev
Log:
Merged revisions 1363630 via  git cherry-pick from
https://svn.apache.org/repos/asf/camel/trunk


  r1363630 | dkulp | 2012-07-19 23:17:59 -0400 (Thu, 19 Jul 2012) | 3 lines

  If body is an inputstream, leave it that way and use a streamsource that
  the xslt engine can handle in a way it's most comfortable with



Modified:

camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java

Modified: 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java?rev=1363631&r1=1363630&r2=1363631&view=diff
==
--- 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
 (original)
+++ 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
 Fri Jul 20 03:18:36 2012
@@ -417,7 +417,9 @@ public class XsltBuilder implements Proc
 return false;
 }
 
-if (body instanceof Source) {
+if (body instanceof InputStream) {
+return true;
+} else if (body instanceof Source) {
 return false;
 } else if (body instanceof String) {
 return false;
@@ -450,6 +452,9 @@ public class XsltBuilder implements Proc
 return (Source) body;
 }
 Source source = null;
+if (body instanceof InputStream) {
+return new StreamSource((InputStream)body);
+}
 if (body != null) {
 TypeConverter tc = 
exchange.getContext().getTypeConverterRegistry().lookup(Source.class, 
body.getClass());
 if (tc != null) {

svn commit: r1363632 - /camel/branches/camel-2.10.x/

[dkulp]

Author: dkulp
Date: Fri Jul 20 03:18:41 2012
New Revision: 1363632

URL: http://svn.apache.org/viewvc?rev=1363632&view=rev
Log:
Recording revisions 1363630 via  git from
https://svn.apache.org/repos/asf/camel/trunk


Modified:
camel/branches/camel-2.10.x/   (props changed)

Propchange: camel/branches/camel-2.10.x/
--
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jul 20 03:18:41 2012
@@ -1 +1 @@
-/camel/trunk:1-1358964,1359013,1359197,1359226,1359265,1359341,1359383,1360031,1360241,1360339,1360525-1360527,1360581,1360583,1360719,1361116-1361117,1361477,1361919,1361973,1362123,1362126,1362210,1362589,1362624
+/camel/trunk:1-1358964,1359013,1359197,1359226,1359265,1359341,1359383,1360031,1360241,1360339,1360525-1360527,1360581,1360583,1360719,1361116-1361117,1361477,1361919,1361973,1362123,1362126,1362210,1362589,1362624,1363630

svn commit: r1363633 - /camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java

[dkulp]

Author: dkulp
Date: Fri Jul 20 03:19:41 2012
New Revision: 1363633

URL: http://svn.apache.org/viewvc?rev=1363633&view=rev
Log:
Merged revisions 1363631 via  git cherry-pick from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x


  r1363631 | dkulp | 2012-07-19 23:18:36 -0400 (Thu, 19 Jul 2012) | 11 lines

  Merged revisions 1363630 via  git cherry-pick from
  https://svn.apache.org/repos/asf/camel/trunk

  
r1363630 | dkulp | 2012-07-19 23:17:59 -0400 (Thu, 19 Jul 2012) | 3 lines

If body is an inputstream, leave it that way and use a streamsource that
the xslt engine can handle in a way it's most comfortable with

  



Modified:

camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java

Modified: 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java?rev=1363633&r1=1363632&r2=1363633&view=diff
==
--- 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
 (original)
+++ 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
 Fri Jul 20 03:19:41 2012
@@ -417,7 +417,9 @@ public class XsltBuilder implements Proc
 return false;
 }
 
-if (body instanceof Source) {
+if (body instanceof InputStream) {
+return true;
+} else if (body instanceof Source) {
 return false;
 } else if (body instanceof String) {
 return false;
@@ -450,6 +452,9 @@ public class XsltBuilder implements Proc
 return (Source) body;
 }
 Source source = null;
+if (body instanceof InputStream) {
+return new StreamSource((InputStream)body);
+}
 if (body != null) {
 TypeConverter tc = 
exchange.getContext().getTypeConverterRegistry().lookup(Source.class, 
body.getClass());
 if (tc != null) {

svn commit: r1363634 - /camel/branches/camel-2.9.x/

[dkulp]

Author: dkulp
Date: Fri Jul 20 03:19:47 2012
New Revision: 1363634

URL: http://svn.apache.org/viewvc?rev=1363634&view=rev
Log:
Recording revisions 1363631 via  git from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x


Modified:
camel/branches/camel-2.9.x/   (props changed)

Propchange: camel/branches/camel-2.9.x/
--
Binary property 'svnmerge-integrated' - no diff available.

svn commit: r1371860 - /camel/trunk/parent/pom.xml

[dkulp]

Author: dkulp
Date: Sat Aug 11 02:50:23 2012
New Revision: 1371860

URL: http://svn.apache.org/viewvc?rev=1371860&view=rev
Log:
Update slf4j-api version to the newer version that will print which impl it is 
binding to if multiple versions are found

Modified:
camel/trunk/parent/pom.xml

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1371860&r1=1371859&r2=1371860&view=diff
==
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sat Aug 11 02:50:23 2012
@@ -167,7 +167,7 @@
 3.0.2
 1.9.0
 1.2.0
-1.6.1
+1.6.6
 1.6.6
 3.2.1
 1.0.4.1_1

svn commit: r1371861 - in /camel/trunk/components/camel-cxf/src: main/java/org/apache/camel/component/cxf/CxfEndpoint.java test/java/org/apache/camel/wsdl_first/PersonImpl12.java

[dkulp]

Author: dkulp
Date: Sat Aug 11 02:50:32 2012
New Revision: 1371861

URL: http://svn.apache.org/viewvc?rev=1371861&view=rev
Log:
Pass some properties that will be required for next CXF version.

Modified:

camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java

camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java

Modified: 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=1371861&r1=1371860&r2=1371861&view=diff
==
--- 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 Sat Aug 11 02:50:32 2012
@@ -19,6 +19,7 @@ package org.apache.camel.component.cxf;
 import java.lang.reflect.Proxy;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -304,6 +305,12 @@ public class CxfEndpoint extends Default
 }
 LOG.debug("ServerFactoryBean: {} added properties: {}", sfb, 
getProperties());
 }
+if (this.isSkipPayloadMessagePartCheck()) {
+if (sfb.getProperties() == null) {
+sfb.setProperties(new HashMap());  
  
+}
+sfb.getProperties().put("soap.force.doclit.bare", Boolean.TRUE);
+}
 
 sfb.setBus(getBus());
 sfb.setStart(false);
@@ -462,6 +469,13 @@ public class CxfEndpoint extends Default
 }
 LOG.debug("ClientFactoryBean: {} added properties: {}", 
factoryBean, getProperties());
 }
+
+if (this.isSkipPayloadMessagePartCheck()) {
+if (factoryBean.getProperties() == null) {
+factoryBean.setProperties(new HashMap());  
  
+}
+factoryBean.getProperties().put("soap.force.doclit.bare", 
Boolean.TRUE);
+}
 
 factoryBean.setBus(getBus());
 }

Modified: 
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java?rev=1371861&r1=1371860&r2=1371861&view=diff
==
--- 
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java
 Sat Aug 11 02:50:32 2012
@@ -20,7 +20,8 @@ import javax.jws.WebService;
 
 @WebService(serviceName = "PersonService12",
 targetNamespace = "http://camel.apache.org/wsdl-first";,
-endpointInterface = "org.apache.camel.wsdl_first.Person")
+endpointInterface = "org.apache.camel.wsdl_first.Person",
+wsdlLocation = "classpath:/person.wsdl")
 
 @javax.xml.ws.BindingType(value = 
"http://www.w3.org/2003/05/soap/bindings/HTTP/";)  
 public class PersonImpl12 extends PersonImpl {

svn commit: r1372113 - /camel/trunk/parent/pom.xml

[dkulp]

Author: dkulp
Date: Sun Aug 12 14:29:16 2012
New Revision: 1372113

URL: http://svn.apache.org/viewvc?rev=1372113&view=rev
Log:
Update to latest woodstox that fixes a performance regression

Modified:
camel/trunk/parent/pom.xml

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1372113&r1=1372112&r2=1372113&view=diff
==
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sun Aug 12 14:29:16 2012
@@ -189,7 +189,7 @@
 6.0.1
 2.2.5
 1.7
-4.1.3
+4.1.4
 3.5
 1.2
 1.4.2

svn commit: r1372460 - /camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpMethodRestrictTest.java

[dkulp]

Author: dkulp
Date: Mon Aug 13 15:17:04 2012
New Revision: 1372460

URL: http://svn.apache.org/viewvc?rev=1372460&view=rev
Log:
Remove some unused imports

Modified:

camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpMethodRestrictTest.java

Modified: 
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpMethodRestrictTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpMethodRestrictTest.java?rev=1372460&r1=1372459&r2=1372460&view=diff
==
--- 
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpMethodRestrictTest.java
 (original)
+++ 
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpMethodRestrictTest.java
 Mon Aug 13 15:17:04 2012
@@ -16,23 +16,19 @@
  */
 package org.apache.camel.component.jetty;
 
+
+
+
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.JndiRegistry;
 import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpMethodBase;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.methods.StringRequestEntity;
 import org.junit.Test;
 
-import javax.servlet.*;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 
 public class HttpMethodRestrictTest extends BaseJettyTest {
 

svn commit: r1372461 - /camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java

[dkulp]

Author: dkulp
Date: Mon Aug 13 15:17:08 2012
New Revision: 1372461

URL: http://svn.apache.org/viewvc?rev=1372461&view=rev
Log:
Changing from forcing doc/lit to just not validating the parts.

Modified:

camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java

Modified: 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=1372461&r1=1372460&r2=1372461&view=diff
==
--- 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 Mon Aug 13 15:17:08 2012
@@ -309,7 +309,7 @@ public class CxfEndpoint extends Default
 if (sfb.getProperties() == null) {
 sfb.setProperties(new HashMap());  
  
 }
-sfb.getProperties().put("soap.force.doclit.bare", Boolean.TRUE);
+sfb.getProperties().put("soap.no.validate.parts", Boolean.TRUE);
 }
 
 sfb.setBus(getBus());
@@ -474,7 +474,7 @@ public class CxfEndpoint extends Default
 if (factoryBean.getProperties() == null) {
 factoryBean.setProperties(new HashMap());  
  
 }
-factoryBean.getProperties().put("soap.force.doclit.bare", 
Boolean.TRUE);
+factoryBean.getProperties().put("soap.no.validate.parts", 
Boolean.TRUE);
 }
 
 factoryBean.setBus(getBus());

svn commit: r1373470 - /camel/branches/camel-2.9.x/

[dkulp]

Author: dkulp
Date: Wed Aug 15 15:31:00 2012
New Revision: 1373470

URL: http://svn.apache.org/viewvc?rev=1373470&view=rev
Log:
Recording revisions 1362139,1362212,1362592,1362627,1363528,1363632,1369475 via 
 git from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x


Modified:
camel/branches/camel-2.9.x/   (props changed)

Propchange: camel/branches/camel-2.9.x/
--
Binary property 'svnmerge-integrated' - no diff available.

svn commit: r1373471 - /camel/branches/camel-2.9.x/

[dkulp]

Author: dkulp
Date: Wed Aug 15 15:31:01 2012
New Revision: 1373471

URL: http://svn.apache.org/viewvc?rev=1373471&view=rev
Log:
Blocking revisions 1360247,1360528,1360529,1361479,1365872,1366161,1372256 via  
git from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
















Modified:
camel/branches/camel-2.9.x/   (props changed)

Propchange: camel/branches/camel-2.9.x/
--
Binary property 'svnmerge-blocked' - no diff available.

svn commit: r1373490 - /camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/TypeConverter.java

[dkulp]

Author: dkulp
Date: Wed Aug 15 16:08:38 2012
New Revision: 1373490

URL: http://svn.apache.org/viewvc?rev=1373490&view=rev
Log:
Merged revisions 1366124 via  git cherry-pick from
https://svn.apache.org/repos/asf/camel/trunk


  r1366124 | bvahdat | 2012-07-26 14:19:37 -0400 (Thu, 26 Jul 2012) | 2 lines

  Corrected tiny javadoc typo.



Modified:

camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/TypeConverter.java

Modified: 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/TypeConverter.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/TypeConverter.java?rev=1373490&r1=1373489&r2=1373490&view=diff
==
--- 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/TypeConverter.java
 (original)
+++ 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/TypeConverter.java
 Wed Aug 15 16:08:38 2012
@@ -78,7 +78,7 @@ public interface TypeConverter {
  T mandatoryConvertTo(Class type, Exchange exchange, Object value) 
throws TypeConversionException, NoTypeConversionAvailableException;
 
 /**
- * Tries to converts the value to the specified type,
+ * Tries to convert the value to the specified type,
  * returning null if not possible to convert.
  * 
  * This method will not throw an exception if an exception occurred 
during conversion.
@@ -90,7 +90,7 @@ public interface TypeConverter {
  T tryConvertTo(Class type, Object value);
 
 /**
- * Tries to converts the value to the specified type in the context of an 
exchange,
+ * Tries to convert the value to the specified type in the context of an 
exchange,
  * returning null if not possible to convert.
  * 
  * This method will not throw an exception if an exception occurred 
during conversion.

svn commit: r1373491 - /camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java

[dkulp]

Author: dkulp
Date: Wed Aug 15 16:08:41 2012
New Revision: 1373491

URL: http://svn.apache.org/viewvc?rev=1373491&view=rev
Log:
Merged revisions 1367324 via  git cherry-pick from
https://svn.apache.org/repos/asf/camel/trunk


  r1367324 | bvahdat | 2012-07-30 17:39:31 -0400 (Mon, 30 Jul 2012) | 2 lines

  Added one missing space to the javadoc.



Modified:

camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java

Modified: 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java?rev=1373491&r1=1373490&r2=1373491&view=diff
==
--- 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java
 (original)
+++ 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java
 Wed Aug 15 16:08:41 2012
@@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory;
  * A helper class for Camel based injector or post processing hooks which can 
be reused by
  * both the http://camel.apache.org/spring.html";>Spring,
  * http://camel.apache.org/guice.html";>Guice and
- * http://camel.apache.org/blueprint.html";>Blueprintsupport.
+ * http://camel.apache.org/blueprint.html";>Blueprint support.
  *
  * @version 
  */

svn commit: r1373492 - /camel/branches/camel-2.10.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/DefaultJmsHeaderKeyFormatStrategyTest.java

[dkulp]

Author: dkulp
Date: Wed Aug 15 16:08:45 2012
New Revision: 1373492

URL: http://svn.apache.org/viewvc?rev=1373492&view=rev
Log:
Merged revisions 1368137 via  git cherry-pick from
https://svn.apache.org/repos/asf/camel/trunk


  r1368137 | bvahdat | 2012-08-01 13:43:32 -0400 (Wed, 01 Aug 2012) | 2 lines

  Corrected a tiny typo.



Modified:

camel/branches/camel-2.10.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/DefaultJmsHeaderKeyFormatStrategyTest.java

Modified: 
camel/branches/camel-2.10.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/DefaultJmsHeaderKeyFormatStrategyTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/DefaultJmsHeaderKeyFormatStrategyTest.java?rev=1373492&r1=1373491&r2=1373492&view=diff
==
--- 
camel/branches/camel-2.10.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/DefaultJmsHeaderKeyFormatStrategyTest.java
 (original)
+++ 
camel/branches/camel-2.10.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/DefaultJmsHeaderKeyFormatStrategyTest.java
 Wed Aug 15 16:08:45 2012
@@ -37,7 +37,7 @@ public class DefaultJmsHeaderKeyFormatSt
 }
 
 @Test
-public void testDeccodeValidKeys() {
+public void testDecodeValidKeys() {
 assertEquals("foo", strategy.decodeKey("foo"));
 assertEquals("foo123bar", strategy.decodeKey("foo123bar"));
 assertEquals("CamelFileName", strategy.decodeKey("CamelFileName"));

svn commit: r1373493 - /camel/branches/camel-2.10.x/examples/camel-example-loan-broker/README.txt

[dkulp]

Author: dkulp
Date: Wed Aug 15 16:08:47 2012
New Revision: 1373493

URL: http://svn.apache.org/viewvc?rev=1373493&view=rev
Log:
Merged revisions 1368785 via  git cherry-pick from
https://svn.apache.org/repos/asf/camel/trunk


  r1368785 | bvahdat | 2012-08-02 23:27:33 -0400 (Thu, 02 Aug 2012) | 2 lines

  Updated the domain name of EIP site which has been changed.



Modified:
camel/branches/camel-2.10.x/examples/camel-example-loan-broker/README.txt

Modified: 
camel/branches/camel-2.10.x/examples/camel-example-loan-broker/README.txt
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/examples/camel-example-loan-broker/README.txt?rev=1373493&r1=1373492&r2=1373493&view=diff
==
--- camel/branches/camel-2.10.x/examples/camel-example-loan-broker/README.txt 
(original)
+++ camel/branches/camel-2.10.x/examples/camel-example-loan-broker/README.txt 
Wed Aug 15 16:08:47 2012
@@ -2,7 +2,7 @@ Loan Broker Example
 
 
 This example shows how to use Camel to implement the EIP's loan broker example,
-from the EIP book (http://www.enterpriseintegrationpatterns.com/index.html).
+from the EIP book (http://www.eaipatterns.com/SystemManagementExample.html).
 
 The example has two versions (JMS queues, and web services),
 that uses a different transport for exchanging messages between

svn commit: r1373494 - /camel/branches/camel-2.10.x/examples/camel-example-loan-broker/README.txt

[dkulp]

Author: dkulp
Date: Wed Aug 15 16:08:50 2012
New Revision: 1373494

URL: http://svn.apache.org/viewvc?rev=1373494&view=rev
Log:
Merged revisions 1369182 via  git cherry-pick from
https://svn.apache.org/repos/asf/camel/trunk


  r1369182 | bvahdat | 2012-08-03 15:45:37 -0400 (Fri, 03 Aug 2012) | 2 lines

  'www.eaipatterns.com' is just an alias for 
'www.enterpriseintegrationpatterns.com'.



Modified:
camel/branches/camel-2.10.x/examples/camel-example-loan-broker/README.txt

Modified: 
camel/branches/camel-2.10.x/examples/camel-example-loan-broker/README.txt
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/examples/camel-example-loan-broker/README.txt?rev=1373494&r1=1373493&r2=1373494&view=diff
==
--- camel/branches/camel-2.10.x/examples/camel-example-loan-broker/README.txt 
(original)
+++ camel/branches/camel-2.10.x/examples/camel-example-loan-broker/README.txt 
Wed Aug 15 16:08:50 2012
@@ -2,7 +2,7 @@ Loan Broker Example
 
 
 This example shows how to use Camel to implement the EIP's loan broker example,
-from the EIP book (http://www.eaipatterns.com/SystemManagementExample.html).
+from the EIP book 
(http://www.enterpriseintegrationpatterns.com/SystemManagementExample.html).
 
 The example has two versions (JMS queues, and web services),
 that uses a different transport for exchanging messages between

svn commit: r1373496 - in /camel/branches/camel-2.10.x/components/camel-cxf/src: main/java/org/apache/camel/component/cxf/CxfEndpoint.java test/java/org/apache/camel/wsdl_first/PersonImpl12.java

[dkulp]

Author: dkulp
Date: Wed Aug 15 16:08:57 2012
New Revision: 1373496

URL: http://svn.apache.org/viewvc?rev=1373496&view=rev
Log:
Merged revisions 1371861 via  git cherry-pick from
https://svn.apache.org/repos/asf/camel/trunk


  r1371861 | dkulp | 2012-08-10 22:50:32 -0400 (Fri, 10 Aug 2012) | 2 lines

  Pass some properties that will be required for next CXF version.



Modified:

camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java

camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java

Modified: 
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=1373496&r1=1373495&r2=1373496&view=diff
==
--- 
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 (original)
+++ 
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 Wed Aug 15 16:08:57 2012
@@ -19,6 +19,7 @@ package org.apache.camel.component.cxf;
 import java.lang.reflect.Proxy;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -304,6 +305,12 @@ public class CxfEndpoint extends Default
 }
 LOG.debug("ServerFactoryBean: {} added properties: {}", sfb, 
getProperties());
 }
+if (this.isSkipPayloadMessagePartCheck()) {
+if (sfb.getProperties() == null) {
+sfb.setProperties(new HashMap());  
  
+}
+sfb.getProperties().put("soap.force.doclit.bare", Boolean.TRUE);
+}
 
 sfb.setBus(getBus());
 sfb.setStart(false);
@@ -462,6 +469,13 @@ public class CxfEndpoint extends Default
 }
 LOG.debug("ClientFactoryBean: {} added properties: {}", 
factoryBean, getProperties());
 }
+
+if (this.isSkipPayloadMessagePartCheck()) {
+if (factoryBean.getProperties() == null) {
+factoryBean.setProperties(new HashMap());  
  
+}
+factoryBean.getProperties().put("soap.force.doclit.bare", 
Boolean.TRUE);
+}
 
 factoryBean.setBus(getBus());
 }

Modified: 
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java?rev=1373496&r1=1373495&r2=1373496&view=diff
==
--- 
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java
 (original)
+++ 
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java
 Wed Aug 15 16:08:57 2012
@@ -20,7 +20,8 @@ import javax.jws.WebService;
 
 @WebService(serviceName = "PersonService12",
 targetNamespace = "http://camel.apache.org/wsdl-first";,
-endpointInterface = "org.apache.camel.wsdl_first.Person")
+endpointInterface = "org.apache.camel.wsdl_first.Person",
+wsdlLocation = "classpath:/person.wsdl")
 
 @javax.xml.ws.BindingType(value = 
"http://www.w3.org/2003/05/soap/bindings/HTTP/";)  
 public class PersonImpl12 extends PersonImpl {

svn commit: r1373495 - /camel/branches/camel-2.10.x/parent/pom.xml

[dkulp]

Author: dkulp
Date: Wed Aug 15 16:08:53 2012
New Revision: 1373495

URL: http://svn.apache.org/viewvc?rev=1373495&view=rev
Log:
Merged revisions 1371860 via  git cherry-pick from
https://svn.apache.org/repos/asf/camel/trunk


  r1371860 | dkulp | 2012-08-10 22:50:23 -0400 (Fri, 10 Aug 2012) | 2 lines

  Update slf4j-api version to the newer version that will print which impl it 
is binding to if multiple versions are found



Modified:
camel/branches/camel-2.10.x/parent/pom.xml

Modified: camel/branches/camel-2.10.x/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/parent/pom.xml?rev=1373495&r1=1373494&r2=1373495&view=diff
==
--- camel/branches/camel-2.10.x/parent/pom.xml (original)
+++ camel/branches/camel-2.10.x/parent/pom.xml Wed Aug 15 16:08:53 2012
@@ -165,7 +165,7 @@
 3.0.2
 1.9.0
 1.2.0
-1.6.1
+1.6.6
 1.6.6
 3.2.1
 1.0.4.1_1

svn commit: r1373497 - /camel/branches/camel-2.10.x/parent/pom.xml

[dkulp]

Author: dkulp
Date: Wed Aug 15 16:08:59 2012
New Revision: 1373497

URL: http://svn.apache.org/viewvc?rev=1373497&view=rev
Log:
Merged revisions 1372113 via  git cherry-pick from
https://svn.apache.org/repos/asf/camel/trunk


  r1372113 | dkulp | 2012-08-12 10:29:16 -0400 (Sun, 12 Aug 2012) | 2 lines

  Update to latest woodstox that fixes a performance regression



Modified:
camel/branches/camel-2.10.x/parent/pom.xml

Modified: camel/branches/camel-2.10.x/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/parent/pom.xml?rev=1373497&r1=1373496&r2=1373497&view=diff
==
--- camel/branches/camel-2.10.x/parent/pom.xml (original)
+++ camel/branches/camel-2.10.x/parent/pom.xml Wed Aug 15 16:08:59 2012
@@ -187,7 +187,7 @@
 6.0.1
 2.2.5
 1.7
-4.1.3
+4.1.4
 3.5
 1.2
 1.4.2

svn commit: r1373498 - /camel/branches/camel-2.10.x/parent/pom.xml

[dkulp]

Author: dkulp
Date: Wed Aug 15 16:09:02 2012
New Revision: 1373498

URL: http://svn.apache.org/viewvc?rev=1373498&view=rev
Log:
Merged revisions 1372320 via  git cherry-pick from
https://svn.apache.org/repos/asf/camel/trunk


  r1372320 | davsclaus | 2012-08-13 04:48:48 -0400 (Mon, 13 Aug 2012) | 2 lines

  Upgraded to Jettison 1.3.2



Modified:
camel/branches/camel-2.10.x/parent/pom.xml

Modified: camel/branches/camel-2.10.x/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/parent/pom.xml?rev=1373498&r1=1373497&r2=1373498&view=diff
==
--- camel/branches/camel-2.10.x/parent/pom.xml (original)
+++ camel/branches/camel-2.10.x/parent/pom.xml Wed Aug 15 16:09:02 2012
@@ -116,7 +116,7 @@
 1.4.0
 1.1.3
 7.5.4.v20111024
-1.3.1
+1.3.2
 2.4.2
 1.2.4.5
 1.6.7

svn commit: r1373499 - /camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java

[dkulp]

Author: dkulp
Date: Wed Aug 15 16:09:06 2012
New Revision: 1373499

URL: http://svn.apache.org/viewvc?rev=1373499&view=rev
Log:
Merged revisions 1372461 via  git cherry-pick from
https://svn.apache.org/repos/asf/camel/trunk


  r1372461 | dkulp | 2012-08-13 11:17:08 -0400 (Mon, 13 Aug 2012) | 2 lines

  Changing from forcing doc/lit to just not validating the parts.



Modified:

camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java

Modified: 
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=1373499&r1=1373498&r2=1373499&view=diff
==
--- 
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 (original)
+++ 
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 Wed Aug 15 16:09:06 2012
@@ -309,7 +309,7 @@ public class CxfEndpoint extends Default
 if (sfb.getProperties() == null) {
 sfb.setProperties(new HashMap());  
  
 }
-sfb.getProperties().put("soap.force.doclit.bare", Boolean.TRUE);
+sfb.getProperties().put("soap.no.validate.parts", Boolean.TRUE);
 }
 
 sfb.setBus(getBus());
@@ -474,7 +474,7 @@ public class CxfEndpoint extends Default
 if (factoryBean.getProperties() == null) {
 factoryBean.setProperties(new HashMap());  
  
 }
-factoryBean.getProperties().put("soap.force.doclit.bare", 
Boolean.TRUE);
+factoryBean.getProperties().put("soap.no.validate.parts", 
Boolean.TRUE);
 }
 
 factoryBean.setBus(getBus());