svn commit: r719866 - in /activemq/camel/branches/camel-1.x: ./ components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/ components/camel-jaxb/src/test/java/org/apache/camel/foo/ components/camel-jaxb/src/test/java/org/apache/camel/foo/bar/...

[ningjiang]

Author: ningjiang
Date: Sat Nov 22 07:41:26 2008
New Revision: 719866

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

........
  r719864 | ningjiang | 2008-11-22 23:34:17 +0800 (Sat, 22 Nov 2008) | 1 line
  
  CAMEL-1074 return the JAXBElement value by default
........

Added:
    
activemq/camel/branches/camel-1.x/components/camel-jaxb/src/test/java/org/apache/camel/foo/
      - copied from r719864, 
activemq/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/foo/
    
activemq/camel/branches/camel-1.x/components/camel-jaxb/src/test/java/org/apache/camel/foo/bar/
      - copied from r719864, 
activemq/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/foo/bar/
    
activemq/camel/branches/camel-1.x/components/camel-jaxb/src/test/java/org/apache/camel/foo/bar/ObjectFactory.java
      - copied unchanged from r719864, 
activemq/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/foo/bar/ObjectFactory.java
    
activemq/camel/branches/camel-1.x/components/camel-jaxb/src/test/java/org/apache/camel/foo/bar/PersonType.java
      - copied unchanged from r719864, 
activemq/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/foo/bar/PersonType.java
    
activemq/camel/branches/camel-1.x/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbTest.java
      - copied unchanged from r719864, 
activemq/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbTest.java
Modified:
    activemq/camel/branches/camel-1.x/   (props changed)
    
activemq/camel/branches/camel-1.x/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
    
activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java
   (props changed)

Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 22 07:41:26 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719864

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

Modified: 
activemq/camel/branches/camel-1.x/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java?rev=719866&r1=719865&r2=719866&view=diff
==============================================================================
--- 
activemq/camel/branches/camel-1.x/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
 (original)
+++ 
activemq/camel/branches/camel-1.x/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
 Sat Nov 22 07:41:26 2008
@@ -21,6 +21,7 @@
 import java.io.OutputStream;
 
 import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
@@ -39,6 +40,7 @@
     private JAXBContext context;
     private String contextPath;
     private boolean prettyPrint = true;
+    private boolean ignoreJAXBElement = true;
     private Marshaller marshaller;
     private Unmarshaller unmarshaller;
 
@@ -63,14 +65,26 @@
 
     public Object unmarshal(Exchange exchange, InputStream stream) throws 
IOException, ClassNotFoundException {
         try {
-            return getUnmarshaller().unmarshal(stream);
+            Object answer = getUnmarshaller().unmarshal(stream);
+            if (answer instanceof JAXBElement && isIgnoreJAXBElement()) {
+                answer = ((JAXBElement)answer).getValue();
+            }
+            return answer;
         } catch (JAXBException e) {
             throw IOHelper.createIOException(e);
         }
-    }
+    }    
 
     // Properties
     // 
-------------------------------------------------------------------------
+    public boolean isIgnoreJAXBElement() {        
+        return ignoreJAXBElement;
+    }
+    
+    public void setIgnoreJAXBElement(boolean flag) {
+        ignoreJAXBElement = flag;
+    }
+    
     public JAXBContext getContext() throws JAXBException {
         if (context == null) {
             context = createContext();

Propchange: 
activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 22 07:41:26 2008
@@ -1 +1 @@
-/activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java:719848
+/activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java:719848,719864