From scm-return-20445-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Wed Jul 04 12:25:12 2007 Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 19832 invoked from network); 4 Jul 2007 12:25:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Jul 2007 12:25:10 -0000 Received: (qmail 38071 invoked by uid 500); 4 Jul 2007 12:25:13 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 38032 invoked by uid 500); 4 Jul 2007 12:25:13 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 38021 invoked by uid 99); 4 Jul 2007 12:25:13 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jul 2007 05:25:12 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jul 2007 05:25:09 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 347C51A981A; Wed, 4 Jul 2007 05:24:49 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r553189 - in /geronimo/server/trunk: modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/TribesDispatcherHolder.java pom.xml Date: Wed, 04 Jul 2007 12:24:49 -0000 To: scm@geronimo.apache.org From: gdamour@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070704122449.347C51A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gdamour Date: Wed Jul 4 05:24:48 2007 New Revision: 553189 URL: http://svn.apache.org/viewvc?view=rev&rev=553189 Log: Move to WADI 2.0-SNAPSHOT and make the relevant changes to enable the WADI administration console. Modified: 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/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=553189&r1=553188&r2=553189 ============================================================================== --- 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 Wed Jul 4 05:24:48 2007 @@ -17,6 +17,7 @@ package org.apache.geronimo.clustering.wadi; import java.net.URI; +import java.util.Collections; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -26,7 +27,10 @@ import org.apache.geronimo.gbean.GBeanLifecycle; import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory; import org.codehaus.wadi.group.Dispatcher; +import org.codehaus.wadi.group.DispatcherRegistry; import org.codehaus.wadi.group.MessageExchangeException; +import org.codehaus.wadi.group.StaticDispatcherRegistry; +import org.codehaus.wadi.servicespace.admin.AdminServiceSpace; import org.codehaus.wadi.tribes.TribesDispatcher; import org.codehaus.wadi.web.impl.URIEndPoint; @@ -40,9 +44,10 @@ private final URI endPointURI; private final String clusterName; private final Node node; + private final DispatcherRegistry dispatcherRegistry; private TribesDispatcher dispatcher; - + private AdminServiceSpace adminServiceSpace; public TribesDispatcherHolder(URI endPointURI, String clusterName, Node node) { if (null == endPointURI) { @@ -55,22 +60,46 @@ this.endPointURI = endPointURI; this.clusterName = clusterName; this.node = node; + + dispatcherRegistry = new StaticDispatcherRegistry(); } public void doStart() throws Exception { - dispatcher = new TribesDispatcher(clusterName, node.getName(), new URIEndPoint(endPointURI), null); + dispatcher = new TribesDispatcher(clusterName, + node.getName(), + new URIEndPoint(endPointURI), + Collections.EMPTY_SET); dispatcher.start(); + + adminServiceSpace = new AdminServiceSpace(dispatcher); + adminServiceSpace.start(); + + dispatcherRegistry.register(dispatcher); } public void doStop() throws Exception { + if (null != adminServiceSpace) { + adminServiceSpace.stop(); + } + + dispatcherRegistry.unregister(dispatcher); dispatcher.stop(); } public void doFail() { + if (null != adminServiceSpace) { + try { + adminServiceSpace.stop(); + } catch (Exception e) { + log.error("see nested", e); + } + } + + dispatcherRegistry.unregister(dispatcher); try { dispatcher.stop(); } catch (MessageExchangeException e) { - log.error(e); + log.error("see nested", e); } } Modified: geronimo/server/trunk/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=553189&r1=553188&r2=553189 ============================================================================== --- geronimo/server/trunk/pom.xml (original) +++ geronimo/server/trunk/pom.xml Wed Jul 4 05:24:48 2007 @@ -988,19 +988,19 @@ org.codehaus.wadi wadi-core - 2.0-M4 + 2.0-SNAPSHOT org.codehaus.wadi wadi-group - 2.0-M4 + 2.0-SNAPSHOT org.codehaus.wadi wadi-tribes - 2.0-M4 + 2.0-SNAPSHOT