Author: dkulp
Date: Fri Jan 16 13:12:35 2009
New Revision: 735136
URL: http://svn.apache.org/viewvc?rev=735136&view=rev
Log:
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.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java
cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java
cxf/branches/2.1.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java
cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 16 13:12:35 2009
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732827,733512,733582,733901,734367,734462,734666,734762,734772,734812,734965
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732827,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java?rev=735136&r1=735135&r2=735136&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java
(original)
+++
cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java
Fri Jan 16 13:12:35 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.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java?rev=735136&r1=735135&r2=735136&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java
(original)
+++
cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java
Fri Jan 16 13:12:35 2009
@@ -19,12 +19,12 @@
package org.apache.cxf.tools.util;
-import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.TreeSet;
public class ClassCollector {
@@ -90,8 +90,8 @@
return typesPackages;
}
- 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.1.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.1.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java?rev=735136&r1=735135&r2=735136&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
(original)
+++
cxf/branches/2.1.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
Fri Jan 16 13:12:35 2009
@@ -292,7 +292,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.1.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.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java?rev=735136&r1=735135&r2=735136&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java
(original)
+++
cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java
Fri Jan 16 13:12:35 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.1.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.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm?rev=735136&r1=735135&r2=735136&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm
(original)
+++
cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm
Fri Jan 16 13:12:35 2009
@@ -24,9 +24,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;
import javax.xml.ws.WebServiceFeature;
@@ -55,7 +52,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");
