svn commit: r590797 - in /incubator/cxf/branches/2.0.x-fixes: ./ rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java

[dkulp]

Author: dkulp
Date: Wed Oct 31 12:37:35 2007
New Revision: 590797

URL: http://svn.apache.org/viewvc?rev=590797&view=rev
Log:
Merged revisions 590729 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r590729 | bimargulies | 2007-10-31 12:01:10 -0400 (Wed, 31 Oct 2007) | 2 lines
  
  Fix build mistake.
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    
incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java

Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java?rev=590797&r1=590796&r2=590797&view=diff
==============================================================================
--- 
incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
 (original)
+++ 
incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
 Wed Oct 31 12:37:35 2007
@@ -47,7 +47,7 @@
 
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.jaxb_form.ObjectWithQualifiedElement;
+import org.apache.cxf.jaxb_form.ObjectWithQualifiedElementElement;
 import org.apache.cxf.jaxb_misc.Base64WithDefaultValueType;
 import org.apache.cxf.jaxb_misc.ObjectFactory;
 import org.apache.cxf.service.model.MessagePartInfo;
@@ -90,7 +90,7 @@
             GreetMe.class,
             GreetMeResponse.class,
             StringStruct.class,
-            ObjectWithQualifiedElement.class
+            ObjectWithQualifiedElementElement.class
         });
         Method method = TestUtil.getMethod(Greeter.class, "greetMe");
         wrapperAnnotation = method.getAnnotation(RequestWrapper.class);
@@ -158,7 +158,7 @@
     
     @Test
     public void testMarshallWithFormQualifiedElement() throws Exception {
-        ObjectWithQualifiedElement testObject = new 
ObjectWithQualifiedElement();
+        ObjectWithQualifiedElementElement testObject = new 
ObjectWithQualifiedElementElement();
         testObject.setString1("twine");
         testObject.setString2("cord");