You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm@geronimo.apache.org by am...@apache.org on 2006/05/16 00:11:38 UTC

svn commit: r406756 - in /geronimo/branches/1.1: applications/console-standard/src/java/org/apache/geronimo/console/car/ExportConfigHandler.java modules/system/src/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java

Author: ammulder
Date: Mon May 15 15:11:37 2006
New Revision: 406756

URL: http://svn.apache.org/viewcvs?rev=406756&view=rev
Log:
Funny how an innocent presentation flushes out bugs...
 - Don't write plugin descriptors with "config-id"
 - Don't reverse category and description

Modified:
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/ExportConfigHandler.java
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java

Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/ExportConfigHandler.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/ExportConfigHandler.java?rev=406756&r1=406755&r2=406756&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/ExportConfigHandler.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/car/ExportConfigHandler.java Mon May 15 15:11:37 2006
@@ -110,7 +110,7 @@
         String obsoletes = request.getParameter("obsoletes");
         PluginMetadata data = PortletManager.getCurrentServer(request).getPluginInstaller().getPluginMetadata(Artifact.create(configId));
         PluginMetadata metadata = new PluginMetadata(name, data.getModuleId(),
-                description, category, url, author, null, true, false);
+                category, description, url, author, null, true, false);
         metadata.setDependencies(split(deps));
         metadata.setGeronimoVersions(split(gers));
         metadata.setJvmVersions(split(jvms));

Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java?rev=406756&r1=406755&r2=406756&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java (original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java Mon May 15 15:11:37 2006
@@ -1335,7 +1335,7 @@
         doc.appendChild(config);
 
         addTextChild(doc, config, "name", data.getName());
-        addTextChild(doc, config, "config-id", data.getModuleId().toString());
+        addTextChild(doc, config, "module-id", data.getModuleId().toString());
         addTextChild(doc, config, "category", data.getCategory());
         addTextChild(doc, config, "description", data.getDescription());
         if(data.getPluginURL() != null) {