ASF Bugzilla – Attachment 32256 Details for
Bug 57305
remove ProxyControl dependency on GuiPackage
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch implementing this feature
jmeter.patch (text/plain), 4.56 KB, created by
Jaroslaw Fuks
on 2014-12-03 15:19:16 UTC
(
hide
)
Description:
patch implementing this feature
Filename:
MIME Type:
Creator:
Jaroslaw Fuks
Created:
2014-12-03 15:19:16 UTC
Size:
4.56 KB
patch
obsolete
>--- F:/Users/Jarek/workspace/apache-jmeter-2.12/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java Wed Nov 05 20:17:58 2014 >+++ F:/Users/Jarek/workspace/LoadTestAutomationFX/src/proxy/ProxyControl.java Tue Dec 02 19:55:59 2014 >@@ -202,6 +202,8 @@ > // If this is defined, it is assumed to be the alias of a user-supplied certificate; overrides dynamic mode > static final String CERT_ALIAS = JMeterUtils.getProperty("proxy.cert.alias"); // $NON-NLS-1$ > >+ private static JMeterTreeModel treeModel = null; >+ > public static enum KeystoreMode { > USER_KEYSTORE, // user-provided keystore > JMETER_KEYSTORE, // keystore generated by JMeter; single entry >@@ -226,6 +228,10 @@ > log.warn("HTTP(S) Test Script Recorder SSL Proxy will use keys that may not work for embedded resources in file " + CERT_PATH_ABS); > } > } >+ >+ if (GuiPackage.getInstance() != null) { >+ treeModel = GuiPackage.getInstance().getTreeModel(); >+ } > } > > // Whether to use the redirect disabling feature (can be switched off if it does not work) >@@ -280,6 +286,14 @@ > setCaptureHttpHeaders(true); // maintain original behaviour > } > >+ /** >+ * When working without GUI required for operation >+ * @param treeModel JMeterTreeModel used for recording >+ */ >+ public static void setGlobalTreeRoot(JMeterTreeModel treeModel) { >+ ProxyControl.treeModel = treeModel; >+ } >+ > public void setPort(int port) { > this.setProperty(new IntegerProperty(PORT, port)); > } >@@ -457,6 +471,7 @@ > try { > server = new Daemon(getPort(), this); > server.start(); >+ if (GuiPackage.getInstance() != null) > GuiPackage.getInstance().register(server); > } catch (IOException e) { > log.error("Could not create Proxy daemon", e); >@@ -571,6 +586,7 @@ > public void stopProxy() { > if (server != null) { > server.stopServer(); >+ if (GuiPackage.getInstance() != null) > GuiPackage.getInstance().unregister(server); > try { > server.join(1000); // wait for server to stop >@@ -844,7 +860,6 @@ > * <code>null</code> if none was found. > */ > private JMeterTreeNode findFirstNodeOfType(Class<?> type) { >- JMeterTreeModel treeModel = GuiPackage.getInstance().getTreeModel(); > List<JMeterTreeNode> nodes = treeModel.getNodesOfType(type); > for (JMeterTreeNode node : nodes) { > if (node.isEnabled()) { >@@ -910,7 +925,6 @@ > */ > // TODO - could be converted to generic class? > private Collection<?> findApplicableElements(JMeterTreeNode myTarget, Class<? extends TestElement> myClass, boolean ascending) { >- JMeterTreeModel treeModel = GuiPackage.getInstance().getTreeModel(); > LinkedList<TestElement> elements = new LinkedList<TestElement>(); > > // Look for elements directly within the HTTP proxy: >@@ -968,8 +982,6 @@ > private void placeSampler(final HTTPSamplerBase sampler, final TestElement[] subConfigs, > JMeterTreeNode myTarget) { > try { >- final JMeterTreeModel treeModel = GuiPackage.getInstance().getTreeModel(); >- > boolean firstInBatch = false; > long now = System.currentTimeMillis(); > long deltaT = now - lastTime; >@@ -1163,7 +1175,6 @@ > * sampling event to be delivered > */ > private void notifySampleListeners(SampleEvent event) { >- JMeterTreeModel treeModel = GuiPackage.getInstance().getTreeModel(); > JMeterTreeNode myNode = treeModel.getNodeOf(this); > Enumeration<JMeterTreeNode> kids = myNode.children(); > while (kids.hasMoreElements()) { >@@ -1182,7 +1193,6 @@ > * (here meaning the proxy recording) has started. > */ > private void notifyTestListenersOfStart() { >- JMeterTreeModel treeModel = GuiPackage.getInstance().getTreeModel(); > JMeterTreeNode myNode = treeModel.getNodeOf(this); > Enumeration<JMeterTreeNode> kids = myNode.children(); > while (kids.hasMoreElements()) { >@@ -1201,7 +1211,6 @@ > * (here meaning the proxy recording) has ended. > */ > private void notifyTestListenersOfEnd() { >- JMeterTreeModel treeModel = GuiPackage.getInstance().getTreeModel(); > JMeterTreeNode myNode = treeModel.getNodeOf(this); > Enumeration<JMeterTreeNode> kids = myNode.children(); > while (kids.hasMoreElements()) {
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 57305
:
32256
|
34374
|
34386
|
34394