You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by ul...@apache.org on 2010/03/26 21:19:23 UTC
svn commit: r928041 - in
/tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test:
Jetty7Runner.java SeleniumLauncher.java
Author: uli
Date: Fri Mar 26 20:19:23 2010
New Revision: 928041
URL: http://svn.apache.org/viewvc?rev=928041&view=rev
Log:
fix some mistakes.
Modified:
tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/Jetty7Runner.java
tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumLauncher.java
Modified: tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/Jetty7Runner.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/Jetty7Runner.java?rev=928041&r1=928040&r2=928041&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/Jetty7Runner.java (original)
+++ tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/Jetty7Runner.java Fri Mar 26 20:19:23 2010
@@ -50,20 +50,22 @@ public class Jetty7Runner
webapp.setWar(expandedPath);
// SSL support
-
- SslSelectChannelConnector sslConnector = new SslSelectChannelConnector();
-
- sslConnector.setPort(sslPort);
-
File keystoreFile = new File(TapestryTestConstants.MODULE_BASE_DIR, "src/test/conf/keystore");
-
- sslConnector.setKeystore(keystoreFile.getPath());
-
- sslConnector.setPassword("tapestry");
-
- sslConnector.setKeyPassword("tapestry");
-
- jettyServer.addConnector(sslConnector);
+
+ if (keystoreFile.exists())
+ {
+ SslSelectChannelConnector sslConnector = new SslSelectChannelConnector();
+
+ sslConnector.setPort(sslPort);
+
+ sslConnector.setKeystore(keystoreFile.getPath());
+
+ sslConnector.setPassword("tapestry");
+
+ sslConnector.setKeyPassword("tapestry");
+
+ jettyServer.addConnector(sslConnector);
+ }
jettyServer.setHandler(webapp);
Modified: tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumLauncher.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumLauncher.java?rev=928041&r1=928040&r2=928041&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumLauncher.java (original)
+++ tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumLauncher.java Fri Mar 26 20:19:23 2010
@@ -177,7 +177,8 @@ public class SeleniumLauncher
File ffProfileTemplate = new File(TapestryTestConstants.MODULE_BASE_DIR, "src/test/conf/ff_profile_template");
- seleniumServer.getConfiguration().setFirefoxProfileTemplate(ffProfileTemplate);
+ if(ffProfileTemplate.isDirectory())
+ seleniumServer.getConfiguration().setFirefoxProfileTemplate(ffProfileTemplate);
seleniumServer.start();