Add missing OSGi import to make designs work (#17377)

Change-Id: I28bbbc7a9079fc81e90d1d3f35f675234e560404

diff --git a/server/build.xml b/server/build.xml
index 79bc6debe25988827392a8ec8dd8305b6f2cb347..e88b53d937f5b1a355589c27794e8145974062c3 100644 (file)
--- a/server/build.xml
+++ b/server/build.xml
@@ -26,7 +26,7 @@
 
     <target name="jar">
         <property name="server.osgi.import"
-            value="javax.servlet;version=&quot;2.4.0&quot;,javax.servlet.http;version=&quot;2.4.0&quot;,javax.validation;version=&quot;1.0.0.GA&quot;;resolution:=optional,org.jsoup;version=&quot;1.6.3&quot;,org.jsoup.parser;version=&quot;1.6.3&quot;,org.jsoup.nodes;version=&quot;1.6.3&quot;,org.jsoup.helper;version=&quot;1.6.3&quot;,org.jsoup.safety;version=&quot;1.6.3&quot;" />
+            value="javax.servlet;version=&quot;2.4.0&quot;,javax.servlet.http;version=&quot;2.4.0&quot;,javax.validation;version=&quot;1.0.0.GA&quot;;resolution:=optional,org.jsoup;version=&quot;1.6.3&quot;,org.jsoup.parser;version=&quot;1.6.3&quot;,org.jsoup.nodes;version=&quot;1.6.3&quot;,org.jsoup.helper;version=&quot;1.6.3&quot;,org.jsoup.safety;version=&quot;1.6.3&quot;,org.jsoup.select;version=&quot;1.6.3&quot;" />
         <property name="server.osgi.require"
             value="com.google.gwt.thirdparty.guava;bundle-version=&quot;16.0.1.vaadin1&quot;,com.vaadin.shared;bundle-version=&quot;${vaadin.version}&quot;,com.vaadin.push;bundle-version=&quot;${vaadin.version}&quot;;resolution:=optional,com.vaadin.sass-compiler;bundle-version=&quot;${vaadin.sass.version}&quot;;resolution:=optional" />
         <antcall target="common.jar">

diff --git a/uitest/src/com/vaadin/tests/integration/LabelFromDesign.html b/uitest/src/com/vaadin/tests/integration/LabelFromDesign.html
new file mode 100644 (file)
index 0000000..370a03e
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/integration/LabelFromDesign.html
@@ -0,0 +1 @@
+<v-label />
\ 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 6aec2c8e2af3582359cff6fec1a8ac834f28f35a..b81d57eccd3addb38fdfc5ccaf313c1c9eda95ba 100755 (executable)
--- 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.Label;
 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 @@ public class ServletIntegrationUI extends UI {
         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 class ServletIntegrationUI extends UI {
         });
         layout.addComponent(selectedLabel);
     }
+
+    @DesignRoot
+    public static class LabelFromDesign extends Label {
+        public LabelFromDesign() {
+            Design.read(this);
+        }
+    }
 }