Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 87ffd0439 -> c9cc70be0
Allow file protocol for SchemaValidator. It's a command line tool, not sure if all the secure
processing even makes sense but test fail without allowing file.
(cherry picked from commit ced98c6e937bd93f92dac9043fa0406c696bfd84)
(cherry picked from commit b47e94df9752b70e8bd14e6dfebf26285066a2c5)
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c9cc70be
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c9cc70be
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c9cc70be
Branch: refs/heads/3.0.x-fixes
Commit: c9cc70be07f0818c227a54595c88018723ee5c21
Parents: 87ffd04
Author: Daniel Kulp <dkulp@apache.org>
Authored: Fri Nov 6 14:34:15 2015 -0500
Committer: Freeman Fang <freeman.fang@gmail.com>
Committed: Tue Feb 23 14:58:33 2016 +0800
----------------------------------------------------------------------
.../org/apache/cxf/tools/validator/internal/SchemaValidator.java | 1 +
.../java/org/apache/cxf/tools/validator/WSDLValidationTest.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/c9cc70be/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/SchemaValidator.java
----------------------------------------------------------------------
diff --git a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/SchemaValidator.java
b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/SchemaValidator.java
index 8fde0b6..d642a42 100644
--- a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/SchemaValidator.java
+++ b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/SchemaValidator.java
@@ -126,6 +126,7 @@ public class SchemaValidator extends AbstractDefinitionValidator {
SchemaFactory sf = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
sf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
+ sf.setProperty(XMLConstants.ACCESS_EXTERNAL_SCHEMA, "file");
SchemaResourceResolver resourceResolver = new SchemaResourceResolver();
sf.setResourceResolver(resourceResolver);
http://git-wip-us.apache.org/repos/asf/cxf/blob/c9cc70be/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
----------------------------------------------------------------------
diff --git a/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
b/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
index 2e34f3d..c1c36ee 100644
--- a/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
+++ b/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
@@ -110,7 +110,7 @@ public class WSDLValidationTest extends ToolTestBase {
getLocation("/validator_wsdl/hello_world_import.wsdl")};
WSDLValidator.main(args);
- assertTrue("Is not valid wsdl!: " + getStdOut(),
+ assertTrue("Is not valid wsdl!: " + getStdOut() + "\n" + getStdErr(),
getStdOut().indexOf("Passed Validation") > -1);
}
|