Skip to content

Commit 1070d4d

Browse files
shs96cshs96c
committed
SimonStewart: Break out a server and client module for the IDEA project definitions. This paves the way to be able to also include the android code. Tests have been run with firefox and htmlunit in the IDE, but no full test run done on the command line.
r16207
1 parent 2c2ed3e commit 1070d4d

File tree

11 files changed

+119
-3
lines changed

11 files changed

+119
-3
lines changed

‎.idea/modules.xml

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎java/client/.classpath

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
4+
<classpathentry kind="src" path="src"/>
5+
<classpathentry kind="src" path="test"/>
6+
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/guava-libraries"/>
7+
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/junit"/>
8+
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/operadriver"/>
9+
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/simple-json"/>
10+
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/testng"/>
11+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/cglib"/>
12+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-io"/>
13+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-exec"/>
14+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-httpclient"/>
15+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/easymock"/>
16+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/hamcrest"/>
17+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/htmlunit"/>
18+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jmock"/>
19+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jna"/>
20+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/servlet-api"/>
21+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/android"/>
22+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jetty"/>
23+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-lang"/>
24+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-logging"/>
25+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-codec"/>
26+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-collections"/>
27+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/cssparser"/>
28+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/nekohtml"/>
29+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/sac"/>
30+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/xml-apis"/>
31+
<classpathentry kind="output" path="build/production"/>
32+
</classpath>

‎java/client/.project

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>client</name>
4+
<comment/>
5+
<projects/>
6+
<buildSpec>
7+
<buildCommand>
8+
<name>org.eclipse.jdt.core.javabuilder</name>
9+
<arguments/>
10+
</buildCommand>
11+
</buildSpec>
12+
<natures>
13+
<nature>org.eclipse.jdt.core.javanature</nature>
14+
</natures>
15+
</projectDescription>

‎java/client/client.eml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<component>
3+
<output-test url="file://$MODULE_DIR$/build/test"/>
4+
<exclude-output/>
5+
<contentEntry url="file://$MODULE_DIR$">
6+
<testFolder url="file://$MODULE_DIR$/test"/>
7+
</contentEntry>
8+
<lib name="jetty" scope="TEST"/>
9+
<lib name="commons-lang" scope="RUNTIME"/>
10+
<lib name="commons-logging" scope="RUNTIME"/>
11+
<lib name="commons-codec" scope="RUNTIME"/>
12+
<lib name="commons-collections" scope="RUNTIME"/>
13+
<lib name="cssparser" scope="RUNTIME"/>
14+
<lib name="nekohtml" scope="RUNTIME"/>
15+
<lib name="sac" scope="RUNTIME"/>
16+
<lib name="xml-apis" scope="RUNTIME"/>
17+
</component>

‎java/client/client.iml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module classpath="eclipse" classpath-dir="$MODULE_DIR$" type="JAVA_MODULE" version="4" />
3+

‎java/client/test/org/openqa/selenium/testing/drivers/SynthesizedFirefoxDriver.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ private static FirefoxProfile createTemporaryProfile() {
8989

9090
try {
9191
File prefs = locate("javascript/firefox-driver/webdriver.json");
92-
File dest = locate("out/production/selenium/org/openqa/selenium/firefox");
92+
File dest = locate("java/client/build/production/org/openqa/selenium/firefox");
9393
Files.copy(prefs, new File(dest, "webdriver.json"));
9494
FirefoxProfile profile = new FirefoxProfile();
9595

‎java/server/.classpath

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
4+
<classpathentry kind="src" path="src"/>
5+
<classpathentry kind="src" path="test"/>
6+
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/client"/>
7+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/bouncycastle"/>
8+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-httpclient"/>
9+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-io"/>
10+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-logging"/>
11+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jcip-annotations"/>
12+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jetty"/>
13+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/mx4j"/>
14+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/servlet-api"/>
15+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/snakeyaml"/>
16+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/easymock"/>
17+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/hamcrest"/>
18+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jmock"/>
19+
<classpathentry kind="output" path="build/production"/>
20+
</classpath>

‎java/server/.project

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>server</name>
4+
<comment/>
5+
<projects/>
6+
<buildSpec>
7+
<buildCommand>
8+
<name>org.eclipse.jdt.core.javabuilder</name>
9+
<arguments/>
10+
</buildCommand>
11+
</buildSpec>
12+
<natures>
13+
<nature>org.eclipse.jdt.core.javanature</nature>
14+
</natures>
15+
</projectDescription>

‎java/server/server.eml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<component>
3+
<output-test url="file://$MODULE_DIR$/build/test"/>
4+
<exclude-output/>
5+
<contentEntry url="file://$MODULE_DIR$">
6+
<testFolder url="file://$MODULE_DIR$/test"/>
7+
</contentEntry>
8+
<lib name="easymock" scope="TEST"/>
9+
<lib name="hamcrest" scope="TEST"/>
10+
<lib name="jmock" scope="TEST"/>
11+
</component>

‎java/server/server.iml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module classpath="eclipse" classpath-dir="$MODULE_DIR$" type="JAVA_MODULE" version="4" />
3+

‎selenium.iml

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<option name="LIBRARY_PROJECT" value="false" />
2020
<option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="true" />
2121
<option name="GENERATE_UNSIGNED_APK" value="false" />
22-
<option name="CUSTOM_DEBUG_KEYSTORE_PATH" value="" />
2322
</configuration>
2423
</facet>
2524
</component>

0 commit comments

Comments
 (0)