geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lin...@apache.org
Subject svn commit: r731752 - 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 Mon, 05 Jan 2009 22:45:30 GMT
Author: linsun
Date: Mon Jan  5 14:45:30 2009
New Revision: 731752

URL: http://svn.apache.org/viewvc?rev=731752&view=rev
Log:
GERONIMO-4489 Creating an application centric custom server does not include Framework plugin
group

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=731752&r1=731751&r2=731752&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
Mon Jan  5 14:45:30 2009
@@ -121,7 +121,7 @@
                 pluginsToInstall = command.getInstallList(pluginGroups, appPlugins, consoleReader,
null)
                             
             } else if (mode.compareTo("2") == 0) {
-                io.out.println('Listing application plugins from the local Geronimo server')
+                io.out.println('Listing application plugins and required framework plugin
group from the local Geronimo server')
                 def appPlugins = variables.get('LocalAppPlugins')
                 
                 if (refreshList || !appPlugins) {

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=731752&r1=731751&r2=731752&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
Mon Jan  5 14:45:30 2009
@@ -162,7 +162,20 @@
         PluginListType data = getLocalPluginCategories(mgr, consoleReader);
         List<String> appList = getApplicationModuleLists(mgr);
 
-        return getPluginsFromIds(appList, data);
+        PluginListType appPlugin = getPluginsFromIds(appList, data);
+        
+        // let's add framework plugin group manually so that users can choose it
+        for (PluginType metadata : data.getPlugin()) {
+            for (PluginArtifactType testInstance : metadata.getPluginArtifact()) {
+                if (PluginInstallerGBean.toArtifact(testInstance.getModuleId()).toString().indexOf("plugingroups/framework")
> 0) {
+                    PluginType plugin = PluginInstallerGBean.copy(metadata, testInstance);
+                    appPlugin.getPlugin().add(plugin);
+                    break;
+                }
+            }
+        }
+        
+        return appPlugin;
     }
     
     public PluginListType getLocalPluginGroups(GeronimoDeploymentManager mgr, ConsoleReader
consoleReader) throws DeploymentException, IOException {



Mime
View raw message