Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' of https://github.com/eclipse/orion.server 
Conflicts:
	releng/org.eclipse.orion.releng/maps/orion.map
  • Loading branch information
@sirnewton01
sirnewton01 committed Jan 31, 2014
2 parents 8d2b1bd + 8c16559 commit 6c7d91b
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 9 deletions.
35 changes: 34 additions & 1 deletion ...r.core/src/org/eclipse/orion/internal/server/core/metastore/SimpleMetaStoreMigration.java
View file
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2013 IBM Corporation and others.
* Copyright (c) 2013, 2014 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
Expand Down Expand Up @@ -350,6 +350,19 @@ private Map<String, Map<String, String>> getMetadataFromSecureStorage(File orion
if (emailConfirmation != null) {
propertyMap.put("email_confirmation", emailConfirmation);
}
ISecurePreferences generalUserProfile = userProfileNode.node("profile/general");
if (generalUserProfile != null && generalUserProfile.get("lastlogintimestamp", null) != null) {
String lastlogintimestamp = generalUserProfile.get("lastlogintimestamp", "");
propertyMap.put("lastlogintimestamp", lastlogintimestamp);
}
if (generalUserProfile != null && generalUserProfile.get("GitName", null) != null) {
String gitName = generalUserProfile.get("GitName", "");
propertyMap.put("GitName", gitName);
}
if (generalUserProfile != null && generalUserProfile.get("GitMail", null) != null) {
String gitMail = generalUserProfile.get("GitMail", "");
propertyMap.put("GitMail", gitMail);
}

if (userProfileNode.nodeExists("properties")) {
JSONObject profileProperties = new JSONObject();
Expand Down Expand Up @@ -550,6 +563,26 @@ private JSONObject getUserJSONfromProperties(Map<String, String> userProperties,
String secureStoragePassword = usersSecureStorageProperties.get("password");
userJSON.put("password", secureStoragePassword);
}
if (usersSecureStorageProperties != null && usersSecureStorageProperties.containsKey("lastlogintimestamp")) {
String lastlogintimestamp = usersSecureStorageProperties.get("lastlogintimestamp");
userJSON.put("lastlogintimestamp", lastlogintimestamp);
}
if (usersSecureStorageProperties != null && usersSecureStorageProperties.containsKey("GitName")) {
String gitName = usersSecureStorageProperties.get("GitName");
userJSON.put("GitName", gitName);
}
if (usersSecureStorageProperties != null && usersSecureStorageProperties.containsKey("GitMail")) {
String gitMail = usersSecureStorageProperties.get("GitMail");
userJSON.put("GitMail", gitMail);
}
if (usersSecureStorageProperties != null && usersSecureStorageProperties.containsKey("blocked")) {
String blocked = usersSecureStorageProperties.get("blocked");
userJSON.put("blocked", blocked);
}
if (usersSecureStorageProperties != null && usersSecureStorageProperties.containsKey("email_confirmation")) {
String email_confirmation = usersSecureStorageProperties.get("email_confirmation");
userJSON.put("email_confirmation", email_confirmation);
}
userJSON.put("WorkspaceIds", new JSONArray());
if (usersSecureStorageProperties != null && usersSecureStorageProperties.containsKey("profileProperties")) {
String secureStorageProfileProperties = usersSecureStorageProperties.get("profileProperties");
Expand Down
16 changes: 8 additions & 8 deletions releng/org.eclipse.orion.releng/maps/orion.map
View file
@@ -1,16 +1,16 @@
#client
plugin@org.eclipse.orion.client.core=GIT,tag=v20140127-2129,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.client.git,path=bundles/org.eclipse.orion.client.core
plugin@org.eclipse.orion.client.ui=GIT,tag=v20140130-1824,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.client.git,path=bundles/org.eclipse.orion.client.ui
plugin@org.eclipse.orion.client.editor=GIT,tag=v20140130-1713,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.client.git,path=bundles/org.eclipse.orion.client.editor
plugin@org.eclipse.orion.client.core=GIT,tag=v20140130-2120,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.client.git,path=bundles/org.eclipse.orion.client.core
plugin@org.eclipse.orion.client.ui=GIT,tag=v20140130-2342,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.client.git,path=bundles/org.eclipse.orion.client.ui
plugin@org.eclipse.orion.client.editor=GIT,tag=v20140130-2302,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.client.git,path=bundles/org.eclipse.orion.client.editor
plugin@org.eclipse.orion.client.users=GIT,tag=v20131101-1801,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.client.git,path=bundles/org.eclipse.orion.client.users
plugin@org.eclipse.orion.client.git=GIT,tag=v20140130-1824,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.client.git,path=bundles/org.eclipse.orion.client.git
plugin@org.eclipse.orion.client.cf=GIT,tag=v20140124-1423,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.client.git,path=bundles/org.eclipse.orion.client.cf
plugin@org.eclipse.orion.client.javascript=GIT,tag=v20140129-1852,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.client.git,path=bundles/org.eclipse.orion.client.javascript
plugin@org.eclipse.orion.client.git=GIT,tag=v20140130-2302,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.client.git,path=bundles/org.eclipse.orion.client.git
plugin@org.eclipse.orion.client.cf=GIT,tag=v20140130-2302,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.client.git,path=bundles/org.eclipse.orion.client.cf
plugin@org.eclipse.orion.client.javascript=GIT,tag=v20140130-2302,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.client.git,path=bundles/org.eclipse.orion.client.javascript
plugin@org.eclipse.orion.client.golang=GIT,tag=v20140129-1852,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.client.git,path=bundles/org.eclipse.orion.client.golang

#server
plugin@org.eclipse.orion.launching=GIT,tag=v20110309-2156,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.launching
plugin@org.eclipse.orion.server.core=GIT,tag=v20140130-0053,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.server.core
plugin@org.eclipse.orion.server.core=GIT,tag=v20140131-0053,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.server.core
plugin@org.eclipse.orion.server.servlets=GIT,tag=v20140130-0053,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.server.servlets
plugin@org.eclipse.orion.server.configurator=GIT,tag=v20131216-1734,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.server.configurator
plugin@org.eclipse.orion.server.basicauth=GIT,tag=v20110309-2156,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.server.basicauth
Expand All @@ -20,7 +20,7 @@ plugin@org.eclipse.orion.server.cf=GIT,tag=v20140130-1208,repo=git://git.eclipse
plugin@org.eclipse.orion.server.sshconfig.userprofile=GIT,tag=v20110420-1839,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.server.sshconfig.userprofile
plugin@org.eclipse.orion.server.user.securestorage=GIT,tag=v20131108-1929,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.server.user.securestorage
plugin@org.eclipse.orion.server.useradmin=GIT,tag=v20131112-1929,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.server.useradmin
plugin@org.eclipse.orion.server.useradmin.simple=GIT,tag=v20140121-2227,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.server.useradmin.simple
plugin@org.eclipse.orion.server.useradmin.simple=GIT,tag=v20140130-1914,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.server.useradmin.simple
plugin@org.eclipse.orion.server.useradmin.xml=GIT,tag=v20110412-0931,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.server.useradmin.xml
plugin@org.eclipse.orion.server.search=GIT,tag=v20131216-2037,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.server.search
fragment@org.eclipse.orion.server.logback.config=GIT,tag=v20140121-2236,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.server.logback.config
Expand Down

0 comments on commit 6c7d91b

Please sign in to comment.