diff --git a/pom.xml b/pom.xml index 23748ea..bdd8326 100644 --- a/pom.xml +++ b/pom.xml @@ -2,28 +2,24 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.sencha.gxt gxt-demo-desktop 1.0.0-SNAPSHOT war Sencha Desktop Demo - + - 4.0.2 + 4.0.3-SNAPSHOT 2.8.2 - 2.8.2 + 2.8.2 OBF UTF-8 ${project.build.directory}/${project.build.finalName} - - true - true @@ -41,8 +37,9 @@ maven-compiler-plugin 3.5.1 - 1.7 - 1.7 + true + 1.8 + 1.8 @@ -69,7 +66,7 @@ org.codehaus.mojo gwt-maven-plugin - ${gwt.plugin.version} + ${gwt.maven.version} true @@ -78,14 +75,14 @@ **/*GwtTest.java htmlunit - -Xss1024K -Xmx1G -XX:MaxPermSize=256M + -Xss1024K -Xmx1g -XX:MaxPermSize=256M INFO true ${webappDirectory} - MyGxtProject40.html + desktop.html com.sencha.gxt.examples.resources.Resources com.sencha.gxt.desktop.Desktop @@ -95,34 +92,11 @@ - test compile + test - - - - com.google.gwt - gwt-user - ${gwt.version} - compile - - - - com.google.gwt - gwt-dev - ${gwt.version} - compile - - - com.google.gwt - gwt-codeserver - ${gwt.version} - compile - - - @@ -132,12 +106,12 @@ **/server/data/*.class true - + @@ -152,16 +126,12 @@ org.apache.openjpa openjpa - 2.1.0 + 2.4.2 commons-logging commons-logging - - org.apache.geronimo.specs - geronimo-jms_1.1_spec - @@ -171,6 +141,38 @@ + + + maven-war-plugin + 2.1.1 + + + true + + + true + src/main/webapp + + **/*.html + + + + WEB-INF/deploy/** + + + + org.apache.maven.plugins + maven-source-plugin + 2.4 + + + attach-sources + + jar-no-fork + + + + @@ -227,82 +229,51 @@ - - - JBoss Repo - https://repository.jboss.org/nexus/content/repositories/releases - JBoss Repo - - - apache-snapshots - http://people.apache.org/repo/m2-incubating-repository - - - repo2-maven2 - http://repo2.maven.org/maven2 - - - sonatype.snapshots - Sonatype snapshot repository - https://oss.sonatype.org/content/repositories/snapshots/ - default - - - - - sencha-gxt-repository - Sencha GXT Repository - - - - https://maven.sencha.com/repo/gxt-support-commercial-release - - - - - - - - - - - - true - - - true - - - - - - - - - - sencha-gxt-repository - Sencha GXT Repository - - - - https://maven.sencha.com/repo/gxt-support-commercial-release - - - - - - - - - - - - - - + + + fast-build + + + <set-property name="user.agent" value="safari" /> + <set-property + name="gxt.user.agent" value="chrome" /> + <set-property name="gxt.device" value="desktop" /> + <set-property name="gxt.theme" value="triton" /> + + + + + src/main/java + true + + **/*.gwt.xml + + + + + + + org.apache.maven.plugins + maven-resources-plugin + 3.0.2 + + UTF-8 + <!--{*}--> + + + + + + + + + junit + junit + 4.8.1 + test + com.google.gwt gwt-user @@ -343,11 +314,17 @@ ${gxt.version} provided + + com.sencha.gxt + gxt-theme-triton + ${gxt.version} + provided + org.hsqldb hsqldb - 2.4.0 + 2.0.0 @@ -393,12 +370,6 @@ gxt-driver 0.0.1-SNAPSHOT - - junit - junit - 4.8.1 - test - diff --git a/src/main/java/META-INF/persistence.xml b/src/main/java/META-INF/persistence.xml deleted file mode 100644 index 90f7b2b..0000000 --- a/src/main/java/META-INF/persistence.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - org.apache.openjpa.persistence.PersistenceProviderImpl - com.sencha.gxt.examples.resources.server.data.Folder - com.sencha.gxt.examples.resources.server.data.Music - - - - - - - - - - - diff --git a/src/main/java/com/sencha/gxt/desktop/Desktop.gwt.xml b/src/main/java/com/sencha/gxt/desktop/Desktop.gwt.xml index 0c10a3f..8edb6cb 100644 --- a/src/main/java/com/sencha/gxt/desktop/Desktop.gwt.xml +++ b/src/main/java/com/sencha/gxt/desktop/Desktop.gwt.xml @@ -15,4 +15,7 @@ + + + diff --git a/src/main/java/com/sencha/gxt/desktopapp/DesktopApp.gwt.xml b/src/main/java/com/sencha/gxt/desktopapp/DesktopApp.gwt.xml index 2241d65..d75801b 100644 --- a/src/main/java/com/sencha/gxt/desktopapp/DesktopApp.gwt.xml +++ b/src/main/java/com/sencha/gxt/desktopapp/DesktopApp.gwt.xml @@ -26,4 +26,7 @@ + + + diff --git a/src/main/java/com/sencha/gxt/examples/resources/Resources.gwt.xml b/src/main/java/com/sencha/gxt/examples/resources/Resources.gwt.xml index 32f3461..e3fe6c4 100644 --- a/src/main/java/com/sencha/gxt/examples/resources/Resources.gwt.xml +++ b/src/main/java/com/sencha/gxt/examples/resources/Resources.gwt.xml @@ -10,4 +10,7 @@ + + + \ No newline at end of file