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 2011/06/07 17:27:58 UTC
svn commit: r1133046 - in /cxf/trunk:
rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java
Author: dkulp
Date: Tue Jun 7 15:27:58 2011
New Revision: 1133046
URL: http://svn.apache.org/viewvc?rev=1133046&view=rev
Log:
Fix more test failures on AIX.
Modified:
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java
Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?rev=1133046&r1=1133045&r2=1133046&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java Tue Jun 7 15:27:58 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/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java?rev=1133046&r1=1133045&r2=1133046&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java Tue Jun 7 15:27:58 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)