Skip to content

cleaning up #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ssaip wants to merge 4 commits into
base: trunk
Choose a base branch
from
Open

cleaning up #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dcb9556
removed unused imports
ssaip Nov 29, 2012
13b7924
added web-sampler and selenium jars
ssaip Nov 29, 2012
677fe70
added all jars to classpath
ssaip Nov 29, 2012
027c20b
removed unused imports
ssaip Nov 29, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
208 changes: 119 additions & 89 deletions eclipse.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,89 +1,119 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!--
This is a sample Eclipse .classpath file, which can be used to help set up the proper .classpath.
Note that the "con" entry may be different on individual systems, but the other entries
should generally be the same, unless you attach sources or javadoc to the jars.
-->
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" output="build/components" path="src/components"/>
<classpathentry kind="src" output="build/core" path="src/core"/>
<classpathentry kind="src" output="build/examples" path="src/examples"/>
<classpathentry kind="src" output="build/functions" path="src/functions"/>
<classpathentry kind="src" output="build/jorphan" path="src/jorphan"/>
<classpathentry kind="src" output="build/junit" path="src/junit"/>
<classpathentry kind="src" output="build/monitor/components" path="src/monitor/components"/>
<classpathentry kind="src" output="build/monitor/model" path="src/monitor/model"/>
<classpathentry kind="src" output="build/protocol/ftp" path="src/protocol/ftp"/>
<classpathentry kind="src" output="build/protocol/http" path="src/protocol/http"/>
<classpathentry kind="src" output="build/protocol/java" path="src/protocol/java"/>
<classpathentry kind="src" output="build/protocol/jdbc" path="src/protocol/jdbc"/>
<classpathentry kind="src" output="build/protocol/jms" path="src/protocol/jms"/>
<classpathentry kind="src" output="build/protocol/ldap" path="src/protocol/ldap"/>
<classpathentry kind="src" output="build/protocol/mail" path="src/protocol/mail"/>
<classpathentry kind="src" output="build/protocol/native" path="src/protocol/native"/>
<classpathentry kind="src" output="build/protocol/tcp" path="src/protocol/tcp"/>
<classpathentry kind="src" output="build/reports" path="src/reports"/>
<classpathentry kind="src" output="build/test" path="test/src"/>
<classpathentry kind="lib" path="lib/activation-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/avalon-framework-4.1.4.jar"/>
<classpathentry kind="lib" path="lib/bsf-2.4.0.jar"/>
<classpathentry kind="lib" path="lib/bsf-api-3.1.jar"/>
<classpathentry kind="lib" path="lib/bsh-2.0b5.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-1.6.jar"/>
<classpathentry kind="lib" path="lib/commons-collections-3.2.1.jar"/>
<classpathentry kind="lib" path="lib/commons-httpclient-3.1.jar"/>
<classpathentry kind="lib" path="lib/commons-io-2.2.jar"/>
<classpathentry kind="lib" path="lib/commons-jexl-1.1.jar"/>
<classpathentry kind="lib" path="lib/commons-jexl-2.1.1.jar"/>
<classpathentry kind="lib" path="lib/commons-lang-2.6.jar"/>
<classpathentry kind="lib" path="lib/commons-logging-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/commons-net-3.1.jar"/>
<classpathentry kind="lib" path="lib/excalibur-datasource-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/excalibur-instrument-1.0.jar"/>
<classpathentry kind="lib" path="lib/excalibur-logger-1.1.jar"/>
<classpathentry kind="lib" path="lib/excalibur-pool-1.2.jar"/>
<classpathentry kind="lib" path="lib/geronimo-jms_1.1_spec-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/htmllexer-2.1.jar"/>
<classpathentry kind="lib" path="lib/htmlparser-2.1.jar"/>
<classpathentry kind="lib" path="lib/httpclient-4.2.jar"/>
<classpathentry kind="lib" path="lib/httpcore-4.2.1.jar"/>
<classpathentry kind="lib" path="lib/httpmime-4.2.jar"/>
<classpathentry kind="lib" path="lib/jcharts-0.7.5.jar"/>
<classpathentry kind="lib" path="lib/jdom-1.1.2.jar"/>
<classpathentry kind="lib" path="lib/rhino-1.7R3.jar"/>
<classpathentry kind="lib" path="lib/jtidy-r938.jar"/>
<classpathentry kind="lib" path="lib/junit-4.10.jar"/>
<classpathentry kind="lib" path="lib/logkit-2.0.jar"/>
<classpathentry kind="lib" path="lib/mail-1.4.4.jar"/>
<classpathentry kind="lib" path="lib/oro-2.0.8.jar"/>
<classpathentry kind="lib" path="lib/serializer-2.7.1.jar"/>
<classpathentry kind="lib" path="lib/soap-2.3.1.jar"/>
<classpathentry kind="lib" path="lib/xalan-2.7.1.jar"/>
<classpathentry kind="lib" path="lib/xercesImpl-2.9.1.jar"/>
<classpathentry kind="lib" path="lib/xml-apis-1.3.04.jar"/>
<classpathentry kind="lib" path="lib/xmlgraphics-commons-1.3.1.jar"/>
<classpathentry kind="lib" path="lib/xmlpull-1.1.3.1.jar"/>
<classpathentry kind="lib" path="lib/xpp3_min-1.1.4c.jar"/>
<classpathentry kind="lib" path="lib/xstream-1.4.2.jar"/>
<!-- Needed for build and test -->
<classpathentry kind="lib" path="lib/api/bcmail-jdk15-1.45.jar"/>
<classpathentry kind="lib" path="lib/api/bcprov-jdk15-1.45.jar"/>
<classpathentry kind="output" path="build"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!--
This is a sample Eclipse .classpath file, which can be used to help set up the proper .classpath.
Note that the "con" entry may be different on individual systems, but the other entries
should generally be the same, unless you attach sources or javadoc to the jars.
-->
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" output="build/components" path="src/components"/>
<classpathentry kind="src" output="build/core" path="src/core"/>
<classpathentry kind="src" output="build/examples" path="src/examples"/>
<classpathentry kind="src" output="build/functions" path="src/functions"/>
<classpathentry kind="src" output="build/jorphan" path="src/jorphan"/>
<classpathentry kind="src" output="build/junit" path="src/junit"/>
<classpathentry kind="src" output="build/monitor/components" path="src/monitor/components"/>
<classpathentry kind="src" output="build/monitor/model" path="src/monitor/model"/>
<classpathentry kind="src" output="build/protocol/ftp" path="src/protocol/ftp"/>
<classpathentry kind="src" output="build/protocol/http" path="src/protocol/http"/>
<classpathentry kind="src" output="build/protocol/java" path="src/protocol/java"/>
<classpathentry kind="src" output="build/protocol/jdbc" path="src/protocol/jdbc"/>
<classpathentry kind="src" output="build/protocol/jms" path="src/protocol/jms"/>
<classpathentry kind="src" output="build/protocol/ldap" path="src/protocol/ldap"/>
<classpathentry kind="src" output="build/protocol/mail" path="src/protocol/mail"/>
<classpathentry kind="src" output="build/protocol/native" path="src/protocol/native"/>
<classpathentry kind="src" output="build/protocol/tcp" path="src/protocol/tcp"/>
<classpathentry kind="src" output="build/protocol/web" path="src/protocol/web"/>
<classpathentry kind="src" output="build/reports" path="src/reports"/>
<classpathentry kind="src" output="build/test" path="test/src"/>
<!-- libs -->
<classpathentry kind="lib" path="lib/activation-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/avalon-framework-4.1.4.jar"/>
<classpathentry kind="lib" path="lib/bsf-2.4.0.jar"/>
<classpathentry kind="lib" path="lib/bsf-api-3.1.jar"/>
<classpathentry kind="lib" path="lib/bsh-2.0b5.jar"/>
<classpathentry kind="lib" path="lib/cglib-nodep-2.1_3.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-1.6.jar"/>
<classpathentry kind="lib" path="lib/commons-collections-3.2.1.jar"/>
<classpathentry kind="lib" path="lib/commons-exec-1.1.jar"/>
<classpathentry kind="lib" path="lib/commons-httpclient-3.1.jar"/>
<classpathentry kind="lib" path="lib/commons-io-2.2.jar"/>
<classpathentry kind="lib" path="lib/commons-jexl-1.1.jar"/>
<classpathentry kind="lib" path="lib/commons-jexl-2.1.1.jar"/>
<classpathentry kind="lib" path="lib/commons-lang-2.6.jar"/>
<classpathentry kind="lib" path="lib/commons-logging-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/commons-net-3.1.jar"/>
<classpathentry kind="lib" path="lib/excalibur-datasource-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/excalibur-instrument-1.0.jar"/>
<classpathentry kind="lib" path="lib/excalibur-logger-1.1.jar"/>
<classpathentry kind="lib" path="lib/excalibur-pool-1.2.jar"/>
<classpathentry kind="lib" path="lib/geronimo-jms_1.1_spec-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/guava-11.0.1.jar"/>
<classpathentry kind="lib" path="lib/htmllexer-2.1.jar"/>
<classpathentry kind="lib" path="lib/htmlparser-2.1.jar"/>
<classpathentry kind="lib" path="lib/httpclient-4.2.jar"/>
<classpathentry kind="lib" path="lib/httpcore-4.2.1.jar"/>
<classpathentry kind="lib" path="lib/httpmime-4.2.jar"/>
<classpathentry kind="lib" path="lib/jcharts-0.7.5.jar"/>
<classpathentry kind="lib" path="lib/jdom-1.1.2.jar"/>
<classpathentry kind="lib" path="lib/jna-3.4.0.jar"/>
<classpathentry kind="lib" path="lib/json-20080701.jar"/>
<classpathentry kind="lib" path="lib/jsr305-1.3.9.jar"/>
<classpathentry kind="lib" path="lib/rhino-1.7R3.jar"/>
<classpathentry kind="lib" path="lib/jtidy-r938.jar"/>
<classpathentry kind="lib" path="lib/junit-4.10.jar"/>
<classpathentry kind="lib" path="lib/logkit-2.0.jar"/>
<classpathentry kind="lib" path="lib/mail-1.4.4.jar"/>
<classpathentry kind="lib" path="lib/oro-2.0.8.jar"/>
<classpathentry kind="lib" path="lib/platform-3.4.0.jar"/>
<classpathentry kind="lib" path="lib/serializer-2.7.1.jar"/>
<classpathentry kind="lib" path="lib/soap-2.3.1.jar"/>
<classpathentry kind="lib" path="lib/xalan-2.7.1.jar"/>
<classpathentry kind="lib" path="lib/xercesImpl-2.9.1.jar"/>
<classpathentry kind="lib" path="lib/xml-apis-1.3.04.jar"/>
<classpathentry kind="lib" path="lib/xmlgraphics-commons-1.3.1.jar"/>
<classpathentry kind="lib" path="lib/xmlpull-1.1.3.1.jar"/>
<classpathentry kind="lib" path="lib/xpp3_min-1.1.4c.jar"/>
<classpathentry kind="lib" path="lib/xstream-1.4.2.jar"/>
<!-- selenium -->
<classpathentry kind="lib" path="lib/selenium-android-driver-2.26.0.jar"/>
<classpathentry kind="lib" path="lib/selenium-api-2.26.0.jar"/>
<classpathentry kind="lib" path="lib/selenium-chrome-driver-2.26.0.jar"/>
<classpathentry kind="lib" path="lib/selenium-firefox-driver-2.26.0.jar"/>
<classpathentry kind="lib" path="lib/selenium-remote-driver-2.26.0.jar"/>
<classpathentry kind="lib" path="lib/selenium-support-2.26.0.jar"/>
<!-- api -->
<classpathentry kind="lib" path="lib/api/bcmail-jdk15-1.45.jar"/>
<classpathentry kind="lib" path="lib/api/bcprov-jdk15-1.45.jar"/>
<!-- doc -->
<classpathentry kind="lib" path="lib/doc/velocity-1.7.jar"/>
<!-- opt -->
<classpathentry kind="lib" path="lib/opt/javassist-3.16.1-GA.jar"/>
<classpathentry kind="lib" path="lib/opt/mockito-all-1.9.0.jar"/>
<classpathentry kind="lib" path="lib/opt/powermock-api-mockito-1.4.12.jar"/>
<classpathentry kind="lib" path="lib/opt/powermock-api-support-1.4.12.jar"/>
<classpathentry kind="lib" path="lib/opt/powermock-classloading-base-1.4.12.jar"/>
<classpathentry kind="lib" path="lib/opt/powermock-classloading-xstream-1.4.12.jar"/>
<classpathentry kind="lib" path="lib/opt/powermock-core-1.4.12.jar"/>
<classpathentry kind="lib" path="lib/opt/powermock-module-junit4-1.4.12.jar"/>
<classpathentry kind="lib" path="lib/opt/powermock-module-junit4-common-1.4.12.jar"/>
<classpathentry kind="lib" path="lib/opt/powermock-module-junit4-rule-1.4.12.jar"/>
<classpathentry kind="lib" path="lib/opt/powermock-reflect-1.4.12.jar"/>
<classpathentry kind="output" path="build"/>
</classpath>
115 changes: 57 additions & 58 deletions src/protocol/web/org/apache/jmeter/protocol/web/config/WebBrowserCacheConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,58 +1,57 @@
package org.apache.jmeter.protocol.web.config;

import org.apache.jmeter.config.ConfigTestElement;
import org.apache.jmeter.engine.event.LoopIterationEvent;
import org.apache.jmeter.engine.event.LoopIterationListener;
import org.apache.jmeter.protocol.web.util.BrowserFactory;
import org.apache.jmeter.testbeans.TestBean;
import org.apache.jmeter.testelement.TestListener;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;

public class WebBrowserCacheConfig extends ConfigTestElement implements TestBean, TestListener {
private static final Logger LOGGER = LoggingManager.getLoggerForClass();

private static final long serialVersionUID = -6579029558490898888L;

private static final String CACHE_SETTINGS = "WebBrowserCacheConfig.cacheSettings";

public WebBrowserCacheConfig() {
}

public String getCacheSettings() {
return getPropertyAsString(CACHE_SETTINGS);
}

public void setCacheSettings(String cacheSettings) {
LOGGER.info("Setting to: "+cacheSettings);
setProperty(CACHE_SETTINGS, cacheSettings);
}

@Override
public void testStarted() {
LOGGER.info("Cache settings: "+getCacheSettings());
if(WebBrowserCacheConfigBeanInfo.CLEAR_ALL.equals(getCacheSettings())) {
BrowserFactory.getInstance().clearBrowser();
} else if(WebBrowserCacheConfigBeanInfo.CLEAR_COOKIES.equals(getCacheSettings())) {
BrowserFactory.getInstance().clearBrowserCookies();
}
}

@Override
public void testStarted(String host) {
testStarted();
}

@Override
public void testEnded() {
}

@Override
public void testEnded(String host) {
}

@Override
public void testIterationStart(LoopIterationEvent event) {
testStarted();
}
}
package org.apache.jmeter.protocol.web.config;

import org.apache.jmeter.config.ConfigTestElement;
import org.apache.jmeter.engine.event.LoopIterationEvent;
import org.apache.jmeter.protocol.web.util.BrowserFactory;
import org.apache.jmeter.testbeans.TestBean;
import org.apache.jmeter.testelement.TestListener;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;

public class WebBrowserCacheConfig extends ConfigTestElement implements TestBean, TestListener {
private static final Logger LOGGER = LoggingManager.getLoggerForClass();

private static final long serialVersionUID = -6579029558490898888L;

private static final String CACHE_SETTINGS = "WebBrowserCacheConfig.cacheSettings";

public WebBrowserCacheConfig() {
}

public String getCacheSettings() {
return getPropertyAsString(CACHE_SETTINGS);
}

public void setCacheSettings(String cacheSettings) {
LOGGER.info("Setting to: "+cacheSettings);
setProperty(CACHE_SETTINGS, cacheSettings);
}

@Override
public void testStarted() {
LOGGER.info("Cache settings: "+getCacheSettings());
if(WebBrowserCacheConfigBeanInfo.CLEAR_ALL.equals(getCacheSettings())) {
BrowserFactory.getInstance().clearBrowser();
} else if(WebBrowserCacheConfigBeanInfo.CLEAR_COOKIES.equals(getCacheSettings())) {
BrowserFactory.getInstance().clearBrowserCookies();
}
}

@Override
public void testStarted(String host) {
testStarted();
}

@Override
public void testEnded() {
}

@Override
public void testEnded(String host) {
}

@Override
public void testIterationStart(LoopIterationEvent event) {
testStarted();
}
}
Loading