From scm-return-31432-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Thu Sep 04 11:39:44 2008 Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 36317 invoked from network); 4 Sep 2008 11:39:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Sep 2008 11:39:44 -0000 Received: (qmail 49438 invoked by uid 500); 4 Sep 2008 11:39:42 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 49382 invoked by uid 500); 4 Sep 2008 11:39:42 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 49373 invoked by uid 99); 4 Sep 2008 11:39:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Sep 2008 04:39:42 -0700 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; Thu, 04 Sep 2008 11:38:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2B380238899C; Thu, 4 Sep 2008 04:38:53 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r691974 - in /geronimo/genesis/trunk: ./ genesis-flava/genesis-default-flava/ genesis-maven-plugin/ genesis-maven-plugin/src/ genesis-maven-plugin/src/main/ genesis-maven-plugin/src/main/groovy/ genesis-maven-plugin/src/main/groovy/org/ gen... Date: Thu, 04 Sep 2008 11:38:52 -0000 To: scm@geronimo.apache.org From: jdillon@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080904113853.2B380238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jdillon Date: Thu Sep 4 04:38:51 2008 New Revision: 691974 URL: http://svn.apache.org/viewvc?rev=691974&view=rev Log: Add genesis-maven-plugin, so we can better manage validation muck Move the basic config validation to the default flava Added: geronimo/genesis/trunk/genesis-maven-plugin/ geronimo/genesis/trunk/genesis-maven-plugin/pom.xml (with props) geronimo/genesis/trunk/genesis-maven-plugin/src/ geronimo/genesis/trunk/genesis-maven-plugin/src/main/ geronimo/genesis/trunk/genesis-maven-plugin/src/main/groovy/ geronimo/genesis/trunk/genesis-maven-plugin/src/main/groovy/org/ geronimo/genesis/trunk/genesis-maven-plugin/src/main/groovy/org/apache/ geronimo/genesis/trunk/genesis-maven-plugin/src/main/groovy/org/apache/geronimo/ geronimo/genesis/trunk/genesis-maven-plugin/src/main/groovy/org/apache/geronimo/genesis/ geronimo/genesis/trunk/genesis-maven-plugin/src/main/groovy/org/apache/geronimo/genesis/plugin/ geronimo/genesis/trunk/genesis-maven-plugin/src/main/groovy/org/apache/geronimo/genesis/plugin/ValidateConfigurationMojo.groovy (with props) Modified: geronimo/genesis/trunk/genesis-flava/genesis-default-flava/pom.xml geronimo/genesis/trunk/pom.xml Modified: geronimo/genesis/trunk/genesis-flava/genesis-default-flava/pom.xml URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/genesis-flava/genesis-default-flava/pom.xml?rev=691974&r1=691973&r2=691974&view=diff ============================================================================== --- geronimo/genesis/trunk/genesis-flava/genesis-default-flava/pom.xml (original) +++ geronimo/genesis/trunk/genesis-flava/genesis-default-flava/pom.xml Thu Sep 4 04:38:51 2008 @@ -174,6 +174,18 @@ + org.apache.geronimo.genesis + genesis-maven-plugin + + + + validate-configuration + + + + + + org.apache.maven.plugins maven-compiler-plugin Added: geronimo/genesis/trunk/genesis-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/genesis-maven-plugin/pom.xml?rev=691974&view=auto ============================================================================== --- geronimo/genesis/trunk/genesis-maven-plugin/pom.xml (added) +++ geronimo/genesis/trunk/genesis-maven-plugin/pom.xml Thu Sep 4 04:38:51 2008 @@ -0,0 +1,88 @@ + + + + + + + + 4.0.0 + + + org.apache.geronimo.genesis + genesis + 2.0-SNAPSHOT + + + genesis-maven-plugin + Genesis Maven Plugin + maven-plugin + + + + org.codehaus.groovy.maven + gmaven-mojo + 1.0-rc-3 + + + + + + + org.codehaus.groovy.maven + gmaven-plugin + + + + generateStubs + compile + generateTestStubs + testCompile + + + + + + + org.apache.maven.plugins + maven-plugin-plugin + + + + helpmojo + descriptor + + + + + + + + + + + org.apache.maven.plugins + maven-plugin-plugin + 2.4.2 + + + + + + Propchange: geronimo/genesis/trunk/genesis-maven-plugin/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/genesis/trunk/genesis-maven-plugin/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: geronimo/genesis/trunk/genesis-maven-plugin/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: geronimo/genesis/trunk/genesis-maven-plugin/src/main/groovy/org/apache/geronimo/genesis/plugin/ValidateConfigurationMojo.groovy URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/genesis-maven-plugin/src/main/groovy/org/apache/geronimo/genesis/plugin/ValidateConfigurationMojo.groovy?rev=691974&view=auto ============================================================================== --- geronimo/genesis/trunk/genesis-maven-plugin/src/main/groovy/org/apache/geronimo/genesis/plugin/ValidateConfigurationMojo.groovy (added) +++ geronimo/genesis/trunk/genesis-maven-plugin/src/main/groovy/org/apache/geronimo/genesis/plugin/ValidateConfigurationMojo.groovy Thu Sep 4 04:38:51 2008 @@ -0,0 +1,80 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.geronimo.genesis.plugin + +import org.codehaus.groovy.maven.mojo.GroovyMojo + +import org.apache.maven.project.MavenProject + +/** + * Validate the basic project configuration. + * + * @goal validate-configuration + * @phase validate + * @since 2.0 + * + * @version $Id$ + */ +class ValidateConfigurationMojo + extends GroovyMojo +{ + /** + * @parameter expression="${project}" + * @required + * @readonly + */ + MavenProject project + + void execute() { + if (project.groupId.startsWith('org.apache.geronimo.genesis')) { + return + } + + def failIfNotConfigured = { var, value, name -> + if (var.startsWith(value)) { + fail("Genesis child project must configure element: $name") + } + } + + // TODO: project/url + + // TODO: project/distributionManagement/site + + failIfNotConfigured( + project.description, + 'Genesis provides', + 'project/description') + + failIfNotConfigured( + project.scm.connection, + 'scm:svn:http://svn.apache.org/repos/asf/geronimo/genesis', + 'project/scm/connection') + + failIfNotConfigured( + project.scm.developerConnection, + 'scm:svn:https://svn.apache.org/repos/asf/geronimo/genesis', + 'project/scm/developerConnection') + + failIfNotConfigured( + project.scm.url, + 'http://svn.apache.org/viewvc/geronimo/geronimo/genesis', + 'project/scm/url') + } +} Propchange: geronimo/genesis/trunk/genesis-maven-plugin/src/main/groovy/org/apache/geronimo/genesis/plugin/ValidateConfigurationMojo.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/genesis/trunk/genesis-maven-plugin/src/main/groovy/org/apache/geronimo/genesis/plugin/ValidateConfigurationMojo.groovy ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: geronimo/genesis/trunk/genesis-maven-plugin/src/main/groovy/org/apache/geronimo/genesis/plugin/ValidateConfigurationMojo.groovy ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: geronimo/genesis/trunk/pom.xml URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/pom.xml?rev=691974&r1=691973&r2=691974&view=diff ============================================================================== --- geronimo/genesis/trunk/pom.xml (original) +++ geronimo/genesis/trunk/pom.xml Thu Sep 4 04:38:51 2008 @@ -176,6 +176,7 @@ + genesis-maven-plugin genesis-packaging genesis-flava genesis-skin @@ -453,58 +454,16 @@ xmlbeans-maven-plugin 2.3.1 + + + + + org.apache.geronimo.genesis + genesis-maven-plugin + 2.0-SNAPSHOT + - - - - org.codehaus.groovy.maven - gmaven-plugin - - - validate - - execute - - - - if (!project.groupId.startsWith('org.apache.geronimo.genesis')) { - def failIfNotConfigured = { var, value, name -> - if (var.startsWith(value)) { - fail("Genesis child project must configure element: $name") - } - } - - // TODO: project/url - - // TODO: project/distributionManagement/site - - failIfNotConfigured( - project.description, - 'Genesis provides', - 'project/description') - - failIfNotConfigured( - project.scm.connection, - 'scm:svn:http://svn.apache.org/repos/asf/geronimo/genesis', - 'project/scm/connection') - - failIfNotConfigured( - project.scm.developerConnection, - 'scm:svn:https://svn.apache.org/repos/asf/geronimo/genesis', - 'project/scm/developerConnection') - - failIfNotConfigured( - project.scm.url, - 'http://svn.apache.org/viewvc/geronimo/geronimo/genesis', - 'project/scm/url') - } - - - - - - @@ -513,6 +472,7 @@ Apache Release Repository scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository + apache.snapshots Apache Development Repository