geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r693977 - in /geronimo/server/trunk/plugins/clustering: geronimo-plugin-farm-node/pom.xml plugin-farm-it/pom.xml plugin-farm-member/pom.xml plugin-farm/pom.xml
Date Wed, 10 Sep 2008 21:00:52 GMT
Author: djencks
Date: Wed Sep 10 14:00:52 2008
New Revision: 693977

URL: http://svn.apache.org/viewvc?rev=693977&view=rev
Log:
GERONIMO-4284 spiff up the plugins with config-substitutions and use the node assembly in
the its

Modified:
    geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm-node/pom.xml
    geronimo/server/trunk/plugins/clustering/plugin-farm-it/pom.xml
    geronimo/server/trunk/plugins/clustering/plugin-farm-member/pom.xml
    geronimo/server/trunk/plugins/clustering/plugin-farm/pom.xml

Modified: geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm-node/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm-node/pom.xml?rev=693977&r1=693976&r2=693977&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm-node/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm-node/pom.xml Wed Sep 10
14:00:52 2008
@@ -27,8 +27,11 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.geronimo.assemblies</groupId>
     <artifactId>geronimo-plugin-farm-node</artifactId>
+    <name>Geronim Plugin Farm Node Server Assembly</name>
     <packaging>server-assembly</packaging>
 
+    <description>An assembly that extends the framework assembly with the plugin farm
node plugin.</description>
+
     <build>
         <pluginManagement>
             <plugins>

Modified: geronimo/server/trunk/plugins/clustering/plugin-farm-it/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/plugin-farm-it/pom.xml?rev=693977&r1=693976&r2=693977&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/plugin-farm-it/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/plugin-farm-it/pom.xml Wed Sep 10 14:00:52 2008
@@ -67,6 +67,14 @@
                     <configuration>
                         <assemblies>
                             <assembly>
+                                <id>node</id>
+                                <groupId>org.apache.geronimo.assemblies</groupId>
+                                <artifactId>geronimo-plugin-farm-node</artifactId>
+                                <version>${geronimoVersion}</version>
+                                <classifier>bin</classifier>
+                                <type>zip</type>
+                            </assembly>
+                            <assembly>
                                 <id>jetty</id>
                                 <groupId>org.apache.geronimo.assemblies</groupId>
                                 <artifactId>geronimo-jetty6-javaee5</artifactId>
@@ -181,7 +189,7 @@
                                 <goal>start-multi-server</goal>
                             </goals>
                             <configuration>
-                                <assemblyId>${it-server}</assemblyId>
+                                <assemblyId>node</assemblyId>
                                 <logOutput>true</logOutput>
                                 <background>true</background>
                                 <verifyTimeout>300</verifyTimeout>
@@ -213,18 +221,18 @@
                                 </optionSets>
                             </configuration>
                         </execution>
-                        <execution>
-                            <id>install-plugin-farm-member-2</id>
-                            <phase>install</phase>
-                            <goals>
-                                <goal>install-plugin</goal>
-                            </goals>
-                            <configuration>
-                                <defaultGeronimoRepository>~/.m2/repository</defaultGeronimoRepository>
-                                <moduleId>org.apache.geronimo.configs/plugin-farm-member/${version}/car</moduleId>
-                                <port>1119</port>
-                            </configuration>
-                        </execution>
+                        <!--<execution>-->
+                            <!--<id>install-plugin-farm-member-2</id>-->
+                            <!--<phase>install</phase>-->
+                            <!--<goals>-->
+                                <!--<goal>install-plugin</goal>-->
+                            <!--</goals>-->
+                            <!--<configuration>-->
+                                <!--<defaultGeronimoRepository>~/.m2/repository</defaultGeronimoRepository>-->
+                                <!--<moduleId>org.apache.geronimo.configs/plugin-farm-member/${version}/car</moduleId>-->
+                                <!--<port>1119</port>-->
+                            <!--</configuration>-->
+                        <!--</execution>-->
                         <execution>
                             <id>install-plugin</id>
                             <phase>install</phase>

Modified: geronimo/server/trunk/plugins/clustering/plugin-farm-member/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/plugin-farm-member/pom.xml?rev=693977&r1=693976&r2=693977&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/plugin-farm-member/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/plugin-farm-member/pom.xml Wed Sep 10 14:00:52
2008
@@ -77,6 +77,20 @@
                     </dependencies>
                     <instance>
                         <plugin-artifact>
+                            <config-xml-content>
+                                <gbean name="DiscoveryPublisher">
+                                    <attribute name="nodeName">${NodeName}</attribute>
+                                    <attribute name="clusterName">${ClusterName}</attribute>
+                                </gbean>
+                                <gbean name="DiscoveryAgent">
+                                    <attribute name="host">${MulticastDiscoveryAddress}</attribute>
+                                    <attribute name="port">${MulticastDiscoveryPort}</attribute>
+                                </gbean>
+                            </config-xml-content>
+                            <config-substitution key="NodeName"></config-substitution>
+                            <config-substitution key="ClusterName">cluster1</config-substitution>
+                            <config-substitution key="MulticastDiscoveryAddress">239.255.3.2</config-substitution>
+                            <config-substitution key="MulticastDiscoveryPort">6142</config-substitution>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/clustering/plugin-farm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/plugin-farm/pom.xml?rev=693977&r1=693976&r2=693977&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/plugin-farm/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/plugin-farm/pom.xml Wed Sep 10 14:00:52 2008
@@ -90,6 +90,24 @@
                     </dependencies>
                     <instance>
                         <plugin-artifact>
+                            <config-xml-content>
+                                <gbean name="FarmDiscoveryListener">
+                                    <attribute name="defaultClusterName">${DefaultClusterName}</attribute>
+                                    <attribute name="userName">system</attribute>
+                                    <attribute name="password">manager</attribute>
+                                </gbean>
+                                <gbean name="DiscoveryAgent">
+                                    <attribute name="host">${MulticastDiscoveryAddress}</attribute>
+                                    <attribute name="port">${MulticastDiscoveryPort}</attribute>
+                                </gbean>
+                                <gbean name="PluginFarm">
+                                    <attribute name="defaultPluginRepository">~/.m2/repository</attribute>
+                                </gbean>
+                            </config-xml-content>
+                            <config-substitution key="DefaultPluginRepository">~/.m2/repository</config-substitution>
+                            <config-substitution key="DefaultClusterName">cluster1</config-substitution>
+                            <config-substitution key="MulticastDiscoveryAddress">239.255.3.2</config-substitution>
+                            <config-substitution key="MulticastDiscoveryPort">6142</config-substitution>
                         </plugin-artifact>
                     </instance>
                 </configuration>



Mime
View raw message