@@ -17,9 +17,9 @@ | |||
<url>http://vaadin.com</url> | |||
<properties> | |||
<vaadin.spring.version>3.0.0.alpha1</vaadin.spring.version> | |||
<vaadin.spring.version>3.0.0.beta1</vaadin.spring.version> | |||
<vaadin.testbench.version>5.1.1</vaadin.testbench.version> | |||
<vaadin.cdi.version>3.0.0.alpha2</vaadin.cdi.version> | |||
<vaadin.cdi.version>3.0.0.beta1</vaadin.cdi.version> | |||
<vaadin.context-menu.version>2.0.0</vaadin.context-menu.version> | |||
</properties> | |||
@@ -1,8 +1,9 @@ | |||
package com.vaadin.test.cdi.views; | |||
import com.vaadin.cdi.CDIView; | |||
import com.vaadin.cdi.ViewContextStrategy.Always; | |||
import com.vaadin.cdi.viewcontextstrategy.ViewContextByNavigation; | |||
@CDIView(value = "new", contextStrategy = Always.class) | |||
@CDIView(value = "new") | |||
@ViewContextByNavigation | |||
public class AlwaysNewView extends GreetingView { | |||
} |
@@ -3,14 +3,15 @@ package com.vaadin.test.cdi.views; | |||
import javax.inject.Inject; | |||
import com.vaadin.cdi.CDIView; | |||
import com.vaadin.cdi.ViewContextStrategy.Always; | |||
import com.vaadin.cdi.viewcontextstrategy.ViewContextByNavigation; | |||
import com.vaadin.navigator.View; | |||
import com.vaadin.test.cdi.ThankYouService; | |||
import com.vaadin.ui.Button; | |||
import com.vaadin.ui.Component; | |||
import com.vaadin.ui.Notification; | |||
@CDIView(value = "", contextStrategy = Always.class) | |||
@CDIView(value = "") | |||
@ViewContextByNavigation | |||
public class DefaultView implements View { | |||
@Inject |
@@ -1,8 +1,9 @@ | |||
package com.vaadin.test.cdi.views; | |||
import com.vaadin.cdi.CDIView; | |||
import com.vaadin.cdi.ViewContextStrategy.ViewName; | |||
import com.vaadin.cdi.viewcontextstrategy.ViewContextByName; | |||
@CDIView(value = "name", contextStrategy = ViewName.class) | |||
@CDIView(value = "name") | |||
@ViewContextByName | |||
public class NameBasedView extends GreetingView { | |||
} |
@@ -1,8 +1,9 @@ | |||
package com.vaadin.test.cdi.views; | |||
import com.vaadin.cdi.CDIView; | |||
import com.vaadin.cdi.ViewContextStrategy.ViewNameAndParameters; | |||
import com.vaadin.cdi.viewcontextstrategy.ViewContextByNameAndParameters; | |||
@CDIView(value = "param", contextStrategy = ViewNameAndParameters.class) | |||
@CDIView(value = "param") | |||
@ViewContextByNameAndParameters | |||
public class ParamBasedView extends GreetingView { | |||
} |
@@ -2,9 +2,10 @@ package com.vaadin.test.cdi.views; | |||
import com.vaadin.cdi.CDIView; | |||
import com.vaadin.cdi.UIScoped; | |||
import com.vaadin.cdi.ViewContextStrategy.Always; | |||
import com.vaadin.cdi.viewcontextstrategy.ViewContextByNavigation; | |||
@UIScoped | |||
@CDIView(value = "persisting", contextStrategy = Always.class) | |||
@CDIView(value = "persisting") | |||
@ViewContextByNavigation | |||
public class UIScopedView extends GreetingView { | |||
} |