Author: snoopdave
Date: Fri Sep 14 12:54:55 2007
New Revision: 575781
URL: http://svn.apache.org/viewvc?rev=575781&view=rev
Log:
More work on http://opensource.atlassian.com/projects/roller/browse/ROL-1534
Eliminating getUser(String userId) method, all user lookups now done by
username.
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/nbproject/project.xml
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/business/UserManager.java
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/TestUtils.java
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/BookmarkTest.java
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/CommentTest.java
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/FileManagerTest.java
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderCRUDTest.java
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderParentDeletesTest.java
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/HitCountTest.java
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/PermissionTest.java
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/PingsTest.java
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/RefererTest.java
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/UserTest.java
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryCRUDTest.java
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryFunctionalityTest.java
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryParentDeletesTest.java
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogEntryTest.java
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogTest.java
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcherTest.java
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/xmlrpc/RollerXmlRpcServerTest.java
Modified: roller/branches/roller_4.1_dev/apps/weblogger/nbproject/project.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/nbproject/project.xml?rev=575781&r1=575780&r2=575781&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/apps/weblogger/nbproject/project.xml
(original)
+++ roller/branches/roller_4.1_dev/apps/weblogger/nbproject/project.xml Fri Sep
14 12:54:55 2007
@@ -10,6 +10,16 @@
</properties>
<folders>
<source-folder>
+ <label>web</label>
+ <type>doc_root</type>
+ <location>web</location>
+ </source-folder>
+ <source-folder>
+ <label>WEB-INF</label>
+ <type>web_inf</type>
+ <location>web/WEB-INF</location>
+ </source-folder>
+ <source-folder>
<label>src/sql</label>
<type>java</type>
<location>src/sql</location>
@@ -24,16 +34,6 @@
<type>java</type>
<location>test/java</location>
</source-folder>
- <source-folder>
- <label>web</label>
- <type>doc_root</type>
- <location>web</location>
- </source-folder>
- <source-folder>
- <label>WEB-INF</label>
- <type>web_inf</type>
- <location>web/WEB-INF</location>
- </source-folder>
</folders>
<ide-actions>
<action name="build">
@@ -122,7 +122,7 @@
<package-root>src/java</package-root>
<package-root>test/java</package-root>
<package-root>src/sql</package-root>
- <classpath
mode="compile">../../tools/lib/commons-betwixt-1.0-beta-1.jar:../../tools/lib/commons-codec-1.3.jar:../../tools/lib/commons-collections-3.2.jar:../../tools/lib/commons-digester-1.6.jar:../../tools/lib/commons-httpclient-2.0.2.jar:../../tools/lib/commons-id-0.1-SNAPSHOT.jar:../../tools/lib/commons-lang-2.1.jar:../../tools/lib/commons-logging-1.0.4.jar:../../tools/lib/concurrent-1.3.2.jar:../../tools/lib/guice-1.0.jar:../../tools/lib/jaxen-full.jar:../../tools/lib/jdom.jar:../../tools/lib/log4j-1.2.11.jar:../../tools/lib/lucene-1.4.3.jar:../../tools/lib/rome-0.9.jar:../../tools/lib/rome-fetcher-0.9.jar:../../tools/lib/saxpath.jar:../../tools/lib/taglibs-string.jar:../../tools/lib/velocity-1.5.jar:../../tools/hibernate-3.1/hibernate3.jar:../../tools/openjpa-0.9.7/geronimo-j2ee-connector_1.5_spec-1.0.1.jar:../../tools/openjpa-0.9.7/geronimo-jpa_3.0_spec-1.0.jar:../../tools/openjpa-0.9.7/geronimo-jta_1.0.1B_spec-1.0.1.jar:../../tools/openjpa-0.9.7/openj
pa-0.9.7-incubating.jar:../../tools/openjpa-0.9.7/serp-1.11.0.jar:../../tools/xmlrpc-3.0/lib/ws-commons-util-1.0.1.jar:../../tools/xmlrpc-3.0/lib/xmlrpc-client-3.0.jar:../../tools/xmlrpc-3.0/lib/xmlrpc-common-3.0.jar:../../tools/xmlrpc-3.0/lib/xmlrpc-server-3.0.jar:../../tools/spring-1.2/acegi-security-1.0.3.jar:../../tools/spring-1.2/spring.jar:../../tools/roller-core/roller-core.jar:../../tools/roller-planet/roller-planet-business.jar:../../tools/struts-1.2.4/lib/antlr.jar:../../tools/struts-1.2.4/lib/commons-beanutils.jar:../../tools/struts-1.2.4/lib/commons-digester.jar:../../tools/struts-1.2.4/lib/commons-validator.jar:../../tools/struts-1.2.4/lib/jakarta-oro.jar:../../tools/struts-1.2.4/lib/struts-el.jar:../../tools/struts-1.2.4/lib/struts.jar:../../tools/buildtime/tomcat-5.0.28/jsp-api.jar:../../tools/buildtime/tomcat-5.0.28/servlet-api.jar:../../tools/buildtime/activation.jar:../../tools/buildtime/mail.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/jstl.jar:../..
/tools/jakarta-taglibs-standard-1.1.2/lib/serializer.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/standard.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/xalan.jar:../../tools/buildtime/junit-4.1.jar:../../tools/buildtime/ant-1.7.0/ant.jar:../../tools/buildtime/derbyclient.jar:../../tools/buildtime/derby.jar:../../tools/buildtime/derbyclient.jar:../../tools/buildtime/derbynet.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:../../tools/buildtime/mockrunner-0.35/lib/nekohtml.jar:../../tools/struts-2.0.9/lib/antlr-2.7.2.jar:../../tools/struts-2.0.9/lib/commons-beanutils-1.6.jar:../../tools/struts-2.0.9/lib/commons-chain-1.1.jar:../../tools/struts-2.0.9/lib/commons-fileupload-1.2.jar:../../tools/struts-2.0.9/lib/commons-io-1.3.1.jar:../../tools/struts-2.0.9/lib/commons-validator-1.3.0.jar:../../tools/struts-2.0.9/lib/freemarker-2
.3.8.jar:../../tools/struts-2.0.9/lib/ognl-2.6.11.jar:../../tools/struts-2.0.9/lib/oro-2.0.8.jar:../../tools/struts-2.0.9/lib/struts2-core-2.0.9.jar:../../tools/struts-2.0.9/lib/struts2-spring-plugin-2.0.9.jar:../../tools/struts-2.0.9/lib/struts2-tiles-plugin-2.0.9.jar:../../tools/struts-2.0.9/lib/tiles-api-2.0.4.jar:../../tools/struts-2.0.9/lib/tiles-core-2.0.4.jar:../../tools/struts-2.0.9/lib/tiles-jsp-2.0.4.jar:../../tools/struts-2.0.9/lib/xwork-2.0.4.jar</classpath>
+ <classpath
mode="compile">../../tools/lib/commons-betwixt-1.0-beta-1.jar:../../tools/lib/commons-codec-1.3.jar:../../tools/lib/commons-collections-3.2.jar:../../tools/lib/commons-digester-1.6.jar:../../tools/lib/commons-id-0.1-SNAPSHOT.jar:../../tools/lib/commons-lang-2.1.jar:../../tools/lib/commons-logging-1.0.4.jar:../../tools/lib/concurrent-1.3.2.jar:../../tools/lib/guice-1.0.jar:../../tools/lib/jaxen-full.jar:../../tools/lib/jdom.jar:../../tools/lib/log4j-1.2.11.jar:../../tools/lib/lucene-1.4.3.jar:../../tools/lib/rome-0.9.jar:../../tools/lib/rome-fetcher-0.9.jar:../../tools/lib/saxpath.jar:../../tools/lib/taglibs-string.jar:../../tools/lib/velocity-1.5.jar:../../tools/hibernate-3.1/hibernate3.jar:../../tools/openjpa-0.9.7/geronimo-j2ee-connector_1.5_spec-1.0.1.jar:../../tools/openjpa-0.9.7/geronimo-jpa_3.0_spec-1.0.jar:../../tools/openjpa-0.9.7/geronimo-jta_1.0.1B_spec-1.0.1.jar:../../tools/openjpa-0.9.7/openjpa-0.9.7-incubating.jar:../../tools/openjpa-0
.9.7/serp-1.11.0.jar:../../tools/xmlrpc-3.0/lib/ws-commons-util-1.0.1.jar:../../tools/xmlrpc-3.0/lib/xmlrpc-client-3.0.jar:../../tools/xmlrpc-3.0/lib/xmlrpc-common-3.0.jar:../../tools/xmlrpc-3.0/lib/xmlrpc-server-3.0.jar:../../tools/spring-1.2/acegi-security-1.0.3.jar:../../tools/spring-1.2/spring.jar:../../tools/roller-core/roller-core.jar:../../tools/roller-planet/roller-planet-business.jar:../../tools/struts-1.2.4/lib/antlr.jar:../../tools/struts-1.2.4/lib/commons-beanutils.jar:../../tools/struts-1.2.4/lib/commons-digester.jar:../../tools/struts-1.2.4/lib/commons-validator.jar:../../tools/struts-1.2.4/lib/jakarta-oro.jar:../../tools/struts-1.2.4/lib/struts-el.jar:../../tools/struts-1.2.4/lib/struts.jar:../../tools/buildtime/tomcat-5.0.28/jsp-api.jar:../../tools/buildtime/tomcat-5.0.28/servlet-api.jar:../../tools/buildtime/activation.jar:../../tools/buildtime/mail.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/jstl.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/ser
ializer.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/standard.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/xalan.jar:../../tools/buildtime/junit-4.1.jar:../../tools/buildtime/ant-1.7.0/ant.jar:../../tools/buildtime/derbyclient.jar:../../tools/buildtime/derby.jar:../../tools/buildtime/derbyclient.jar:../../tools/buildtime/derbynet.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:../../tools/buildtime/mockrunner-0.35/lib/nekohtml.jar:../../tools/struts-2.0.9/lib/antlr-2.7.2.jar:../../tools/struts-2.0.9/lib/commons-beanutils-1.6.jar:../../tools/struts-2.0.9/lib/commons-chain-1.1.jar:../../tools/struts-2.0.9/lib/commons-fileupload-1.2.jar:../../tools/struts-2.0.9/lib/commons-io-1.3.1.jar:../../tools/struts-2.0.9/lib/commons-validator-1.3.0.jar:../../tools/struts-2.0.9/lib/freemarker-2.3.8.jar:../../tools/struts-2.0.9/lib/ognl-2.
6.11.jar:../../tools/struts-2.0.9/lib/oro-2.0.8.jar:../../tools/struts-2.0.9/lib/struts2-core-2.0.9.jar:../../tools/struts-2.0.9/lib/struts2-spring-plugin-2.0.9.jar:../../tools/struts-2.0.9/lib/struts2-tiles-plugin-2.0.9.jar:../../tools/struts-2.0.9/lib/tiles-api-2.0.4.jar:../../tools/struts-2.0.9/lib/tiles-core-2.0.4.jar:../../tools/struts-2.0.9/lib/tiles-jsp-2.0.4.jar:../../tools/struts-2.0.9/lib/xwork-2.0.4.jar:../../tools/lib/commons-httpclient-3.0.1.jar</classpath>
<source-level>1.5</source-level>
</compilation-unit>
</java-data>
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/business/UserManager.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/business/UserManager.java?rev=575781&r1=575780&r2=575781&view=diff
==============================================================================
---
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/business/UserManager.java
(original)
+++
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/business/UserManager.java
Fri Sep 14 12:54:55 2007
@@ -69,16 +69,6 @@
/**
- * Lookup a user by ID.
- *
- * @param id ID of user to lookup.
- * @returns UsUserhe user, or null if not found.
- * @throws WebloggerException If there is a problem.
- */
- public User getUser(String id) throws WebloggerException;
-
-
- /**
* Get count of enabled users
*/
public long getUserCount() throws WebloggerException;
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java?rev=575781&r1=575780&r2=575781&view=diff
==============================================================================
---
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java
(original)
+++
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java
Fri Sep 14 12:54:55 2007
@@ -47,7 +47,7 @@
static final long serialVersionUID = 5890132909166913727L;
// the id of the user represented by this session
- private String userId = null;
+ private String userName = null;
private static Log log = LogFactory.getLog(RollerSession.class);
@@ -137,12 +137,12 @@
public User getAuthenticatedUser() {
User authenticUser = null;
- if(userId != null) {
+ if(userName != null) {
try {
UserManager mgr =
WebloggerFactory.getWeblogger().getUserManager();
- authenticUser = mgr.getUser(userId);
+ authenticUser = mgr.getUserByUserName(userName);
} catch (WebloggerException ex) {
- log.warn("Error looking up authenticated user "+userId, ex);
+ log.warn("Error looking up authenticated user "+userName, ex);
}
}
@@ -154,7 +154,7 @@
* Authenticated user associated with this session.
*/
public void setAuthenticatedUser(User authenticatedUser) {
- this.userId = authenticatedUser.getId();
+ this.userName = authenticatedUser.getUserName();
}
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java?rev=575781&r1=575780&r2=575781&view=diff
==============================================================================
---
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
(original)
+++
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
Fri Sep 14 12:54:55 2007
@@ -80,7 +80,7 @@
} else if(getBean().getId() != null) {
try {
UserManager mgr =
WebloggerFactory.getWeblogger().getUserManager();
- setUser(mgr.getUser(getBean().getId()));
+ setUser(mgr.getUserByUserName(getBean().getUserName()));
} catch(Exception e) {
log.error("Error looking up user - "+getBean().getId(), e);
}
@@ -93,7 +93,7 @@
*/
public String execute() {
- if (getUser() != null && getUser().getId() != null) {
+ if (getUser() != null && getUser().getUserName() != null) {
// populate form data from user profile data
getBean().copyFrom(getUser(), getLocale());
} else {
@@ -175,7 +175,7 @@
// TODO: replace with struts2 validation
private void myValidate() {
- if(getUser().getId() == null) {
+ if(getUser().getUserName() == null) {
addError("userAdmin.error.userNotFound");
}
if (StringUtils.isEmpty(getBean().getEmailAddress())) {
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java?rev=575781&r1=575780&r2=575781&view=diff
==============================================================================
---
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
(original)
+++
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
Fri Sep 14 12:54:55 2007
@@ -91,11 +91,11 @@
for (WeblogPermission perms : permsList) {
- String sval = getParameter("perm-" + perms.getUser().getId());
+ String sval = getParameter("perm-" +
perms.getUser().getUserName());
if (sval != null) {
boolean error = false;
User user = getAuthenticatedUser();
- if (perms.getUser().getId().equals(user.getId())) {
+ if
(perms.getUser().getUserName().equals(user.getUserName())) {
// if modifying self
if (sval.equals(WeblogPermission.EDIT_DRAFT)
&& (perms.hasAction(WeblogPermission.POST) ||
perms.hasAction(WeblogPermission.ADMIN))) {
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/TestUtils.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/TestUtils.java?rev=575781&r1=575780&r2=575781&view=diff
==============================================================================
---
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/TestUtils.java
(original)
+++
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/TestUtils.java
Fri Sep 14 12:54:55 2007
@@ -147,11 +147,11 @@
/**
* Convenience method for removing a user.
*/
- public static void teardownUser(String id) throws Exception {
+ public static void teardownUser(String userName) throws Exception {
// lookup the user
UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
- User user = mgr.getUser(id);
+ User user = mgr.getUserByUserName(userName, null);
// remove the user
mgr.removeUser(user);
@@ -572,7 +572,7 @@
*/
public static User getManagedUser(User user) throws WebloggerException {
UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
- return mgr.getUser(user.getId());
+ return mgr.getUserByUserName(user.getUserName());
}
/**
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/BookmarkTest.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/BookmarkTest.java?rev=575781&r1=575780&r2=575781&view=diff
==============================================================================
---
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/BookmarkTest.java
(original)
+++
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/BookmarkTest.java
Fri Sep 14 12:54:55 2007
@@ -72,7 +72,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Exception ex) {
log.error("ERROR in tearDown", ex);
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/CommentTest.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/CommentTest.java?rev=575781&r1=575780&r2=575781&view=diff
==============================================================================
---
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/CommentTest.java
(original)
+++
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/CommentTest.java
Fri Sep 14 12:54:55 2007
@@ -82,7 +82,7 @@
try {
TestUtils.teardownWeblogEntry(testEntry.getId());
TestUtils.teardownWeblog(testWeblog.getId());
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/FileManagerTest.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/FileManagerTest.java?rev=575781&r1=575780&r2=575781&view=diff
==============================================================================
---
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/FileManagerTest.java
(original)
+++
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/FileManagerTest.java
Fri Sep 14 12:54:55 2007
@@ -70,7 +70,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderCRUDTest.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderCRUDTest.java?rev=575781&r1=575780&r2=575781&view=diff
==============================================================================
---
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderCRUDTest.java
(original)
+++
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderCRUDTest.java
Fri Sep 14 12:54:55 2007
@@ -66,7 +66,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java?rev=575781&r1=575780&r2=575781&view=diff
==============================================================================
---
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java
(original)
+++
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java
Fri Sep 14 12:54:55 2007
@@ -82,7 +82,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderParentDeletesTest.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderParentDeletesTest.java?rev=575781&r1=575780&r2=575781&view=diff
==============================================================================
---
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderParentDeletesTest.java
(original)
+++
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderParentDeletesTest.java
Fri Sep 14 12:54:55 2007
@@ -68,7 +68,7 @@
log.info("BEGIN");
try {
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/HitCountTest.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/HitCountTest.java?rev=575781&r1=575780&r2=575781&view=diff
==============================================================================
---
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/HitCountTest.java
(original)
+++
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/HitCountTest.java
Fri Sep 14 12:54:55 2007
@@ -76,7 +76,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/PermissionTest.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/PermissionTest.java?rev=575781&r1=575780&r2=575781&view=diff
==============================================================================
---
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/PermissionTest.java
(original)
+++
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/PermissionTest.java
Fri Sep 14 12:54:55 2007
@@ -80,7 +80,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Exception ex) {
log.error("ERROR in tear down", ex);
@@ -231,7 +231,7 @@
// cleanup
TestUtils.teardownPermissions(pendings.get(0));
- TestUtils.teardownUser(user.getId());
+ TestUtils.teardownUser(user.getUserName());
TestUtils.endSession(true);
log.info("END");
@@ -299,7 +299,7 @@
assertEquals(0, weblogs.size());
// cleanup the extra test user
- TestUtils.teardownUser(user.getId());
+ TestUtils.teardownUser(user.getUserName());
TestUtils.endSession(true);
log.info("END");
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/PingsTest.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/PingsTest.java?rev=575781&r1=575780&r2=575781&view=diff
==============================================================================
---
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/PingsTest.java
(original)
+++
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/PingsTest.java
Fri Sep 14 12:54:55 2007
@@ -93,7 +93,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java?rev=575781&r1=575780&r2=575781&view=diff
==============================================================================
---
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java
(original)
+++
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java
Fri Sep 14 12:54:55 2007
@@ -108,7 +108,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/RefererTest.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/RefererTest.java?rev=575781&r1=575780&r2=575781&view=diff
==============================================================================
---
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/RefererTest.java
(original)
+++
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/RefererTest.java
Fri Sep 14 12:54:55 2007
@@ -121,7 +121,7 @@
TestUtils.teardownWeblog(testWeblog.getId());
TestUtils.teardownWeblog(testWeblog2.getId());
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/UserTest.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/UserTest.java?rev=575781&r1=575780&r2=575781&view=diff
==============================================================================
---
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/UserTest.java
(original)
+++
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/UserTest.java
Fri Sep 14 12:54:55 2007
@@ -84,12 +84,12 @@
// add test user
mgr.addUser(testUser);
- String id = testUser.getId();
+ String userName = testUser.getUserName();
TestUtils.endSession(true);
// make sure test user exists
user = null;
- user = mgr.getUser(id);
+ user = mgr.getUserByUserName(userName);
assertNotNull(user);
assertEquals(testUser, user);
@@ -101,7 +101,7 @@
// make sure changes were saved
user = null;
- user = mgr.getUser(id);
+ user = mgr.getUserByUserName(userName);
assertNotNull(user);
assertEquals("testtesttest", user.getScreenName());
assertEquals("testtesttest", user.getFullName());
@@ -112,7 +112,7 @@
// make sure user no longer exists
user = null;
- user = mgr.getUser(id);
+ user = mgr.getUserByUserName(userName);
assertNull(user);
}
@@ -135,9 +135,9 @@
assertEquals(testUser.getUserName(), user.getUserName());
// lookup by id
- String id = user.getId();
+ String userName = user.getUserName();
user = null;
- user = mgr.getUser(id);
+ user = mgr.getUserByUserName(userName);
assertNotNull(user);
assertEquals(testUser.getUserName(), user.getUserName());
@@ -166,7 +166,7 @@
assertNull(user);
// remove test user
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
}
@@ -217,7 +217,7 @@
assertTrue(mgr.hasRole("admin", user));
// remove test user
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
}
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryCRUDTest.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryCRUDTest.java?rev=575781&r1=575780&r2=575781&view=diff
==============================================================================
---
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryCRUDTest.java
(original)
+++
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryCRUDTest.java
Fri Sep 14 12:54:55 2007
@@ -67,7 +67,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryFunctionalityTest.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryFunctionalityTest.java?rev=575781&r1=575780&r2=575781&view=diff
==============================================================================
---
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryFunctionalityTest.java
(original)
+++
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryFunctionalityTest.java
Fri Sep 14 12:54:55 2007
@@ -83,7 +83,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Throwable t) {
log.error(t);
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryParentDeletesTest.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryParentDeletesTest.java?rev=575781&r1=575780&r2=575781&view=diff
==============================================================================
---
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryParentDeletesTest.java
(original)
+++
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryParentDeletesTest.java
Fri Sep 14 12:54:55 2007
@@ -65,7 +65,7 @@
log.info("BEGIN");
try {
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogEntryTest.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogEntryTest.java?rev=575781&r1=575780&r2=575781&view=diff
==============================================================================
---
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogEntryTest.java
(original)
+++
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogEntryTest.java
Fri Sep 14 12:54:55 2007
@@ -86,7 +86,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
@@ -1030,7 +1030,7 @@
TestUtils.teardownWeblog(blog2.getId());
TestUtils.teardownWeblog(blog3.getId());
- TestUtils.teardownUser(user1.getId());
+ TestUtils.teardownUser(user1.getUserName());
TestUtils.endSession(true);
}
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java?rev=575781&r1=575780&r2=575781&view=diff
==============================================================================
---
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java
(original)
+++
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java
Fri Sep 14 12:54:55 2007
@@ -86,7 +86,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java?rev=575781&r1=575780&r2=575781&view=diff
==============================================================================
---
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java
(original)
+++
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java
Fri Sep 14 12:54:55 2007
@@ -112,8 +112,8 @@
TestUtils.teardownComment(comment21.getId());
TestUtils.teardownWeblog(website2.getId());
- TestUtils.teardownUser(user1.getId());
- TestUtils.teardownUser(user2.getId());
+ TestUtils.teardownUser(user1.getUserName());
+ TestUtils.teardownUser(user2.getUserName());
TestUtils.endSession(true);
}
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogTest.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogTest.java?rev=575781&r1=575780&r2=575781&view=diff
==============================================================================
---
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogTest.java
(original)
+++
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogTest.java
Fri Sep 14 12:54:55 2007
@@ -77,7 +77,7 @@
log.info("BEGIN");
try {
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcherTest.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcherTest.java?rev=575781&r1=575780&r2=575781&view=diff
==============================================================================
---
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcherTest.java
(original)
+++
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcherTest.java
Fri Sep 14 12:54:55 2007
@@ -66,7 +66,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java?rev=575781&r1=575780&r2=575781&view=diff
==============================================================================
---
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java
(original)
+++
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java
Fri Sep 14 12:54:55 2007
@@ -60,7 +60,7 @@
protected void tearDown() throws Exception {
TestUtils.teardownWeblogEntry(entry.getId());
TestUtils.teardownWeblog(weblog.getId());
- TestUtils.teardownUser(user.getId());
+ TestUtils.teardownUser(user.getUserName());
}
public void testExcessSizeCommentValidator() {
Modified:
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/xmlrpc/RollerXmlRpcServerTest.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/xmlrpc/RollerXmlRpcServerTest.java?rev=575781&r1=575780&r2=575781&view=diff
==============================================================================
---
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/xmlrpc/RollerXmlRpcServerTest.java
(original)
+++
roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/xmlrpc/RollerXmlRpcServerTest.java
Fri Sep 14 12:54:55 2007
@@ -212,7 +212,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
mockRequest = null;
