geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lin...@apache.org
Subject svn commit: r720620 - in /geronimo/server/trunk/framework/modules: geronimo-commands/src/main/groovy/org/apache/geronimo/commands/ geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/
Date Tue, 25 Nov 2008 21:59:29 GMT
Author: linsun
Date: Tue Nov 25 13:59:28 2008
New Revision: 720620

URL: http://svn.apache.org/viewvc?rev=720620&view=rev
Log:
GERONIMO-4282 add display of application plugins at functional centric mode, to be consistent
as admin console

Modified:
    geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/AssembleServerCommand.groovy
    geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandListConfigurations.java

Modified: geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/AssembleServerCommand.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/AssembleServerCommand.groovy?rev=720620&r1=720619&r2=720620&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/AssembleServerCommand.groovy
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/AssembleServerCommand.groovy
Tue Nov 25 13:59:28 2008
@@ -105,14 +105,20 @@
             def pluginsToInstall;
                                         
             if (mode.compareTo("1") == 0) {
-                io.out.println('Listing plugin groups from the local Geronimo server')
+                io.out.println('Listing plugin groups and application plugins from the local
Geronimo server')
                 def pluginGroups = variables.get('LocalPluginGroups')
+                def appPlugins = variables.get('LocalAppPlugins')
                 
                 if (refreshList || !pluginGroups) {
                     pluginGroups = command.getLocalPluginGroups(connection.getDeploymentManager(),
consoleReader)
                     variables.parent.set('LocalPluginGroups', pluginGroups)
                 }
-                pluginsToInstall = command.getInstallList(pluginGroups, consoleReader, null)
+                
+                if (refreshList || !appPlugins) {
+                    appPlugins = command.getLocalApplicationPlugins(connection.getDeploymentManager(),
consoleReader)
+                    variables.parent.set('LocalAppPlugins', appPlugins)
+                }
+                pluginsToInstall = command.getInstallList(pluginGroups, appPlugins, consoleReader,
null)
                             
             } else if (mode.compareTo("2") == 0) {
                 io.out.println('Listing application plugins from the local Geronimo server')

Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandListConfigurations.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandListConfigurations.java?rev=720620&r1=720619&r2=720620&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandListConfigurations.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandListConfigurations.java
Tue Nov 25 13:59:28 2008
@@ -221,6 +221,18 @@
         return categories;
     }
 
+    public PluginListType getInstallList(PluginListType plugins1, PluginListType plugins2,
ConsoleReader consoleReader, String repo) throws IOException {
+        PluginListType plugins = new PluginListType();
+        for (PluginType metadata : plugins1.getPlugin()) {
+            plugins.getPlugin().add(metadata);
+        }
+        
+        for (PluginType metadata : plugins2.getPlugin()) {
+            plugins.getPlugin().add(metadata);
+        }        
+        
+        return getInstallList(plugins, consoleReader, repo);
+    }
     public PluginListType getInstallList(PluginListType plugins, ConsoleReader consoleReader,
String repo) throws IOException {
         Map<String, Collection<PluginType>> categories = writePluginList(plugins,
consoleReader);
         List<String> defaultRepoLocations = plugins.getDefaultRepository();



Mime
View raw message