geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gdam...@apache.org
Subject svn commit: r543877 - in /geronimo/server/trunk: configs/wadi-clustering/pom.xml configs/wadi-clustering/src/plan/plan.xml modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/TribesDispatcherHolder.java pom.xml
Date Sun, 03 Jun 2007 10:50:38 GMT
Author: gdamour
Date: Sun Jun  3 03:50:37 2007
New Revision: 543877

URL: http://svn.apache.org/viewvc?view=rev&rev=543877
Log:
move to WADI 2.0-M4

Modified:
    geronimo/server/trunk/configs/wadi-clustering/pom.xml
    geronimo/server/trunk/configs/wadi-clustering/src/plan/plan.xml
    geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/TribesDispatcherHolder.java
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/configs/wadi-clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/wadi-clustering/pom.xml?view=diff&rev=543877&r1=543876&r2=543877
==============================================================================
--- geronimo/server/trunk/configs/wadi-clustering/pom.xml (original)
+++ geronimo/server/trunk/configs/wadi-clustering/pom.xml Sun Jun  3 03:50:37 2007
@@ -39,7 +39,6 @@
         <PlanNbReplica>2</PlanNbReplica>
         <EndPointURI>http://localhost:8080</EndPointURI>
         <PlanClusterName>DEFAULT_CLUSTER</PlanClusterName>
-        <PlanInactiveTime>3600</PlanInactiveTime>
     </properties>
 
     <dependencies>

Modified: geronimo/server/trunk/configs/wadi-clustering/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/wadi-clustering/src/plan/plan.xml?view=diff&rev=543877&r1=543876&r2=543877
==============================================================================
--- geronimo/server/trunk/configs/wadi-clustering/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/wadi-clustering/src/plan/plan.xml Sun Jun  3 03:50:37 2007
@@ -33,7 +33,6 @@
     <gbean name="DefaultDispatcherHolder" class="org.apache.geronimo.clustering.wadi.TribesDispatcherHolder">
         <attribute name="endPointURI">${EndPointURI}</attribute>
         <attribute name="clusterName">${PlanClusterName}</attribute>
-        <attribute name="inactiveTime">${PlanInactiveTime}</attribute>
         <reference name="Node">
             <name>Node</name>
         </reference>

Modified: geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/TribesDispatcherHolder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/TribesDispatcherHolder.java?view=diff&rev=543877&r1=543876&r2=543877
==============================================================================
--- geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/TribesDispatcherHolder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/TribesDispatcherHolder.java
Sun Jun  3 03:50:37 2007
@@ -39,30 +39,26 @@
     
     private final URI endPointURI;
     private final String clusterName;
-    private final long inactiveTime;
     private final Node node;
 
     private TribesDispatcher dispatcher;
 
 
-    public TribesDispatcherHolder(URI endPointURI, String clusterName, long inactiveTime,
Node node) {
+    public TribesDispatcherHolder(URI endPointURI, String clusterName, Node node) {
         if (null == endPointURI) {
             throw new IllegalArgumentException("endPointURI is required");
         } else if (null == clusterName) {
             throw new IllegalArgumentException("clusterName is required");
-        } else if (0 > inactiveTime) {
-            throw new IllegalArgumentException("inactiveTime must be > 0");
         } else if (null == node) {
             throw new IllegalArgumentException("node is required");
         }
         this.endPointURI = endPointURI;
         this.clusterName = clusterName;
-        this.inactiveTime = inactiveTime;
         this.node = node;
     }
 
     public void doStart() throws Exception {
-        dispatcher = new TribesDispatcher(clusterName, node.getName(), new URIEndPoint(endPointURI),
inactiveTime, null);
+        dispatcher = new TribesDispatcher(clusterName, node.getName(), new URIEndPoint(endPointURI));
         dispatcher.start();
     }
 
@@ -92,7 +88,6 @@
     public static final String GBEAN_ATTR_END_POINT_URI = "endPointURI";
     public static final String GBEAN_ATTR_CLUSTER_NAME = "clusterName";
     public static final String GBEAN_ATTR_CLUSTER_URI = "clusterUri";
-    public static final String GBEAN_ATTR_INACTIVE_TIME = "inactiveTime";
 
     public static final String GBEAN_REF_NODE = "Node";
 
@@ -102,7 +97,6 @@
         
         infoBuilder.addAttribute(GBEAN_ATTR_END_POINT_URI, URI.class, true);
         infoBuilder.addAttribute(GBEAN_ATTR_CLUSTER_NAME, String.class, true);
-        infoBuilder.addAttribute(GBEAN_ATTR_INACTIVE_TIME, long.class, true);
         
         infoBuilder.addReference(GBEAN_REF_NODE, Node.class, NameFactory.GERONIMO_SERVICE);
 
@@ -110,8 +104,7 @@
         
         infoBuilder.setConstructor(new String[] {
                 GBEAN_ATTR_END_POINT_URI,
-                GBEAN_ATTR_CLUSTER_NAME, 
-                GBEAN_ATTR_INACTIVE_TIME, 
+                GBEAN_ATTR_CLUSTER_NAME,
                 GBEAN_REF_NODE });
         
         GBEAN_INFO = infoBuilder.getBeanInfo();

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=543877&r1=543876&r2=543877
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Sun Jun  3 03:50:37 2007
@@ -988,19 +988,19 @@
             <dependency>
                 <groupId>org.codehaus.wadi</groupId>
                 <artifactId>wadi-core</artifactId>
-                <version>2.0M3-SNAPSHOT</version>
+                <version>2.0-M4</version>
             </dependency>
 
             <dependency>
                 <groupId>org.codehaus.wadi</groupId>
                 <artifactId>wadi-group</artifactId>
-                <version>2.0M3-SNAPSHOT</version>
+                <version>2.0-M4</version>
             </dependency>
 
             <dependency>
                 <groupId>org.codehaus.wadi</groupId>
                 <artifactId>wadi-tribes</artifactId>
-                <version>2.0M3-SNAPSHOT</version>
+                <version>2.0-M4</version>
             </dependency>
 
             <dependency>



Mime
View raw message