Author: dkulp
Date: Fri Oct 17 11:57:02 2008
New Revision: 705708
URL: http://svn.apache.org/viewvc?rev=705708&view=rev
Log:
Fix checkstyle error, add warning if cannot find a "classpath:...." resource,
add an import
Modified:
cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/Messages.properties
cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProvider.java
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
Modified:
cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/Messages.properties
URL:
http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/Messages.properties?rev=705708&r1=705707&r2=705708&view=diff
==============================================================================
---
cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/Messages.properties
(original)
+++
cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/Messages.properties
Fri Oct 17 11:57:02 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/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java?rev=705708&r1=705707&r2=705708&view=diff
==============================================================================
---
cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
(original)
+++
cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
Fri Oct 17 11:57:02 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/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProvider.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProvider.java?rev=705708&r1=705707&r2=705708&view=diff
==============================================================================
---
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProvider.java
(original)
+++
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProvider.java
Fri Oct 17 11:57:02 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/trunk/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/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java?rev=705708&r1=705707&r2=705708&view=diff
==============================================================================
---
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
(original)
+++
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
Fri Oct 17 11:57:02 2008
@@ -206,6 +206,7 @@
asyncHandlerAnnotation.addElement(new
JAnnotationElement("targetNamespace", ""));
asyncHandler.addAnnotation("WebParam", asyncHandlerAnnotation);
+ method.getInterface().addImport("javax.jws.WebParam");
method.getInterface().addMethod(callbackMethod);
}
