Return-Path: Delivered-To: apmail-incubator-sling-commits-archive@minotaur.apache.org Received: (qmail 93065 invoked from network); 29 Mar 2009 16:49:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 29 Mar 2009 16:49:37 -0000 Received: (qmail 47289 invoked by uid 500); 29 Mar 2009 16:49:36 -0000 Delivered-To: apmail-incubator-sling-commits-archive@incubator.apache.org Received: (qmail 47240 invoked by uid 500); 29 Mar 2009 16:49:36 -0000 Mailing-List: contact sling-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: sling-dev@incubator.apache.org Delivered-To: mailing list sling-commits@incubator.apache.org Received: (qmail 47231 invoked by uid 99); 29 Mar 2009 16:49:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 29 Mar 2009 16:49:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Sun, 29 Mar 2009 16:49:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CB2E8238889B; Sun, 29 Mar 2009 16:49:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r759724 - in /incubator/sling/trunk/maven/maven-sling-plugin: pom.xml src/main/java/org/apache/sling/maven/bundlesupport/ValidationMojo.java Date: Sun, 29 Mar 2009 16:49:15 -0000 To: sling-commits@incubator.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090329164915.CB2E8238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Sun Mar 29 16:49:15 2009 New Revision: 759724 URL: http://svn.apache.org/viewvc?rev=759724&view=rev Log: SLING-653 : Use new validator from commons. Modified: incubator/sling/trunk/maven/maven-sling-plugin/pom.xml incubator/sling/trunk/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/ValidationMojo.java Modified: incubator/sling/trunk/maven/maven-sling-plugin/pom.xml URL: http://svn.apache.org/viewvc/incubator/sling/trunk/maven/maven-sling-plugin/pom.xml?rev=759724&r1=759723&r2=759724&view=diff ============================================================================== --- incubator/sling/trunk/maven/maven-sling-plugin/pom.xml (original) +++ incubator/sling/trunk/maven/maven-sling-plugin/pom.xml Sun Mar 29 16:49:15 2009 @@ -90,7 +90,7 @@ org.apache.sling org.apache.sling.commons.json - 2.0.2-incubator + 2.0.3-incubator-SNAPSHOT org.apache.sling Modified: incubator/sling/trunk/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/ValidationMojo.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/ValidationMojo.java?rev=759724&r1=759723&r2=759724&view=diff ============================================================================== --- incubator/sling/trunk/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/ValidationMojo.java (original) +++ incubator/sling/trunk/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/bundlesupport/ValidationMojo.java Sun Mar 29 16:49:15 2009 @@ -28,9 +28,8 @@ import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.project.MavenProject; -import org.apache.sling.commons.json.JSONArray; import org.apache.sling.commons.json.JSONException; -import org.apache.sling.commons.json.JSONObject; +import org.apache.sling.commons.json.util.Validator; import org.codehaus.plexus.util.DirectoryScanner; /** @@ -124,14 +123,9 @@ } // first, let's see if this is a json array try { - new JSONArray(json); + Validator.validate(json); } catch (JSONException e) { - // it might be a json object - try { - new JSONObject(json); - } catch (JSONException je) { - throw new MojoExecutionException("An Error occured while validating the file '"+fileName+"'", je); - } + throw new MojoExecutionException("An Error occured while validating the file '"+fileName+"'", e); } } }