cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r714134 - in /cxf/branches/2.0.x-fixes: ./ tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/ tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/
Date Fri, 14 Nov 2008 20:55:59 GMT
Author: dkulp
Date: Fri Nov 14 12:55:56 2008
New Revision: 714134

URL: http://svn.apache.org/viewvc?rev=714134&view=rev
Log:
Merged revisions 710184 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes

................
  r710184 | dkulp | 2008-11-03 17:01:27 -0500 (Mon, 03 Nov 2008) | 9 lines
  
  Merged revisions 710150 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r710150 | dkulp | 2008-11-03 15:25:34 -0500 (Mon, 03 Nov 2008) | 2 lines
    
    Add some checks to handle anonymous types when dealing with wrappers.  Also make sure
the code is compilable
  ........
................

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm
    cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 14 12:55:56 2008
@@ -1,3 +1,3 @@
-/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,712896
-/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,712893
+/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,712896
+/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712893
 /incubator/cxf/trunk:434594-651668

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

Modified: cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm?rev=714134&r1=714133&r2=714134&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm
(original)
+++ cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm
Fri Nov 14 12:55:56 2008
@@ -20,7 +20,9 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import javax.xml.namespace.QName;
+#if (${service.Name} != "Service")
 import javax.xml.ws.Service;
+#end
 import javax.xml.ws.WebEndpoint;
 import javax.xml.ws.WebServiceClient;
 #foreach ($port in ${service.Ports})    
@@ -45,7 +47,7 @@
 #foreach ($annotation in $service.Annotations)
 $annotation
 #end
-public class ${service.Name} extends Service {
+public class ${service.Name} extends #if (${service.Name} == "Service")javax.xml.ws.Service#else
Service#end {
 
     public final static URL WSDL_LOCATION;
     public final static QName SERVICE = new QName("$service.Namespace", "$service.ServiceName");

Modified: cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java?rev=714134&r1=714133&r2=714134&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
(original)
+++ cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
Fri Nov 14 12:55:56 2008
@@ -105,7 +105,8 @@
         if (input != null) {
             for (WrapperElement element : ProcessorUtil.getWrappedElement(context, input.getElementQName()))
{
                 if (names.containsKey(element.getElementName())
-                    &&  names.get(element.getElementName()).equals(element.getSchemaTypeName()))
{
+                    &&  (names.get(element.getElementName()) == element.getSchemaTypeName()
+                        || names.get(element.getElementName()).equals(element.getSchemaTypeName())))
{
                     handleErrors(names.get(element.getElementName()), element);
                     return false;
                 } else {
@@ -118,7 +119,8 @@
             for (WrapperElement element : ProcessorUtil.getWrappedElement(context, 
                                                                           output.getElementQName()))
{
                 if (names.containsKey(element.getElementName())
-                    &&  !names.get(element.getElementName()).equals(element.getSchemaTypeName()))
{
+                    &&  !(names.get(element.getElementName()) == element.getSchemaTypeName()
+                        || names.get(element.getElementName()).equals(element.getSchemaTypeName())))
{
                     handleErrors(names.get(element.getElementName()), element);
                     return false;
                 } else {



Mime
View raw message