svn commit: r1133072 - in /cxf/branches/2.3.x-fixes: ./ rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/ systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/

[dkulp]

Author: dkulp
Date: Tue Jun  7 16:15:27 2011
New Revision: 1133072

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

........
  r1133046 | dkulp | 2011-06-07 11:27:58 -0400 (Tue, 07 Jun 2011) | 1 line
  
  Fix more test failures on AIX.
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    
cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
    
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java

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

Modified: 
cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?rev=1133072&r1=1133071&r2=1133072&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
 Tue Jun  7 16:15:27 2011
@@ -444,24 +444,14 @@ public class DynamicClientFactory {
     }
 
     protected boolean compileJavaSrc(String classPath, List<File> srcList, 
String dest) {
-        String[] javacCommand = new String[srcList.size() + 7];
-        
-        javacCommand[0] = "javac";
-        javacCommand[1] = "-classpath";
-        javacCommand[2] = classPath;        
-        javacCommand[3] = "-d";
-        javacCommand[4] = dest;
-        javacCommand[5] = "-target";
-        javacCommand[6] = "1.5";
-        
-        int i = 7;
-        for (File f : srcList) {
-            javacCommand[i++] = f.getAbsolutePath();            
-        }
         org.apache.cxf.common.util.Compiler javaCompiler 
             = new org.apache.cxf.common.util.Compiler();
         
-        return javaCompiler.internalCompile(javacCommand, 7); 
+        javaCompiler.setClassPath(classPath);
+        javaCompiler.setOutputDir(dest);
+        javaCompiler.setTarget("1.5");
+        
+        return javaCompiler.compileFiles(srcList); 
     }
     
     static void addClasspathFromManifest(StringBuilder classPath, File file) 

Modified: 
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java?rev=1133072&r1=1133071&r2=1133072&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java
 Tue Jun  7 16:15:27 2011
@@ -360,24 +360,14 @@ public class JAXRSClientServerResourceCr
     }
     
     protected boolean compileJavaSrc(String classPath, List<File> srcList, 
String dest) {
-        String[] javacCommand = new String[srcList.size() + 7];
-        
-        javacCommand[0] = "javac";
-        javacCommand[1] = "-classpath";
-        javacCommand[2] = classPath;        
-        javacCommand[3] = "-d";
-        javacCommand[4] = dest;
-        javacCommand[5] = "-target";
-        javacCommand[6] = "1.5";
-        
-        int i = 7;
-        for (File f : srcList) {
-            javacCommand[i++] = f.getAbsolutePath();            
-        }
         org.apache.cxf.common.util.Compiler javaCompiler 
             = new org.apache.cxf.common.util.Compiler();
         
-        return javaCompiler.internalCompile(javacCommand, 7); 
+        javaCompiler.setTarget("1.5");
+        javaCompiler.setOutputDir(dest);
+        javaCompiler.setClassPath(classPath);
+        
+        return javaCompiler.compileFiles(srcList); 
     }
     
     static void setupClasspath(StringBuilder classPath, ClassLoader 
classLoader)