cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1364717 - in /cxf/branches/2.5.x-fixes: 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...
Date Mon, 23 Jul 2012 17:11:25 GMT
Author: dkulp
Date: Mon Jul 23 17:11:24 2012
New Revision: 1364717

URL: http://svn.apache.org/viewvc?rev=1364717&view=rev
Log:
Merged revisions 1364706 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1364706 | dkulp | 2012-07-23 12:42:21 -0400 (Mon, 23 Jul 2012) | 10 lines

  Merged revisions 1363513 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk

  ........
    r1363513 | dkulp | 2012-07-19 16:07:30 -0400 (Thu, 19 Jul 2012) | 2 lines

    Minor updates so CXF is warning free in eclipse with both  JDK7 and JDK6

  ........

........

Modified:
    cxf/branches/2.5.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
    cxf/branches/2.5.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
    cxf/branches/2.5.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java
    cxf/branches/2.5.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java

Modified: cxf/branches/2.5.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java?rev=1364717&r1=1364716&r2=1364717&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
(original)
+++ cxf/branches/2.5.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
Mon Jul 23 17:11:24 2012
@@ -412,8 +412,7 @@ public class ServerLauncher {
         }
         
         if (loader instanceof URLClassLoader) {
-            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/branches/2.5.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java?rev=1364717&r1=1364716&r2=1364717&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
(original)
+++ cxf/branches/2.5.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
Mon Jul 23 17:11:24 2012
@@ -82,8 +82,7 @@ public class ProcessorTestBase extends A
         ClassLoader loader = getClass().getClassLoader();
         StringBuilder classPath = new StringBuilder();
         if (loader instanceof URLClassLoader) {
-            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/branches/2.5.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java?rev=1364717&r1=1364716&r2=1364717&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java
(original)
+++ cxf/branches/2.5.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java
Mon Jul 23 17:11:24 2012
@@ -72,10 +72,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());
-        URLClassLoader classLoader = new URLClassLoader(urls, parent);
+        ClassLoader classLoader = newLoader(urls, parent);
         try {
             clazz = classLoader.loadClass(className);
         } catch (Exception e) {
@@ -89,8 +92,7 @@ public final class AnnotationUtil {
         ClassLoader loader = AnnotationUtil.class.getClassLoader();
         StringBuilder classpath = new StringBuilder(System.getProperty("java.class.path"));
         if (loader instanceof URLClassLoader) {
-            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/branches/2.5.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java?rev=1364717&r1=1364716&r2=1364717&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
(original)
+++ cxf/branches/2.5.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
Mon Jul 23 17:11:24 2012
@@ -377,8 +377,7 @@ public class JavaToWSTest extends ToolTe
         ClassLoader loader = getClass().getClassLoader();
         StringBuffer classPath = new StringBuffer();
         if (loader instanceof URLClassLoader) {
-            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();



Mime
View raw message