Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 39970 invoked from network); 26 Sep 2008 17:18:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 26 Sep 2008 17:18:10 -0000 Received: (qmail 93594 invoked by uid 500); 26 Sep 2008 17:18:07 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 93536 invoked by uid 500); 26 Sep 2008 17:18:07 -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 93527 invoked by uid 99); 26 Sep 2008 17:18:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Sep 2008 10:18:07 -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; Fri, 26 Sep 2008 17:17:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9524023889C2; Fri, 26 Sep 2008 10:17:48 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r699420 - in /geronimo/server/trunk: buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ framework/configs/plugin/src/main/plan/ framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/ Date: Fri, 26 Sep 2008 17:17:48 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080926171748.9524023889C2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djencks Date: Fri Sep 26 10:17:48 2008 New Revision: 699420 URL: http://svn.apache.org/viewvc?rev=699420&view=rev Log: GERONIMO-4328 Fix problems with installed plugins tracking: c-m-p assembly now tracks plugins, PluginInstallerGBean is now configured to track plugins, and bug fixed in save method Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java geronimo/server/trunk/framework/configs/plugin/src/main/plan/plan.xml geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java?rev=699420&r1=699419&r2=699420&view=diff ============================================================================== --- geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java (original) +++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java Fri Sep 26 10:17:48 2008 @@ -25,6 +25,7 @@ import java.util.Set; import java.util.Collections; import java.net.URL; +import java.net.URI; import org.apache.geronimo.kernel.Kernel; import org.apache.geronimo.kernel.basic.BasicKernel; @@ -108,6 +109,14 @@ private File explicitResolutionProperties = null; /** + * The location of the target config files. + * + * @parameter expression="var/config/installed-plugins.properties" + * @required + */ + private String installedPluginsList; + + /** * The Geronimo repository artifact resolver. *

*

@@ -162,7 +171,7 @@ Kernel kernel = new BasicKernel("Assembly"); PluginRepositoryList pluginRepoList = new PluginRepositoryDownloader(Collections.singletonMap(localRepo, (String[]) null), true); try { - PluginInstallerGBean installer = new PluginInstallerGBean(targetRepositoryPath, targetServerPath, null, servers, pluginRepoList, kernel, getClass().getClassLoader()); + PluginInstallerGBean installer = new PluginInstallerGBean(targetRepositoryPath, targetServerPath, installedPluginsList, servers, pluginRepoList, kernel, getClass().getClassLoader()); installer.install(pluginList, sourceRepo, true, null, null, downloadPoller); if (overrides != null) { for (Override override: this.overrides) { Modified: geronimo/server/trunk/framework/configs/plugin/src/main/plan/plan.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/plugin/src/main/plan/plan.xml?rev=699420&r1=699419&r2=699420&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/plugin/src/main/plan/plan.xml (original) +++ geronimo/server/trunk/framework/configs/plugin/src/main/plan/plan.xml Fri Sep 26 10:17:48 2008 @@ -22,6 +22,7 @@ + var/config/installed-plugins.properties Repository Modified: geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java?rev=699420&r1=699419&r2=699420&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java (original) +++ geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java Fri Sep 26 10:17:48 2008 @@ -364,7 +364,7 @@ if (installedPluginsList != null) { Properties properties = new Properties(); for (Artifact artifact : installedArtifacts) { - properties.put(artifact.toString(), null); + properties.setProperty(artifact.toString(), ""); } try { File historyFile = serverInfo.resolveServer(installedPluginsList);