Revision 3375 org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.lib/org.gvsig.vcsgis.lib.impl/src/main/java/org/gvsig/vcsgis/lib/workspace/VCSGisWorkspaceImpl.java

View differences:

VCSGisWorkspaceImpl.java
17 17
import javax.json.JsonObject;
18 18
import org.apache.commons.collections.CollectionUtils;
19 19
import org.apache.commons.lang3.StringUtils;
20
import org.apache.commons.lang3.mutable.MutableBoolean;
21
import org.apache.commons.lang3.mutable.MutableInt;
22 20
import org.apache.commons.lang3.mutable.MutableLong;
23 21
import org.apache.commons.lang3.mutable.MutableObject;
24 22
import org.gvsig.expressionevaluator.ExpressionBuilder;
......
72 70
import static org.gvsig.vcsgis.lib.VCSGisManager.ERR_CANT_ADD_CHANGE;
73 71
import static org.gvsig.vcsgis.lib.VCSGisManager.ERR_CANT_AUTHENTICATE_USER;
74 72
import static org.gvsig.vcsgis.lib.VCSGisManager.ERR_CANT_COMMIT;
73
import static org.gvsig.vcsgis.lib.VCSGisManager.ERR_CANT_EXECUTE_REQUEST;
75 74
import static org.gvsig.vcsgis.lib.VCSGisManager.ERR_CANT_INSERT_CHANGE;
76 75
import static org.gvsig.vcsgis.lib.VCSGisManager.ERR_CANT_INSERT_FEATURES;
77 76
import static org.gvsig.vcsgis.lib.VCSGisManager.ERR_CANT_OPEN_CHANGES;
......
112 111
import org.gvsig.vcsgis.lib.VCSGisRuntimeException;
113 112
import org.gvsig.vcsgis.lib.VCSGisTopologyPlan;
114 113
import org.gvsig.vcsgis.lib.VCSGisUser;
114
import org.gvsig.vcsgis.lib.VCSGisUserIdentificationRequester;
115 115
import org.gvsig.vcsgis.lib.VCSGisUtils;
116 116
import org.gvsig.vcsgis.lib.repository.VCSGisRepository;
117 117
import org.gvsig.vcsgis.lib.repository.VCSGisRepositoryChange;
118 118
import org.gvsig.vcsgis.lib.repository.VCSGisRepositoryData;
119 119
import org.gvsig.vcsgis.lib.repository.localdb.VCSGisRepositoryLocaldb;
120 120
import org.gvsig.vcsgis.lib.repository.localdb.tables.EntitiesRepoTable;
121
import org.gvsig.vcsgis.lib.repository.requests.VCSGisAuthenticateRequest;
121 122
import org.gvsig.vcsgis.lib.repository.requests.VCSGisCheckoutRequest;
122 123
import org.gvsig.vcsgis.lib.repository.requests.VCSGisCommitRequest;
123 124
import org.gvsig.vcsgis.lib.repository.requests.VCSGisEntitiesRequest;
124 125
import org.gvsig.vcsgis.lib.repository.requests.VCSGisHistoryRequest;
126
import org.gvsig.vcsgis.lib.repository.requests.VCSGisRequest;
127
import org.gvsig.vcsgis.lib.repository.requests.VCSGisTopologyPlansRequest;
125 128
import org.gvsig.vcsgis.lib.repository.requests.VCSGisUpdateRequest;
129
import org.gvsig.vcsgis.lib.repository.requests.VCSGisUsersRequest;
126 130
import org.gvsig.vcsgis.lib.workspace.tables.EntitiesTable;
127 131
import org.gvsig.vcsgis.lib.workspace.tables.EntitiesTable.EntityRow;
128 132
import org.gvsig.vcsgis.lib.workspace.tables.LocalRevisionsTable;
......
130 134
import org.gvsig.vcsgis.lib.workspace.tables.RemoteChangesTable;
131 135
import static org.gvsig.vcsgis.lib.workspace.tables.RemoteChangesTable.COD_ENTITY;
132 136
import org.gvsig.vcsgis.lib.workspace.tables.RemoteChangesTable.RemoteChangeRow;
137
import org.gvsig.vcsgis.lib.workspace.tables.TopologyplanTable;
138
import org.gvsig.vcsgis.lib.workspace.tables.UsersTable;
133 139
import org.gvsig.vcsgis.lib.workspace.tables.VarsTable;
134 140
import org.gvsig.vcsgis.lib.workspace.tables.WorkspaceChangesTable;
135 141
import org.gvsig.vcsgis.lib.workspace.tables.WorkspaceChangesTable.WorkspaceChangeRow;
136 142
import org.slf4j.Logger;
137 143
import org.slf4j.LoggerFactory;
138
import org.gvsig.vcsgis.lib.VCSGisUserIdentificationRequester;
139
import org.gvsig.vcsgis.lib.repository.requests.VCSGisAuthenticateRequest;
140
import org.gvsig.vcsgis.lib.repository.requests.VCSGisRequest;
141
import org.gvsig.vcsgis.lib.repository.requests.VCSGisTopologyPlansRequest;
142
import org.gvsig.vcsgis.lib.repository.requests.VCSGisUsersRequest;
143
import org.gvsig.vcsgis.lib.workspace.tables.TopologyplanTable;
144
import org.gvsig.vcsgis.lib.workspace.tables.UsersTable;
145 144

  
146 145
/**
147 146
 *
......
3068 3067
            varsTable.set(this,"AUTHENTICATIONTOKEN",request.getAuthenticationToken());
3069 3068
            this.currentUser = request.getUserCode();
3070 3069
            this.authenticationToken = request.getAuthenticationToken();
3070
            this.getRepository().setAuthenticationToken(request.getAuthenticationToken());
3071
            this.getRepository().setUserCode(request.getUserCode());
3072
            
3071 3073
            status.message("Authentication completed");
3072 3074
            status.terminate();
3073 3075
            return ERR_OK;

Also available in: Unified diff