Repository: cxf Updated Branches: refs/heads/2.6.x-fixes 9fca6223b -> 3569c2254
Fix compile failures in api on 2.6.x with Java5 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3569c225 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3569c225 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3569c225 Branch: refs/heads/2.6.x-fixes Commit: 3569c225420d916a3591d9c134109e1094870f5e Parents: 9fca622 Author: Daniel Kulp <dk...@apache.org> Authored: Tue Oct 7 12:38:21 2014 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Tue Oct 7 12:38:21 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/cxf/helpers/FileUtils.java | 5 ---- .../org/apache/cxf/staxutils/StaxUtilsTest.java | 26 -------------------- 2 files changed, 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/3569c225/api/src/main/java/org/apache/cxf/helpers/FileUtils.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/cxf/helpers/FileUtils.java b/api/src/main/java/org/apache/cxf/helpers/FileUtils.java index 2bafee2..5ebea38 100644 --- a/api/src/main/java/org/apache/cxf/helpers/FileUtils.java +++ b/api/src/main/java/org/apache/cxf/helpers/FileUtils.java @@ -80,11 +80,6 @@ public final class FileUtils { + " is not writable, please set java.io.tempdir" + " to a writable directory"); } - if (checkExists.getUsableSpace() < 1024 * 1024) { - LogUtils.getL7dLogger(FileUtils.class).warning("The directory " + s + " has very " - + "little usable temporary space. Operations" - + " requiring temporary files may fail."); - } File f = new File(checkExists, "cxf-tmp-" + x); int count = 0; while (!f.mkdir()) { http://git-wip-us.apache.org/repos/asf/cxf/blob/3569c225/api/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java ---------------------------------------------------------------------- diff --git a/api/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java b/api/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java index b5963c3..158a42f 100644 --- a/api/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java +++ b/api/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java @@ -343,32 +343,6 @@ public class StaxUtilsTest extends Assert { } @Test - public void testDefaultPrefixInRootElementWithJDKInternalCopyTransformer() throws Exception { - TransformerFactory trf = null; - try { - trf = TransformerFactory - .newInstance("com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl", null); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - String xml = "<root xmlns=\"urn:org.apache.cxf:test\">Text</root>"; - StringReader stringReader = new StringReader(xml); - StreamSource source = new StreamSource(stringReader); - XMLStreamReader reader = StaxUtils.createXMLStreamReader(source); - XMLStreamWriter writer = StaxUtils.createXMLStreamWriter(baos); - StaxSource staxSource = new StaxSource(reader); - Transformer transformer = trf.newTransformer(new StreamSource(getTestStream("./resources/copy.xsl"))); - System.out.println("Used transformer: " + transformer.getClass().getName()); - transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes"); - transformer.transform(staxSource, new StreamResult(baos)); - writer.flush(); - baos.flush(); - assertThat(new String(baos.toByteArray()), equalTo(xml)); - } catch (Throwable throwable) { - // ignore on non Sun/Oracle JDK - return; - } - } - - @Test public void testCXF3193() throws Exception { String testString = "<a:elem1 xmlns:a=\"test\" xmlns:b=\"test\" a:attr1=\"value\"/>"; CachingXmlEventWriter writer = new CachingXmlEventWriter();