Skip to content

Commit

Permalink
All compiles with new libs
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel Brolund committed Oct 9, 2010
1 parent 61ba5e7 commit 1f0c0ce
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 16 deletions.
9 changes: 4 additions & 5 deletions bumblebee_junit4_acceptance/.classpath
View file
Expand Up @@ -36,11 +36,10 @@
<classpathentry kind="var" path="M2_REPO/batik/batik-xml/1.6/batik-xml-1.6.jar" sourcepath="M2_REPO/batik/batik-xml/1.6/batik-xml-1.6-sources.jar" javadocpath="M2_REPO/batik/batik-xml/1.6/batik-xml-1.6-javadoc.jar"/>
<classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.5.0/xercesImpl-2.5.0.jar" sourcepath="M2_REPO/xerces/xercesImpl/2.5.0/xercesImpl-2.5.0-sources.jar" javadocpath="M2_REPO/xerces/xercesImpl/2.5.0/xercesImpl-2.5.0-javadoc.jar"/>
<classpathentry kind="var" path="M2_REPO/xml-apis/xmlParserAPIs/2.0.2/xmlParserAPIs-2.0.2.jar" sourcepath="M2_REPO/xml-apis/xmlParserAPIs/2.0.2/xmlParserAPIs-2.0.2-sources.jar" javadocpath="M2_REPO/xml-apis/xmlParserAPIs/2.0.2/xmlParserAPIs-2.0.2-javadoc.jar"/>
<classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/client-drivers/selenium-java-client-driver/1.0.1/selenium-java-client-driver-1.0.1.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/client-drivers/selenium-java-client-driver/1.0.1/selenium-java-client-driver-1.0.1-sources.jar" javadocpath="M2_REPO/org/seleniumhq/selenium/client-drivers/selenium-java-client-driver/1.0.1/selenium-java-client-driver-1.0.1-javadoc.jar"/>
<classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/server/selenium-server/1.0.1/selenium-server-1.0.1.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/server/selenium-server/1.0.1/selenium-server-1.0.1-sources.jar" javadocpath="M2_REPO/org/seleniumhq/selenium/server/selenium-server/1.0.1/selenium-server-1.0.1-javadoc.jar"/>
<classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/server/selenium-server/1.0.1/selenium-server-1.0.1-standalone.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/server/selenium-server/1.0.1/selenium-server-1.0.1-sources.jar" javadocpath="M2_REPO/org/seleniumhq/selenium/server/selenium-server/1.0.1/selenium-server-1.0.1-javadoc.jar"/>
<classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/core/selenium-core/1.0.1/selenium-core-1.0.1.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/core/selenium-core/1.0.1/selenium-core-1.0.1-sources.jar" javadocpath="M2_REPO/org/seleniumhq/selenium/core/selenium-core/1.0.1/selenium-core-1.0.1-javadoc.jar"/>
<classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/server/selenium-server-coreless/1.0.1/selenium-server-coreless-1.0.1.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/server/selenium-server-coreless/1.0.1/selenium-server-coreless-1.0.1-sources.jar" javadocpath="M2_REPO/org/seleniumhq/selenium/server/selenium-server-coreless/1.0.1/selenium-server-coreless-1.0.1-javadoc.jar"/>
<classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium/2.0a5/selenium-2.0a5.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium/2.0a5/selenium-2.0a5-sources.jar" javadocpath="M2_REPO/org/seleniumhq/selenium/selenium/2.0a5/selenium-2.0a5-javadoc.jar"/>
<classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-common/2.0a5/selenium-common-2.0a5.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-common/2.0a5/selenium-common-2.0a5-sources.jar" javadocpath="M2_REPO/org/seleniumhq/selenium/selenium-common/2.0a5/selenium-common-2.0a5-javadoc.jar"/>
<classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-chrome-driver/2.0a5/selenium-chrome-driver-2.0a5.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-chrome-driver/2.0a5/selenium-chrome-driver-2.0a5-sources.jar" javadocpath="M2_REPO/org/seleniumhq/selenium/selenium-chrome-driver/2.0a5/selenium-chrome-driver-2.0a5-javadoc.jar"/>
<classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-server/2.0a5/selenium-server-2.0a5.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-server/2.0a5/selenium-server-2.0a5-sources.jar" javadocpath="M2_REPO/org/seleniumhq/selenium/selenium-server/2.0a5/selenium-server-2.0a5-javadoc.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/4.7/junit-4.7.jar" sourcepath="M2_REPO/junit/junit/4.7/junit-4.7-sources.jar" javadocpath="M2_REPO/junit/junit/4.7/junit-4.7-javadoc.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar" sourcepath="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1-sources.jar" javadocpath="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1-javadoc.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jmock/jmock-junit4/2.5.1/jmock-junit4-2.5.1.jar" sourcepath="M2_REPO/org/jmock/jmock-junit4/2.5.1/jmock-junit4-2.5.1-sources.jar" javadocpath="M2_REPO/org/jmock/jmock-junit4/2.5.1/jmock-junit4-2.5.1-javadoc.jar"/>
Expand Down
2 changes: 1 addition & 1 deletion ...eptance/src/test/java/com/agical/bumblebee/acceptance/selenium/SimpleSiteAndSelenium.java
View file
Expand Up @@ -27,7 +27,7 @@ public static void startJetty() {
public static void startSelenium() throws Exception {
seleniumServer = new SeleniumServer();
seleniumServer.start();
selenium = new DefaultSelenium("localhost", seleniumServer.getPort(), "*firefox", "http://localhost:8080");
selenium = new DefaultSelenium("localhost", seleniumServer.getPort(), "*googlechrome", "http://localhost:8080");
selenium.start();
}

Expand Down
8 changes: 4 additions & 4 deletions ...ceptance/src/test/java/com/agical/bumblebee/acceptance/selenium/site/JettyController.java
View file
Expand Up @@ -2,9 +2,9 @@

import java.io.File;

import org.mortbay.http.HttpContext;
import org.mortbay.http.HttpServer;
import org.mortbay.util.InetAddrPort;
import org.openqa.jetty.http.HttpContext;
import org.openqa.jetty.http.HttpServer;
import org.openqa.jetty.util.InetAddrPort;
import org.openqa.selenium.server.FsResourceLocator;
import org.openqa.selenium.server.StaticContentHandler;

Expand All @@ -26,7 +26,7 @@ public void start() {
httpServer = new HttpServer();
httpServer.addListener(new InetAddrPort(8080));
HttpContext context = httpServer.addContext("/");
StaticContentHandler staticContentHandler = new StaticContentHandler("http:s//localhost:45628");
StaticContentHandler staticContentHandler = new StaticContentHandler("http:s//localhost:45628", false);
staticContentHandler.addStaticContent(new FsResourceLocator(dir));
context.addHandler(staticContentHandler);
httpServer.start();
Expand Down
2 changes: 2 additions & 0 deletions bumblebee_selenium/.classpath
View file
Expand Up @@ -15,6 +15,8 @@
<classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1.1/jaxen-1.1.1.jar" sourcepath="M2_REPO/jaxen/jaxen/1.1.1/jaxen-1.1.1-sources.jar" javadocpath="M2_REPO/jaxen/jaxen/1.1.1/jaxen-1.1.1-javadoc.jar"/>
<classpathentry kind="var" path="M2_REPO/asm/asm/3.1/asm-3.1.jar" sourcepath="M2_REPO/asm/asm/3.1/asm-3.1-sources.jar" javadocpath="M2_REPO/asm/asm/3.1/asm-3.1-javadoc.jar"/>
<classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium/2.0a5/selenium-2.0a5.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium/2.0a5/selenium-2.0a5-sources.jar" javadocpath="M2_REPO/org/seleniumhq/selenium/selenium/2.0a5/selenium-2.0a5-javadoc.jar"/>
<classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-common/2.0a5/selenium-common-2.0a5.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-common/2.0a5/selenium-common-2.0a5-sources.jar" javadocpath="M2_REPO/org/seleniumhq/selenium/selenium-common/2.0a5/selenium-common-2.0a5-javadoc.jar"/>
<classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-chrome-driver/2.0a5/selenium-chrome-driver-2.0a5.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-chrome-driver/2.0a5/selenium-chrome-driver-2.0a5-sources.jar" javadocpath="M2_REPO/org/seleniumhq/selenium/selenium-chrome-driver/2.0a5/selenium-chrome-driver-2.0a5-javadoc.jar"/>
<classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-server/2.0a5/selenium-server-2.0a5.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-server/2.0a5/selenium-server-2.0a5-sources.jar" javadocpath="M2_REPO/org/seleniumhq/selenium/selenium-server/2.0a5/selenium-server-2.0a5-javadoc.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
</classpath>
16 changes: 10 additions & 6 deletions dependencies.rb
View file
@@ -1,6 +1,12 @@
BUMBLEBEE_VERSION = '1.1.1'

UMLSPEED_NAME='umlspeed:umlspeed:jar:0.19'
MUSE_NAME='oqube.muse:muse-parser:jar:1.0-rc3'
LIFL_NAME='fr.lifl:parsing:jar:1.0.1'
JHIGHLIGHT_NAME='jhighlight:jhighlight:jar:1.0'

MUSE_PARSER = [
MUSE_NAME,
'commons-collections:commons-collections:jar:3.1',
'commons-logging:commons-logging:jar:1.0.4']
BATIK = [
Expand Down Expand Up @@ -49,14 +55,12 @@

SELENIUM_2_0 = [
'org.seleniumhq.selenium:selenium:jar:2.0a5',
'org.seleniumhq.selenium:selenium-common:jar:2.0a5',
'org.seleniumhq.selenium:selenium-chrome-driver:jar:2.0a5',
'org.seleniumhq.selenium:selenium-server:jar:2.0a5']

SELENIUM = SELENIUM_1_0
JETTY = ['jetty:jetty:jar:5.01.1']
UMLSPEED_NAME='umlspeed:umlspeed:jar:0.19'
MUSE_NAME='oqube.muse:muse-parser:jar:1.0-rc3'
LIFL_NAME='fr.lifl:parsing:jar:1.0.1'
JHIGHLIGHT_NAME='jhighlight:jhighlight:jar:1.0'
SELENIUM = SELENIUM_2_0
JETTY = ['jetty:jetty:jar:5.1.10']

BUMBLEBEE = ['com.agical.bumblebee:bumblebee:jar:' + BUMBLEBEE_VERSION]
BUMBLEBEE_JUNIT4 = ['com.agical.bumblebee:bumblebee_junit4:jar:' + BUMBLEBEE_VERSION]
Expand Down

0 comments on commit 1f0c0ce

Please sign in to comment.