geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
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 GMT
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.
      * <p/>
      * <p/>
@@ -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 @@
 
     <!-- Configuration Installer -->
     <gbean name="PluginInstaller" class="org.apache.geronimo.system.plugin.PluginInstallerGBean">
+        <attribute name="installedPluginsList">var/config/installed-plugins.properties</attribute>
         <reference name="Repository">
             <name>Repository</name>
         </reference>

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);



Mime
View raw message