You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/07/19 22:07:30 UTC
svn commit: r1363513 - in /cxf/trunk:
testutils/src/main/java/org/apache/cxf/testutil/common/
tools/common/src/main/java/org/apache/cxf/tools/common/
tools/common/src/main/java/org/apache/cxf/tools/util/
tools/javato/ws/src/test/java/org/apache/cxf/too...
Author: dkulp
Date: Thu Jul 19 20:07:30 2012
New Revision: 1363513
URL: http://svn.apache.org/viewvc?rev=1363513&view=rev
Log:
Minor updates so CXF is warning free in eclipse with both JDK7 and JDK6
Modified:
cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
Modified: cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java?rev=1363513&r1=1363512&r2=1363513&view=diff
==============================================================================
--- cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java (original)
+++ cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java Thu Jul 19 20:07:30 2012
@@ -412,9 +412,7 @@ public class ServerLauncher {
}
if (loader instanceof URLClassLoader) {
- @SuppressWarnings("resource")
- URLClassLoader urlloader = (URLClassLoader)loader;
- for (URL url : urlloader.getURLs()) {
+ for (URL url : ((URLClassLoader)loader).getURLs()) {
classpath.append(File.pathSeparatorChar);
classpath.append(url.toURI().getPath());
}
Modified: cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java?rev=1363513&r1=1363512&r2=1363513&view=diff
==============================================================================
--- cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java (original)
+++ cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java Thu Jul 19 20:07:30 2012
@@ -82,9 +82,7 @@ public class ProcessorTestBase extends A
ClassLoader loader = getClass().getClassLoader();
StringBuilder classPath = new StringBuilder();
if (loader instanceof URLClassLoader) {
- @SuppressWarnings("resource")
- URLClassLoader urlLoader = (URLClassLoader)loader;
- for (URL url : urlLoader.getURLs()) {
+ for (URL url : ((URLClassLoader)loader).getURLs()) {
File file;
file = new File(url.toURI());
String filename = file.getAbsolutePath();
Modified: cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java?rev=1363513&r1=1363512&r2=1363513&view=diff
==============================================================================
--- cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java (original)
+++ cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java Thu Jul 19 20:07:30 2012
@@ -73,11 +73,13 @@ public final class AnnotationUtil {
return new URLClassLoader(urls, parent);
}
+ private static ClassLoader newLoader(URL[] urls, ClassLoader parent) {
+ return new URLClassLoader(urls, parent);
+ }
public static synchronized Class<?> loadClass(String className, ClassLoader parent) {
Class<?> clazz = null;
URL[] urls = URIParserUtil.pathToURLs(getClassPath());
- @SuppressWarnings("resource")
- URLClassLoader classLoader = new URLClassLoader(urls, parent);
+ ClassLoader classLoader = newLoader(urls, parent);
try {
clazz = classLoader.loadClass(className);
} catch (Exception e) {
@@ -91,9 +93,7 @@ public final class AnnotationUtil {
ClassLoader loader = AnnotationUtil.class.getClassLoader();
StringBuilder classpath = new StringBuilder(System.getProperty("java.class.path"));
if (loader instanceof URLClassLoader) {
- @SuppressWarnings("resource")
- URLClassLoader urlloader = (URLClassLoader)loader;
- for (URL url : urlloader.getURLs()) {
+ for (URL url : ((URLClassLoader)loader).getURLs()) {
classpath.append(File.pathSeparatorChar);
classpath.append(url.getFile());
}
Modified: cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java?rev=1363513&r1=1363512&r2=1363513&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java (original)
+++ cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java Thu Jul 19 20:07:30 2012
@@ -377,9 +377,7 @@ public class JavaToWSTest extends ToolTe
ClassLoader loader = getClass().getClassLoader();
StringBuffer classPath = new StringBuffer();
if (loader instanceof URLClassLoader) {
- @SuppressWarnings("resource")
- URLClassLoader urlLoader = (URLClassLoader)loader;
- for (URL url : urlLoader.getURLs()) {
+ for (URL url : ((URLClassLoader)loader).getURLs()) {
File file;
file = new File(url.toURI());
String filename = file.getAbsolutePath();