Browse files

Build: Better differenciation between vendor and lib directories

git-svn-id: http://svn.openqa.org/svn/selenium-grid/trunk@292 22590ab4-ef3b-0410-9bef-a9f5a1089f47
  • Loading branch information...
1 parent 2a54cd0 commit b671ab532f91e88c0c7b1f7018fa473ccaa318a8 ph7 committed Jun 25, 2008
View
387 Selenium Grid.iws
@@ -40,18 +40,24 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <change type="DELETED" beforePath="$PROJECT_DIR$/core/src/test/unit/unit_test_helper.rb" afterPath="" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Selenium Grid.ipr" afterPath="$PROJECT_DIR$/Selenium Grid.ipr" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/hub/src/test/unit/unit_test_helper.rb" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build.xml" afterPath="$PROJECT_DIR$/build.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/testng.policy" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/examples/java/build.xml" afterPath="$PROJECT_DIR$/examples/java/build.xml" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/testng.policy" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/examples/ruby/book_example.rb" afterPath="$PROJECT_DIR$/examples/ruby/book_example.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Selenium Grid.iws" afterPath="$PROJECT_DIR$/Selenium Grid.iws" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/hub/src/test/unit/com/thoughtworks/selenium/grid/hub/environment_test.rb" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hub/build.xml" afterPath="$PROJECT_DIR$/hub/build.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/examples/ruby/lib/view_test_helper.rb" afterPath="$PROJECT_DIR$/examples/ruby/lib/view_test_helper.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/src/main/com/thoughtworks/selenium/grid/ClasspathHelper.java" afterPath="$PROJECT_DIR$/core/src/main/com/thoughtworks/selenium/grid/ClasspathHelper.java" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/remote-control/src/test/unit/unit_test_helper.rb" afterPath="" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/common-build.xml" afterPath="$PROJECT_DIR$/common-build.xml" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/core/src/test/unit/all_tests.rb" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/core/src/test/unit/com/thoughtworks/selenium/grid/http_parameters_test.rb" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/hub/src/test/unit/all_tests.rb" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/remote-control/src/test/unit/all_tests.rb" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/remote-control/build.xml" afterPath="$PROJECT_DIR$/remote-control/build.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/regression-tests/build.xml" afterPath="$PROJECT_DIR$/regression-tests/build.xml" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/ruby/tcp_socket_extensions.rb" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/ruby" afterPath="" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/common-build.xml" afterPath="$PROJECT_DIR$/lib/build/common-build.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo/build.xml" afterPath="$PROJECT_DIR$/demo/build.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/build.xml" afterPath="$PROJECT_DIR$/core/build.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/examples/ruby/Rakefile" afterPath="$PROJECT_DIR$/examples/ruby/Rakefile" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tools/build.xml" afterPath="$PROJECT_DIR$/tools/build.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/build/pmd-ruleset.xml" afterPath="$PROJECT_DIR$/lib/build/pmd-ruleset.xml" />
</list>
<list name="Failed commit: Default" comment="Renamed to com.thoughtworks.selenium.grid" />
@@ -120,19 +126,19 @@
<SUITE FILE_PATH="\Local\Users\Philippe\.IntelliJIdea70\system\coverage\Selenium Grid$PageTest.setAcceptsArbitraryObjectsAsValue$PageTest.setAcceptsArbitraryObjectsAsValue.es" NAME="PageTest.setAcceptsArbitraryObjectsAsValue" MODIFIED="1189727071140" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
<FILTER>com.thoughtworks.selenium.grid.hub.management.console.mvc.*</FILTER>
</SUITE>
- <SUITE FILE_PATH="/Users/ph7/Library/Caches/IntelliJIDEA70/coverage/Selenium Grid$com.thoughtworks.selenium.grid.remotecontrol$com.thoughtworks.selenium.grid.remotecontrol.es" NAME="com.thoughtworks.selenium.grid.remotecontrol" MODIFIED="1201935517638" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" />
- <SUITE FILE_PATH="/Local/Users/Philippe/.IntelliJIdea70/system/coverage/Selenium Grid$EnvironmentTest$EnvironmentTest.es" NAME="EnvironmentTest" MODIFIED="1209565181911" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
- <FILTER>com.thoughtworks.selenium.grid.hub.*</FILTER>
- </SUITE>
<SUITE FILE_PATH="\Local\Users\Philippe\.IntelliJIdea70\system\coverage\Selenium Grid$EnvironmentConfigurationTest.anEnvironmentInstanceIsEqualToItself$EnvironmentConfigurationTest.anEnvironmentInstanceIsEqualToItself.es" NAME="EnvironmentConfigurationTest.anEnvironmentInstanceIsEqualToItself" MODIFIED="1190156189543" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
<FILTER>com.thoughtworks.selenium.grid.configuration.*</FILTER>
</SUITE>
- <SUITE FILE_PATH="/Users/ph7/Library/Caches/IntelliJIDEA70/coverage/Selenium Grid$ServletParameterAdapterTest$ServletParameterAdapterTest.es" NAME="ServletParameterAdapterTest" MODIFIED="1202022522221" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
+ <SUITE FILE_PATH="/Local/Users/Philippe/.IntelliJIdea70/system/coverage/Selenium Grid$EnvironmentTest$EnvironmentTest.es" NAME="EnvironmentTest" MODIFIED="1209565181911" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
<FILTER>com.thoughtworks.selenium.grid.hub.*</FILTER>
</SUITE>
+ <SUITE FILE_PATH="/Users/ph7/Library/Caches/IntelliJIDEA70/coverage/Selenium Grid$com.thoughtworks.selenium.grid.remotecontrol$com.thoughtworks.selenium.grid.remotecontrol.es" NAME="com.thoughtworks.selenium.grid.remotecontrol" MODIFIED="1201935517638" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" />
<SUITE FILE_PATH="/Users/ph7/Library/Caches/IntelliJIDEA70/coverage/Selenium Grid$RemoteControlProxyTest$RemoteControlProxyTest.es" NAME="RemoteControlProxyTest" MODIFIED="1202008928391" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
<FILTER>com.thoughtworks.selenium.grid.hub.remotecontrol.*</FILTER>
</SUITE>
+ <SUITE FILE_PATH="/Users/ph7/Library/Caches/IntelliJIDEA70/coverage/Selenium Grid$ServletParameterAdapterTest$ServletParameterAdapterTest.es" NAME="ServletParameterAdapterTest" MODIFIED="1202022522221" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
+ <FILTER>com.thoughtworks.selenium.grid.hub.*</FILTER>
+ </SUITE>
<SUITE FILE_PATH="/Users/ph7/Library/Caches/IntelliJIDEA70/coverage/Selenium Grid$HubServletTest$HubServletTest.es" NAME="HubServletTest" MODIFIED="1202009256141" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
<FILTER>com.thoughtworks.selenium.grid.hub.*</FILTER>
</SUITE>
@@ -208,25 +214,25 @@
<SUITE FILE_PATH="/Users/ph7/Library/Caches/IntelliJIDEA70/coverage/Selenium Grid$RegistrationRequestTest.postToHubUsingURLProvidedInConstructor$RegistrationRequestTest.postToHubUsingURLProvidedInConstructor.es" NAME="RegistrationRequestTest.postToHubUsingURLProvidedInConstructor" MODIFIED="1214270073663" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
<FILTER>com.thoughtworks.selenium.grid.remotecontrol.*</FILTER>
</SUITE>
- <SUITE FILE_PATH="/Local/Users/Philippe/.IntelliJIdea70/system/coverage/Selenium Grid$MartinOnAmazonSeleniumTest.testAmazonOnFirefox$MartinOnAmazonSeleniumTest.testAmazonOnFirefox.es" NAME="MartinOnAmazonSeleniumTest.testAmazonOnFirefox" MODIFIED="1195772044439" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
- <FILTER>com.thoughtworks.selenium.grid.demo.*</FILTER>
- </SUITE>
<SUITE FILE_PATH="\Local\Users\Philippe\.IntelliJIdea70\system\coverage\Selenium Grid$IOHelperTest$IOHelperTest.es" NAME="IOHelperTest" MODIFIED="1190156015024" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
<FILTER>com.thoughtworks.selenium.grid.*</FILTER>
</SUITE>
+ <SUITE FILE_PATH="/Local/Users/Philippe/.IntelliJIdea70/system/coverage/Selenium Grid$MartinOnAmazonSeleniumTest.testAmazonOnFirefox$MartinOnAmazonSeleniumTest.testAmazonOnFirefox.es" NAME="MartinOnAmazonSeleniumTest.testAmazonOnFirefox" MODIFIED="1195772044439" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
+ <FILTER>com.thoughtworks.selenium.grid.demo.*</FILTER>
+ </SUITE>
<SUITE FILE_PATH="/Users/ph7/Library/Caches/IntelliJIDEA70/coverage/Selenium Grid$HttpClientTest.buildPostMethodSetTimeoutsAsParameter$HttpClientTest.buildPostMethodSetTimeoutsAsParameter.es" NAME="HttpClientTest.buildPostMethodSetTimeoutsAsParameter" MODIFIED="1203757360853" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
<FILTER>com.thoughtworks.selenium.grid.*</FILTER>
</SUITE>
<SUITE FILE_PATH="\Local\Users\Philippe\.IntelliJIdea70\system\coverage\Selenium Grid$ResourceLocatorTest.throwAnIllegalStateExceptionWhenResourceCannotBeFound$ResourceLocatorTest.throwAnIllegalStateExceptionWhenResourceCannotBeFound.es" NAME="ResourceLocatorTest.throwAnIllegalStateExceptionWhenResourceCannotBeFound" MODIFIED="1190156618965" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
<FILTER>com.thoughtworks.selenium.grid.configuration.*</FILTER>
</SUITE>
- <SUITE FILE_PATH="/Local/Users/Philippe/.IntelliJIdea70/system/coverage/Selenium Grid$com.thoughtworks.selenium.grid.hub$com.thoughtworks.selenium.grid.hub.es" NAME="com.thoughtworks.selenium.grid.hub" MODIFIED="1209565599875" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" />
- <SUITE FILE_PATH="\Local\Users\Philippe\.IntelliJIdea70\system\coverage\Selenium Grid$PageTest.templateIsTheOneProvidedInTheConstructor$PageTest.templateIsTheOneProvidedInTheConstructor.es" NAME="PageTest.templateIsTheOneProvidedInTheConstructor" MODIFIED="1189726413204" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
- <FILTER>com.thoughtworks.selenium.grid.hub.management.console.mvc.*</FILTER>
- </SUITE>
<SUITE FILE_PATH="/Users/ph7/Library/Caches/IntelliJIDEA70/coverage/Selenium Grid$HttpClientTest$HttpClientTest.es" NAME="HttpClientTest" MODIFIED="1203758832799" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
<FILTER>com.thoughtworks.selenium.grid.*</FILTER>
</SUITE>
+ <SUITE FILE_PATH="\Local\Users\Philippe\.IntelliJIdea70\system\coverage\Selenium Grid$PageTest.templateIsTheOneProvidedInTheConstructor$PageTest.templateIsTheOneProvidedInTheConstructor.es" NAME="PageTest.templateIsTheOneProvidedInTheConstructor" MODIFIED="1189726413204" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
+ <FILTER>com.thoughtworks.selenium.grid.hub.management.console.mvc.*</FILTER>
+ </SUITE>
+ <SUITE FILE_PATH="/Local/Users/Philippe/.IntelliJIdea70/system/coverage/Selenium Grid$com.thoughtworks.selenium.grid.hub$com.thoughtworks.selenium.grid.hub.es" NAME="com.thoughtworks.selenium.grid.hub" MODIFIED="1209565599875" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" />
<SUITE FILE_PATH="/Local/Users/Philippe/.IntelliJIdea70/system/coverage/Selenium Grid$NewBrowserSessionCommandTest.parseSessionIdReturnsTheSessionIdWhenSessionIdIsAGUID$NewBrowserSessionCommandTest.parseSessionIdReturnsTheSessionIdWhenSessionIdIsAGUID.es" NAME="NewBrowserSessionCommandTest.parseSessionIdReturnsTheSessionIdWhenSessionIdIsAGUID" MODIFIED="1197830937264" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
<FILTER>com.thoughtworks.selenium.grid.hub.remotecontrol.commands.*</FILTER>
</SUITE>
@@ -311,93 +317,91 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="common-build.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/common-build.xml">
+ <file leaf-file-name="ClasspathHelper.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/core/src/main/com/thoughtworks/selenium/grid/ClasspathHelper.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="13" column="40" selection-start="595" selection-end="595" vertical-scroll-proportion="0.24050634">
+ <state line="19" column="20" selection-start="517" selection-end="517" vertical-scroll-proportion="0.27382752">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ClasspathHelper.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/core/src/main/com/thoughtworks/selenium/grid/ClasspathHelper.java">
+ <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="6" column="26" selection-start="176" selection-end="176" vertical-scroll-proportion="0.15929204">
+ <state line="9" column="37" selection-start="352" selection-end="352" vertical-scroll-proportion="0.17142858">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="pmd-ruleset.xml" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/lib/build/pmd-ruleset.xml">
+ <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/core/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="33" column="40" selection-start="1185" selection-end="1185" vertical-scroll-proportion="0.79816514">
+ <state line="12" column="37" selection-start="464" selection-end="464" vertical-scroll-proportion="0.22325581">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/remote-control/build.xml">
+ <entry file="file://$PROJECT_DIR$/demo/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="12" column="33" selection-start="515" selection-end="515" vertical-scroll-proportion="0.34204274">
+ <state line="11" column="37" selection-start="476" selection-end="476" vertical-scroll-proportion="0.13333334">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="RegistrationRequestTest.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/remote-control/src/test/unit/java/com/thoughtworks/selenium/grid/remotecontrol/RegistrationRequestTest.java">
+ <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/hub/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="11" column="13" selection-start="273" selection-end="273" vertical-scroll-proportion="0.3020595">
+ <state line="10" column="37" selection-start="419" selection-end="419" vertical-scroll-proportion="0.1904762">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="SelfRegisteringRemoteControlTest.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/remote-control/src/test/unit/java/com/thoughtworks/selenium/grid/remotecontrol/SelfRegisteringRemoteControlTest.java">
+ <file leaf-file-name="ThreadSafeSeleniumSessionStorage.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/tools/src/main/com/thoughtworks/selenium/grid/tools/ThreadSafeSeleniumSessionStorage.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="11" column="36" selection-start="332" selection-end="332" vertical-scroll-proportion="0.23112129">
+ <state line="35" column="25" selection-start="1347" selection-end="1347" vertical-scroll-proportion="0.65015477">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ThreadSafeSeleniumSessionStorage.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/tools/src/main/com/thoughtworks/selenium/grid/tools/ThreadSafeSeleniumSessionStorage.java">
+ <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/examples/java/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="25" selection-start="1347" selection-end="1347" vertical-scroll-proportion="0.5881007">
+ <state line="13" column="37" selection-start="527" selection-end="527" vertical-scroll-proportion="0.20952381">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/examples/java/build.xml">
+ <entry file="file://$PROJECT_DIR$/regression-tests/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="13" column="38" selection-start="528" selection-end="528" vertical-scroll-proportion="0.32911393">
+ <state line="12" column="37" selection-start="532" selection-end="532" vertical-scroll-proportion="0.20952381">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="UnregistrationRequestTest.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/remote-control/src/test/unit/java/com/thoughtworks/selenium/grid/remotecontrol/UnregistrationRequestTest.java">
+ <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/remote-control/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="10" column="94" selection-start="333" selection-end="333" vertical-scroll-proportion="0.13729978">
- <folding>
- <element signature="imports" expanded="false" />
- </folding>
+ <state line="12" column="37" selection-start="519" selection-end="519" vertical-scroll-proportion="0.20952381">
+ <folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="HubRequestTest.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/remote-control/src/test/unit/java/com/thoughtworks/selenium/grid/remotecontrol/HubRequestTest.java">
+ <file leaf-file-name="build.xml" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/tools/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="38" column="0" selection-start="305" selection-end="1427" vertical-scroll-proportion="0.78032035">
+ <state line="20" column="10" selection-start="755" selection-end="755" vertical-scroll-proportion="0.3809524">
<folding />
</state>
</provider>
@@ -532,7 +536,7 @@
<showLibraryContents />
<hideEmptyPackages PackagesPane="true" ProjectPane="false" />
<abbreviatePackageNames />
- <showStructure ProjectPane="false" Scope="false" PackagesPane="false" Favorites="false" />
+ <showStructure Favorites="false" Scope="false" PackagesPane="false" ProjectPane="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -604,40 +608,11 @@
<option name="Make" value="true" />
</method>
</tempConfiguration>
- <configuration default="true" type="JUnit" factoryName="JUnit" enabled="true" merge="false">
- <module name="All" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" value="" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" value="" />
- <option name="METHOD_NAME" value="" />
- <option name="TEST_OBJECT" value="class" />
- <option name="VM_PARAMETERS" value="" />
- <option name="PARAMETERS" value="" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <option name="ADDITIONAL_CLASS_PATH" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="wholeProject" />
- </option>
- <envs />
- <method>
- <option name="Make" value="true" />
- </method>
- </configuration>
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
<module name="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" />
</configuration>
- <configuration default="true" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
- </configuration>
<configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
@@ -654,6 +629,57 @@
<option name="Make" value="true" />
</method>
</configuration>
+ <configuration default="true" type="RubyRunConfigurationType" factoryName="Ruby test">
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_CLASS_NAME" VALUE="" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_METHOD_NAME" VALUE="" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e STDOUT.sync=true;STDERR.sync=true;load($0=ARGV.shift)" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="MODULE_NAME" VALUE="" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="INHERITANCE_CHECK_DISABLED" VALUE="false" />
+ </configuration>
+ <configuration default="true" type="TestNG" factoryName="TestNG" enabled="false" merge="false">
+ <module name="" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="SUITE_NAME" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="GROUP_NAME" />
+ <option name="TEST_OBJECT" value="CLASS" />
+ <option name="VM_PARAMETERS" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" />
+ <option name="OUTPUT_DIRECTORY" />
+ <option name="ANNOTATION_TYPE" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <option name="ADDITIONAL_CLASS_PATH" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="wholeProject" />
+ </option>
+ <option name="PROPERTIES_FILE" />
+ <envs />
+ <properties>
+ <property name="firstEnvironment" value="*chrome" />
+ <property name="seleniumPort" value="4444" />
+ <property name="webSite" value="http://amazon.com" />
+ <property name="secondEnvironmnet" value="*chrome" />
+ <property name="browser" value="*chrome" />
+ <property name="thirdEnvironment" value="*chrome" />
+ <property name="seleniumHost" value="localhost" />
+ </properties>
+ <listeners />
+ <method>
+ <option name="Make" value="true" />
+ </method>
+ </configuration>
<configuration default="true" type="RubyRunConfigurationType" factoryName="Ruby script">
<RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="" />
<RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
@@ -663,6 +689,25 @@
<RUBY_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" />
<RUBY_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" />
</configuration>
+ <configuration default="true" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="5005" />
+ </configuration>
+ <configuration default="true" type="Applet" factoryName="Applet">
+ <module name="" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="HTML_FILE_NAME" />
+ <option name="HTML_USED" value="false" />
+ <option name="WIDTH" value="400" />
+ <option name="HEIGHT" value="300" />
+ <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+ <option name="VM_PARAMETERS" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ </configuration>
<configuration default="true" type="MavenRunConfiguration" factoryName="Maven">
<MavenSettings>
<option name="myCoreSettings">
@@ -705,69 +750,28 @@
</option>
</MavenSettings>
</configuration>
- <configuration default="true" type="Applet" factoryName="Applet">
- <module name="" />
- <option name="MAIN_CLASS_NAME" />
- <option name="HTML_FILE_NAME" />
- <option name="HTML_USED" value="false" />
- <option name="WIDTH" value="400" />
- <option name="HEIGHT" value="300" />
- <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
- <option name="VM_PARAMETERS" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- </configuration>
- <configuration default="true" type="TestNG" factoryName="TestNG" enabled="false" merge="false">
- <module name="" />
+ <configuration default="true" type="JUnit" factoryName="JUnit" enabled="true" merge="false">
+ <module name="All" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="SUITE_NAME" />
+ <option name="ALTERNATIVE_JRE_PATH" value="" />
<option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="GROUP_NAME" />
- <option name="TEST_OBJECT" value="CLASS" />
- <option name="VM_PARAMETERS" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" />
- <option name="OUTPUT_DIRECTORY" />
- <option name="ANNOTATION_TYPE" />
+ <option name="MAIN_CLASS_NAME" value="" />
+ <option name="METHOD_NAME" value="" />
+ <option name="TEST_OBJECT" value="class" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PARAMETERS" value="" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="ADDITIONAL_CLASS_PATH" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <option name="PROPERTIES_FILE" />
<envs />
- <properties>
- <property name="firstEnvironment" value="*chrome" />
- <property name="seleniumPort" value="4444" />
- <property name="webSite" value="http://amazon.com" />
- <property name="browser" value="*chrome" />
- <property name="secondEnvironmnet" value="*chrome" />
- <property name="thirdEnvironment" value="*chrome" />
- <property name="seleniumHost" value="localhost" />
- </properties>
- <listeners />
<method>
<option name="Make" value="true" />
</method>
</configuration>
- <configuration default="true" type="RubyRunConfigurationType" factoryName="Ruby test">
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_CLASS_NAME" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_METHOD_NAME" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e STDOUT.sync=true;STDERR.sync=true;load($0=ARGV.shift)" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="MODULE_NAME" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="INHERITANCE_CHECK_DISABLED" VALUE="false" />
- </configuration>
<configuration default="false" name="http_client_test" type="RubyRunConfigurationType" factoryName="Ruby test">
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$PROJECT_DIR$/hub/src/test/unit/com/thoughtworks/selenium/grid/hub/http_client_test.rb" />
@@ -987,8 +991,8 @@
<property name="firstEnvironment" value="*chrome" />
<property name="seleniumPort" value="4444" />
<property name="webSite" value="http://amazon.com" />
- <property name="browser" value="*chrome" />
<property name="secondEnvironmnet" value="*chrome" />
+ <property name="browser" value="*chrome" />
<property name="thirdEnvironment" value="*chrome" />
<property name="seleniumHost" value="localhost" />
</properties>
@@ -1026,8 +1030,8 @@
<property name="firstEnvironment" value="*chrome" />
<property name="seleniumPort" value="4444" />
<property name="webSite" value="http://amazon.com" />
- <property name="browser" value="*chrome" />
<property name="secondEnvironmnet" value="*chrome" />
+ <property name="browser" value="*chrome" />
<property name="thirdEnvironment" value="*chrome" />
<property name="seleniumHost" value="localhost" />
</properties>
@@ -1071,8 +1075,8 @@
<property name="firstEnvironment" value="*chrome" />
<property name="seleniumPort" value="4444" />
<property name="webSite" value="http://amazon.com" />
- <property name="browser" value="*chrome" />
<property name="secondEnvironmnet" value="*chrome" />
+ <property name="browser" value="*chrome" />
<property name="thirdEnvironment" value="*chrome" />
<property name="seleniumHost" value="localhost" />
</properties>
@@ -1084,19 +1088,19 @@
</method>
</configuration>
<list size="13">
- <item index="0" class="java.lang.String" itemvalue="RubyOnRails.http_client_test" />
- <item index="1" class="java.lang.String" itemvalue="RubyOnRails.HttpCommandParserTest" />
- <item index="2" class="java.lang.String" itemvalue="RubyOnRails.http_command_parser_test" />
- <item index="3" class="java.lang.String" itemvalue="Application.SelfRegisteringRemoteControlLauncher" />
- <item index="4" class="java.lang.String" itemvalue="Application.TestDriver" />
- <item index="5" class="java.lang.String" itemvalue="JUnit.PageTest" />
- <item index="6" class="java.lang.String" itemvalue="JUnit.TemplateTest" />
- <item index="7" class="java.lang.String" itemvalue="JUnit.ControllerTest" />
- <item index="8" class="java.lang.String" itemvalue="JUnit.com.thoughtworks.selenium.grid.configuration in Core" />
- <item index="9" class="java.lang.String" itemvalue="TestNG.WebTestForASingleBrowser.amazonOnFirefox" />
- <item index="10" class="java.lang.String" itemvalue="TestNG.WebTestForASingleBrowser.secondTest" />
- <item index="11" class="java.lang.String" itemvalue="TestNG.WebTestInvolvingMultiEnvironments" />
- <item index="12" class="java.lang.String" itemvalue="JUnit.SelfRegisteringRemoteControlTest" />
+ <item index="0" class="java.lang.String" itemvalue="JUnit.SelfRegisteringRemoteControlTest" />
+ <item index="1" class="java.lang.String" itemvalue="RubyOnRails.http_client_test" />
+ <item index="2" class="java.lang.String" itemvalue="RubyOnRails.HttpCommandParserTest" />
+ <item index="3" class="java.lang.String" itemvalue="RubyOnRails.http_command_parser_test" />
+ <item index="4" class="java.lang.String" itemvalue="Application.SelfRegisteringRemoteControlLauncher" />
+ <item index="5" class="java.lang.String" itemvalue="Application.TestDriver" />
+ <item index="6" class="java.lang.String" itemvalue="JUnit.PageTest" />
+ <item index="7" class="java.lang.String" itemvalue="JUnit.TemplateTest" />
+ <item index="8" class="java.lang.String" itemvalue="JUnit.ControllerTest" />
+ <item index="9" class="java.lang.String" itemvalue="JUnit.com.thoughtworks.selenium.grid.configuration in Core" />
+ <item index="10" class="java.lang.String" itemvalue="TestNG.WebTestForASingleBrowser.amazonOnFirefox" />
+ <item index="11" class="java.lang.String" itemvalue="TestNG.WebTestForASingleBrowser.secondTest" />
+ <item index="12" class="java.lang.String" itemvalue="TestNG.WebTestInvolvingMultiEnvironments" />
</list>
<configuration default="true" type="RUBY_RUN_CONFIGURATION_TYPE" factoryName="Ruby test">
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
@@ -1191,25 +1195,25 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="75" y="22" width="1332" height="834" extended-state="0" />
- <editor active="true" />
+ <frame x="58" y="22" width="1332" height="834" extended-state="0" />
+ <editor active="false" />
<layout>
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3293011" order="6" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32969603" order="0" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.31748253" order="1" />
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32969603" order="0" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3164557" order="1" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24927114" order="1" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3164557" order="11" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39784947" order="5" />
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="6" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="12" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="5" />
- <window_info id="TeamCity" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
+ <window_info id="TeamCity" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3921283" order="1" />
<window_info id="Maven projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32994923" order="4" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32436472" order="8" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28410688" order="2" x="25" y="383" width="1379" height="169" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.28410688" order="2" x="25" y="383" width="1379" height="169" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24945612" order="2" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39657632" order="3" />
@@ -1356,111 +1360,114 @@
</buildFile>
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/hub/build.xml">
+ <entry file="jar:///System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home/src.jar!/src/java/lang/System.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="34" column="70" selection-start="1285" selection-end="1285" vertical-scroll-proportion="0.60634923">
+ <state line="82" column="35" selection-start="2888" selection-end="2899" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/build.xml">
+ <entry file="file://$PROJECT_DIR$/lib/build/pmd-ruleset.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="76" column="39" selection-start="2930" selection-end="2930" vertical-scroll-proportion="-1.0380952">
+ <state line="19" column="0" selection-start="759" selection-end="759" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/core/src/main/com/thoughtworks/selenium/grid/HttpClient.java">
+ <entry file="file://$PROJECT_DIR$/remote-control/src/test/unit/java/com/thoughtworks/selenium/grid/remotecontrol/RegistrationRequestTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="41" selection-start="874" selection-end="874" vertical-scroll-proportion="0.604119">
+ <state line="11" column="13" selection-start="273" selection-end="273" vertical-scroll-proportion="0.20433436">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/core/src/test/unit/java/com/thoughtworks/selenium/grid/HttpClientTest.java">
+ <entry file="file://$PROJECT_DIR$/remote-control/src/test/unit/java/com/thoughtworks/selenium/grid/remotecontrol/SelfRegisteringRemoteControlTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="15" column="67" selection-start="416" selection-end="416" vertical-scroll-proportion="0.19221967">
+ <state line="11" column="36" selection-start="332" selection-end="332" vertical-scroll-proportion="0.20433436">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/remote-control/src/main/java/com/thoughtworks/selenium/grid/remotecontrol/HubRequest.java">
+ <entry file="file://$PROJECT_DIR$/remote-control/src/test/unit/java/com/thoughtworks/selenium/grid/remotecontrol/UnregistrationRequestTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="23" column="13" selection-start="647" selection-end="647" vertical-scroll-proportion="0.53097343">
- <folding>
- <element signature="imports" expanded="false" />
- </folding>
+ <state line="10" column="94" selection-start="333" selection-end="333" vertical-scroll-proportion="0.18575852">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/remote-control/build.xml">
+ <entry file="file://$PROJECT_DIR$/remote-control/src/test/unit/java/com/thoughtworks/selenium/grid/remotecontrol/HubRequestTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="12" column="33" selection-start="515" selection-end="515" vertical-scroll-proportion="0.34204274">
+ <state line="38" column="0" selection-start="305" selection-end="1427" vertical-scroll-proportion="0.7058824">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/remote-control/src/test/unit/java/com/thoughtworks/selenium/grid/remotecontrol/UnregistrationRequestTest.java">
+ <entry file="file://$PROJECT_DIR$/core/src/main/com/thoughtworks/selenium/grid/ClasspathHelper.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="10" column="94" selection-start="333" selection-end="333" vertical-scroll-proportion="0.13729978">
- <folding>
- <element signature="imports" expanded="false" />
- </folding>
+ <state line="19" column="20" selection-start="517" selection-end="517" vertical-scroll-proportion="0.27382752">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/remote-control/src/test/unit/java/com/thoughtworks/selenium/grid/remotecontrol/RegistrationRequestTest.java">
+ <entry file="file://$PROJECT_DIR$/tools/src/main/com/thoughtworks/selenium/grid/tools/ThreadSafeSeleniumSessionStorage.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="11" column="13" selection-start="273" selection-end="273" vertical-scroll-proportion="0.3020595">
+ <state line="35" column="25" selection-start="1347" selection-end="1347" vertical-scroll-proportion="0.65015477">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/remote-control/src/test/unit/java/com/thoughtworks/selenium/grid/remotecontrol/HubRequestTest.java">
+ <entry file="file://$PROJECT_DIR$/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="38" column="0" selection-start="305" selection-end="1427" vertical-scroll-proportion="0.78032035">
+ <state line="9" column="37" selection-start="352" selection-end="352" vertical-scroll-proportion="0.17142858">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/remote-control/src/test/unit/java/com/thoughtworks/selenium/grid/remotecontrol/SelfRegisteringRemoteControlTest.java">
+ <entry file="file://$PROJECT_DIR$/core/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="11" column="36" selection-start="332" selection-end="332" vertical-scroll-proportion="0.23112129">
+ <state line="12" column="37" selection-start="464" selection-end="464" vertical-scroll-proportion="0.22325581">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tools/src/main/com/thoughtworks/selenium/grid/tools/ThreadSafeSeleniumSessionStorage.java">
+ <entry file="file://$PROJECT_DIR$/demo/build.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="11" column="37" selection-start="476" selection-end="476" vertical-scroll-proportion="0.13333334">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/hub/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="25" selection-start="1347" selection-end="1347" vertical-scroll-proportion="0.5881007">
+ <state line="10" column="37" selection-start="419" selection-end="419" vertical-scroll-proportion="0.1904762">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/examples/java/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="13" column="38" selection-start="528" selection-end="528" vertical-scroll-proportion="0.32911393">
+ <state line="13" column="37" selection-start="527" selection-end="527" vertical-scroll-proportion="0.20952381">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/common-build.xml">
+ <entry file="file://$PROJECT_DIR$/regression-tests/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="13" column="40" selection-start="595" selection-end="595" vertical-scroll-proportion="0.24050634">
+ <state line="12" column="37" selection-start="532" selection-end="532" vertical-scroll-proportion="0.20952381">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/core/src/main/com/thoughtworks/selenium/grid/ClasspathHelper.java">
+ <entry file="file://$PROJECT_DIR$/remote-control/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="6" column="26" selection-start="176" selection-end="176" vertical-scroll-proportion="0.15929204">
+ <state line="12" column="37" selection-start="519" selection-end="519" vertical-scroll-proportion="0.20952381">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/lib/build/pmd-ruleset.xml">
+ <entry file="file://$PROJECT_DIR$/tools/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="33" column="40" selection-start="1185" selection-end="1185" vertical-scroll-proportion="0.79816514">
+ <state line="20" column="10" selection-start="755" selection-end="755" vertical-scroll-proportion="0.3809524">
<folding />
</state>
</provider>
View
4 build.xml
@@ -7,7 +7,7 @@
<property file="${basedir}/project.properties"/>
- <import file="${basedir}/common-build.xml" />
+ <import file="${basedir}/lib/build/common-build.xml" />
<target name="sanity-check" description="Check that building tools are been installed and configured properly">
<property environment="env"/>
@@ -72,7 +72,7 @@
<fileset dir="${basedir}/tools/target/dist/lib"/>
<fileset dir="${basedir}/vendor" includes="ruby/**/*.rb"/>
<fileset dir="${basedir}/demo/target/dist/lib"/>
- <fileset file="${basedir}/vendor/testng.policy"/>
+ <fileset file="${basedir}/lib/testng.policy"/>
<fileset file="${basedir}/vendor/testng-5.7-jdk15.jar"/>
<fileset file="${basedir}/vendor/selenium-java-client-driver-${selenium.version}.jar"/>
<fileset file="${basedir}/vendor/commons-logging-1.0.4.jar"/>
View
2 core/build.xml
@@ -10,7 +10,7 @@
<property name="build.src" location="src/main"/>
- <import file="${rootdir}/common-build.xml" />
+ <import file="${rootdir}/lib/build/common-build.xml" />
<path id="compile.classpath">
<fileset dir="${rootdir}/vendor">
View
25 core/src/main/com/thoughtworks/selenium/grid/ClasspathHelper.java
@@ -4,17 +4,20 @@
import java.net.URLClassLoader;
import java.io.IOException;
import java.io.InputStream;
-
+import java.io.PrintStream;
+import java.io.DataInputStream;
+
/**
* Instrospect Java Classpath at Runtime. Useful for Debuuging.
*/
public class ClasspathHelper {
public static String readFromClasspath(String path) throws IOException {
+ final ClassLoader classLoader;
final String content;
InputStream stream = null;
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ classLoader = Thread.currentThread().getContextClassLoader();
stream = classLoader.getResourceAsStream(path);
if (null == stream) {
throw new RuntimeException("cannot find '" + path + "' in classpath");
@@ -24,18 +27,22 @@ public static String readFromClasspath(String path) throws IOException {
return content;
}
- public static void dumpClasspath(Object javaObject) {
- URLClassLoader classLoader = (URLClassLoader) javaObject.getClass().getClassLoader();
+ public static void dumpClasspath(Object javaObject, PrintStream outputStream) {
+ final URLClassLoader classLoader;
+
+ classLoader = (URLClassLoader) javaObject.getClass().getClassLoader();
for (URL url : classLoader.getURLs()) {
- System.out.println(url.getFile());
+ outputStream.println(url.getFile());
}
}
- protected static String read(InputStream in)
- throws IOException {
- StringBuffer sb = new StringBuffer();
+ protected static String read(InputStream in) throws IOException {
+ DataInputStream ds;
+ final StringBuffer sb;
+
+ sb = new StringBuffer();
String line = null;
- java.io.DataInputStream ds = new java.io.DataInputStream(in);
+ ds = new DataInputStream(in);
while ((line = ds.readLine()) != null) {
sb.append(line);
sb.append("\n");
View
8 demo/build.xml
@@ -9,7 +9,7 @@
<property name="version" value="SNAPSHOT"/>
<property name="selenium.version" value="SET ME"/>
- <import file="${rootdir}/common-build.xml" />
+ <import file="${rootdir}/lib/build/common-build.xml" />
<property name="webSite" value="http://amazon.com" />
<property name="seleniumHost" value="localhost" />
@@ -58,7 +58,7 @@
classname="org.testng.TestNG"
failonerror="true"
>
- <sysproperty key="java.security.policy" file="${rootdir}/vendor/testng.policy"/>
+ <sysproperty key="java.security.policy" file="${rootdir}/lib/testng.policy"/>
<sysproperty key="webSite" value="${webSite}" />
<sysproperty key="seleniumHost" value="${seleniumHost}" />
<sysproperty key="seleniumPort" value="${seleniumPort}" />
@@ -78,7 +78,7 @@
classname="org.testng.TestNG"
failonerror="true">
- <sysproperty key="java.security.policy" file="${rootdir}/vendor/testng.policy"/>
+ <sysproperty key="java.security.policy" file="${rootdir}/lib/testng.policy"/>
<sysproperty key="webSite" value="${webSite}" />
<sysproperty key="seleniumHost" value="${seleniumHost}" />
<sysproperty key="seleniumPort" value="${seleniumPort}" />
@@ -103,7 +103,7 @@
failonerror="true"
>
- <sysproperty key="java.security.policy" file="${rootdir}/vendor/testng.policy"/>
+ <sysproperty key="java.security.policy" file="${rootdir}/lib/testng.policy"/>
<sysproperty key="webSite" value="${webSite}" />
<sysproperty key="seleniumHost" value="${seleniumHost}" />
<sysproperty key="seleniumPort" value="${seleniumPort}" />
View
6 examples/java/build.xml
@@ -11,7 +11,7 @@
<property name="build.src" location="src"/>
- <import file="${rootdir}/common-build.xml" />
+ <import file="${rootdir}/lib/build/common-build.xml" />
<property name="webSite" value="http://amazon.com" />
<property name="seleniumHost" value="localhost" />
@@ -41,7 +41,7 @@
classname="org.testng.TestNG"
failonerror="true">
- <sysproperty key="java.security.policy" file="${rootdir}/vendor/testng.policy"/>
+ <sysproperty key="java.security.policy" file="${rootdir}/lib/testng.policy"/>
<sysproperty key="webSite" value="${webSite}" />
<sysproperty key="seleniumHost" value="${seleniumHost}" />
<sysproperty key="seleniumPort" value="${seleniumPort}" />
@@ -65,7 +65,7 @@
classname="org.testng.TestNG"
failonerror="true">
- <sysproperty key="java.security.policy" file="${rootdir}/vendor/testng.policy"/>
+ <sysproperty key="java.security.policy" file="${rootdir}/lib/testng.policy"/>
<sysproperty key="webSite" value="${webSite}" />
<sysproperty key="seleniumHost" value="${seleniumHost}" />
<sysproperty key="seleniumPort" value="${seleniumPort}" />
View
10 examples/ruby/Rakefile
@@ -22,6 +22,16 @@ task :run_in_parallel => [:sanity_check, :report_dir] do
runner.run(Dir['*_spec.rb'])
end
+require "rubygems"
+require 'deep_test'
+require "deep_test/rake_tasks"
+
+Spec::Rake::SpecTask.new(:deep_spec) do |t|
+ t.spec_files = FileList['*_spec.rb']
+ t.deep_test :number_of_workers => 3,
+ :timeout_in_seconds => 30
+end
+
task :run_in_sequence => [:sanity_check, :report_dir]
task :run_in_parallel_single_process => [:sanity_check, :report_dir]
View
2 examples/ruby/book_example.rb
@@ -6,7 +6,7 @@ def as_described_on_amazon(options)
@selenium.type "twotabsearchtextbox", options[:keywords]
@selenium.click_and_wait "navGoButtonPanel"
@selenium.is_text_present(options[:title]).should be_true
- @selenium.click_and_wait "//img[@alt=\"#{options[:anchor]}\"]"
+ @selenium.click_and_wait "link=#{options[:anchor]}"
@selenium.field("name=quantity").should == "1"
@selenium.is_text_present("ISBN-10: #{options[:isbn]}").should be_true
@selenium.click_and_wait "link=Explore similar items"
View
2 examples/ruby/lib/view_test_helper.rb
@@ -2,8 +2,6 @@
require 'rubygems'
require 'spec'
require 'spec/runner/formatter/html_formatter'
-require 'spec/ui'
-require 'spec/ui/selenium/driver_ext'
require File.expand_path(File.dirname(__FILE__) + "/selenium")
require File.expand_path(File.dirname(__FILE__) + "/selenium_driver_extensions")
require File.expand_path(File.dirname(__FILE__) + "/spec/screenshot_formatter")
View
2 hub/build.xml
@@ -8,7 +8,7 @@
<property name="artifact" value="selenium-grid-hub"/>
<property name="version" value="SNAPSHOT"/>
- <import file="${rootdir}/common-build.xml" />
+ <import file="${rootdir}/lib/build/common-build.xml" />
<path id="compile.classpath">
<fileset dir="${rootdir}/vendor">
View
2 common-build.xml → lib/build/common-build.xml
@@ -185,7 +185,7 @@
<taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpathref="pmd.classpath"/>
<mkdir dir="${metrics.pmd.reports}"/>
<pmd shortFilenames="true">
- <ruleset>lib/build/pmd-ruleset.xml</ruleset>
+ <ruleset>../lib/build/pmd-ruleset.xml</ruleset>
<formatter type="html" toFile="${metrics.pmd.reports}/pmd_report.html"
linkPrefix="http://pmd.sourceforge.net/xref/"/>
<fileset dir="${build.src}">
View
1 lib/build/pmd-ruleset.xml
@@ -17,7 +17,6 @@
<rule ref="rulesets/junit.xml"/>
<rule ref="rulesets/logging-java.xml"/>
<rule ref="rulesets/naming.xml"/>
- <rule ref="rulesets/optimizations.xml"/>
<rule ref="rulesets/strictexception.xml"/>
<rule ref="rulesets/strings.xml"/>
<rule ref="rulesets/typeresolution.xml"/>
View
0 vendor/ruby/tcp_socket_extensions.rb → lib/ruby/tcp_socket_extensions.rb
File renamed without changes.
View
0 vendor/testng.policy → lib/testng.policy
File renamed without changes.
View
4 regression-tests/build.xml
@@ -10,7 +10,7 @@
<property name="selenium.version" value="SET ME"/>
<property name="build.src" location="src/"/>
- <import file="${rootdir}/common-build.xml" />
+ <import file="${rootdir}/lib/build/common-build.xml" />
<property name="webSite" value="http://amazon.com" />
<property name="seleniumHost" value="localhost" />
@@ -40,7 +40,7 @@
classname="org.testng.TestNG"
failonerror="true">
- <sysproperty key="java.security.policy" file="${rootdir}/vendor/testng.policy"/>
+ <sysproperty key="java.security.policy" file="${rootdir}/lib/testng.policy"/>
<sysproperty key="seleniumHost" value="${seleniumHost}" />
<sysproperty key="seleniumPort" value="${seleniumPort}" />
<sysproperty key="browser" value="${browser}" />
View
2 remote-control/build.xml
@@ -10,7 +10,7 @@
<property name="selenium.version" value="Set Me"/>
- <import file="${rootdir}/common-build.xml" />
+ <import file="${rootdir}/lib/build/common-build.xml" />
<path id="compile.classpath">
<fileset dir="${basedir}/lib">
View
2 tools/build.xml
@@ -10,7 +10,7 @@
<property name="build.src" location="src/main"/>
- <import file="${rootdir}/common-build.xml" />
+ <import file="${rootdir}/lib/build/common-build.xml" />
<path id="compile.classpath">
<fileset dir="${rootdir}/vendor">

0 comments on commit b671ab5

Please sign in to comment.