[jboss-svn-commits] JBL Code SVN: r8979 - in labs/jbosslabs/trunk/portal-extensions: forge-tagme/src/java/org/jboss/labs/tagme/services and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jan 22 15:48:04 EST 2007
Author: szimano
Date: 2007-01-22 15:48:04 -0500 (Mon, 22 Jan 2007)
New Revision: 8979
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTools.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/JBossPortalCredentials.java
Log:
migration fixes
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java 2007-01-22 19:52:49 UTC (rev 8978)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java 2007-01-22 20:48:04 UTC (rev 8979)
@@ -27,12 +27,14 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import org.jboss.forge.common.PermissionTools;
import org.jboss.forge.common.soa.LabsServices;
import org.jboss.forge.common.soa.primates.PrimatesService;
import org.jboss.labs.tagme.gwt.client.AddTagsClickListener;
import org.jboss.labs.tagme.gwt.client.TaggingService;
import org.jboss.labs.tagme.services.TagMeTagger;
import org.jboss.logging.Logger;
+import org.jboss.portal.identity.User;
import com.google.gwt.user.server.rpc.RemoteServiceServlet;
@@ -79,7 +81,8 @@
log.debug("tags: " + tags + "\nspliter: "
+ AddTagsClickListener.TAG_SEP);
String[] tagsTable = tags.split(AddTagsClickListener.TAG_SEP);
- String[] descTable = descriptions.split(AddTagsClickListener.TAG_SEP);
+ String[] descTable = descriptions
+ .split(AddTagsClickListener.TAG_SEP);
for (int i = 0; i < tagsTable.length; i++) {
tagger.addTag(user, path, tagsTable[i], descTable[i], website);
@@ -196,12 +199,21 @@
if (pServ.getPrimate(nickname, "default") != null) {
String bio = pServ.getPrimate(nickname, "default").getBio();
- if (pServ.getUser(nickname).getGivenName() != null
- && pServ.getUser(nickname).getFamilyName() != null) {
+ if (PermissionTools.getUserProfileModule().getProperty(
+ pServ.getUser(nickname), User.INFO_USER_NAME_GIVEN) != null
+ && PermissionTools.getUserProfileModule().getProperty(
+ pServ.getUser(nickname),
+ User.INFO_USER_NAME_FAMILY) != null) {
bio = "<div class=\"tagme-username\">"
- + pServ.getUser(nickname).getGivenName() + " "
- + pServ.getUser(nickname).getFamilyName()
- + "</div> " + bio;
+ + PermissionTools.getUserProfileModule()
+ .getProperty(pServ.getUser(nickname),
+ User.INFO_USER_NAME_GIVEN)
+ .toString()
+ + " "
+ + PermissionTools.getUserProfileModule()
+ .getProperty(pServ.getUser(nickname),
+ User.INFO_USER_NAME_FAMILY)
+ .toString() + "</div> " + bio;
}
return bio;
} else
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTools.java 2007-01-22 19:52:49 UTC (rev 8978)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTools.java 2007-01-22 20:48:04 UTC (rev 8979)
@@ -1,7 +1,6 @@
package org.jboss.labs.tagme.services;
-import javax.management.MalformedObjectNameException;
-
+import org.jboss.forge.common.PermissionTools;
import org.jboss.forge.common.soa.LabsServices;
import org.jboss.portal.identity.User;
@@ -12,12 +11,16 @@
User user = LabsServices.getPrimatesService().getUser(username);
if (user != null
- && (user.getGivenName() != null && user.getFamilyName() != null)) {
- return user.getGivenName() + " " + user.getFamilyName();
+ && (PermissionTools.getUserProfileModule().getProperty(
+ user, User.INFO_USER_NAME_GIVEN) != null && PermissionTools.getUserProfileModule().getProperty(
+ user, User.INFO_USER_NAME_FAMILY) != null)) {
+ return PermissionTools.getUserProfileModule().getProperty(
+ user, User.INFO_USER_NAME_GIVEN).toString() + " " + PermissionTools.getUserProfileModule().getProperty(
+ user, User.INFO_USER_NAME_FAMILY).toString();
} else {
return username;
}
- } catch (MalformedObjectNameException e) {
+ } catch (Exception e) {
e.printStackTrace();
return username;
}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/JBossPortalCredentials.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/JBossPortalCredentials.java 2007-01-22 19:52:49 UTC (rev 8978)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/JBossPortalCredentials.java 2007-01-22 20:48:04 UTC (rev 8979)
@@ -38,10 +38,14 @@
import org.jboss.portal.common.transaction.TransactionManagerProvider;
import org.jboss.portal.common.transaction.Transactions;
import org.jboss.portal.core.modules.ModuleException;
+import org.jboss.portal.identity.IdentityContext;
import org.jboss.portal.identity.IdentityException;
+import org.jboss.portal.identity.IdentityServiceController;
+import org.jboss.portal.identity.MembershipModule;
import org.jboss.portal.identity.Role;
import org.jboss.portal.identity.RoleModule;
import org.jboss.portal.identity.User;
+import org.jboss.portal.identity.UserProfileModule;
import org.jboss.portlet.JBossActionRequest;
import org.jboss.portlet.JBossRenderRequest;
@@ -67,27 +71,48 @@
private Logger log = Logger.getLogger(this.getClass());
- public JBossPortalCredentials() {
-
+ private static IdentityServiceController isc;
+
+ public JBossPortalCredentials() throws NamingException {
+ InitialContext initialContext = new InitialContext();
+ isc = (IdentityServiceController) initialContext
+ .lookup("portal:service=Module,type=IdentityServiceController");
}
- public void setRenderRequest(RenderRequest rReq) {
+ private Set<String> getRoleNames(User user) {
+ Set<String> ret = new TreeSet<String>();
+ try {
+ for (Object roleObj : getMembershipModule().getRoles(user)) {
+ ret.add(((Role) roleObj).getName());
+ }
+ } catch (IdentityException e) {
+ return ret;
+ }
- }
-
- public static Set<String> getRoleNames(User user, RoleModule roleModule) {
- Set<String> ret = new HashSet<String>();
+ return ret;
+ }
+
+ private MembershipModule getMembershipModule() {
+ try {
+ return (MembershipModule) isc.getIdentityContext().getObject(
+ IdentityContext.TYPE_MEMBERSHIP_MODULE);
+ } catch (IdentityException e) {
+ log.error(e);
+ return null;
+ }
+ }
+
+ private UserProfileModule getUserProfileModule() {
try {
- for (Object roleObj : roleModule.getRoles(user)) {
- ret.add(((Role) roleObj).getName());
- }
+ return (UserProfileModule) isc.getIdentityContext().getObject(
+ IdentityContext.TYPE_USER_PROFILE_MODULE);
} catch (IdentityException e) {
- return ret;
+ log.error(e);
+ return null;
}
+ }
- return ret;
- }
-
+
public void setParam(Object param) {
InitialContext initialContext;
@@ -112,10 +137,17 @@
if (jrReq.getUser() != null) {
name = jrReq.getUser().getUserName();
logedIn = true;
- isAdmin = getRoleNames(jrReq.getUser(), roleModule)
+ isAdmin = getRoleNames(jrReq.getUser())
.contains(adminRoleName);
- roles = getRoleNames(jrReq.getUser(), roleModule);
- email = jrReq.getUser().getRealEmail();
+ roles = getRoleNames(jrReq.getUser());
+ try {
+ email = getUserProfileModule().getProperty(jrReq.getUser(), User.INFO_USER_EMAIL_REAL).toString();
+ } catch (IllegalArgumentException e) {
+ log.error(e);
+ } catch (IdentityException e) {
+ log.error(e);
+ }
+
}
} else if (param instanceof JBossRenderRequest) {
@@ -124,10 +156,16 @@
if (jrReq.getUser() != null) {
name = jrReq.getUser().getUserName();
logedIn = true;
- isAdmin = getRoleNames(jrReq.getUser(), roleModule)
+ isAdmin = getRoleNames(jrReq.getUser())
.contains(adminRoleName);
- roles = getRoleNames(jrReq.getUser(), roleModule);
- email = jrReq.getUser().getRealEmail();
+ roles = getRoleNames(jrReq.getUser());
+ try {
+ email = getUserProfileModule().getProperty(jrReq.getUser(), User.INFO_USER_EMAIL_REAL).toString();
+ } catch (IllegalArgumentException e) {
+ log.error(e);
+ } catch (IdentityException e) {
+ log.error(e);
+ }
} else {
name = "Unknown";
}
More information about the jboss-svn-commits
mailing list