Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 72120 invoked from network); 24 Feb 2011 07:03:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 24 Feb 2011 07:03:16 -0000 Received: (qmail 28870 invoked by uid 500); 24 Feb 2011 07:03:15 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 28735 invoked by uid 500); 24 Feb 2011 07:03: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 28728 invoked by uid 99); 24 Feb 2011 07:03:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Feb 2011 07:03:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Feb 2011 07:03:11 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 547792388903; Thu, 24 Feb 2011 07:02:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1074054 - in /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui: META-INF/MANIFEST.MF src/main/java/org/apache/geronimo/st/v30/ui/internal/GeronimoRuntimeWizardFragment.java Date: Thu, 24 Feb 2011 07:02:50 -0000 To: scm@geronimo.apache.org From: hanhongfang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110224070250.547792388903@eris.apache.org> Author: hanhongfang Date: Thu Feb 24 07:02:49 2011 New Revision: 1074054 URL: http://svn.apache.org/viewvc?rev=1074054&view=rev Log: GERONIMODEVTOOLS-716 Automatically switch "target platform" to Geronimo Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/META-INF/MANIFEST.MF geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/GeronimoRuntimeWizardFragment.java Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/META-INF/MANIFEST.MF?rev=1074054&r1=1074053&r2=1074054&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/META-INF/MANIFEST.MF (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/META-INF/MANIFEST.MF Thu Feb 24 07:02:49 2011 @@ -34,6 +34,7 @@ Require-Bundle: org.eclipse.wst.server.ui, org.eclipse.wst.sse.ui, org.eclipse.wst.xml.ui, - org.eclipse.core.variables + org.eclipse.core.variables, + org.eclipse.pde.core Bundle-ActivationPolicy: lazy Bundle-Vendor: Apache Software Foundation Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/GeronimoRuntimeWizardFragment.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/GeronimoRuntimeWizardFragment.java?rev=1074054&r1=1074053&r2=1074054&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/GeronimoRuntimeWizardFragment.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/GeronimoRuntimeWizardFragment.java Thu Feb 24 07:02:49 2011 @@ -53,6 +53,11 @@ import org.eclipse.jface.preference.IPre import org.eclipse.jface.preference.PreferenceDialog; import org.eclipse.jface.preference.PreferenceManager; import org.eclipse.jface.window.Window; +import org.eclipse.pde.internal.core.PDECore; +import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition; +import org.eclipse.pde.internal.core.target.provisional.ITargetHandle; +import org.eclipse.pde.internal.core.target.provisional.ITargetPlatformService; +import org.eclipse.pde.internal.core.target.provisional.LoadTargetDefinitionJob; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.BusyIndicator; import org.eclipse.swt.events.ModifyEvent; @@ -447,6 +452,29 @@ public class GeronimoRuntimeWizardFragme copyFile(template, destination, getLocationEntryLists(geronimoServerLocation)); } + + ITargetPlatformService service = (ITargetPlatformService)PDECore.getDefault().acquireService( + ITargetPlatformService.class.getName()); + ITargetHandle activeTargetHandle = service.getWorkspaceTargetHandle(); + ITargetHandle[] targetHandles = service.getTargets(null); + ITargetHandle geronimoTargetHandle = null; + for (ITargetHandle cur : targetHandles) { + if (cur.getTargetDefinition().getName().equals("Apache Geronimo 3.0")) { + geronimoTargetHandle = cur; + } + } + if (geronimoTargetHandle != null) { + boolean resetFlag = false; + if (activeTargetHandle == null ) { + resetFlag = true; + } else if (!activeTargetHandle.equals(geronimoTargetHandle)) { + resetFlag = true; + } + if (resetFlag) { + ITargetDefinition geronimoTarget = geronimoTargetHandle.getTargetDefinition(); + LoadTargetDefinitionJob.load(geronimoTarget); + } + } } protected void copyFile(URL source, IPath dest, String replacement) throws CoreException {