Scarab commit: svn commit: r11251 - branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab: actions actions/admin attribute om pipeline screens tools util util/word util/xmlissues
[email protected] Fri, 4 May 2012 08:09:35 -0700 (PDT)
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: mcoss
Date: 2012-05-04 08:09:35-0700
New Revision: 11251
Modified:
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Login.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Register.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/Approval.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageUser.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/attribute/UserAttribute.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ActivityManager.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/AttributeValue.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/Issue.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/MITListManager.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabModule.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserImpl.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserManager.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ReportExport.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/ScarabUserTool.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/Email.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/word/QueryResult.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/xmlissues/ImportIssues.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/xmlissues/ScarabIssues.java
Log:
CHG - Method .User.getUserName() -> .User.getName()
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Login.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Login.java?view=diff&pathrev=11251&r1=11250&r2=11251
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Login.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Login.java 2012-05-04 08:09:35-0700
@@ -91,7 +91,7 @@
public static void simpleLogin(RunData data, ScarabUser user)
{
- if(user.getUserName().equals("")) //is it a TurbineAnonymousUser?
+ if(user.getName().equals("")) //is it a TurbineAnonymousUser?
{
user.setHasLoggedIn(Boolean.FALSE);
}
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Register.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Register.java?view=diff&pathrev=11251&r1=11250&r2=11251
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Register.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Register.java 2012-05-04 08:09:35-0700
@@ -118,7 +118,7 @@
return;
}
- ScarabUser existingUser=ScarabUserManager.getInstance(su.getUserName());
+ ScarabUser existingUser=ScarabUserManager.getInstance(su.getName());
if (existingUser!=null)
{
data.setScreenTemplate(template);
@@ -154,7 +154,7 @@
su = ScarabUserManager.reactivateUserIfDeleted(su);
if (su == null)
{
- ScarabUser existingUser = ScarabUserManager.getInstance(su.getUserName());
+ ScarabUser existingUser = ScarabUserManager.getInstance(su.getName());
if(existingUser.isConfirmed())
{
Localizable msg = new L10NMessage(L10NKeySet.UsernameExistsAlready);
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/Approval.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/Approval.java?view=diff&pathrev=11251&r1=11250&r2=11251
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/Approval.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/Approval.java 2012-05-04 08:09:35-0700
@@ -291,12 +291,12 @@
ScarabUserManager.getInstance(pending.getUserId());
String checked = data.getParameters()
- .getString("user_id_"+user.getUserName());
+ .getString("user_id_"+user.getName());
if(checked != null && checked.equals("on"))
{
String roleName = data.getParameters()
- .getString(user.getUserName());
+ .getString(user.getName());
if (roleName != null && roleName.length() > 0)
{
if (roleName.equalsIgnoreCase(l10n.get(L10NKeySet.Deny)))
@@ -322,7 +322,7 @@
if (acl.hasRole( role, (Group) module ) )
{
String[] args = {roleName,
- user.getUserName(),
+ user.getName(),
module.getRealName()};
String msg = l10n
.format(
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageUser.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageUser.java?view=diff&pathrev=11251&r1=11250&r2=11251
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageUser.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageUser.java 2012-05-04 08:09:35-0700
@@ -227,7 +227,7 @@
// workaround.
//
User userInSession = data.getUser();
- if (userInSession.getUserName().equals(username))
+ if (userInSession.getName().equals(username))
{
//
// The current user is trying to modify their
@@ -335,7 +335,7 @@
User user = null;
String username = data.getParameters().getString("username");
User userInSession = data.getUser();
- if (userInSession.getUserName().equals(username)){
+ if (userInSession.getName().equals(username)){
scarabR.setAlertMessage(L10NKeySet.UserCanNotDeleteSelf);
return;
}
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/attribute/UserAttribute.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/attribute/UserAttribute.java?view=diff&pathrev=11251&r1=11250&r2=11251
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/attribute/UserAttribute.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/attribute/UserAttribute.java 2012-05-04 08:09:35-0700
@@ -67,7 +67,7 @@
*
* @return The Value value
*/
- public String getUserName()
+ public String getName()
{
return getValue();
}
@@ -81,7 +81,7 @@
{
ScarabUser user = getScarabUser();
if(user!=null)
- return user.getUserName();
+ return user.getName();
else
return null;
}
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ActivityManager.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ActivityManager.java?view=diff&pathrev=11251&r1=11250&r2=11251
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ActivityManager.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ActivityManager.java 2012-05-04 08:09:35-0700
@@ -120,11 +120,11 @@
String newUsername = null;
if (oldUserId != null)
{
- oldUsername = ScarabUserManager.getInstance(oldUserId).getUserName();
+ oldUsername = ScarabUserManager.getInstance(oldUserId).getName();
}
if (newUserId != null)
{
- newUsername = ScarabUserManager.getInstance(newUserId).getUserName();
+ newUsername = ScarabUserManager.getInstance(newUserId).getName();
}
return create(issue,attribute,activitySet,ActivityType.USER_ATTRIBUTE_CHANGED,null,attachment,
null, null,
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/AttributeValue.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/AttributeValue.java?view=diff&pathrev=11251&r1=11250&r2=11251
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/AttributeValue.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/AttributeValue.java 2012-05-04 08:09:35-0700
@@ -496,7 +496,7 @@
if (userId != null)
{
ScarabUser user = ScarabUserManager.getInstance(userId);
- setValueOnly(user.getUserName());
+ setValueOnly(user.getName());
}
else
{
@@ -688,7 +688,7 @@
}
else if(getAttribute().isUserAttribute())
{
- displayValue = getScarabUser().getUserName();
+ displayValue = getScarabUser().getName();
}
else if(getAttribute().isDateAttribute())
{
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/Issue.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/Issue.java?view=diff&pathrev=11251&r1=11250&r2=11251
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/Issue.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/Issue.java 2012-05-04 08:09:35-0700
@@ -2601,7 +2601,7 @@
if (attr instanceof UserAttribute)
{
UserAttribute userAttr = (UserAttribute)attr;
- bRdo = userAttr.getUserName().equals(((UserAttribute)value).getUserName());
+ bRdo = userAttr.getName().equals(((UserAttribute)value).getName());
}
else
{
@@ -2730,7 +2730,7 @@
if (attVal != null && !isNonMatchingAttribute(nonMatchingAttributes, att))
{
final boolean isUser = (att instanceof UserAttribute);
- if (!isUser || !alreadyAssociatedUsers.contains(((UserAttribute)att).getUserName()+att.getAttribute().getName()))
+ if (!isUser || !alreadyAssociatedUsers.contains(((UserAttribute)att).getName()+att.getAttribute().getName()))
{
att.setIssueId(newIssue.getIssueId());
att.setActivity(a);
@@ -2738,7 +2738,7 @@
att.save();
if (isUser)
{
- alreadyAssociatedUsers.add(((UserAttribute)att).getUserName()+att.getAttribute().getName());
+ alreadyAssociatedUsers.add(((UserAttribute)att).getName()+att.getAttribute().getName());
}
}
}
@@ -2821,7 +2821,7 @@
{
final UserAttribute useratt = (UserAttribute)commentUserValues.get(i);
delAttrsBuf.append(useratt.getAttribute().getName() + ": " +
- useratt.getUserName() + "\n");
+ useratt.getName() + "\n");
}
final String delAttrs = delAttrsBuf.toString();
attachmentBuf.append(delAttrs);
@@ -2980,7 +2980,7 @@
if (attVal != null && !isNonMatchingAttribute(nonMatchingAttributes, att))
{
final boolean isUser = (att instanceof UserAttribute);
- if (!isUser || !alreadyAssociatedUsers.contains(((UserAttribute)att).getUserName()+att.getAttribute().getName()))
+ if (!isUser || !alreadyAssociatedUsers.contains(((UserAttribute)att).getName()+att.getAttribute().getName()))
{
final AttributeValue newAttVal = att.copy();
newAttVal.setIssueId(newIssue.getIssueId());
@@ -2989,7 +2989,7 @@
newAttVal.save();
if (isUser)
{
- alreadyAssociatedUsers.add(((UserAttribute)att).getUserName()+att.getAttribute().getName());
+ alreadyAssociatedUsers.add(((UserAttribute)att).getName()+att.getAttribute().getName());
}
}
}
@@ -3084,7 +3084,7 @@
{
final UserAttribute useratt = (UserAttribute)commentUserValues.get(i);
delAttrsBuf.append(useratt.getAttribute().getName() + ": " +
- useratt.getUserName() + "\n");
+ useratt.getName() + "\n");
}
final String delAttrs = delAttrsBuf.toString();
attachmentBuf.append(delAttrs);
@@ -3179,7 +3179,7 @@
if (!getModule().allowsMultipleVoting() && previousVotes > 0)
{
throw new ScarabException(L10NKeySet.ExceptionMultipleVoteForUnallowed,
- user.getUserName(),
+ user.getName(),
getUniqueId());
}
@@ -3621,7 +3621,7 @@
attVal.setIssue(this);
attVal.setAttributeId(attribute.getAttributeId());
attVal.setUserId(assignee.getUserId());
- attVal.setValue(assignee.getUserName());
+ attVal.setValue(assignee.getName());
attVal.save();
return activitySet;
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/MITListManager.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/MITListManager.java?view=diff&pathrev=11251&r1=11250&r2=11251
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/MITListManager.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/MITListManager.java 2012-05-04 08:09:35-0700
@@ -202,7 +202,7 @@
// but its possible the system can still function under
// this circumstance, so just log it for now.
Log.get().error("Multiple active lists exist with list name="
- + name + " for user=" + user.getUserName() +
+ + name + " for user=" + user.getName() +
"("+user.getUserId()+")");
}
return result;
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabModule.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabModule.java?view=diff&pathrev=11251&r1=11250&r2=11251
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabModule.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabModule.java 2012-05-04 08:09:35-0700
@@ -407,8 +407,8 @@
int i = 0;
if ("username".equals(sortColumn))
{
- i = polarity * ((ScarabUser)o1).getUserName()
- .compareTo(((ScarabUser)o2).getUserName());
+ i = polarity * ((ScarabUser)o1).getName()
+ .compareTo(((ScarabUser)o2).getName());
}
else
{
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserImpl.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserImpl.java?view=diff&pathrev=11251&r1=11250&r2=11251
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserImpl.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserImpl.java 2012-05-04 08:09:35-0700
@@ -857,7 +857,7 @@
boolean brdo = false;
String anonymous = ScarabUserManager.getAnonymousUserName();
if (ScarabUserManager.anonymousAccessAllowed() &&
- anonymous != null && getUserName().equals(anonymous))
+ anonymous != null && getName().equals(anonymous))
{
brdo = true;
}
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserManager.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserManager.java?view=diff&pathrev=11251&r1=11250&r2=11251
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserManager.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserManager.java 2012-05-04 08:09:35-0700
@@ -271,7 +271,7 @@
*/
public static ScarabUser reactivateUserIfDeleted(ScarabUser su) throws Exception
{
- String username = su.getUserName();
+ String username = su.getName();
ScarabUser reactivatedUser=(ScarabUser) TurbineSecurity.getUser(username);
String cs = reactivatedUser.getConfirmed();
if(cs.equals(ScarabUser.DELETED))
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java?view=diff&pathrev=11251&r1=11250&r2=11251
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java 2012-05-04 08:09:35-0700
@@ -60,7 +60,7 @@
{
if (bNTLMActive &&
(
- ((null == data.getUserFromSession() || data.getUserFromSession().getUserName().trim().length()==0) && null == data.getUser())
+ ((null == data.getUserFromSession() || data.getUserFromSession().getName().trim().length()==0) && null == data.getUser())
|| ((ScarabUser)data.getUserFromSession()).isUserAnonymous()
)
&& ( !data.getAction().equals("Logout")
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ReportExport.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ReportExport.java?view=diff&pathrev=11251&r1=11250&r2=11251
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ReportExport.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ReportExport.java 2012-05-04 08:09:35-0700
@@ -294,7 +294,7 @@
else if (model.isUser(cellLabel))
{
return l10n.get("Author") + ": "
- + ((ScarabUser) cellLabel).getUserName();
+ + ((ScarabUser) cellLabel).getName();
}
else
{
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/ScarabUserTool.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/ScarabUserTool.java?view=diff&pathrev=11251&r1=11250&r2=11251
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/ScarabUserTool.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/ScarabUserTool.java 2012-05-04 08:09:35-0700
@@ -96,8 +96,8 @@
int i = 0;
if ("username".equals(sortColumn))
{
- i = polarity * ((ScarabUser)o1).getUserName()
- .compareTo(((ScarabUser)o2).getUserName());
+ i = polarity * ((ScarabUser)o1).getName()
+ .compareTo(((ScarabUser)o2).getName());
}
else
{
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/Email.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/Email.java?view=diff&pathrev=11251&r1=11250&r2=11251
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/Email.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/Email.java 2012-05-04 08:09:35-0700
@@ -663,7 +663,7 @@
{
log.error(
"Couldn't determine locale for user " + user
- .getUserName(), e);
+ .getName(), e);
}
}
if (locale == null)
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/word/QueryResult.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/word/QueryResult.java?view=diff&pathrev=11251&r1=11250&r2=11251
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/word/QueryResult.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/word/QueryResult.java 2012-05-04 08:09:35-0700
@@ -193,7 +193,7 @@
if (attributeId.equals(RModuleUserAttribute.CREATED_BY.getName()))
{
ScarabUser user = getIssue().getCreatedBy();
- value.add(user.getUserName());
+ value.add(user.getName());
}
else if (attributeId.equals(RModuleUserAttribute.CREATED_DATE.getName()))
{
@@ -203,7 +203,7 @@
else if (attributeId.equals(RModuleUserAttribute.MODIFIED_BY.getName()))
{
ScarabUser user = getIssue().getModifiedBy();
- value.add(user.getUserName());
+ value.add(user.getName());
}
else if (attributeId.equals(RModuleUserAttribute.MODIFIED_DATE.getName()))
{
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/xmlissues/ImportIssues.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/xmlissues/ImportIssues.java?view=diff&pathrev=11251&r1=11250&r2=11251
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/xmlissues/ImportIssues.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/xmlissues/ImportIssues.java 2012-05-04 08:09:35-0700
@@ -918,7 +918,7 @@
// idNode.appendChild(doc.createTextNode(String.valueOf(currModule.getModuleId())));
// parentIdNode.appendChild(doc.createTextNode(String.valueOf(currModule.getParentId())));
// nameNode.appendChild(doc.createTextNode(currModule.getName()));
-// ownerNode.appendChild(doc.createTextNode(user.getUserName()));
+// ownerNode.appendChild(doc.createTextNode(user.getName()));
// descriptionNode.appendChild(doc.createTextNode(currModule.getDescription()));
// urlNode.appendChild(doc.createTextNode(currModule.getUrl()));
// domainNode.appendChild(doc.createTextNode(currModule.getHttpDomain()));
@@ -963,7 +963,7 @@
idNode.setText(String.valueOf(currModule.getModuleId()));
parentIdNode.setText(String.valueOf(currModule.getParentId()));
nameNode.setText(currModule.getRealName());
- ownerNode.setText(user.getUserName());
+ ownerNode.setText(user.getName());
descriptionNode.setText(currModule.getDescription());
urlNode.setText(currModule.getUrl());
domainNode.setText(currModule.getHttpDomain());
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/xmlissues/ScarabIssues.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/xmlissues/ScarabIssues.java?view=diff&pathrev=11251&r1=11250&r2=11251
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/xmlissues/ScarabIssues.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/util/xmlissues/ScarabIssues.java 2012-05-04 08:09:35-0700
@@ -1347,7 +1347,7 @@
{
LOG.debug("Could not find previous AttributeValue assigning " +
(oldUserOM == null ? "NULL" :
- oldUserOM.getUserName()) +
+ oldUserOM.getName()) +
" to attribute " +
avalAttributeOM.getName());
}
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2957675