Author: dongxu Date: Thu Sep 12 02:51:39 2013 New Revision: 1522150 URL: http://svn.apache.org/r1522150 Log: As the FetchFolders RequestFactory, but can not run correctly. Maybe the procedure is wrong somewhere.
Added: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/IMAPFolderProxy.java Removed: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/IMAPFolderService.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/ImapFolderService.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/IMAPFolderRequestContext.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/InMemoryIMAPStoreCache.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java?rev=1522150&r1=1522149&r2=1522150&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java Thu Sep 12 02:51:39 2013 @@ -140,7 +140,6 @@ import com.google.gwt.user.client.ui.Foc import com.google.gwt.user.client.ui.HasValue; import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; -import com.google.inject.Provider; public class LoginActivity extends AbstractActivity { @@ -292,6 +291,9 @@ public class LoginActivity extends Abstr display.setLoading(true); <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> As the FetchFolders RequestFactory, but can not run correctly. // HupaRequestFactory rf = GWT.create(HupaRequestFactory.class); // rf.initialize(eventBus); // UserRequest userRequest = rf.userRequest(); @@ -311,8 +313,11 @@ public class LoginActivity extends Abstr +<<<<<<< HEAD ======= >>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter +======= +>>>>>>> As the FetchFolders RequestFactory, but can not run correctly. dispatcher.execute(new LoginUser(user, pass), new HupaEvoCallback<LoginUserResult>(dispatcher, eventBus, display) { public void callback(LoginUserResult result) { @@ -371,6 +376,7 @@ public class LoginActivity extends Abstr } }); +<<<<<<< HEAD ======= Window.alert("failure"); // LoginActivity.this.placeController.goTo(newGoToPlaceProvider.get()); @@ -384,6 +390,8 @@ public class LoginActivity extends Abstr } }); >>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter +======= +>>>>>>> As the FetchFolders RequestFactory, but can not run correctly. } /** Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java?rev=1522150&r1=1522149&r2=1522150&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java Thu Sep 12 02:51:39 2013 @@ -310,6 +310,9 @@ import org.apache.hupa.client.evo.HupaEv import org.apache.hupa.client.place.IMAPMessagePlace; import org.apache.hupa.client.place.MailFolderPlace; import org.apache.hupa.client.place.MessageSendPlace; +import org.apache.hupa.client.rf.HupaRequestFactory; +import org.apache.hupa.client.rf.IMAPFolderProxy; +import org.apache.hupa.client.rf.IMAPFolderRequestContext; import org.apache.hupa.client.ui.WidgetContainerDisplayable; import org.apache.hupa.client.widgets.HasDialog; import org.apache.hupa.client.widgets.IMAPTreeItem; @@ -344,8 +347,6 @@ import org.apache.hupa.shared.events.Sen import org.apache.hupa.shared.events.SentMessageEventHandler; import org.apache.hupa.shared.rpc.CreateFolder; import org.apache.hupa.shared.rpc.DeleteFolder; -import org.apache.hupa.shared.rpc.FetchFolders; -import org.apache.hupa.shared.rpc.FetchFoldersResult; import org.apache.hupa.shared.rpc.GenericResult; <<<<<<< HEAD >>>>>>> Change to new mvp framework - first step @@ -381,6 +382,7 @@ import com.google.gwt.user.client.ui.Tre import com.google.inject.Inject; import com.google.inject.Provider; <<<<<<< HEAD +<<<<<<< HEAD import com.google.web.bindery.requestfactory.shared.Receiver; ======= import com.google.gwt.event.dom.client.HasClickHandlers; @@ -393,6 +395,9 @@ import com.google.inject.Inject; >>>>>>> Change to new mvp framework - first step ======= >>>>>>> +======= +import com.google.web.bindery.requestfactory.shared.Receiver; +>>>>>>> As the FetchFolders RequestFactory, but can not run correctly. public class WestActivity extends AbstractActivity { @@ -516,6 +521,9 @@ public class WestActivity extends Abstra protected void loadTreeItems() { display.setLoadingFolders(true); <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> As the FetchFolders RequestFactory, but can not run correctly. HupaRequestFactory rf = GWT.create(HupaRequestFactory.class); rf.initialize(eventBus); @@ -532,7 +540,12 @@ public class WestActivity extends Abstra @Override public void onSuccess(List<IMAPFolderProxy> response) { +<<<<<<< HEAD display.bindTreeItems(createTreeNodes(response)); +======= +System.out.println("1111111"+response); + display.bindTreeItems(null); +>>>>>>> As the FetchFolders RequestFactory, but can not run correctly. // // disable display.getDeleteEnable().setEnabled(false); display.getRenameEnable().setEnabled(false); @@ -553,6 +566,7 @@ public class WestActivity extends Abstra // } // }); +<<<<<<< HEAD ======= dispatcher.execute(new FetchFolders(), new HupaEvoCallback<FetchFoldersResult>(dispatcher, eventBus, display) { public void callback(FetchFoldersResult result) { @@ -565,6 +579,8 @@ public class WestActivity extends Abstra } }); >>>>>>> Change to new mvp framework - first step +======= +>>>>>>> As the FetchFolders RequestFactory, but can not run correctly. } /** Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java?rev=1522150&r1=1522149&r2=1522150&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java Thu Sep 12 02:51:39 2013 @@ -70,5 +70,10 @@ public interface HupaRequestFactory exte >>>>>>> As the FetchFolders RequestFactory, but can not run correctly. ======= SubjectRequest subjectRequest(); +<<<<<<< HEAD >>>>>>> first commit +======= + UserRequest userRequest(); + IMAPFolderRequestContext folderRequest(); +>>>>>>> As the FetchFolders RequestFactory, but can not run correctly. } \ No newline at end of file Added: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/IMAPFolderProxy.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/IMAPFolderProxy.java?rev=1522150&view=auto ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/IMAPFolderProxy.java (added) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/IMAPFolderProxy.java Thu Sep 12 02:51:39 2013 @@ -0,0 +1,15 @@ +package org.apache.hupa.client.rf; + +import java.util.List; + +import org.apache.hupa.shared.data.IMAPFolder; + +import com.google.web.bindery.requestfactory.shared.EntityProxy; +import com.google.web.bindery.requestfactory.shared.ProxyFor; + +@ProxyFor(IMAPFolder.class) +public interface IMAPFolderProxy extends EntityProxy { +// List<IMAPFolder> requestFolders(); + Long getId(); + Long getVersion(); +} Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/IMAPFolderRequestContext.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/IMAPFolderRequestContext.java?rev=1522150&r1=1522149&r2=1522150&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/IMAPFolderRequestContext.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/IMAPFolderRequestContext.java Thu Sep 12 02:51:39 2013 @@ -3,7 +3,10 @@ package org.apache.hupa.client.rf; import java.util.List; import org.apache.hupa.server.service.IMAPFolderService; +<<<<<<< HEAD import org.apache.hupa.shared.proxy.IMAPFolderProxy; +======= +>>>>>>> As the FetchFolders RequestFactory, but can not run correctly. import com.google.web.bindery.requestfactory.shared.Request; import com.google.web.bindery.requestfactory.shared.RequestContext; Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/InMemoryIMAPStoreCache.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/InMemoryIMAPStoreCache.java?rev=1522150&r1=1522149&r2=1522150&view=diff ============================================================================== --- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/InMemoryIMAPStoreCache.java (original) +++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/InMemoryIMAPStoreCache.java Thu Sep 12 02:51:39 2013 @@ -162,9 +162,13 @@ public class InMemoryIMAPStoreCache impl try { cstore.getStore().connect(address, port, username, password); <<<<<<< HEAD +<<<<<<< HEAD System.out.println(address +"ImMemory"+ port); ======= >>>>>>> first commit +======= + System.out.println(address +"ImMemory"+ port); +>>>>>>> As the FetchFolders RequestFactory, but can not run correctly. } catch (MessagingException e) { throw (e); } Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java?rev=1522150&r1=1522149&r2=1522150&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java Thu Sep 12 02:51:39 2013 @@ -22,11 +22,20 @@ package org.apache.hupa.shared.data; import java.io.Serializable; import java.util.ArrayList; <<<<<<< HEAD +<<<<<<< HEAD import java.util.List; import org.apache.hupa.shared.rf.EntityBase; ======= >>>>>>> first commit +======= +import java.util.List; +import java.util.Properties; + +import javax.servlet.http.HttpSession; + +import com.google.web.bindery.requestfactory.server.RequestFactoryServlet; +>>>>>>> As the FetchFolders RequestFactory, but can not run correctly. /** * IMAPFolder @@ -60,9 +69,36 @@ public class IMAPFolder extends EntityBa /** ======= public class IMAPFolder implements Serializable { +<<<<<<< HEAD /** >>>>>>> first commit +======= + + private Long id; + private Long version; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getVersion() { + return version; + } + + public void setVersion(Long version) { + this.version = version; + } + + + + /** +>>>>>>> As the FetchFolders RequestFactory, but can not run correctly. * */ private static final long serialVersionUID = 2084188092060266479L; --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org