Skip to content

Commit

Permalink
Upgrade to gwt 2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@heiko-braun
heiko-braun committed Oct 19, 2011
1 parent 72a28d9 commit c6e0510
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 94 deletions.
50 changes: 21 additions & 29 deletions gui/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,36 +53,29 @@
<scope>provided</scope>
</dependency>

<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>1.0.0.GA</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>1.0.0.GA</version>
<classifier>sources</classifier>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.google.code.gwt-log</groupId>
<artifactId>gwt-log</artifactId>
</dependency>

<dependency>
<groupId>com.gwtplatform</groupId>
<artifactId>gwtp-all</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</exclusion>
<exclusion>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>crawl_htmlunit</artifactId>
</exclusion>
</exclusions>
<artifactId>gwtp-mvp-client</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
Expand All @@ -91,16 +84,15 @@
</dependency>

<dependency>
<groupId>com.google.gwt.inject</groupId>
<artifactId>gin</artifactId>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-assistedinject</artifactId>
</dependency>

<dependency>
<groupId>com.mycila.com.google.inject.extensions</groupId>
<artifactId>guice-assisted-inject</artifactId>
<groupId>com.google.gwt.inject</groupId>
<artifactId>gin</artifactId>
</dependency>

<!-- Testing dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand All @@ -123,7 +115,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>gwt-maven-plugin</artifactId>
<version>2.2.0</version>
<version>${gwt.maven}</version>
<configuration>
<inplace>true</inplace>
<logLevel>TRACE</logLevel>
Expand Down
3 changes: 1 addition & 2 deletions gui/src/main/java/org/jboss/as/console/client/core/gin/CoreUI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import com.google.inject.Provider;
import com.gwtplatform.mvp.client.proxy.Gatekeeper;
import com.gwtplatform.mvp.client.proxy.PlaceManager;
import com.gwtplatform.mvp.client.proxy.ProxyFailureHandler;

import org.jboss.as.console.client.auth.CurrentUser;
import org.jboss.as.console.client.auth.SignInPagePresenter;
Expand Down Expand Up @@ -110,7 +109,7 @@ public interface CoreUI extends Ginjector {

PlaceManager getPlaceManager();
EventBus getEventBus();
ProxyFailureHandler getProxyFailureHandler();
//ProxyFailureHandler getProxyFailureHandler();

//@DefaultGatekeeper
Gatekeeper getLoggedInGatekeeper();
Expand Down
5 changes: 1 addition & 4 deletions gui/src/main/java/org/jboss/as/console/client/core/gin/CoreUIModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,12 @@
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.event.shared.SimpleEventBus;
import com.google.inject.Singleton;
import com.gwtplatform.mvp.client.DefaultProxyFailureHandler;
import com.gwtplatform.mvp.client.RootPresenter;
import com.gwtplatform.mvp.client.gin.AbstractPresenterModule;
import com.gwtplatform.mvp.client.proxy.Gatekeeper;
import com.gwtplatform.mvp.client.proxy.ParameterTokenFormatter;
import com.gwtplatform.mvp.client.proxy.PlaceManager;
import com.gwtplatform.mvp.client.proxy.ProxyFailureHandler;
import com.gwtplatform.mvp.client.proxy.TokenFormatter;

import org.jboss.as.console.client.auth.CurrentUser;
import org.jboss.as.console.client.auth.LoggedInGatekeeper;
import org.jboss.as.console.client.auth.SignInPagePresenter;
Expand Down Expand Up @@ -178,7 +175,7 @@ protected void configure() {
bind(PlaceManager.class).to(DefaultPlaceManager.class).in(Singleton.class);
bind(TokenFormatter.class).to(ParameterTokenFormatter.class).in(Singleton.class);
bind(RootPresenter.class).asEagerSingleton();
bind(ProxyFailureHandler.class).to(DefaultProxyFailureHandler.class).in(Singleton.class);
//bind(ProxyFailureHandler.class).to(DefaultProxyFailureHandler.class).in(Singleton.class);
bind(Gatekeeper.class).to(LoggedInGatekeeper.class);
bind(CurrentUser.class).in(Singleton.class);
bind(BootstrapContext.class).in(Singleton.class);
Expand Down
93 changes: 34 additions & 59 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,16 @@
</licenses>

<properties>
<gwt.version>2.2.0</gwt.version>
<gwt.maven>2.2.0</gwt.maven>
<gwt-log.version>3.1.0</gwt-log.version>
<gwt.version>2.3.0</gwt.version>
<gwtp.version>0.6</gwtp.version>
<gwt.maven>2.3.0</gwt.maven>
<gwt-log.version>3.1.3</gwt-log.version>
<gwt-vis.version>1.1.1</gwt-vis.version>
<gin.version>1.0_r170</gin.version>
<guice.version>3.0-rc2</guice.version>
<gwtp.version>0.6-2.17</gwtp.version>
<junit.version>4.8.1</junit.version>

<gin.version>1.5_past22</gin.version>
<guice.version>3.0</guice.version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand Down Expand Up @@ -121,6 +123,20 @@
<version>${gwt.version}</version>
</dependency>

<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>1.0.0.GA</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>1.0.0.GA</version>
<classifier>sources</classifier>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.google.code</groupId>
<artifactId>gwt-visualization</artifactId>
Expand All @@ -141,32 +157,12 @@
</dependency>

<dependency>
<groupId>com.gwtplatform</groupId>
<artifactId>gwtp-all</artifactId>
<version>${gwtp.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</exclusion>
<exclusion>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>crawl_htmlunit</artifactId>
</exclusion>
</exclusions>
</dependency>
<groupId>com.gwtplatform</groupId>
<artifactId>gwtp-mvp-client</artifactId>
<version>${gwtp.version}</version>
<scope>provided</scope>
</dependency>


<dependency>
<groupId>com.google.inject</groupId>
Expand All @@ -175,15 +171,15 @@
</dependency>

<dependency>
<groupId>com.google.gwt.inject</groupId>
<artifactId>gin</artifactId>
<version>${gin.version}</version>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-assistedinject</artifactId>
<version>${guice.version}</version>
</dependency>

<dependency>
<groupId>com.mycila.com.google.inject.extensions</groupId>
<artifactId>guice-assisted-inject</artifactId>
<version>3.0-20100927</version>
<groupId>com.google.gwt.inject</groupId>
<artifactId>gin</artifactId>
<version>${gin.version}</version>
</dependency>

</dependencies>
Expand Down Expand Up @@ -260,27 +256,6 @@

</plugins>

<!-- PluginManagement -->
<!--pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2.SP1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.1</version>
</plugin>
<plugin>
<groupId>net.sourceforge.maven-taglib</groupId>
<artifactId>maven-taglib-plugin</artifactId>
<version>2.3</version>
</plugin>
</plugins>
</pluginManagement-->

</build>

<!-- Profiles -->
Expand Down

0 comments on commit c6e0510

Please sign in to comment.