X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=security%2Fplugins%2Forg.argeo.security.ui.admin%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Feditors%2FArgeoUserEditor.java;h=74f290a55425e23fad116e8f09f84eb19fe02ceb;hb=cd50e3711d3b86921f11d9e021fc6a43bef0d400;hp=87b241867ddd1510f34c17f3854085c7892f6a88;hpb=4d665b0700136573b05879aa19897d8f448d8ca4;p=lgpl%2Fargeo-commons.git

diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java
index 87b241867..74f290a55 100644
--- a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java
+++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.security.ui.admin.editors;
 
 import javax.jcr.Node;
@@ -5,8 +20,7 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
 import org.argeo.ArgeoException;
-import org.argeo.jcr.ArgeoNames;
-import org.argeo.jcr.JcrUtils;
+import org.argeo.jcr.UserJcrUtils;
 import org.argeo.security.UserAdminService;
 import org.argeo.security.jcr.JcrUserDetails;
 import org.argeo.security.ui.admin.SecurityAdminPlugin;
@@ -24,7 +38,8 @@ public class ArgeoUserEditor extends FormEditor {
 	public final static String ID = "org.argeo.security.ui.admin.adminArgeoUserEditor";
 
 	private JcrUserDetails userDetails;
-	private Node userHome;
+	// private Node userHome;
+	private Node userProfile;
 	private UserAdminService userAdminService;
 	private Session session;
 
@@ -33,7 +48,7 @@ public class ArgeoUserEditor extends FormEditor {
 		super.init(site, input);
 		String username = ((ArgeoUserEditorInput) getEditorInput())
 				.getUsername();
-		userHome = JcrUtils.getUserHome(session, username);
+		userProfile = UserJcrUtils.getUserProfile(session, username);
 
 		if (userAdminService.userExists(username)) {
 			userDetails = (JcrUserDetails) userAdminService
@@ -54,8 +69,7 @@ public class ArgeoUserEditor extends FormEditor {
 
 	protected void addPages() {
 		try {
-			addPage(new DefaultUserMainPage(this,
-					userHome.getNode(ArgeoNames.ARGEO_PROFILE)));
+			addPage(new DefaultUserMainPage(this, userProfile));
 			addPage(new UserRolesPage(this, userDetails, userAdminService));
 		} catch (Exception e) {
 			throw new ArgeoException("Cannot add pages", e);