Block merge of version number change

svn changeset:19049/svn branch:6.6

9 files changed, 15 insertions, 10 deletions

diff --git a/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites-ie6.png
index 90a73be23f..515f64155d 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites-ie6.png
+++ b/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites-ie6.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/button-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/button/img/button-sprites-ie6.png
index 8ccaa56edd..662dc4c661 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/button-sprites-ie6.png
+++ b/WebContent/VAADIN/themes/reindeer/button/img/button-sprites-ie6.png
diff --git a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png
index 84c52dbf4c..0a7bd350e5 100644
--- a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png
+++ b/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png
diff --git a/WebContent/VAADIN/themes/reindeer/common/img/horizontal-sprites.png b/WebContent/VAADIN/themes/reindeer/common/img/horizontal-sprites.png
index 7980a5aa18..3f107c2c31 100644
--- a/WebContent/VAADIN/themes/reindeer/common/img/horizontal-sprites.png
+++ b/WebContent/VAADIN/themes/reindeer/common/img/horizontal-sprites.png
diff --git a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png
index a7ace8b131..4387eb3f63 100644
--- a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png
+++ b/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png
diff --git a/src/com/vaadin/launcher/DevelopmentServerLauncher.java b/src/com/vaadin/launcher/DevelopmentServerLauncher.java
index 256712c963..38222324d3 100644
--- a/src/com/vaadin/launcher/DevelopmentServerLauncher.java
+++ b/src/com/vaadin/launcher/DevelopmentServerLauncher.java
@@ -14,8 +14,6 @@ import org.mortbay.jetty.nio.SelectChannelConnector;
 import org.mortbay.jetty.security.SslSocketConnector;

 import org.mortbay.jetty.webapp.WebAppContext;

 

-import com.vaadin.launcher.util.BrowserLauncher;

-

 /**

  * Class for running Jetty servlet container within Eclipse project.

  * 

@@ -49,7 +47,7 @@ public class DevelopmentServerLauncher {
                 System.out.println("Starting Web Browser.");

 

                 // Open browser into application URL

-                BrowserLauncher.openBrowser(url);

+                // BrowserLauncher.openBrowser(url);

             }

         } catch (Exception e) {

             // NOP exception already on console by jetty

diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java
index 738f9c53c5..5f596ca398 100644
--- a/src/com/vaadin/ui/Table.java
+++ b/src/com/vaadin/ui/Table.java
@@ -985,7 +985,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Gets the icon Resource for the specified column.
      * 
      * @param propertyId
-     *            the propertyId indentifying the column.
+     *            the propertyId identifying the column.
      * @return the icon for the specified column; null if the column has no icon
      *         set, or if the column is not visible.
      */
diff --git a/tests/eclipse-run-selected-test.properties b/tests/eclipse-run-selected-test.properties
index 49925925bc..2fd0485403 100644
--- a/tests/eclipse-run-selected-test.properties
+++ b/tests/eclipse-run-selected-test.properties
@@ -1,12 +1,12 @@
 ; Location where vaadin-testbench jar can be found

-com.vaadin.testbench.lib.dir=<enter location of testbench here>

+com.vaadin.testbench.lib.dir=/home/hesara/dev/software/testbench/vaadin-testbench-2.2.0

 

 ; Deployment url to use for testing. Context path must be /  

-com.vaadin.testbench.deployment.url=http://<enter your ip here>:8888/

+com.vaadin.testbench.deployment.url=http://192.168.2.215:8888/

 

 ; Location of the screenshot directory. 

 ; This is the directory that contains the "references" directory

-com.vaadin.testbench.screenshot.directory=<enter the full path to the screenshots directory, parent of "references" directory>

+com.vaadin.testbench.screenshot.directory=/home/hesara/dev/workspaces/helios_sr1_jee_vaadin/v66_screenshots

 

 ; Run the whole test even if 

 com.vaadin.testbench.screenshot.softfail=true

@@ -21,9 +21,9 @@ com.vaadin.testbench.screenshot.cursor=true
 ; testfiles=${resource_loc}

 

 ; Uncomment to limit to certain browsers or override in launch configuration

-; browsers=winxp-opera10

+; browsers=winxp-googlechrome-stable

 

-; Claim that the server has started succesfully. Needed for the tests to run

+; Claim that the server has started successfully. Needed for the tests to run

 server.start.succeeded=1

 

-test-output-dir=../build/test-output
\ No newline at end of file
+test-output-dir=../build/test-output

diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxes2.java b/tests/src/com/vaadin/tests/components/combobox/ComboBoxes2.java
index f41176c6ca..bea3a449c7 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxes2.java
+++ b/tests/src/com/vaadin/tests/components/combobox/ComboBoxes2.java
@@ -2,6 +2,7 @@ package com.vaadin.tests.components.combobox;
 
 import java.util.LinkedHashMap;
 
+import com.vaadin.data.Container;
 import com.vaadin.terminal.Resource;
 import com.vaadin.tests.components.select.SelectTest;
 import com.vaadin.ui.ComboBox;
@@ -72,4 +73,10 @@ public class ComboBoxes2 extends SelectTest<ComboBox> {
                 });
     }
 
+    @Override
+    protected void setContainer(Container newContainer) {
+        super.setContainer(newContainer);
+        // getComponent().setItemCaptionPropertyId("Property 1");
+    }
+
 }