geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lin...@apache.org
Subject svn commit: r689199 - in /geronimo/server/trunk/framework/modules: geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java geronimo-system/src/main/xsd/plugins-1.3.xsd
Date Tue, 26 Aug 2008 20:16:31 GMT
Author: linsun
Date: Tue Aug 26 13:16:30 2008
New Revision: 689199

URL: http://svn.apache.org/viewvc?rev=689199&view=rev
Log:
related to GERONIMO-4265 - allow a geronimo plugin to be a geronimo plugin group when module-id
is not null

Modified:
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/xsd/plugins-1.3.xsd

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=689199&r1=689198&r2=689199&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
Tue Aug 26 13:16:30 2008
@@ -327,7 +327,7 @@
         }
         String targetServerPathName = targetServerPath.getAbsolutePath();
         Kernel kernel = new BasicKernel("assembly");
-
+        
         try {
 //            kernel.boot();
             PluginInstallerGBean installer = new PluginInstallerGBean(
@@ -618,7 +618,9 @@
                     PluginArtifactType instance = metadata.getPluginArtifact().get(0);
 
                     if (instance.getModuleId() != null) {
-                        metaMap.put(toArtifact(instance.getModuleId()), metadata);
+                        if (metadata.isPluginGroup() !=null && !metadata.isPluginGroup())
{
+                            metaMap.put(toArtifact(instance.getModuleId()), metadata);
+                        }
                     }
                     toInstall.add(metadata);
                 } catch (MissingDependencyException e) {
@@ -834,7 +836,7 @@
     /**
      * Installs from a pre-downloaded CAR file
      *
-     * @param carFile                     care file to install
+     * @param carFile                     car file to install
      * @param defaultRepository           Default repo to look for plugins in
      * @param restrictToDefaultRepository Whether to follow hints to other plugin repos.
      * @param username                    repo username
@@ -1604,7 +1606,6 @@
         return pluginList;
     }
 
-
     /**
      * If a plugin includes config.xml content, copy it into the attribute
      * store.

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/xsd/plugins-1.3.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/xsd/plugins-1.3.xsd?rev=689199&r1=689198&r2=689199&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/xsd/plugins-1.3.xsd (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/xsd/plugins-1.3.xsd Tue
Aug 26 13:16:30 2008
@@ -129,6 +129,15 @@
                     </xs:documentation>
                 </xs:annotation>
             </xs:element>
+            <xs:element name="pluginGroup" type="xs:boolean" default="false" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation>
+                        Influences whether a geronimo plugin is a geronimo plugin group,
which is
+                        just a list of other plugins to install. The dependencies listed
for this 
+                        plugin will be treated as the list of actual plugins to install.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>             
             <xs:element name="description" type="xs:string">
                 <xs:annotation>
                     <xs:documentation>



Mime
View raw message