Author: snoopdave
Date: Wed Apr 19 20:32:02 2006
New Revision: 395468
URL: http://svn.apache.org/viewcvs?rev=395468&view=rev
Log:
Merge fixes for AAPP
Modified:
incubator/roller/trunk/sandbox/atomadminprotocol/src/org/roller/presentation/atomadminapi/RollerMemberHandler.java
incubator/roller/trunk/sandbox/atomadminprotocol/src/org/roller/presentation/atomadminapi/RollerUserHandler.java
incubator/roller/trunk/sandbox/atomadminprotocol/src/org/roller/presentation/atomadminapi/RollerWeblogHandler.java
Modified:
incubator/roller/trunk/sandbox/atomadminprotocol/src/org/roller/presentation/atomadminapi/RollerMemberHandler.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/sandbox/atomadminprotocol/src/org/roller/presentation/atomadminapi/RollerMemberHandler.java?rev=395468&r1=395467&r2=395468&view=diff
==============================================================================
---
incubator/roller/trunk/sandbox/atomadminprotocol/src/org/roller/presentation/atomadminapi/RollerMemberHandler.java
(original)
+++
incubator/roller/trunk/sandbox/atomadminprotocol/src/org/roller/presentation/atomadminapi/RollerMemberHandler.java
Wed Apr 19 20:32:02 2006
@@ -272,7 +272,7 @@
for (int i = 0; i < c.getEntries().length; i++) {
MemberEntry entry = (MemberEntry)c.getEntries()[i];
PermissionsData pd = toPermissionsData(entry);
- mgr.storePermissions(pd);
+ mgr.savePermissions(pd);
}
getRoller().flush();
} catch (RollerException re) {
@@ -344,7 +344,7 @@
CacheManager.invalidate(wd);
UserManager mgr = getRoller().getUserManager();
- mgr.storePermissions(pd);
+ mgr.savePermissions(pd);
} catch (RollerException re) {
throw new InternalException("ERROR: Could not update permissions
data", re);
Modified:
incubator/roller/trunk/sandbox/atomadminprotocol/src/org/roller/presentation/atomadminapi/RollerUserHandler.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/sandbox/atomadminprotocol/src/org/roller/presentation/atomadminapi/RollerUserHandler.java?rev=395468&r1=395467&r2=395468&view=diff
==============================================================================
---
incubator/roller/trunk/sandbox/atomadminprotocol/src/org/roller/presentation/atomadminapi/RollerUserHandler.java
(original)
+++
incubator/roller/trunk/sandbox/atomadminprotocol/src/org/roller/presentation/atomadminapi/RollerUserHandler.java
Wed Apr 19 20:32:02 2006
@@ -194,7 +194,7 @@
}
updateUserData(ud, entry);
- mgr.storeUser(ud);
+ mgr.saveUser(ud);
}
getRoller().flush();
} catch (RollerException re) {
Modified:
incubator/roller/trunk/sandbox/atomadminprotocol/src/org/roller/presentation/atomadminapi/RollerWeblogHandler.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/sandbox/atomadminprotocol/src/org/roller/presentation/atomadminapi/RollerWeblogHandler.java?rev=395468&r1=395467&r2=395468&view=diff
==============================================================================
---
incubator/roller/trunk/sandbox/atomadminprotocol/src/org/roller/presentation/atomadminapi/RollerWeblogHandler.java
(original)
+++
incubator/roller/trunk/sandbox/atomadminprotocol/src/org/roller/presentation/atomadminapi/RollerWeblogHandler.java
Wed Apr 19 20:32:02 2006
@@ -17,6 +17,7 @@
import org.jdom.JDOMException;
import org.jdom.input.SAXBuilder;
import org.roller.RollerException;
+import org.roller.config.RollerConfig;
import org.roller.model.UserManager;
import org.roller.pojos.PermissionsData;
import org.roller.pojos.UserData;
@@ -186,7 +187,18 @@
for (int i = 0; i < c.getEntries().length; i++) {
WeblogEntry entry = (WeblogEntry)c.getEntries()[i];
UserData user = mgr.getUser(entry.getCreatingUser());
- WebsiteData wd = mgr.createWebsite(user, pages,
entry.getHandle(), entry.getName(), entry.getDescription(),
entry.getEmailAddress(), DEFAULT_THEME, entry.getLocale(), entry.getTimezone());
+ WebsiteData wd = new WebsiteData(
+ entry.getHandle(),
+ user,
+ entry.getName(),
+ entry.getDescription(),
+ entry.getEmailAddress(),
+ entry.getEmailAddress(),
+ DEFAULT_THEME,
+ entry.getLocale(),
+ entry.getTimezone());
+ wd.setEditorPage(RollerConfig.getProperty("newweblog.editor"));
+ mgr.addWebsite(wd);
}
getRoller().flush();
} catch (RollerException re) {
@@ -235,7 +247,7 @@
try {
UserManager mgr = getRoller().getUserManager();
- mgr.storeWebsite(wd);
+ mgr.saveWebsite(wd);
CacheManager.invalidate(wd);
} catch (RollerException re) {
