Update appengine basic

ArcBees · Apr 17, 2014 · 790d5f8 · 790d5f8
1 parent 58c2f15
commit 790d5f8
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 18 deletions.
diff --git a/archetypes/gwtp-appengine-basic/pom.xml b/archetypes/gwtp-appengine-basic/pom.xml
@@ -12,13 +12,13 @@
 
     <properties>
         <!-- client -->
-        <gwt.version>2.5.1</gwt.version>
-        <gwtp.version>1.0</gwtp.version>
-        <gin.version>2.0.0</gin.version>
+        <gwt.version>2.6.0</gwt.version>
+        <gwtp.version>1.2.1</gwtp.version>
+        <gin.version>2.1.2</gin.version>
         <gwt.style>OBF</gwt.style>
 
         <!-- server -->
-        <gae.version>1.8.0</gae.version>
+        <gae.version>1.9.2</gae.version>
         <guice.version>3.0</guice.version>
         <objectify.version>4.0b1</objectify.version>
         <servlet-api.version>2.5</servlet-api.version>
@@ -27,7 +27,7 @@
 
         <!-- testing -->
         <junit.version>4.11</junit.version>
-        <jukito.version>1.1</jukito.version>
+        <jukito.version>1.4</jukito.version>
 
         <!-- maven -->
         <gwt-maven-plugin.version>2.5.1</gwt-maven-plugin.version>
@@ -38,7 +38,7 @@
         <maven-processor-plugin.version>2.0.5</maven-processor-plugin.version>
         <maven-build-helper-plugin.version>1.7</maven-build-helper-plugin.version>
 
-        <target.jdk>1.6</target.jdk>
+        <target.jdk>1.7</target.jdk>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
@@ -91,7 +91,6 @@
                 <artifactId>gwt-maven-plugin</artifactId>
                 <version>${gwt.version}</version>
                 <configuration>
-                    <strict>true</strict>
                     <testTimeOut>180</testTimeOut>
                     <includes>**/*GwtTest.java</includes>
                     <mode>htmlunit</mode>
@@ -214,17 +213,17 @@
         </dependency>
         <dependency>
             <groupId>com.gwtplatform</groupId>
-            <artifactId>gwtp-dispatch-client</artifactId>
+            <artifactId>gwtp-dispatch-rpc-client</artifactId>
             <version>${gwtp.version}</version>
         </dependency>
         <dependency>
             <groupId>com.gwtplatform</groupId>
-            <artifactId>gwtp-dispatch-server-guice</artifactId>
+            <artifactId>gwtp-dispatch-rpc-server-guice</artifactId>
             <version>${gwtp.version}</version>
         </dependency>
         <dependency>
             <groupId>com.gwtplatform</groupId>
-            <artifactId>gwtp-dispatch-shared</artifactId>
+            <artifactId>gwtp-dispatch-rpc-shared</artifactId>
             <version>${gwtp.version}</version>
         </dependency>
 

diff --git a/...gine-basic/src/main/java/com/arcbees/project/client/application/ApplicationPresenter.java b/...gine-basic/src/main/java/com/arcbees/project/client/application/ApplicationPresenter.java
@@ -16,8 +16,9 @@
 
 package com.arcbees.project.client.application;
 
+import javax.inject.Inject;
+
 import com.google.gwt.event.shared.GwtEvent.Type;
-import com.google.inject.Inject;
 import com.google.web.bindery.event.shared.EventBus;
 import com.gwtplatform.mvp.client.Presenter;
 import com.gwtplatform.mvp.client.View;
@@ -31,7 +32,7 @@ public interface MyView extends View {
     }
 
     @ContentSlot
-    public static final Type<RevealContentHandler<?>> TYPE_SetMainContent = new Type<RevealContentHandler<?>>();
+    public static final Type<RevealContentHandler<?>> SLOT_SetMainContent = new Type<RevealContentHandler<?>>();
 
     @ProxyStandard
     public interface MyProxy extends Proxy<ApplicationPresenter> {

diff --git a/...appengine-basic/src/main/java/com/arcbees/project/client/application/ApplicationView.java b/...appengine-basic/src/main/java/com/arcbees/project/client/application/ApplicationView.java
@@ -39,7 +39,7 @@ public ApplicationView(Binder uiBinder) {
 
     @Override
     public void setInSlot(Object slot, IsWidget content) {
-        if (slot == ApplicationPresenter.TYPE_SetMainContent) {
+        if (slot == ApplicationPresenter.SLOT_SetMainContent) {
             main.setWidget(content);
         } else {
             super.setInSlot(slot, content);

diff --git a/...ne-basic/src/main/java/com/arcbees/project/client/application/home/HomePagePresenter.java b/...ne-basic/src/main/java/com/arcbees/project/client/application/home/HomePagePresenter.java
@@ -16,9 +16,10 @@
 
 package com.arcbees.project.client.application.home;
 
+import javax.inject.Inject;
+
 import com.arcbees.project.client.application.ApplicationPresenter;
 import com.arcbees.project.client.place.NameTokens;
-import com.google.inject.Inject;
 import com.google.web.bindery.event.shared.EventBus;
 import com.gwtplatform.mvp.client.Presenter;
 import com.gwtplatform.mvp.client.View;
@@ -37,6 +38,6 @@ public interface MyProxy extends ProxyPlace<HomePagePresenter> {
 
     @Inject
     public HomePagePresenter(EventBus eventBus, MyView view, MyProxy proxy) {
-        super(eventBus, view, proxy, ApplicationPresenter.TYPE_SetMainContent);
+        super(eventBus, view, proxy, ApplicationPresenter.SLOT_SetMainContent);
     }
 }
diff --git a/...pengine-basic/src/main/java/com/arcbees/project/client/application/home/HomePageView.java b/...pengine-basic/src/main/java/com/arcbees/project/client/application/home/HomePageView.java
@@ -16,9 +16,10 @@
 
 package com.arcbees.project.client.application.home;
 
+import javax.inject.Inject;
+
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.user.client.ui.Widget;
-import com.google.inject.Inject;
 import com.gwtplatform.mvp.client.ViewImpl;
 
 public class HomePageView extends ViewImpl implements HomePagePresenter.MyView {

diff --git a/...appengine-basic/src/main/java/com/arcbees/project/server/guice/DispatchServletModule.java b/...appengine-basic/src/main/java/com/arcbees/project/server/guice/DispatchServletModule.java
@@ -17,8 +17,8 @@
 package com.arcbees.project.server.guice;
 
 import com.google.inject.servlet.ServletModule;
-import com.gwtplatform.dispatch.server.guice.DispatchServiceImpl;
-import com.gwtplatform.dispatch.shared.ActionImpl;
+import com.gwtplatform.dispatch.rpc.server.guice.DispatchServiceImpl;
+import com.gwtplatform.dispatch.rpc.shared.ActionImpl;
 
 public class DispatchServletModule extends ServletModule {
     @Override