samples module migrated to vaadin8

peholmst · Mar 7, 2017 · 28fe0d0 · 28fe0d0
1 parent e5ceed7
commit 28fe0d0
Show file tree

Hide file tree

Showing 18 changed files with 45 additions and 27 deletions.
diff --git a/pom.xml b/pom.xml
@@ -83,7 +83,7 @@
         <project.build.encoding>UTF-8</project.build.encoding>
         <project.build.target>1.8</project.build.target>
         <project.build.source>1.8</project.build.source>
-        <vaadin.version>8.0.1</vaadin.version>
+        <vaadin.version>8.0.0</vaadin.version>
         <vaadin-touchkit.version>4.0.0</vaadin-touchkit.version>
         <vaadin-spring.version>2.0.0</vaadin-spring.version>
         <spring.version>4.3.6.RELEASE</spring.version>
@@ -352,6 +352,6 @@
         <module>extensions/core</module>
         <module>extensions/security</module>
         <module>extensions/test</module>
-        <!--<module>samples</module>-->
+        <module>samples</module>
     </modules>
 </project>
diff --git a/samples/i18n-sample/pom.xml b/samples/i18n-sample/pom.xml
@@ -32,7 +32,11 @@
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>vaadin-client-compiled</artifactId>
+            <artifactId>vaadin-compatibility-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-compatibility-client</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/samples/i18n-sample/src/main/java/org/vaadin/spring/samples/i18n/TranslatedUI.java b/samples/i18n-sample/src/main/java/org/vaadin/spring/samples/i18n/TranslatedUI.java
@@ -24,13 +24,13 @@
 import org.vaadin.spring.i18n.support.Translatable;
 import org.vaadin.spring.i18n.support.TranslatableUI;
 
-import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.data.util.converter.StringToBigDecimalConverter;
+import com.vaadin.v7.data.util.ObjectProperty;
+import com.vaadin.v7.data.util.converter.StringToBigDecimalConverter;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.spring.annotation.SpringUI;
 import com.vaadin.ui.Button;
-import com.vaadin.ui.DateField;
-import com.vaadin.ui.TextField;
+import com.vaadin.v7.ui.DateField;
+import com.vaadin.v7.ui.TextField;
 import com.vaadin.ui.VerticalLayout;
 
 /**

diff --git a/samples/navigation-sample/pom.xml b/samples/navigation-sample/pom.xml
@@ -30,7 +30,11 @@
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>vaadin-client-compiled</artifactId>
+            <artifactId>vaadin-compatibility-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-compatibility-client</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/...vigation-sample/src/main/java/org/vaadin/spring/samples/navigation/AccessControlView.java b/...vigation-sample/src/main/java/org/vaadin/spring/samples/navigation/AccessControlView.java
@@ -15,7 +15,7 @@
  */
 package org.vaadin.spring.samples.navigation;
 
-import com.vaadin.data.Property;
+import com.vaadin.data.HasValue;
 import com.vaadin.navigator.View;
 import com.vaadin.navigator.ViewChangeListener;
 import com.vaadin.spring.access.ViewAccessControl;
@@ -69,9 +69,9 @@ void init() {
 
     private CheckBox createViewCheckbox(String caption, final String viewName) {
         final CheckBox checkBox = new CheckBox(caption, true);
-        checkBox.addValueChangeListener(new Property.ValueChangeListener() {
+        checkBox.addValueChangeListener(new HasValue.ValueChangeListener<Boolean>() {
             @Override
-            public void valueChange(Property.ValueChangeEvent event) {
+            public void valueChange(HasValue.ValueChangeEvent<Boolean> valueChangeEvent) {
                 if (checkBox.getValue()) {
                     allowedViews.add(viewName);
                 } else {

diff --git a/...avigation-sample/src/main/java/org/vaadin/spring/samples/navigation/AccessDeniedView.java b/...avigation-sample/src/main/java/org/vaadin/spring/samples/navigation/AccessDeniedView.java
@@ -2,7 +2,7 @@
 
 import com.vaadin.navigator.View;
 import com.vaadin.navigator.ViewChangeListener;
-import com.vaadin.shared.ui.label.ContentMode;
+import com.vaadin.shared.ui.ContentMode;
 import com.vaadin.spring.annotation.SpringComponent;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;

diff --git a/...gation-sample/src/main/java/org/vaadin/spring/samples/navigation/PrototypeScopedView.java b/...gation-sample/src/main/java/org/vaadin/spring/samples/navigation/PrototypeScopedView.java
@@ -17,7 +17,7 @@
 
 import com.vaadin.navigator.View;
 import com.vaadin.navigator.ViewChangeListener;
-import com.vaadin.shared.ui.label.ContentMode;
+import com.vaadin.shared.ui.ContentMode;
 import com.vaadin.spring.annotation.SpringView;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Label;

diff --git a/...es/navigation-sample/src/main/java/org/vaadin/spring/samples/navigation/UIScopedView.java b/...es/navigation-sample/src/main/java/org/vaadin/spring/samples/navigation/UIScopedView.java
@@ -17,7 +17,7 @@
 
 import com.vaadin.navigator.View;
 import com.vaadin.navigator.ViewChangeListener;
-import com.vaadin.shared.ui.label.ContentMode;
+import com.vaadin.shared.ui.ContentMode;
 import com.vaadin.spring.annotation.SpringView;
 import com.vaadin.spring.annotation.UIScope;
 import com.vaadin.ui.Button;

diff --git a/...gation-sample/src/main/java/org/vaadin/spring/samples/navigation/ViewScopedComponent.java b/...gation-sample/src/main/java/org/vaadin/spring/samples/navigation/ViewScopedComponent.java
@@ -15,7 +15,7 @@
  */
 package org.vaadin.spring.samples.navigation;
 
-import com.vaadin.shared.ui.label.ContentMode;
+import com.vaadin.shared.ui.ContentMode;
 import com.vaadin.spring.annotation.SpringComponent;
 import com.vaadin.spring.annotation.ViewScope;
 import com.vaadin.ui.Label;

diff --git a/.../navigation-sample/src/main/java/org/vaadin/spring/samples/navigation/ViewScopedView.java b/.../navigation-sample/src/main/java/org/vaadin/spring/samples/navigation/ViewScopedView.java
@@ -17,7 +17,7 @@
 
 import com.vaadin.navigator.View;
 import com.vaadin.navigator.ViewChangeListener;
-import com.vaadin.shared.ui.label.ContentMode;
+import com.vaadin.shared.ui.ContentMode;
 import com.vaadin.spring.annotation.SpringView;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Label;

diff --git a/samples/pom.xml b/samples/pom.xml
@@ -17,8 +17,8 @@
     <name>Vaadin4Spring Samples</name>
 
     <properties>
-        <vaadin.version>7.7.3</vaadin.version>
-        <vaadin-spring.version>1.1.0</vaadin-spring.version>
+        <vaadin.version>8.0.0</vaadin.version>
+        <vaadin-spring.version>2.0.0</vaadin-spring.version>
     </properties>
 
     <dependencyManagement>

diff --git a/samples/push-sample/pom.xml b/samples/push-sample/pom.xml
@@ -30,7 +30,11 @@
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>vaadin-client-compiled</artifactId>
+            <artifactId>vaadin-compatibility-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-compatibility-client</artifactId>
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>

diff --git a/samples/push-sample/src/main/java/org/vaadin/spring/samples/push/PushUI.java b/samples/push-sample/src/main/java/org/vaadin/spring/samples/push/PushUI.java
@@ -18,12 +18,12 @@
 import com.vaadin.annotations.Push;
 import com.vaadin.annotations.Theme;
 import com.vaadin.annotations.Title;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.ui.Transport;
 import com.vaadin.spring.annotation.SpringUI;
-import com.vaadin.ui.Grid;
+import com.vaadin.v7.ui.Grid;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.themes.ValoTheme;
 import org.slf4j.Logger;

diff --git a/...mple-managed/src/main/java/org/vaadin/spring/samples/security/managed/views/HomeView.java b/...mple-managed/src/main/java/org/vaadin/spring/samples/security/managed/views/HomeView.java
@@ -18,7 +18,7 @@
 import com.vaadin.navigator.View;
 import com.vaadin.navigator.ViewChangeListener;
 import com.vaadin.server.FontAwesome;
-import com.vaadin.shared.ui.label.ContentMode;
+import com.vaadin.shared.ui.ContentMode;
 import com.vaadin.spring.annotation.SpringView;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;

diff --git a/...sample-shared/src/main/java/org/vaadin/spring/samples/security/shared/views/HomeView.java b/...sample-shared/src/main/java/org/vaadin/spring/samples/security/shared/views/HomeView.java
@@ -18,7 +18,7 @@
 import com.vaadin.navigator.View;
 import com.vaadin.navigator.ViewChangeListener;
 import com.vaadin.server.FontAwesome;
-import com.vaadin.shared.ui.label.ContentMode;
+import com.vaadin.shared.ui.ContentMode;
 import com.vaadin.spring.annotation.SpringView;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;

diff --git a/samples/sidebar-sample/pom.xml b/samples/sidebar-sample/pom.xml
@@ -28,10 +28,16 @@
             <groupId>com.vaadin</groupId>
             <artifactId>vaadin-themes</artifactId>
         </dependency>
+
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>vaadin-client-compiled</artifactId>
+            <artifactId>vaadin-compatibility-server</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-compatibility-client</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.vaadin.icons</groupId>
             <artifactId>vaadin-icons</artifactId>

diff --git a/...es/sidebar-sample/src/main/java/org/vaadin/spring/samples/sidebar/AccordionSideBarUI.java b/...es/sidebar-sample/src/main/java/org/vaadin/spring/samples/sidebar/AccordionSideBarUI.java
@@ -17,7 +17,7 @@
 
 import com.vaadin.annotations.Theme;
 import com.vaadin.spring.annotation.SpringUI;
-import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.ui.themes.Reindeer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.vaadin.spring.sidebar.components.AbstractSideBar;
 import org.vaadin.spring.sidebar.components.AccordionSideBar;

diff --git a/samples/sidebar-sample/src/main/java/org/vaadin/spring/samples/sidebar/ValoSideBarUI.java b/samples/sidebar-sample/src/main/java/org/vaadin/spring/samples/sidebar/ValoSideBarUI.java
@@ -19,7 +19,7 @@
 import com.vaadin.annotations.Theme;
 import com.vaadin.server.FontAwesome;
 import com.vaadin.server.VaadinRequest;
-import com.vaadin.shared.ui.label.ContentMode;
+import com.vaadin.shared.ui.ContentMode;
 import com.vaadin.spring.annotation.SpringUI;
 import com.vaadin.ui.CssLayout;
 import com.vaadin.ui.Label;