geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r926007 [2/2] - in /geronimo/server/branches/2.2/plugins/clustering: ./ geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/ geronimo-farm-wadi/ geronimo-farm-wadi/src/ geronimo-farm-wadi/src/main/ geronimo-farm-wadi/...
Date Mon, 22 Mar 2010 09:21:23 GMT
Added: geronimo/server/branches/2.2/plugins/clustering/plugin-farm-member-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/clustering/plugin-farm-member-wadi/pom.xml?rev=926007&view=auto
==============================================================================
--- geronimo/server/branches/2.2/plugins/clustering/plugin-farm-member-wadi/pom.xml (added)
+++ geronimo/server/branches/2.2/plugins/clustering/plugin-farm-member-wadi/pom.xml Mon Mar
22 09:21:20 2010
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 613667 $ $Date: 2008-01-20 12:18:37 -0800 (Sun, 20 Jan 2008) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>clustering</artifactId>
+        <version>2.2.1-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>plugin-farm-member-wadi</artifactId>
+    <name>Geronimo Plugins, Clustering :: Plugin Farm Member WADI</name>
+    <packaging>car</packaging>
+
+    <description>
+        Basic farming support based on WADI.
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>plugin</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>jmx-security</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+       <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-farm-wadi</artifactId>
+            <version>${version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>wadi-clustering</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <category>Clustering</category>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.geronimo.framework</groupId>
+                            <artifactId>geronimo-gbean-deployer</artifactId>
+                            <type>car</type>
+                            <import>classes</import>
+                        </dependency>
+                    </dependencies>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content>
+                                <gbean name="DiscoveryPublisher">
+                                    <attribute name="nodeName">${ClusterNodeName}</attribute>
+                                    <attribute name="clusterName">${ClusterName}</attribute>
+                                </gbean>
+                              </config-xml-content>
+                            <config-substitution key="ClusterName">cluster1</config-substitution>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Propchange: geronimo/server/branches/2.2/plugins/clustering/plugin-farm-member-wadi/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.2/plugins/clustering/plugin-farm-member-wadi/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/clustering/plugin-farm-member-wadi/src/main/history/dependencies.xml?rev=926007&view=auto
==============================================================================
--- geronimo/server/branches/2.2/plugins/clustering/plugin-farm-member-wadi/src/main/history/dependencies.xml
(added)
+++ geronimo/server/branches/2.2/plugins/clustering/plugin-farm-member-wadi/src/main/history/dependencies.xml
Mon Mar 22 09:21:20 2010
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+    <module-id>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>plugin-farm-member-wadi</artifactId>
+        <version>2.2.1-SNAPSHOT</version>
+        <type>car</type>
+    </module-id>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>wadi-clustering</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deployment</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-service-builder</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>jmx-security</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>plugin</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-farm</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-farm-wadi</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.xmlbeans</groupId>
+        <artifactId>xmlbeans</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>xml-resolver</groupId>
+        <artifactId>xml-resolver</artifactId>
+        <type>jar</type>
+    </dependency>
+</plugin-artifact>

Propchange: geronimo/server/branches/2.2/plugins/clustering/plugin-farm-member-wadi/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.2/plugins/clustering/plugin-farm-member-wadi/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/clustering/plugin-farm-member-wadi/src/main/plan/plan.xml?rev=926007&view=auto
==============================================================================
--- geronimo/server/branches/2.2/plugins/clustering/plugin-farm-member-wadi/src/main/plan/plan.xml
(added)
+++ geronimo/server/branches/2.2/plugins/clustering/plugin-farm-member-wadi/src/main/plan/plan.xml
Mon Mar 22 09:21:20 2010
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Rev: 594117 $ $Date: 2007-11-13 00:35:48 +1100 (Tue, 13 Nov 2007) $ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    
+    <gbean name="MulticastLocation" class="org.apache.geronimo.farm.discovery.multicast.MulticastLocation">
+        <attribute name="host">239.255.3.2</attribute>
+        <attribute name="port">6142</attribute>
+    </gbean>
+    
+    <gbean name="NodeServiceVitalsFactory" class="org.apache.geronimo.farm.service.NodeServiceVitalsFactory">
   
+        <attribute name="initialReconnectDelay">5000</attribute>
+        <attribute name="maxReconnectDelay">30000</attribute>
+        <attribute name="maxReconnectDelay">0</attribute>
+        <attribute name="backOffMultiplier">0</attribute>
+        <attribute name="useExponentialBackOff">false</attribute>
+    </gbean>
+    
+	<gbean name="NodeServiceTrackerClusteredServiceHolder" class="org.apache.geronimo.farm.service.NodeServiceTrackerClusteredServiceHolder">
+        <reference name="NodeServiceVitalsFactory">
+            <name>NodeServiceVitalsFactory</name>
+        </reference>  
+    </gbean>
+    
+    <gbean name="BasicWADISessionManagerHolder" class="org.apache.geronimo.clustering.wadi.BasicWADISessionManagerHolder">
+        <attribute name="serviceSpaceURI">farm://localhost:8080/serviceSpace/serviceTracker/</attribute>
+        <attribute name="sweepInterval">10</attribute>
+        <attribute name="sessionTimeout">3600</attribute>
+        <attribute name="numPartitions">24</attribute>
+        <attribute name="disableReplication">true</attribute>
+        <attribute name="deltaReplication">true</attribute>
+        <reference name="Cluster">
+            <name>DefaultCluster</name>
+        </reference>
+        <reference name="BackingStrategyFactory">
+            <name>DefaultBackingStrategyFactory</name>
+        </reference>
+        <references name="ServiceHolders">
+            <pattern>
+                <name>NodeServiceTrackerClusteredServiceHolder</name>
+            </pattern>
+        </references>
+        
+    </gbean>   
+    
+   <!--<gbean name="DiscoveryAgent" class="org.apache.geronimo.farm.discovery.multicast.MulticastDiscoveryAgent">
+        <attribute name="heartRate">500</attribute>
+        <attribute name="maxMissedHeartbeats">10</attribute>
+        <attribute name="loopbackMode">false</attribute>
+        <reference name="MulticastLocation">
+            <name>MulticastLocation</name>
+        </reference>
+        <reference name="NodeServiceVitalsFactory">
+            <name>NodeServiceVitalsFactory</name>
+        </reference>  
+    </gbean>--> 
+
+   <gbean name="DiscoveryAgent" class="org.apache.geronimo.farm.discovery.wadi.WADIDiscoveryAgent">
+        <attribute name="heartRate">5000</attribute>
+        <attribute name="maxMissedHeartbeats">10</attribute>
+        <reference name="BasicWADISessionManagerHolder">
+            <name>BasicWADISessionManagerHolder</name>
+        </reference>
+    </gbean>
+    
+    <gbean name="DiscoveryPublisher" class="org.apache.geronimo.farm.discovery.JmxDiscoveryPublisher">
+        <!--<attribute name="nodeName">FarmPersistence</attribute>-->
+        <attribute name="clusterName">cluster1</attribute>
+        <attribute name="protocol">rmi</attribute>
+        <attribute name="urlPath">JMXConnector</attribute>
+        <attribute name="discoveryType">farm</attribute>
+        <reference name="DiscoveryAgent">
+            <name>DiscoveryAgent</name>
+        </reference>
+        <reference name="RMIRegistryService">
+            <name>RMIRegistry</name>
+        </reference>
+        <dependency>
+            <name>PluginInstaller</name>
+        </dependency>
+    </gbean>
+    
+</module>

Propchange: geronimo/server/branches/2.2/plugins/clustering/plugin-farm-member-wadi/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.2/plugins/clustering/plugin-farm-member-wadi/src/main/resources/cluster-repository/EMPTY
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/clustering/plugin-farm-member-wadi/src/main/resources/cluster-repository/EMPTY?rev=926007&view=auto
==============================================================================
    (empty)

Added: geronimo/server/branches/2.2/plugins/clustering/plugin-farm-member-wadi/src/main/resources/master-repository/EMPTY
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/clustering/plugin-farm-member-wadi/src/main/resources/master-repository/EMPTY?rev=926007&view=auto
==============================================================================
    (empty)

Modified: geronimo/server/branches/2.2/plugins/clustering/plugin-farm-member/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/clustering/plugin-farm-member/src/main/plan/plan.xml?rev=926007&r1=926006&r2=926007&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/clustering/plugin-farm-member/src/main/plan/plan.xml
(original)
+++ geronimo/server/branches/2.2/plugins/clustering/plugin-farm-member/src/main/plan/plan.xml
Mon Mar 22 09:21:20 2010
@@ -20,6 +20,33 @@
 
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
 
+    
+    <gbean name="MulticastLocation" class="org.apache.geronimo.farm.discovery.multicast.MulticastLocation">
+        <attribute name="host">239.255.3.2</attribute>
+        <attribute name="port">6142</attribute>
+    </gbean>
+    
+    <gbean name="NodeServiceVitalsFactory" class="org.apache.geronimo.farm.service.NodeServiceVitalsFactory">
   
+        <attribute name="initialReconnectDelay">5000</attribute>
+        <attribute name="maxReconnectDelay">30000</attribute>
+        <attribute name="maxReconnectDelay">0</attribute>
+        <attribute name="backOffMultiplier">0</attribute>
+        <attribute name="useExponentialBackOff">false</attribute>
+    </gbean>
+    
+
+   <gbean name="DiscoveryAgent" class="org.apache.geronimo.farm.discovery.multicast.MulticastDiscoveryAgent">
+        <attribute name="heartRate">500</attribute>
+        <attribute name="maxMissedHeartbeats">10</attribute>
+        <attribute name="loopbackMode">false</attribute>
+        <reference name="MulticastLocation">
+            <name>MulticastLocation</name>
+        </reference>
+        <reference name="NodeServiceVitalsFactory">
+            <name>NodeServiceVitalsFactory</name>
+        </reference>  
+    </gbean>
+    
     <gbean name="DiscoveryPublisher" class="org.apache.geronimo.farm.discovery.JmxDiscoveryPublisher">
         <!--<attribute name="nodeName">FarmPersistence</attribute>-->
         <attribute name="clusterName">cluster1</attribute>
@@ -36,23 +63,5 @@
             <name>PluginInstaller</name>
         </dependency>
     </gbean>
-
-    <gbean name="MulticastLocation" class="org.apache.geronimo.farm.discovery.MulticastLocation">
-        <attribute name="host">239.255.3.2</attribute>
-        <attribute name="port">6142</attribute>
-    </gbean>
-
-    <gbean name="DiscoveryAgent" class="org.apache.geronimo.farm.discovery.MulticastDiscoveryAgent">
-        <attribute name="heartRate">500</attribute>
-        <attribute name="maxMissedHeartbeats">10</attribute>
-        <attribute name="loopbackMode">false</attribute>
-        <attribute name="initialReconnectDelay">5000</attribute>
-        <attribute name="maxReconnectDelay">30000</attribute>
-        <attribute name="backOffMultiplier">0</attribute>
-        <attribute name="useExponentialBackOff">false</attribute>
-        <reference name="MulticastLocation">
-            <name>MulticastLocation</name>
-        </reference>
-    </gbean>
-
+    
 </module>

Added: geronimo/server/branches/2.2/plugins/clustering/plugin-farm-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/clustering/plugin-farm-wadi/pom.xml?rev=926007&view=auto
==============================================================================
--- geronimo/server/branches/2.2/plugins/clustering/plugin-farm-wadi/pom.xml (added)
+++ geronimo/server/branches/2.2/plugins/clustering/plugin-farm-wadi/pom.xml Mon Mar 22 09:21:20
2010
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 613667 $ $Date: 2008-01-20 12:18:37 -0800 (Sun, 20 Jan 2008) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>clustering</artifactId>
+        <version>2.2.1-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>plugin-farm-wadi</artifactId>
+    <name>Geronimo Plugins, Clustering :: Plugin Farm WADI</name>
+    <packaging>car</packaging>
+
+    <description>
+        Basic farming support based on WADI.
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>plugin</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>plugin-farm-datasource</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>wadi-clustering</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+               
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-farm-wadi</artifactId>
+            <version>${version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-plugin-farm</artifactId>
+            <version>${version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <category>Clustering</category>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.geronimo.framework</groupId>
+                            <artifactId>geronimo-gbean-deployer</artifactId>
+                            <type>car</type>
+                            <import>classes</import>
+                        </dependency>
+                    </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="PluginFarm">
+                                    <attribute name="defaultPluginRepository">${DefaultPluginRepository}</attribute>
+                                </gbean>
+                            </config-xml-content>
+                            <config-substitution key="DefaultPluginRepository">~/.m2/repository</config-substitution>
+                            <config-substitution key="DefaultClusterName">cluster1</config-substitution>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Propchange: geronimo/server/branches/2.2/plugins/clustering/plugin-farm-wadi/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.2/plugins/clustering/plugin-farm-wadi/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/clustering/plugin-farm-wadi/src/main/history/dependencies.xml?rev=926007&view=auto
==============================================================================
--- geronimo/server/branches/2.2/plugins/clustering/plugin-farm-wadi/src/main/history/dependencies.xml
(added)
+++ geronimo/server/branches/2.2/plugins/clustering/plugin-farm-wadi/src/main/history/dependencies.xml
Mon Mar 22 09:21:20 2010
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+    <module-id>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>plugin-farm-wadi</artifactId>
+        <version>2.2.1-SNAPSHOT</version>
+        <type>car</type>
+    </module-id>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>openjpa</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>plugin-farm-datasource</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>wadi-clustering</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency start="true">
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-gbean-deployer</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>plugin</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-farm</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-farm-wadi</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-plugin-farm</artifactId>
+        <type>jar</type>
+    </dependency>
+</plugin-artifact>

Propchange: geronimo/server/branches/2.2/plugins/clustering/plugin-farm-wadi/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.2/plugins/clustering/plugin-farm-wadi/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/clustering/plugin-farm-wadi/src/main/plan/plan.xml?rev=926007&view=auto
==============================================================================
--- geronimo/server/branches/2.2/plugins/clustering/plugin-farm-wadi/src/main/plan/plan.xml
(added)
+++ geronimo/server/branches/2.2/plugins/clustering/plugin-farm-wadi/src/main/plan/plan.xml
Mon Mar 22 09:21:20 2010
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Rev: 594117 $ $Date: 2007-11-13 00:35:48 +1100 (Tue, 13 Nov 2007) $ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <gbean name="FarmPersistence" class="org.apache.geronimo.persistence.PersistenceUnitGBean">
+        <attribute name="persistenceUnitName">FarmPersistence</attribute>
+        <attribute name="persistenceUnitTransactionType">RESOURCE_LOCAL</attribute>
+        <attribute name="persistenceUnitRoot"></attribute>
+        <attribute name="excludeUnlistedClasses">true</attribute>
+        <attribute name="managedClassNames">org.apache.geronimo.farm.plugin.JpaClusterInfo,
+            org.apache.geronimo.farm.plugin.JpaNodeInfo,
+            org.apache.geronimo.farm.plugin.JpaPluginInstance,
+            org.apache.geronimo.farm.plugin.JpaPluginList
+        </attribute>
+        <attribute name="properties">
+            openjpa.Log=commons
+            openjpa.jdbc.DBDictionary=org.apache.openjpa.jdbc.sql.DerbyDictionary
+            openjpa.jdbc.SynchronizeMappings=buildSchema(ForeignKeys=true)
+            openjpa.jdbc.UpdateManager=operation-order
+            openjpa.Sequence=table(Table=OPENJPASEQ, Increment=100)
+            openjpa.InverseManager=true
+        </attribute>
+        <reference name="JtaDataSourceWrapper">
+            <name>PluginFarmDatasource</name>
+        </reference>
+        <reference name="NonJtaDataSourceWrapper">
+            <name>NoTxPluginFarmDatasource</name>
+        </reference>
+    </gbean>
+
+    <gbean name="PluginFarm" class="org.apache.geronimo.farm.plugin.FarmGBean">
+        <attribute name="defaultPluginRepository">~/.m2/repository</attribute>
+        <reference name="PersistenceUnit">
+            <name>FarmPersistence</name>
+        </reference>
+    </gbean>
+
+   <gbean name="NodeServiceVitalsFactory" class="org.apache.geronimo.farm.service.NodeServiceVitalsFactory">
+       
+        <attribute name="initialReconnectDelay">5000</attribute>
+        <attribute name="maxReconnectDelay">30000</attribute>
+        <attribute name="maxReconnectDelay">0</attribute>
+        <attribute name="backOffMultiplier">0</attribute>
+        <attribute name="useExponentialBackOff">false</attribute>
+
+    </gbean>
+    
+    <gbean name="NodeServiceTrackerClusteredServiceHolder" class="org.apache.geronimo.farm.service.NodeServiceTrackerClusteredServiceHolder">
+        <reference name="NodeServiceVitalsFactory">
+            <name>NodeServiceVitalsFactory</name>
+        </reference>  
+    </gbean>
+    
+    <gbean name="BasicWADISessionManagerHolder" class="org.apache.geronimo.clustering.wadi.BasicWADISessionManagerHolder">
+        <attribute name="serviceSpaceURI">farm://localhost:8080/serviceSpace/serviceTracker/</attribute>
+        <attribute name="sweepInterval">10</attribute>
+        <attribute name="sessionTimeout">3600</attribute>
+        <attribute name="numPartitions">24</attribute>
+        <attribute name="disableReplication">true</attribute>
+        <attribute name="deltaReplication">true</attribute>
+        <reference name="Cluster">
+            <name>DefaultCluster</name>
+        </reference>
+        <reference name="BackingStrategyFactory">
+            <name>DefaultBackingStrategyFactory</name>
+        </reference>
+        <references name="ServiceHolders">
+            <pattern>
+                <name>NodeServiceTrackerClusteredServiceHolder</name>
+            </pattern>
+        </references>
+        
+    </gbean>    
+    
+   <gbean name="DiscoveryAgent" class="org.apache.geronimo.farm.discovery.wadi.WADIDiscoveryAgent">
+        <attribute name="heartRate">5000</attribute>
+        <attribute name="maxMissedHeartbeats">10</attribute>
+        <reference name="BasicWADISessionManagerHolder">
+            <name>BasicWADISessionManagerHolder</name>
+        </reference>
+    </gbean>
+
+    <gbean name="FarmDiscoveryListener" class="org.apache.geronimo.farm.plugin.FarmDiscoveryListener">
+        <attribute name="defaultClusterName">cluster1</attribute>
+        <attribute name="discoveryType">farm</attribute>
+        <attribute name="userName">system</attribute>
+        <attribute name="password">manager</attribute>
+        <reference name="DiscoveryAgent">
+            <name>DiscoveryAgent</name>
+        </reference>
+        <reference name="NodeListener">
+            <name>PluginFarm</name>
+        </reference>
+    </gbean>
+
+</module>

Propchange: geronimo/server/branches/2.2/plugins/clustering/plugin-farm-wadi/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.2/plugins/clustering/plugin-farm-wadi/src/main/resources/cluster-repository/EMPTY
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/clustering/plugin-farm-wadi/src/main/resources/cluster-repository/EMPTY?rev=926007&view=auto
==============================================================================
    (empty)

Added: geronimo/server/branches/2.2/plugins/clustering/plugin-farm-wadi/src/main/resources/master-repository/EMPTY
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/clustering/plugin-farm-wadi/src/main/resources/master-repository/EMPTY?rev=926007&view=auto
==============================================================================
    (empty)

Modified: geronimo/server/branches/2.2/plugins/clustering/plugin-farm/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/clustering/plugin-farm/src/main/plan/plan.xml?rev=926007&r1=926006&r2=926007&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/clustering/plugin-farm/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.2/plugins/clustering/plugin-farm/src/main/plan/plan.xml Mon
Mar 22 09:21:20 2010
@@ -53,7 +53,8 @@
         </reference>
     </gbean>
 
-    <gbean name="MulticastLocation" class="org.apache.geronimo.farm.discovery.MulticastLocation">
+
+    <gbean name="MulticastLocation" class="org.apache.geronimo.farm.discovery.multicast.MulticastLocation">
         <attribute name="host">239.255.3.2</attribute>
         <attribute name="port">6142</attribute>
     </gbean>
@@ -63,18 +64,28 @@
             <name>MulticastLocation</name>
         </reference>
     </gbean>
-
-    <gbean name="DiscoveryAgent" class="org.apache.geronimo.farm.discovery.MulticastDiscoveryAgent">
-        <attribute name="heartRate">500</attribute>
-        <attribute name="maxMissedHeartbeats">10</attribute>
-        <attribute name="loopbackMode">false</attribute>
+    
+   <gbean name="NodeServiceVitalsFactory" class="org.apache.geronimo.farm.service.NodeServiceVitalsFactory">
+       
         <attribute name="initialReconnectDelay">5000</attribute>
         <attribute name="maxReconnectDelay">30000</attribute>
+        <attribute name="maxReconnectDelay">0</attribute>
         <attribute name="backOffMultiplier">0</attribute>
         <attribute name="useExponentialBackOff">false</attribute>
+
+    </gbean>
+      
+    
+    <gbean name="DiscoveryAgent" class="org.apache.geronimo.farm.discovery.multicast.MulticastDiscoveryAgent">
+        <attribute name="heartRate">500</attribute>
+        <attribute name="maxMissedHeartbeats">10</attribute>
+        <attribute name="loopbackMode">false</attribute>
         <reference name="MulticastLocation">
             <name>MulticastLocation</name>
         </reference>
+        <reference name="NodeServiceVitalsFactory">
+            <name>NodeServiceVitalsFactory</name>
+        </reference>  
     </gbean>
 
     <gbean name="FarmDiscoveryListener" class="org.apache.geronimo.farm.plugin.FarmDiscoveryListener">

Modified: geronimo/server/branches/2.2/plugins/clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/clustering/pom.xml?rev=926007&r1=926006&r2=926007&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/clustering/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/clustering/pom.xml Mon Mar 22 09:21:20 2010
@@ -37,18 +37,18 @@
         <module>geronimo-clustering</module>
         <module>geronimo-clustering-wadi</module>
         <module>geronimo-farm</module>
-        <!-- <module>geronimo-farm-wadi</module>-->
+        <module>geronimo-farm-wadi</module>
         <module>geronimo-deploy-farm</module>
         <module>geronimo-plugin-farm</module>
         <module>clustering</module>
         <module>wadi-clustering</module>
         <module>farming</module>
         <module>plugin-farm</module>
-        <!--<module>plugin-farm-wadi</module>-->
+        <module>plugin-farm-wadi</module>
         <module>plugin-farm-member</module>
-        <!-- <module>plugin-farm-member-wadi</module>-->
+        <module>plugin-farm-member-wadi</module>
         <module>geronimo-plugin-farm-node</module>
-        <!-- <module>geronimo-plugin-farm-node-wadi</module>-->
+        <module>geronimo-plugin-farm-node-wadi</module>
         <module>plugin-farm-datasource</module>
     </modules>
 



Mime
View raw message