You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2011/07/22 05:34:27 UTC
svn commit: r1149446 - in /cxf/branches/2.3.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: ningjiang
Date: Fri Jul 22 03:34:26 2011
New Revision: 1149446
URL: http://svn.apache.org/viewvc?rev=1149446&view=rev
Log:
Merged revisions 1149325 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................
r1149325 | dkulp | 2011-07-22 03:17:50 +0800 (Fri, 22 Jul 2011) | 9 lines
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.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProvider.java
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProviderTest.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 22 03:34:26 2011
@@ -1,2 +1,2 @@
-/cxf/branches/2.4.x-fixes:1144979,1147505,1148964,1149190
+/cxf/branches/2.4.x-fixes:1144979,1147505,1148964,1149190,1149325
/cxf/trunk:1144977,1147504,1148962,1149183
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.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.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProvider.java?rev=1149446&r1=1149445&r2=1149446&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProvider.java (original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProvider.java Fri Jul 22 03:34:26 2011
@@ -104,7 +104,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 static final String TAB = " ";
private static final Map<String, Class<?>> HTTP_METHOD_ANNOTATIONS;
Modified: cxf/branches/2.3.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.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProviderTest.java?rev=1149446&r1=1149445&r2=1149446&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProviderTest.java (original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProviderTest.java Fri Jul 22 03:34:26 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();