Skip to content

Commit

Permalink
Remove rudimentary limits for XMPP
Browse files Browse the repository at this point in the history
  • Loading branch information
undera committed Jan 2, 2016
1 parent 9cb31f7 commit 99a8f14
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 28 deletions.
4 changes: 2 additions & 2 deletions site/dat/wiki/Changelog.wiki
@@ -1,7 +1,6 @@
= Changelog =

== 1.4.0 <i><font color=gray size="1">preparing</font></i>==
* Add additional fields (grpThreads, sampleCount, errorCount, responseHeaderSize, responseSize, URL) to FFW.
* BlazeMeter Inc. has contributed XMPP testing plugins
* BlazeMeter Inc. has contributed PhantomJS support for WebDriver
* Modernize project website, change its look a bit
Expand All @@ -10,6 +9,7 @@
* add custom functions strReplace and strReplaceRegex (thanks to Dima Lulko for suggesting)
* add FilterResultsTool command line tool, filter results by label (regex), offset, success, output file XML or CSV format
* change HttpSimpleTableServer command ADD a new line for a file with GET (new) or POST protocols
* Add fields to FFW: grpThreads, sampleCount, errorCount, responseHeaderSize, responseSize, URL
* upgrade JSONPath lib to 2.0.0 to not conflict with core JMeter 2.14, this breaks some cases because of the lib regression
== 1.3.1 <i><font color=gray size="1">October 12, 2015</font></i>==
Expand Down Expand Up @@ -47,7 +47,7 @@
* UltimateThreadGroup: Added parametrization via _threads_schedule_ property
* Add 'description' column to Parameterized Controller
* deprecated [RESTSampler REST Sampler] dropped from the codebase
* Add if function
* Add {{{if}}} function
* Enable getting output logging from Developer Tool [https://sites.google.com/a/chromium.org/chromedriver/logging/performance-log]
== 1.2.1 <i><font color=gray size="1">March 9, 2015</font></i>==
Expand Down
@@ -1,43 +1,28 @@
package com.blazemeter.jmeter.xmpp;


import com.blazemeter.jmeter.xmpp.actions.AbstractXMPPAction;
import com.blazemeter.jmeter.xmpp.actions.Connect;
import com.blazemeter.jmeter.xmpp.actions.Disconnect;
import com.blazemeter.jmeter.xmpp.actions.Login;
import com.blazemeter.jmeter.xmpp.actions.NoOp;
import com.blazemeter.jmeter.xmpp.actions.RawXML;
import com.blazemeter.jmeter.xmpp.actions.RosterAction;
import com.blazemeter.jmeter.xmpp.actions.SendMessage;
import com.blazemeter.jmeter.xmpp.actions.SendPresence;
import java.io.IOException;
import java.io.Serializable;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import com.blazemeter.jmeter.xmpp.actions.*;
import org.apache.jmeter.threads.JMeterContextService;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
import org.jivesoftware.smack.ConnectionConfiguration;
import org.jivesoftware.smack.ConnectionListener;
import org.jivesoftware.smack.PacketListener;
import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.*;
import org.jivesoftware.smack.bosh.BOSHConfiguration;
import org.jivesoftware.smack.bosh.XMPPBOSHConnection;
import org.jivesoftware.smack.filter.AndFilter;
import org.jivesoftware.smack.tcp.XMPPTCPConnection;

import java.io.IOException;
import java.io.Serializable;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import java.util.*;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;

public class JMeterXMPPConnection extends JMeterXMPPConnectionBase {
private static final Logger log = LoggingManager.getLoggerForClass();
private static final BlockingQueue<XMPPConnection> connectionRegistry = new LinkedBlockingQueue<>(JMeterUtils.getPropDefault("blazemeter.xmpp.ceiling", 5));
private static final BlockingQueue<XMPPConnection> connectionRegistry = new LinkedBlockingQueue<>();
private XMPPConnection conn;
private Map<String, AbstractXMPPAction> actions = getAvailableActions();

Expand Down

0 comments on commit 99a8f14

Please sign in to comment.