You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2005/09/23 04:49:34 UTC
svn commit: r291061 - in /incubator/roller/branches/roller_2.0:
src/org/roller/business/ src/org/roller/model/
src/org/roller/presentation/website/actions/ tests/org/roller/business/
Author: agilliland
Date: Thu Sep 22 19:49:29 2005
New Revision: 291061
URL: http://svn.apache.org/viewcvs?rev=291061&view=rev
Log:
adding "email" to UserManager.createWebsite()
Modified:
incubator/roller/branches/roller_2.0/src/org/roller/business/UserManagerImpl.java
incubator/roller/branches/roller_2.0/src/org/roller/model/UserManager.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java
incubator/roller/branches/roller_2.0/tests/org/roller/business/FileManagerTest.java
incubator/roller/branches/roller_2.0/tests/org/roller/business/UserManagerTest.java
incubator/roller/branches/roller_2.0/tests/org/roller/business/WebsiteTest.java
Modified: incubator/roller/branches/roller_2.0/src/org/roller/business/UserManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/business/UserManagerImpl.java?rev=291061&r1=291060&r2=291061&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/business/UserManagerImpl.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/business/UserManagerImpl.java Thu Sep 22 19:49:29 2005
@@ -232,6 +232,7 @@
String handle,
String name,
String description,
+ String email,
String theme,
String locale,
String timeZone) throws RollerException
@@ -256,7 +257,7 @@
Boolean.FALSE, // emailComments
"", // emailFromAddress
Boolean.TRUE, // isEnabled
- "dummy@example.com", // emailAddress
+ email, // emailAddress
new Date());
website.setEditorTheme(theme);
website.setLocale(locale);
Modified: incubator/roller/branches/roller_2.0/src/org/roller/model/UserManager.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/model/UserManager.java?rev=291061&r1=291060&r2=291061&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/model/UserManager.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/model/UserManager.java Thu Sep 22 19:49:29 2005
@@ -154,6 +154,7 @@
String handle,
String name,
String description,
+ String email,
String theme,
String locale,
String timeZone) throws RollerException;
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java?rev=291061&r1=291060&r2=291061&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java Thu Sep 22 19:49:29 2005
@@ -120,6 +120,7 @@
form.getHandle(),
form.getName(),
form.getDescription(),
+ form.getEmailAddress(),
form.getTheme(),
form.getLocale(),
form.getTimeZone());
Modified: incubator/roller/branches/roller_2.0/tests/org/roller/business/FileManagerTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/tests/org/roller/business/FileManagerTest.java?rev=291061&r1=291060&r2=291061&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/tests/org/roller/business/FileManagerTest.java (original)
+++ incubator/roller/branches/roller_2.0/tests/org/roller/business/FileManagerTest.java Thu Sep 22 19:49:29 2005
@@ -130,7 +130,7 @@
umgr.addUser(user);
umgr.createWebsite(user, pages,
user.getUserName(), user.getUserName(), user.getUserName(),
- "basic", "en_US_WIN", "America/Los_Angeles");
+ "dummy@example.com","basic", "en_US_WIN", "America/Los_Angeles");
mRoller.commit();
WebsiteData website = (WebsiteData)umgr.getWebsites(user,null).get(0);
return website;
Modified: incubator/roller/branches/roller_2.0/tests/org/roller/business/UserManagerTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/tests/org/roller/business/UserManagerTest.java?rev=291061&r1=291060&r2=291061&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/tests/org/roller/business/UserManagerTest.java (original)
+++ incubator/roller/branches/roller_2.0/tests/org/roller/business/UserManagerTest.java Thu Sep 22 19:49:29 2005
@@ -244,7 +244,7 @@
umgr.addUser(user);
umgr.createWebsite(user, pages,
user.getUserName(), user.getUserName(), user.getUserName(),
- "basic", "en_US_WIN", "America/Los_Angeles");
+ "dummy@example.com","basic", "en_US_WIN", "America/Los_Angeles");
getRoller().commit();
// Verify that user has all the goodies
Modified: incubator/roller/branches/roller_2.0/tests/org/roller/business/WebsiteTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/tests/org/roller/business/WebsiteTest.java?rev=291061&r1=291060&r2=291061&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/tests/org/roller/business/WebsiteTest.java (original)
+++ incubator/roller/branches/roller_2.0/tests/org/roller/business/WebsiteTest.java Thu Sep 22 19:49:29 2005
@@ -56,7 +56,7 @@
// Create website for user with those pages
WebsiteData website = umgr.createWebsite(
- user, pages, "testuser", "testuser", "testuser", "basic",
+ user, pages, "testuser", "testuser", "testuser","dummy@example.com","basic",
"en_US_WIN", "America/Los_Angeles");
Timestamp day = new Timestamp(new Date().getTime());