Author: dkulp Date: Wed Oct 22 09:38:01 2008 New Revision: 707126 URL: http://svn.apache.org/viewvc?rev=707126&view=rev Log: Merged revisions 703523 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r703523 | dkulp | 2008-10-10 13:01:34 -0400 (Fri, 10 Oct 2008) | 9 lines Merged revisions 703501 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r703501 | dkulp | 2008-10-10 11:36:02 -0400 (Fri, 10 Oct 2008) | 2 lines Log a warning if you use the Simple frontend with a class that has jaxws annotations on it. (sick of fielding support issues related to it) ........ ................ Modified: cxf/branches/2.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/SimpleMessages.properties Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 22 09:38:01 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,705153 -/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,705150 +/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,705153 +/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,705150 /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/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java?rev=707126&r1=707125&r2=707126&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java (original) +++ cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java Wed Oct 22 09:38:01 2008 @@ -116,6 +116,10 @@ setJaxWsImplementorInfo(new JaxWsImplementorInfo(serviceClass)); super.setServiceClass(serviceClass); } + @Override + protected void checkServiceClassAnnotations(Class<?> sc) { + //no need to check + } @Override protected void initializeDefaultInterceptors() { Modified: cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=707126&r1=707125&r2=707126&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java (original) +++ cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Wed Oct 22 09:38:01 2008 @@ -1881,6 +1881,35 @@ public void setServiceClass(Class<?> serviceClass) { this.serviceClass = serviceClass; + checkServiceClassAnnotations(serviceClass); + } + protected void checkServiceClassAnnotations(Class<?> sc) { + Annotation anns[] = serviceClass.getAnnotations(); + if (anns != null) { + for (Annotation ann : anns) { + String pkg = ann.annotationType().getPackage().getName(); + if ("javax.xml.ws".equals(pkg) + || "javax.jws".equals(pkg)) { + + LOG.log(Level.WARNING, "JAXWS_ANNOTATION_FOUND", serviceClass.getName()); + return; + } + } + } + for (Method m : serviceClass.getMethods()) { + anns = m.getAnnotations(); + if (anns != null) { + for (Annotation ann : anns) { + String pkg = ann.annotationType().getPackage().getName(); + if ("javax.xml.ws".equals(pkg) + || "javax.jws".equals(pkg)) { + + LOG.log(Level.WARNING, "JAXWS_ANNOTATION_FOUND", serviceClass.getName()); + return; + } + } + } + } } public String getWsdlURL() { Modified: cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/SimpleMessages.properties URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/SimpleMessages.properties?rev=707126&r1=707125&r2=707126&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/SimpleMessages.properties (original) +++ cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/SimpleMessages.properties Wed Oct 22 09:38:01 2008 @@ -27,4 +27,8 @@ REFERENCE_TO_UNDEFINED_TYPE = Schema element {0} references undefined type {1} for service {2}. COULD_NOT_FIND_PART = Could not find a message part matching name {0}. Possible values are {1}. UNMAPPABLE_PORT_TYPE= Service class {0} method {1} part {2} cannot be mapped to schema. Check for use of a JAX-WS-specific type \ - without the JAX-WS service factory bean. \ No newline at end of file + without the JAX-WS service factory bean. +INTRACTABLE_PART= Message part {0} of Message {1} cannot be processed. This can be caused by the use of JAX-WS-specific types \ + without the JAX-WS service factory bean. +JAXWS_ANNOTATION_FOUND=A JAX-WS Annotation was found on {0} while using the Simple frontend. For better results, use the JAX-WS frontend. +
