Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 02ADA9EA0 for ; Thu, 19 Jan 2012 05:35:41 +0000 (UTC) Received: (qmail 62042 invoked by uid 500); 19 Jan 2012 05:35:40 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 61971 invoked by uid 500); 19 Jan 2012 05:35:34 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 61963 invoked by uid 99); 19 Jan 2012 05:35:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jan 2012 05:35:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jan 2012 05:35:32 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 128C223889BB for ; Thu, 19 Jan 2012 05:35:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1233185 - in /camel/branches/camel-2.9.x: ./ camel-core/src/main/java/org/apache/camel/component/validator/ camel-core/src/main/java/org/apache/camel/processor/validation/ camel-core/src/test/java/org/apache/camel/component/validator/ came... Date: Thu, 19 Jan 2012 05:35:11 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120119053512.128C223889BB@eris.apache.org> Author: davsclaus Date: Thu Jan 19 05:35:11 2012 New Revision: 1233185 URL: http://svn.apache.org/viewvc?rev=1233185&view=rev Log: CAMEL-4877: Validator component now supports xs:import again. Added: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/validator/DefaultLSResourceResolver.java - copied unchanged from r1233183, camel/trunk/camel-core/src/main/java/org/apache/camel/component/validator/DefaultLSResourceResolver.java camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorIncludeRouteTest.java - copied unchanged from r1233183, camel/trunk/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorIncludeRouteTest.java camel/branches/camel-2.9.x/camel-core/src/test/resources/org/apache/camel/component/validator/health.xsd - copied unchanged from r1233183, camel/trunk/camel-core/src/test/resources/org/apache/camel/component/validator/health.xsd camel/branches/camel-2.9.x/camel-core/src/test/resources/org/apache/camel/component/validator/person.xsd - copied unchanged from r1233183, camel/trunk/camel-core/src/test/resources/org/apache/camel/component/validator/person.xsd Modified: camel/branches/camel-2.9.x/ (props changed) camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorWithResourceResolverRouteTest.java Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jan 19 05:35:11 2012 @@ -1 +1 @@ -/camel/trunk:1227209,1227212,1227540,1228015,1228027,1228223,1228879,1229565,1231135,1231704,1232309,1232312,1232429,1232763,1232782,1232834 +/camel/trunk:1227209,1227212,1227540,1228015,1228027,1228223,1228879,1229565,1231135,1231704,1232309,1232312,1232429,1232763,1232782,1232834,1233183 Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Thu Jan 19 05:35:11 2012 @@ -1 +1 @@ -/camel/trunk:1-1227196,1227209,1227212,1227540,1228015,1228027,1228223,1228879,1229565,1231135,1231704,1232309,1232312,1232429,1232763,1232782,1232834 +/camel/trunk:1-1227196,1227209,1227212,1227540,1228015,1228027,1228223,1228879,1229565,1231135,1231704,1232309,1232312,1232429,1232763,1232782,1232834,1233183 Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java?rev=1233185&r1=1233184&r2=1233185&view=diff ============================================================================== --- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java (original) +++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java Thu Jan 19 05:35:11 2012 @@ -50,8 +50,7 @@ public class ValidatorComponent extends configureValidator(validator, uri, remaining, parameters); // force loading of schema at create time otherwise concurrent - // processing could - // cause thread safe issues for the javax.xml.validation.SchemaFactory + // processing could cause thread safe issues for the javax.xml.validation.SchemaFactory validator.loadSchema(); return new ProcessorEndpoint(uri, this, validator); @@ -61,6 +60,8 @@ public class ValidatorComponent extends LSResourceResolver resourceResolver = resolveAndRemoveReferenceParameter(parameters, "resourceResolver", LSResourceResolver.class); if (resourceResolver != null) { validator.setResourceResolver(resourceResolver); + } else { + validator.setResourceResolver(new DefaultLSResourceResolver(getCamelContext(), remaining)); } setProperties(validator, parameters); Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java?rev=1233185&r1=1233184&r2=1233185&view=diff ============================================================================== --- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java (original) +++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java Thu Jan 19 05:35:11 2012 @@ -209,7 +209,9 @@ public class ValidatingProcessor impleme protected SchemaFactory createSchemaFactory() { SchemaFactory factory = SchemaFactory.newInstance(schemaLanguage); - factory.setResourceResolver(getResourceResolver()); + if (getResourceResolver() != null) { + factory.setResourceResolver(getResourceResolver()); + } return factory; } Modified: camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorWithResourceResolverRouteTest.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorWithResourceResolverRouteTest.java?rev=1233185&r1=1233184&r2=1233185&view=diff ============================================================================== --- camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorWithResourceResolverRouteTest.java (original) +++ camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorWithResourceResolverRouteTest.java Thu Jan 19 05:35:11 2012 @@ -87,7 +87,8 @@ public class ValidatorWithResourceResolv from("direct:start") .doTry() .to("validator:org/apache/camel/component/validator/report.xsd?resourceResolver=#resourceResolver") - .to("mock:valid").doCatch(ValidationException.class) + .to("mock:valid") + .doCatch(ValidationException.class) .to("mock:invalid") .doFinally() .to("mock:finally")