cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r945885 - in /cxf/branches/2.2.x-fixes: ./ common/common/src/main/java/org/apache/cxf/common/util/Compiler.java
Date Tue, 18 May 2010 21:04:17 GMT
Author: dkulp
Date: Tue May 18 21:04:16 2010
New Revision: 945885

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

........
  r945465 | dkulp | 2010-05-17 22:25:49 -0400 (Mon, 17 May 2010) | 1 line
  
  Send endorsed flags into forked compiler
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/Compiler.java

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

Modified: cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/Compiler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/Compiler.java?rev=945885&r1=945884&r2=945885&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/Compiler.java
(original)
+++ cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/Compiler.java
Tue May 18 21:04:16 2010
@@ -102,6 +102,7 @@ public class Compiler {
     }
     
     public boolean compileFiles(String[] files) {
+        String endorsed = System.getProperty("java.endorsed.dirs");
         if (!forceFork) {
             try { 
                 Class.forName("javax.tools.JavaCompiler");
@@ -135,6 +136,10 @@ public class Compiler {
         list.add(javacstr);
         // End of honoring java.home for used javac
 
+        if (!StringUtils.isEmpty(endorsed)) {
+            list.add("-endorseddirs");
+            list.add(endorsed);
+        }
 
         //fix for CXF-2081, set maximum heap of this VM to javac.
         list.add("-J-Xmx" + maxMemory);



Mime
View raw message