Merge branch 'master' of ssh://dev.eclipse.org/gitroot/e4/org.eclipse…

….orion.server
subtleGradient · Jan 28, 2011 · fe7cf40 · fe7cf40
2 parents d4af134 + 2cacdb9
commit fe7cf40
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/bundles/org.eclipse.orion.server.user.securestorage/META-INF/MANIFEST.MF b/bundles/org.eclipse.orion.server.user.securestorage/META-INF/MANIFEST.MF
@@ -13,5 +13,6 @@ Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.orion.server.useradmin;bundle-version="0.1.0",
  org.eclipse.core.runtime;bundle-version="3.6.100",
  org.eclipse.orion.server.core;bundle-version="0.1.0",
- org.eclipse.equinox.security;bundle-version="1.1.0"
+ org.eclipse.equinox.security;bundle-version="1.1.0",
+ org.eclipse.orion.server.servlets;bundle-version="0.1.0"
 Export-Package: org.eclipse.orion.internal.server.user.securestorage;x-internal:=true
diff --git a/...rage/src/org/eclipse/orion/internal/server/user/securestorage/SecureStorageUserAdmin.java b/...rage/src/org/eclipse/orion/internal/server/user/securestorage/SecureStorageUserAdmin.java
@@ -10,6 +10,12 @@
  *******************************************************************************/
 package org.eclipse.orion.internal.server.user.securestorage;
 
+import org.eclipse.orion.server.useradmin.servlets.UserServlet;
+
+import org.eclipse.core.runtime.CoreException;
+
+import org.eclipse.orion.internal.server.servlets.workspace.authorization.AuthorizationService;
+
 import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -67,6 +73,12 @@ private void initStorage() {
 		String adminDefaultPassword = System.getProperty(Activator.ORION_STORAGE_ADMIN_DEFAULT_PASSWORD, null);
 		if (adminDefaultPassword != null && getUser(USER_LOGIN, ADMIN_LOGIN_VALUE) == null) {
 			createUser(new User(ADMIN_LOGIN_VALUE, ADMIN_NAME_VALUE, adminDefaultPassword));
+			try {
+				AuthorizationService.addUserRight(ADMIN_LOGIN_VALUE, UserServlet.USERS_URI);
+				AuthorizationService.addUserRight(ADMIN_LOGIN_VALUE, UserServlet.USERS_URI +"/*"); //$NON-NLS-1$
+			} catch (CoreException e) {
+				LogHelper.log(e);
+			}
 		}
 		//add default roles
 		for (String role : new String[] {"admin", "user", "quest"}) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

diff --git a/releng/org.eclipse.orion.releng/maps/orion.map b/releng/org.eclipse.orion.releng/maps/orion.map
@@ -16,7 +16,7 @@ plugin@org.eclipse.orion.server.authentication.openid=GIT,tag=v20110127-1820,rep
 plugin@org.eclipse.orion.server.authentication.openid.core=GIT,tag=v20110124-1700,repo=dev.eclipse.org:/gitroot/e4/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.server.authentication.openid.core
 plugin@org.eclipse.orion.server.authentication.basic=GIT,tag=v20110124-1700,repo=dev.eclipse.org:/gitroot/e4/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.server.authentication.basic
 plugin@org.eclipse.orion.server.filesystem.git=GIT,tag=v20110124-1700,repo=dev.eclipse.org:/gitroot/e4/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.server.filesystem.git
-plugin@org.eclipse.orion.server.user.securestorage=GIT,tag=v20110128-1210,repo=dev.eclipse.org:/gitroot/e4/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.server.user.securestorage
+plugin@org.eclipse.orion.server.user.securestorage=GIT,tag=v20110128-1437,repo=dev.eclipse.org:/gitroot/e4/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.server.user.securestorage
 plugin@org.eclipse.orion.server.useradmin=GIT,tag=v20110127-1820,repo=dev.eclipse.org:/gitroot/e4/org.eclipse.orion.server.git,path=/bundles/org.eclipse.orion.server.useradmin
 plugin@org.eclipse.orion.server.useradmin.xml=GIT,tag=v20110127-1820,repo=dev.eclipse.org:/gitroot/e4/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.server.useradmin.xml
 plugin@org.eclipse.orion.server.search=GIT,tag=v20110124-1700,repo=dev.eclipse.org:/gitroot/e4/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.server.search