Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 11077 invoked from network); 11 Dec 2005 21:55:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 11 Dec 2005 21:55:03 -0000 Received: (qmail 57527 invoked by uid 500); 11 Dec 2005 20:54:29 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 57473 invoked by uid 500); 11 Dec 2005 20:54:28 -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 57433 invoked by uid 99); 11 Dec 2005 20:54:28 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 11 Dec 2005 12:54:28 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sun, 11 Dec 2005 12:54:27 -0800 Received: (qmail 43001 invoked by uid 65534); 11 Dec 2005 20:54:04 -0000 Message-ID: <20051211205404.42999.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r356017 - in /geronimo/trunk: etc/ plugins/geronimo-assembly-plugin/ plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/ Date: Sun, 11 Dec 2005 20:54:02 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: djencks Date: Sun Dec 11 12:54:00 2005 New Revision: 356017 URL: http://svn.apache.org/viewcvs?rev=356017&view=rev Log: GERONIMO-1334 assembly plugin should not reinstall configs that are already present Modified: geronimo/trunk/etc/project.properties geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/BaseConfigInstaller.java geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/LocalConfigInstaller.java geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/RepoConfigInstaller.java Modified: geronimo/trunk/etc/project.properties URL: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.properties?rev=356017&r1=356016&r2=356017&view=diff ============================================================================== --- geronimo/trunk/etc/project.properties (original) +++ geronimo/trunk/etc/project.properties Sun Dec 11 12:54:00 2005 @@ -87,7 +87,7 @@ tranql_vendors_version=1.1 geronimo_packaging_plugin_version=1.1.0 -geronimo_assembly_plugin_version=1.1.0 +geronimo_assembly_plugin_version=1.1.1 geronimo_deployment_plugin_version=1.1.0 geronimo_dependency_plugin_version=1.1.0 Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml?rev=356017&r1=356016&r2=356017&view=diff ============================================================================== --- geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml (original) +++ geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml Sun Dec 11 12:54:00 2005 @@ -23,7 +23,7 @@ geronimo-assembly-plugin Geronimo :: Maven Assembly Plugin A plugin used to assemble a distribution of Geronimo - 1.1.0 + 1.1.1 Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/BaseConfigInstaller.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/BaseConfigInstaller.java?rev=356017&r1=356016&r2=356017&view=diff ============================================================================== --- geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/BaseConfigInstaller.java (original) +++ geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/BaseConfigInstaller.java Sun Dec 11 12:54:00 2005 @@ -113,9 +113,13 @@ } protected void execute(URI configId, InstallAdapter installAdapter, Repository sourceRepo, FileSystemRepository targetRepo) throws IOException, InvalidConfigException { + if (installAdapter.containsConfiguration(configId)) { + System.out.println("Configuration " + configId + " already present in repository"); + return; + } GBeanData config = installAdapter.install(sourceRepo, configId); List dependencies = (List) config.getAttribute("dependencies"); - System.out.println("Installed configuration " + artifact); + System.out.println("Installed configuration " + configId); FileWriteMonitor monitor = new StartFileWriteMonitor(); @@ -143,6 +147,7 @@ GBeanData install(Repository sourceRepo, URI configId) throws IOException, InvalidConfigException; + boolean containsConfiguration(URI configID); } protected static class StartFileWriteMonitor implements FileWriteMonitor { Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/LocalConfigInstaller.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/LocalConfigInstaller.java?rev=356017&r1=356016&r2=356017&view=diff ============================================================================== --- geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/LocalConfigInstaller.java (original) +++ geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/LocalConfigInstaller.java Sun Dec 11 12:54:00 2005 @@ -48,6 +48,10 @@ GBeanData config = store.install2(artifact); return config; } + + public boolean containsConfiguration(URI configID) { + return store.containsConfiguration(configID); + } }; Repository sourceRepo = new InnerRepository(); URI rootURI = targetRoot.toURI().resolve(targetRepository); Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/RepoConfigInstaller.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/RepoConfigInstaller.java?rev=356017&r1=356016&r2=356017&view=diff ============================================================================== --- geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/RepoConfigInstaller.java (original) +++ geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/RepoConfigInstaller.java Sun Dec 11 12:54:00 2005 @@ -87,6 +87,10 @@ } return config; } + + public boolean containsConfiguration(URI configID) { + return targetRepo.hasURI(configID); + } } }