Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 92210 Details for
Bug 208110
Generic Recorder Wizard enhancement to filter the list of recorders
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Patch
Bugzilla_208110_patch.txt (text/plain), 102.16 KB, created by
Paul Slauenwhite
on 2008-03-11 14:09:17 EDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Paul Slauenwhite
Created:
2008-03-11 14:09:17 EDT
Size:
102.16 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.hyades.test.core >Index: src/org/eclipse/hyades/test/core/util/ArtifactUtil.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.core/src/org/eclipse/hyades/test/core/util/ArtifactUtil.java,v >retrieving revision 1.11 >diff -u -r1.11 ArtifactUtil.java >--- src/org/eclipse/hyades/test/core/util/ArtifactUtil.java 5 Dec 2007 20:03:41 -0000 1.11 >+++ src/org/eclipse/hyades/test/core/util/ArtifactUtil.java 11 Mar 2008 18:07:47 -0000 >@@ -1,5 +1,5 @@ > /******************************************************************************* >- * Copyright (c) 2005, 2007 IBM Corporation and others. >+ * Copyright (c) 2005, 2008 IBM Corporation and others. > * All rights reserved. This program and the accompanying materials > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -49,8 +49,8 @@ > * @author Bianca Xue Jiang > * @author Julien Canches > * @author Paul E. Slauenwhite >- * @version January 10, 2007 >- * @since 3.0 >+ * @version March 11, 2008 >+ * @since February 8, 2005 > */ > public class ArtifactUtil > { >@@ -183,7 +183,7 @@ > "hl14.jar", > "hlcommons.jar", > "hlcore.jar", >- "http.hexrecr.jar", >+ "urlRecorder.runner.jar", > "http.runner.jar", > "java.runner.jar", > }; >Index: src/org/eclipse/hyades/execution/recorder/local/appadapters/MozillaAdapter.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.core/src/org/eclipse/hyades/execution/recorder/local/appadapters/MozillaAdapter.java,v >retrieving revision 1.16 >diff -u -r1.16 MozillaAdapter.java >--- src/org/eclipse/hyades/execution/recorder/local/appadapters/MozillaAdapter.java 2 May 2007 19:36:15 -0000 1.16 >+++ src/org/eclipse/hyades/execution/recorder/local/appadapters/MozillaAdapter.java 11 Mar 2008 18:07:47 -0000 >@@ -1,5 +1,5 @@ > /********************************************************************** >- * Copyright (c) 2005, 2007 IBM Corporation and others. >+ * Copyright (c) 2005, 2008 IBM Corporation and others. > * All rights reserved. This program and the accompanying materials > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -26,9 +26,14 @@ > * (point org.eclipse.hyades.execution.recorder.RecorderApplication) it contains > * logic for initializing, starting, and stopping Mozilla. In particular, this > * object is able to modify user preference settings to cause Mozilla to use a >- * particular host and port for proxy recording. . >+ * particular host and port for proxy recording. >+ * <p/> > * >- * @author Mark D Dunn >+ * >+ * @author Mark D Dunn >+ * @author Paul E. Slauenwhite >+ * @version March 11, 2008 >+ * @since May 25, 2005 > * @deprecated This is not public API. It will be moved to internal in TPTP 5 > */ > public class MozillaAdapter implements IRecorderApplicationAdapter { >@@ -66,7 +71,7 @@ > public String recorderPathFileName = "recorderPathFile"; > > public static final String PREFERENCE_PATH = "RECORDER_MOZILLA_PATH"; >- public static final String extensionID = "org.eclipse.hyades.test.core.RecorderApplication.Mozilla"; >+ > /** > * init routine called by the recorder to have mozilla prepared for > * recording >Index: src/org/eclipse/hyades/execution/recorder/local/appadapters/FirefoxPrefs.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.core/src/org/eclipse/hyades/execution/recorder/local/appadapters/FirefoxPrefs.java,v >retrieving revision 1.20 >diff -u -r1.20 FirefoxPrefs.java >--- src/org/eclipse/hyades/execution/recorder/local/appadapters/FirefoxPrefs.java 4 Jun 2007 13:59:09 -0000 1.20 >+++ src/org/eclipse/hyades/execution/recorder/local/appadapters/FirefoxPrefs.java 11 Mar 2008 18:07:46 -0000 >@@ -1,5 +1,5 @@ > /********************************************************************** >- * Copyright (c) 2005, 2007 IBM Corporation and others. >+ * Copyright (c) 2005, 2008 IBM Corporation and others. > * All rights reserved. This program and the accompanying materials > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -28,9 +28,14 @@ > /** > * This object is the support methods for the FireFoxAdapter. In particular, this > * object is able to read and modify user preference settings to cause Firefox to use a >- * particular host and port for proxy recording. . >+ * particular host and port for proxy recording. >+ * <p/> > * >- * @author Mark D Dunn >+ * >+ * @author Mark D Dunn >+ * @author Paul E. Slauenwhite >+ * @version March 11, 2008 >+ * @since May 25, 2005 > * @deprecated This is not public API. It will be moved to internal in TPTP 5 > */ > >@@ -1280,8 +1285,6 @@ > strKeyFile = initInfo.substring(iStartPos); > } > // Now have a sslkeyfile, pull path out >- // d:\\tptpWorkspaces\i4WithMozillaMay27\org.eclipse.hyades.test.tools.ui\testkeys >- > int lastSlash = strKeyFile.lastIndexOf(separatorChar); > String tmp = strKeyFile.substring(0,lastSlash); > RecorderPathFileStr = tmp + separatorChar + recorderPathFileName; >Index: src/org/eclipse/hyades/execution/recorder/local/appadapters/MozillaPrefs.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.core/src/org/eclipse/hyades/execution/recorder/local/appadapters/MozillaPrefs.java,v >retrieving revision 1.14 >diff -u -r1.14 MozillaPrefs.java >--- src/org/eclipse/hyades/execution/recorder/local/appadapters/MozillaPrefs.java 26 Apr 2007 20:46:14 -0000 1.14 >+++ src/org/eclipse/hyades/execution/recorder/local/appadapters/MozillaPrefs.java 11 Mar 2008 18:07:47 -0000 >@@ -27,9 +27,14 @@ > /** > * This object is the support methods for the MozillaAdapter. In particular, this > * object is able to read and modify user preference settings to cause Firefox to use a >- * particular host and port for proxy recording. . >+ * particular host and port for proxy recording. >+ * <p/> > * >- * @author Mark D Dunn >+ * >+ * @author Mark D Dunn >+ * @author Paul E. Slauenwhite >+ * @version March 11, 2008 >+ * @since May 25, 2005 > * @deprecated This is not public API. It will be moved to internal in TPTP 5 > */ > >@@ -1232,8 +1237,6 @@ > strKeyFile = initInfo.substring(iStartPos); > } > // Now have a sslkeyfile, pull path out >- // d:\\tptpWorkspaces\i4WithMozillaMay27\org.eclipse.hyades.test.tools.ui\testkeys >- > int lastSlash = strKeyFile.lastIndexOf(separatorChar); > String tmp = strKeyFile.substring(0,lastSlash); > RecorderPathFileStr = tmp + separatorChar + recorderPathFileName; >Index: src/org/eclipse/hyades/execution/recorder/local/appadapters/JNIWrapper.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.core/src/org/eclipse/hyades/execution/recorder/local/appadapters/JNIWrapper.java,v >retrieving revision 1.4 >diff -u -r1.4 JNIWrapper.java >--- src/org/eclipse/hyades/execution/recorder/local/appadapters/JNIWrapper.java 26 Nov 2007 18:18:22 -0000 1.4 >+++ src/org/eclipse/hyades/execution/recorder/local/appadapters/JNIWrapper.java 11 Mar 2008 18:07:46 -0000 >@@ -1,5 +1,5 @@ > /********************************************************************** >- * Copyright (c) 2007 IBM Corporation and others. >+ * Copyright (c) 2007, 2008 IBM Corporation and others. > * All rights reserved. This program and the accompanying materials > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -12,26 +12,27 @@ > > package org.eclipse.hyades.execution.recorder.local.appadapters; > >- >+import java.io.File; >+import java.io.FileOutputStream; >+import java.io.IOException; >+import java.io.OutputStreamWriter; > import java.net.URL; > > import org.eclipse.core.runtime.FileLocator; > import org.eclipse.core.runtime.Platform; > import org.osgi.framework.Bundle; > >-import java.io.FileOutputStream; >-import java.io.IOException; >-import java.io.File; >-import java.io.OutputStreamWriter; >- >- >-// added this file for bugzilla 168597 >-/* >- * @deprecated This is not public API. It will be moved to internal in TPTP 5 >+/** >+ * JNI wrapper. >+ * <p/> > * > * >+ * @author Paul E. Slauenwhite >+ * @author Duwayne Morris >+ * @version March 11, 2008 >+ * @since October 23, 2007 >+ * @deprecated This is not public API. It will be moved to internal in TPTP 5. > */ >- > public class JNIWrapper { > > private static final native String getLastError(); >Index: src/org/eclipse/hyades/execution/recorder/local/appadapters/FirefoxAdapter.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.core/src/org/eclipse/hyades/execution/recorder/local/appadapters/FirefoxAdapter.java,v >retrieving revision 1.14 >diff -u -r1.14 FirefoxAdapter.java >--- src/org/eclipse/hyades/execution/recorder/local/appadapters/FirefoxAdapter.java 26 Apr 2007 20:37:39 -0000 1.14 >+++ src/org/eclipse/hyades/execution/recorder/local/appadapters/FirefoxAdapter.java 11 Mar 2008 18:07:46 -0000 >@@ -1,5 +1,5 @@ > /********************************************************************** >- * Copyright (c) 2005, 2007 IBM Corporation and others. >+ * Copyright (c) 2005, 2008 IBM Corporation and others. > * All rights reserved. This program and the accompanying materials > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -26,9 +26,14 @@ > * (point org.eclipse.hyades.execution.recorder.RecorderApplication) it contains > * logic for initializing, starting, and stopping Firefox. In particular, this > * object is able to modify user preference settings to cause Firefox to use a >- * particular host and port for proxy recording. . >+ * particular host and port for proxy recording. >+ * <p/> > * >- * @author Mark D Dunn >+ * >+ * @author Mark D Dunn >+ * @author Paul E. Slauenwhite >+ * @version March 11, 2008 >+ * @since May 25, 2005 > * @deprecated This is not public API. It will be moved to internal in TPTP 5 > */ > public class FirefoxAdapter implements IRecorderApplicationAdapter { >@@ -64,7 +69,6 @@ > public String recorderPathFileName = "recorderPathFile"; > > public static final String PREFERENCE_PATH = "RECORDER_FIREFOX_PATH"; >- public static final String extensionID = "org.eclipse.hyades.test.core.RecorderApplication.Firefox"; > > /** > * init routine called by the recorder to have firefox prepared for >#P org.eclipse.hyades.test.tools.core >Index: src/org/eclipse/hyades/test/tools/core/internal/resources/CorePluginResourceBundle.java >=================================================================== >RCS file: src/org/eclipse/hyades/test/tools/core/internal/resources/CorePluginResourceBundle.java >diff -N src/org/eclipse/hyades/test/tools/core/internal/resources/CorePluginResourceBundle.java >--- src/org/eclipse/hyades/test/tools/core/internal/resources/CorePluginResourceBundle.java 5 Dec 2007 20:01:33 -0000 1.2 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,50 +0,0 @@ >-/********************************************************************** >- * Copyright (c) 2007 IBM Corporation and others. >- * All rights reserved. This program and the accompanying materials >- * are made available under the terms of the Eclipse Public License v1.0 >- * which accompanies this distribution, and is available at >- * http://www.eclipse.org/legal/epl-v10.html >- * $Id: CorePluginResourceBundle.java,v 1.2 2007/12/05 20:01:33 paules Exp $ >- * >- * Contributors: >- * IBM - Initial API and implementation >- **********************************************************************/ >-package org.eclipse.hyades.test.tools.core.internal.resources; >- >-import org.eclipse.osgi.util.NLS; >- >-/** >- * Plug-in level resource bundle. >- * <p> >- * >- * >- * @author Paul E. Slauenwhite >- * @version March 21, 2007 >- * @since March 21, 2007 >- */ >-public final class CorePluginResourceBundle extends NLS { >- >- private static final String BUNDLE_NAME = "org.eclipse.hyades.test.tools.core.internal.resources.messages";//$NON-NLS-1$ >- >- private CorePluginResourceBundle() { >- // Do not instantiate >- } >- >- public static String W_LOOP; >- public static String W_LWR_INV; >- public static String Page; >- public static String E_INVALID_REC_FILE; >- public static String E_SAX_DRIVER_FAILURE; >- public static String E_SAX_IOEXCEPTION; >- public static String E_SAX_SAXEXCEPTION; >- public static String E_LOAD_NODE_HANDLER; >- public static String E_PACKET_NO_DATA; >- public static String E_DATA_NO_TYPE_ATT; >- public static String E_DATA_NO_CONTENT; >- public static String E_DATA_NO_ENCODING_ATT; >- public static String I_PROCESSING; >- >- static { >- NLS.initializeMessages(BUNDLE_NAME, CorePluginResourceBundle.class); >- } >-} >\ No newline at end of file >Index: src/org/eclipse/hyades/test/tools/core/internal/resources/messages.properties >=================================================================== >RCS file: src/org/eclipse/hyades/test/tools/core/internal/resources/messages.properties >diff -N src/org/eclipse/hyades/test/tools/core/internal/resources/messages.properties >--- src/org/eclipse/hyades/test/tools/core/internal/resources/messages.properties 5 Dec 2007 20:01:33 -0000 1.3 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,32 +0,0 @@ >-############################################################################### >-# Copyright (c) 2007 IBM Corporation and others. >-# All rights reserved. This program and the accompanying materials >-# are made available under the terms of the Eclipse Public License v1.0 >-# which accompanies this distribution, and is available at >-# http://www.eclipse.org/legal/epl-v10.html >-# $Id: messages.properties,v 1.3 2007/12/05 20:01:33 paules Exp $ >-# >-# Contributors: >-# IBM Corporation - initial API and implementation >-############################################################################### >-# >-# messages.properties >-# >-# NOTE: When using substitution parameters, all single quote characters (e.g. ') must be escaped with a preceding single quote character (e.g. ''text in single quotes''). >-# >-# NLS_MESSAGEFORMAT_VAR >-# NLS_ENCODING=UTF-8 >- >-W_LOOP = Loop >-W_LWR_INV = invocation >-Page = Page >-E_INVALID_REC_FILE=IWAT3018E invalid .rec file >-E_SAX_DRIVER_FAILURE=IWAT3019E failed to create XML driver >-E_SAX_IOEXCEPTION=IWAT3020E IOException parsing input source >-E_SAX_SAXEXCEPTION=IWAT3021E SAXException parsing input source >-E_LOAD_NODE_HANDLER=IWAT3022E cannot load node handler >-E_PACKET_NO_DATA=IWAT3024E data element not found in packet element >-E_DATA_NO_TYPE_ATT=IWAT3025E type attribute not found in data element >-E_DATA_NO_CONTENT=IWAT3026E content not found in data element >-E_DATA_NO_ENCODING_ATT=IWAT3027E encoding attribute not found in data element >-I_PROCESSING=Processing >Index: build.properties >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.tools.core/build.properties,v >retrieving revision 1.23 >diff -u -r1.23 build.properties >--- build.properties 5 Dec 2007 20:02:57 -0000 1.23 >+++ build.properties 11 Mar 2008 18:07:48 -0000 >@@ -3,8 +3,6 @@ > bin.includes = about.html,\ > plugin.xml,\ > tools-core.jar,\ >- http.hexrecr.jar,\ >- http.hextgen.jar,\ > common.runner.jar,\ > http.runner.jar,\ > java.runner.jar,\ >@@ -12,20 +10,13 @@ > config.jar,\ > config/,\ > plugin.properties,\ >- META-INF/,\ >- testkeys >+ META-INF/ > > jars.compile.order = common.runner.jar,\ > tools-core.jar,\ > java.runner.jar,\ > http.runner.jar,\ >- http.hexrecr.jar,\ >- http.hextgen.jar,\ > config.jar >-source.http.hexrecr.jar = src-recorder-http-runner/ >-output.http.hexrecr.jar = bin/ >-source.http.hextgen.jar = src-testgen-http/ >-output.http.hextgen.jar = bin/ > source.common.runner.jar = src-common-runner/ > output.common.runner.jar = bin/ > source.http.runner.jar = src-http-runner/ >Index: .classpath >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.tools.core/.classpath,v >retrieving revision 1.7 >diff -u -r1.7 .classpath >--- .classpath 5 Dec 2007 20:02:57 -0000 1.7 >+++ .classpath 11 Mar 2008 18:07:48 -0000 >@@ -4,8 +4,6 @@ > <classpathentry kind="src" path="src-common-runner"/> > <classpathentry kind="src" path="src-http-runner"/> > <classpathentry kind="src" path="src-java-runner"/> >- <classpathentry kind="src" path="src-recorder-http-runner"/> >- <classpathentry kind="src" path="src-testgen-http"/> > <classpathentry kind="src" path="src-config"/> > <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> > <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> >Index: plugin.xml >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.tools.core/plugin.xml,v >retrieving revision 1.50 >diff -u -r1.50 plugin.xml >--- plugin.xml 14 Jan 2008 11:47:29 -0000 1.50 >+++ plugin.xml 11 Mar 2008 18:07:48 -0000 >@@ -80,16 +80,6 @@ > </loader> > </extension> > >- <extension >- point="org.eclipse.hyades.test.core.TestGenerator"> >- <Generator >- class="org.eclipse.hyades.execution.testgen.http.Testgen" >- id="org.eclipse.hyades.test.tools.core.TestGenerator.HTTPGenerator" >- name="%HTTP_Test_Generator_Name" >- priority="-1" >- recorderID="org.eclipse.hyades.test.tools.recorder.http"> >- </Generator> >- </extension> > <extension > id="java.junit.builder" > name="%TPTP_JUNIT_BUILDER" >Index: plugin.properties >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.tools.core/plugin.properties,v >retrieving revision 1.28 >diff -u -r1.28 plugin.properties >--- plugin.properties 26 Apr 2007 17:32:26 -0000 1.28 >+++ plugin.properties 11 Mar 2008 18:07:48 -0000 >@@ -1,5 +1,5 @@ > ############################################################################### >-# Copyright (c) 2005, 2007 IBM Corporation and others. >+# Copyright (c) 2005, 2008 IBM Corporation and others. > # All rights reserved. This program and the accompanying materials > # are made available under the terms of the Eclipse Public License v1.0 > # which accompanies this distribution, and is available at >@@ -23,7 +23,6 @@ > providerName = Eclipse.org > > TPTP_JUNIT_BUILDER = TPTP JUnit Builder >-HTTP_Test_Generator_Name = TPTP URL Test Generator > > TPTP_JUNIT_TYPE_NAME_VARIABLE_DESCRIPTION = Returns the name of the type implementing a JUnit test. The target JUnit test is the selected regular JUnit test in a TPTP view. > TPTP_JUNIT_PROJECT_VARIABLE_DESCRIPTION = Returns the project name of a JUnit test. The target JUnit test is the selected regular JUnit test in a TPTP view. >Index: META-INF/MANIFEST.MF >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.tools.core/META-INF/MANIFEST.MF,v >retrieving revision 1.22 >diff -u -r1.22 MANIFEST.MF >--- META-INF/MANIFEST.MF 5 Dec 2007 20:03:01 -0000 1.22 >+++ META-INF/MANIFEST.MF 11 Mar 2008 18:07:48 -0000 >@@ -6,15 +6,11 @@ > Bundle-ClassPath: tools-core.jar, > common.runner.jar, > java.runner.jar, >- http.runner.jar, >- http.hexrecr.jar, >- http.hextgen.jar >+ http.runner.jar > Bundle-Activator: org.eclipse.hyades.test.tools.core.CorePlugin > Bundle-Vendor: %providerName > Bundle-Localization: plugin > Export-Package: ., >- org.eclipse.hyades.execution.recorder.http.remote, >- org.eclipse.hyades.execution.testgen.http, > org.eclipse.hyades.test.common.agent, > org.eclipse.hyades.test.common.event, > org.eclipse.hyades.test.common.junit, >@@ -55,5 +51,5 @@ > org.junit;bundle-version="[3.8.1,4.0.0)", > org.eclipse.core.variables;bundle-version="[3.1.100,4.0.0)", > org.eclipse.xsd;bundle-version="[2.2.0,3.0.0)" >-Eclipse-LazyStart: true >+Bundle-ActivationPolicy: lazy > Bundle-RequiredExecutionEnvironment: J2SE-1.4 >#P org.eclipse.hyades.test.doc.user >Index: tasks/trecordtest.html >=================================================================== >RCS file: tasks/trecordtest.html >diff -N tasks/trecordtest.html >--- tasks/trecordtest.html 7 Mar 2008 15:09:34 -0000 1.6 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,116 +0,0 @@ >-<!DOCTYPE html >- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> >-<html lang="en-us" xml:lang="en-us"> >-<!-- >-/********************************************************************** >- * Copyright (c) 2006, 2008 IBM Corporation. >- * All rights reserved. This content >- * is made available under the terms of the Eclipse Public License v1.0 >- * which accompanies this distribution, and is available at >- * http://www.eclipse.org/legal/epl-v10.html >- * $Id: trecordtest.html,v 1.6 2008/03/07 15:09:34 paules Exp $ >- * >- * Contributors: >- * IBM - Initial contribution >- **********************************************************************/ >- --> >-<head> >-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> >-<meta name="security" content="public" /> >-<meta name="Robots" content="index,follow" /> >-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' /> >-<meta name="DC.Type" content="task" /> >-<meta name="DC.Title" content="Recording a test" /> >-<meta name="abstract" content="The test creation wizard starts when you record a test. This wizard combines these actions: recording a session with a Web application, generating a test from the recording, and opening the test in the test editor. You can record a test from Internet Explorer (the default on Windows) or from another browser." /> >-<meta name="description" content="The test creation wizard starts when you record a test. This wizard combines these actions: recording a session with a Web application, generating a test from the recording, and opening the test in the test editor. You can record a test from Internet Explorer (the default on Windows) or from another browser." /> >-<meta name="DC.Format" content="XHTML" /> >-<meta name="DC.Identifier" content="recordingatest" /> >-<meta name="DC.Language" content="en-us" /> >-<link rel="stylesheet" type="text/css" href="../css/ibmdita.css" /> >-<link rel="stylesheet" type="text/css" href="../css/book.css" /> >-<title>Recording a test</title> >-</head> >-<body><a name="recordingatest"><!-- --></a> >-<h1 class="topictitle1">Recording a test</h1> >-<div><p>The test creation wizard starts when you record a test. This wizard >-combines these actions: recording a session with a Web application, generating >-a test from the recording, and opening the test in the test editor. You can >-record a test from Internet Explorer (the default on Windows) or from another >-browser.</p> >-<div class="p">Before recording, verify that the Agent Controller is running on the >-local computer.<p>If you will record with Internet Explorer, you do not need >-to set your browser preferences. However, this procedure assumes that the >-defaults are set, so you might want to click <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span></span>, expand Test, select <span class="uicontrol">HTTP >-Recording</span>, and click <span class="uicontrol">Restore Defaults</span>. </p> >-<div class="p">If >-you will record with Mozilla or Firefox, set your browser preferences as follows: <ol><li>Click <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span></span>, and expand <span class="uicontrol">Test</span>.</li> >-<li> Select <span class="uicontrol">URL Recorder</span>, and set <span class="uicontrol">Application >-to Record</span> to <span class="uicontrol">Mozilla</span> or <span class="uicontrol">Firefox</span>.</li> >-<li>Enter the path to, or browse to, the browser executable. </li> >-</ol> >- </div> >-<div class="p">If you will record with another browser:<ol><li>Click <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span></span>, and expand <span class="uicontrol">Test</span>.</li> >-<li> Select <span class="uicontrol">URL Recorder</span>, and set <span class="uicontrol">Application >-to Record</span> to <span class="uicontrol">None</span>.</li> >-<li>You will have to manually configure and load your browser; consult the >-browser's proxy configuration documentation on how to do this.</li> >-</ol> >- </div> >-</div> >-<div class="section">To record a test: </div> >-<ol><li class="stepexpand"><span>Click <span class="menucascade"><span class="uicontrol">File</span> > <span class="uicontrol">New</span> > <span class="uicontrol">Other</span></span>.</span></li> >-<li class="stepexpand"><span>In the New window, expand <span class="uicontrol">Test</span>, click <span class="uicontrol">Test >-From Recording</span>, and then click <span class="uicontrol">Next</span>. </span></li> >-<li class="stepexpand"><span>In the Create New Test from Recording window, select <span class="uicontrol">Create >-Test from New Recording</span>, and then click <span class="uicontrol">Next</span>. </span></li> >-<li class="stepexpand"><span> In the list of projects, click the one in which to store this >-test and related files. The <img src="../images/javaicon.gif" alt="Java icon" /> icon identifies projects that are suitable for containing tests. >-Tests stored in other projects will not run. </span> <div class="note"><span class="notetitle">Note:</span> If you have >-not yet created a project, the <span class="uicontrol">Project Name</span> field displays >-a default name of <tt class="sysout">testproj</tt>, which you can change.</div> >-</li> >-<li class="stepexpand"><span>In the <span class="uicontrol">Test file name</span> field, type a >-name for the test, and click <span class="uicontrol">Finish</span>. The standard Navigator >-and the Java Package Explorer use this name, with extensions. You will also >-see this name in the Test Navigator. A progress window opens while your browser >-starts. </span></li> >-<li class="stepexpand"><span>To make sure your recording accurately captures HTTP traffic, clear >-your browser's cache.</span> <div class="p">To clear the Internet Explorer cache: <ol type="a"><li>Click <span class="menucascade"><span class="uicontrol">Tools</span> > <span class="uicontrol">Internet Options</span></span>.</li> >-<li>In the Internet Options window, in the Temporary Internet files area, >-click <span class="uicontrol">Delete Files</span>.</li> >-<li>In the Delete Files window, select <span class="uicontrol">Delete all offline content</span> and >-click <span class="uicontrol">OK</span>. </li> >-<li>Click <span class="uicontrol">OK</span> to close the Internet Options window. </li> >-</ol> >-</div> >-<div class="p">To clear the Mozilla cache:<ol type="a"><li>Click <span class="menucascade"><span class="uicontrol">Edit</span> > <span class="uicontrol">Preferences</span></span>.</li> >-<li>In the Preferences window, expand <span class="uicontrol">Advanced</span> and >-click <span class="uicontrol">Cache</span>.</li> >-<li>In the Set Cache Options area, click <span class="uicontrol">Clear Cache</span>.</li> >-<li>Click <span class="uicontrol">OK</span> to close the Preferences window.</li> >-</ol> >-</div> >-<div class="p">To clear the Firefox cache<ol type="a"><li>Click <span class="menucascade"><span class="uicontrol">Tools</span> > <span class="uicontrol">Options</span> > <span class="uicontrol">Privacy</span> > <span class="uicontrol">Clear Cache</span></span>.</li> >-<li>Click <span class="uicontrol">OK</span> to close the Options window.</li> >-</ol> >-</div> >-</li> >-<li class="stepexpand"><span>In the address box for your browser, type the address of the Web-based >-application to test and activate the link. </span> <div class="note"><span class="notetitle">Note:</span> If you enter >-the address of a secure Web site (one that starts with <kbd class="userinput">https:</kbd>), >-your browser might display a security alert. Depending on the security certificate >-for the site, you might be required to accept a security risk to proceed with >-the recording.</div> >-</li> >-<li class="stepexpand"><span> Perform the user tasks that you want to test. </span></li> >-<li class="stepexpand"><span>After you finish performing the tasks, stop recording. To stop >-recording, close your browser or click on the <span class="uicontrol">Stop Recording</span> >-button on the right side of the Recorder Control >-view bar. </span> A progress window opens while the test is generated. </li> >-</ol> >-<div class="section">On completion, the Recorder Control view displays the message <tt class="sysout">Test >-generation completed</tt>, the Test Navigator lists your test, and >-the test opens for you to inspect or edit.</div> >-</div> >-</body> >-</html> >\ No newline at end of file >Index: toc/url_toc.xml >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.doc.user/toc/url_toc.xml,v >retrieving revision 1.1 >diff -u -r1.1 url_toc.xml >--- toc/url_toc.xml 5 Dec 2007 20:04:00 -0000 1.1 >+++ toc/url_toc.xml 11 Mar 2008 18:07:49 -0000 >@@ -1,7 +1,7 @@ > <?xml version="1.0" encoding="utf-8"?> > <!-- > /********************************************************************** >- * Copyright (c) 2007 IBM Corporation. >+ * Copyright (c) 2007, 2008 IBM Corporation. > * All rights reserved. This content > * is made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -15,7 +15,11 @@ > <?NLS TYPE="org.eclipse.help.toc"?> > <toc label="Testing performance"> > <topic label="Testing performance" href="concepts/ctestwithhyades.htm"> >- <topic label="Recording a test" href="tasks/trecordtest.html"/> >+ >+ <topic label="Creating a test" href="tasks/tcreatingaperformancetest.htm"> >+ <anchor id="test_suite_generators"/> >+ </topic> >+ > <topic label="Editing a test" href="concepts/cedittest.htm"/> > <topic label="Generating an executable test" href="tasks/tgenerateexecutabletest.htm"/> > <topic label="Running a test" href="tasks/trun.htm"/> >Index: concepts/cedittest.htm >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.doc.user/concepts/cedittest.htm,v >retrieving revision 1.16 >diff -u -r1.16 cedittest.htm >--- concepts/cedittest.htm 7 Mar 2008 15:08:42 -0000 1.16 >+++ concepts/cedittest.htm 11 Mar 2008 18:07:49 -0000 >@@ -36,19 +36,11 @@ > <h1 class="topictitle1">Editing a test</h1> > <div><p>You can inspect and modify a test prior to compiling and running > it.</p> >-<p>By default, when you have finished recording an interaction with a browser-based >-application, the <b>URL Recorder</b> automatically starts the <b>URL >-Test Generator</b>, which produces a test from the recording. (You can modify >-this behavior - specify that a different test generator be started, or that >-none be started - by editing the <b>URL Recorder</b> preferences.) >-The test is not yet executable. You can immediately make the test executable >+<p>Note, the test is not yet executable. You can immediately make the test executable > by right-clicking it in the Test Navigator and selecting <span class="uicontrol">Generate</span>. > Or you can first edit the test by right-clicking it and selecting <span class="uicontrol">Open</span>. </p> > <p> </p> >-<p>From TPTP, three types of test suite can be created and edited. The type >-created by the <b>URL Test Generator</b> is named <b>URL Test</b>. >-The following figure illustrates what you see when you open an <span class="uicontrol">URL Test</span>. You see a slightly different organization when you >-open other types of tests.</p> >+<p>Open the performance test in the TPTP URL Test editor:</p> > <img src="../images/editOverview.jpg" alt=""/><p>The test opens in the <span class="uicontrol">Overview</span> tab (see the bottom > border) with the four edit areas (<span class="uicontrol">General Information</span> and <span class="uicontrol">Source > Information</span> on the left and <span class="uicontrol">Deployment</span> and <span class="uicontrol">HTTP Requests</span> on >@@ -58,18 +50,15 @@ > name, an optional description, the test's type, and the name of the file containing > the test. Information appearing in boxes can be edited. The <span class="uicontrol">Name</span> box > under <span class="uicontrol">General Information</span> displays the name of the >-test. Initially, this is the same as the <span class="uicontrol">Test file name</span> that >-you specified during recording, but you can change the name. If you do, the >+test. You can change the name. If you do, the > name displayed in the Test Navigator changes also but the filename containing > the test does not change. In this example, the test's name, as listed in the >-Test Navigator and displayed in the <span class="uicontrol">Name</span> box, was originally <span class="uicontrol">b</span> - >-same as the recording file name, without the suffix. The tester has decided >+Test Navigator and displayed in the <span class="uicontrol">Name</span> box. The tester has decided > to change the name to something more descriptive of the task that the test > emulates, <span class="uicontrol">searchEmployeeDB</span>.</p> > <p>The <span class="uicontrol">Source Information</span> area displays the Java package > name that will contain the test's executable Java code when it is generated, >-and the Java class implementing the test - same as the recording file name, >-without the suffix, with the initial character upper-cased. You can relocate >+and the Java class implementing the test. You can relocate > the code to a different package by clicking the <span class="uicontrol">Browse</span> button > under the <span class="uicontrol">Package Name:</span> box.</p> > <p>The <span class="uicontrol">HTTP Requests</span> area on the right lists all HTTP >@@ -89,7 +78,7 @@ > </p> > <p>Clicking the <span class="uicontrol">Behavior</span> tab opens the behavior edit > pane, shown below.</p> >-<img src="../images/editBehavior.jpg" alt=""/><p>The HTTP requests initially recorded by the test are listed by page, as >+<img src="../images/editBehavior.jpg" alt=""/><p>The HTTP requests are listed by page, as > invocations, inside a loop construct initially named <span class="uicontrol">Loop 1</span>. > With this loop selected, you can rename the loop, describe what it does, or > change the <span class="uicontrol">Number of Iterations</span>. With <span class="uicontrol">Synchronous</span> checked >Index: concepts/ctestwithhyades.htm >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.doc.user/concepts/ctestwithhyades.htm,v >retrieving revision 1.19 >diff -u -r1.19 ctestwithhyades.htm >--- concepts/ctestwithhyades.htm 20 Dec 2007 19:08:09 -0000 1.19 >+++ concepts/ctestwithhyades.htm 11 Mar 2008 18:07:49 -0000 >@@ -3,7 +3,7 @@ > <html lang="en-us" xml:lang="en-us"> > <!-- > /********************************************************************** >- * Copyright (c) 2004, 2007 IBM Corporation. >+ * Copyright (c) 2004, 2008 IBM Corporation. > * All rights reserved. This content > * is made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -24,7 +24,6 @@ > <meta name="DC.Title" content="Testing performance" /> > <meta name="abstract" content="The Eclipse test and performance tools platform (TPTP) supports automated performance testing of HTTP applications." /> > <meta name="description" content="The Eclipse test and performance tools platform (TPTP) supports automated performance testing of HTTP applications." /> >-<meta name="DC.Relation" scheme="URI" content="../tasks/trecordtop.dita" /> > <meta name="DC.Relation" scheme="URI" content="../concepts/cedittest.dita" /> > <meta name="DC.Relation" scheme="URI" content="../tasks/tgenerateexecutabletest.dita" /> > <meta name="DC.Relation" scheme="URI" content="../tasks/truntest.dita" /> >@@ -45,8 +44,8 @@ > > <div> > <blockquote> >-<div class="ulchildlink"><b><a href="../tasks/trecordtest.html">Recording a test</a></b><br /> >-The test creation wizard starts when you start the test recorder. This wizard combines into a single flow these actions: the recording of a session with a Web application, the generation of a test from the recording, and the opening of the test in the test editor. You can record tests from Internet Explorer (the default on Windows) or from another browser.</div> >+<div class="ulchildlink"><b><a href="../tasks/tcreatingaperformancetest.htm">Creating a test</a></b><br /> >+You can create a performance test.</div> > <div class="ulchildlink"><b><a href="../concepts/cedittest.htm">Editing a test</a></b><br /> > You can inspect and modify a test prior to compiling and running it.</div> > <div class="ulchildlink"><b><a href="../tasks/tgenerateexecutabletest.htm">Generating an executable test</a></b><br /> >Index: ref/rdeploymentGroundRules.htm >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.doc.user/ref/rdeploymentGroundRules.htm,v >retrieving revision 1.6 >diff -u -r1.6 rdeploymentGroundRules.htm >--- ref/rdeploymentGroundRules.htm 5 Dec 2007 20:04:02 -0000 1.6 >+++ ref/rdeploymentGroundRules.htm 11 Mar 2008 18:07:49 -0000 >@@ -2,7 +2,7 @@ > <html lang="en-us" xml:lang="en-us"> > <!-- > /********************************************************************** >- * Copyright (c) 2006, 2007 Scapa Technologies and others. >+ * Copyright (c) 2006, 2008 Scapa Technologies and others. > * All rights reserved. This content is made available under > * the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -123,7 +123,7 @@ > <li>hlcore.jar</li> > <li>hlevents.jar</li> > <li>hlcbe101.jar</li> >- <li>http.hexrecr.jar</li> >+ <li>urlRecorder.runner.jar</li> > <li>http.runner.jar</li> > <li>java.runner.jar</li> > <li>jmxagent.jar</li> >Index: tasks/tcreatingaperformancetest.htm >=================================================================== >RCS file: tasks/tcreatingaperformancetest.htm >diff -N tasks/tcreatingaperformancetest.htm >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ tasks/tcreatingaperformancetest.htm 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,54 @@ >+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"> >+<html lang="en-us" xml:lang="en-us"> >+ >+<!-- >+/********************************************************************** >+ * Copyright (c) 2008 IBM Corporation. >+ * All rights reserved. This content >+ * is made available under the terms of the Eclipse Public License v1.0 >+ * which accompanies this distribution, and is available at >+ * http://www.eclipse.org/legal/epl-v10.html >+ * $Id$ >+ * >+ * Contributors: >+ * IBM - Initial contribution >+ **********************************************************************/ >+ --> >+ >+<head> >+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"/> >+<link rel=StyleSheet href="../css/book.css" type="text/css"/> >+ >+<title>Creating a test</title> >+ >+</head> >+ >+<body> >+ >+<div> >+ >+<h2>Creating a test</h2> >+<p> >+This topic describes how to create a performance test suite. >+</p> >+ >+<ol> >+ <li>Create a Java project.</li> >+ <li>Open the Test perspective <b>Window > Open Perspective > Other... > Test</b>.</li> >+ <li>Click <b>File > New > Other</b>. The <b>New</b> dialog appears.</li> >+ <li>Expand the <b>Test</b> folder, then select <b>TPTP URL Test</b>.</li> >+ <li>Click <b>Next</b>, select the location (the project created in step 1), and name the performance test suite, for example, <i>examplePerformanceTest</i>.</li> >+ <li>Click <b>Next</b> and optionally provide a description for the performance test suite. Click <b>Finish</b>.</li> >+ <li>A performance test suite file (examplePerformanceTest.testsuite) will be created, becomes visible in the Test Navigator and opens in the URL Test editor.</li> >+</ol> >+</div> >+ >+<div> >+<p> >+<b class="parentlink">Parent topic:</b> <a href="../concepts/ctestwithhyades.htm" shape="rect" title="The Eclipse test and performance tools platform (TPTP) supports automated performance testing of HTTP applications.">Performance Testing with TPTP</a><br clear="none" /> >+</p> >+</div> >+ >+</body> >+ >+</html> >#P org.eclipse.hyades.test.ui >Index: META-INF/MANIFEST.MF >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/META-INF/MANIFEST.MF,v >retrieving revision 1.24 >diff -u -r1.24 MANIFEST.MF >--- META-INF/MANIFEST.MF 1 Feb 2008 19:55:53 -0000 1.24 >+++ META-INF/MANIFEST.MF 11 Mar 2008 18:07:51 -0000 >@@ -8,7 +8,6 @@ > Bundle-Localization: plugin > Export-Package: org.eclipse.hyades.execution.recorder, > org.eclipse.hyades.execution.recorder.ui.preferences, >- org.eclipse.hyades.execution.testgen, > org.eclipse.hyades.internal.execution.recorder.ui, > org.eclipse.hyades.internal.execution.recorder.ui.actions, > org.eclipse.hyades.internal.execution.recorder.ui.views, >Index: src-recorder/org/eclipse/hyades/internal/execution/recorder/ui/wizards/RecorderRegistryInfo.java >=================================================================== >RCS file: src-recorder/org/eclipse/hyades/internal/execution/recorder/ui/wizards/RecorderRegistryInfo.java >diff -N src-recorder/org/eclipse/hyades/internal/execution/recorder/ui/wizards/RecorderRegistryInfo.java >--- src-recorder/org/eclipse/hyades/internal/execution/recorder/ui/wizards/RecorderRegistryInfo.java 23 Oct 2007 14:14:41 -0000 1.13 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,615 +0,0 @@ >-/********************************************************************** >- * Copyright (c) 2005, 2007 IBM Corporation and others. >- * All rights reserved. This program and the accompanying materials >- * are made available under the terms of the Eclipse Public License v1.0 >- * which accompanies this distribution, and is available at >- * http://www.eclipse.org/legal/epl-v10.html >- * $Id: RecorderRegistryInfo.java,v 1.13 2007/10/23 14:14:41 dmorris Exp $ >- * >- * Contributors: >- * IBM Corporation - initial API and implementation >- **********************************************************************/ >- >-/* >- * Created on Mar 4, 2004 >- * >- * To change the template for this generated file go to >- * Window>Preferences>Java>Code Generation>Code and Comments >- */ >-package org.eclipse.hyades.internal.execution.recorder.ui.wizards; >- >-import java.io.File; >-import java.io.FileInputStream; >- >-import java.io.IOException; >-import java.io.InputStreamReader; >-import java.net.URL; >-import java.util.StringTokenizer; >- >-import org.eclipse.core.runtime.FileLocator; >-import org.eclipse.core.runtime.IPath; >-import org.eclipse.core.runtime.Platform; >-import org.eclipse.hyades.execution.recorder.local.appadapters.JNIWrapper; >-import org.osgi.framework.Bundle; >- >-/** >- * @author mdunn >- * >- * To change the template for this generated type comment go to >- * Window>Preferences>Java>Code Generation>Code and Comments >- */ >-public class RecorderRegistryInfo { >- >- private String proxyType = ""; >- private String proxyAddr = ""; >- private String proxyPort = ""; >- private boolean isProxyEnabled = false; >- private boolean badProxySettings = false; >- private int proxyError = 0; >- // defect 82974 1/18/2005 >- private boolean isAutoConfigURLEnabled = false; >- private boolean isProxyOverrideEnabled = false; >- >- public final int PROXY_SETTINGS_OK = 0; >- public final int SOCKS_SET = -1; >- public final int HTTP_PROXY_ONLY_SET = -2; >- public final int SECURE_PROXY_ONLY_SET = -3; >- public final int HTTP_SECURE_MISMATCH = -4; >- public final int HTTP_SECURE_LOCALHOST = -5; >- public final int HTTP_PROXY_OVERRIDE = -6; >- public final int AUTO_CONFIG_URL = -7; >- // below is for bugzilla 177396 mdd >- public final int VISTA_ADMIN_ERROR = -8; >- public final int WINDOWS_ADMIN_ERROR = -8; >- public final int BROWSER_IN_USE_ERROR = -9; >- public final int RECORDING_TPTPRECUTIL_DLL_MISSING = -10; >- // bugzilla 79219 mdd >- private String sslProxyAddr = ""; >- private String sslProxyPort = ""; >- private String secureStringGlobal = ""; >- private boolean isSSLProxyEnabled = false; >- // new stuff bugzilla 89968 mdd >- private String proxyOverrideString = ""; >- private String autoConfigURLString = ""; >- >- private boolean bUseNativeRegistryInterface = false; >- private JNIWrapper jniWrapper = null; >- >- public RecorderRegistryInfo() { >- StringBuffer inputFileContents = new StringBuffer(); >- // return of false indicates fatal error >- checkOSVersion(inputFileContents); >- if (bUseNativeRegistryInterface) >- getRegistryInfoUsingNativeAPI(inputFileContents); >- else >- getRegistryInfo(inputFileContents); >- >- // below is for bugzilla 177396 mdd >- String checkVistaError=inputFileContents.toString(); >- if (checkVistaError.equalsIgnoreCase("VISTA_ADMIN_ERROR")) { >- setBadProxySettings(true); >- setProxyError(VISTA_ADMIN_ERROR); >- } >- else if (checkVistaError.equalsIgnoreCase("WINDOWS_ADMIN_ERROR")) { >- setBadProxySettings(true); >- setProxyError(WINDOWS_ADMIN_ERROR); >- } >- else if (checkVistaError.equalsIgnoreCase("BROWSER_IN_USE_ERROR")) { >- setBadProxySettings(true); >- setProxyError(BROWSER_IN_USE_ERROR); >- } >- if (checkVistaError.equalsIgnoreCase("RECORDING_TPTPRECUTIL_DLL_MISSING")) { >- setBadProxySettings(true); >- setProxyError(RECORDING_TPTPRECUTIL_DLL_MISSING); >- } >- else { >- boolean isEnabled = checkProxyEnabled(inputFileContents); >- setProxyEnabled(isEnabled); >- if (! isEnabled ) { >- setProxyType("socks"); >- } >- else { >- // must do it new way for hyades 1.3 mdd >- // make sure it is http proxy, grab the address and port >- // then set ProxyServer http=localhost:1080 >- String proxyInfo = getProxyInfo(inputFileContents); >- if (isProxyEnabled && isProxyOverrideEnabled) { >- setBadProxySettings(true); >- setProxyError(HTTP_PROXY_OVERRIDE); >- } >- if (proxyInfo.length()!= 0) { >- String[] proxySplit = proxyInfo.split(":"); >- String myProxyAddr = proxySplit[0]; >- String myProxyPort = proxySplit[1]; >- setProxyAddr(myProxyAddr); >- setProxyPort(myProxyPort); >- setProxyType("http"); >- // defect 79219 >- if (secureStringGlobal.length()!= 0) { >- String[] sslSplit = secureStringGlobal.split(":"); >- String mysslProxyAddr = sslSplit[0]; >- String mysslProxyPort = sslSplit[1]; >- setSslProxyAddr(mysslProxyAddr); >- setSslProxyPort(mysslProxyPort); >- } >- } >- else { >- setProxyType("socks"); >- } >- } >- } >- } >- >- private boolean checkOSVersion(StringBuffer inputFileContents){ >- String currentOS = Platform.getOS(); >- if (currentOS.equals("win32")) { >- String myVersion = System.getProperty("os.version"); >- if (myVersion.startsWith("6")) { >- try{ >- // Bugilla 168597, use native registry calls >- // instead of displaying an error message >- Bundle b = Platform.getBundle("org.eclipse.hyades.test.core"); >- URL u = FileLocator.resolve(b.getEntry("/")); >- String path = u.getPath(); >- path = path.substring(1); >- String finalPath = path + "TPTPRecUtil.dll"; >- File dllFile = new File(finalPath); >- if (dllFile.exists() == false){ >- return false; >- } >- >- >- jniWrapper = new JNIWrapper(); >- if (jniWrapper.isProcessRunningElevated() == false){ >- bUseNativeRegistryInterface = true; >- if (jniWrapper.isBrowserRunning() == true){ >- inputFileContents.append("BROWSER_IN_USE_ERROR"); >- return false; >- } >- } >- } >- catch (IOException ioe){ >- >- } >- >- // so, if we can't load our DLL, we will throw the old >- // error message out so the user can perform a recording by >- // running eclipse using "Run as Adminstrator >- // this should never happen >- catch (UnsatisfiedLinkError e2){ >- inputFileContents.append("VISTA_ADMIN_ERROR"); >- return false; >- } >- } >- } >- return true; >- } >- >- private void getRegistryInfo(StringBuffer inputFileContents) >- { >- String originalSettingsFileName = "newSettingsFile.tmp"; >- String originalSettingsFilePath = ""; >- // bugzilla 126592 mdd change location of temp file >- originalSettingsFilePath = getTempPath(); >- originalSettingsFilePath += "\\" + originalSettingsFileName; >- // bugzilla 127536 mdd put quotes around file path due to spaces in workspace path >- String getOriginalInfoCommandLine = "regedit /e "+"\"" + originalSettingsFilePath+"\"" + " \"HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings\"";//$NON-NLS-1$//$NON-NLS-2$ >- InputStreamReader inputReader=null; >- File file = null; >- try >- { >- try { >- Process registryChange = Runtime.getRuntime().exec(getOriginalInfoCommandLine,null); >- registryChange.waitFor(); >- } >- catch (InterruptedException e) {} >- // bugzilla 126592 mdd use originalSettingsFilePath rather than ...FileName >- file = new File(originalSettingsFilePath); >- inputReader= new InputStreamReader(new FileInputStream(file),"UTF-16");//$NON-NLS-1$ >- inputFileContents = new StringBuffer(); >- char[] inputBuf = new char[1000]; >- int bytesRead = inputReader.read(inputBuf); >- >- while(bytesRead!=-1) >- { >- inputFileContents.append(inputBuf,0,bytesRead); >- bytesRead = inputReader.read(inputBuf); >- } >- } >- catch (IOException e) >- { >- String currentOS = Platform.getOS(); >- if (currentOS.equals("win32")) { >- String myVersion = System.getProperty("os.version"); >- if (myVersion.startsWith("6")) { >- inputFileContents.append("RECORDING_TPTPRECUTIL_DLL_MISSING"); >- }else { >- inputFileContents.append("WINDOWS_ADMIN_ERROR"); >- e.printStackTrace(); >- } >- } >- >- } >- >- finally >- { >- if(inputReader!=null) >- try >- { >- inputReader.close(); >- } >- catch (IOException e1) >- { >- e1.printStackTrace(); >- } >- } >- // Clean up >- if (file != null) { >- if (file.exists()) >- file.delete(); >- } >- return; >- } >- >- // added for Bugilla 168597 >- private void getRegistryInfoUsingNativeAPI(StringBuffer inputFileContents){ >- // fire up an instance of the JNI layer to start using native code >- AddSettingToBuffer(jniWrapper, inputFileContents, "ProxyEnable"); >- AddSettingToBuffer(jniWrapper, inputFileContents, "AutoConfigURL"); >- AddSettingToBuffer(jniWrapper, inputFileContents, "ProxyServer"); >- AddSettingToBuffer(jniWrapper, inputFileContents, "ProxyOverride"); >- >- return; >- } >- >- private void AddSettingToBuffer(JNIWrapper jniWrapper, StringBuffer inputFileContents, String name){ >- String setting = jniWrapper.getInternetSetting(name); >- if (setting != null && setting.length() > 0){ >- inputFileContents.append("\"" + name + "\"=" + setting + "\r\n"); >- } >- return; >- } >- >- >- private boolean checkProxyEnabled(StringBuffer inputBuffer) >- { >- boolean comparesOK = false; >- StringTokenizer fileTokenizer = new StringTokenizer(inputBuffer.toString(),"\r\n");//$NON-NLS-1$ >- while(fileTokenizer.hasMoreTokens()) >- { >- String line=fileTokenizer.nextToken(); >- String newLine = line; >- // example ProxyServer is key, "http=markdunn:1000;socks=localhost:450" >- if(line.startsWith("\"ProxyEnable"))//$NON-NLS-1$ >- { >- StringTokenizer lineTokenizer = new StringTokenizer(line,":");//$NON-NLS-1$ >- newLine=lineTokenizer.nextToken(); // get ProxyEnable >- newLine=lineTokenizer.nextToken(); >- if (newLine.equalsIgnoreCase("00000001")) >- comparesOK = true; >- >- } //defect 82974 below - also check AutoConfigURL >- else if (line.startsWith("\"AutoConfigURL")) { >- setBadProxySettings(true); >- setProxyError(AUTO_CONFIG_URL); >- setAutoConfigURLEnabled(true); >- String autoConfigStr = ""; >- autoConfigStr = findAutoConfigURLString(line); >- setAutoConfigURLString(autoConfigStr); >- break; >- } >- } >- return comparesOK; >- } >- >- private String getProxyInfo(StringBuffer inputBuffer) >- { >- String proxyString = ""; >- String httpString = "http="; >- String secureString = "https="; >- String socksString = "socks="; >- String equalsString = "="; >- String HTTPString = ""; >- String SECUREString = ""; >- int findSOCKS = -1; >- int findHTTP = -1; >- int findSECURE = -1; >- StringTokenizer fileTokenizer = new StringTokenizer(inputBuffer.toString(),"\r\n");//$NON-NLS-1$ >- while(fileTokenizer.hasMoreTokens()) >- { >- String line=fileTokenizer.nextToken(); >- // example ProxyServer is key, "http=markdunn:1000;https=mdunnlinux:3128;socks=localhost:450" >- // or "mdunnlinux:3128 - which means use this proxy for all protocols >- >- if(line.startsWith("\"ProxyServer"))//$NON-NLS-1$ >- { >- String tmp = "\"ProxyServer\"="; >- String modifiedLine = line.substring(tmp.length()); >- String [] entireString = modifiedLine.split(";"); >- int numVars = entireString.length; >- for (int i =0; i < numVars; i++){ >- String tmpEntireString = entireString[i].replaceAll("\"",""); >- int findEqualsString = tmpEntireString.indexOf(equalsString); >- if (findEqualsString == -1) { >- proxyString = tmpEntireString; >- } >- else { >- if (findSOCKS == -1){ >- findSOCKS = tmpEntireString.indexOf(socksString); >- if (findSOCKS >= 0) >- break; >- } >- if (findHTTP == -1) { >- findHTTP = tmpEntireString.indexOf(httpString); >- if (findHTTP >= 0) >- HTTPString = tmpEntireString; >- } >- if (findSECURE == -1) { >- findSECURE = tmpEntireString.indexOf(secureString); >- if (findSECURE >= 0) >- SECUREString = tmpEntireString; >- } >- } >- } >- if (findSOCKS >= 0) { >- setBadProxySettings(true); >- setProxyError(SOCKS_SET); >- } >- else { >- if ((findHTTP >= 0) && (findSECURE == -1)) { >- setBadProxySettings(true); >- setProxyError(HTTP_PROXY_ONLY_SET); >- } >- else if ((findHTTP == -1) && (findSECURE >= 0 )) { >- setBadProxySettings(true); >- setProxyError(SECURE_PROXY_ONLY_SET); >- } >- else if ((findHTTP >= 0) && (findSECURE >= 0)) { >- // if two string equal - it is OK >- // if different - then ERROR >- // HTTPString=http=mdunnlinux:3128 >- // SECUREString=https=mdunnlinux:3128 >- // must first strip off up to '=' and then compare >- int httpEQUALS = HTTPString.indexOf("="); >- int secureEQUALS = SECUREString.indexOf("="); >- String tmpHTTP = HTTPString.substring(httpEQUALS+1); >- String tmpSECURE = SECUREString.substring(secureEQUALS+1); >- //if (HTTPString.equalsIgnoreCase(SECUREString)){ >- if (tmpHTTP.equalsIgnoreCase(tmpSECURE)){ >- if (tmpHTTP.startsWith("localhost")) { >- setBadProxySettings(true); >- setProxyError(HTTP_SECURE_LOCALHOST); >- } >- else { >- setBadProxySettings(false); >- setProxyError(PROXY_SETTINGS_OK); >- String tmpVal = ""; >- tmpVal = HTTPString.substring(findHTTP+httpString.length()); >- proxyString = tmpVal; >- } >- } >- else { >- //setBadProxySettings(true); >- //setProxyError(HTTP_SECURE_MISMATCH); >- // bugzilla 79219 mdd >- // https proxy different from http proxy >- setBadProxySettings(false); >- secureStringGlobal = tmpSECURE; >- setSSLProxyEnabled(true); >- setProxyError(PROXY_SETTINGS_OK); >- String tmpVal = ""; >- tmpVal = HTTPString.substring(findHTTP+httpString.length()); >- proxyString = tmpVal; >- } >- } >- } >- } >- // defect 82974 1/18/2005 >- else if (line.startsWith("\"ProxyOverride")) { >- setProxyOverrideEnabled(true); >- proxyOverrideString = findOverrideString(line); >- } >- else if (line.startsWith("\"AutoConfigURL")) { >- setAutoConfigURLEnabled(true); >- autoConfigURLString = findAutoConfigURLString(line); >- } >- } >- return proxyString; >- } >- >- /** >- * @param string >- */ >- private String findOverrideString(String line) { >- // TODO Auto-generated method stub >- String returnStr = ""; >- String tmp="\"ProxyOverride"; >- String tmp2 = line.replaceAll("\"",""); >- String tmp3= tmp2.replaceAll("<",""); >- tmp3= tmp3.replaceAll(">",""); >- >- returnStr = tmp3.substring(tmp.length()); >- return returnStr; >- } >- >- private String findAutoConfigURLString(String line) { >- // TODO Auto-generated method stub >- String returnStr = ""; >- String tmp="\"AutoConfigURL"; >- String tmp2 = line.replaceAll("\"",""); >- String tmp3= tmp2.replaceAll("<",""); >- tmp3= tmp3.replaceAll(">",""); >- >- returnStr = tmp3.substring(tmp.length()); >- return returnStr; >- } >- public void setProxyType(String string) { >- proxyType = string; >- } >- /** >- * @return >- */ >- public String getProxyType() { >- return proxyType; >- } >- >- /** >- * @param string >- */ >- public void setProxyPort(String string) { >- proxyPort = string; >- } >- /** >- * @return >- */ >- public String getProxyPort() { >- return proxyPort; >- } >- >- /** >- * @return >- */ >- public boolean isProxyEnabled() { >- return isProxyEnabled; >- } >- >- /** >- * @param b >- */ >- public void setProxyEnabled(boolean b) { >- isProxyEnabled = b; >- } >- >- /** >- * @return >- */ >- public String getProxyAddr() { >- return proxyAddr; >- } >- >- /** >- * @param string >- */ >- public void setProxyAddr(String string) { >- proxyAddr = string; >- } >- >- /** >- * @return Returns the badProxySettings. >- */ >- public boolean isBadProxySettings() { >- return badProxySettings; >- } >- /** >- * @param badProxySettings The badProxySettings to set. >- */ >- public void setBadProxySettings(boolean badProxySettings) { >- this.badProxySettings = badProxySettings; >- } >- /** >- * @return Returns the proxyError. >- */ >- public int getProxyError() { >- return proxyError; >- } >- /** >- * @param proxyError The proxyError to set. >- */ >- public void setProxyError(int proxyError) { >- this.proxyError = proxyError; >- } >- /** >- * @return Returns the sslProxyPort. >- */ >- public String getSslProxyPort() { >- return sslProxyPort; >- } >- /** >- * @param sslProxyPort The sslProxyPort to set. >- */ >- public void setSslProxyPort(String sslProxyPort) { >- this.sslProxyPort = sslProxyPort; >- } >- /** >- * @return Returns the sslProxy. >- */ >- public String getSslProxyAddr() { >- return sslProxyAddr; >- } >- /** >- * @param sslProxy The sslProxy to set. >- */ >- public void setSslProxyAddr(String sslProxy) { >- this.sslProxyAddr = sslProxy; >- } >- /** >- * @return Returns the isSSLProxyEnabled. >- */ >- public boolean isSSLProxyEnabled() { >- return isSSLProxyEnabled; >- } >- /** >- * @param isSSLProxyEnabled The isSSLProxyEnabled to set. >- */ >- public void setSSLProxyEnabled(boolean isSSLProxyEnabled) { >- this.isSSLProxyEnabled = isSSLProxyEnabled; >- } >- /** >- * @return Returns the isAutoConfigURLEnabled. >- */ >- public boolean isAutoConfigURLEnabled() { >- return isAutoConfigURLEnabled; >- } >- /** >- * @param isAutoConfigURLEnabled The isAutoConfigURLEnabled to set. >- */ >- public void setAutoConfigURLEnabled(boolean isAutoConfigURLEnabled) { >- this.isAutoConfigURLEnabled = isAutoConfigURLEnabled; >- } >- >- /** >- * @return Returns the isProxyOverrideEnabled. >- */ >- public boolean isProxyOverrideEnabled() { >- return isProxyOverrideEnabled; >- } >- /** >- * @param isProxyOverrideEnabled The isProxyOverrideEnabled to set. >- */ >- public void setProxyOverrideEnabled(boolean isProxyOverrideEnabled) { >- this.isProxyOverrideEnabled = isProxyOverrideEnabled; >- } >- /** >- * @return Returns the autoConfigURLString. >- */ >- public String getAutoConfigURLString() { >- return autoConfigURLString; >- } >- /** >- * @param autoConfigURLString The autoConfigURLString to set. >- */ >- public void setAutoConfigURLString(String autoConfigURLString) { >- this.autoConfigURLString = autoConfigURLString; >- } >- /** >- * @return Returns the proxyOverrideString. >- */ >- public String getProxyOverrideString() { >- return proxyOverrideString; >- } >- /** >- * @param proxyOverrideString The proxyOverrideString to set. >- */ >- public void setProxyOverrideString(String proxyOverrideString) { >- this.proxyOverrideString = proxyOverrideString; >- } >- public String getTempPath() >- { >- String theTmpPath = ""; >- IPath baseLoc = Platform.getLocation(); >- String newtpath = baseLoc.toOSString(); >- >- theTmpPath = newtpath; >- return theTmpPath; >- } >-} >Index: plugin.properties >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/plugin.properties,v >retrieving revision 1.83 >diff -u -r1.83 plugin.properties >--- plugin.properties 6 Mar 2008 21:58:26 -0000 1.83 >+++ plugin.properties 11 Mar 2008 18:07:50 -0000 >@@ -28,9 +28,7 @@ > EP_GEN_WIZS = Generate Wizards > EP_RUN_WIZS = Run Wizards > ConfigurableObjectExtensionPage = Configurable Object Extension Page >-Internet_Explorer=Internet Explorer >-Mozilla=Mozilla >-Firefox=Firefox >+ > ExecutionVerdictDecoratorDescription = Adds an icon decoration in the Test Navigator to display the verdict of the execution result elements. > GENERATE_TEST_MENUITEM_LABEL = Generate Test... > W_TEST_ASSETS = Test Assets >Index: plugin.xml >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/plugin.xml,v >retrieving revision 1.81 >diff -u -r1.81 plugin.xml >--- plugin.xml 7 Mar 2008 12:53:37 -0000 1.81 >+++ plugin.xml 11 Mar 2008 18:07:51 -0000 >@@ -40,7 +40,6 @@ > <contexts file="infopop\testJava.xml" plugin ="org.eclipse.hyades.test.java"/> > <contexts file="infopop\testCommon.xml" plugin ="org.eclipse.hyades.test.common"/> > <contexts file="infopop\recorderUI.xml" plugin ="org.eclipse.hyades.execution.testgen"/> >- <contexts file="infopop\recorderUI.xml" plugin ="org.eclipse.hyades.execution.recorder.http"/> > <contexts file="infopop\recorderUI.xml" plugin ="org.eclipse.hyades.execution.recorder.harness"/> > </extension> > >@@ -712,29 +711,6 @@ > <attribute name="lastSaveStamp"/> > <persistent value="true"/> > </extension> >- >- <extension >- point="org.eclipse.hyades.test.core.RecorderApplication"> >- <RecorderAppAdapter >- supportedOS="win32" >- name="%Internet_Explorer" >- id="org.eclipse.hyades.test.core.RecorderApplication.InternetExplorer" >- class="org.eclipse.hyades.execution.recorder.local.appadapters.InternetExplorerAdapter" >- isPathEditable="false"> >- </RecorderAppAdapter> >- <RecorderAppAdapter >- supportedOS="linux,win32" >- name="%Mozilla" >- id="org.eclipse.hyades.test.core.RecorderApplication.Mozilla" >- class="org.eclipse.hyades.execution.recorder.local.appadapters.MozillaAdapter"> >- </RecorderAppAdapter> >- <RecorderAppAdapter >- supportedOS="linux,win32" >- name="%Firefox" >- id="org.eclipse.hyades.test.core.RecorderApplication.Firefox" >- class="org.eclipse.hyades.execution.recorder.local.appadapters.FirefoxAdapter"> >- </RecorderAppAdapter> >- </extension> > > <extension > point="org.eclipse.ui.popupMenus"> >Index: src/org/eclipse/hyades/test/ui/UiPlugin.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/UiPlugin.java,v >retrieving revision 1.42 >diff -u -r1.42 UiPlugin.java >--- src/org/eclipse/hyades/test/ui/UiPlugin.java 28 Feb 2008 18:21:52 -0000 1.42 >+++ src/org/eclipse/hyades/test/ui/UiPlugin.java 11 Mar 2008 18:07:51 -0000 >@@ -26,14 +26,11 @@ > import org.eclipse.core.runtime.Platform; > import org.eclipse.core.runtime.Status; > import org.eclipse.emf.ecore.resource.Resource; >-import org.eclipse.hyades.execution.recorder.local.appadapters.FirefoxAdapter; >-import org.eclipse.hyades.execution.recorder.local.appadapters.MozillaAdapter; > import org.eclipse.hyades.models.common.common.CMNNamedElement; > import org.eclipse.hyades.models.common.testprofile.TPFExecutionEvent; > import org.eclipse.hyades.models.common.util.ICommonConstants; > import org.eclipse.hyades.test.core.TestCorePlugin; > import org.eclipse.hyades.test.core.TestCorePreferences; >-import org.eclipse.hyades.test.core.testgen.TestGeneratorFactory; > import org.eclipse.hyades.test.ui.adapter.IResourceSetFileAdaptable; > import org.eclipse.hyades.test.ui.adapter.TestAdapterFactory; > import org.eclipse.hyades.test.ui.internal.navigator.proxy.IExtendedProxyNode; >@@ -57,7 +54,7 @@ > * > * > * @author Paul E. Slauenwhite >- * @version February 28, 2008 >+ * @version March 11, 2008 > * @since January 27, 2005 > */ > public class UiPlugin extends AbstractUIPlugin { >@@ -82,8 +79,11 @@ > * Extension point id used to register the generate wizards. > */ > public static final String EP_GENERATE_WIZARDS = "generateWizards"; //$NON-NLS-1$ >- // TestGen info >- public static final String TEST_GENERATOR="default_test_generator"; //$NON-NLS-1$ >+ >+ /** >+ * @deprecated As of TPTP 4.5.0, internalized in the <code>org.eclipse.tptp.test.recorders.url</code> plug-in. >+ */ >+ public static final String TEST_GENERATOR = "default_test_generator"; //$NON-NLS-1$ > > /** > * The constructor. >@@ -392,7 +392,6 @@ > */ > protected void initializeDefaultPreferences(IPreferenceStore store) > { >- store.setDefault(UiPlugin.TEST_GENERATOR,getDefaultGeneratorID()); //$NON-NLS-1$ > store.setDefault(TestUI.REPORT_OPEN_EDITOR, true); > store.setDefault(TestUI.OPEN_EDITOR, MessageDialogWithToggle.PROMPT); > store.setDefault(TestUI.OPEN_TEST_PERSPECTIVE, MessageDialogWithToggle.PROMPT); >@@ -411,28 +410,19 @@ > store.getString(TestCorePreferences.LOCALHOST_PORT)); > TestCorePlugin.getDefault().getPluginPreferences().setValue(TestCorePreferences.SAVE_INTERVAL, > store.getInt(TestCorePreferences.SAVE_INTERVAL)); >- >- TestCorePlugin.getDefault().getPluginPreferences().setValue(MozillaAdapter.PREFERENCE_PATH, >- store.getString(MozillaAdapter.PREFERENCE_PATH)); >- >- TestCorePlugin.getDefault().getPluginPreferences().setValue(FirefoxAdapter.PREFERENCE_PATH, >- store.getString(FirefoxAdapter.PREFERENCE_PATH)); >- >- > } > >- public String getDefaultGeneratorID() >- { >- //find all registered generators, select the highest priority >- String[] ids = TestGeneratorFactory.getInstance().getGeneratorIDs(); >- String defaultID = "org.eclipse.hyades.test.tools.core.TestGenerator.HTTPGenerator"; //$NON-NLS-1$ >- int nMax = -1; >- for (int i = 0; i < ids.length; i++) >- { >- if (TestGeneratorFactory.getInstance().getGeneratorPriority(ids[i]) > nMax) >- defaultID = ids[i]; >- } >- return defaultID; >+ /** >+ * This method always returns <code>null</code> for API compatability. >+ * <p/> >+ * >+ * @return Always returns <code>null</code>. >+ * @deprecated As of TPTP 4.5.0, internalized in the <code>org.eclipse.tptp.test.recorders.url</code> plug-in. >+ */ >+ public String getDefaultGeneratorID(){ >+ >+ //Return null since only for API compatability. >+ return null; > } > > /** >Index: infopop/recorderUI.xml >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/infopop/recorderUI.xml,v >retrieving revision 1.3 >diff -u -r1.3 recorderUI.xml >--- infopop/recorderUI.xml 29 Feb 2008 03:36:10 -0000 1.3 >+++ infopop/recorderUI.xml 11 Mar 2008 18:07:51 -0000 >@@ -11,14 +11,6 @@ > <?NLS TYPE="org.eclipse.help.contexts"?> > <contexts> > >- >- >-<!--HTTP proxy recorder preferences--> >-<context id="HttpRecorderPreferencePage"> >-<description>Set HTTP proxy recorder preferences</description> >-<topic href="../org.eclipse.hyades.test.doc.user/ref/httpRecorderPref.htm" label="HTTP proxy recorder preferences dialog box"/> >-</context> >- > <!--Specify the pathname of the test suite container file--> > <context id="TestSuitePathSelector"> > <description>Specify the pathname of the generated test suite</description> >#P features >? org.eclipse.tptp.test.recorders.url >? org.eclipse.tptp.test.recorders.url >? org.eclipse.tptp.test.recorders.url >Index: org.eclipse.tptp.test.recorders.url/sourceTemplateFeature/feature.properties >=================================================================== >RCS file: /cvsroot/tptp/test/features/org.eclipse.tptp.test.tools.junit/sourceTemplateFeature/feature.properties,v >retrieving revision 1.3 >diff -u -r1.3 feature.properties >--- org.eclipse.tptp.test.recorders.url/sourceTemplateFeature/feature.properties 28 Feb 2008 21:39:18 -0000 1.3 >+++ org.eclipse.tptp.test.recorders.url/sourceTemplateFeature/feature.properties 11 Mar 2008 18:07:52 -0000 >@@ -1,10 +1,10 @@ > ############################################################################### >-# Copyright (c) 2007, 2008 IBM Corporation and others. >+# Copyright (c) 2008 IBM Corporation and others. > # All rights reserved. This program and the accompanying materials > # are made available under the terms of the Eclipse Public License v1.0 > # which accompanies this distribution, and is available at > # http://www.eclipse.org/legal/epl-v10.html >-# $Id: feature.properties,v 1.3 2008/02/28 21:39:18 jkubasta Exp $ >+# $Id$ > # > # Contributors: > # IBM Corporation - initial API and implementation >@@ -20,14 +20,14 @@ > # NLS_ENCODING=UTF-8 > > # "featureName" property - name of the feature >-featureName=TPTP Test Tools JUnit Source >+featureName=TPTP URL Recorder Source > > # "licenseURL" property - URL of the "Feature License" > # do not translate value - just change to point to a locale-specific HTML page > licenseURL=license.html > > # "description" property - description of the feature >-description=TPTP Test Tools JUnit Source Feature >+description=Source for the TPTP URL Recorder for creating a recording of the HTTP protocol from URLs entered in a Web browser used to generate a TPTP URL Test suite. > > # "providerName" property - name of the company that provides the feature > providerName=Eclipse.org >Index: org.eclipse.tptp.test.tools/feature.xml >=================================================================== >RCS file: /cvsroot/tptp/test/features/org.eclipse.tptp.test.tools/feature.xml,v >retrieving revision 1.28 >diff -u -r1.28 feature.xml >--- org.eclipse.tptp.test.tools/feature.xml 29 Feb 2008 20:46:43 -0000 1.28 >+++ org.eclipse.tptp.test.tools/feature.xml 11 Mar 2008 18:07:52 -0000 >@@ -40,6 +40,11 @@ > version="0.0.0" > optional="true"/> > >+ <includes >+ id="org.eclipse.tptp.test.recorders.url" >+ version="0.0.0" >+ optional="true"/> >+ > <requires> > <import feature="org.eclipse.tptp.test"/> > </requires> >Index: org.eclipse.tptp.test.recorders.url/sourceTemplatePlugin/about.properties >=================================================================== >RCS file: /cvsroot/tptp/test/features/org.eclipse.tptp.test.tools.junit/sourceTemplatePlugin/about.properties,v >retrieving revision 1.3 >diff -u -r1.3 about.properties >--- org.eclipse.tptp.test.recorders.url/sourceTemplatePlugin/about.properties 18 Jan 2008 16:10:32 -0000 1.3 >+++ org.eclipse.tptp.test.recorders.url/sourceTemplatePlugin/about.properties 11 Mar 2008 18:07:52 -0000 >@@ -1,10 +1,10 @@ > ############################################################################### >-# Copyright (c) 2007, 2008 IBM Corporation and others. >+# Copyright (c) 2008 IBM Corporation and others. > # All rights reserved. This program and the accompanying materials > # are made available under the terms of the Eclipse Public License v1.0 > # which accompanies this distribution, and is available at > # http://www.eclipse.org/legal/epl-v10.html >-# $Id: about.properties,v 1.3 2008/01/18 16:10:32 paules Exp $ >+# $Id$ > # > # Contributors: > # IBM Corporation - initial API and implementation >@@ -25,17 +25,16 @@ > # fill-ins are supplied by about.mappings > # This file should be translated. > >-featureName=TPTP Test Tools JUnit >+featureName=TPTP URL Recorder Source > >-featureText=TPTP Test Tools JUnit\n\ >+featureText=TPTP URL Recorder Source\n\ > Version: {featureVersion}\n\ > Build id: {0}\n\ > \n\ >-Copyright (c) 2007 IBM Corporation and others. All rights reserved.\n\ >+Copyright (c) 2008 IBM Corporation and others. All rights reserved.\n\ > \n\ >-The TPTP Test feature provides frameworks and services for building testing tools.\n\ >-The feature also includes reference implementations of tools that build on these\n\ >-frameworks and services.\n\ >+Source for the TPTP URL Recorder for creating a recording of the HTTP protocol \n\ >+from URLs entered in a Web browser used to generate a TPTP URL Test suite.\n\ > Visit http://www.eclipse.org/tptp/test/ > > # ============================================================================== >Index: org.eclipse.tptp.test.recorders.url/sourceTemplatePlugin/plugin.properties >=================================================================== >RCS file: /cvsroot/tptp/test/features/org.eclipse.tptp.test.tools.junit/sourceTemplatePlugin/plugin.properties,v >retrieving revision 1.1 >diff -u -r1.1 plugin.properties >--- org.eclipse.tptp.test.recorders.url/sourceTemplatePlugin/plugin.properties 24 Apr 2007 18:47:38 -0000 1.1 >+++ org.eclipse.tptp.test.recorders.url/sourceTemplatePlugin/plugin.properties 11 Mar 2008 18:07:52 -0000 >@@ -1,10 +1,10 @@ > ############################################################################### >-# Copyright (c) 2007 IBM Corporation and others. >+# Copyright (c) 2008 IBM Corporation and others. > # All rights reserved. This program and the accompanying materials > # are made available under the terms of the Eclipse Public License v1.0 > # which accompanies this distribution, and is available at > # http://www.eclipse.org/legal/epl-v10.html >-# $Id: plugin.properties,v 1.1 2007/04/24 18:47:38 hleung Exp $ >+# $Id$ > # > # Contributors: > # IBM Corporation - initial API and implementation >@@ -19,19 +19,5 @@ > # NLS_MESSAGEFORMAT_VAR > # NLS_ENCODING=UTF-8 > >-pluginName = TPTP JUnit Plugin Test Tools >+pluginName = TPTP URL Recorder Source > providerName = Eclipse.org >- >- >-# plugin.xml message(s): >-WORKBENCH_PROPERTY_GROUP_TTL = Eclipse Workbench Properties >-WORKBENCH_PROPERTY_GROUP_DSC = This location defines the following workbench properties: >-TST_SUITE_PLUGIN_JUNIT_NAME = TPTP JUnit Plug-in Test >-WIZ_NEW_PLUGIN_JUNIT_TST_SUITE_DSC = Creates a new TPTP JUnit Test for an Eclipse plug-in >-W_WORKBENCH_LOCATION = Workbench Location >-WIZ_NEW_WORKBENCH_LOCATION_DSC = Creates a new location for an Eclipse workbench. A workbench location is used to specify where a TPTP JUnit Plug-in test will run. >-TST_SUITE_PLUGIN_JUNIT_DSC = A Plug-in Test is a JUnit test designed to run in an Eclipse worbench. >-EDT_PLUGIN_JUNIT_TST_SUITE_DSC = A specialized editor for defining JUnit plug-in tests >-EDT_PLUGIN_JUNIT_TST_SUITE_TTL = JUnit Plug-in Test Editor >- >- >#P org.eclipse.hyades.test.tools.ui >Index: src/org/eclipse/hyades/test/tools/ui/ToolsUiPlugin.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.tools.ui/src/org/eclipse/hyades/test/tools/ui/ToolsUiPlugin.java,v >retrieving revision 1.26 >diff -u -r1.26 ToolsUiPlugin.java >--- src/org/eclipse/hyades/test/tools/ui/ToolsUiPlugin.java 5 Dec 2007 20:03:53 -0000 1.26 >+++ src/org/eclipse/hyades/test/tools/ui/ToolsUiPlugin.java 11 Mar 2008 18:07:54 -0000 >@@ -1,5 +1,5 @@ > /********************************************************************** >- * Copyright (c) 2005, 2007 IBM Corporation and others. >+ * Copyright (c) 2005, 2008 IBM Corporation and others. > * All rights reserved. This program and the accompanying materials > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -9,7 +9,6 @@ > * Contributors: > * IBM - Initial API and implementation > **********************************************************************/ >- > package org.eclipse.hyades.test.tools.ui; > > import java.net.URL; >@@ -19,45 +18,58 @@ > import org.eclipse.core.runtime.Platform; > import org.eclipse.core.runtime.Status; > import org.eclipse.hyades.execution.recorder.Recorder; >-import org.eclipse.hyades.execution.recorder.RecorderException; >-import org.eclipse.hyades.execution.recorder.http.local.HttpRecorderAgentEnvironmentAdapter; >-import org.eclipse.hyades.execution.recorder.http.local.HttpRecorderDataProcessor; >-import org.eclipse.hyades.execution.recorder.http.local.HttpRecorderExecutableObjectAdapter; > import org.eclipse.hyades.test.core.TestCorePlugin; > import org.eclipse.hyades.test.tools.ui.common.TestCommonImages; > import org.eclipse.hyades.test.tools.ui.http.TestHttpImages; > import org.eclipse.hyades.test.tools.ui.java.TestJavaImages; >-import org.eclipse.hyades.test.ui.UiPlugin; >-import org.eclipse.jface.preference.IPreferenceStore; > import org.eclipse.osgi.util.NLS; > import org.eclipse.swt.widgets.Display; > import org.eclipse.ui.plugin.AbstractUIPlugin; > import org.osgi.framework.BundleContext; > >- > /** >- * The main plugin class to be used in the desktop. >+ * Tools UI activator. The activator class controls the >+ * plug-in life cycle. >+ * <p> >+ * <p/> >+ * >+ * >+ * @author Paul E. Slauenwhite >+ * @version March 11, 2008 >+ * @since February 1, 2005 > */ > public class ToolsUiPlugin extends AbstractUIPlugin { > >+ //Plug-in ID: > public static final String PLUGIN_ID = "org.eclipse.hyades.test.tools.ui"; //$NON-NLS-1$ >- //The shared instance. >+ >+ //Shared instance of the activator class for this plug-in: > private static ToolsUiPlugin plugin; > >- //Resource bundle. >+ //Resource bundle: > private ResourceBundle resourceBundle; >- >- //Recorder Info below >+ >+ /** >+ * @deprecated As of TPTP 4.5.0, internalized in the <code>org.eclipse.tptp.test.recorders.url</code> plug-in. >+ */ > public static final String RECORDING_PATH = "recording_path"; //$NON-NLS-1$ >- public static final String RECORDER_APP_ADAPTER="application_under_test"; //$NON-NLS-1$ > >- public static final String PROXY_PORT="default_proxy_port"; //$NON-NLS-1$ >- >- public static final String DEFAULT_PORT="1080"; >+ /** >+ * @deprecated As of TPTP 4.5.0, internalized in the <code>org.eclipse.tptp.test.recorders.url</code> plug-in. >+ */ >+ public static final String RECORDER_APP_ADAPTER = "application_under_test"; //$NON-NLS-1$ > >- private Recorder recorder; >+ /** >+ * @deprecated As of TPTP 4.5.0, internalized in the <code>org.eclipse.tptp.test.recorders.url</code> plug-in. >+ */ >+ public static final String PROXY_PORT = "default_proxy_port"; //$NON-NLS-1$ > > /** >+ * @deprecated As of TPTP 4.5.0, internalized in the <code>org.eclipse.tptp.test.recorders.url</code> plug-in. >+ */ >+ public static final String DEFAULT_PORT = "1080"; >+ >+ /** > * The constructor. > */ > public ToolsUiPlugin() { >@@ -219,6 +231,14 @@ > return PLUGIN_ID; > } > >+ public static void storePreference(String key, String value){ >+ getDefault().getPreferenceStore().setValue(key,value); >+ } >+ >+ public static String getPreference(String key){ >+ return getDefault().getPreferenceStore().getString(key); >+ } >+ > /** > * Logs an error described by a throwable. > * >@@ -249,49 +269,23 @@ > } > > // Recorder Stuff >+ /** >+ * @deprecated As of TPTP 4.5.0, internalized in the <code>org.eclipse.tptp.test.recorders.url</code> plug-in. >+ */ > public void getRecorderInfo() { >- try >- { >- recorder = new Recorder("org.eclipse.hyades.execution.recorder.http", //$NON-NLS-1$ >- new HttpRecorderDataProcessor(), >- new HttpRecorderAgentEnvironmentAdapter(), >- new HttpRecorderExecutableObjectAdapter()); >- } >- catch (RecorderException e1) >- { >- e1.printStackTrace(); >- } >- >- >+ //No-operation since only for API compatability. > } > >- public Recorder getRecorder() >- { >- if(recorder == null) >- getRecorderInfo(); >- return recorder; >- } >- >- public static void storePreference(String key, String value) >- { >- getDefault().getPreferenceStore().setValue(key,value); >- } >- >- protected void initializeDefaultPreferences(IPreferenceStore store) >- { >- if (Platform.getOS().equals("win32")) >- store.setDefault(ToolsUiPlugin.RECORDER_APP_ADAPTER,"org.eclipse.hyades.test.core.RecorderApplication.InternetExplorer");//$NON-NLS-1$ >- else >- // below for bugzilla 171812 mdd 04/17/2007 >- store.setDefault(ToolsUiPlugin.RECORDER_APP_ADAPTER,"org.eclipse.hyades.test.core.RecorderApplication.Firefox"); >- >- ToolsUiPlugin.getDefault().getPreferenceStore().setDefault(UiPlugin.TEST_GENERATOR,UiPlugin.getDefault().getDefaultGeneratorID()); >- store.setDefault(ToolsUiPlugin.PROXY_PORT,DEFAULT_PORT); //$NON-NLS-1$ >- >- } >- public static String getPreference(String key) >- { >- return getDefault().getPreferenceStore().getString(key); >- } >+ /** >+ * This method always returns <code>null</code> for API compatability. >+ * <p/> >+ * >+ * @return Always returns <code>null</code>. >+ * @deprecated As of TPTP 4.5.0, internalized in the <code>org.eclipse.tptp.test.recorders.url</code> plug-in. >+ */ >+ public Recorder getRecorder(){ > >+ //Return null since only for API compatability. >+ return null; >+ } > } >Index: src/org/eclipse/hyades/test/tools/ui/HTTPRecorderPreferences.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.tools.ui/src/org/eclipse/hyades/test/tools/ui/HTTPRecorderPreferences.java,v >retrieving revision 1.4 >diff -u -r1.4 HTTPRecorderPreferences.java >--- src/org/eclipse/hyades/test/tools/ui/HTTPRecorderPreferences.java 17 Apr 2007 19:50:42 -0000 1.4 >+++ src/org/eclipse/hyades/test/tools/ui/HTTPRecorderPreferences.java 11 Mar 2008 18:07:53 -0000 >@@ -1,5 +1,5 @@ > /********************************************************************** >- * Copyright (c) 2006, 2007 IBM Corporation and others. >+ * Copyright (c) 2006, 2008 IBM Corporation and others. > * All rights reserved. This program and the accompanying materials > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -11,37 +11,31 @@ > **********************************************************************/ > package org.eclipse.hyades.test.tools.ui; > >- >-import org.eclipse.core.runtime.Platform; >-import org.eclipse.core.runtime.Preferences; > import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; >-import org.eclipse.hyades.test.ui.UiPlugin; > >+/** >+ * HTTP recorder preferences. >+ * <p/> >+ * >+ * >+ * @author Paul E. Slauenwhite >+ * @version March 11, 2008 >+ * @since September 21, 2006 >+ * @deprecated As of TPTP 4.5.0, internalized in the <code>org.eclipse.tptp.test.recorders.url</code> plug-in. >+ */ > public class HTTPRecorderPreferences extends AbstractPreferenceInitializer { >- public static final String PLUGIN_ID = "org.eclipse.hyades.test.tools.ui"; //$NON-NLS-1$ >- >- //Recorder Info below >- public static final String RECORDING_PATH = "recording_path"; //$NON-NLS-1$ >- public static final String RECORDER_APP_ADAPTER="application_under_test"; //$NON-NLS-1$ >- >- public static final String PROXY_PORT="default_proxy_port"; //$NON-NLS-1$ > >- public static final String DEFAULT_PORT="1080"; >+ public static final String PLUGIN_ID = ToolsUiPlugin.PLUGIN_ID; >+ public static final String RECORDING_PATH = ToolsUiPlugin.RECORDING_PATH; >+ public static final String RECORDER_APP_ADAPTER = ToolsUiPlugin.RECORDER_APP_ADAPTER; >+ public static final String PROXY_PORT = ToolsUiPlugin.PROXY_PORT; >+ public static final String DEFAULT_PORT = ToolsUiPlugin.DEFAULT_PORT; > >- //private Recorder recorder; >- >+ /** >+ * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences() >+ * @deprecated As of TPTP 4.5.0, internalized in the <code>org.eclipse.tptp.test.recorders.url</code> plug-in. >+ */ > public void initializeDefaultPreferences() { >- // prefs.setDefault(DEFAULT_JUNIT_TEST_SUITE_FACTORY, DEFAULT_DEFAULT_JUNIT_TEST_SUITE_FACTORY); >- Preferences prefs = ToolsUiPlugin.getDefault().getPluginPreferences(); >- // TODO Auto-generated method stub >- if (Platform.getOS().equals("win32")) >- prefs.setDefault(ToolsUiPlugin.RECORDER_APP_ADAPTER,"org.eclipse.hyades.test.core.RecorderApplication.InternetExplorer");//$NON-NLS-1$ >- else // below for bugzilla 171812 mdd 04/17/2007 >- prefs.setDefault(ToolsUiPlugin.RECORDER_APP_ADAPTER,"org.eclipse.hyades.test.core.RecorderApplication.Firefox"); //$NON-NLS-1$ >- >- ToolsUiPlugin.getDefault().getPreferenceStore().setDefault(UiPlugin.TEST_GENERATOR,UiPlugin.getDefault().getDefaultGeneratorID()); >- prefs.setDefault(ToolsUiPlugin.PROXY_PORT,DEFAULT_PORT); //$NON-NLS-1$ >- >+ //No-operation since only for API compatability. > } >- > } >Index: plugin.xml >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.tools.ui/plugin.xml,v >retrieving revision 1.56 >diff -u -r1.56 plugin.xml >--- plugin.xml 7 Mar 2008 15:12:00 -0000 1.56 >+++ plugin.xml 11 Mar 2008 18:07:53 -0000 >@@ -316,32 +316,8 @@ > </objectContribution> > </extension> > >- <extension >- point="org.eclipse.ui.preferencePages"> >- <page >- name="%URL_RECORDER_NAME" >- category="org.eclipse.hyades.test.http.internal.preferences.HttpPreferencePage" >- class="org.eclipse.hyades.execution.recorder.http.ui.preferences.HttpRecorderPreferencePage" >- id="org.eclipse.hyades.execution.recorder.http.ui.preferences.HttpRecorderPreferencePage"> >- </page> >- </extension> > > <extension >- point="org.eclipse.hyades.test.core.Recorder"> >- <Recorder >- description="%URL_RECORDER_DESCRIPTION" >- execOptionsProvider="org.eclipse.tptp.test.tools.internal.recorder.http.providers.HttpRecorderExecOptions" >- fileExtension="rec" >- icon="icons/full/obj16/http.gif" >- id="org.eclipse.hyades.test.tools.recorder.http" >- name="%URL_RECORDER_NAME" >- protocol="HTTP" >- recorderAgent="org.eclipse.hyades.execution.recorder.http.remote.SSLProxyRecorder" >- recorderClientHelper="org.eclipse.tptp.test.provisional.recorder.ui.framework.DefaultRecorderClientHelper" >- recorderMessageHandlers="org.eclipse.hyades.execution.recorder.http.local.HttpRecorderDataProcessor" >- wizardPageProvider="org.eclipse.tptp.test.tools.internal.recorder.http.providers.HttpRecorderWizardProvider"/> >- </extension> >- <extension > point="org.eclipse.hyades.ui.typeDescriptions"> > <typeDescription > name="%REGULAR_JUNIT_TYPE" >@@ -378,10 +354,6 @@ > <initializer class="org.eclipse.hyades.test.tools.ui.java.internal.junit.preferences.JUnitUIPreferences"/> > </extension> > <extension >- point="org.eclipse.core.runtime.preferences"> >- <initializer class="org.eclipse.hyades.test.tools.ui.HTTPRecorderPreferences"/> >- </extension> >- <extension > point="org.eclipse.hyades.test.ui.testNavigatorFileProxyFactory"> > <factory > class="org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator.RegularJUnitFileProxyFactory" >Index: plugin.properties >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.tools.ui/plugin.properties,v >retrieving revision 1.73 >diff -u -r1.73 plugin.properties >--- plugin.properties 7 Mar 2008 15:12:00 -0000 1.73 >+++ plugin.properties 11 Mar 2008 18:07:53 -0000 >@@ -73,11 +73,7 @@ > GEN_WTITLE = TPTP URL (JUnit) Test Definition Code Generation > GEN_WDESC = Generates a JUnit skeleton for a test definition. > >- > URL_RECORDER_STARTUP_PAGE = URL Recorder Startup Page >-URL_RECORDER_NAME = URL Recorder >-URL_RECORDER_DESCRIPTION = Creates a recording of the HTTP protocol from URLs entered in a Web browser application used to generate a TPTP URL Test suite. >- > > # Regular JUnit types > REGULAR_JUNIT_PROPERTY_PAGE_TITLE=TPTP JUnit Test >Index: .classpath >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.tools.ui/.classpath,v >retrieving revision 1.4 >diff -u -r1.4 .classpath >--- .classpath 28 Sep 2005 16:18:59 -0000 1.4 >+++ .classpath 11 Mar 2008 18:07:53 -0000 >@@ -1,7 +1,6 @@ > <?xml version="1.0" encoding="UTF-8"?> > <classpath> > <classpathentry kind="src" path="src"/> >- <classpathentry kind="src" path="src-recorder-http"/> > <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> > <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> > <classpathentry kind="output" path="bin"/> >Index: build.properties >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.tools.ui/build.properties,v >retrieving revision 1.14 >diff -u -r1.14 build.properties >--- build.properties 26 Apr 2007 20:26:21 -0000 1.14 >+++ build.properties 11 Mar 2008 18:07:53 -0000 >@@ -1,12 +1,10 @@ >-source.. = src-recorder-http/,\ >- src/ >+source.. = src/ > output.. = bin/ > bin.includes = about.html, plugin.xml,\ > .,\ > plugin.properties,\ > icons/,\ > messages/,\ >- testkeys,\ > schema/,\ > META-INF/ > jars.compile.order = . >Index: src/org/eclipse/hyades/test/tools/ui/internal/resources/ToolsUiPluginResourceBundle.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.tools.ui/src/org/eclipse/hyades/test/tools/ui/internal/resources/ToolsUiPluginResourceBundle.java,v >retrieving revision 1.11 >diff -u -r1.11 ToolsUiPluginResourceBundle.java >--- src/org/eclipse/hyades/test/tools/ui/internal/resources/ToolsUiPluginResourceBundle.java 10 Mar 2008 12:30:02 -0000 1.11 >+++ src/org/eclipse/hyades/test/tools/ui/internal/resources/ToolsUiPluginResourceBundle.java 11 Mar 2008 18:07:54 -0000 >@@ -19,7 +19,7 @@ > * > * > * @author Paul E. Slauenwhite >- * @version March 10, 2008 >+ * @version March 11, 2008 > * @since March 15, 2007 > */ > public final class ToolsUiPluginResourceBundle extends NLS { >@@ -157,51 +157,6 @@ > > public static String WIZ_TST_SUITE_GEN_PG_LOC_DSC; > public static String WIZ_TST_SUITE_GEN_PG_ATT_DSC; >- public static String HttpRecorderPreferencePage_PROXY_RECORDER_LOCAL_PORT_LABEL; >- public static String HttpRecorderPreferencePage_APPLICATION_GROUP; >- public static String HttpRecorderPreferencePage_GENERATOR_GROUP; >- public static String HttpRecorderPreferencePage_PROXY_GROUP; >- public static String HttpRecorderPreferencePage_APPLICATION_ADAPTER_SELECTOR_LABEL; >- public static String HttpRecorderPreferencePage_TEST_GENERATOR_LABEL; >- public static String HttpRecorderPreferencePage_NONE_SELECTED_TEXT; >- public static String HttpRecorderPreferencePage_APPLICATION_PATH_LABEL; >- public static String HttpRecorderLaunchWizard_UNABLE_TO_START_RECORDER_MESSAGE; >- public static String HttpRecorderLaunchWizard_DEFAULT_PROJECT_NAME; >- public static String HttpRecorderDataProcessor_SSL_RECORDER_ATTEMPTED_ERR_MESSAGE; >- public static String HttpRecorderDataProcessor_PLAYBACK_MAY_BE_AFFECTED_WARNING; >- public static String HttpRecorderDataProcessor_SSL_PACKET_IN_RECORDING_AND_NOT_SUPPORTED_WARNING; >- public static String HttpRecorderDataProcessor_WARNING; >- public static String HttpRecorderDataProcessor_TESTKEYS_NOT_FOUND; >- public static String HttpRecorderNoProjectsPage_DESCRIPTION; >- public static String HttpRecorderNoProjectsPage_TITLE; >- public static String HttpRecorderNoProjectsPage_INVALID_REC_FILE; >- public static String HttpRecorderPreferencePage_PORT_TOO_BIG; >- public static String HttpRecorderPreferencePage_PORT_TOO_SMALL; >- public static String HttpRecorderPreferencePage_PORT_NOT_A_NUMBER; >- public static String HttpRecorderLaunchWizard_SOCKS_ONLY_ERROR; >- public static String HttpRecorderLaunchWizard_HTTP_PROXY_ONLY_ERROR; >- public static String HttpRecorderLaunchWizard_SECURE_PROXY_ONLY_ERROR; >- public static String HttpRecorderLaunchWizard_HTTP_SECURE_MISMATCH_ERROR; >- public static String HttpRecorderLaunchWizard_RECORDER_REGISTRY_ERROR; >- public static String HttpRecorderLaunchWizard_LOCALHOST_ERROR; >- public static String HttpRecorderDataProcessor_PROBLEM_CREATING_CLIENTSIDEREADER; >- public static String HttpRecorderDataProcessor_SOCKET_BIND_ERROR; >- public static String HttpRecorderLaunchWizard_RECORDING_CHANGE_PORT_MESSAGE; >- public static String HttpRecorderLaunchWizard_RECORDING_AUTO_CONFIG_MESSAGE; >- public static String HttpRecorderLaunchWizard_RECORDING_PROXY_OVERRIDE_MESSAGE; >- public static String HttpRecorderLaunchWizard_RECORDING_SUPPORTED_CONFIG_MESSAGE; >- public static String HttpRecorderLaunchWizard_RECORDING_BROWSER_NOT_FOUND; >- public static String HttpRecorderLaunchWizard_RECORDING_BROWSER_CONFIG_ERROR; >- public static String HttpRecorderLaunchWizard_RECORDING_PREFS_NOT_FOUND_ERROR; >- public static String HttpRecorderLaunchWizard_RECORDING_SELECT_DIFFERENT_BROWSER; >- public static String HttpRecorderLaunchWizard_BROWSER_PREFS_FILE_ERROR; >- public static String HttpRecorderLaunchWizard_VISTA_ADMIN_ERROR; >- public static String HttpRecorderLaunchWizard_WINDOWS_ADMIN_ERROR; >- public static String HttpRecorderLaunchWizard_WINDOWS_GENERAL_ERROR; >- public static String HttpRecorderLaunchWizard_RECORDING_BROWSER_IN_USE; >- public static String HttpRecorderLaunchWizard_RECORDING_BROWSER_IN_USE_VISTA; >- public static String HttpRecorderLaunchWizard_RECORDING_TPTPRECUTIL_DLL_MISSING; >- public static String WizardNewProjectCreationPage_nameLabel; > public static String error_NullTestSuite; > public static String word_Error; > >Index: src/org/eclipse/hyades/test/tools/ui/internal/resources/messages.properties >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.tools.ui/src/org/eclipse/hyades/test/tools/ui/internal/resources/messages.properties,v >retrieving revision 1.18 >diff -u -r1.18 messages.properties >--- src/org/eclipse/hyades/test/tools/ui/internal/resources/messages.properties 10 Mar 2008 12:30:02 -0000 1.18 >+++ src/org/eclipse/hyades/test/tools/ui/internal/resources/messages.properties 11 Mar 2008 18:07:54 -0000 >@@ -200,54 +200,6 @@ > > ############################################################################### > >-#moved from httpRecorderPlugin.properties >-HttpRecorderPreferencePage_PROXY_RECORDER_LOCAL_PORT_LABEL=&Port: >-HttpRecorderPreferencePage_APPLICATION_GROUP=Application to record >-HttpRecorderPreferencePage_GENERATOR_GROUP=Test suite generator >-HttpRecorderPreferencePage_PROXY_GROUP=Proxy recorder >-HttpRecorderPreferencePage_APPLICATION_ADAPTER_SELECTOR_LABEL=Appli&cation: >-HttpRecorderPreferencePage_TEST_GENERATOR_LABEL=&Generator: >-HttpRecorderPreferencePage_NONE_SELECTED_TEXT=None >-HttpRecorderPreferencePage_APPLICATION_PATH_LABEL=&Location: >-HttpRecorderLaunchWizard_UNABLE_TO_START_RECORDER_MESSAGE=IWAT3040E unable to start recorder >-HttpRecorderLaunchWizard_DEFAULT_PROJECT_NAME=testproj >-HttpRecorderDataProcessor_SSL_RECORDER_ATTEMPTED_ERR_MESSAGE=SSL Recording attempted >-HttpRecorderDataProcessor_PLAYBACK_MAY_BE_AFFECTED_WARNING=Playback may be affected >-HttpRecorderDataProcessor_SSL_PACKET_IN_RECORDING_AND_NOT_SUPPORTED_WARNING=IWAT3044W SSL packet detected in recording.\nSSL not supported in this release. >-HttpRecorderDataProcessor_WARNING=Warning >-HttpRecorderDataProcessor_TESTKEYS_NOT_FOUND=IWAT3046E SSL Certificate File Not Found C:\\testkeys >-HttpRecorderNoProjectsPage_DESCRIPTION=A test suite must be contained within a project. >-HttpRecorderNoProjectsPage_TITLE=Create Project >-HttpRecorderNoProjectsPage_INVALID_REC_FILE=Enter a valid filename. >-HttpRecorderPreferencePage_PORT_TOO_BIG=Port must be smaller than 64000. >-HttpRecorderPreferencePage_PORT_TOO_SMALL=Port must be a positive number. >-HttpRecorderPreferencePage_PORT_NOT_A_NUMBER=Port must be an integer. >-HttpRecorderLaunchWizard_SOCKS_ONLY_ERROR=Your browser is set in to use a SOCKS proxy.\n Please de-select it if you wish to record. >-HttpRecorderLaunchWizard_HTTP_PROXY_ONLY_ERROR=IWAT3049E HTTP Proxy set and Secure Proxy not set.\n Please fix Registry settings and try again. >-HttpRecorderLaunchWizard_SECURE_PROXY_ONLY_ERROR=IWAT3050E Secure Proxy set and HTTP Proxy not set.\n Please fix Registry settings and try again. >-HttpRecorderLaunchWizard_HTTP_SECURE_MISMATCH_ERROR=IWAT3051E HTTP Proxy and Secure Proxy settings different.\n Please fix Registry settings and try again. >-HttpRecorderLaunchWizard_RECORDER_REGISTRY_ERROR=IWAT3052E Registry Settings Error >-HttpRecorderLaunchWizard_LOCALHOST_ERROR=IWAT3053E Proxy Set to localhost is not supported. \n Please fix Registry settings and try again. >-HttpRecorderDataProcessor_PROBLEM_CREATING_CLIENTSIDEREADER=IWAT3054E Recording Stopped.\n Socket already in use. >-HttpRecorderDataProcessor_SOCKET_BIND_ERROR=IWAT3055E Problem Binding to Socket >-HttpRecorderLaunchWizard_RECORDING_CHANGE_PORT_MESSAGE=Warning: Port {0} already in use. Using port {1} for recording. >-HttpRecorderLaunchWizard_RECORDING_AUTO_CONFIG_MESSAGE=Your browser configuration setting for Automatic Configuration Script is not supported. >-HttpRecorderLaunchWizard_RECORDING_PROXY_OVERRIDE_MESSAGE=Your browser configuration setting for Proxy Server Exceptions is not supported. >-HttpRecorderLaunchWizard_RECORDING_SUPPORTED_CONFIG_MESSAGE=The Recorder only supports either no Proxy or both HTTP and Secure Proxy. >-HttpRecorderLaunchWizard_RECORDING_BROWSER_NOT_FOUND=Your browser executable was not found.\n You must correct the browser path or select another browser from Application to Record in Preferences. >-HttpRecorderLaunchWizard_RECORDING_BROWSER_CONFIG_ERROR=Browser Configuration Error >-HttpRecorderLaunchWizard_RECORDING_PREFS_NOT_FOUND_ERROR=Browser Preferences File Not Found. >-HttpRecorderLaunchWizard_RECORDING_SELECT_DIFFERENT_BROWSER=Please select a different browser application to record in the URL Recorder preferences. Alternatively, select ''None'' as the application to record in the URL Recorder preferences and manually configure and start a browser. >-HttpRecorderLaunchWizard_BROWSER_PREFS_FILE_ERROR=IWAT3055E Browser Preferences File Error >-HttpRecorderLaunchWizard_VISTA_ADMIN_ERROR=Unable to configure Internet Explorer for URL recording.\nPlease run the Eclipse executable with administrator privileges. >-HttpRecorderLaunchWizard_WINDOWS_ADMIN_ERROR=Unable to configure Internet Explorer for URL recording.\nPlease reset the Internet Explorer proxy settings before starting a new URL recording. >-HttpRecorderLaunchWizard_WINDOWS_GENERAL_ERROR=File Permissions Error >-HttpRecorderLaunchWizard_RECORDING_BROWSER_IN_USE=Your browser profile is already in use.\nYou must close the browser or select another browser from Application to Record in Preferences. >-HttpRecorderLaunchWizard_RECORDING_BROWSER_IN_USE_VISTA=Your Internet Explorer browser is in use.\nYou must close the browser or select another browser from Application to Record in Preferences. >-HttpRecorderLaunchWizard_RECORDING_TPTPRECUTIL_DLL_MISSING=Unable to locate TPTPRecUtil.dll.\nPlease run the Eclipse executable with administrator privileges. >- >-WizardNewProjectCreationPage_nameLabel=&Project name: >- > error_NullTestSuite = The test suite is null. > > word_Error = Error >Index: META-INF/MANIFEST.MF >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.tools.ui/META-INF/MANIFEST.MF,v >retrieving revision 1.22 >diff -u -r1.22 MANIFEST.MF >--- META-INF/MANIFEST.MF 6 Mar 2008 21:51:09 -0000 1.22 >+++ META-INF/MANIFEST.MF 11 Mar 2008 18:07:53 -0000 >@@ -6,12 +6,7 @@ > Bundle-Activator: org.eclipse.hyades.test.tools.ui.ToolsUiPlugin > Bundle-Vendor: %PROVIDER_NAME > Bundle-Localization: plugin >-Export-Package: org.eclipse.hyades.execution.recorder.http, >- org.eclipse.hyades.execution.recorder.http.local, >- org.eclipse.hyades.execution.recorder.http.ui.preferences, >- org.eclipse.hyades.execution.recorder.http.ui.wizards, >- org.eclipse.hyades.internal.recorder.http.util, >- org.eclipse.hyades.test.tools.ui, >+Export-Package: org.eclipse.hyades.test.tools.ui, > org.eclipse.hyades.test.tools.ui.common, > org.eclipse.hyades.test.tools.ui.common.internal.dialog, > org.eclipse.hyades.test.tools.ui.common.internal.editor, >@@ -36,8 +31,7 @@ > org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator, > org.eclipse.hyades.test.tools.ui.java.internal.junit.wizard, > org.eclipse.hyades.test.tools.ui.java.internal.util, >- org.eclipse.hyades.test.tools.ui.java.junit, >- org.eclipse.tptp.test.tools.internal.recorder.http.providers >+ org.eclipse.hyades.test.tools.ui.java.junit > Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)", > org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)", > org.eclipse.tptp.platform.models;bundle-version="[4.2.0,5.0.0)", >@@ -54,5 +48,5 @@ > org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)", > org.eclipse.ltk.ui.refactoring;bundle-version="[3.2.0,4.0.0)", > org.eclipse.core.variables;bundle-version="[3.1.100,4.0.0)" >-Eclipse-LazyStart: true >+Bundle-ActivationPolicy: lazy > Bundle-RequiredExecutionEnvironment: J2SE-1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 208110
: 92210 |
92211
|
92212
|
92286