Author: sebb
Date: Mon Dec 6 11:33:11 2010
New Revision: 1042588
URL: http://svn.apache.org/viewvc?rev=1042588&view=rev
Log:
Move CookieSpec method to CookieManager so CookiePanel no longer depends
directly on the HttpClient version
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java?rev=1042588&r1=1042587&r2=1042588&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
Mon Dec 6 11:33:11 2010
@@ -498,4 +498,10 @@ public class CookieManager extends Confi
setProperty((CollectionProperty)initialCookies.clone());
}
}
+
+ public static String[] getCookieSpecs(){
+ return CookiePolicy.getRegisteredCookieSpecs(); // Commons HttpClient
+ //return new
DefaultHttpClient().getCookieSpecs().getSpecNames().toArray(new String[]{}); //
Apache HttpClient
+ }
+
}
\ No newline at end of file
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java?rev=1042588&r1=1042587&r2=1042588&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java
Mon Dec 6 11:33:11 2010
@@ -34,7 +34,6 @@ import javax.swing.JTable;
import javax.swing.ListSelectionModel;
import javax.swing.table.TableCellEditor;
-import org.apache.commons.httpclient.cookie.CookiePolicy;
import org.apache.jmeter.config.gui.AbstractConfigGui;
import org.apache.jmeter.gui.util.FileDialoger;
import org.apache.jmeter.gui.util.HeaderAsPropertyRenderer;
@@ -107,7 +106,7 @@ public class CookiePanel extends Abstrac
*
* These are used both for the display, and for setting the policy
*/
- private final String[] policies = CookiePolicy.getRegisteredCookieSpecs();
+ private final String[] policies = CookieManager.getCookieSpecs();
private JLabeledChoice policy;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
