Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 69443 invoked from network); 24 May 2006 16:44:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 24 May 2006 16:44:17 -0000 Received: (qmail 95605 invoked by uid 500); 24 May 2006 16:44:16 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 95569 invoked by uid 500); 24 May 2006 16:44:15 -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 95558 invoked by uid 99); 24 May 2006 16:44:15 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 May 2006 09:44:15 -0700 X-ASF-Spam-Status: No, hits=0.6 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 May 2006 09:44:15 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 139991A983A; Wed, 24 May 2006 09:43:55 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r409202 - /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServerBehaviour.java Date: Wed, 24 May 2006 16:43:54 -0000 To: scm@geronimo.apache.org From: sppatel@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060524164355.139991A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: sppatel Date: Wed May 24 09:43:54 2006 New Revision: 409202 URL: http://svn.apache.org/viewvc?rev=409202&view=rev Log: GERONIMODEVTOOLS-73 Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServerBehaviour.java Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServerBehaviour.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServerBehaviour.java?rev=409202&r1=409201&r2=409202&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServerBehaviour.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServerBehaviour.java Wed May 24 09:43:54 2006 @@ -24,6 +24,7 @@ import javax.enterprise.deploy.spi.Target; import javax.management.MBeanServerConnection; +import javax.management.MalformedObjectNameException; import javax.management.ObjectName; import javax.management.remote.JMXConnector; import javax.management.remote.JMXConnectorFactory; @@ -33,6 +34,7 @@ import org.apache.geronimo.gbean.GBeanData; import org.apache.geronimo.gbean.GBeanQuery; import org.apache.geronimo.kernel.GBeanNotFoundException; +import org.apache.geronimo.kernel.InternalKernelException; import org.apache.geronimo.kernel.Kernel; import org.apache.geronimo.kernel.config.Configuration; import org.apache.geronimo.kernel.config.PersistentConfigurationList; @@ -173,19 +175,27 @@ * @see org.eclipse.wst.server.core.internal.IModulePublishHelper#getPublishDirectory(org.eclipse.wst.server.core.IModule[]) */ public IPath getPublishDirectory(IModule[] module) { - IPath path = null; - if (module.length == 1) { - try { - String configId = getConfigId(module[0]); - ObjectName on = Configuration.getConfigurationObjectName(URI.create(configId)); - GBeanData data = kernel.getGBeanData(on); - URL url = (URL) data.getAttribute("baseURL"); - return new Path(url.getFile()); - } catch (Exception e) { - e.printStackTrace(); - } + if(module == null || module.length == 0) + return null; + + try { + String configId = getConfigId(module[0]); + ObjectName on = Configuration.getConfigurationObjectName(URI.create(configId)); + GBeanData data = kernel.getGBeanData(on); + URL url = (URL) data.getAttribute("baseURL"); + IPath modulePath = new Path(url.getFile()); + if(module.length == 2) { + modulePath = modulePath.append(module[1].getName()); + } + } catch (MalformedObjectNameException e) { + e.printStackTrace(); + } catch (GBeanNotFoundException e) { + e.printStackTrace(); + } catch (InternalKernelException e) { + e.printStackTrace(); } - return path; + + return null; } /* (non-Javadoc)