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/07/21 21:17:51 UTC

svn commit: r1149325 - in /cxf/branches/2.4.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProvider.java rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProviderTest.java

Author: dkulp
Date: Thu Jul 21 19:17:50 2011
New Revision: 1149325

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

........
  r1149313 | dkulp | 2011-07-21 14:54:37 -0400 (Thu, 21 Jul 2011) | 1 line
  
  Use the CXF FileUtils to find an appropriate tmp dir
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProvider.java
    cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProviderTest.java

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

Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProvider.java?rev=1149325&r1=1149324&r2=1149325&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProvider.java (original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProvider.java Thu Jul 21 19:17:50 2011
@@ -63,7 +63,7 @@ public class CodeGeneratorProvider imple
     private static final Set<String> SUPPORTED_LANGUAGES = new HashSet<String>(
         Arrays.asList(new String[]{"java"}));
     
-    private static final String TMPDIR = System.getProperty("java.io.tmpdir");
+    private static final File TMPDIR = FileUtils.getDefaultTempDir();
     
     
     private Comparator<String> importsComparator;

Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProviderTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProviderTest.java?rev=1149325&r1=1149324&r2=1149325&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProviderTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProviderTest.java Thu Jul 21 19:17:50 2011
@@ -99,7 +99,7 @@ public class CodeGeneratorProviderTest e
             cgp.setUriInfo(new UriInfoImpl(m, null));
             cgp.handleRequest(m, cri);
             
-            String tmpdir = System.getProperty("java.io.tmpdir");
+            File tmpdir = FileUtils.getDefaultTempDir();
             File classes = new File(tmpdir, cgp.getStem(cri, "classes"));
             if (!classes.mkdir()) {
                 fail();