This repository has been archived by the owner on Nov 9, 2017. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
rhbz833639 Remove editor clients on GWTEventService timeout
- Loading branch information
Showing
12 changed files
with
175 additions
and
19 deletions.
There are no files selected for viewing
56 changes: 56 additions & 0 deletions
56
zanata-war/src/main/java/org/zanata/eventservice/SequentialConnectionIdGenerator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| /* | ||
| * Copyright 2012, Red Hat, Inc. and individual contributors | ||
| * as indicated by the @author tags. See the copyright.txt file in the | ||
| * distribution for a full listing of individual contributors. | ||
| * | ||
| * This is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU Lesser General Public License as | ||
| * published by the Free Software Foundation; either version 2.1 of | ||
| * the License, or (at your option) any later version. | ||
| * | ||
| * This software is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this software; if not, write to the Free | ||
| * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| * 02110-1301 USA, or see the FSF site: http://www.fsf.org. | ||
| */ | ||
|
|
||
| package org.zanata.eventservice; | ||
|
|
||
| import javax.servlet.http.HttpServletRequest; | ||
|
|
||
| import lombok.Synchronized; | ||
|
|
||
| import de.novanic.eventservice.service.connection.id.ConnectionIdGenerator; | ||
|
|
||
| /** | ||
| * @author Sean Flanigan <a href="mailto:sflaniga@redhat.com">sflaniga@redhat.com</a> | ||
| * | ||
| */ | ||
| public class SequentialConnectionIdGenerator implements ConnectionIdGenerator | ||
| { | ||
| private static long nextConnectionNum = 0; | ||
|
|
||
| @Synchronized | ||
| private static long generateConnectionNum() | ||
| { | ||
| return nextConnectionNum++; | ||
| } | ||
|
|
||
| @Override | ||
| public String generateConnectionId(HttpServletRequest aRequest) | ||
| { | ||
| return String.valueOf(aRequest.getSession(true).getId() + "-" + generateConnectionNum()); | ||
| } | ||
|
|
||
| @Override | ||
| public String getConnectionId(HttpServletRequest aRequest) | ||
| { | ||
| return aRequest.getParameter("id"); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
zanata-war/src/main/java/org/zanata/webtrans/server/rpc/EventServiceConnectedHandler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| package org.zanata.webtrans.server.rpc; | ||
|
|
||
| import net.customware.gwt.dispatch.server.ExecutionContext; | ||
| import net.customware.gwt.dispatch.shared.ActionException; | ||
|
|
||
| import org.jboss.seam.ScopeType; | ||
| import org.jboss.seam.annotations.In; | ||
| import org.jboss.seam.annotations.Name; | ||
| import org.jboss.seam.annotations.Scope; | ||
| import org.zanata.security.ZanataIdentity; | ||
| import org.zanata.webtrans.server.ActionHandlerFor; | ||
| import org.zanata.webtrans.server.TranslationWorkspace; | ||
| import org.zanata.webtrans.server.TranslationWorkspaceManager; | ||
| import org.zanata.webtrans.shared.rpc.EventServiceConnectedAction; | ||
| import org.zanata.webtrans.shared.rpc.NoOpResult; | ||
|
|
||
| @Name("webtrans.gwt.ActivateEventServiceHandler") | ||
| @Scope(ScopeType.STATELESS) | ||
| @ActionHandlerFor(EventServiceConnectedAction.class) | ||
| public class EventServiceConnectedHandler extends AbstractActionHandler<EventServiceConnectedAction, NoOpResult> | ||
| { | ||
|
|
||
| @In | ||
| TranslationWorkspaceManager translationWorkspaceManager; | ||
|
|
||
| @Override | ||
| public NoOpResult execute(EventServiceConnectedAction action, ExecutionContext context) throws ActionException | ||
| { | ||
| ZanataIdentity.instance().checkLoggedIn(); | ||
| TranslationWorkspace workspace = translationWorkspaceManager.getOrRegisterWorkspace(action.getWorkspaceId()); | ||
| workspace.onEventServiceConnected(action.getEditorClientId(), action.getConnectionId()); | ||
| return new NoOpResult(); | ||
| } | ||
|
|
||
| @Override | ||
| public void rollback(EventServiceConnectedAction action, NoOpResult result, ExecutionContext context) throws ActionException | ||
| { | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/EventServiceConnectedAction.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| package org.zanata.webtrans.shared.rpc; | ||
|
|
||
|
|
||
| public class EventServiceConnectedAction extends AbstractWorkspaceAction<NoOpResult> | ||
| { | ||
|
|
||
| private static final long serialVersionUID = 1L; | ||
| private String connectionId; | ||
|
|
||
| @SuppressWarnings("unused") | ||
| private EventServiceConnectedAction() | ||
| { | ||
| } | ||
|
|
||
| public EventServiceConnectedAction(String connectionId) | ||
| { | ||
| this.connectionId = connectionId; | ||
| } | ||
|
|
||
| public String getConnectionId() | ||
| { | ||
| return connectionId; | ||
| } | ||
|
|
||
| } |
1 change: 1 addition & 0 deletions
1
zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/ExitWorkspaceResult.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PublishWorkspaceChatResult.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitEditResult.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters