Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 64894 invoked from network); 28 Sep 2005 13:57:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 28 Sep 2005 13:57:49 -0000 Received: (qmail 81379 invoked by uid 500); 28 Sep 2005 13:57:48 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 81356 invoked by uid 500); 28 Sep 2005 13:57:47 -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 81343 invoked by uid 99); 28 Sep 2005 13:57:47 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Sep 2005 06:57:47 -0700 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,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; Wed, 28 Sep 2005 06:57:54 -0700 Received: (qmail 64786 invoked by uid 65534); 28 Sep 2005 13:57:26 -0000 Message-ID: <20050928135726.64785.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r292180 - in /geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal: DeploymentPlanCreationOperation.java GeronimoServerBehaviour.java Date: Wed, 28 Sep 2005 13:57:25 -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: Wed Sep 28 06:57:22 2005 New Revision: 292180 URL: http://svn.apache.org/viewcvs?rev=292180&view=rev Log: fix extended op to check for target runtime Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/DeploymentPlanCreationOperation.java 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/DeploymentPlanCreationOperation.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/DeploymentPlanCreationOperation.java?rev=292180&r1=292179&r2=292180&view=diff ============================================================================== --- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/DeploymentPlanCreationOperation.java (original) +++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/DeploymentPlanCreationOperation.java Wed Sep 28 06:57:22 2005 @@ -36,7 +36,6 @@ import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.emf.ecore.xmi.XMIResource; -import org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties; import org.eclipse.wst.common.componentcore.ComponentCore; import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties; import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants; @@ -44,6 +43,8 @@ import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.frameworks.datamodel.properties.IFlexibleProjectCreationDataModelProperties; +import org.eclipse.wst.server.core.IRuntime; +import org.eclipse.wst.server.core.ServerCore; import org.openejb.xml.ns.openejb.jar.JarFactory; import org.openejb.xml.ns.openejb.jar.OpenejbJarType; @@ -57,7 +58,7 @@ } public IStatus execute(IProgressMonitor monitor, IAdaptable info) - throws ExecutionException { + throws ExecutionException { if (isGeronimoRuntimeTarget()) { @@ -154,12 +155,9 @@ } public boolean isGeronimoRuntimeTarget() { - - String runtimeTarget = model.getProperty( - IJavaComponentCreationDataModelProperties.RUNTIME_TARGET_ID) - .toString(); - - return runtimeTarget.startsWith("Apache Geronimo"); + + IRuntime runtime = ServerCore.getProjectProperties(getProject()).getRuntimeTarget(); + return runtime.getName().startsWith("Apache Geronimo"); } 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=292180&r1=292179&r2=292180&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 Wed Sep 28 06:57:22 2005 @@ -60,7 +60,6 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Status; import org.eclipse.jst.server.core.IJ2EEModule; import org.eclipse.jst.server.generic.core.internal.GenericServerBehaviour;