Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 88451 invoked from network); 12 Jan 2006 21:47:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 12 Jan 2006 21:47:01 -0000 Received: (qmail 1814 invoked by uid 500); 12 Jan 2006 21:47:01 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 1659 invoked by uid 500); 12 Jan 2006 21:47:00 -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 1648 invoked by uid 99); 12 Jan 2006 21:46:59 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Jan 2006 13:46:59 -0800 X-ASF-Spam-Status: No, hits=-8.6 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 12 Jan 2006 13:46:58 -0800 Received: (qmail 88357 invoked by uid 65534); 12 Jan 2006 21:46:38 -0000 Message-ID: <20060112214638.88355.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r368481 - /geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoServerBehaviour.java Date: Thu, 12 Jan 2006 21:46:38 -0000 To: scm@geronimo.apache.org From: sppatel@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: sppatel Date: Thu Jan 12 13:46:36 2006 New Revision: 368481 URL: http://svn.apache.org/viewcvs?rev=368481&view=rev Log: partial fix for handling delta's in project Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoServerBehaviour.java Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoServerBehaviour.java URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoServerBehaviour.java?rev=368481&r1=368480&r2=368481&view=diff ============================================================================== --- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoServerBehaviour.java (original) +++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoServerBehaviour.java Thu Jan 12 13:46:36 2006 @@ -180,16 +180,17 @@ */ public void publishModule(int kind, int deltaKind, IModule[] module, IProgressMonitor monitor) throws CoreException { - Trace.trace(Trace.INFO, ">> publishModule(), deltaKind = " + kind); + Trace.trace(Trace.INFO, ">> publishModule(), deltaKind = " + deltaKind); Trace.trace(Trace.INFO, Arrays.asList(module).toString()); _monitor = monitor; - if (deltaKind != NO_CHANGE && module.length == 1) { - invokeCommand(deltaKind, module[0]); + if (module.length == 1 + && (deltaKind == ADDED || deltaKind == REMOVED)) { + invokeCommand(deltaKind, module[0]); + } else if (deltaKind == CHANGED) { + invokeCommand(deltaKind, module[0]); } - - setModulePublishState(module, IServer.PUBLISH_STATE_NONE); - + Trace.trace(Trace.INFO, "<< publishModule()"); } @@ -321,10 +322,14 @@ existingPrgArgs); } - Trace.trace(Trace.INFO, "VM_INSTALL_TYPE: " + workingCopy.getAttribute( - IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE, "")); - Trace.trace(Trace.INFO, "VM_INSTALL_NAME: " + workingCopy.getAttribute( - IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_NAME, "")); + Trace.trace(Trace.INFO, "VM_INSTALL_TYPE: " + + workingCopy.getAttribute( + IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE, + "")); + Trace.trace(Trace.INFO, "VM_INSTALL_NAME: " + + workingCopy.getAttribute( + IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_NAME, + "")); } /**