Author: dkulp Date: Fri May 4 17:52:20 2012 New Revision: 1334090 URL: http://svn.apache.org/viewvc?rev=1334090&view=rev Log: Merged revisions 1333536 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1333536 | dkulp | 2012-05-03 12:42:48 -0400 (Thu, 03 May 2012) | 11 lines Merged revisions 1332832 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1332832 | dkulp | 2012-05-01 17:14:52 -0400 (Tue, 01 May 2012) | 4 lines Use target dir for the tmp dir as the various WS-Security things end up using a shared cache for the tokens/replays and deleting them untimely when running in parallel. ........ ........ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/parent/pom.xml Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/parent/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/parent/pom.xml?rev=1334090&r1=1334089&r2=1334090&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/parent/pom.xml (original) +++ cxf/branches/2.4.x-fixes/parent/pom.xml Fri May 4 17:52:20 2012 @@ -337,6 +337,7 @@ <argLine>${cxf.surefire.fork.vmargs}</argLine> <parallel>${cxf.surefire.parallel.mode}</parallel> <systemPropertyVariables> + <java.io.tmpdir>${basedir}/target</java.io.tmpdir> <cxf.useRandomFirstPort>true</cxf.useRandomFirstPort> <org.apache.ws.commons.schema.protectReadOnlyCollections>${cxf.protect-xmlschema-collections}</org.apache.ws.commons.schema.protectReadOnlyCollections> <cxf.validateServiceSchemas>${cxf.validateServices}</cxf.validateServiceSchemas>
