JSR-168 Branch Merge – Fix Reset etc.

I made some progress here is the status for JSR-168. Pretty much all the big stuff is done (Broken reset was the last “blocker”). Here is status:
TODO:
Why to we register too many times?
Why do we doView more than once?
reference/docs/architecture – Update
JSR-168 Preferences – permanently persist in Tool Placement
Re-enable userInfo capabilities once Pluto 1.1.1 is released of we put it into the Sakai repo.
Nice to have
JSR-168 Edit Mode
JSR-168 Help Mode
DONE
PDA – Rename – Done 22111
Test Portlet – Done
Test CSS – Done
Reset – Fixed
PDA Presence – Fixed
My cool SVN statement – merged a branch all by myself!
svn merge -r 21991:HEAD https://source.sakaiproject.org/svn//portal/branches/experimental_portal_branch/
The rest of this is just notes form my desktop.


charles-severances-computer:~/dev/sakai/portal csev$ svn commit
Sending portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java
Sending portal-render-impl/impl/src/java/org/sakaiproject/portal/render/portlet/PortletToolRenderService.java
Transmitting file data ..
Committed revision 22107.
charles-severances-computer:~/dev/sakai/portal csev$
org.sakaiproject.portal.service.PortletTool
charles-severances-computer:~/dev/sakai/portal csev$ vi portal-service-impl/impl/src/java/org/sakaiproject/portal/service/PortletTool.java
m_finalConfig.setProperty(PortalService.TOOL_PORTLET_CONTEXT_PATH, portlet
.getApplicationId());
m_finalConfig.setProperty(PortalService.TOOL_PORTLET_NAME, pdd.getPortletName());
http://localhost:8080/portal/site/9be11bc9-b692-4b7d-005d-0dd86027b355/page/fc5f6cce-11c6-441e-0026-b6340720900b
public class PortalServiceImpl implements PortalService
// To allow us to retain reset state across redirects
public String getResetState()
{
Session s = SessionManager.getCurrentSession();
String ss = (String) s.getAttribute(“reset-stored-state”);
return ss;
}
// Reset the tool state if requested
if (“true”.equals(req.getParameter(portalService.getResetStateParam()))
|| “true”.equals(portalService.getResetState()))
private PortalService portalService;
portalService = org.sakaiproject.portal.api.cover.PortalService.getInstance();
public boolean isPortletPlacement(Placement placement)
{
if ( placement == null ) return false;
Properties toolProps = placement.getTool().getFinalConfig();
if ( toolProps == null ) return false;
String portletContext = toolProps.getProperty(PortalService.TOOL_PORTLET_CONTEXT_PATH);
return (portletContext != null);
}