cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r735840 - in /cxf/branches/2.0.x-fixes: ./ tools/common/src/main/java/org/apache/cxf/tools/common/ tools/common/src/main/java/org/apache/cxf/tools/util/ tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jax...
Date Mon, 19 Jan 2009 21:49:12 GMT
Author: dkulp
Date: Mon Jan 19 13:49:11 2009
New Revision: 735840

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

................
  r735136 | dkulp | 2009-01-16 16:12:35 -0500 (Fri, 16 Jan 2009) | 9 lines
  
  Merged revisions 734836 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r734836 | dkulp | 2009-01-15 17:03:57 -0500 (Thu, 15 Jan 2009) | 2 lines
    
    [CXF-1979] If something else is named Service, make sure it's qualified
  ........
................

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java
    cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java
    cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
    cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java
    cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 19 13:49:11 2009
@@ -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,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132
-/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,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163
 1,731635,732320,732363,732411,732710,732827,733582,734666
+/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,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132,735136
+/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,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163
 1,731635,732320,732363,732411,732710,732827,733582,734666,734836
 /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/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java?rev=735840&r1=735839&r2=735840&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java
(original)
+++ cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java
Mon Jan 19 13:49:11 2009
@@ -69,9 +69,9 @@
         Set<String> dirSet = new HashSet<String>();
         ClassCollector classCollector = context.get(ClassCollector.class);
         List<String> fileList = new ArrayList<String>();
-        Iterator ite = classCollector.getGeneratedFileInfo().iterator();
+        Iterator<String> ite = classCollector.getGeneratedFileInfo().iterator();
         while (ite.hasNext()) {
-            String fileName = (String)ite.next();
+            String fileName = ite.next();
             fileName = fileName.replace('.', File.separatorChar);
             String dirName = fileName.substring(0, fileName.lastIndexOf(File.separator) +
1);
             

Modified: cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java?rev=735840&r1=735839&r2=735840&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java
(original)
+++ cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java
Mon Jan 19 13:49:11 2009
@@ -19,10 +19,10 @@
 
 package org.apache.cxf.tools.util;
 
-import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
+import java.util.TreeSet;
 
 public class ClassCollector {
 
@@ -83,8 +83,8 @@
         return packagename + "#" + type;
     }
 
-    public List<String> getGeneratedFileInfo() {
-        List<String> generatedFileList = new ArrayList<String>();
+    public Collection<String> getGeneratedFileInfo() {
+        Set<String> generatedFileList = new TreeSet<String>();
         generatedFileList.addAll(seiClassNames.values());
         generatedFileList.addAll(typesClassNames.values());
         generatedFileList.addAll(exceptionClassNames.values());

Modified: cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java?rev=735840&r1=735839&r2=735840&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
(original)
+++ cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
Mon Jan 19 13:49:11 2009
@@ -275,7 +275,7 @@
 
     private boolean addedToClassCollector(String packageName) {
         ClassCollector classCollector = context.get(ClassCollector.class);
-        List<String> files = (List<String>)classCollector.getGeneratedFileInfo();
+        Collection<String> files = classCollector.getGeneratedFileInfo();
         for (String file : files) {
             int dotIndex = file.lastIndexOf(".");
             String sub = file.substring(0, dotIndex - 1);

Modified: cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.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/generators/ServiceGenerator.java?rev=735840&r1=735839&r2=735840&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java
(original)
+++ cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java
Mon Jan 19 13:49:11 2009
@@ -65,7 +65,8 @@
         if (passthrough()) {
             return;
         }
-
+        ClassCollector collector = penv.get(ClassCollector.class);
+        
         Map<String, JavaServiceClass> serviceClasses = javaModel.getServiceClasses();
         
         if (serviceClasses.size() == 0) {
@@ -113,10 +114,20 @@
                 location = url;
             }
             
+            String serviceSuperclass = "Service";
+            for (String s : collector.getGeneratedFileInfo()) {
+                if (s.equals(js.getPackageName() + ".Service")) {
+                    serviceSuperclass = "javax.xml.ws.Service";
+                }
+            }
             clearAttributes();
-
+            
             setAttributes("service", js);
             setAttributes("wsdlLocation", location);
+            setAttributes("serviceSuperclass", serviceSuperclass);
+            if ("Service".equals(serviceSuperclass)) {
+                js.addImport("javax.xml.ws.Service");
+            }
             setAttributes("wsdlUrl", url);
             setCommonAttributes();
 

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=735840&r1=735839&r2=735840&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
Mon Jan 19 13:49:11 2009
@@ -20,9 +20,6 @@
 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})    
@@ -47,7 +44,7 @@
 #foreach ($annotation in $service.Annotations)
 $annotation
 #end
-public class ${service.Name} extends #if (${service.Name} == "Service")javax.xml.ws.Service#else
Service#end {
+public class ${service.Name} extends ${serviceSuperclass} {
 
     public final static URL WSDL_LOCATION;
     public final static QName SERVICE = new QName("$service.Namespace", "$service.ServiceName");



Mime
View raw message