Return-Path: Delivered-To: apmail-forrest-svn-archive@www.apache.org Received: (qmail 49449 invoked from network); 17 Aug 2005 16:33:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 17 Aug 2005 16:33:24 -0000 Received: (qmail 76590 invoked by uid 500); 17 Aug 2005 16:33:23 -0000 Delivered-To: apmail-forrest-svn-archive@forrest.apache.org Received: (qmail 76545 invoked by uid 500); 17 Aug 2005 16:33:23 -0000 Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Forrest Developers List" List-Id: Delivered-To: mailing list svn@forrest.apache.org Received: (qmail 76532 invoked by uid 99); 17 Aug 2005 16:33:23 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Aug 2005 09:33:23 -0700 X-ASF-Spam-Status: No, hits=-9.3 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,WEIRD_PORT 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, 17 Aug 2005 09:33:43 -0700 Received: (qmail 49414 invoked by uid 65534); 17 Aug 2005 16:33:22 -0000 Message-ID: <20050817163322.49412.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r233195 - in /forrest/trunk/tools/eclipse/plugins/org.apache.forrest: META-INF/MANIFEST.MF src/org/apache/forrest/eclipse/job/ForrestRunner.java Date: Wed, 17 Aug 2005 16:33:21 -0000 To: svn@forrest.apache.org From: rgardler@apache.org X-Mailer: svnmailer-1.0.3 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: rgardler Date: Wed Aug 17 09:33:05 2005 New Revision: 233195 URL: http://svn.apache.org/viewcvs?rev=233195&view=rev Log: WTP 0.7 compatability (reported by Adam Chandler) Modified: forrest/trunk/tools/eclipse/plugins/org.apache.forrest/META-INF/MANIFEST.MF forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/job/ForrestRunner.java Modified: forrest/trunk/tools/eclipse/plugins/org.apache.forrest/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewcvs/forrest/trunk/tools/eclipse/plugins/org.apache.forrest/META-INF/MANIFEST.MF?rev=233195&r1=233194&r2=233195&view=diff ============================================================================== --- forrest/trunk/tools/eclipse/plugins/org.apache.forrest/META-INF/MANIFEST.MF (original) +++ forrest/trunk/tools/eclipse/plugins/org.apache.forrest/META-INF/MANIFEST.MF Wed Aug 17 09:33:05 2005 @@ -48,7 +48,7 @@ org.eclipse.debug.core, org.eclipse.ui.ide, org.eclipse.debug.ui, - org.eclipse.wst.internet.webbrowser, org.apache.forrest.eclipse.servletEngine, - org.eclipse.ui.views + org.eclipse.ui.views, + org.eclipse.wst.web.ui Eclipse-AutoStart: true Modified: forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/job/ForrestRunner.java URL: http://svn.apache.org/viewcvs/forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/job/ForrestRunner.java?rev=233195&r1=233194&r2=233195&view=diff ============================================================================== --- forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/job/ForrestRunner.java (original) +++ forrest/trunk/tools/eclipse/plugins/org.apache.forrest/src/org/apache/forrest/eclipse/job/ForrestRunner.java Wed Aug 17 09:33:05 2005 @@ -33,8 +33,6 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.ui.browser.IWebBrowser; import org.eclipse.ui.browser.IWorkbenchBrowserSupport; -import org.eclipse.wst.internet.webbrowser.internal.Trace; -import org.eclipse.wst.internet.webbrowser.internal.WebBrowserUIPlugin; /** * Run a version of Forrest @@ -179,15 +177,14 @@ URL url; try { url = new URL("http://localhost:8888"); - IWorkbenchBrowserSupport browserSupport = WebBrowserUIPlugin - .getInstance().getWorkbench().getBrowserSupport(); + IWorkbenchBrowserSupport browserSupport = ForrestPlugin.getDefault().getWorkbench().getBrowserSupport(); IWebBrowser browser = browserSupport.createBrowser( IWorkbenchBrowserSupport.LOCATION_BAR | IWorkbenchBrowserSupport.NAVIGATION_BAR, null, null, null); browser.openURL(url); } catch (Exception e) { - Trace.trace(Trace.SEVERE, "Error opening browser", e); + logger.error("Error opening browser", e); } } });