Author: manolo
Date: Sat Mar 24 09:12:08 2012
New Revision: 1304734
URL: http://svn.apache.org/viewvc?rev=1304734&view=rev
Log:
Remove last snapshot dependency: fixes HUPA-49. Run app in standard instead of
quirks mode. Remove libraries which only are needed during compilation & test
phases from the final distribution file (reduced size about 30M).
Modified:
james/hupa/trunk/client/pom.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/gin/HupaClientModule.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/place/HupaPlaceManager.java
james/hupa/trunk/client/src/main/webapp/Hupa.html
james/hupa/trunk/pom.xml
Modified: james/hupa/trunk/client/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/pom.xml?rev=1304734&r1=1304733&r2=1304734&view=diff
==============================================================================
--- james/hupa/trunk/client/pom.xml (original)
+++ james/hupa/trunk/client/pom.xml Sat Mar 24 09:12:08 2012
@@ -225,6 +225,28 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.5</version>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/webapp</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java?rev=1304734&r1=1304733&r2=1304734&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java
(original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java Sat
Mar 24 09:12:08 2012
@@ -23,16 +23,46 @@ import net.customware.gwt.presenter.clie
import org.apache.hupa.client.gin.HupaGinjector;
import org.apache.hupa.client.mvp.AppPresenter;
+import org.apache.hupa.client.rf.HupaRequestFactory;
+import org.apache.hupa.client.rf.SubjectProxy;
+import org.apache.hupa.client.rf.SubjectRequest;
import com.google.gwt.core.client.EntryPoint;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.ui.RootPanel;
+import com.google.web.bindery.requestfactory.shared.Receiver;
public class Hupa implements EntryPoint{
private final HupaGinjector injector = GWT.create(HupaGinjector.class);
public void onModuleLoad() {
+
+// HupaRequestFactory rf = injector.getRequestFactory();
+//
+// SubjectRequest req = rf.subjectRequest();
+// SubjectProxy t = req.create(SubjectProxy.class);
+// t.setTitle("New-Subject");
+// req.echo(t, "from_manolo", "to_james").fire(new Receiver<String>() {
+// public void onSuccess(String response) {
+// System.out.println(response);
+// }
+// });
+//
+// req = rf.subjectRequest();
+// t = req.create(SubjectProxy.class);
+// t.setTitle("New-Subject");
+// req.persist().using(t);
+// req.countSubjects().to(new Receiver<Long>() {
+// public void onSuccess(Long response) {
+// System.out.println(response);
+// }
+// }).fire();
+//
+//
+// if(true) return;
+
+
// remove the loading message from the browser
com.google.gwt.user.client.Element loading =
DOM.getElementById("loading");
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/gin/HupaClientModule.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/gin/HupaClientModule.java?rev=1304734&r1=1304733&r2=1304734&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/gin/HupaClientModule.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/gin/HupaClientModule.java
Sat Mar 24 09:12:08 2012
@@ -22,7 +22,9 @@ package org.apache.hupa.client.gin;
import net.customware.gwt.presenter.client.DefaultEventBus;
import net.customware.gwt.presenter.client.EventBus;
import net.customware.gwt.presenter.client.gin.AbstractPresenterModule;
+import net.customware.gwt.presenter.client.place.ParameterTokenFormatter;
import net.customware.gwt.presenter.client.place.PlaceManager;
+import net.customware.gwt.presenter.client.place.TokenFormatter;
import org.apache.hupa.client.CachingDispatchAsync;
import org.apache.hupa.client.dnd.PagingScrollTableRowDragController;
@@ -59,6 +61,7 @@ public class HupaClientModule extends Ab
protected void configure() {
bind(EventBus.class).to(DefaultEventBus.class).in(Singleton.class);
bind(PlaceManager.class).to(HupaPlaceManager.class);
+
bind(TokenFormatter.class).to(ParameterTokenFormatter.class).in(Singleton.class);
bindPresenter(LoginPresenter.class,LoginPresenter.Display.class,
LoginView.class);
bindPresenter(IMAPMessageListPresenter.class,IMAPMessageListPresenter.Display.class,IMAPMessageListView.class);
bindPresenter(IMAPMessagePresenter.class,IMAPMessagePresenter.Display.class,IMAPMessageView.class);
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/place/HupaPlaceManager.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/place/HupaPlaceManager.java?rev=1304734&r1=1304733&r2=1304734&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/place/HupaPlaceManager.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/place/HupaPlaceManager.java
Sat Mar 24 09:12:08 2012
@@ -19,10 +19,11 @@
package org.apache.hupa.client.mvp.place;
-import com.google.inject.Inject;
-
import net.customware.gwt.presenter.client.EventBus;
import net.customware.gwt.presenter.client.place.DefaultPlaceManager;
+import net.customware.gwt.presenter.client.place.TokenFormatter;
+
+import com.google.inject.Inject;
/**
* PlaceManager implementation for Hupa
@@ -30,10 +31,9 @@ import net.customware.gwt.presenter.clie
*
*/
public class HupaPlaceManager extends DefaultPlaceManager{
-
@Inject
- public HupaPlaceManager(EventBus eventBus, LoginPresenterPlace
loginPresenterPlace, IMAPMessageListPresenterPlace messageListPresenterPlace,
IMAPMessagePresenterPlace imapMessagePresenterPlace, MessageSendPresenterPlace
sendPresenterPlace, ContactsPresenterPlace contactsPresenterPlace) {
- super(eventBus, loginPresenterPlace, messageListPresenterPlace,
imapMessagePresenterPlace, sendPresenterPlace, contactsPresenterPlace);
+ public HupaPlaceManager(EventBus eventBus, TokenFormatter tokenFormatter,
LoginPresenterPlace loginPresenterPlace, IMAPMessageListPresenterPlace
messageListPresenterPlace, IMAPMessagePresenterPlace imapMessagePresenterPlace,
MessageSendPresenterPlace sendPresenterPlace, ContactsPresenterPlace
contactsPresenterPlace) {
+ super(eventBus, tokenFormatter, loginPresenterPlace,
messageListPresenterPlace, imapMessagePresenterPlace, sendPresenterPlace,
contactsPresenterPlace);
}
}
Modified: james/hupa/trunk/client/src/main/webapp/Hupa.html
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/Hupa.html?rev=1304734&r1=1304733&r2=1304734&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/webapp/Hupa.html (original)
+++ james/hupa/trunk/client/src/main/webapp/Hupa.html Sat Mar 24 09:12:08 2012
@@ -13,7 +13,7 @@
the specific language governing permissions and limitations under the
License.
-->
-<!DOCTYPE>
+<!DOCTYPE HTML>
<html>
<head>
Modified: james/hupa/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/pom.xml?rev=1304734&r1=1304733&r2=1304734&view=diff
==============================================================================
--- james/hupa/trunk/pom.xml (original)
+++ james/hupa/trunk/pom.xml Sat Mar 24 09:12:08 2012
@@ -83,6 +83,7 @@
<groupId>org.apache.hupa</groupId>
<artifactId>hupa-widgets</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -103,6 +104,7 @@
<groupId>org.cobogw.gwt</groupId>
<artifactId>cobogw</artifactId>
<version>1.3</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>net.customware.gwt.dispatch</groupId>
@@ -119,6 +121,7 @@
<groupId>com.google.gwt.inject</groupId>
<artifactId>gin</artifactId>
<version>1.5.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
@@ -128,7 +131,8 @@
<dependency>
<groupId>net.customware.gwt.presenter</groupId>
<artifactId>gwt-presenter</artifactId>
- <version>1.1.0-replace-SNAPSHOT</version>
+ <version>1.1.1</version>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>com.google.gwt.inject</groupId>
@@ -140,16 +144,20 @@
<groupId>com.google.gwt</groupId>
<artifactId>gwt-incubator</artifactId>
<version>20101117-r1766</version>
+ <!-- For some reason incubator is needed in the default scope
although we dont need it in the server side -->
+ <!-- <scope>provided</scope> -->
</dependency>
<dependency>
<groupId>com.google.code.gwt-dnd</groupId>
<artifactId>gwt-dnd</artifactId>
<version>3.1.1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>eu.maydu.gwt</groupId>
<artifactId>gwt-vl</artifactId>
<version>0.9a</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.googlecode.gwtupload</groupId>
@@ -167,19 +175,6 @@
<version>2.0.1</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.guice</groupId>
<artifactId>guice</artifactId>
<version>3.0</version>
@@ -210,7 +205,7 @@
<groupId>com.google.gwt</groupId>
<artifactId>gwt-dev</artifactId>
<version>${gwtVersion}</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.json</groupId>
@@ -245,7 +240,7 @@
<artifactId>validation-api</artifactId>
<version>1.0.0.GA</version>
<classifier>sources</classifier>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>aopalliance</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
