geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r591248 - in /geronimo/server/trunk: assemblies/geronimo-jetty6-javaee5/ assemblies/geronimo-tomcat6-javaee5/ framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ framework/modules/geronimo-system/src/ma...
Date Fri, 02 Nov 2007 07:25:41 GMT
Author: djencks
Date: Fri Nov  2 00:25:34 2007
New Revision: 591248

URL: http://svn.apache.org/viewvc?rev=591248&view=rev
Log:
GERONIMO-3502 Allow conditions on starting plugins to be specified in geronimo-plugin.xml

Modified:
    geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/PluginAttributeStore.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/xsd/plugins-1.3.xsd
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/pom.xml
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml
    geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml
    geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml
    geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml?rev=591248&r1=591247&r2=591248&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml Fri Nov  2 00:25:34 2007
@@ -102,21 +102,21 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-<!--
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>axis2</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>axis2-ejb</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
--->
+        <!--
+                <dependency>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>axis2</artifactId>
+                    <version>${version}</version>
+                    <type>car</type>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>axis2-ejb</artifactId>
+                    <version>${version}</version>
+                    <type>car</type>
+                </dependency>
+        -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>cxf</artifactId>
@@ -312,7 +312,7 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-<!--
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>axis2-deployer</artifactId>
@@ -326,7 +326,7 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
--->
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>cxf-deployer</artifactId>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml?rev=591248&r1=591247&r2=591248&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml Fri Nov  2 00:25:34
2007
@@ -312,7 +312,7 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-<!--
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>cxf-deployer</artifactId>
@@ -326,7 +326,7 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
--->
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client-deployer</artifactId>

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java?rev=591248&r1=591247&r2=591248&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
Fri Nov  2 00:25:34 2007
@@ -205,7 +205,7 @@
         return gbean.applyOverrides(data, configName, gbeanName, classLoader);
     }
 
-    public void setModuleGBeans(Artifact moduleName, List<GbeanType> gbeans, boolean
load) throws InvalidGBeanException {
+    public void setModuleGBeans(Artifact moduleName, List<GbeanType> gbeans, boolean
load, String condition) throws InvalidGBeanException {
         if (readOnly) {
             return;
         }
@@ -217,6 +217,7 @@
             }
         }
         configuration.setLoad(load);
+        configuration.setCondition(condition);
         log.info("Added gbeans for module: " + moduleName + " load: " + load);
         attributeChanged();
     }

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/PluginAttributeStore.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/PluginAttributeStore.java?rev=591248&r1=591247&r2=591248&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/PluginAttributeStore.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/PluginAttributeStore.java
Fri Nov  2 00:25:34 2007
@@ -36,7 +36,7 @@
      * Adds a group of settings to the attribute store.  This is used by e.g.
      * the plugin installer to add the settings needed for a new plugin.
      */
-    public void setModuleGBeans(Artifact moduleName, List<GbeanType> gbeans, boolean
load) throws InvalidGBeanException;
+    public void setModuleGBeans(Artifact moduleName, List<GbeanType> gbeans, boolean
load, String condition) throws InvalidGBeanException;
 
     void addConfigSubstitutions(Properties properties);
 }

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java?rev=591248&r1=591247&r2=591248&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
Fri Nov  2 00:25:34 2007
@@ -1742,10 +1742,10 @@
                 for (ConfigXmlContentType configXmlContent: pluginData.getConfigXmlContent())
{
                     String serverName = configXmlContent.getServer();
                     ServerInstance serverInstance = getServerInstance(serverName);
-                    serverInstance.getAttributeStore().setModuleGBeans(configID, configXmlContent.getGbean(),
configXmlContent.isLoad());
+                    serverInstance.getAttributeStore().setModuleGBeans(configID, configXmlContent.getGbean(),
configXmlContent.isLoad(), configXmlContent.getCondition());
                 }
             } else {
-                getServerInstance("default").getAttributeStore().setModuleGBeans(configID,
null, true);
+                getServerInstance("default").getAttributeStore().setModuleGBeans(configID,
null, true, null);
             }
         }
         if (!pluginData.getConfigSubstitution().isEmpty()) {

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=591248&r1=591247&r2=591248&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 Fri
Nov  2 00:25:34 2007
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 
-<xs:schema targetNamespace="http://geronimo.apache.org/xml/ns/plugins-1.3"
+<xs:schema targetNamespace="http://geronimo.apache.org/xml/ns/plugins-1.3"  
            xmlns:list="http://geronimo.apache.org/xml/ns/plugins-1.3"
            xmlns:atts="http://geronimo.apache.org/xml/ns/attributes-1.2"
            xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
@@ -369,6 +369,13 @@
                 <xs:documentation>
                     Whether the module should be marked load true or false. If marked false
it can still
                     be started if other started modules depend on it.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="condition" type="xs:string">
+            <xs:annotation>
+                <xs:documentation>
+                    Optional condition that if present is evaluated to determine whether
to load the module.
                 </xs:documentation>
             </xs:annotation>
         </xs:attribute>

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/pom.xml?rev=591248&r1=591247&r2=591248&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/pom.xml
(original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/pom.xml
Fri Nov  2 00:25:34 2007
@@ -147,6 +147,12 @@
                                     <attribute name="userRepositories">~/.m2/repository,#{key1}</attribute>
                                 </gbean>
                             </config-xml-content>
+                            <config-xml-content condition="props['org.apache.geronimo.jaxws.provider']
== 'axis2'" server="bar">
+                                <gbean name="DownloadedPluginRepos">
+                                    <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.1.txt</attribute>
+                                    <attribute name="userRepositories">~/.m2/repository,#{key1}</attribute>
+                                </gbean>
+                            </config-xml-content>
                             <source-repository>http://foo.com</source-repository>
                             <source-repository>http://bar.com</source-repository>
                             <copy-file relative-to="WEB-INF" dest-dir="bar">META-INF/foo.xml</copy-file>

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml?rev=591248&r1=591247&r2=591248&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml
Fri Nov  2 00:25:34 2007
@@ -47,6 +47,12 @@
                 <ns2:attribute name="userRepositories">~/.m2/repository,${key1}</ns2:attribute>
             </ns2:gbean>
         </config-xml-content>
+        <config-xml-content condition="props['org.apache.geronimo.jaxws.provider'] ==
'axis2'" server="bar">
+            <ns2:gbean name="DownloadedPluginRepos">
+                <ns2:attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.1.txt</ns2:attribute>
+                <ns2:attribute name="userRepositories">~/.m2/repository,${key1}</ns2:attribute>
+            </ns2:gbean>
+        </config-xml-content>
         <artifact-alias key="org.apache.geronimo.test/foo//car">org.apache.geronimo.test/bar/1.0/car</artifact-alias>
         <config-substitution key="key2">value2</config-substitution>
         <config-substitution key="key1">value1</config-substitution>

Modified: geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml?rev=591248&r1=591247&r2=591248&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml Fri Nov  2 00:25:34 2007
@@ -90,8 +90,8 @@
                     </dependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="default"/>
-                            <config-xml-content server="offline"/>
+                            <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider']
== 'axis2'"/>
+                            <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider']
== 'axis2'"/>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml?rev=591248&r1=591247&r2=591248&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml Fri Nov  2 00:25:34 2007
@@ -105,22 +105,8 @@
                     </dependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content>
-                                <gbean name="Axis2ModuleBuilderExtension">
-                                    <attribute name="listener">?name=#{webcontainer}</attribute>
-                                    <attribute name="defaultEnvironment">
-                                      <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                                        <dependencies>
-                                            <dependency>
-                                                <groupId>org.apache.geronimo.configs</groupId>
-                                                <artifactId>#{webcontainerName}</artifactId>
-                                                <type>car</type>
-                                            </dependency>
-                                        </dependencies>
-                                      </environment>
-                                     </attribute>
-                                </gbean>
-                            </config-xml-content>
+                            <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider']
== 'axis2'"/>
+                            <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider']
== 'axis2'"/>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml?rev=591248&r1=591247&r2=591248&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml Fri Nov  2 00:25:34 2007
@@ -92,8 +92,8 @@
                     </dependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="default"/>
-                            <config-xml-content server="offline"/>
+                            <config-xml-content server="default" condition="props.getProperty('org.apache.geronimo.jaxws.provider',
'cxf') == 'cxf'"/>
+                            <config-xml-content server="offline" condition="props.getProperty('org.apache.geronimo.jaxws.provider',
'cxf') == 'cxf'"/>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml?rev=591248&r1=591247&r2=591248&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml Fri Nov  2 00:25:34 2007
@@ -105,22 +105,8 @@
                     </dependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content>
-                                <gbean name="CXFModuleBuilderExtension">
-                                    <attribute name="listener">?name=#{webcontainer}</attribute>
-                                    <attribute name="defaultEnvironment">
-                                      <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                                        <dependencies>
-                                            <dependency>
-                                                <groupId>org.apache.geronimo.configs</groupId>
-                                                <artifactId>#{webcontainerName}</artifactId>
-                                                <type>car</type>
-                                            </dependency>
-                                        </dependencies>
-                                      </environment>
-                                    </attribute>
-                                </gbean>
-                            </config-xml-content>
+                            <config-xml-content server="default" condition="props.getProperty('org.apache.geronimo.jaxws.provider',
'cxf') == 'cxf'"/>
+                            <config-xml-content server="offline" condition="props.getProperty('org.apache.geronimo.jaxws.provider',
'cxf') == 'cxf'"/>
                         </plugin-artifact>
                     </instance>
                 </configuration>



Mime
View raw message