Skip to content

Commit

Permalink
SimonStewart: Break out a server and client module for the IDEA proje…
Browse files Browse the repository at this point in the history 
…ct 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
  • Loading branch information
@shs96c
shs96c committed Mar 9, 2012
1 parent 2c2ed3e commit 1070d4d
Show file tree
Hide file tree
Showing 11 changed files with 119 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .idea/modules.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 32 additions & 0 deletions java/client/.classpath
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="test"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/guava-libraries"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/junit"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/operadriver"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/simple-json"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/testng"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/cglib"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-io"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-exec"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-httpclient"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/easymock"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/hamcrest"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/htmlunit"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jmock"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jna"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/servlet-api"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/android"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jetty"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-lang"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-logging"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-codec"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-collections"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/cssparser"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/nekohtml"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/sac"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/xml-apis"/>
<classpathentry kind="output" path="build/production"/>
</classpath>
15 changes: 15 additions & 0 deletions java/client/.project
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>client</name>
<comment/>
<projects/>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments/>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
17 changes: 17 additions & 0 deletions java/client/client.eml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<component>
<output-test url="file://$MODULE_DIR$/build/test"/>
<exclude-output/>
<contentEntry url="file://$MODULE_DIR$">
<testFolder url="file://$MODULE_DIR$/test"/>
</contentEntry>
<lib name="jetty" scope="TEST"/>
<lib name="commons-lang" scope="RUNTIME"/>
<lib name="commons-logging" scope="RUNTIME"/>
<lib name="commons-codec" scope="RUNTIME"/>
<lib name="commons-collections" scope="RUNTIME"/>
<lib name="cssparser" scope="RUNTIME"/>
<lib name="nekohtml" scope="RUNTIME"/>
<lib name="sac" scope="RUNTIME"/>
<lib name="xml-apis" scope="RUNTIME"/>
</component>
3 changes: 3 additions & 0 deletions java/client/client.iml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<module classpath="eclipse" classpath-dir="$MODULE_DIR$" type="JAVA_MODULE" version="4" />

2 changes: 1 addition & 1 deletion java/client/test/org/openqa/selenium/testing/drivers/SynthesizedFirefoxDriver.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ private static FirefoxProfile createTemporaryProfile() {

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

Expand Down
20 changes: 20 additions & 0 deletions java/server/.classpath
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="test"/>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/client"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/bouncycastle"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-httpclient"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-io"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-logging"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jcip-annotations"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jetty"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/mx4j"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/servlet-api"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/snakeyaml"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/easymock"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/hamcrest"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jmock"/>
<classpathentry kind="output" path="build/production"/>
</classpath>
15 changes: 15 additions & 0 deletions java/server/.project
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>server</name>
<comment/>
<projects/>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments/>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
11 changes: 11 additions & 0 deletions java/server/server.eml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<component>
<output-test url="file://$MODULE_DIR$/build/test"/>
<exclude-output/>
<contentEntry url="file://$MODULE_DIR$">
<testFolder url="file://$MODULE_DIR$/test"/>
</contentEntry>
<lib name="easymock" scope="TEST"/>
<lib name="hamcrest" scope="TEST"/>
<lib name="jmock" scope="TEST"/>
</component>
3 changes: 3 additions & 0 deletions java/server/server.iml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<module classpath="eclipse" classpath-dir="$MODULE_DIR$" type="JAVA_MODULE" version="4" />

1 change: 0 additions & 1 deletion selenium.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
<option name="LIBRARY_PROJECT" value="false" />
<option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="true" />
<option name="GENERATE_UNSIGNED_APK" value="false" />
<option name="CUSTOM_DEBUG_KEYSTORE_PATH" value="" />
</configuration>
</facet>
</component>
Expand Down

0 comments on commit 1070d4d

Please sign in to comment.