diff --git a/server/build.xml b/server/build.xml index 79bc6debe25..e88b53d937f 100644 --- a/server/build.xml +++ b/server/build.xml @@ -26,7 +26,7 @@ + value="javax.servlet;version="2.4.0",javax.servlet.http;version="2.4.0",javax.validation;version="1.0.0.GA";resolution:=optional,org.jsoup;version="1.6.3",org.jsoup.parser;version="1.6.3",org.jsoup.nodes;version="1.6.3",org.jsoup.helper;version="1.6.3",org.jsoup.safety;version="1.6.3",org.jsoup.select;version="1.6.3"" /> diff --git a/uitest/src/com/vaadin/tests/integration/LabelFromDesign.html b/uitest/src/com/vaadin/tests/integration/LabelFromDesign.html new file mode 100644 index 00000000000..370a03e9900 --- /dev/null +++ b/uitest/src/com/vaadin/tests/integration/LabelFromDesign.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationUI.java b/uitest/src/com/vaadin/tests/integration/ServletIntegrationUI.java index 6aec2c8e2af..b81d57eccd3 100755 --- a/uitest/src/com/vaadin/tests/integration/ServletIntegrationUI.java +++ b/uitest/src/com/vaadin/tests/integration/ServletIntegrationUI.java @@ -1,5 +1,6 @@ package com.vaadin.tests.integration; +import com.vaadin.annotations.DesignRoot; import com.vaadin.data.Item; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; @@ -10,6 +11,7 @@ import com.vaadin.ui.Table; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; +import com.vaadin.ui.declarative.Design; public class ServletIntegrationUI extends UI { @@ -36,7 +38,7 @@ protected void init(VaadinRequest request) { item.getItemProperty("icon").setValue(new FlagSeResource()); item.getItemProperty("country").setValue("Sweden"); - final Label selectedLabel = new Label(); + final Label selectedLabel = new LabelFromDesign(); table.addValueChangeListener(new ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { @@ -45,4 +47,11 @@ public void valueChange(ValueChangeEvent event) { }); layout.addComponent(selectedLabel); } + + @DesignRoot + public static class LabelFromDesign extends Label { + public LabelFromDesign() { + Design.read(this); + } + } }