SimonStewart: Break out a server and client module for the IDEA proje…

…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

java/client/.classpath

@@ -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>

java/client/.project

@@ -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>

java/client/client.eml

@@ -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>

java/client/client.iml

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

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

@@ -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();
 

java/server/.classpath

@@ -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>

java/server/.project

@@ -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>

java/server/server.eml

@@ -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>

java/server/server.iml

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

selenium.iml

@@ -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>