cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r705709 - in /cxf/branches/2.1.x-fixes: ./ common/common/src/main/java/org/apache/cxf/resource/ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/ja...
Date Fri, 17 Oct 2008 18:58:21 GMT
Author: dkulp
Date: Fri Oct 17 11:58:20 2008
New Revision: 705709

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

........
  r705708 | dkulp | 2008-10-17 14:57:02 -0400 (Fri, 17 Oct 2008) | 2 lines
  
  Fix checkstyle error, add warning if cannot find a "classpath:...." resource, add an import
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/resource/Messages.properties
    cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
    cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProvider.java
    cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 17 11:58:20 2008
@@ -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,705692
+/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,705692,705708

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

Modified: cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/resource/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/resource/Messages.properties?rev=705709&r1=705708&r2=705709&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/resource/Messages.properties
(original)
+++ cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/resource/Messages.properties
Fri Oct 17 11:58:20 2008
@@ -19,3 +19,4 @@
 #
 #
 # messages for resource package 
+NOT_ON_CLASSPATH: Resource classpath:{0} was not found in the classloaders.
\ No newline at end of file

Modified: cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java?rev=705709&r1=705708&r2=705709&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
(original)
+++ cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
Fri Oct 17 11:58:20 2008
@@ -28,8 +28,11 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.Base64Utility;
 
 /**
@@ -43,6 +46,8 @@
  * @author Dan Diephouse
  */
 public class URIResolver {
+    private static final Logger LOG = LogUtils.getLogger(URIResolver.class);
+    
     private File file;
     private URI uri;
     private URL url;
@@ -240,8 +245,10 @@
     }
     
     private void tryClasspath(String uriStr) throws IOException {
+        boolean isClasspathURL = false;
         if (uriStr.startsWith("classpath:")) {
             uriStr = uriStr.substring(10);
+            isClasspathURL = true;
         }
         url = ClassLoaderUtils.getResource(uriStr, calling);
         if (url == null) {
@@ -266,6 +273,9 @@
             }
             is = url.openStream();
         }
+        if (is == null && isClasspathURL) {
+            LOG.log(Level.WARNING, "NOT_ON_CLASSPATH", uriStr);
+        }
     }
 
     private void tryRemote(String uriStr) throws IOException {

Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProvider.java?rev=705709&r1=705708&r2=705709&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProvider.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProvider.java
Fri Oct 17 11:58:20 2008
@@ -64,7 +64,8 @@
     }
 
     public void writeTo(Object obj, Class<?> type, Type genType, Annotation[] anns,

-                        MediaType mt, MultivaluedMap<String, Object> headers, OutputStream
os) throws IOException {
+                        MediaType mt, MultivaluedMap<String, Object> headers,
+                        OutputStream os) throws IOException {
         os.write(obj.toString().getBytes("UTF-8"));
     }
 

Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.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/processor/internal/OperationProcessor.java?rev=705709&r1=705708&r2=705709&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
(original)
+++ cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
Fri Oct 17 11:58:20 2008
@@ -206,6 +206,7 @@
         asyncHandlerAnnotation.addElement(new JAnnotationElement("targetNamespace", ""));
         asyncHandler.addAnnotation("WebParam", asyncHandlerAnnotation);                
 
+        method.getInterface().addImport("javax.jws.WebParam");
         method.getInterface().addMethod(callbackMethod);
     }
 



Mime
View raw message