svn commit: r1051363 - in /cxf/branches/2.3.x-fixes: ./ rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/ systests/databinding/src/test/java/org/apache/cxf/systest/aegis/ systests/databinding/src/test/resources/

[ffang]

Author: ffang
Date: Tue Dec 21 02:39:45 2010
New Revision: 1051363

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

........
  r1051094 | ffang | 2010-12-20 21:27:03 +0800 (一, 20 12 2010) | 1 line
  
  [CXF-2810]wrong namespace in generated wsdl which conflict with aegis type 
annation namespace in SEI
........

Added:
    
cxf/branches/2.3.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsWsdlNs.java
      - copied unchanged from r1051094, 
cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsWsdlNs.java
    
cxf/branches/2.3.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsWsdlNsImpl.java
      - copied unchanged from r1051094, 
cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsWsdlNsImpl.java
    
cxf/branches/2.3.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisWSDLNSTest.java
      - copied unchanged from r1051094, 
cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisWSDLNSTest.java
    
cxf/branches/2.3.x-fixes/systests/databinding/src/test/resources/aegisWSDLNSBeans.xml
      - copied unchanged from r1051094, 
cxf/trunk/systests/databinding/src/test/resources/aegisWSDLNSBeans.xml
Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    
cxf/branches/2.3.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java

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

Modified: 
cxf/branches/2.3.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java?rev=1051363&r1=1051362&r2=1051363&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java
 Tue Dec 21 02:39:45 2010
@@ -250,7 +250,11 @@ public class Java5TypeCreator extends Ab
         if (name == null || name.length() == 0) {
             name = ServiceUtils.makeServiceNameFromClassName(typeClass);
         }
-
+        
+        //check from aegis type annotation
+        if (ns == null || ns.length() == 0) {
+            ns = annotationReader.getNamespace(typeClass);
+        }
         // check jaxb package annotation
         if (ns == null || ns.length() == 0) {
             ns = annotationReader.getNamespace(typeClass.getPackage());