tag:old.nabble.com,2006:forum-14377
Nabble - Jetspeed
2009-12-09T11:03:21Z
Jetspeed is an Open Source implementation of an Enterprise Information Portal, using Java and XML. Jetspeed home is <a href="http://portals.apache.org/jetspeed-1/" target="_top" rel="nofollow">here</a>.
tag:old.nabble.com,2006:post-26715780
svn commit: r888925 - in /portals/jetspeed-2/applications/j2-admin/trunk/src/main: java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java java/org/apache/jetspeed/portlets/toolbox/LayoutBean.java webapp/WEB-INF/view/toolbox/toolbox.jsp
2009-12-09T11:03:21Z
2009-12-09T11:03:21Z
woonsan
Author: woonsan
<br>Date: Wed Dec 9 19:03:21 2009
<br>New Revision: 888925
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=888925&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=888925&view=rev</a><br>Log:
<br>JS2-1057: Fixing layout/theme selection.
<br><br>Modified:
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/LayoutBean.java
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java?rev=888925&r1=888924&r2=888925&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java?rev=888925&r1=888924&r2=888925&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java Wed Dec 9 19:03:21 2009
<br>@@ -34,16 +34,13 @@
<br> import org.apache.commons.lang.math.NumberUtils;
<br> import org.apache.jetspeed.CommonPortletServices;
<br> import org.apache.jetspeed.JetspeedActions;
<br>-import org.apache.jetspeed.components.portletregistry.PortletRegistry;
<br> import org.apache.jetspeed.decoration.DecorationFactory;
<br>+import org.apache.jetspeed.layout.PageLayoutComponent;
<br> import org.apache.jetspeed.om.page.ContentFragment;
<br> import org.apache.jetspeed.om.page.ContentPage;
<br> import org.apache.jetspeed.om.page.Fragment;
<br> import org.apache.jetspeed.portlet.HeaderPhaseSupportConstants;
<br>-import org.apache.jetspeed.profiler.Profiler;
<br> import org.apache.jetspeed.request.RequestContext;
<br>-import org.apache.jetspeed.search.SearchEngine;
<br>-import org.apache.jetspeed.security.SecurityAccessController;
<br> import org.apache.portals.bridges.common.GenericServletPortlet;
<br> import org.slf4j.Logger;
<br> import org.slf4j.LoggerFactory;
<br>@@ -59,11 +56,8 @@
<br> {
<br> static Logger log = LoggerFactory.getLogger(JetspeedToolbox.class);
<br>
<br>- protected PortletRegistry registry;
<br>- protected SearchEngine searchEngine;
<br>- protected Profiler profiler;
<br>- protected SecurityAccessController securityAccessController;
<br>- protected DecorationFactory decorationFactory;
<br>+ protected PageLayoutComponent pageLayoutComponent;
<br>+ protected DecorationFactory decorationFactory;
<br> protected String yuiScriptPath = "/javascript/yui/build/yui/yui-min.js";
<br>
<br> public void init(PortletConfig config) throws PortletException
<br>@@ -72,28 +66,16 @@
<br>
<br> PortletContext context = getPortletContext();
<br>
<br>- registry = (PortletRegistry)context.getAttribute(CommonPortletServices.CPS_REGISTRY_COMPONENT);
<br>- if (null == registry)
<br>- {
<br>- throw new PortletException("Failed to find the Portlet Registry on portlet initialization");
<br>- }
<br>- searchEngine = (SearchEngine)context.getAttribute(CommonPortletServices.CPS_SEARCH_COMPONENT);
<br>- if (null == searchEngine)
<br>- {
<br>- throw new PortletException("Failed to find the Search Engine on portlet initialization");
<br>- }
<br>- securityAccessController = (SecurityAccessController)context.getAttribute(CommonPortletServices.CPS_SECURITY_ACCESS_CONTROLLER);
<br>- if (null == securityAccessController)
<br>- {
<br>- throw new PortletException("Failed to find the Security Access Controller on portlet initialization");
<br>- }
<br>- profiler = (Profiler)context.getAttribute(CommonPortletServices.CPS_PROFILER_COMPONENT);
<br>- if (null == profiler)
<br>+ pageLayoutComponent = (PageLayoutComponent) context.getAttribute(CommonPortletServices.CPS_PAGE_LAYOUT_COMPONENT);
<br>+
<br>+ if (pageLayoutComponent == null)
<br> {
<br>- throw new PortletException("Failed to find the Profiler on portlet initialization");
<br>+ throw new PortletException("Failed to find the Page Layout Component on portlet initialization");
<br> }
<br>+
<br> decorationFactory = (DecorationFactory)context.getAttribute(CommonPortletServices.CPS_DECORATION_FACTORY);
<br>- if (null == decorationFactory)
<br>+
<br>+ if (decorationFactory == null)
<br> {
<br> throw new PortletException("Failed to find the Decoration Factory on portlet initialization");
<br> }
<br>@@ -131,7 +113,8 @@
<br> try
<br> {
<br> RequestContext requestContext = (RequestContext) request.getAttribute(RequestContext.REQUEST_PORTALENV);
<br>- requestContext.getPage().checkAccess(JetspeedActions.EDIT);
<br>+ ContentPage contentPage = requestContext.getPage();
<br>+ contentPage.checkAccess(JetspeedActions.EDIT);
<br> hasEditAccess = true;
<br> }
<br> catch(Exception ignore)
<br>@@ -153,12 +136,11 @@
<br>
<br> if (theme != null)
<br> {
<br>- ContentPage page = requestContext.getPage();
<br>-
<br> try
<br> {
<br>- page.updateDefaultDecorator(theme, ContentFragment.LAYOUT);
<br>- page.updateDefaultDecorator(theme, ContentFragment.PORTLET);
<br>+ ContentPage page = requestContext.getPage();
<br>+ pageLayoutComponent.updateDefaultDecorator(page, theme, ContentFragment.LAYOUT);
<br>+ pageLayoutComponent.updateDefaultDecorator(page, theme, ContentFragment.LAYOUT);
<br> actionRequest.getPortletSession().removeAttribute("themes");
<br> }
<br> catch (Exception e)
<br>@@ -169,12 +151,10 @@
<br>
<br> if (layout != null)
<br> {
<br>- ContentPage page = requestContext.getPage();
<br>- ContentFragment layoutFragment = page.getRootFragment();
<br>-
<br> try
<br> {
<br>- layoutFragment.updateName(layout);
<br>+ ContentFragment layoutFragment = pageLayoutComponent.getUnlockedRootFragment(requestContext.getPage());
<br>+ pageLayoutComponent.updateName(layoutFragment, layout);
<br> actionRequest.getPortletSession().removeAttribute("layouts");
<br> }
<br> catch (Exception e)
<br>@@ -182,23 +162,6 @@
<br> log.error("Page has not been updated.", e);
<br> }
<br> }
<br>-
<br>- String portletAdd = actionRequest.getParameter("portletAdd");
<br>-
<br>- if (portletAdd != null)
<br>- {
<br>- // BOZO: this should be done via AJAX API
<br>- ContentPage page = requestContext.getPage();
<br>-
<br>- try
<br>- {
<br>- addPortletToLeastUsedColumn(page, portletAdd);
<br>- }
<br>- catch (Exception e)
<br>- {
<br>- log.error("Unable to add portlet to page: " + e, e);
<br>- }
<br>- }
<br> }
<br>
<br> @SuppressWarnings("unchecked")
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/LayoutBean.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/LayoutBean.java?rev=888925&r1=888924&r2=888925&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/LayoutBean.java?rev=888925&r1=888924&r2=888925&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/LayoutBean.java (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/LayoutBean.java Wed Dec 9 19:03:21 2009
<br>@@ -23,6 +23,8 @@
<br> import javax.portlet.PortletRequest;
<br>
<br> import org.apache.jetspeed.decoration.DecorationFactory;
<br>+import org.apache.jetspeed.om.page.ContentFragment;
<br>+import org.apache.jetspeed.om.page.ContentPage;
<br> import org.apache.jetspeed.request.RequestContext;
<br>
<br> public class LayoutBean implements Serializable
<br>@@ -103,24 +105,28 @@
<br> RequestContext rc = (RequestContext) request.getAttribute(RequestContext.REQUEST_PORTALENV);
<br> // BOZO: support 4 for now, need to localize, formalize etc
<br> LayoutBean single = new LayoutBean("OneColumn", "One Column", "OneColumn.jpg", "jetspeed-layouts::VelocityOneColumn");
<br>- addLayout(single, rc, layouts);
<br>+ layouts.add(single);
<br> LayoutBean twoColumns = new LayoutBean("TwoColumn", "Two Columns", "TwoColumns.jpg", "jetspeed-layouts::VelocityTwoColumns");
<br>- addLayout(twoColumns, rc, layouts);
<br>+ layouts.add(twoColumns);
<br> LayoutBean threeColumns = new LayoutBean("ThreeColumn", "Three Columns", "ThreeColumns.jpg", "jetspeed-layouts::VelocityThreeColumns");
<br>- addLayout(threeColumns, rc, layouts);
<br>+ layouts.add(threeColumns);
<br> LayoutBean fourColumns = new LayoutBean("FourColumn", "Four Columns", "FourColumns.jpg", "jetspeed-layouts::VelocityFourColumns");
<br>- addLayout(fourColumns, rc, layouts);
<br>- request.getPortletSession().setAttribute("layouts", layouts);
<br>- return layouts;
<br>- }
<br>-
<br>- private static void addLayout(LayoutBean bean, RequestContext rc, List<LayoutBean> layouts)
<br>- {
<br>- if (rc.getPage().getRootFragment().getName().equals(bean.getLayoutPortlet()))
<br>+ layouts.add(fourColumns);
<br>+
<br>+ ContentPage page = rc.getPage();
<br>+ ContentFragment layoutFragment = page.getPageLayoutComponent().getUnlockedRootFragment(page);
<br>+ String currentLayoutName = layoutFragment.getName();
<br>+
<br>+ for (LayoutBean layout : layouts)
<br> {
<br>- bean.setSelected(true);
<br>+ if (layout.getLayoutPortlet().equals(currentLayoutName))
<br>+ {
<br>+ layout.setSelected(true);
<br>+ }
<br> }
<br>- layouts.add(bean);
<br>+
<br>+ request.getPortletSession().setAttribute("layouts", layouts);
<br>+ return layouts;
<br> }
<br> }
<br>
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=888925&r1=888924&r2=888925&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=888925&r1=888924&r2=888925&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp Wed Dec 9 19:03:21 2009
<br>@@ -290,8 +290,8 @@
<br> };
<br>
<br> var onAddPortletComplete = function(id, o, args) {
<br>- if (o.status == 200 && o.readyState == 4) {
<br>- location.reload();
<br>+ if (o.status == 200) {
<br>+ location.href = location.href;
<br> }
<br> };
<br>
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26715780&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26715780&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26715745
svn commit: r888923 - in /portals/jetspeed-2/portal/trunk: components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/ components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/ jetspeed-api/src/main/java/org/apache/jetspeed/la...
2009-12-09T11:01:04Z
2009-12-09T11:01:04Z
woonsan
Author: woonsan
<br>Date: Wed Dec 9 19:01:03 2009
<br>New Revision: 888923
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=888923&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=888923&view=rev</a><br>Log:
<br>JS2-1057: Adding a method to retrieve unlocked root fragment.
<br><br>Modified:
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java
<br> portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PageLayoutComponent.java
<br> portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java?rev=888923&r1=888922&r2=888923&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java?rev=888923&r1=888922&r2=888923&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java Wed Dec 9 19:01:03 2009
<br>@@ -1440,7 +1440,28 @@
<br> throw new PageLayoutComponentException("Unexpected exception: "+e, e);
<br> }
<br> }
<br>-
<br>+
<br>+ /* (non-Javadoc)
<br>+ * @see org.apache.jetspeed.layout.PageLayoutComponent#getUnlockedRootFragment(org.apache.jetspeed.om.page.ContentPage)
<br>+ */
<br>+ public ContentFragment getUnlockedRootFragment(ContentPage contentPage)
<br>+ {
<br>+ ContentFragment rootFragment = contentPage.getRootFragment();
<br>+
<br>+ if (rootFragment.isLocked())
<br>+ {
<br>+ for (ContentFragment f : (List<ContentFragment>) rootFragment.getFragments())
<br>+ {
<br>+ if (!f.isLocked() && f.getType().equals(ContentFragment.LAYOUT))
<br>+ {
<br>+ return f;
<br>+ }
<br>+ }
<br>+ }
<br>+
<br>+ return rootFragment;
<br>+ }
<br>+
<br> /**
<br> * Merge content page attributes from source PSML page.
<br> *
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java?rev=888923&r1=888922&r2=888923&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java?rev=888923&r1=888922&r2=888923&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java Wed Dec 9 19:01:03 2009
<br>@@ -29,6 +29,7 @@
<br> import org.apache.jetspeed.decoration.Theme;
<br> import org.apache.jetspeed.headerresource.HeaderResource;
<br> import org.apache.jetspeed.headerresource.HeaderResourceFactory;
<br>+import org.apache.jetspeed.layout.PageLayoutComponent;
<br> import org.apache.jetspeed.om.page.ContentFragment;
<br> import org.apache.jetspeed.pipeline.PipelineException;
<br> import org.apache.jetspeed.portlet.HeadElement;
<br>@@ -48,12 +49,14 @@
<br> {
<br> private PortletRenderer renderer;
<br> private HeaderResourceFactory headerFactory;
<br>+ private PageLayoutComponent pageLayoutComponent;
<br> private String layoutTemplate;
<br>
<br>- public Jetui(PortletRenderer renderer, HeaderResourceFactory headerFactory, String layoutTemplate)
<br>+ public Jetui(PortletRenderer renderer, HeaderResourceFactory headerFactory, PageLayoutComponent pageLayoutComponent, String layoutTemplate)
<br> {
<br> this.renderer = renderer;
<br> this.headerFactory = headerFactory;
<br>+ this.pageLayoutComponent = pageLayoutComponent;
<br> this.layoutTemplate = layoutTemplate;
<br> }
<br>
<br>@@ -64,18 +67,7 @@
<br> {
<br> RequestDispatcher dispatcher = request.getRequest().getRequestDispatcher(layoutTemplate);
<br> request.setAttribute("jetui", this);
<br>- ContentFragment rootFragment = request.getPage().getRootFragment();
<br>- if (rootFragment.isLocked())
<br>- {
<br>- for (ContentFragment f : (List<ContentFragment>)rootFragment.getFragments())
<br>- {
<br>- if (!f.isLocked() && f.getType().equals(ContentFragment.LAYOUT))
<br>- {
<br>- rootFragment = f;
<br>- break;
<br>- }
<br>- }
<br>- }
<br>+ ContentFragment rootFragment = pageLayoutComponent.getUnlockedRootFragment(request.getPage());
<br> if (maximized == null)
<br> {
<br> String jetspeedLayout = rootFragment.getName();
<br><br>Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PageLayoutComponent.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PageLayoutComponent.java?rev=888923&r1=888922&r2=888923&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PageLayoutComponent.java?rev=888923&r1=888922&r2=888923&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PageLayoutComponent.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PageLayoutComponent.java Wed Dec 9 19:01:03 2009
<br>@@ -280,4 +280,13 @@
<br> * @param shortTitle page short title
<br> */
<br> void updateTitles(ContentPage contentPage, String title, String shortTitle);
<br>+
<br>+ /**
<br>+ * Returns the root fragment which is not locked and not merged from a page template
<br>+ *
<br>+ * @param contentPage content page context
<br>+ * @return
<br>+ */
<br>+ ContentFragment getUnlockedRootFragment(ContentPage contentPage);
<br>+
<br> }
<br><br>Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml?rev=888923&r1=888922&r2=888923&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml?rev=888923&r1=888922&r2=888923&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml (original)
<br>+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml Wed Dec 9 19:01:03 2009
<br>@@ -914,10 +914,11 @@
<br> <meta key="j2:cat" value="default" />
<br> <constructor-arg><ref bean="org.apache.jetspeed.aggregator.PortletRenderer"/></constructor-arg>
<br> <constructor-arg><ref bean="org.apache.jetspeed.headerresource.HeaderResourceFactory"/></constructor-arg>
<br>+ <constructor-arg><ref bean="org.apache.jetspeed.layout.PageLayoutComponent" /></constructor-arg>
<br> <constructor-arg><value>/WEB-INF/jetui/yui/jetui.jsp</value></constructor-arg>
<br> </bean>
<br>
<br>- <bean id="jetuiAggregator" class="org.apache.jetspeed.ui.JetuiAggregatorImpl">
<br>+ <bean id="jetuiAggregator" class="org.apache.jetspeed.ui.JetuiAggregatorImpl">
<br> <meta key="j2:cat" value="default" />
<br> <constructor-arg index="0">
<br> <ref bean="org.apache.jetspeed.aggregator.PortletRenderer" />
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26715745&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26715745&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26712851
svn commit: r888853 - in /portals/jetspeed-2/portal/trunk: components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/ jetspeed-portal-resources/src/main/resources/assembly/
2009-12-09T08:09:58Z
2009-12-09T08:09:58Z
woonsan
Author: woonsan
<br>Date: Wed Dec 9 16:09:57 2009
<br>New Revision: 888853
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=888853&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=888853&view=rev</a><br>Log:
<br>JS2-1087: Removing static access to jetspeed component manager from jaxrs application.
<br><br>Added:
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/JaxrsServiceValve.java (with props)
<br>Removed:
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/JetspeedJaxrsApplication.java
<br>Modified:
<br> portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml
<br> portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml
<br><br>Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/JaxrsServiceValve.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/JaxrsServiceValve.java?rev=888853&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/JaxrsServiceValve.java?rev=888853&view=auto</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/JaxrsServiceValve.java (added)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/JaxrsServiceValve.java Wed Dec 9 16:09:57 2009
<br>@@ -0,0 +1,117 @@
<br>+/*
<br>+ * Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ * contributor license agreements. See the NOTICE file distributed with
<br>+ * this work for additional information regarding copyright ownership.
<br>+ * The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ * (the "License"); you may not use this file except in compliance with
<br>+ * the License. You may obtain a copy of the License at
<br>+ *
<br>+ * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+ *
<br>+ * Unless required by applicable law or agreed to in writing, software
<br>+ * distributed under the License is distributed on an "AS IS" BASIS,
<br>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ * See the License for the specific language governing permissions and
<br>+ * limitations under the License.
<br>+ */
<br>+package org.apache.jetspeed.services.rest;
<br>+
<br>+import org.apache.commons.beanutils.MethodUtils;
<br>+import org.apache.jetspeed.pipeline.PipelineException;
<br>+import org.apache.jetspeed.pipeline.valve.AbstractValve;
<br>+import org.apache.jetspeed.pipeline.valve.ValveContext;
<br>+import org.apache.jetspeed.request.RequestContext;
<br>+import org.slf4j.Logger;
<br>+import org.slf4j.LoggerFactory;
<br>+
<br>+/**
<br>+ * JaxrsServiceValve
<br>+ *
<br>+ * @version $Id$
<br>+ */
<br>+public class JaxrsServiceValve extends AbstractValve
<br>+{
<br>+
<br>+ private static final Logger log = LoggerFactory.getLogger(JaxrsServiceValve.class);
<br>+
<br>+ private Class<?> busFactoryClass; // org.apache.cxf.BusFactory
<br>+ private Object bus; // org.apache.cxf.Bus
<br>+ private Object servletController; // org.apache.cxf.transport.servlet.ServletController
<br>+ private Object jaxrsServerFactoryBean; // org.apache.cxf.jaxrs.JAXRSServerFactoryBean
<br>+
<br>+ public JaxrsServiceValve(Class<?> busFactoryClass, Object bus, Object servletController, Object jaxrsServerFactoryBean)
<br>+ {
<br>+ this.busFactoryClass = busFactoryClass;
<br>+ this.bus = bus;
<br>+ this.servletController = servletController;
<br>+ this.jaxrsServerFactoryBean = jaxrsServerFactoryBean;
<br>+ }
<br>+
<br>+ @Override
<br>+ public void initialize() throws PipelineException
<br>+ {
<br>+ try
<br>+ {
<br>+ MethodUtils.invokeStaticMethod(busFactoryClass, "setThreadDefaultBus", new Object [] { bus });
<br>+ MethodUtils.invokeMethod(jaxrsServerFactoryBean, "create", null);
<br>+ }
<br>+ catch (Exception e)
<br>+ {
<br>+ log.error("Failed to initialize jaxrs server.", e);
<br>+ }
<br>+ finally
<br>+ {
<br>+ try
<br>+ {
<br>+ MethodUtils.invokeStaticMethod(busFactoryClass, "setThreadDefaultBus", new Object [] { null });
<br>+ }
<br>+ catch (Exception ignore)
<br>+ {
<br>+ }
<br>+ }
<br>+ }
<br>+
<br>+ public void destroy()
<br>+ {
<br>+ try
<br>+ {
<br>+ MethodUtils.invokeMethod(bus, "shutdown", Boolean.TRUE);
<br>+ }
<br>+ catch (Exception e)
<br>+ {
<br>+ log.error("Failed to destroy jaxrs bus.", e);
<br>+ }
<br>+ }
<br>+
<br>+ @Override
<br>+ public void invoke(RequestContext request, ValveContext context) throws PipelineException
<br>+ {
<br>+ try
<br>+ {
<br>+ MethodUtils.invokeStaticMethod(busFactoryClass, "setThreadDefaultBus", new Object [] { bus });
<br>+ MethodUtils.invokeMethod(servletController, "invoke", new Object [] { request.getRequest(), request.getResponse() });
<br>+ }
<br>+ catch (Exception e)
<br>+ {
<br>+ if (log.isDebugEnabled())
<br>+ {
<br>+ log.error("Failed to invoke jaxrs service.", e);
<br>+ }
<br>+ else
<br>+ {
<br>+ log.error("Failed to invoke jaxrs service. {}", e.toString());
<br>+ }
<br>+ }
<br>+ finally
<br>+ {
<br>+ try
<br>+ {
<br>+ MethodUtils.invokeStaticMethod(busFactoryClass, "setThreadDefaultBus", new Object [] { null });
<br>+ }
<br>+ catch (Exception ignore)
<br>+ {
<br>+ }
<br>+ }
<br>+ }
<br>+
<br>+}
<br><br>Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/JaxrsServiceValve.java
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/JaxrsServiceValve.java
<br>------------------------------------------------------------------------------
<br> svn:keywords = Id
<br><br>Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/JaxrsServiceValve.java
<br>------------------------------------------------------------------------------
<br> svn:mime-type = text/plain
<br><br>Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml?rev=888853&r1=888852&r2=888853&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml?rev=888853&r1=888852&r2=888853&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml (original)
<br>+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml Wed Dec 9 16:09:57 2009
<br>@@ -32,43 +32,6 @@
<br> </property>
<br> </bean>
<br>
<br>- <!-- To set resource singletons bean id properties -->
<br>- <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
<br>- <meta key="j2:cat" value="default" />
<br>- <property name="targetClass" value="java.lang.System"/>
<br>- <property name="targetMethod" value="setProperty"/>
<br>- <property name="arguments">
<br>- <list>
<br>- <value>org.apache.jetspeed.services.rest.singletons</value>
<br>- <value>org.apache.jetspeed.services.rest.singletons</value>
<br>- </list>
<br>- </property>
<br>- </bean>
<br>-
<br>- <!-- Delegating CXF Servlet -->
<br>- <bean id="cxfServlet" class="org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet">
<br>- <meta key="j2:cat" value="default" />
<br>- </bean>
<br>-
<br>- <!-- CXF Servlet Config -->
<br>- <bean id="cxfServletConfig" class="org.apache.jetspeed.pipeline.valve.impl.ServletDelegatingValve$ServletConfigImpl">
<br>- <meta key="j2:cat" value="default" />
<br>- <constructor-arg value="CXFNonSpringJaxrsServlet" />
<br>- <constructor-arg>
<br>- <props>
<br>- <prop key="javax.ws.rs.Application">
<br>- org.apache.jetspeed.services.rest.JetspeedJaxrsApplication
<br>- </prop>
<br>- </props>
<br>- </constructor-arg>
<br>- <property name="servletContext">
<br>- <bean class="org.springframework.beans.factory.config.PropertyPathFactoryBean">
<br>- <property name="targetObject" ref="javax.servlet.ServletConfig" />
<br>- <property name="propertyPath" value="servletContext"/>
<br>- </bean>
<br>- </property>
<br>- </bean>
<br>-
<br> <bean id="jacksonObjectMapper" class="org.codehaus.jackson.map.ObjectMapper">
<br> <meta key="j2:cat" value="default" />
<br> </bean>
<br>@@ -116,20 +79,56 @@
<br> <property name="mapper" ref="jacksonObjectMapper" />
<br> </bean>
<br>
<br>- <!-- JAX-RS Service Singleton Resource Beans -->
<br>- <bean id="org.apache.jetspeed.services.rest.singletons" class="org.springframework.beans.factory.config.SetFactoryBean">
<br>+ <bean id="cxfJaxrsBus" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
<br> <meta key="j2:cat" value="default" />
<br>- <property name="sourceSet">
<br>- <set>
<br>-
<br>- <!-- JAX-RS Providers -->
<br>+ <property name="targetClass" value="org.apache.cxf.BusFactory"/>
<br>+ <property name="targetMethod" value="getThreadDefaultBus"/>
<br>+ <property name="arguments">
<br>+ <list>
<br>+ <value>true</value>
<br>+ </list>
<br>+ </property>
<br>+ </bean>
<br>+
<br>+ <bean id="cxfDestinationFactory" class="org.apache.cxf.transport.servlet.ServletTransportFactory">
<br>+ <meta key="j2:cat" value="default" />
<br>+ <constructor-arg ref="cxfJaxrsBus" />
<br>+ </bean>
<br>+
<br>+ <bean id="cxfJaxrsServletController" class="org.apache.cxf.transport.servlet.ServletController">
<br>+ <meta key="j2:cat" value="default" />
<br>+ <constructor-arg ref="cxfDestinationFactory" />
<br>+ <constructor-arg ref="javax.servlet.ServletConfig" />
<br>+ <constructor-arg>
<br>+ <bean class="org.springframework.beans.factory.config.PropertyPathFactoryBean">
<br>+ <meta key="j2:cat" value="default" />
<br>+ <property name="targetObject" ref="javax.servlet.ServletConfig" />
<br>+ <property name="propertyPath" value="servletContext"/>
<br>+ </bean>
<br>+ </constructor-arg>
<br>+ <constructor-arg ref="cxfJaxrsBus" />
<br>+ </bean>
<br>+
<br>+ <bean id="cxfJaxrsServerFactoryBean" class="org.apache.cxf.jaxrs.JAXRSServerFactoryBean">
<br>+ <meta key="j2:cat" value="default" />
<br>+ <property name="address" value="/" />
<br>+ <property name="destinationFactory" ref="cxfDestinationFactory" />
<br>+ <property name="providers">
<br>+ <list>
<br> <ref bean="jaxrsJsonProvider" />
<br>-
<br>- <!-- Resource providers -->
<br>- <ref bean="jaxrsPortletRegistryService" />
<br>- <ref bean="jaxrsPageManagementService" />
<br>-
<br>- </set>
<br>+ </list>
<br>+ </property>
<br>+ <property name="resourceProviders">
<br>+ <list>
<br>+ <bean class="org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider">
<br>+ <meta key="j2:cat" value="default" />
<br>+ <constructor-arg ref="jaxrsPortletRegistryService" />
<br>+ </bean>
<br>+ <bean class="org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider">
<br>+ <meta key="j2:cat" value="default" />
<br>+ <constructor-arg ref="jaxrsPageManagementService" />
<br>+ </bean>
<br>+ </list>
<br> </property>
<br> </bean>
<br>
<br><br>Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml?rev=888853&r1=888852&r2=888853&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml?rev=888853&r1=888852&r2=888853&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml (original)
<br>+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml Wed Dec 9 16:09:57 2009
<br>@@ -350,11 +350,13 @@
<br> </constructor-arg>
<br> </bean>
<br>
<br>- <bean id="RestfulServicesValve" class="org.apache.jetspeed.pipeline.valve.impl.ServletDelegatingValve"
<br>+ <bean id="RestfulServicesValve" class="org.apache.jetspeed.services.rest.JaxrsServiceValve"
<br> init-method="initialize" destroy-method="destroy">
<br> <meta key="j2:cat" value="default" />
<br>- <constructor-arg ref="cxfServlet" />
<br>- <constructor-arg ref="cxfServletConfig" />
<br>+ <constructor-arg value="org.apache.cxf.BusFactory" />
<br>+ <constructor-arg ref="cxfJaxrsBus" />
<br>+ <constructor-arg ref="cxfJaxrsServletController" />
<br>+ <constructor-arg ref="cxfJaxrsServerFactoryBean" />
<br> </bean>
<br>
<br> <bean id="DecorationValve" class="org.apache.jetspeed.decoration.DecorationValve" init-method="initialize">
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26712851&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26712851&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26705786
svn commit: r888711 - in /portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src: main/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java
2009-12-08T22:33:07Z
2009-12-08T22:33:07Z
Ate Douma-2
Author: ate
<br>Date: Wed Dec 9 06:33:06 2009
<br>New Revision: 888711
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=888711&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=888711&view=rev</a><br>Log:
<br>JS2-1088: fixing TestUserInfoManager testcase
<br>As the UserInfoManager no longer retrieves user attributes from the UserManager but takes them directly from the Subject UserPrincipal, the testcase needed to be adjusted to use a properly setup UserPrincipal to test against as well.
<br>Also, I've fixed a small glitch I introduced with my previous changes to never return null for an authenticated User (by the way untested by the testcase)
<br><br>Modified:
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java?rev=888711&r1=888710&r2=888711&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java?rev=888711&r1=888710&r2=888711&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java Wed Dec 9 06:33:06 2009
<br>@@ -104,11 +104,16 @@
<br> log.debug("Getting user info for portlet application: " + appName);
<br>
<br> Map<String, String> userInfo = getUserInformation(context);
<br>- if (null == userInfo || userInfo.isEmpty())
<br>+ if (null == userInfo)
<br> {
<br>- log.debug(PortletRequest.USER_INFO + " is null or empty");
<br>+ log.debug(PortletRequest.USER_INFO + " is null");
<br> return null;
<br> }
<br>+ else if (userInfo.isEmpty())
<br>+ {
<br>+ log.debug(PortletRequest.USER_INFO + " is empty");
<br>+ return Collections.emptyMap();
<br>+ }
<br>
<br> return mapUserInfo(userInfo, getLinkedUserAttr(appName));
<br> }
<br>@@ -149,17 +154,20 @@
<br> protected Map<String, String> mapUserInfo(Map<String, String> userInfo, List<UserAttributeRef> linkedUserAttributes)
<br> {
<br> Map<String, String>userInfoMap = new HashMap<String, String>();
<br>- for (UserAttributeRef currentAttributeRef : linkedUserAttributes)
<br>+ if (linkedUserAttributes != null)
<br> {
<br>- String key = currentAttributeRef.getNameLink();
<br>- String name = currentAttributeRef.getName();
<br>- if (key == null)
<br>- {
<br>- key = name;
<br>- }
<br>- if (userInfo.containsKey(key))
<br>+ for (UserAttributeRef currentAttributeRef : linkedUserAttributes)
<br> {
<br>- userInfoMap.put(name, userInfo.get(key));
<br>+ String key = currentAttributeRef.getNameLink();
<br>+ String name = currentAttributeRef.getName();
<br>+ if (key == null)
<br>+ {
<br>+ key = name;
<br>+ }
<br>+ if (userInfo.containsKey(key))
<br>+ {
<br>+ userInfoMap.put(name, userInfo.get(key));
<br>+ }
<br> }
<br> }
<br> return userInfoMap;
<br>@@ -194,4 +202,4 @@
<br> }
<br> return userInfo;
<br> }
<br>-}
<br>\ No newline at end of file
<br>+}
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java?rev=888711&r1=888710&r2=888711&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java?rev=888711&r1=888710&r2=888711&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java Wed Dec 9 06:33:06 2009
<br>@@ -169,9 +169,20 @@
<br> * @return The request context.
<br> */
<br> private RequestContext initRequestContext(String username)
<br>- {
<br>+ {
<br> RequestContext request = new MockRequestContext("default-other");
<br>- request.setSubject(JetspeedSubjectFactory.createSubject(new UserImpl(username), null, null, null));
<br>+ User user = null;
<br>+ // need to retrieve user from usermanager to retrieve previously configured user attributes
<br>+ // if user doesn't exist (e.g. anon user), a transient UserImpl will be used instead
<br>+ try
<br>+ {
<br>+ user = ums.getUser(username);
<br>+ }
<br>+ catch (SecurityException e)
<br>+ {
<br>+ user = new UserImpl(username);
<br>+ }
<br>+ request.setSubject(JetspeedSubjectFactory.createSubject(user, null, null, null));
<br> return request;
<br> }
<br>
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26705786&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26705786&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26702761
Add Portlet does not add portlet and opens a new web browser
2009-12-08T15:21:33Z
2009-12-08T15:21:33Z
jainneha_81
Hello,
<br><br>My jetspeed 2.2 portal was working fine. But suddenly, the Add Portlet functionality stopped working. Now when I click on Add Portlet, the add portlet page opens in a new web browser and the portlet does not get added to the original page.
<br>I am not able to figure out why this has started to happen suddenly.
<br><br>Please help.
<br><br>Thanks
<br>Neha
<br><br>--
<br>This message was sent on behalf of <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26702761&i=0" target="_top" rel="nofollow">jainneha_81@...</a> at openSubscriber.com
<br><a href="http://opensubscriber.com/messages/jetspeed-user@portals.apache.org/topic.html" target="_top" rel="nofollow">http://opensubscriber.com/messages/jetspeed-user@.../topic.html</a><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26702761&i=1" target="_top" rel="nofollow">jetspeed-user-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26702761&i=2" target="_top" rel="nofollow">jetspeed-user-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---User-f198.html" embed="fixTarget[198]" target="_top" >Jetspeed - User</a></p>
tag:old.nabble.com,2006:post-26698979
svn commit: r888524 - /portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
2009-12-08T11:04:37Z
2009-12-08T11:04:37Z
woonsan
Author: woonsan
<br>Date: Tue Dec 8 19:04:37 2009
<br>New Revision: 888524
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=888524&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=888524&view=rev</a><br>Log:
<br>JS2-1087: Adding rest invocation to add portlet.
<br>TODO: Move "addPortletToLeastUsedColumn" method to layout component. How to avoid refreshing after portlet addition?
<br><br>Modified:
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=888524&r1=888523&r2=888524&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=888524&r1=888523&r2=888524&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp Tue Dec 8 19:04:37 2009
<br>@@ -35,6 +35,7 @@
<br> <c:if test="${empty portalContextPath}">
<br> <c:set var="portalContextPath" value="/"/>
<br> </c:if>
<br>+<c:set var="portalServletPath" value="${requestContext.request.servletPath}"/>
<br>
<br> <table style="border-collapse: collapse; width: 100%; margin-top: 0px; margin-bottom: 0px; float: left;">
<br> <tr>
<br>@@ -240,9 +241,8 @@
<br>
<br> <c:choose>
<br> <c:when test="${editAccess}">
<br>- var actionURL = "<portlet:actionURL/>";
<br>- var addActionURL = actionURL + (actionURL.indexOf('?') == -1 ? "?portletAdd=" : "&portletAdd=") + def.uniqueName;
<br>- clone.all("a").item(1).set("href", addActionURL);
<br>+ Y.Node.getDOMNode(clone.all("a").item(1)).setAttribute("portletUniqueName", def.uniqueName);
<br>+ clone.all("a").item(1).on("click", addPortlet);
<br> </c:when>
<br> <c:otherwise>
<br> clone.all("a").item(1).remove();
<br>@@ -288,6 +288,30 @@
<br>
<br> e.halt();
<br> };
<br>+
<br>+ var onAddPortletComplete = function(id, o, args) {
<br>+ if (o.status == 200 && o.readyState == 4) {
<br>+ location.reload();
<br>+ }
<br>+ };
<br>+
<br>+ var addPortlet = function(e) {
<br>+ var a = Y.Node.getDOMNode(e.target);
<br>+ var portletUniqueName = a.getAttribute("portletUniqueName");
<br>+
<br>+ if (portletUniqueName) {
<br>+ var re = new RegExp("\\" + "${portalServletPath}" + "(\\/|$)");
<br>+ var uri = location.href.replace(re, "/services/").replace(/#$/, "");
<br>+ Y.on('io:complete', onAddPortletComplete, this, []);
<br>+ var config = {
<br>+ method: "POST",
<br>+ data: "type=portlet&name=" + portletUniqueName
<br>+ };
<br>+ var request = Y.io(uri, config);
<br>+ }
<br>+
<br>+ e.halt();
<br>+ };
<br>
<br> Y.on("click", switchTab, "#<portlet:namespace/>portletsTabAction");
<br> Y.on("click", switchTab, "#<portlet:namespace/>layoutsTabAction");
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26698979&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26698979&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26698956
svn commit: r888521 - in /portals/jetspeed-2/portal/trunk: components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageManagementService.java jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml
2009-12-08T11:02:37Z
2009-12-08T11:02:37Z
woonsan
Author: woonsan
<br>Date: Tue Dec 8 19:02:36 2009
<br>New Revision: 888521
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=888521&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=888521&view=rev</a><br>Log:
<br>JS2-1087: Adding jax-rs operations for addPortlet and removePortlet.
<br><br>Modified:
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageManagementService.java
<br> portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageManagementService.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageManagementService.java?rev=888521&r1=888520&r2=888521&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageManagementService.java?rev=888521&r1=888520&r2=888521&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageManagementService.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageManagementService.java Tue Dec 8 19:02:36 2009
<br>@@ -21,17 +21,24 @@
<br> import javax.servlet.ServletConfig;
<br> import javax.servlet.ServletContext;
<br> import javax.servlet.http.HttpServletRequest;
<br>+import javax.ws.rs.DELETE;
<br>+import javax.ws.rs.FormParam;
<br> import javax.ws.rs.GET;
<br>+import javax.ws.rs.POST;
<br> import javax.ws.rs.Path;
<br> import javax.ws.rs.PathParam;
<br>+import javax.ws.rs.QueryParam;
<br> import javax.ws.rs.WebApplicationException;
<br> import javax.ws.rs.core.Context;
<br> import javax.ws.rs.core.PathSegment;
<br>+import javax.ws.rs.core.Response;
<br> import javax.ws.rs.core.UriInfo;
<br>
<br>+import org.apache.commons.lang.StringUtils;
<br> import org.apache.jetspeed.JetspeedActions;
<br> import org.apache.jetspeed.components.portletregistry.PortletRegistry;
<br> import org.apache.jetspeed.decoration.DecorationValve;
<br>+import org.apache.jetspeed.layout.PageLayoutComponent;
<br> import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
<br> import org.apache.jetspeed.om.page.ContentPage;
<br> import org.apache.jetspeed.page.PageManager;
<br>@@ -66,42 +73,81 @@
<br>
<br> private DecorationValve decorationValve;
<br>
<br>+ private PageLayoutComponent pageLayoutComponent;
<br>+
<br> public PageManagementService(PageManager pageManager,
<br> PortletActionSecurityBehavior securityBehavior,
<br> PortletRegistry portletRegistry,
<br>- DecorationValve decorationValve)
<br>+ DecorationValve decorationValve,
<br>+ PageLayoutComponent pageLayoutComponent)
<br> {
<br> this.pageManager = pageManager;
<br> this.securityBehavior = securityBehavior;
<br> this.portletRegistry = portletRegistry;
<br> this.decorationValve = decorationValve;
<br>+ this.pageLayoutComponent = pageLayoutComponent;
<br> }
<br>
<br> @GET
<br> @Path("/{path:.*}")
<br> public ContentPageBean getContentPage(@Context HttpServletRequest servletRequest,
<br>- @Context UriInfo uriInfo,
<br>- @PathParam("path") List<PathSegment> pathSegments)
<br>+ @Context UriInfo uriInfo,
<br>+ @PathParam("path") List<PathSegment> pathSegments)
<br> {
<br> RequestContext requestContext = (RequestContext) servletRequest.getAttribute(RequestContext.REQUEST_PORTALENV);
<br>-
<br>- try
<br>+ ContentPage contentPage = getContentPage(requestContext);
<br>+ return new ContentPageBean(contentPage);
<br>+ }
<br>+
<br>+ @POST
<br>+ @Path("/{path:.*}")
<br>+ public Response addContentFragment(@Context HttpServletRequest servletRequest,
<br>+ @Context UriInfo uriInfo,
<br>+ @PathParam("path") List<PathSegment> pathSegments,
<br>+ @FormParam("type") String fragmentType,
<br>+ @FormParam("name") String fragmentName)
<br>+ {
<br>+ if (StringUtils.isBlank(fragmentType) || StringUtils.isBlank(fragmentName))
<br> {
<br>- checkPageAccess(requestContext, JetspeedActions.VIEW);
<br>+ throw new WebApplicationException(new IllegalArgumentException("Fragment type and name not specified"));
<br> }
<br>- catch (SecurityException e)
<br>+
<br>+ RequestContext requestContext = (RequestContext) servletRequest.getAttribute(RequestContext.REQUEST_PORTALENV);
<br>+ ContentPage contentPage = getContentPage(requestContext);
<br>+
<br>+ pageLayoutComponent.addPortlet(contentPage, fragmentType, fragmentName);
<br>+
<br>+ return Response.ok().build();
<br>+ }
<br>+
<br>+ @DELETE
<br>+ @Path("/{path:.*}")
<br>+ public Response deleteContentFragment(@Context HttpServletRequest servletRequest,
<br>+ @Context UriInfo uriInfo,
<br>+ @PathParam("path") List<PathSegment> pathSegments,
<br>+ @QueryParam("id") String fragmentId)
<br>+ {
<br>+ if (StringUtils.isBlank(fragmentId))
<br> {
<br>- throw new WebApplicationException(e);
<br>+ throw new WebApplicationException(new IllegalArgumentException("Fragment id not specified"));
<br> }
<br>
<br>+ RequestContext requestContext = (RequestContext) servletRequest.getAttribute(RequestContext.REQUEST_PORTALENV);
<br>+ ContentPage contentPage = getContentPage(requestContext);
<br>+
<br>+ pageLayoutComponent.removeFragment(contentPage, fragmentId);
<br>+
<br>+ return Response.ok().build();
<br>+ }
<br>+
<br>+ private ContentPage getContentPage(RequestContext requestContext) throws WebApplicationException
<br>+ {
<br> try
<br> {
<br>+ checkPageAccess(requestContext, JetspeedActions.VIEW);
<br> // Run the Decoration valve to get actions
<br> decorationValve.invoke(requestContext, null);
<br>-
<br>- ContentPage contentPage = requestContext.getPage();
<br>-
<br>- return new ContentPageBean(contentPage);
<br>+ return requestContext.getPage();
<br> }
<br> catch (Exception e)
<br> {
<br><br>Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml?rev=888521&r1=888520&r2=888521&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml?rev=888521&r1=888520&r2=888521&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml (original)
<br>+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml Tue Dec 8 19:02:36 2009
<br>@@ -148,6 +148,7 @@
<br> <constructor-arg ref="PortletActionSecurityBehavior" />
<br> <constructor-arg ref="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
<br> <constructor-arg ref="DecorationValve" />
<br>+ <constructor-arg ref="org.apache.jetspeed.layout.PageLayoutComponent" />
<br> </bean>
<br>
<br> </beans>
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26698956&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26698956&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26697226
svn commit: r888487 - in /portals/jetspeed-2/portal/trunk: components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/ components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/ jetspeed-portal-resources/src/main/resou...
2009-12-08T09:10:56Z
2009-12-08T09:10:56Z
woonsan
Author: woonsan
<br>Date: Tue Dec 8 17:10:54 2009
<br>New Revision: 888487
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=888487&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=888487&view=rev</a><br>Log:
<br>JS2-1087: Initial addition of page management service bean. It's a simple replacement of GetPageAction.
<br>TODO: Add another service for layout component.
<br><br>Added:
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/ContentFragmentBean.java (with props)
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/ContentPageBean.java (with props)
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageManagementService.java (with props)
<br>Modified:
<br> portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml
<br><br>Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/ContentFragmentBean.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/ContentFragmentBean.java?rev=888487&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/ContentFragmentBean.java?rev=888487&view=auto</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/ContentFragmentBean.java (added)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/ContentFragmentBean.java Tue Dec 8 17:10:54 2009
<br>@@ -0,0 +1,165 @@
<br>+/*
<br>+ * Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ * contributor license agreements. See the NOTICE file distributed with
<br>+ * this work for additional information regarding copyright ownership.
<br>+ * The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ * (the "License"); you may not use this file except in compliance with
<br>+ * the License. You may obtain a copy of the License at
<br>+ *
<br>+ * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+ *
<br>+ * Unless required by applicable law or agreed to in writing, software
<br>+ * distributed under the License is distributed on an "AS IS" BASIS,
<br>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ * See the License for the specific language governing permissions and
<br>+ * limitations under the License.
<br>+ */
<br>+package org.apache.jetspeed.services.beans;
<br>+
<br>+import java.io.Serializable;
<br>+import java.util.ArrayList;
<br>+import java.util.Collection;
<br>+import java.util.Map;
<br>+
<br>+import javax.xml.bind.annotation.XmlElement;
<br>+import javax.xml.bind.annotation.XmlElementWrapper;
<br>+import javax.xml.bind.annotation.XmlElements;
<br>+import javax.xml.bind.annotation.XmlRootElement;
<br>+
<br>+import org.apache.jetspeed.om.page.ContentFragment;
<br>+
<br>+/**
<br>+ * ContentFragmentBean
<br>+ *
<br>+ * @version $Id$
<br>+ */
<br>+@XmlRootElement(name="fragment")
<br>+public class ContentFragmentBean implements Serializable
<br>+{
<br>+
<br>+ private static final long serialVersionUID = 1L;
<br>+
<br>+ private String id;
<br>+ private String type;
<br>+ private String name;
<br>+ private String decorator;
<br>+ private String mode;
<br>+ private String state;
<br>+ private Map<String, String> properties;
<br>+ private Collection<ContentFragmentBean> contentFragmentBeans;
<br>+
<br>+
<br>+ public ContentFragmentBean()
<br>+ {
<br>+
<br>+ }
<br>+
<br>+ public ContentFragmentBean(final ContentFragment contentFragment)
<br>+ {
<br>+ id = contentFragment.getId();
<br>+ type = contentFragment.getType();
<br>+ name = contentFragment.getName();
<br>+ decorator = contentFragment.getDecorator();
<br>+
<br>+ mode = contentFragment.getMode();
<br>+ state = contentFragment.getState();
<br>+ properties = contentFragment.getProperties();
<br>+
<br>+ Collection<ContentFragment> childContentFragments = contentFragment.getFragments();
<br>+
<br>+ if (childContentFragments != null && !childContentFragments.isEmpty())
<br>+ {
<br>+ ArrayList<ContentFragmentBean> childContentFragmentBeanList = new ArrayList<ContentFragmentBean>();
<br>+
<br>+ for (ContentFragment childContentFragment : childContentFragments)
<br>+ {
<br>+ childContentFragmentBeanList.add(new ContentFragmentBean(childContentFragment));
<br>+ }
<br>+
<br>+ contentFragmentBeans = childContentFragmentBeanList;
<br>+ }
<br>+ }
<br>+
<br>+ public String getId()
<br>+ {
<br>+ return id;
<br>+ }
<br>+
<br>+ public void setId(String id)
<br>+ {
<br>+ this.id = id;
<br>+ }
<br>+
<br>+ public String getType()
<br>+ {
<br>+ return type;
<br>+ }
<br>+
<br>+ public void setType(String type)
<br>+ {
<br>+ this.type = type;
<br>+ }
<br>+
<br>+ public String getName()
<br>+ {
<br>+ return name;
<br>+ }
<br>+
<br>+ public void setName(String name)
<br>+ {
<br>+ this.name = name;
<br>+ }
<br>+
<br>+ public String getDecorator()
<br>+ {
<br>+ return decorator;
<br>+ }
<br>+
<br>+ public void setDecorator(String decorator)
<br>+ {
<br>+ this.decorator = decorator;
<br>+ }
<br>+
<br>+ public String getMode()
<br>+ {
<br>+ return mode;
<br>+ }
<br>+
<br>+ public void setMode(String mode)
<br>+ {
<br>+ this.mode = mode;
<br>+ }
<br>+
<br>+ public String getState()
<br>+ {
<br>+ return state;
<br>+ }
<br>+
<br>+ public void setState(String state)
<br>+ {
<br>+ this.state = state;
<br>+ }
<br>+
<br>+ public Map<String, String> getProperties()
<br>+ {
<br>+ return properties;
<br>+ }
<br>+
<br>+ public void setProperties(Map<String, String> properties)
<br>+ {
<br>+ this.properties = properties;
<br>+ }
<br>+
<br>+ @XmlElementWrapper(name="fragments")
<br>+ @XmlElements(@XmlElement(name="fragment"))
<br>+ public Collection<ContentFragmentBean> getContentFragmentBeans()
<br>+ {
<br>+ return contentFragmentBeans;
<br>+ }
<br>+
<br>+ public void setContentFragmentBeans(Collection<ContentFragmentBean> contentFragmentBeans)
<br>+ {
<br>+ this.contentFragmentBeans = contentFragmentBeans;
<br>+ }
<br>+
<br>+}
<br><br>Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/ContentFragmentBean.java
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/ContentFragmentBean.java
<br>------------------------------------------------------------------------------
<br> svn:keywords = Id
<br><br>Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/ContentFragmentBean.java
<br>------------------------------------------------------------------------------
<br> svn:mime-type = text/plain
<br><br>Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/ContentPageBean.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/ContentPageBean.java?rev=888487&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/ContentPageBean.java?rev=888487&view=auto</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/ContentPageBean.java (added)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/ContentPageBean.java Tue Dec 8 17:10:54 2009
<br>@@ -0,0 +1,151 @@
<br>+/*
<br>+ * Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ * contributor license agreements. See the NOTICE file distributed with
<br>+ * this work for additional information regarding copyright ownership.
<br>+ * The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ * (the "License"); you may not use this file except in compliance with
<br>+ * the License. You may obtain a copy of the License at
<br>+ *
<br>+ * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+ *
<br>+ * Unless required by applicable law or agreed to in writing, software
<br>+ * distributed under the License is distributed on an "AS IS" BASIS,
<br>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ * See the License for the specific language governing permissions and
<br>+ * limitations under the License.
<br>+ */
<br>+package org.apache.jetspeed.services.beans;
<br>+
<br>+import java.io.Serializable;
<br>+
<br>+import javax.xml.bind.annotation.XmlElement;
<br>+import javax.xml.bind.annotation.XmlRootElement;
<br>+
<br>+import org.apache.jetspeed.om.page.ContentFragment;
<br>+import org.apache.jetspeed.om.page.ContentPage;
<br>+
<br>+/**
<br>+ * ContentPageBean
<br>+ *
<br>+ * @version $Id$
<br>+ */
<br>+@XmlRootElement(name="page")
<br>+public class ContentPageBean implements Serializable
<br>+{
<br>+
<br>+ private static final long serialVersionUID = 1L;
<br>+
<br>+ private String id;
<br>+ private String name;
<br>+ private String path;
<br>+ private String title;
<br>+ private String shortTitle;
<br>+ private String url;
<br>+ private String skin;
<br>+ private ContentFragmentBean rootFragmentBean;
<br>+
<br>+ public ContentPageBean()
<br>+ {
<br>+
<br>+ }
<br>+
<br>+ public ContentPageBean(final ContentPage contentPage)
<br>+ {
<br>+ id = contentPage.getId();
<br>+ name = contentPage.getName();
<br>+ path = contentPage.getPath();
<br>+ title = contentPage.getTitle();
<br>+ shortTitle = contentPage.getShortTitle();
<br>+ url = contentPage.getUrl();
<br>+ skin = contentPage.getSkin();
<br>+
<br>+ ContentFragment rootFragment = contentPage.getRootFragment();
<br>+
<br>+ if (rootFragment != null)
<br>+ {
<br>+ rootFragmentBean = new ContentFragmentBean(rootFragment);
<br>+ }
<br>+ }
<br>+
<br>+ public String getId()
<br>+ {
<br>+ return id;
<br>+ }
<br>+
<br>+ public void setId(String id)
<br>+ {
<br>+ this.id = id;
<br>+ }
<br>+
<br>+ public String getName()
<br>+ {
<br>+ return name;
<br>+ }
<br>+
<br>+ public void setName(String name)
<br>+ {
<br>+ this.name = name;
<br>+ }
<br>+
<br>+ public String getPath()
<br>+ {
<br>+ return path;
<br>+ }
<br>+
<br>+ public void setPath(String path)
<br>+ {
<br>+ this.path = path;
<br>+ }
<br>+
<br>+ public String getTitle()
<br>+ {
<br>+ return title;
<br>+ }
<br>+
<br>+ public void setTitle(String title)
<br>+ {
<br>+ this.title = title;
<br>+ }
<br>+
<br>+ public String getShortTitle()
<br>+ {
<br>+ return shortTitle;
<br>+ }
<br>+
<br>+ public void setShortTitle(String shortTitle)
<br>+ {
<br>+ this.shortTitle = shortTitle;
<br>+ }
<br>+
<br>+ public String getUrl()
<br>+ {
<br>+ return url;
<br>+ }
<br>+
<br>+ public void setUrl(String url)
<br>+ {
<br>+ this.url = url;
<br>+ }
<br>+
<br>+ public String getSkin()
<br>+ {
<br>+ return skin;
<br>+ }
<br>+
<br>+ public void setSkin(String skin)
<br>+ {
<br>+ this.skin = skin;
<br>+ }
<br>+
<br>+ @XmlElement(name="fragment")
<br>+ public ContentFragmentBean getContentFragmentBean()
<br>+ {
<br>+ return rootFragmentBean;
<br>+ }
<br>+
<br>+ public void setContentFragmentBean(ContentFragmentBean rootFragmentBean)
<br>+ {
<br>+ this.rootFragmentBean = rootFragmentBean;
<br>+ }
<br>+
<br>+}
<br><br>Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/ContentPageBean.java
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/ContentPageBean.java
<br>------------------------------------------------------------------------------
<br> svn:keywords = Id
<br><br>Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/ContentPageBean.java
<br>------------------------------------------------------------------------------
<br> svn:mime-type = text/plain
<br><br>Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageManagementService.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageManagementService.java?rev=888487&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageManagementService.java?rev=888487&view=auto</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageManagementService.java (added)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageManagementService.java Tue Dec 8 17:10:54 2009
<br>@@ -0,0 +1,123 @@
<br>+/*
<br>+ * Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ * contributor license agreements. See the NOTICE file distributed with
<br>+ * this work for additional information regarding copyright ownership.
<br>+ * The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ * (the "License"); you may not use this file except in compliance with
<br>+ * the License. You may obtain a copy of the License at
<br>+ *
<br>+ * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+ *
<br>+ * Unless required by applicable law or agreed to in writing, software
<br>+ * distributed under the License is distributed on an "AS IS" BASIS,
<br>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ * See the License for the specific language governing permissions and
<br>+ * limitations under the License.
<br>+ */
<br>+package org.apache.jetspeed.services.rest;
<br>+
<br>+import java.util.List;
<br>+
<br>+import javax.servlet.ServletConfig;
<br>+import javax.servlet.ServletContext;
<br>+import javax.servlet.http.HttpServletRequest;
<br>+import javax.ws.rs.GET;
<br>+import javax.ws.rs.Path;
<br>+import javax.ws.rs.PathParam;
<br>+import javax.ws.rs.WebApplicationException;
<br>+import javax.ws.rs.core.Context;
<br>+import javax.ws.rs.core.PathSegment;
<br>+import javax.ws.rs.core.UriInfo;
<br>+
<br>+import org.apache.jetspeed.JetspeedActions;
<br>+import org.apache.jetspeed.components.portletregistry.PortletRegistry;
<br>+import org.apache.jetspeed.decoration.DecorationValve;
<br>+import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
<br>+import org.apache.jetspeed.om.page.ContentPage;
<br>+import org.apache.jetspeed.page.PageManager;
<br>+import org.apache.jetspeed.request.RequestContext;
<br>+import org.apache.jetspeed.services.beans.ContentPageBean;
<br>+import org.slf4j.Logger;
<br>+import org.slf4j.LoggerFactory;
<br>+
<br>+/**
<br>+ * PageManagementService
<br>+ *
<br>+ * @version $Id$
<br>+ */
<br>+
<br>+@Path("/")
<br>+public class PageManagementService
<br>+{
<br>+
<br>+ private static Logger log = LoggerFactory.getLogger(PageManagementService.class);
<br>+
<br>+ @Context
<br>+ private ServletConfig servletConfig;
<br>+
<br>+ @Context
<br>+ private ServletContext servletContext;
<br>+
<br>+ private PageManager pageManager;
<br>+
<br>+ private PortletActionSecurityBehavior securityBehavior;
<br>+
<br>+ private PortletRegistry portletRegistry;
<br>+
<br>+ private DecorationValve decorationValve;
<br>+
<br>+ public PageManagementService(PageManager pageManager,
<br>+ PortletActionSecurityBehavior securityBehavior,
<br>+ PortletRegistry portletRegistry,
<br>+ DecorationValve decorationValve)
<br>+ {
<br>+ this.pageManager = pageManager;
<br>+ this.securityBehavior = securityBehavior;
<br>+ this.portletRegistry = portletRegistry;
<br>+ this.decorationValve = decorationValve;
<br>+ }
<br>+
<br>+ @GET
<br>+ @Path("/{path:.*}")
<br>+ public ContentPageBean getContentPage(@Context HttpServletRequest servletRequest,
<br>+ @Context UriInfo uriInfo,
<br>+ @PathParam("path") List<PathSegment> pathSegments)
<br>+ {
<br>+ RequestContext requestContext = (RequestContext) servletRequest.getAttribute(RequestContext.REQUEST_PORTALENV);
<br>+
<br>+ try
<br>+ {
<br>+ checkPageAccess(requestContext, JetspeedActions.VIEW);
<br>+ }
<br>+ catch (SecurityException e)
<br>+ {
<br>+ throw new WebApplicationException(e);
<br>+ }
<br>+
<br>+ try
<br>+ {
<br>+ // Run the Decoration valve to get actions
<br>+ decorationValve.invoke(requestContext, null);
<br>+
<br>+ ContentPage contentPage = requestContext.getPage();
<br>+
<br>+ return new ContentPageBean(contentPage);
<br>+ }
<br>+ catch (Exception e)
<br>+ {
<br>+ throw new WebApplicationException(e);
<br>+ }
<br>+ }
<br>+
<br>+ private void checkPageAccess(RequestContext requestContext, String action) throws SecurityException
<br>+ {
<br>+ if (securityBehavior != null)
<br>+ {
<br>+ if (!securityBehavior.checkAccess(requestContext, action))
<br>+ {
<br>+ throw new SecurityException("Insufficient access to view page");
<br>+ }
<br>+ }
<br>+ }
<br>+
<br>+}
<br><br>Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageManagementService.java
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageManagementService.java
<br>------------------------------------------------------------------------------
<br> svn:keywords = Id
<br><br>Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PageManagementService.java
<br>------------------------------------------------------------------------------
<br> svn:mime-type = text/plain
<br><br>Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml?rev=888487&r1=888486&r2=888487&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml?rev=888487&r1=888486&r2=888487&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml (original)
<br>+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml Tue Dec 8 17:10:54 2009
<br>@@ -127,6 +127,7 @@
<br>
<br> <!-- Resource providers -->
<br> <ref bean="jaxrsPortletRegistryService" />
<br>+ <ref bean="jaxrsPageManagementService" />
<br>
<br> </set>
<br> </property>
<br>@@ -140,4 +141,13 @@
<br> <constructor-arg ref="org.apache.jetspeed.search.SearchEngine" />
<br> </bean>
<br>
<br>+ <!-- Portal Page Management JAX-RS Service -->
<br>+ <bean id="jaxrsPageManagementService" class="org.apache.jetspeed.services.rest.PageManagementService">
<br>+ <meta key="j2:cat" value="default" />
<br>+ <constructor-arg ref="org.apache.jetspeed.page.PageManager" />
<br>+ <constructor-arg ref="PortletActionSecurityBehavior" />
<br>+ <constructor-arg ref="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
<br>+ <constructor-arg ref="DecorationValve" />
<br>+ </bean>
<br>+
<br> </beans>
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26697226&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26697226&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26696031
Re: Page Security Report
2009-12-08T07:54:18Z
2009-12-08T07:54:18Z
Randy Watler
Michael,
<br><br>There is not a simple way to do this, but it is possible using the
<br>PortalSite component.
<br><br>The PortalSite component generates a view of the portal folder/page
<br>hierarchy that is used to construct menus. One of the most important
<br>aspects of menus is that they present only what the user is able to
<br>access and, at the same time, everything they can. Consequently, if you
<br>walk the Folder/Page proxy hierarchy returned by the PortalSite, you
<br>will have exactly what you need.
<br><br>To do this for each user, you need to become the user and then ask the
<br>portal site for the root folder and recurse from there as the user. You
<br>can also ask the PortalSite to return a deep menu of all folders and
<br>pages if you want a comprehensive set of URLs for the user. See the
<br>Security and Profiler valves for hints on how to do this. Feel free to
<br>ask any more detailed questions as they come up.
<br><br>HTH.
<br><br>Randy
<br><br>Michael Binette wrote:
<div class='shrinkable-quote'><br>> I have a custom "report" portlet that uses the UserManager, GroupManager,
<br>> and RoleManager to create a report showing each user with what groups and
<br>> roles are assigned to them. That works great. But what we really need is a
<br>> list of Folders and Pages each user has access to as well. Right now they
<br>> are using a big Excel spreadsheet but of course keeping that up to date is
<br>> error prone. It doesn't look like the PageManager in Jetspeed does what I
<br>> need. Does anyone think of a way for me to do this using the information
<br>> already setup in Jetspeed.
<br>>
<br>> --
<br>> Michael
<br>>
<br>>
</div><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26696031&i=0" target="_top" rel="nofollow">jetspeed-user-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26696031&i=1" target="_top" rel="nofollow">jetspeed-user-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---User-f198.html" embed="fixTarget[198]" target="_top" >Jetspeed - User</a></p>
tag:old.nabble.com,2006:post-26695686
Leveraging Jetspeed security tables to secure access to external resources
2009-12-08T07:31:04Z
2009-12-08T07:31:04Z
shikarishambu
<br>Hi,
<br><br> I have a solution that uses Jetspeed with Alfresco ECM. Rather than create users and access permissions in both places I plan to access Alfresco content from Jetspeed through a service account and implement the authorization checks on the front end - in Jetspeed portal. I would like to see if there is a way to leverage the Jetspeed security tables to achieve this.
<br><br>
<br><br>Essentially, I have document types and sub types. Specific roles have specific permissions on document type (in which case they have the same permission on all sub types) or they have defined permissions on the sub type. All documents related to a document type are stored in a folder/ space in Alfresco.
<br><br>
<br><br>I am toying with the idea of using the security_permission table and create document management specific entries
<br><br>
<br><br>PERMISSION_ID PERMISSION_TYPE NAME ACTIONS
<br><br>XXX document /doctype view, edit
<br><br>YYY document /doctype/subtype view, edit
<br><br>
<br><br>Is this a valid/ good approach? Or, is there a better way to extend jetspeed security to support access to external resources?
<br><br>
<br><br>TIA
<br>
<br>_________________________________________________________________
<br>Windows Live Hotmail gives you a free,exclusive gift.
<br><a href="http://www.microsoft.com/windows/windowslive/hotmail_bl1/hotmail_bl1.aspx?ocid=PID23879::T:WLMTAGL:ON:WL:en-ww:WM_IMHM_7:092009" target="_top" rel="nofollow">http://www.microsoft.com/windows/windowslive/hotmail_bl1/hotmail_bl1.aspx?ocid=PID23879::T:WLMTAGL:ON:WL:en-ww:WM_IMHM_7:092009</a><p>From forum: <a href="http://old.nabble.com/Jetspeed---User-f198.html" embed="fixTarget[198]" target="_top" >Jetspeed - User</a></p>
tag:old.nabble.com,2006:post-26692971
svn commit: r888357 - /portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
2009-12-08T04:10:37Z
2009-12-08T04:10:37Z
woonsan
Author: woonsan
<br>Date: Tue Dec 8 12:10:36 2009
<br>New Revision: 888357
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=888357&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=888357&view=rev</a><br>Log:
<br>JS2-1087: Changing to keep up with the json marshaling changes in Jetspeed
<br><br>Modified:
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=888357&r1=888356&r2=888357&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=888357&r1=888356&r2=888357&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp Tue Dec 8 12:10:36 2009
<br>@@ -222,10 +222,8 @@
<br> portletsPanel = clonedPortletsPanel;
<br>
<br> var templatePanel = Y.Node.one("#<portlet:namespace/>portletItemTemplate");
<br>- var defs = [];
<br>- if (dataOut.collection) {
<br>- defs = dataOut.collection;
<br>- }
<br>+ var defs = dataOut.definitions;
<br>+
<br> for (var i = 0; i < defs.length; i++) {
<br> var def = defs[i];
<br> var clone = templatePanel.cloneNode(true);
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26692971&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26692971&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26692813
svn commit: r888350 - in /portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services: beans/ rest/
2009-12-08T03:57:19Z
2009-12-08T03:57:19Z
woonsan
Author: woonsan
<br>Date: Tue Dec 8 11:57:19 2009
<br>New Revision: 888350
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=888350&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=888350&view=rev</a><br>Log:
<br>JS2-1087: To keep consitency between xml and json marshalings
<br><br>Modified:
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/BeanCollection.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeanCollection.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeanCollection.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/BeanCollection.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/BeanCollection.java?rev=888350&r1=888349&r2=888350&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/BeanCollection.java?rev=888350&r1=888349&r2=888350&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/BeanCollection.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/BeanCollection.java Tue Dec 8 11:57:19 2009
<br>@@ -17,11 +17,7 @@
<br> package org.apache.jetspeed.services.beans;
<br>
<br> import java.io.Serializable;
<br>-import java.util.Collection;
<br>
<br>-import javax.xml.bind.annotation.XmlAttribute;
<br>-import javax.xml.bind.annotation.XmlElement;
<br>-import javax.xml.bind.annotation.XmlElements;
<br> import javax.xml.bind.annotation.XmlRootElement;
<br>
<br> /**
<br>@@ -29,13 +25,11 @@
<br> *
<br> * @version $Id$
<br> */
<br>-@XmlRootElement(name="collection")
<br>-public class BeanCollection<T> implements Serializable
<br>+@XmlRootElement(name="data")
<br>+public class BeanCollection implements Serializable
<br> {
<br> private static final long serialVersionUID = 1L;
<br>
<br>- private Collection<T> collection;
<br>-
<br> private int totalSize = -1;
<br>
<br> private int beginIndex = -1;
<br>@@ -45,28 +39,6 @@
<br>
<br> }
<br>
<br>- protected Collection<T> getCollection()
<br>- {
<br>- return collection;
<br>- }
<br>-
<br>- protected void setCollection(Collection<T> collection)
<br>- {
<br>- this.collection = collection;
<br>- }
<br>-
<br>- @XmlAttribute(name="size")
<br>- public int getSize()
<br>- {
<br>- return (collection != null ? collection.size() : 0);
<br>- }
<br>-
<br>- public void setSize()
<br>- {
<br>-
<br>- }
<br>-
<br>- @XmlAttribute(name="totalSize")
<br> public int getTotalSize()
<br> {
<br> return totalSize;
<br>@@ -77,7 +49,6 @@
<br> this.totalSize = totalSize;
<br> }
<br>
<br>- @XmlAttribute(name="beginIndex")
<br> public int getBeginIndex()
<br> {
<br> return beginIndex;
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeanCollection.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeanCollection.java?rev=888350&r1=888349&r2=888350&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeanCollection.java?rev=888350&r1=888349&r2=888350&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeanCollection.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeanCollection.java Tue Dec 8 11:57:19 2009
<br>@@ -19,6 +19,7 @@
<br> import java.util.Collection;
<br>
<br> import javax.xml.bind.annotation.XmlElement;
<br>+import javax.xml.bind.annotation.XmlElementWrapper;
<br> import javax.xml.bind.annotation.XmlElements;
<br> import javax.xml.bind.annotation.XmlRootElement;
<br>
<br>@@ -27,25 +28,27 @@
<br> *
<br> * @version $Id$
<br> */
<br>-@XmlRootElement(name="applications")
<br>-public class PortletApplicationBeanCollection extends BeanCollection<PortletApplicationBean>
<br>+@XmlRootElement(name="data")
<br>+public class PortletApplicationBeanCollection extends BeanCollection
<br> {
<br> private static final long serialVersionUID = 1L;
<br>
<br>+ private Collection<PortletApplicationBean> applicationBeans;
<br>+
<br> public PortletApplicationBeanCollection()
<br> {
<br> super();
<br> }
<br>
<br>- @Override
<br>+ @XmlElementWrapper(name="applications")
<br> @XmlElements(@XmlElement(name="application"))
<br>- public Collection<PortletApplicationBean> getCollection()
<br>+ public Collection<PortletApplicationBean> getApplications()
<br> {
<br>- return super.getCollection();
<br>+ return applicationBeans;
<br> }
<br>
<br>- public void setPortletApplicationBeans(Collection<PortletApplicationBean> collection)
<br>+ public void setApplications(Collection<PortletApplicationBean> applicationBeans)
<br> {
<br>- super.setCollection(collection);
<br>+ this.applicationBeans = applicationBeans;
<br> }
<br> }
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeanCollection.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeanCollection.java?rev=888350&r1=888349&r2=888350&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeanCollection.java?rev=888350&r1=888349&r2=888350&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeanCollection.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeanCollection.java Tue Dec 8 11:57:19 2009
<br>@@ -19,6 +19,7 @@
<br> import java.util.Collection;
<br>
<br> import javax.xml.bind.annotation.XmlElement;
<br>+import javax.xml.bind.annotation.XmlElementWrapper;
<br> import javax.xml.bind.annotation.XmlElements;
<br> import javax.xml.bind.annotation.XmlRootElement;
<br>
<br>@@ -27,26 +28,28 @@
<br> *
<br> * @version $Id$
<br> */
<br>-@XmlRootElement(name="definitions")
<br>-public class PortletDefinitionBeanCollection extends BeanCollection<PortletDefinitionBean>
<br>+@XmlRootElement(name="data")
<br>+public class PortletDefinitionBeanCollection extends BeanCollection
<br> {
<br> private static final long serialVersionUID = 1L;
<br>
<br>+ private Collection<PortletDefinitionBean> definitionBeans;
<br>+
<br> public PortletDefinitionBeanCollection()
<br> {
<br> super();
<br> }
<br>
<br>- @Override
<br>+ @XmlElementWrapper(name="definitions")
<br> @XmlElements(@XmlElement(name="definition"))
<br>- public Collection<PortletDefinitionBean> getCollection()
<br>+ public Collection<PortletDefinitionBean> getDefinitions()
<br> {
<br>- return super.getCollection();
<br>+ return definitionBeans;
<br> }
<br>
<br>- public void setPortletApplicationBeans(Collection<PortletDefinitionBean> collection)
<br>+ public void setDefinitions(Collection<PortletDefinitionBean> definitionBeans)
<br> {
<br>- super.setCollection(collection);
<br>+ this.definitionBeans = definitionBeans;
<br> }
<br>
<br> }
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java?rev=888350&r1=888349&r2=888350&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java?rev=888350&r1=888349&r2=888350&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java Tue Dec 8 11:57:19 2009
<br>@@ -155,7 +155,7 @@
<br> }
<br> }
<br>
<br>- paBeans.setPortletApplicationBeans(paBeanList);
<br>+ paBeans.setApplications(paBeanList);
<br>
<br> return paBeans;
<br> }
<br>@@ -270,7 +270,7 @@
<br> }
<br> }
<br>
<br>- pdBeans.setPortletApplicationBeans(pdBeanList);
<br>+ pdBeans.setDefinitions(pdBeanList);
<br>
<br> return pdBeans;
<br> }
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26692813&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26692813&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26683893
Repost Jetspeed2 error
2009-12-07T12:46:38Z
2009-12-07T12:46:38Z
Smith, Nathan-3
I'm trying to run my portal-app on Jetspeed 2.2.0. It is configured similar to the Jetexpress example with the exception that I'm using Spring 3 to create my portlet(s) and control the dispatching. Could this create problems for Jetspeed? I'm at a loss as to what else I might need to configure within Jetspeed to get this running. Responses would be greatly appreciated.
<br><br>I receive the following error(s):
<br><br>org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'portalURLValve' defined in ServletContext resource [/WEB-INF/assembly/pipelines.xml]: Cannot resolve reference to bean 'NavigationalStateComponent' while setting constructor argument;
<br><br>nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'NavigationalStateComponent' defined in ServletContext resource [/WEB-INF/assembly/portal-url-generation.xml]: Instantiation of bean failed;
<br><br>nested exception is org.springframework.beans.BeanInstantiationException: Could not instantiate bean class [org.apache.jetspeed.container.state.impl.JetspeedNavigationalStateComponent]: Constructor threw exception;
<br><br>nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.apache.jetspeed.request.RequestContextComponent' defined in ServletContext resource [/WEB-INF/assembly/jetspeed-spring.xml]: Cannot resolve reference to bean 'org.apache.jetspeed.components.portletregistry.PortletRegistry' while setting constructor argument;
<br><br>nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.apache.jetspeed.components.portletregistry.PortletRegistry' defined in ServletContext resource [/WEB-INF/assembly/registry.xml]: Cannot resolve reference to bean 'portletRegistryImpl' while setting bean property 'target';
<br><br>nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'portletRegistryImpl' defined in ServletContext resource [/WEB-INF/assembly/registry.xml]: Cannot resolve reference to bean 'org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider' while setting constructor argument;
<br><br>nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider' defined in ServletContext resource [/WEB-INF/assembly/registry.xml]: Cannot resolve reference to bean 'org.apache.pluto.services.PreferencesService' while setting bean property 'target';
<br><br>nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.apache.pluto.services.PreferencesService' defined in ServletContext resource [/WEB-INF/assembly/registry.xml]: Cannot resolve reference to bean 'portletFactory' while setting constructor argument;
<br><br>nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'portletFactory' defined in ServletContext resource [/WEB-INF/assembly/registry.xml]: Initialization of bean failed;
<br><br>nested exception is java.lang.LinkageError: loader constraint violation: loader (instance of org/apache/catalina/loader/StandardClassLoader) previously initiated loading for a different type with name "javax/portlet/PreferencesValidator"
<br>at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveReference(BeanDefinitionValueResolver.java:328)
<br>at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveValueIfNecessary(BeanDefinitionValueResolver.java:106)
<br>at org.springframework.beans.factory.support.ConstructorResolver.resolveConstructorArguments(ConstructorResolver.java:600)
<br>at org.springframework.beans.factory.support.ConstructorResolver.autowireConstructor(ConstructorResolver.java:140)
<br>at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireConstructor(AbstractAutowireCapableBeanFactory.java:984)
<br>at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:886)
<br>at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:479)
<br>at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:450)
<br>at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:289)
<br>at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
<br>at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:286)
<br>at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:188)
<br>at org.springframework.beans.factory.support.DefaultListableBeanFactory.preInstantiateSingletons(DefaultListableBeanFactory.java:558)
<br>at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:852)
<br>at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:422)
<br>at org.apache.jetspeed.components.SpringComponentManager.start(SpringComponentManager.java:308)
<br>at org.apache.jetspeed.engine.JetspeedEngine.start(JetspeedEngine.java:119)
<br>at org.apache.jetspeed.engine.JetspeedServlet.init(JetspeedServlet.java:208)
<br>at org.apache.catalina.core.StandardWrapper.loadServlet(StandardWrapper.java:1173)
<br>at org.apache.catalina.core.StandardWrapper.load(StandardWrapper.java:993)
<br>at org.apache.catalina.core.StandardContext.loadOnStartup(StandardContext.java:4149)
<br>at org.apache.catalina.core.StandardContext.start(StandardContext.java:4458)
<br>at org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:791)
<br>at org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:771)
<br>at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:526)
<br>at org.apache.catalina.startup.HostConfig.deployDescriptor(HostConfig.java:630)
<br>at org.apache.catalina.startup.HostConfig.deployDescriptors(HostConfig.java:556)
<br>at org.apache.catalina.startup.HostConfig.deployApps(HostConfig.java:491)
<br>at org.apache.catalina.startup.HostConfig.start(HostConfig.java:1206)
<br>at org.apache.catalina.startup.HostConfig.lifecycleEvent(HostConfig.java:314)
<br>at org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:119)
<br>at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1053)
<br>at org.apache.catalina.core.StandardHost.start(StandardHost.java:722)
<br>at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1045)
<br>at org.apache.catalina.core.StandardEngine.start(StandardEngine.java:443)
<br>at org.apache.catalina.core.StandardService.start(StandardService.java:516)
<br>at org.apache.catalina.core.StandardServer.start(StandardServer.java:710)
<br>at org.apache.catalina.startup.Catalina.start(Catalina.java:583)
<br>at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
<br>at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
<br>at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
<br>at java.lang.reflect.Method.invoke(Method.java:597)
<br>at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:288)
<br>at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:413)
<br>Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'NavigationalStateComponent' defined in ServletContext resource [/WEB-INF/assembly/portal-url-generation.xml]: Instantiation of bean failed;
<br><br>nested exception is org.springframework.beans.BeanInstantiationException: Could not instantiate bean class [org.apache.jetspeed.container.state.impl.JetspeedNavigationalStateComponent]: Constructor threw exception;
<br><br>nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.apache.jetspeed.request.RequestContextComponent' defined in ServletContext resource [/WEB-INF/assembly/jetspeed-spring.xml]: Cannot resolve reference to bean 'org.apache.jetspeed.components.portletregistry.PortletRegistry' while setting constructor argument;
<br><br>nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.apache.jetspeed.components.portletregistry.PortletRegistry' defined in ServletContext resource [/WEB-INF/assembly/registry.xml]: Cannot resolve reference to bean 'portletRegistryImpl' while setting bean property 'target';
<br><br>nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'portletRegistryImpl' defined in ServletContext resource [/WEB-INF/assembly/registry.xml]: Cannot resolve reference to bean 'org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider' while setting constructor argument;
<br><br>nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider' defined in ServletContext resource [/WEB-INF/assembly/registry.xml]: Cannot resolve reference to bean 'org.apache.pluto.services.PreferencesService' while setting bean property 'target';
<br><br>nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.apache.pluto.services.PreferencesService' defined in ServletContext resource [/WEB-INF/assembly/registry.xml]: Cannot resolve reference to bean 'portletFactory' while setting constructor argument;
<br><br>nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'portletFactory' defined in ServletContext resource [/WEB-INF/assembly/registry.xml]: Initialization of bean failed; nested exception is java.lang.LinkageError: loader constraint violation: loader (instance of org/apache/catalina/loader/StandardClassLoader) previously initiated loading for a different type with name "javax/portlet/PreferencesValidator"
<br>at org.springframework.beans.factory.support.ConstructorResolver.autowireConstructor(ConstructorResolver.java:283)
<br>at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireConstructor(AbstractAutowireCapableBeanFactory.java:984)
<br>at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:886)
<br>at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:479)
<br>at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:450)
<br>at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:289)
<br>at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
<br>at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:286)
<br>at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:188)
<br>at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveReference(BeanDefinitionValueResolver.java:322)
<br>... 43 more
<br>Caused by: org.springframework.beans.BeanInstantiationException: Could not instantiate bean class [org.apache.jetspeed.container.state.impl.JetspeedNavigationalStateComponent]: Constructor threw exception;
<br><br>nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.apache.jetspeed.request.RequestContextComponent' defined in ServletContext resource [/WEB-INF/assembly/jetspeed-spring.xml]: Cannot resolve reference to bean 'org.apache.jetspeed.components.portletregistry.PortletRegistry' while setting constructor argument;
<br><br>nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.apache.jetspeed.components.portletregistry.PortletRegistry' defined in ServletContext resource [/WEB-INF/assembly/registry.xml]: Cannot resolve reference to bean 'portletRegistryImpl' while setting bean property 'target';
<br><br>nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'portletRegistryImpl' defined in ServletContext resource [/WEB-INF/assembly/registry.xml]: Cannot resolve reference to bean 'org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider' while setting constructor argument;
<br><br>nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider' defined in ServletContext resource [/WEB-INF/assembly/registry.xml]: Cannot resolve reference to bean 'org.apache.pluto.services.PreferencesService' while setting bean property 'target';
<br><br>nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.apache.pluto.services.PreferencesService' defined in ServletContext resource [/WEB-INF/assembly/registry.xml]: Cannot resolve reference to bean 'portletFactory' while setting constructor argument;
<br><br>nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'portletFactory' defined in ServletContext resource [/WEB-INF/assembly/registry.xml]: Initialization of bean failed;
<br><br>nested exception is java.lang.LinkageError: loader constraint violation: loader (instance of org/apache/catalina/loader/StandardClassLoader) previously initiated loading for a different type with name "javax/portlet/PreferencesValidator"
<br>at org.springframework.beans.BeanUtils.instantiateClass(BeanUtils.java:141)
<br>at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:107)
<br>at org.springframework.beans.factory.support.ConstructorResolver.autowireConstructor(ConstructorResolver.java:275)
<br>... 52 more
<br><br>Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.apache.jetspeed.request.RequestContextComponent' defined in ServletContext resource [/WEB-INF/assembly/jetspeed-spring.xml]: Cannot resolve reference to bean 'org.apache.jetspeed.components.portletregistry.PortletRegistry' while setting constructor argument;
<br><br>nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.apache.jetspeed.components.portletregistry.PortletRegistry' defined in ServletContext resource [/WEB-INF/assembly/registry.xml]: Cannot resolve reference to bean 'portletRegistryImpl' while setting bean property 'target';
<br><br>nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'portletRegistryImpl' defined in ServletContext resource [/WEB-INF/assembly/registry.xml]: Cannot resolve reference to bean 'org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider' while setting constructor argument;
<br><br>nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider' defined in ServletContext resource [/WEB-INF/assembly/registry.xml]: Cannot resolve reference to bean 'org.apache.pluto.services.PreferencesService' while setting bean property 'target';
<br><br>nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.apache.pluto.services.PreferencesService' defined in ServletContext resource [/WEB-INF/assembly/registry.xml]: Cannot resolve reference to bean 'portletFactory' while setting constructor argument;
<br><br>nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'portletFactory' defined in ServletContext resource [/WEB-INF/assembly/registry.xml]: Initialization of bean failed;
<br><br>nested exception is java.lang.LinkageError: loader constraint violation: loader (instance of org/apache/catalina/loader/StandardClassLoader) previously initiated loading for a different type with name "javax/portlet/PreferencesValidator"
<br>at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveReference(BeanDefinitionValueResolver.java:328)
<br>at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveValueIfNecessary(BeanDefinitionValueResolver.java:106)
<br>at org.springframework.beans.factory.support.ConstructorResolver.resolveConstructorArguments(ConstructorResolver.java:586)
<br>at org.springframework.beans.factory.support.ConstructorResolver.autowireConstructor(ConstructorResolver.java:140)
<br>at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireConstructor(AbstractAutowireCapableBeanFactory.java:984)
<br>at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:886)
<br>at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:479)
<br>at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:450)
<br>at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:289)
<br>at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
<br>at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:286)
<br>at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:188)
<br>at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1010)
<br>at org.apache.jetspeed.components.SpringComponentManager.getComponent(SpringComponentManager.java:178)
<br>at org.apache.jetspeed.engine.JetspeedEngine.getCurrentRequestContext(JetspeedEngine.java:285)
<br>at org.apache.jetspeed.Jetspeed.getCurrentRequestContext(Jetspeed.java:88)
<br>at org.apache.jetspeed.JetspeedPortalContext.getSupportedModes(JetspeedPortalContext.java:223)
<br>at org.apache.jetspeed.JetspeedPortalContext.getSupportedPortletModes(JetspeedPortalContext.java:240)
<br>at org.apache.jetspeed.container.state.impl.JetspeedNavigationalStateComponent.<init>(JetspeedNavigationalStateComponent.java:78)
<br>at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
<br>at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:39)
<br>at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27)
<br>at java.lang.reflect.Constructor.newInstance(Constructor.java:513)
<br>at org.springframework.beans.BeanUtils.instantiateClass(BeanUtils.java:126)
<br>... 54 more
<br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26683751
Page Security Report
2009-12-07T12:39:28Z
2009-12-07T12:39:28Z
Michael Binette-2
I have a custom "report" portlet that uses the UserManager, GroupManager,
<br>and RoleManager to create a report showing each user with what groups and
<br>roles are assigned to them. That works great. But what we really need is a
<br>list of Folders and Pages each user has access to as well. Right now they
<br>are using a big Excel spreadsheet but of course keeping that up to date is
<br>error prone. It doesn't look like the PageManager in Jetspeed does what I
<br>need. Does anyone think of a way for me to do this using the information
<br>already setup in Jetspeed.
<br><br>--
<br>Michael
<br><p>From forum: <a href="http://old.nabble.com/Jetspeed---User-f198.html" embed="fixTarget[198]" target="_top" >Jetspeed - User</a></p>
tag:old.nabble.com,2006:post-26682711
svn commit: r888099 - /portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
2009-12-07T11:27:51Z
2009-12-07T11:27:51Z
woonsan
Author: woonsan
<br>Date: Mon Dec 7 19:27:49 2009
<br>New Revision: 888099
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=888099&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=888099&view=rev</a><br>Log:
<br>JS2-1057: changes on json handling caused by jetspeed json provider change.
<br><br>Modified:
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=888099&r1=888098&r2=888099&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=888099&r1=888098&r2=888099&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp Mon Dec 7 19:27:49 2009
<br>@@ -223,12 +223,8 @@
<br>
<br> var templatePanel = Y.Node.one("#<portlet:namespace/>portletItemTemplate");
<br> var defs = [];
<br>- if (dataOut.definitions.definition) {
<br>- if (dataOut.definitions.definition instanceof Array) {
<br>- defs = dataOut.definitions.definition;
<br>- } else {
<br>- defs.push(dataOut.definitions.definition);
<br>- }
<br>+ if (dataOut.collection) {
<br>+ defs = dataOut.collection;
<br> }
<br> for (var i = 0; i < defs.length; i++) {
<br> var def = defs[i];
<br>@@ -242,14 +238,7 @@
<br> }
<br>
<br> var nameNode = clone.one('div');
<br>-
<br>- if (def.displayNames.displayName) {
<br>- if (def.displayNames.displayName instanceof Array) {
<br>- nameNode.setContent(def.displayNames.displayName[0].value);
<br>- } else {
<br>- nameNode.setContent(def.displayNames.displayName.value);
<br>- }
<br>- }
<br>+ nameNode.setContent(def.displayNames[0].value);
<br>
<br> <c:choose>
<br> <c:when test="${editAccess}">
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26682711&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26682711&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26682699
svn commit: r888098 - in /portals/jetspeed-2/portal/trunk: components/jetspeed-portal/pom.xml jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml pom.xml
2009-12-07T11:26:20Z
2009-12-07T11:26:20Z
woonsan
Author: woonsan
<br>Date: Mon Dec 7 19:26:13 2009
<br>New Revision: 888098
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=888098&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=888098&view=rev</a><br>Log:
<br>JS2-1087: Using jackson json provider. Thanks to Randy for the pointer.
<br><br>Modified:
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
<br> portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml
<br> portals/jetspeed-2/portal/trunk/pom.xml
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml?rev=888098&r1=888097&r2=888098&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml?rev=888098&r1=888097&r2=888098&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml Mon Dec 7 19:26:13 2009
<br>@@ -174,6 +174,16 @@
<br> <artifactId>cxf-rt-frontend-jaxrs</artifactId>
<br> <scope>runtime</scope>
<br> </dependency>
<br>+ <dependency>
<br>+ <groupId>org.codehaus.jackson</groupId>
<br>+ <artifactId>jackson-jaxrs</artifactId>
<br>+ <scope>runtime</scope>
<br>+ </dependency>
<br>+ <dependency>
<br>+ <groupId>org.codehaus.jackson</groupId>
<br>+ <artifactId>jackson-xc</artifactId>
<br>+ <scope>runtime</scope>
<br>+ </dependency>
<br>
<br> <!-- Test Dependencies -->
<br> <dependency>
<br><br>Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml?rev=888098&r1=888097&r2=888098&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml?rev=888098&r1=888097&r2=888098&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml (original)
<br>+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml Mon Dec 7 19:26:13 2009
<br>@@ -68,27 +68,54 @@
<br> </bean>
<br> </property>
<br> </bean>
<br>+
<br>+ <bean id="jacksonObjectMapper" class="org.codehaus.jackson.map.ObjectMapper">
<br>+ <meta key="j2:cat" value="default" />
<br>+ </bean>
<br>+
<br>+ <bean id="jacksonJaxbIntrospector" class="org.codehaus.jackson.xc.JaxbAnnotationIntrospector">
<br>+ <meta key="j2:cat" value="default" />
<br>+ </bean>
<br>+
<br>+ <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
<br>+ <meta key="j2:cat" value="default" />
<br>+ <property name="targetObject">
<br>+ <bean class="org.springframework.beans.factory.config.PropertyPathFactoryBean">
<br>+ <meta key="j2:cat" value="default" />
<br>+ <property name="targetObject" ref="jacksonObjectMapper" />
<br>+ <property name="propertyPath" value="serializationConfig"/>
<br>+ </bean>
<br>+ </property>
<br>+ <property name="targetMethod" value="setAnnotationIntrospector"/>
<br>+ <property name="arguments">
<br>+ <list>
<br>+ <ref bean="jacksonJaxbIntrospector" />
<br>+ </list>
<br>+ </property>
<br>+ </bean>
<br>
<br>- <bean id="jaxrsJsonProvider" class="org.apache.cxf.jaxrs.provider.JSONProvider">
<br>+ <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
<br> <meta key="j2:cat" value="default" />
<br>- <property name="serializeAsArray" value="true"/>
<br>- <property name="arrayKeys">
<br>+ <property name="targetObject">
<br>+ <bean class="org.springframework.beans.factory.config.PropertyPathFactoryBean">
<br>+ <meta key="j2:cat" value="default" />
<br>+ <property name="targetObject" ref="jacksonObjectMapper" />
<br>+ <property name="propertyPath" value="deserializationConfig"/>
<br>+ </bean>
<br>+ </property>
<br>+ <property name="targetMethod" value="setAnnotationIntrospector"/>
<br>+ <property name="arguments">
<br> <list>
<br>- <!--
<br>- <value>displayName</value>
<br>- <value>description</value>
<br>- <value>initparam</value>
<br>- <value>language</value>
<br>- <value>field</value>
<br>- <value>portletMode</value>
<br>- <value>windowState</value>
<br>- <value>definition</value>
<br>- <value>application</value>
<br>- -->
<br>+ <ref bean="jacksonJaxbIntrospector" />
<br> </list>
<br> </property>
<br> </bean>
<br>
<br>+ <bean id="jaxrsJsonProvider" class="org.codehaus.jackson.jaxrs.JacksonJsonProvider">
<br>+ <meta key="j2:cat" value="default" />
<br>+ <property name="mapper" ref="jacksonObjectMapper" />
<br>+ </bean>
<br>+
<br> <!-- JAX-RS Service Singleton Resource Beans -->
<br> <bean id="org.apache.jetspeed.services.rest.singletons" class="org.springframework.beans.factory.config.SetFactoryBean">
<br> <meta key="j2:cat" value="default" />
<br>@@ -113,4 +140,4 @@
<br> <constructor-arg ref="org.apache.jetspeed.search.SearchEngine" />
<br> </bean>
<br>
<br>-</beans>
<br>\ No newline at end of file
<br>+</beans>
<br><br>Modified: portals/jetspeed-2/portal/trunk/pom.xml
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=888098&r1=888097&r2=888098&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=888098&r1=888097&r2=888098&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/pom.xml (original)
<br>+++ portals/jetspeed-2/portal/trunk/pom.xml Mon Dec 7 19:26:13 2009
<br>@@ -313,6 +313,7 @@
<br> <commonj.version>1.1</commonj.version>
<br> <tyrex.version>1.0.1</tyrex.version>
<br> <cxf.version>2.2.5</cxf.version>
<br>+ <jackson.version>1.3.2</jackson.version>
<br> </properties>
<br>
<br> <!-- Dependency Configuration -->
<br>@@ -1014,6 +1015,22 @@
<br> </exclusions>
<br> </dependency>
<br>
<br>+ <!-- Jackson JSON -->
<br>+ <dependency>
<br>+ <groupId>org.codehaus.jackson</groupId>
<br>+ <artifactId>jackson-jaxrs</artifactId>
<br>+ <version>${jackson.version}</version>
<br>+ <scope>runtime</scope>
<br>+ </dependency>
<br>+
<br>+ <!-- Jacson Xml Compatibility extensions -->
<br>+ <dependency>
<br>+ <groupId>org.codehaus.jackson</groupId>
<br>+ <artifactId>jackson-xc</artifactId>
<br>+ <version>${jackson.version}</version>
<br>+ <scope>runtime</scope>
<br>+ </dependency>
<br>+
<br> <!-- Test -->
<br> <dependency>
<br> <groupId>junit</groupId>
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26682699&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26682699&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26680342
svn commit: r888004 - in /portals/jetspeed-2/applications/j2-admin/trunk/src/main: java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java webapp/WEB-INF/view/toolbox/toolbox.jsp
2009-12-07T09:04:02Z
2009-12-07T09:04:02Z
woonsan
Author: woonsan
<br>Date: Mon Dec 7 17:04:01 2009
<br>New Revision: 888004
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=888004&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=888004&view=rev</a><br>Log:
<br>JS2-1057: Code clean up. Removing unused codes.
<br><br>Modified:
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java?rev=888004&r1=888003&r2=888004&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java?rev=888004&r1=888003&r2=888004&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java Mon Dec 7 17:04:01 2009
<br>@@ -17,17 +17,8 @@
<br> package org.apache.jetspeed.portlets.toolbox;
<br>
<br> import java.io.IOException;
<br>-import java.io.Serializable;
<br>-import java.util.ArrayList;
<br>-import java.util.Collection;
<br>-import java.util.Collections;
<br>-import java.util.Comparator;
<br>-import java.util.Iterator;
<br>+import java.util.Arrays;
<br> import java.util.List;
<br>-import java.util.Locale;
<br>-import java.util.Map;
<br>-import java.util.Random;
<br>-import java.util.StringTokenizer;
<br>
<br> import javax.portlet.ActionRequest;
<br> import javax.portlet.ActionResponse;
<br>@@ -35,12 +26,12 @@
<br> import javax.portlet.PortletConfig;
<br> import javax.portlet.PortletContext;
<br> import javax.portlet.PortletException;
<br>-import javax.portlet.PortletPreferences;
<br> import javax.portlet.PortletRequest;
<br>-import javax.portlet.PortletSession;
<br> import javax.portlet.RenderRequest;
<br> import javax.portlet.RenderResponse;
<br>
<br>+import org.apache.commons.lang.StringUtils;
<br>+import org.apache.commons.lang.math.NumberUtils;
<br> import org.apache.jetspeed.CommonPortletServices;
<br> import org.apache.jetspeed.JetspeedActions;
<br> import org.apache.jetspeed.components.portletregistry.PortletRegistry;
<br>@@ -48,16 +39,9 @@
<br> import org.apache.jetspeed.om.page.ContentFragment;
<br> import org.apache.jetspeed.om.page.ContentPage;
<br> import org.apache.jetspeed.om.page.Fragment;
<br>-import org.apache.jetspeed.om.page.Page;
<br>-import org.apache.jetspeed.om.portlet.InitParam;
<br>-import org.apache.jetspeed.om.portlet.LocalizedField;
<br>-import org.apache.jetspeed.om.portlet.PortletApplication;
<br>-import org.apache.jetspeed.om.portlet.PortletDefinition;
<br> import org.apache.jetspeed.portlet.HeaderPhaseSupportConstants;
<br>-import org.apache.jetspeed.portlets.PortletInfo;
<br> import org.apache.jetspeed.profiler.Profiler;
<br> import org.apache.jetspeed.request.RequestContext;
<br>-import org.apache.jetspeed.search.ParsedObject;
<br> import org.apache.jetspeed.search.SearchEngine;
<br> import org.apache.jetspeed.security.SecurityAccessController;
<br> import org.apache.portals.bridges.common.GenericServletPortlet;
<br>@@ -71,7 +55,7 @@
<br> * @author <a href="mailto:<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26680342&i=0" target="_top" rel="nofollow">taylor@...</a>">David Sean Taylor</a>
<br> * @version $Id$
<br> */
<br>-public class JetspeedToolbox extends GenericServletPortlet implements Comparator
<br>+public class JetspeedToolbox extends GenericServletPortlet
<br> {
<br> static Logger log = LoggerFactory.getLogger(JetspeedToolbox.class);
<br>
<br>@@ -80,23 +64,14 @@
<br> protected Profiler profiler;
<br> protected SecurityAccessController securityAccessController;
<br> protected DecorationFactory decorationFactory;
<br>- protected Random rand;
<br> protected String yuiScriptPath = "/javascript/yui/build/yui/yui-min.js";
<br>
<br>- public final String[] DEFAULT_IMAGES = new String[]
<br>- {
<br>- "images/portlets/applications-development.png",
<br>- "images/portlets/applications-system.png",
<br>- "images/portlets/applications-other.png",
<br>- "images/portlets/linux.png"
<br>- };
<br>- public final static String PORTLET_ICON = "portlet-icon";
<br>-
<br>-
<br> public void init(PortletConfig config) throws PortletException
<br> {
<br> super.init(config);
<br>- PortletContext context = getPortletContext();
<br>+
<br>+ PortletContext context = getPortletContext();
<br>+
<br> registry = (PortletRegistry)context.getAttribute(CommonPortletServices.CPS_REGISTRY_COMPONENT);
<br> if (null == registry)
<br> {
<br>@@ -122,7 +97,6 @@
<br> {
<br> throw new PortletException("Failed to find the Decoration Factory on portlet initialization");
<br> }
<br>- rand = new Random( 19580427 );
<br>
<br> String param = config.getInitParameter("yuiScriptPath");
<br>
<br>@@ -145,33 +119,27 @@
<br> }
<br>
<br> @Override
<br>- @SuppressWarnings("unchecked")
<br> public void doView(RenderRequest request, RenderResponse response)
<br> throws PortletException, IOException
<br> {
<br>- String category = request.getParameter("category");
<br>- String filter = request.getParameter("filter");
<br>- if (filter == null || filter.equals("")) filter = null;
<br>- if (category == null || category.equals("")) category = "All";
<br>- RequestContext requestContext = (RequestContext) request.getAttribute(RequestContext.REQUEST_PORTALENV);
<br>-
<br>- //TODO: The following two lines need to be move somewhere like 'serveResource()'
<br>- // because portlets info should be retrieved from ajax calls.
<br>- //List<PortletInfo> portlets = retrievePortlets(request, null);
<br>- //request.setAttribute("portlets", portlets);
<br>-
<br> request.setAttribute("categories", retrieveCategories(request));
<br> request.setAttribute("layouts", LayoutBean.retrieveLayouts(request, decorationFactory));
<br> request.setAttribute("themes", ThemeBean.retrieveThemes(request, decorationFactory));
<br>+
<br> boolean hasEditAccess = false;
<br>+
<br> try
<br> {
<br>+ RequestContext requestContext = (RequestContext) request.getAttribute(RequestContext.REQUEST_PORTALENV);
<br> requestContext.getPage().checkAccess(JetspeedActions.EDIT);
<br> hasEditAccess = true;
<br> }
<br>- catch(Exception e)
<br>- {}
<br>- request.setAttribute("editAccess", new Boolean(hasEditAccess));
<br>+ catch(Exception ignore)
<br>+ {
<br>+ }
<br>+
<br>+ request.setAttribute("editAccess", hasEditAccess ? Boolean.TRUE : Boolean.FALSE);
<br>+
<br> super.doView(request, response);
<br> }
<br>
<br>@@ -179,32 +147,14 @@
<br> public void processAction(ActionRequest actionRequest, ActionResponse actionResponse) throws PortletException,
<br> IOException
<br> {
<br>- String category = null;
<br>- String filter = actionRequest.getParameter("filter");
<br> String theme = actionRequest.getParameter("theme");
<br> String layout = actionRequest.getParameter("layout");
<br>- RequestContext requestContext = (RequestContext) actionRequest.getAttribute(RequestContext.REQUEST_PORTALENV);
<br>- if (filter != null)
<br>- {
<br>- if (filter.trim().equals(""))
<br>- {
<br>- filter = null;
<br>- category = "all";
<br>- actionRequest.getPortletSession().removeAttribute("portlets", PortletSession.PORTLET_SCOPE);
<br>- }
<br>- CategoryResult result = getPortlets(actionRequest, category, "1", 10, filter);
<br>- actionRequest.getPortletSession().setAttribute("portlets", result.getPortlets(), PortletSession.PORTLET_SCOPE);
<br>-
<br>- // Invalidate category results...
<br>- List<CategoryResult> categories = (List) actionRequest.getPortletSession().getAttribute("categories");
<br>- if (categories != null)
<br>- {
<br>- actionRequest.getPortletSession().removeAttribute("categories");
<br>- }
<br>- }
<br>+ RequestContext requestContext = (RequestContext) actionRequest.getAttribute(RequestContext.REQUEST_PORTALENV);
<br>+
<br> if (theme != null)
<br> {
<br> ContentPage page = requestContext.getPage();
<br>+
<br> try
<br> {
<br> page.updateDefaultDecorator(theme, ContentFragment.LAYOUT);
<br>@@ -216,10 +166,12 @@
<br> log.error("Page has not been updated.", e);
<br> }
<br> }
<br>+
<br> if (layout != null)
<br> {
<br> ContentPage page = requestContext.getPage();
<br> ContentFragment layoutFragment = page.getRootFragment();
<br>+
<br> try
<br> {
<br> layoutFragment.updateName(layout);
<br>@@ -230,11 +182,14 @@
<br> log.error("Page has not been updated.", e);
<br> }
<br> }
<br>+
<br> String portletAdd = actionRequest.getParameter("portletAdd");
<br>+
<br> if (portletAdd != null)
<br> {
<br> // BOZO: this should be done via AJAX API
<br> ContentPage page = requestContext.getPage();
<br>+
<br> try
<br> {
<br> addPortletToLeastUsedColumn(page, portletAdd);
<br>@@ -247,317 +202,35 @@
<br> }
<br>
<br> @SuppressWarnings("unchecked")
<br>- public List<PortletInfo> retrievePortlets(PortletRequest request, String filter)
<br>- {
<br>- List<PortletInfo> portletsList = (List<PortletInfo>)request.getPortletSession().getAttribute("portlets", PortletSession.PORTLET_SCOPE);
<br>- if (filter == null && portletsList != null)
<br>- {
<br>- return portletsList;
<br>- }
<br>- Iterator portlets = null;
<br>- List list = new ArrayList();
<br>- Locale locale = request.getLocale();
<br>- if (filter == null)
<br>- portlets = registry.getAllPortletDefinitions().iterator();
<br>- else
<br>- portlets = searchEngine.search(filter).getResults().iterator();
<br>- while (portlets.hasNext())
<br>- {
<br>- PortletDefinition portlet = null;
<br>- if (filter == null)
<br>- portlet = (PortletDefinition)portlets.next();
<br>- else
<br>- portlet = getPortletFromParsedObject((ParsedObject)portlets.next());
<br>-
<br>- PortletInfo portletInfo = filterPortlet(portlet, locale, request);
<br>- if (portletInfo != null)
<br>- {
<br>- list.add(portletInfo);
<br>- }
<br>- }
<br>- Collections.sort(list, this);
<br>-// if (filter == null )
<br>- request.getPortletSession().setAttribute("portlets", list, PortletSession.PORTLET_SCOPE);
<br>- return list;
<br>- }
<br>-
<br>- protected PortletDefinition getPortletFromParsedObject(ParsedObject po)
<br>+ public List<String> retrieveCategories(PortletRequest request) throws PortletException
<br> {
<br>- boolean found = false;
<br>- String name = "";
<br>- Map fields = po.getFields();
<br>- if(fields != null)
<br>- {
<br>- Object id = fields.get("ID");
<br>-
<br>- if(id != null)
<br>- {
<br>- if(id instanceof Collection)
<br>- {
<br>- Collection coll = (Collection)id;
<br>- name = (String) coll.iterator().next();
<br>- }
<br>- else
<br>- {
<br>- name = (String)id;
<br>- }
<br>- }
<br>-
<br>- if(po.getType().equals("portlet"))
<br>- {
<br>- Object pa = fields.get("portlet_application");
<br>- String paName = "";
<br>- if(pa != null)
<br>- {
<br>- if(id instanceof Collection)
<br>- {
<br>- Collection coll = (Collection)pa;
<br>- paName = (String) coll.iterator().next();
<br>- }
<br>- else
<br>- {
<br>- paName = (String)pa;
<br>- }
<br>- }
<br>- name = paName + "::" + name;
<br>- found = true;
<br>- }
<br>- }
<br>- if (found == false)
<br>- return null;
<br>+ List<String> categories = (List) request.getPortletSession().getAttribute("categories");
<br>
<br>- return registry.getPortletDefinitionByUniqueName(name);
<br>- }
<br>-
<br>- /**
<br>- * Filters portlets being added to the based on security checks and layout criteria
<br>- *
<br>- * @param portlet
<br>- * @return null if filtered, otherwise PortletInfo to be added to list
<br>- */
<br>- protected PortletInfo filterPortlet(PortletDefinition portlet, Locale locale, PortletRequest request)
<br>- {
<br>- if (portlet == null)
<br>- return null;
<br>- if (filterByRole(portlet, request))
<br>- {
<br>- return null;
<br>- }
<br>- // Do not display Jetspeed Layout Applications
<br>- PortletApplication pa = (PortletApplication)portlet.getApplication();
<br>- if (pa.isLayoutApplication())
<br>- return null;
<br>-
<br>- // SECURITY filtering
<br>- String uniqueName = pa.getName() + "::" + portlet.getPortletName();
<br>- if (securityAccessController.checkPortletAccess(portlet, JetspeedActions.MASK_VIEW))
<br>- {
<br>- InitParam param = portlet.getInitParam(PORTLET_ICON);
<br>- String image;
<br>- if (param != null)
<br>- {
<br>- //String relativeImagePath = param.getValue();
<br>- //String context = muta.getWebApplicationDefinition().getContextRoot();
<br>- // Have to use a supported icon in jetspeed, otherwise image can be out of skew
<br>- String imagePath = param.getParamValue();
<br>- if (imagePath == null)
<br>- {
<br>- image = DEFAULT_IMAGES[rand.nextInt(DEFAULT_IMAGES.length)];
<br>- }
<br>- else
<br>- {
<br>- if (-1 == imagePath.indexOf("/"))
<br>- image = "images/portlets/" + param.getParamValue();
<br>- else
<br>- image = param.getParamValue();
<br>- }
<br>- }
<br>- else
<br>- {
<br>- image = DEFAULT_IMAGES[rand.nextInt(DEFAULT_IMAGES.length)];
<br>- }
<br>- return new PortletInfo(uniqueName, cleanup(portlet.getDisplayNameText(locale)), cleanup(portlet.getDescriptionText(locale)), "/" + image);
<br>- }
<br>- return null;
<br>- }
<br>-
<br>- public int compare(Object obj1, Object obj2)
<br>- {
<br>- PortletInfo portlet1 = (PortletInfo)obj1;
<br>- PortletInfo portlet2 = (PortletInfo)obj2;
<br>- String name1 = portlet1.getDisplayName();
<br>- String name2 = portlet2.getDisplayName();
<br>- name1 = (name1 == null) ? "unknown" : name1;
<br>- name2 = (name2 == null) ? "unknown" : name2;
<br>- return name1.compareTo(name2);
<br>- }
<br>-
<br>- protected boolean filterByRole(PortletDefinition portlet, PortletRequest request)
<br>- {
<br>- boolean doFilter = false;
<br>- Collection c = portlet.getMetadata().getFields("selector.conditional.role");
<br>- if (c != null)
<br>- {
<br>- Iterator it = c.iterator();
<br>- if (it.hasNext())
<br>- {
<br>- LocalizedField roleField = (LocalizedField) it.next();
<br>- String role = roleField.getValue();
<br>- if (role != null)
<br>- {
<br>- if (role.equals("*"))
<br>- doFilter = true;
<br>- else
<br>- {
<br>- return (!request.isUserInRole(role));
<br>- }
<br>- }
<br>- }
<br>- }
<br>- return doFilter;
<br>- }
<br>-
<br>- protected String cleanup(String str)
<br>- {
<br>- if (str == null)
<br>- return str;
<br>- return str.replaceAll("\r|\n|\"|\'", "");
<br>- }
<br>-
<br>- @SuppressWarnings("unchecked")
<br>- public List<CategoryResult> retrieveCategories(PortletRequest request)
<br>- throws PortletException
<br>- {
<br>- List<CategoryResult> categories = (List)request.getPortletSession().getAttribute("categories");
<br> if (categories != null)
<br> {
<br> return categories;
<br> }
<br>- Locale locale = request.getLocale();
<br>- categories = new ArrayList<CategoryResult>();
<br>- PortletPreferences prefs = request.getPreferences();
<br>- String cats = prefs.getValue("Categories", null);
<br>+
<br>+ String cats = request.getPreferences().getValue("Categories", null);
<br>+
<br> if (cats == null)
<br> {
<br> throw new PortletException("No categories defined, please add categories via edit mode.");
<br> }
<br>- StringTokenizer catTokenizer = new StringTokenizer(cats, ",");
<br>- while (catTokenizer.hasMoreTokens())
<br>- {
<br>- String name = catTokenizer.nextToken().trim();
<br>- List<PortletInfo> portlets = new ArrayList<PortletInfo>();
<br>- String keywords = prefs.getValue("Keywords:" + name, null);
<br>- if (keywords != null)
<br>- {
<br>- StringTokenizer keyTokenizer = new StringTokenizer(keywords, ",");
<br>- StringBuffer searchString = new StringBuffer();
<br>- int count = 0;
<br>- while (keyTokenizer.hasMoreTokens())
<br>- {
<br>- String keyword = keyTokenizer.nextToken().trim();
<br>- if (count > 0)
<br>- {
<br>- searchString.append(" | ");
<br>- }
<br>- searchString.append(keyword);
<br>- count++;
<br>- }
<br>- if (count > 0)
<br>- {
<br>- Iterator portletsIter = searchEngine.search(searchString.toString()).getResults().iterator();
<br>- while (portletsIter.hasNext())
<br>- {
<br>- PortletDefinition portlet =
<br>- getPortletFromParsedObject((ParsedObject) portletsIter.next());
<br>- PortletInfo portletInfo = filterPortlet(portlet, locale, request);
<br>- if (portletInfo != null)
<br>- {
<br>- portlets.add(portletInfo);
<br>- }
<br>- }
<br>- Collections.sort(portlets, this);
<br>- }
<br>- }
<br>- categories.add(new CategoryResult(name, portlets));
<br>- }
<br>- request.getPortletSession().setAttribute("categories", categories);
<br>- return categories;
<br>- }
<br>-
<br>- private CategoryResult getPortlets(PortletRequest request,
<br>- String category, String pageNumber, int portletPerPages,String filter)
<br>- {
<br>- List<PortletInfo> list = new ArrayList<PortletInfo>();
<br>
<br>- try
<br>- {
<br>- if (category != null && category.equalsIgnoreCase("all"))
<br>- {
<br>- list = retrievePortlets(request, filter);
<br>- }
<br>- else if (filter != null)
<br>- {
<br>- list = retrievePortlets(request, filter);
<br>- }
<br>- else
<br>- {
<br>- List<CategoryResult> catList = retrieveCategories(request);
<br>- for (CategoryResult catInfo : catList)
<br>- {
<br>- if (catInfo.getName().equalsIgnoreCase(category))
<br>- {
<br>- list = catInfo.getPortlets();
<br>- break;
<br>- }
<br>- }
<br>- }
<br>- }
<br>- catch (Exception e)
<br>- {
<br>- log.error("Cannot retrieve portlets.", e);
<br>- }
<br>+ categories = Arrays.asList(StringUtils.split(cats, ", \t\n"));
<br>
<br>- return new CategoryResult(category, list);
<br>- }
<br>-
<br>- public static class CategoryResult implements Serializable
<br>- {
<br>+ request.getPortletSession().setAttribute("categories", categories);
<br>
<br>- String name;
<br>- List<PortletInfo> portlets;
<br>-
<br>- /**
<br>- * @param name
<br>- * @param list
<br>- */
<br>- public CategoryResult(String name, List<PortletInfo> portlets)
<br>- {
<br>- this.name = name;
<br>- this.portlets = portlets;
<br>- }
<br>-
<br>- /**
<br>- * @return the name
<br>- */
<br>- public String getName() {
<br>- return name;
<br>- }
<br>-
<br>- /**
<br>- * @return the list
<br>- */
<br>- public List<PortletInfo> getPortlets()
<br>- {
<br>- return portlets;
<br>- }
<br>-
<br>- }
<br>-
<br>+ return categories;
<br>+ }
<br>+
<br> protected ContentFragment findFirstUnlockedFragment(ContentFragment fragment)
<br> {
<br> if (fragment.isLocked())
<br> {
<br>- List<ContentFragment> fragments = (List<ContentFragment>)fragment.getFragments();
<br>+ List<ContentFragment> fragments = (List<ContentFragment>) fragment.getFragments();
<br>+
<br> for (ContentFragment f : fragments)
<br> {
<br> if (f.getType().equals(Fragment.LAYOUT))
<br>@@ -566,7 +239,8 @@
<br> if (fragment != null)
<br> return fragment;
<br> }
<br>- }
<br>+ }
<br>+
<br> return null;
<br> }
<br> return fragment;
<br>@@ -577,17 +251,19 @@
<br> protected void addPortletToLeastUsedColumn(ContentPage page, String portletName)
<br> {
<br> ContentFragment layoutFragment = findFirstUnlockedFragment(page.getRootFragment());
<br>+
<br> if (layoutFragment != null)
<br> {
<br> String layoutType = layoutFragment.getName();
<br> List<ContentFragment> fragments = (List<ContentFragment>)layoutFragment.getFragments();
<br> int columnCounts[] = new int[getLayoutSize(layoutType)];
<br>+
<br> for (ContentFragment fragment : fragments)
<br> {
<br> int column = fragment.getLayoutColumn();
<br> int row = fragment.getLayoutRow();
<br> if (column == -1)
<br>- column = min(columnCounts);
<br>+ column = NumberUtils.min(columnCounts);
<br> if (row == -1)
<br> row = columnCounts[column];
<br> if (column > fragments.size() -1)
<br>@@ -597,29 +273,19 @@
<br> }
<br> columnCounts[column]++;
<br> }
<br>+
<br> int placedColumn = 0;
<br>+
<br> for (int ix = 1; ix < columnCounts.length; ix++)
<br> {
<br> if (columnCounts[ix] < columnCounts[placedColumn])
<br> placedColumn = ix;
<br> }
<br>+
<br> layoutFragment.addPortlet(ContentFragment.PORTLET, portletName, columnCounts[placedColumn], placedColumn);
<br> }
<br> }
<br>
<br>- public static int min(int[] numbers)
<br>- {
<br>- int minValue = numbers[0];
<br>- for (int i = 1; i < numbers.length; i++)
<br>- {
<br>- if (numbers[i] < minValue)
<br>- {
<br>- minValue = numbers[i];
<br>- }
<br>- }
<br>- return minValue;
<br>- }
<br>-
<br> public static int getLayoutSize(String layoutType)
<br> {
<br> if (layoutType.indexOf("TwoColumns") > -1)
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=888004&r1=888003&r2=888004&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=888004&r1=888003&r2=888004&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp Mon Dec 7 17:04:01 2009
<br>@@ -67,7 +67,7 @@
<br> <select id="<portlet:namespace/>categories">
<br> <option value="">Choose a category</option>
<br> <c:forEach var="category" items="${categories}">
<br>- <option value="${category.name}">${category.name}</option>
<br>+ <option value="${category}">${category}</option>
<br> </c:forEach>
<br> </select>
<br> </td>
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26680342&i=1" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26680342&i=2" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26679220
svn commit: r887964 - /portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java
2009-12-07T07:50:02Z
2009-12-07T07:50:02Z
woonsan
Author: woonsan
<br>Date: Mon Dec 7 15:50:01 2009
<br>New Revision: 887964
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=887964&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=887964&view=rev</a><br>Log:
<br>JS2-1087: Adds the existing portlet filtering out logic by role
<br><br>Modified:
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java?rev=887964&r1=887963&r2=887964&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java?rev=887964&r1=887963&r2=887964&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java Mon Dec 7 15:50:01 2009
<br>@@ -36,6 +36,7 @@
<br> import org.apache.commons.lang.math.NumberUtils;
<br> import org.apache.jetspeed.JetspeedActions;
<br> import org.apache.jetspeed.components.portletregistry.PortletRegistry;
<br>+import org.apache.jetspeed.om.portlet.LocalizedField;
<br> import org.apache.jetspeed.om.portlet.PortletApplication;
<br> import org.apache.jetspeed.om.portlet.PortletDefinition;
<br> import org.apache.jetspeed.search.ParsedObject;
<br>@@ -219,7 +220,7 @@
<br> }
<br> }
<br>
<br>- Collection<PortletDefinition> filteredPortletDefinitions = filterPortletDefinitionsBySecurityAccess(searchedPortletDefinitions, JetspeedActions.MASK_VIEW);
<br>+ Collection<PortletDefinition> filteredPortletDefinitions = filterPortletDefinitionsBySecurityAccess(searchedPortletDefinitions, JetspeedActions.MASK_VIEW, servletRequest);
<br> pdBeans.setTotalSize(filteredPortletDefinitions.size());
<br>
<br> for (PortletDefinition pd : (Collection<PortletDefinition>) PaginationUtils.subCollection(filteredPortletDefinitions, beginIndex, maxResults))
<br>@@ -231,7 +232,7 @@
<br> {
<br> if (StringUtils.isBlank(applicationName) && StringUtils.isBlank(definitionName))
<br> {
<br>- Collection<PortletDefinition> pds = filterPortletDefinitionsBySecurityAccess(portletRegistry.getAllPortletDefinitions(), JetspeedActions.MASK_VIEW);
<br>+ Collection<PortletDefinition> pds = filterPortletDefinitionsBySecurityAccess(portletRegistry.getAllPortletDefinitions(), JetspeedActions.MASK_VIEW, servletRequest);
<br> pdBeans.setTotalSize(pds.size());
<br>
<br> for (PortletDefinition pd : (Collection<PortletDefinition>) PaginationUtils.subCollection(pds, beginIndex, maxResults))
<br>@@ -247,7 +248,7 @@
<br> {
<br> if (StringUtils.isBlank(definitionName))
<br> {
<br>- Collection<PortletDefinition> pds = filterPortletDefinitionsBySecurityAccess(pa.getPortlets(), JetspeedActions.MASK_VIEW);
<br>+ Collection<PortletDefinition> pds = filterPortletDefinitionsBySecurityAccess(pa.getPortlets(), JetspeedActions.MASK_VIEW, servletRequest);
<br> pdBeans.setTotalSize(pds.size());
<br>
<br> for (PortletDefinition pd : (List<PortletDefinition>) PaginationUtils.subCollection(pds, beginIndex, maxResults))
<br>@@ -274,7 +275,7 @@
<br> return pdBeans;
<br> }
<br>
<br>- private Collection<PortletDefinition> filterPortletDefinitionsBySecurityAccess(Collection<PortletDefinition> collection, int mask)
<br>+ private Collection<PortletDefinition> filterPortletDefinitionsBySecurityAccess(Collection<PortletDefinition> collection, int mask, HttpServletRequest servletRequest)
<br> {
<br> if (securityAccessController == null)
<br> {
<br>@@ -290,6 +291,11 @@
<br>
<br> for (PortletDefinition pd : collection)
<br> {
<br>+ if (isFilteredOutByRole(pd, servletRequest))
<br>+ {
<br>+ continue;
<br>+ }
<br>+
<br> if (securityAccessController.checkPortletAccess(pd, mask))
<br> {
<br> filteredCollection.add(pd);
<br>@@ -299,4 +305,31 @@
<br> return filteredCollection;
<br> }
<br>
<br>+ private boolean isFilteredOutByRole(PortletDefinition pd, HttpServletRequest servletRequest)
<br>+ {
<br>+ boolean filteredOut = false;
<br>+
<br>+ Collection<LocalizedField> fields = pd.getMetadata().getFields("selector.conditional.role");
<br>+
<br>+ if (fields != null && !fields.isEmpty())
<br>+ {
<br>+ LocalizedField field = fields.iterator().next();
<br>+ String role = field.getValue();
<br>+
<br>+ if (!StringUtils.isBlank(role))
<br>+ {
<br>+ if (role.equals("*"))
<br>+ {
<br>+ filteredOut = true;
<br>+ }
<br>+ else
<br>+ {
<br>+ filteredOut = (!servletRequest.isUserInRole(role));
<br>+ }
<br>+ }
<br>+ }
<br>+
<br>+ return filteredOut;
<br>+ }
<br>+
<br> }
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26679220&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26679220&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26676496
RE: wicket portlet
2009-12-07T04:21:17Z
2009-12-07T04:21:17Z
Vlachogiannis Evangelos
Thnx for your time!
<br>I have compared with these and everything seems ok. However I still have same problem...
<br>Let me try give some "context". I am actually trying to develop a very simple CMS based on jcr/jackrabbit and wicket. You can find source code in <a href="http://source.aegean.gr/svn/projects/e-university/uportal3/cmsApp/" target="_top" rel="nofollow">http://source.aegean.gr/svn/projects/e-university/uportal3/cmsApp/</a> . It would be great if somebody could take a look or even deploy and give me a hint. When I am testing as wicket application everything is ok. When I deploy as portlet I get the exception below..
<br><br>Thanks in advance,
<br>Vangelis
<br><br>-----Original Message-----
<br>From: Woonsan Ko [mailto:<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26676496&i=0" target="_top" rel="nofollow">woon_san@...</a>]
<br>Sent: Monday, December 07, 2009 11:12 AM
<br>To: Jetspeed Developers List
<br>Subject: Re: wicket portlet
<br><br>HiVlachogiannis,
<br><br>I think you can compare your configurations with j2-admin's wicket portlets.
<br>For example, WicketProfilerAdminApplication is configured in web.xml like this:
<br><br> <filter>
<br> <filter-name>WicketProfilerAdminApplication</filter-name>
<br> <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
<br> <init-param>
<br> <param-name>applicationClassName</param-name>
<br> <param-value>org.apache.jetspeed.portlets.profiler.WicketProfilerAdminApplication</param-value>
<br> </init-param>
<br> </filter>
<br><br> <filter-mapping>
<br> <filter-name>WicketProfilerAdminApplication</filter-name>
<br> <url-pattern>/profileradmin/*</url-pattern>
<br> <dispatcher>REQUEST</dispatcher>
<br> <dispatcher>INCLUDE</dispatcher>
<br> </filter-mapping>
<br><br>The dispatcher configurations (REQUEST and INCLUDE) are important.
<br>Also, the portlet is configured in portlet.xml like this:
<br><br> <portlet>
<br> <description>Profiler Administration</description>
<br> <portlet-name>WicketProfilerAdmin</portlet-name>
<br> <display-name>Profiler Administration</display-name>
<br> <portlet-class>
<br> org.apache.wicket.protocol.http.portlet.WicketPortlet</portlet-class>
<br> <init-param>
<br> <name>wicketFilterPath</name>
<br> <value>/profileradmin</value>
<br> </init-param>
<br> <supports>
<br> <mime-type>*/*</mime-type>
<br> <portlet-mode>VIEW</portlet-mode>
<br> </supports>
<br> <supported-locale>en</supported-locale>
<br> <portlet-info>
<br> <title>Profiler Admin</title>
<br> <short-title>ProfilerAdmin</short-title>
<br> <keywords>admin,profiler</keywords>
<br> </portlet-info>
<br> </portlet>
<br><br><br>HTH,
<br><br>Woonsan
<br><br><br><br><br>----- Original Message ----
<div class='shrinkable-quote'><br>> From: Vlachogiannis Evangelos <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26676496&i=1" target="_top" rel="nofollow">evlach@...</a>>
<br>> To: Jetspeed Developers List <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26676496&i=2" target="_top" rel="nofollow">jetspeed-dev@...</a>>
<br>> Sent: Sun, December 6, 2009 9:44:46 AM
<br>> Subject: RE: wicket portlet
<br>>
<br>> Thnx a lot! That seems to work now as a portlet, but in my particular
<br>> application I get the following exception. In my markup I ref all ids. Out of
<br>> the portal I test that and works fine. Any ideas please?
<br>>
<br>> Unexpected RuntimeException
<br>>
<br>> WicketMessage: The component(s) below failed to render. A common problem is that
<br>> you have added a component in code but forgot to reference it in the markup
<br>> (thus the component will never be rendered).
<br>>
<br>> 1. [MarkupContainer [Component id = tree]]
<br>> 2. [MarkupContainer [Component id = i]]
<br>> 3. [MarkupContainer [Component id = 0]]
<br>> 4. [MarkupContainer [Component id = junctionLink]]
<br>> 5. [MarkupContainer [Component id = nodeComponent]]
<br>> 6. [MarkupContainer [Component id = iconLink]]
<br>> 7. [Component id = icon]
<br>> 8. [MarkupContainer [Component id = contentLink]]
<br>> 9. [Component id = content]
<br>>
<br>> Root cause:
<br>>
<br>> org.apache.wicket.WicketRuntimeException: The component(s) below failed to
<br>> render. A common problem is that you have added a component in code but forgot
<br>> to reference it in the markup (thus the component will never be rendered).
<br>>
<br>> 1. [MarkupContainer [Component id = tree]]
<br>> 2. [MarkupContainer [Component id = i]]
<br>> 3. [MarkupContainer [Component id = 0]]
<br>> 4. [MarkupContainer [Component id = junctionLink]]
<br>> 5. [MarkupContainer [Component id = nodeComponent]]
<br>> 6. [MarkupContainer [Component id = iconLink]]
<br>> 7. [Component id = icon]
<br>> 8. [MarkupContainer [Component id = contentLink]]
<br>> 9. [Component id = content]
<br>>
<br>> at org.apache.wicket.Page.checkRendering(Page.java:1162)
<br>> at org.apache.wicket.Page.renderPage(Page.java:922)
<br>> at
<br>> org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.respond(BookmarkablePageRequestTarget.java:262)
<br>> at
<br>> org.apache.wicket.request.AbstractRequestCycleProcessor.respond(AbstractRequestCycleProcessor.java:105)
<br>> at
<br>> org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1258)
<br>> at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329)
<br>> at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428)
<br>> at org.apache.wicket.RequestCycle.request(RequestCycle.java:545)
<br>> at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468)
<br>> at org.apache.wicket.protocol.http.WicketFilter.doFilter(WicketFilter.java:301)
<br>> at
<br>> org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235)
<br>> at
<br>> org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
<br>> at
<br>> org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:646)
<br>> at
<br>> org.apache.catalina.core.ApplicationDispatcher.doInclude(ApplicationDispatcher.java:551)
<br>> at
<br>> org.apache.catalina.core.ApplicationDispatcher.include(ApplicationDispatcher.java:488)
<br>> at
<br>> org.apache.pluto.container.impl.PortletRequestDispatcherImpl.doDispatch(PortletRequestDispatcherImpl.java:174)
<br>> at
<br>> org.apache.pluto.container.impl.PortletRequestDispatcherImpl.include(PortletRequestDispatcherImpl.java:222)
<br>> at
<br>> org.apache.wicket.protocol.http.portlet.WicketPortlet.processMimeResponseRequest(WicketPortlet.java:655)
<br>> at
<br>> org.apache.wicket.protocol.http.portlet.WicketPortlet.processRequest(WicketPortlet.java:608)
<br>> at
<br>> org.apache.wicket.protocol.http.portlet.WicketPortlet.doView(WicketPortlet.java:469)
<br>> at javax.portlet.GenericPortlet.doDispatch(GenericPortlet.java:348)
<br>> at javax.portlet.GenericPortlet.render(GenericPortlet.java:253)
<br>> at
<br>> org.apache.jetspeed.portlet.PortletObjectProxy.proxyRender(PortletObjectProxy.java:244)
<br>> at
<br>> org.apache.jetspeed.portlet.PortletObjectProxy.invoke(PortletObjectProxy.java:159)
<br>> at $Proxy19.render(Unknown Source)
<br>> at
<br>> org.apache.jetspeed.factory.JetspeedPortletInstance.render(JetspeedPortletInstance.java:110)
<br>> at
<br>> org.apache.jetspeed.container.services.JetspeedFilterChain.doFilter(JetspeedFilterChain.java:142)
<br>> at
<br>> org.apache.jetspeed.container.services.JetspeedFilterChain.processFilter(JetspeedFilterChain.java:92)
<br>> at
<br>> org.apache.jetspeed.container.services.JetspeedFilterManager.processFilter(JetspeedFilterManager.java:112)
<br>> at
<br>> org.apache.jetspeed.container.JetspeedContainerServlet.doGet(JetspeedContainerServlet.java:272)
<br>> at javax.servlet.http.HttpServlet.service(HttpServlet.java:617)
<br>> at javax.servlet.http.HttpServlet.service(HttpServlet.java:717)
<br>> at
<br>> org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290)
<br>> at
<br>> org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
<br>> at
<br>> org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:646)
<br>> at
<br>> org.apache.catalina.core.ApplicationDispatcher.doInclude(ApplicationDispatcher.java:551)
<br>> at
<br>> org.apache.catalina.core.ApplicationDispatcher.include(ApplicationDispatcher.java:488)
<br>> at
<br>> org.apache.jetspeed.container.invoker.ServletPortletInvoker.invoke(ServletPortletInvoker.java:165)
<br>> at
<br>> org.apache.jetspeed.container.invoker.JetspeedPortletInvokerService.render(JetspeedPortletInvokerService.java:127)
<br>> at
<br>> org.apache.pluto.container.impl.PortletContainerImpl.doRender(PortletContainerImpl.java:157)
<br>> at
<br>> org.apache.jetspeed.container.JetspeedPortletContainerWrapper.doRender(JetspeedPortletContainerWrapper.java:69)
<br>> at
<br>> org.apache.jetspeed.aggregator.impl.RenderingJobImpl.execute(RenderingJobImpl.java:183)
<br>> at
<br>> org.apache.jetspeed.aggregator.impl.PortletRendererImpl.renderNow(PortletRendererImpl.java:160)
<br>> at
<br>> org.apache.jetspeed.aggregator.impl.PortletRendererImpl.renderNow(PortletRendererImpl.java:138)
<br>> at
<br>> org.apache.jetspeed.aggregator.impl.BaseAggregatorImpl.renderMaximizedWindow(BaseAggregatorImpl.java:101)
<br>> at
<br>> org.apache.jetspeed.aggregator.impl.PageAggregatorImpl.build(PageAggregatorImpl.java:73)
<br>> at
<br>> org.apache.jetspeed.aggregator.AggregatorValve.invoke(AggregatorValve.java:46)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at
<br>> org.apache.jetspeed.aggregator.HeaderAggregatorValve.invoke(HeaderAggregatorValve.java:53)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at
<br>> org.apache.jetspeed.decoration.DecorationValve.invoke(DecorationValve.java:137)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at
<br>> org.apache.jetspeed.resource.ResourceValveImpl.invoke(ResourceValveImpl.java:84)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at
<br>> org.apache.jetspeed.pipeline.valve.impl.ActionValveImpl.invoke(ActionValveImpl.java:139)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at org.apache.jetspeed.container.ContainerValve.invoke(ContainerValve.java:88)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at
<br>> org.apache.jetspeed.container.PageHistoryValve.invoke(PageHistoryValve.java:108)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at
<br>> org.apache.jetspeed.profiler.impl.RefreshUserHomepageValveImpl.invoke(RefreshUserHomepageValveImpl.java:110)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at
<br>> org.apache.jetspeed.profiler.impl.ProfilerValveImpl.invoke(ProfilerValveImpl.java:251)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at
<br>> org.apache.jetspeed.security.impl.LoginValidationValveImpl.invoke(LoginValidationValveImpl.java:158)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at
<br>> org.apache.jetspeed.security.impl.PasswordCredentialValveImpl.invoke(PasswordCredentialValveImpl.java:151)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at
<br>> org.apache.jetspeed.localization.impl.LocalizationValveImpl.invoke(LocalizationValveImpl.java:170)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at
<br>> org.apache.jetspeed.security.impl.AbstractSecurityValve$1.run(AbstractSecurityValve.java:138)
<br>> at java.security.AccessController.doPrivileged(Native Method)
<br>> at javax.security.auth.Subject.doAsPrivileged(Subject.java:454)
<br>> at org.apache.jetspeed.security.JSSubject.doAsPrivileged(JSSubject.java:179)
<br>> at
<br>> org.apache.jetspeed.security.impl.AbstractSecurityValve.invoke(AbstractSecurityValve.java:132)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at
<br>> org.apache.jetspeed.container.url.impl.PortalURLValveImpl.invoke(PortalURLValveImpl.java:67)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at
<br>> org.apache.jetspeed.capabilities.impl.CapabilityValveImpl.invoke(CapabilityValveImpl.java:127)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline.invoke(JetspeedPipeline.java:146)
<br>> at org.apache.jetspeed.engine.JetspeedEngine.service(JetspeedEngine.java:225)
<br>> at org.apache.jetspeed.engine.JetspeedServlet.doGet(JetspeedServlet.java:300)
<br>> at javax.servlet.http.HttpServlet.service(HttpServlet.java:617)
<br>> at javax.servlet.http.HttpServlet.service(HttpServlet.java:717)
<br>> at
<br>> org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290)
<br>> at
<br>> org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
<br>> at
<br>> org.apache.jetspeed.engine.servlet.XXSUrlAttackFilter.doFilter(XXSUrlAttackFilter.java:52)
<br>> at
<br>> org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235)
<br>> at
<br>> org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
<br>> at gr.uportal.filter.CASPortalFilter.doFilter(CASPortalFilter.java:154)
<br>> at
<br>> org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235)
<br>> at
<br>> org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
<br>> at
<br>> org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:233)
<br>> at
<br>> org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:191)
<br>> at
<br>> org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:433)
<br>> at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:128)
<br>> at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:102)
<br>> at
<br>> org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:109)
<br>> at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:293)
<br>> at org.apache.coyote.http11.Http11Processor.process(Http11Processor.java:849)
<br>> at
<br>> org.apache.coyote.http11.Http11Protocol$Http11ConnectionHandler.process(Http11Protocol.java:583)
<br>> at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:454)
<br>> at java.lang.Thread.run(Thread.java:595)
<br>>
<br>> -----Original Message-----
<br>> From: Woonsan Ko [mailto:<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26676496&i=3" target="_top" rel="nofollow">woon_san@...</a>]
<br>> Sent: Friday, December 04, 2009 11:27 AM
<br>> To: Jetspeed Developers List
<br>> Subject: Re: wicket portlet
<br>>
<br>> Hi Vlachogiannis,
<br>>
<br>> There's a simple guideline here:
<br>>
<br>> <a href="http://cwiki.apache.org/WICKET/portal-howto.html" target="_top" rel="nofollow">http://cwiki.apache.org/WICKET/portal-howto.html</a><br>>
<br>> Regards,
<br>>
<br>> Woonsan
<br>>
<br>>
<br>>
<br>> ----- Original Message ----
<br>> > From: Vlachogiannis Evangelos
<br>> > To: Jetspeed Developers List
<br>> > Sent: Fri, December 4, 2009 9:14:06 AM
<br>> > Subject: wicket portlet
<br>> >
<br>> > Hi list,
<br>> >
<br>> > Is there a howto page for developing a wicket portlet for jetspeed? Some
<br>> hints?
<br>> >
<br>> > Thanks a lot,
<br>> > Vangelis
<br>>
<br>>
<br>>
<br>>
<br>>
<br>> ---------------------------------------------------------------------
<br>> To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26676496&i=4" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>> For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26676496&i=5" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br>>
<br>>
<br>> ---------------------------------------------------------------------
<br>> To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26676496&i=6" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>> For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26676496&i=7" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
</div><br><br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26676496&i=8" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26676496&i=9" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26676496&i=10" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26676496&i=11" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26676282
svn commit: r887897 - /portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
2009-12-07T04:03:31Z
2009-12-07T04:03:31Z
woonsan
Author: woonsan
<br>Date: Mon Dec 7 12:03:31 2009
<br>New Revision: 887897
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=887897&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=887897&view=rev</a><br>Log:
<br>JS2-1057: replacing json target url by new jax-rs service url.
<br>removes empty img src url.
<br><br>Modified:
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=887897&r1=887896&r2=887897&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=887897&r1=887896&r2=887897&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp Mon Dec 7 12:03:31 2009
<br>@@ -50,15 +50,15 @@
<br> </tr>
<br> </table>
<br>
<br>+<form id="<portlet:namespace/>form">
<br> <table id="<portlet:namespace/>portletsTab" style="display: none; border-collapse: collapse; width: 100%; margin-top: 0px; margin-bottom: 0px; float: left;">
<br>- <form onsubmit="return false;">
<br> <tr>
<br> <th class="portlet-section-header" colspan="10">Portlets</th>
<br> </tr>
<br> <tr>
<br> <td class="portlet-section-subheader" colspan='10'>
<br>- <input id="<portlet:namespace/>query" type="text" name="filter" size="15" value="" >
<br>- <input id="<portlet:namespace/>search" type="button" value="Search" />
<br>+ <input type="text" name="query" size="15" value="" >
<br>+ <input type="submit" value="Search" />
<br> </td>
<br> </tr>
<br>
<br>@@ -82,14 +82,14 @@
<br> <tr>
<br> <th class="portlet-section-header" colspan="2"></th>
<br> </tr>
<br>- </form>
<br> </table>
<br>+</form>
<br>
<br> <div id="<portlet:namespace/>portletItemTemplate" style="display: none">
<br> <table style="border-collapse: collapse; width: 100%; margin-top: 0px; margin-bottom: 0px; float: left;">
<br> <tr>
<br> <td rowspan="2" width="20%" class="portlet-section-body">
<br>- <img src='${portalContextPath}' />
<br>+ <img/>
<br> </td>
<br> <td width="80%" class="portlet-section-body">
<br> <div>#</span>
<br>@@ -168,7 +168,7 @@
<br> </table>
<br>
<br> <script language="javascript">
<br>-YUI().use('io', 'dataschema-json', 'node-base', 'cookie', function(Y) {
<br>+YUI().use('io', 'json', 'node-base', 'cookie', function(Y) {
<br>
<br> function switchTab(e) {
<br> var tabId = ('string' == typeof(e) ? e : e.target.get("id"));
<br>@@ -203,23 +203,13 @@
<br> var onLoadPortletComplete = function(id, o, args) {
<br> var id = id; // Transaction ID.
<br> var data = o.responseText; // Response data.
<br>- var schemaPortletList = {
<br>- metaFields: {status:"status", action:"action"},
<br>- resultListLocator: "portlets",
<br>- resultFields: [{key:"name"}, {key:"displayName"}, {key:"description"}, {key:"image"}]
<br>- };
<br>-
<br> var dataOut = null;
<br>
<br> try {
<br>- dataOut = Y.DataSchema.JSON.apply(schemaPortletList, data);
<br>- // TODO: error handling
<br>+ dataOut = Y.JSON.parse(data);
<br> if (!dataOut) {
<br> Y.log("Error: no data found.");
<br> return;
<br>- } else if (dataOut.error) {
<br>- Y.log("Error: " + dataOut.error);
<br>- return;
<br> }
<br> } catch (e) {
<br> Y.log("Error: " + e.message);
<br>@@ -232,27 +222,49 @@
<br> portletsPanel = clonedPortletsPanel;
<br>
<br> var templatePanel = Y.Node.one("#<portlet:namespace/>portletItemTemplate");
<br>- var results = dataOut.results;
<br>- for (var i = 0; i < results.length; i++) {
<br>- var item = results[i];
<br>+ var defs = [];
<br>+ if (dataOut.definitions.definition) {
<br>+ if (dataOut.definitions.definition instanceof Array) {
<br>+ defs = dataOut.definitions.definition;
<br>+ } else {
<br>+ defs.push(dataOut.definitions.definition);
<br>+ }
<br>+ }
<br>+ for (var i = 0; i < defs.length; i++) {
<br>+ var def = defs[i];
<br> var clone = templatePanel.cloneNode(true);
<br> clone.setStyle('display', '');
<br> var imgNode = clone.one('img');
<br>- var url = imgNode.get('src');
<br>- var imgURL = url + "/" + item.image;
<br>- imgNode.set('src', imgURL);
<br>- var nameNode = clone.one('div');
<br>- nameNode.setContent(item.displayName);
<br>+ if (def.portletIcon) {
<br>+ imgNode.set("src", "${portalContextPath}/images/portlets/" + def.portletIcon);
<br>+ } else {
<br>+ imgNode.set("src", "${portalContextPath}/images/portlets/applications-other.png");
<br>+ }
<br>
<br>- <c:if test="${editAccess}">
<br>- var actionURL = "<portlet:actionURL/>";
<br>- var addActionURL = actionURL + (actionURL.indexOf('?') == -1 ? "?portletAdd=" : "&portletAdd=") + item.name;
<br>- clone.all("a").item(1).set("href", addActionURL);
<br>- </c:if>
<br>+ var nameNode = clone.one('div');
<br>+
<br>+ if (def.displayNames.displayName) {
<br>+ if (def.displayNames.displayName instanceof Array) {
<br>+ nameNode.setContent(def.displayNames.displayName[0].value);
<br>+ } else {
<br>+ nameNode.setContent(def.displayNames.displayName.value);
<br>+ }
<br>+ }
<br>+
<br>+ <c:choose>
<br>+ <c:when test="${editAccess}">
<br>+ var actionURL = "<portlet:actionURL/>";
<br>+ var addActionURL = actionURL + (actionURL.indexOf('?') == -1 ? "?portletAdd=" : "&portletAdd=") + def.uniqueName;
<br>+ clone.all("a").item(1).set("href", addActionURL);
<br>+ </c:when>
<br>+ <c:otherwise>
<br>+ clone.all("a").item(1).remove();
<br>+ </c:otherwise>
<br>+ </c:choose>
<br>
<br> // TODO: add handlers for preview
<br>
<br>- clone.set("id", "<portlet:namespace/>portletItem-" + item.name);
<br>+ clone.set("id", "<portlet:namespace/>portletItem-" + def.uniqueName);
<br>
<br> portletsPanel.appendChild(clone);
<br> }
<br>@@ -268,23 +280,26 @@
<br> return;
<br> }
<br> Y.Cookie.set("toolboxcat", category);
<br>- var uri = "${portalContextPath}/ajaxapi/?action=getportlets&format=json";
<br>- uri += "&filter=" + category;
<br>+ var uri = "${portalContextPath}/services/portletregistry/definition/?_type=json";
<br>+ uri += "&query=" + category;
<br> Y.on('io:complete', onLoadPortletComplete, this, []);
<br> var request = Y.io(uri);
<br>- Y.Node.one("#<portlet:namespace/>query").set("value", "");
<br>+ Y.Node.getDOMNode(Y.Node.one("#<portlet:namespace/>form")).query.value = "";
<br> }
<br>
<br> var loadPortletsByQuery = function(e) {
<br>- var query = Y.Node.one("#<portlet:namespace/>query").get("value");
<br>- var uri = "${portalContextPath}/ajaxapi/?action=getportlets&format=json";
<br>+ var form = Y.Node.getDOMNode(e.target);
<br>+ var query = form.query.value;
<br>+ var uri = "${portalContextPath}/services/portletregistry/definition/?_type=json";
<br> if (query) {
<br>- uri += "&filter=" + query;
<br>+ uri += "&query=" + query;
<br> }
<br> Y.on('io:complete', onLoadPortletComplete, this, []);
<br> var request = Y.io(uri);
<br>
<br> Y.Node.getDOMNode(Y.Node.one("#<portlet:namespace/>categories")).selectedIndex = 0;
<br>+
<br>+ e.halt();
<br> };
<br>
<br> Y.on("click", switchTab, "#<portlet:namespace/>portletsTabAction");
<br>@@ -292,8 +307,8 @@
<br> Y.on("click", switchTab, "#<portlet:namespace/>themesTabAction");
<br> Y.on("click", switchTab, "#<portlet:namespace/>widgetsTabAction");
<br> Y.on("change", loadPortletsInCategory, "#<portlet:namespace/>categories");
<br>- Y.on("click", loadPortletsByQuery, "#<portlet:namespace/>search");
<br>-
<br>+ Y.on("submit", loadPortletsByQuery, "#<portlet:namespace/>form");
<br>+
<br> var tabId = Y.Cookie.get("toolboxtab");
<br> if (!tabId) {
<br> tabId = "<portlet:namespace/>portletsTabAction";
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26676282&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26676282&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26676099
svn commit: r887895 - /portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java
2009-12-07T03:48:06Z
2009-12-07T03:48:06Z
woonsan
Author: woonsan
<br>Date: Mon Dec 7 11:48:05 2009
<br>New Revision: 887895
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=887895&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=887895&view=rev</a><br>Log:
<br>JS2-1087: Adds portlet icon property.
<br><br>Modified:
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java?rev=887895&r1=887894&r2=887895&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java?rev=887895&r1=887894&r2=887895&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java Mon Dec 7 11:48:05 2009
<br>@@ -46,6 +46,7 @@
<br> private String applicationName;
<br> private String portletName;
<br> private String uniqueName;
<br>+ private String portletIcon;
<br> private PortletInfoBean portletInfoBean;
<br> private Collection<DisplayNameBean> displayNameBeans;
<br> private Collection<DescriptionBean> descriptionBeans;
<br>@@ -108,6 +109,11 @@
<br> for (InitParam initParam : portletDefinition.getInitParams())
<br> {
<br> initParamBeanList.add(new InitParamBean(initParam));
<br>+
<br>+ if ("portlet-icon".equals(initParam.getParamName()))
<br>+ {
<br>+ portletIcon = initParam.getParamValue();
<br>+ }
<br> }
<br> initParamBeans = initParamBeanList;
<br> }
<br>@@ -132,6 +138,16 @@
<br> this.portletName = portletName;
<br> }
<br>
<br>+ public String getPortletIcon()
<br>+ {
<br>+ return portletIcon;
<br>+ }
<br>+
<br>+ public void setPortletIcon(String portletIcon)
<br>+ {
<br>+ this.portletIcon = portletIcon;
<br>+ }
<br>+
<br> public String getUniqueName()
<br> {
<br> return uniqueName;
<br>@@ -224,8 +240,8 @@
<br> this.containerRuntimeOptionBeans = containerRuntimeOptionBeans;
<br> }
<br>
<br>- @XmlElementWrapper(name="initparams")
<br>- @XmlElements(@XmlElement(name="initparam"))
<br>+ @XmlElementWrapper(name="initParams")
<br>+ @XmlElements(@XmlElement(name="initParam"))
<br> public Collection<InitParamBean> getInitParamBeans()
<br> {
<br> return initParamBeans;
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26676099&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26676099&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26675264
Re: Apa-RSS
2009-12-07T02:24:05Z
2009-12-07T02:24:05Z
Gonzalo Aguilar Delgado-4
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
<HTML>
<HEAD>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8">
<META NAME="GENERATOR" CONTENT="GtkHTML/3.28.1">
</HEAD>
<BODY>
Here is the patch. <BR>
<BR>
Sorry for the delay
</BODY>
</HTML>
<br /> <br /><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26675264&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26675264&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a><div class="small"><br/><img src="http://old.nabble.com/images/icon_attachment.gif" > <strong>apa-rss-add-html-support-slf4j-20091207.patch.gz</strong> (6K) <a href="http://old.nabble.com/attachment/26675264/0/apa-rss-add-html-support-slf4j-20091207.patch.gz" target="_top">Download Attachment</a></div><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26674943
[jira] Commented: (JS2-1088) UserInfoManager implementation needs inprovements in resolving mapped user attributes and its cache handling
2009-12-07T01:55:18Z
2009-12-07T01:55:18Z
Jetspeed - Dev mailing list
<br> [ <a href="https://issues.apache.org/jira/browse/JS2-1088?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12786840#action_12786840" target="_top" rel="nofollow">https://issues.apache.org/jira/browse/JS2-1088?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12786840#action_12786840</a> ]
<br><br>Ate Douma commented on JS2-1088:
<br>--------------------------------
<br><br>I've refactored the code a bit and added a caching solution which should improve performance considerably.
<br>What remains to be improved is dealing with registry changes with regards to the user attribute mapping which requires invalidation for the cache entries.
<br>Furthermore, the changes still need to be back ported to the 2.1.4 branch.
<br>Leaving this issue open until those tasks are completed as well.
<br><div class='shrinkable-quote'><br>> UserInfoManager implementation needs inprovements in resolving mapped user attributes and its cache handling
<br>> ------------------------------------------------------------------------------------------------------------
<br>>
<br>> Key: JS2-1088
<br>> URL: <a href="https://issues.apache.org/jira/browse/JS2-1088" target="_top" rel="nofollow">https://issues.apache.org/jira/browse/JS2-1088</a><br>> Project: Jetspeed 2
<br>> Issue Type: Improvement
<br>> Components: Container
<br>> Affects Versions: 2.1.3, 2.2.0
<br>> Reporter: Ate Douma
<br>> Assignee: Ate Douma
<br>> Priority: Minor
<br>> Fix For: 2.1.4, 2.2.1
<br>>
<br>>
<br>> The UserInfoManager currently doesn't properly maintain a cache of mapped (linked) attributes for a portlet application as there are some bugs in the code.
<br>> Furthermore, I discovered the UserInfoManager didn't work when logging was set to DEBUG (it throws a NPE then).
</div><br>--
<br>This message is automatically generated by JIRA.
<br>-
<br>You can reply to this email to add a comment to the issue online.
<br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26674943&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26674943&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26674925
[jira] Created: (JS2-1088) UserInfoManager implementation needs inprovements in resolving mapped user attributes and its cache handling
2009-12-07T01:53:18Z
2009-12-07T01:53:18Z
Jetspeed - Dev mailing list
UserInfoManager implementation needs inprovements in resolving mapped user attributes and its cache handling
<br>------------------------------------------------------------------------------------------------------------
<br><br> Key: JS2-1088
<br> URL: <a href="https://issues.apache.org/jira/browse/JS2-1088" target="_top" rel="nofollow">https://issues.apache.org/jira/browse/JS2-1088</a><br> Project: Jetspeed 2
<br> Issue Type: Improvement
<br> Components: Container
<br> Affects Versions: 2.1.3, 2.2.0
<br> Reporter: Ate Douma
<br> Assignee: Ate Douma
<br> Priority: Minor
<br> Fix For: 2.1.4, 2.2.1
<br><br><br>The UserInfoManager currently doesn't properly maintain a cache of mapped (linked) attributes for a portlet application as there are some bugs in the code.
<br>Furthermore, I discovered the UserInfoManager didn't work when logging was set to DEBUG (it throws a NPE then).
<br><br>--
<br>This message is automatically generated by JIRA.
<br>-
<br>You can reply to this email to add a comment to the issue online.
<br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26674925&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26674925&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26674926
svn commit: r887871 - in /portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl: AbstractUserInfoManagerImpl.java MultiSourceUserInfoManagerImpl.java UserInfoManagerImpl.java
2009-12-07T01:53:17Z
2009-12-07T01:53:17Z
Ate Douma-2
Author: ate
<br>Date: Mon Dec 7 09:53:16 2009
<br>New Revision: 887871
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=887871&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=887871&view=rev</a><br>Log:
<br>JS2-1088: Improvements for the mapped user attributes resolving and the UserInfoManager cache handling
<br><br>Modified:
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/AbstractUserInfoManagerImpl.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/MultiSourceUserInfoManagerImpl.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/AbstractUserInfoManagerImpl.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/AbstractUserInfoManagerImpl.java?rev=887871&r1=887870&r2=887871&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/AbstractUserInfoManagerImpl.java?rev=887871&r1=887870&r2=887871&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/AbstractUserInfoManagerImpl.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/AbstractUserInfoManagerImpl.java Mon Dec 7 09:53:16 2009
<br>@@ -17,8 +17,7 @@
<br> package org.apache.jetspeed.userinfo.impl;
<br>
<br> import java.util.ArrayList;
<br>-import java.util.Collection;
<br>-import java.util.Iterator;
<br>+import java.util.List;
<br> import java.util.Map;
<br>
<br> import javax.portlet.PortletRequest;
<br>@@ -29,7 +28,6 @@
<br> import org.apache.jetspeed.om.portlet.UserAttributeRef;
<br> import org.apache.jetspeed.om.portlet.impl.UserAttributeRefImpl;
<br> import org.apache.jetspeed.request.RequestContext;
<br>-import org.apache.pluto.container.PortletContainerException;
<br> import org.apache.jetspeed.container.PortletWindow;
<br>
<br> /**
<br>@@ -55,50 +53,47 @@
<br> * @param userAttributeRefs
<br> * The declarative jetspeed portlet extension user attributes
<br> * reference.
<br>- * @return The collection of linked attributes.
<br>+ * @return The list of linked attributes.
<br> */
<br>- protected Collection mapLinkedUserAttributes(Collection userAttributes, Collection userAttributeRefs)
<br>+ protected List<UserAttributeRef> mapLinkedUserAttributes(List<UserAttribute> userAttributes, List<UserAttributeRef> userAttributeRefs)
<br> {
<br>- Collection linkedUserAttributes = new ArrayList();
<br>+ UserAttributeRefImpl impl;
<br>+ List<UserAttributeRef> linkedUserAttributes = new ArrayList<UserAttributeRef>();
<br> if ((null != userAttributeRefs) && (userAttributeRefs.size() > 0))
<br> {
<br>- Iterator attrIter = userAttributes.iterator();
<br>- while (attrIter.hasNext())
<br>+ for (UserAttribute currentAttribute : userAttributes)
<br> {
<br>- UserAttribute currentAttribute = (UserAttribute) attrIter.next();
<br> boolean linkedAttribute = false;
<br>- if (null != currentAttribute)
<br>+ impl = new UserAttributeRefImpl();
<br>+ for (UserAttributeRef currentAttributeRef : userAttributeRefs)
<br> {
<br>- Iterator attrRefsIter = userAttributeRefs.iterator();
<br>- while (attrRefsIter.hasNext())
<br>+ if ((currentAttribute.getName()).equals(currentAttributeRef.getNameLink()))
<br> {
<br>- UserAttributeRef currentAttributeRef = (UserAttributeRef) attrRefsIter.next();
<br>- if (null != currentAttributeRef)
<br>+ if (log.isDebugEnabled())
<br> {
<br>- if ((currentAttribute.getName()).equals(currentAttributeRef.getNameLink()))
<br>- {
<br>- if (log.isDebugEnabled())
<br>- log.debug("Linking user attribute ref: [[name, " + currentAttribute.getName()
<br>- + "], [linked name, " + currentAttributeRef.getName() + "]]");
<br>- linkedUserAttributes.add(currentAttributeRef);
<br>- linkedAttribute = true;
<br>- }
<br>+ log.debug("Linking user attribute ref: [[name, " + currentAttribute.getName()
<br>+ + "], [linked name, " + currentAttributeRef.getName() + "]]");
<br> }
<br>+ impl.setName(currentAttributeRef.getName());
<br>+ impl.setNameLink(currentAttributeRef.getNameLink());
<br>+ linkedAttribute = true;
<br>+ break;
<br> }
<br> }
<br> if (!linkedAttribute)
<br> {
<br>- linkedUserAttributes.add(new UserAttributeRefImpl(currentAttribute));
<br>+ impl.setName(currentAttribute.getName());
<br> }
<br>+ linkedUserAttributes.add(impl);
<br> }
<br> }
<br> else
<br> {
<br>- Iterator attrIter = userAttributes.iterator();
<br>- while (attrIter.hasNext())
<br>+ for (UserAttribute currentAttribute : userAttributes)
<br> {
<br>- UserAttribute currentAttribute = (UserAttribute) attrIter.next();
<br>- linkedUserAttributes.add(new UserAttributeRefImpl(currentAttribute));
<br>+ impl = new UserAttributeRefImpl();
<br>+ impl.setName(currentAttribute.getName());
<br>+ linkedUserAttributes.add(impl);
<br> }
<br> }
<br> return linkedUserAttributes;
<br>@@ -107,10 +102,9 @@
<br> /**
<br> * For Pluto 2.0
<br> */
<br>- public Map<String, String> getUserInfo(PortletRequest request, org.apache.pluto.container.PortletWindow window) throws PortletContainerException
<br>+ public Map<String, String> getUserInfo(PortletRequest request, org.apache.pluto.container.PortletWindow window)
<br> {
<br>- String remoteUser = request.getRemoteUser();
<br>- if ( remoteUser == null )
<br>+ if ( request.getUserPrincipal() == null )
<br> {
<br> return null;
<br> }
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/MultiSourceUserInfoManagerImpl.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/MultiSourceUserInfoManagerImpl.java?rev=887871&r1=887870&r2=887871&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/MultiSourceUserInfoManagerImpl.java?rev=887871&r1=887870&r2=887871&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/MultiSourceUserInfoManagerImpl.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/MultiSourceUserInfoManagerImpl.java Mon Dec 7 09:53:16 2009
<br>@@ -16,23 +16,19 @@
<br> */
<br> package org.apache.jetspeed.userinfo.impl;
<br>
<br>-import java.util.Collection;
<br> import java.util.HashMap;
<br>-import java.util.Iterator;
<br> import java.util.List;
<br> import java.util.Map;
<br>
<br>-import javax.portlet.PortletRequest;
<br> import javax.security.auth.Subject;
<br>
<br> import org.slf4j.Logger;
<br> import org.slf4j.LoggerFactory;
<br> import org.apache.jetspeed.components.portletregistry.PortletRegistry;
<br>-import org.apache.jetspeed.om.portlet.PortletApplication;
<br>+import org.apache.jetspeed.om.portlet.UserAttributeRef;
<br> import org.apache.jetspeed.request.RequestContext;
<br> import org.apache.jetspeed.userinfo.UserAttributeRetrievalException;
<br> import org.apache.jetspeed.userinfo.UserAttributeSource;
<br>-import org.apache.jetspeed.userinfo.UserInfoManager;
<br>
<br> /**
<br> * Multisource User Information manager
<br>@@ -42,57 +38,51 @@
<br> * @author <a href="mailto:<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26674926&i=0" target="_top" rel="nofollow">taylor@...</a>">David Sean Taylor </a>
<br> * @version $Id: $
<br> */
<br>-public class MultiSourceUserInfoManagerImpl extends AbstractUserInfoManagerImpl
<br>- implements UserInfoManager
<br>+public class MultiSourceUserInfoManagerImpl extends UserInfoManagerImpl
<br> {
<br>
<br> /** Logger */
<br> private static final Logger log = LoggerFactory.getLogger(MultiSourceUserInfoManagerImpl.class);
<br>
<br>- private List sources;
<br>+ private List<UserAttributeSource> sources;
<br>
<br>- private PortletRegistry portletRegistry;
<br>-
<br>- public Map getUserInfoMap(String appName, RequestContext context)
<br>+ public Map<String,String> getUserInfoMap(String appName, RequestContext context)
<br> {
<br>-
<br>+ Map<String,String> userInfoMap = null;
<br> try
<br> {
<br>- Map userInfoMap = new HashMap();
<br> Subject subject = context.getSubject();
<br>- PortletApplication pa = portletRegistry.getPortletApplication(appName, true);
<br>- if (null == pa)
<br>+ if (null != subject)
<br> {
<br>- log.debug(PortletRequest.USER_INFO + " is set to null");
<br>- return null;
<br>+
<br> }
<br>- Collection userAttributes = pa.getUserAttributes();
<br>- Collection userAttributeRefs = pa.getUserAttributeRefs();
<br>- Collection linkedUserAttributes = mapLinkedUserAttributes(
<br>- userAttributes, userAttributeRefs);
<br>- for (Iterator iter = sources.iterator(); iter.hasNext();)
<br>+ userInfoMap = new HashMap<String,String>();
<br>+
<br>+ List<UserAttributeRef> linkedUserAttributes = getLinkedUserAttr(appName);
<br>+
<br>+ for (UserAttributeSource source : sources)
<br> {
<br>- UserAttributeSource source = (UserAttributeSource) iter.next();
<br>- Map sourceMap;
<br>-
<br>- sourceMap = source.getUserAttributeMap(subject,
<br>- linkedUserAttributes, context);
<br>- userInfoMap.putAll(sourceMap);
<br>+ Map<String, String> sourceMap = source.getUserAttributeMap(subject, linkedUserAttributes, context);
<br>+ if (sourceMap != null)
<br>+ {
<br>+ userInfoMap.putAll(sourceMap);
<br>+ }
<br> }
<br>- return userInfoMap;
<br>- } catch (UserAttributeRetrievalException e)
<br>+ }
<br>+ catch (UserAttributeRetrievalException e)
<br> {
<br> // Until external api is changed return
<br>- e.printStackTrace();
<br>+ log.error(e.getMessage(), e);
<br> return null;
<br> }
<br>+ return userInfoMap;
<br> }
<br>
<br> /**
<br> * @param sources
<br> * The sources to set.
<br> */
<br>- public void setSources(List sources)
<br>+ public void setSources(List<UserAttributeSource> sources)
<br> {
<br> this.sources = sources;
<br> }
<br>@@ -103,7 +93,7 @@
<br> */
<br> public void setPortletRegistry(PortletRegistry portletRegistry)
<br> {
<br>- this.portletRegistry = portletRegistry;
<br>+ registry = portletRegistry;
<br> }
<br>
<br> }
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java?rev=887871&r1=887870&r2=887871&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java?rev=887871&r1=887870&r2=887871&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java Mon Dec 7 09:53:16 2009
<br>@@ -17,10 +17,9 @@
<br> package org.apache.jetspeed.userinfo.impl;
<br>
<br> import java.security.Principal;
<br>-import java.util.Collection;
<br> import java.util.Collections;
<br> import java.util.HashMap;
<br>-import java.util.Iterator;
<br>+import java.util.List;
<br> import java.util.Map;
<br>
<br> import javax.portlet.PortletRequest;
<br>@@ -30,9 +29,10 @@
<br> import org.slf4j.LoggerFactory;
<br> import org.apache.jetspeed.components.portletregistry.PortletRegistry;
<br> import org.apache.jetspeed.om.portlet.PortletApplication;
<br>+import org.apache.jetspeed.om.portlet.UserAttribute;
<br> import org.apache.jetspeed.om.portlet.UserAttributeRef;
<br> import org.apache.jetspeed.request.RequestContext;
<br>-import org.apache.jetspeed.security.SecurityException;
<br>+import org.apache.jetspeed.security.JetspeedPrincipal;
<br> import org.apache.jetspeed.security.SubjectHelper;
<br> import org.apache.jetspeed.security.User;
<br> import org.apache.jetspeed.security.UserManager;
<br>@@ -53,19 +53,19 @@
<br> /** Logger */
<br> private static final Logger log = LoggerFactory.getLogger(UserInfoManagerImpl.class);
<br>
<br>- // TODO Same caching issue as usual. We should look into JCS. That wil do
<br>- // for now.
<br>- /** Map used to cache user info maps for each mapped portlet application. */
<br>- private static Map<String, Map<String, String>> userInfoMapCache;
<br>+ // TODO: needs cache invalidation when portlet application user info configuration changes
<br>+ /** Map to cache user info keys for each mapped portlet application. */
<br>+ private static Map<String, List<UserAttributeRef>> appUserInfoAttrCache = Collections.synchronizedMap(new HashMap<String,List<UserAttributeRef>>());
<br>
<br> /** The user manager */
<br>- UserManager userMgr;
<br>+ protected UserManager userMgr;
<br>
<br> /** The portlet registry. */
<br>- PortletRegistry registry;
<br>-
<br>- /** The object id of the portlet application being processed. */
<br>- String oid;
<br>+ protected PortletRegistry registry;
<br>+
<br>+ protected UserInfoManagerImpl()
<br>+ {
<br>+ }
<br>
<br> /**
<br> * <p>
<br>@@ -79,7 +79,6 @@
<br> {
<br> this.userMgr = userMgr;
<br> this.registry = registry;
<br>- initUserInfoMapCache();
<br> }
<br>
<br> /**
<br>@@ -97,36 +96,42 @@
<br> {
<br> this.userMgr = userMgr;
<br> this.registry = registry;
<br>- initUserInfoMapCache();
<br> }
<br>
<br> public Map<String, String> getUserInfoMap(String appName, RequestContext context)
<br> {
<br> if (log.isDebugEnabled())
<br>- log.debug("Getting user info for portlet application: " + oid.toString());
<br>-
<br>- // Check if user info map is in cache.
<br>- if (userInfoMapCache.containsKey(appName))
<br>- {
<br>- return userInfoMapCache.get(appName);
<br>- }
<br>- // Not in cache, map user info.
<br>+ log.debug("Getting user info for portlet application: " + appName);
<br>+
<br> Map<String, String> userInfo = getUserInformation(context);
<br>- if (null == userInfo)
<br>+ if (null == userInfo || userInfo.isEmpty())
<br> {
<br>- log.debug(PortletRequest.USER_INFO + " is set to null");
<br>+ log.debug(PortletRequest.USER_INFO + " is null or empty");
<br> return null;
<br> }
<br>-
<br>- PortletApplication pa = registry.getPortletApplication(appName, true);
<br>- if (null == pa)
<br>+
<br>+ return mapUserInfo(userInfo, getLinkedUserAttr(appName));
<br>+ }
<br>+
<br>+ protected List<UserAttributeRef> getLinkedUserAttr(String appName)
<br>+ {
<br>+ // Check if user info map is in cache.
<br>+ List<UserAttributeRef> linkedUserAttr = appUserInfoAttrCache.get(appName);
<br>+
<br>+ if (linkedUserAttr == null)
<br> {
<br>- log.debug(PortletRequest.USER_INFO + " is set to null");
<br>- return null;
<br>+ PortletApplication pa = registry.getPortletApplication(appName, true);
<br>+ if (null == pa)
<br>+ {
<br>+ log.debug(PortletRequest.USER_INFO + " is set to null");
<br>+ return null;
<br>+ }
<br>+ List<UserAttribute> userAttributes = pa.getUserAttributes();
<br>+ List<UserAttributeRef> userAttributeRefs = pa.getUserAttributeRefs();
<br>+ linkedUserAttr = mapLinkedUserAttributes(userAttributes, userAttributeRefs);
<br>+ appUserInfoAttrCache.put(appName, linkedUserAttr);
<br> }
<br>- Collection userAttributes = pa.getUserAttributes();
<br>- Collection userAttributeRefs = pa.getUserAttributeRefs();
<br>- return mapUserInfo(userInfo, userAttributes, userAttributeRefs);
<br>+ return linkedUserAttr;
<br> }
<br>
<br> /**
<br>@@ -141,40 +146,22 @@
<br> * attributes reference.
<br> * @return The user info map.
<br> */
<br>- private Map<String, String> mapUserInfo(Map<String, String> userInfo, Collection userAttributes, Collection userAttributeRefs)
<br>+ protected Map<String, String> mapUserInfo(Map<String, String> userInfo, List<UserAttributeRef> linkedUserAttributes)
<br> {
<br> Map<String, String>userInfoMap = new HashMap<String, String>();
<br>- if ((null == userAttributes) || (userAttributes.size() == 0))
<br>+ for (UserAttributeRef currentAttributeRef : linkedUserAttributes)
<br> {
<br>- return null;
<br>- }
<br>- Collection linkedUserAttributes = mapLinkedUserAttributes(userAttributes, userAttributeRefs);
<br>- Iterator iter = linkedUserAttributes.iterator();
<br>- while (iter.hasNext())
<br>- {
<br>- UserAttributeRef currentAttributeRef = (UserAttributeRef) iter.next();
<br>- if (null != currentAttributeRef)
<br>+ String key = currentAttributeRef.getNameLink();
<br>+ String name = currentAttributeRef.getName();
<br>+ if (key == null)
<br>+ {
<br>+ key = name;
<br>+ }
<br>+ if (userInfo.containsKey(key))
<br> {
<br>- for (String key : userInfo.keySet())
<br>- {
<br>- if (null != currentAttributeRef.getNameLink())
<br>- {
<br>- if ((currentAttributeRef.getNameLink()).equals(key))
<br>- {
<br>- userInfoMap.put(currentAttributeRef.getName(), userInfo.get(key));
<br>- }
<br>- }
<br>- else
<br>- {
<br>- if ((currentAttributeRef.getName()).equals(key))
<br>- {
<br>- userInfoMap.put(currentAttributeRef.getName(), userInfo.get(key));
<br>- }
<br>- }
<br>- }
<br>+ userInfoMap.put(name, userInfo.get(key));
<br> }
<br> }
<br>- userInfoMapCache.put(oid, userInfoMap);
<br> return userInfoMap;
<br> }
<br>
<br>@@ -191,7 +178,7 @@
<br> */
<br> private Map<String, String> getUserInformation(RequestContext context)
<br> {
<br>- Map<String, String> userInfo = new HashMap<String, String>();
<br>+ Map<String, String> userInfo = null;
<br> Subject subject = context.getSubject();
<br> if (null != subject)
<br> {
<br>@@ -199,29 +186,12 @@
<br> if (null != userPrincipal)
<br> {
<br> log.debug("Got user principal: " + userPrincipal.getName());
<br>- try
<br>- {
<br>- if (userMgr.userExists(userPrincipal.getName()))
<br>- {
<br>- User user = userMgr.getUser(userPrincipal.getName());
<br>- userInfo = user.getInfoMap();
<br>- }
<br>- }
<br>- catch (SecurityException sex)
<br>+ if (userPrincipal instanceof JetspeedPrincipal)
<br> {
<br>- log.warn("Unexpected SecurityException in UserInfoManager", sex);
<br>+ return ((JetspeedPrincipal)userPrincipal).getInfoMap();
<br> }
<br> }
<br> }
<br> return userInfo;
<br> }
<br>-
<br>- private void initUserInfoMapCache()
<br>- {
<br>- if (null == userInfoMapCache)
<br>- {
<br>- userInfoMapCache = Collections.synchronizedMap(new HashMap());
<br>- }
<br>- }
<br>-
<br> }
<br>\ No newline at end of file
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26674926&i=1" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26674926&i=2" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26674509
Re: wicket portlet
2009-12-07T01:11:53Z
2009-12-07T01:11:53Z
Woonsan Ko
HiVlachogiannis,
<br><br>I think you can compare your configurations with j2-admin's wicket portlets.
<br>For example, WicketProfilerAdminApplication is configured in web.xml like this:
<br><br> <filter>
<br> <filter-name>WicketProfilerAdminApplication</filter-name>
<br> <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
<br> <init-param>
<br> <param-name>applicationClassName</param-name>
<br> <param-value>org.apache.jetspeed.portlets.profiler.WicketProfilerAdminApplication</param-value>
<br> </init-param>
<br> </filter>
<br><br> <filter-mapping>
<br> <filter-name>WicketProfilerAdminApplication</filter-name>
<br> <url-pattern>/profileradmin/*</url-pattern>
<br> <dispatcher>REQUEST</dispatcher>
<br> <dispatcher>INCLUDE</dispatcher>
<br> </filter-mapping>
<br><br>The dispatcher configurations (REQUEST and INCLUDE) are important.
<br>Also, the portlet is configured in portlet.xml like this:
<br><br> <portlet>
<br> <description>Profiler Administration</description>
<br> <portlet-name>WicketProfilerAdmin</portlet-name>
<br> <display-name>Profiler Administration</display-name>
<br> <portlet-class>
<br> org.apache.wicket.protocol.http.portlet.WicketPortlet</portlet-class>
<br> <init-param>
<br> <name>wicketFilterPath</name>
<br> <value>/profileradmin</value>
<br> </init-param>
<br> <supports>
<br> <mime-type>*/*</mime-type>
<br> <portlet-mode>VIEW</portlet-mode>
<br> </supports>
<br> <supported-locale>en</supported-locale>
<br> <portlet-info>
<br> <title>Profiler Admin</title>
<br> <short-title>ProfilerAdmin</short-title>
<br> <keywords>admin,profiler</keywords>
<br> </portlet-info>
<br> </portlet>
<br><br><br>HTH,
<br><br>Woonsan
<br><br><br><br><br>----- Original Message ----
<div class='shrinkable-quote'><br>> From: Vlachogiannis Evangelos <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26674509&i=0" target="_top" rel="nofollow">evlach@...</a>>
<br>> To: Jetspeed Developers List <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26674509&i=1" target="_top" rel="nofollow">jetspeed-dev@...</a>>
<br>> Sent: Sun, December 6, 2009 9:44:46 AM
<br>> Subject: RE: wicket portlet
<br>>
<br>> Thnx a lot! That seems to work now as a portlet, but in my particular
<br>> application I get the following exception. In my markup I ref all ids. Out of
<br>> the portal I test that and works fine. Any ideas please?
<br>>
<br>> Unexpected RuntimeException
<br>>
<br>> WicketMessage: The component(s) below failed to render. A common problem is that
<br>> you have added a component in code but forgot to reference it in the markup
<br>> (thus the component will never be rendered).
<br>>
<br>> 1. [MarkupContainer [Component id = tree]]
<br>> 2. [MarkupContainer [Component id = i]]
<br>> 3. [MarkupContainer [Component id = 0]]
<br>> 4. [MarkupContainer [Component id = junctionLink]]
<br>> 5. [MarkupContainer [Component id = nodeComponent]]
<br>> 6. [MarkupContainer [Component id = iconLink]]
<br>> 7. [Component id = icon]
<br>> 8. [MarkupContainer [Component id = contentLink]]
<br>> 9. [Component id = content]
<br>>
<br>> Root cause:
<br>>
<br>> org.apache.wicket.WicketRuntimeException: The component(s) below failed to
<br>> render. A common problem is that you have added a component in code but forgot
<br>> to reference it in the markup (thus the component will never be rendered).
<br>>
<br>> 1. [MarkupContainer [Component id = tree]]
<br>> 2. [MarkupContainer [Component id = i]]
<br>> 3. [MarkupContainer [Component id = 0]]
<br>> 4. [MarkupContainer [Component id = junctionLink]]
<br>> 5. [MarkupContainer [Component id = nodeComponent]]
<br>> 6. [MarkupContainer [Component id = iconLink]]
<br>> 7. [Component id = icon]
<br>> 8. [MarkupContainer [Component id = contentLink]]
<br>> 9. [Component id = content]
<br>>
<br>> at org.apache.wicket.Page.checkRendering(Page.java:1162)
<br>> at org.apache.wicket.Page.renderPage(Page.java:922)
<br>> at
<br>> org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.respond(BookmarkablePageRequestTarget.java:262)
<br>> at
<br>> org.apache.wicket.request.AbstractRequestCycleProcessor.respond(AbstractRequestCycleProcessor.java:105)
<br>> at
<br>> org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1258)
<br>> at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329)
<br>> at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428)
<br>> at org.apache.wicket.RequestCycle.request(RequestCycle.java:545)
<br>> at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468)
<br>> at org.apache.wicket.protocol.http.WicketFilter.doFilter(WicketFilter.java:301)
<br>> at
<br>> org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235)
<br>> at
<br>> org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
<br>> at
<br>> org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:646)
<br>> at
<br>> org.apache.catalina.core.ApplicationDispatcher.doInclude(ApplicationDispatcher.java:551)
<br>> at
<br>> org.apache.catalina.core.ApplicationDispatcher.include(ApplicationDispatcher.java:488)
<br>> at
<br>> org.apache.pluto.container.impl.PortletRequestDispatcherImpl.doDispatch(PortletRequestDispatcherImpl.java:174)
<br>> at
<br>> org.apache.pluto.container.impl.PortletRequestDispatcherImpl.include(PortletRequestDispatcherImpl.java:222)
<br>> at
<br>> org.apache.wicket.protocol.http.portlet.WicketPortlet.processMimeResponseRequest(WicketPortlet.java:655)
<br>> at
<br>> org.apache.wicket.protocol.http.portlet.WicketPortlet.processRequest(WicketPortlet.java:608)
<br>> at
<br>> org.apache.wicket.protocol.http.portlet.WicketPortlet.doView(WicketPortlet.java:469)
<br>> at javax.portlet.GenericPortlet.doDispatch(GenericPortlet.java:348)
<br>> at javax.portlet.GenericPortlet.render(GenericPortlet.java:253)
<br>> at
<br>> org.apache.jetspeed.portlet.PortletObjectProxy.proxyRender(PortletObjectProxy.java:244)
<br>> at
<br>> org.apache.jetspeed.portlet.PortletObjectProxy.invoke(PortletObjectProxy.java:159)
<br>> at $Proxy19.render(Unknown Source)
<br>> at
<br>> org.apache.jetspeed.factory.JetspeedPortletInstance.render(JetspeedPortletInstance.java:110)
<br>> at
<br>> org.apache.jetspeed.container.services.JetspeedFilterChain.doFilter(JetspeedFilterChain.java:142)
<br>> at
<br>> org.apache.jetspeed.container.services.JetspeedFilterChain.processFilter(JetspeedFilterChain.java:92)
<br>> at
<br>> org.apache.jetspeed.container.services.JetspeedFilterManager.processFilter(JetspeedFilterManager.java:112)
<br>> at
<br>> org.apache.jetspeed.container.JetspeedContainerServlet.doGet(JetspeedContainerServlet.java:272)
<br>> at javax.servlet.http.HttpServlet.service(HttpServlet.java:617)
<br>> at javax.servlet.http.HttpServlet.service(HttpServlet.java:717)
<br>> at
<br>> org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290)
<br>> at
<br>> org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
<br>> at
<br>> org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:646)
<br>> at
<br>> org.apache.catalina.core.ApplicationDispatcher.doInclude(ApplicationDispatcher.java:551)
<br>> at
<br>> org.apache.catalina.core.ApplicationDispatcher.include(ApplicationDispatcher.java:488)
<br>> at
<br>> org.apache.jetspeed.container.invoker.ServletPortletInvoker.invoke(ServletPortletInvoker.java:165)
<br>> at
<br>> org.apache.jetspeed.container.invoker.JetspeedPortletInvokerService.render(JetspeedPortletInvokerService.java:127)
<br>> at
<br>> org.apache.pluto.container.impl.PortletContainerImpl.doRender(PortletContainerImpl.java:157)
<br>> at
<br>> org.apache.jetspeed.container.JetspeedPortletContainerWrapper.doRender(JetspeedPortletContainerWrapper.java:69)
<br>> at
<br>> org.apache.jetspeed.aggregator.impl.RenderingJobImpl.execute(RenderingJobImpl.java:183)
<br>> at
<br>> org.apache.jetspeed.aggregator.impl.PortletRendererImpl.renderNow(PortletRendererImpl.java:160)
<br>> at
<br>> org.apache.jetspeed.aggregator.impl.PortletRendererImpl.renderNow(PortletRendererImpl.java:138)
<br>> at
<br>> org.apache.jetspeed.aggregator.impl.BaseAggregatorImpl.renderMaximizedWindow(BaseAggregatorImpl.java:101)
<br>> at
<br>> org.apache.jetspeed.aggregator.impl.PageAggregatorImpl.build(PageAggregatorImpl.java:73)
<br>> at
<br>> org.apache.jetspeed.aggregator.AggregatorValve.invoke(AggregatorValve.java:46)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at
<br>> org.apache.jetspeed.aggregator.HeaderAggregatorValve.invoke(HeaderAggregatorValve.java:53)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at
<br>> org.apache.jetspeed.decoration.DecorationValve.invoke(DecorationValve.java:137)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at
<br>> org.apache.jetspeed.resource.ResourceValveImpl.invoke(ResourceValveImpl.java:84)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at
<br>> org.apache.jetspeed.pipeline.valve.impl.ActionValveImpl.invoke(ActionValveImpl.java:139)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at org.apache.jetspeed.container.ContainerValve.invoke(ContainerValve.java:88)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at
<br>> org.apache.jetspeed.container.PageHistoryValve.invoke(PageHistoryValve.java:108)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at
<br>> org.apache.jetspeed.profiler.impl.RefreshUserHomepageValveImpl.invoke(RefreshUserHomepageValveImpl.java:110)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at
<br>> org.apache.jetspeed.profiler.impl.ProfilerValveImpl.invoke(ProfilerValveImpl.java:251)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at
<br>> org.apache.jetspeed.security.impl.LoginValidationValveImpl.invoke(LoginValidationValveImpl.java:158)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at
<br>> org.apache.jetspeed.security.impl.PasswordCredentialValveImpl.invoke(PasswordCredentialValveImpl.java:151)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at
<br>> org.apache.jetspeed.localization.impl.LocalizationValveImpl.invoke(LocalizationValveImpl.java:170)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at
<br>> org.apache.jetspeed.security.impl.AbstractSecurityValve$1.run(AbstractSecurityValve.java:138)
<br>> at java.security.AccessController.doPrivileged(Native Method)
<br>> at javax.security.auth.Subject.doAsPrivileged(Subject.java:454)
<br>> at org.apache.jetspeed.security.JSSubject.doAsPrivileged(JSSubject.java:179)
<br>> at
<br>> org.apache.jetspeed.security.impl.AbstractSecurityValve.invoke(AbstractSecurityValve.java:132)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at
<br>> org.apache.jetspeed.container.url.impl.PortalURLValveImpl.invoke(PortalURLValveImpl.java:67)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at
<br>> org.apache.jetspeed.capabilities.impl.CapabilityValveImpl.invoke(CapabilityValveImpl.java:127)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>> at
<br>> org.apache.jetspeed.pipeline.JetspeedPipeline.invoke(JetspeedPipeline.java:146)
<br>> at org.apache.jetspeed.engine.JetspeedEngine.service(JetspeedEngine.java:225)
<br>> at org.apache.jetspeed.engine.JetspeedServlet.doGet(JetspeedServlet.java:300)
<br>> at javax.servlet.http.HttpServlet.service(HttpServlet.java:617)
<br>> at javax.servlet.http.HttpServlet.service(HttpServlet.java:717)
<br>> at
<br>> org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290)
<br>> at
<br>> org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
<br>> at
<br>> org.apache.jetspeed.engine.servlet.XXSUrlAttackFilter.doFilter(XXSUrlAttackFilter.java:52)
<br>> at
<br>> org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235)
<br>> at
<br>> org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
<br>> at gr.uportal.filter.CASPortalFilter.doFilter(CASPortalFilter.java:154)
<br>> at
<br>> org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235)
<br>> at
<br>> org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
<br>> at
<br>> org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:233)
<br>> at
<br>> org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:191)
<br>> at
<br>> org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:433)
<br>> at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:128)
<br>> at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:102)
<br>> at
<br>> org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:109)
<br>> at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:293)
<br>> at org.apache.coyote.http11.Http11Processor.process(Http11Processor.java:849)
<br>> at
<br>> org.apache.coyote.http11.Http11Protocol$Http11ConnectionHandler.process(Http11Protocol.java:583)
<br>> at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:454)
<br>> at java.lang.Thread.run(Thread.java:595)
<br>>
<br>> -----Original Message-----
<br>> From: Woonsan Ko [mailto:<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26674509&i=2" target="_top" rel="nofollow">woon_san@...</a>]
<br>> Sent: Friday, December 04, 2009 11:27 AM
<br>> To: Jetspeed Developers List
<br>> Subject: Re: wicket portlet
<br>>
<br>> Hi Vlachogiannis,
<br>>
<br>> There's a simple guideline here:
<br>>
<br>> <a href="http://cwiki.apache.org/WICKET/portal-howto.html" target="_top" rel="nofollow">http://cwiki.apache.org/WICKET/portal-howto.html</a><br>>
<br>> Regards,
<br>>
<br>> Woonsan
<br>>
<br>>
<br>>
<br>> ----- Original Message ----
<br>> > From: Vlachogiannis Evangelos
<br>> > To: Jetspeed Developers List
<br>> > Sent: Fri, December 4, 2009 9:14:06 AM
<br>> > Subject: wicket portlet
<br>> >
<br>> > Hi list,
<br>> >
<br>> > Is there a howto page for developing a wicket portlet for jetspeed? Some
<br>> hints?
<br>> >
<br>> > Thanks a lot,
<br>> > Vangelis
<br>>
<br>>
<br>>
<br>>
<br>>
<br>> ---------------------------------------------------------------------
<br>> To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26674509&i=3" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>> For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26674509&i=4" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br>>
<br>>
<br>> ---------------------------------------------------------------------
<br>> To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26674509&i=5" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>> For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26674509&i=6" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
</div><br><br><br>
<br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26674509&i=7" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26674509&i=8" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26674258
Re: Progress...
2009-12-07T00:45:57Z
2009-12-07T00:45:57Z
Woonsan Ko
Hi David,
<br><br>Thanks for the pointer. The img tag doesn't have to have src attribute because it is used as a template source.
<br>I will remove the attribute.
<br><br>Regards,
<br><br>Woonsan
<br><br><br><br>----- Original Message ----
<div class='shrinkable-quote'><br>> From: David Sean Taylor <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26674258&i=0" target="_top" rel="nofollow">d.taylor@...</a>>
<br>> To: Jetspeed Developers List <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26674258&i=1" target="_top" rel="nofollow">jetspeed-dev@...</a>>
<br>> Sent: Mon, December 7, 2009 7:33:21 AM
<br>> Subject: Re: Progress...
<br>>
<br>> Woonsan,
<br>>
<br>> Not sure what was intended here in toolbox.jsp:
<br>>
<br>>
</div><br>>
<br><br>>
<br><br>>
<br>>
<br>>
<br>> the img src is causing an extra pipeline hit
<br>>
<br>>
<br>> ---------------------------------------------------------------------
<br>> To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26674258&i=2" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>> For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26674258&i=3" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><br>
<br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26674258&i=4" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26674258&i=5" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26673131
Re: Progress...
2009-12-06T22:33:21Z
2009-12-06T22:33:21Z
David Sean Taylor-3
Woonsan,
<br><br>Not sure what was intended here in toolbox.jsp:
<br><br><div id="<portlet:namespace/>portletItemTemplate" style="display: none">
<br> <table style="border-collapse: collapse; width: 100%; margin-top:
<br>0px; margin-bottom: 0px; float: left;">
<br> <tr>
<br> <td rowspan="2" width="20%" class="portlet-section-body">
<br> <img src='' />
<br><br>the img src is causing an extra pipeline hit
<br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26673131&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26673131&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26665837
svn commit: r887690 - in /portals/jetspeed-2/portal/trunk: components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ jetspeed-api/src/main/java/org/apache/jetspeed/om/page/
2009-12-06T07:15:50Z
2009-12-06T07:15:50Z
Ate Douma-2
Author: ate
<br>Date: Sun Dec 6 15:15:47 2009
<br>New Revision: 887690
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=887690&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=887690&view=rev</a><br>Log:
<br>Adding lookup of ContentFragment by underlying PSML Fragment id to support decorators actively pulling in specific fragments at a specific place within the markup
<br><br>Modified:
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentImpl.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentPageImpl.java
<br> portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentPage.java
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentImpl.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentImpl.java?rev=887690&r1=887689&r2=887690&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentImpl.java?rev=887690&r1=887689&r2=887690&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentImpl.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentImpl.java Sun Dec 6 15:15:47 2009
<br>@@ -745,6 +745,31 @@
<br> }
<br>
<br> /**
<br>+ * Get content fragment by underlying PSML Fragment id.
<br>+ *
<br>+ * @param id PSML fragment id
<br>+ * @return content fragment
<br>+ */
<br>+ public ContentFragmentImpl getFragmentByFragmentId(String id)
<br>+ {
<br>+ if (fragment != null && fragment.getId().equals(id))
<br>+ {
<br>+ return this;
<br>+ }
<br>+ Iterator fragmentIter = getFragments().iterator();
<br>+ while (fragmentIter.hasNext())
<br>+ {
<br>+ ContentFragmentImpl childFragment = (ContentFragmentImpl)fragmentIter.next();
<br>+ ContentFragmentImpl fragment = childFragment.getFragmentByFragmentId(id);
<br>+ if (fragment != null)
<br>+ {
<br>+ return fragment;
<br>+ }
<br>+ }
<br>+ return null;
<br>+ }
<br>+
<br>+ /**
<br> * Get content fragment nesting level.
<br> *
<br> * @param fragmentId fragment id to find
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentPageImpl.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentPageImpl.java?rev=887690&r1=887689&r2=887690&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentPageImpl.java?rev=887690&r1=887689&r2=887690&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentPageImpl.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentPageImpl.java Sun Dec 6 15:15:47 2009
<br>@@ -154,6 +154,18 @@
<br> }
<br>
<br> /* (non-Javadoc)
<br>+ * @see org.apache.jetspeed.om.page.ContentPage#getFragmentByFragmentId(java.lang.String)
<br>+ */
<br>+ public ContentFragment getFragmentByFragmentId(String id)
<br>+ {
<br>+ if (rootContentFragment != null)
<br>+ {
<br>+ return rootContentFragment.getFragmentByFragmentId(id);
<br>+ }
<br>+ return null;
<br>+ }
<br>+
<br>+ /* (non-Javadoc)
<br> * @see org.apache.jetspeed.om.page.ContentPage#getFragmentsByName(java.lang.String)
<br> */
<br> public List getFragmentsByName(String name)
<br><br>Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentPage.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentPage.java?rev=887690&r1=887689&r2=887690&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentPage.java?rev=887690&r1=887689&r2=887690&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentPage.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentPage.java Sun Dec 6 15:15:47 2009
<br>@@ -159,6 +159,13 @@
<br> ContentFragment getFragmentById(String id);
<br>
<br> /**
<br>+ * Returns a ContentFragment represented by the underlying PSML Fragment fragment id argument.
<br>+ * @param id unique id of the ContentFragment we want to retrieve.
<br>+ * @return
<br>+ */
<br>+ ContentFragment getFragmentByFragmentId(String id);
<br>+
<br>+ /**
<br> * Returns a list of ContentFragment fragments represented by the name argument.
<br> * @param name name of the ContentFragments we want to retrieve.
<br> * @return list of ContentFragment
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26665837&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26665837&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26663107
RE: wicket portlet
2009-12-06T00:44:46Z
2009-12-06T00:44:46Z
Vlachogiannis Evangelos
Thnx a lot! That seems to work now as a portlet, but in my particular application I get the following exception. In my markup I ref all ids. Out of the portal I test that and works fine. Any ideas please?
<br><br>Unexpected RuntimeException
<br><br>WicketMessage: The component(s) below failed to render. A common problem is that you have added a component in code but forgot to reference it in the markup (thus the component will never be rendered).
<br><br>1. [MarkupContainer [Component id = tree]]
<br>2. [MarkupContainer [Component id = i]]
<br>3. [MarkupContainer [Component id = 0]]
<br>4. [MarkupContainer [Component id = junctionLink]]
<br>5. [MarkupContainer [Component id = nodeComponent]]
<br>6. [MarkupContainer [Component id = iconLink]]
<br>7. [Component id = icon]
<br>8. [MarkupContainer [Component id = contentLink]]
<br>9. [Component id = content]
<br><br>Root cause:
<br><br>org.apache.wicket.WicketRuntimeException: The component(s) below failed to render. A common problem is that you have added a component in code but forgot to reference it in the markup (thus the component will never be rendered).
<br><br>1. [MarkupContainer [Component id = tree]]
<br>2. [MarkupContainer [Component id = i]]
<br>3. [MarkupContainer [Component id = 0]]
<br>4. [MarkupContainer [Component id = junctionLink]]
<br>5. [MarkupContainer [Component id = nodeComponent]]
<br>6. [MarkupContainer [Component id = iconLink]]
<br>7. [Component id = icon]
<br>8. [MarkupContainer [Component id = contentLink]]
<br>9. [Component id = content]
<br><br>at org.apache.wicket.Page.checkRendering(Page.java:1162)
<br>at org.apache.wicket.Page.renderPage(Page.java:922)
<br>at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.respond(BookmarkablePageRequestTarget.java:262)
<br>at org.apache.wicket.request.AbstractRequestCycleProcessor.respond(AbstractRequestCycleProcessor.java:105)
<br>at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1258)
<br>at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329)
<br>at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428)
<br>at org.apache.wicket.RequestCycle.request(RequestCycle.java:545)
<br>at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468)
<br>at org.apache.wicket.protocol.http.WicketFilter.doFilter(WicketFilter.java:301)
<br>at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235)
<br>at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
<br>at org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:646)
<br>at org.apache.catalina.core.ApplicationDispatcher.doInclude(ApplicationDispatcher.java:551)
<br>at org.apache.catalina.core.ApplicationDispatcher.include(ApplicationDispatcher.java:488)
<br>at org.apache.pluto.container.impl.PortletRequestDispatcherImpl.doDispatch(PortletRequestDispatcherImpl.java:174)
<br>at org.apache.pluto.container.impl.PortletRequestDispatcherImpl.include(PortletRequestDispatcherImpl.java:222)
<br>at org.apache.wicket.protocol.http.portlet.WicketPortlet.processMimeResponseRequest(WicketPortlet.java:655)
<br>at org.apache.wicket.protocol.http.portlet.WicketPortlet.processRequest(WicketPortlet.java:608)
<br>at org.apache.wicket.protocol.http.portlet.WicketPortlet.doView(WicketPortlet.java:469)
<br>at javax.portlet.GenericPortlet.doDispatch(GenericPortlet.java:348)
<br>at javax.portlet.GenericPortlet.render(GenericPortlet.java:253)
<br>at org.apache.jetspeed.portlet.PortletObjectProxy.proxyRender(PortletObjectProxy.java:244)
<br>at org.apache.jetspeed.portlet.PortletObjectProxy.invoke(PortletObjectProxy.java:159)
<br>at $Proxy19.render(Unknown Source)
<br>at org.apache.jetspeed.factory.JetspeedPortletInstance.render(JetspeedPortletInstance.java:110)
<br>at org.apache.jetspeed.container.services.JetspeedFilterChain.doFilter(JetspeedFilterChain.java:142)
<br>at org.apache.jetspeed.container.services.JetspeedFilterChain.processFilter(JetspeedFilterChain.java:92)
<br>at org.apache.jetspeed.container.services.JetspeedFilterManager.processFilter(JetspeedFilterManager.java:112)
<br>at org.apache.jetspeed.container.JetspeedContainerServlet.doGet(JetspeedContainerServlet.java:272)
<br>at javax.servlet.http.HttpServlet.service(HttpServlet.java:617)
<br>at javax.servlet.http.HttpServlet.service(HttpServlet.java:717)
<br>at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290)
<br>at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
<br>at org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:646)
<br>at org.apache.catalina.core.ApplicationDispatcher.doInclude(ApplicationDispatcher.java:551)
<br>at org.apache.catalina.core.ApplicationDispatcher.include(ApplicationDispatcher.java:488)
<br>at org.apache.jetspeed.container.invoker.ServletPortletInvoker.invoke(ServletPortletInvoker.java:165)
<br>at org.apache.jetspeed.container.invoker.JetspeedPortletInvokerService.render(JetspeedPortletInvokerService.java:127)
<br>at org.apache.pluto.container.impl.PortletContainerImpl.doRender(PortletContainerImpl.java:157)
<br>at org.apache.jetspeed.container.JetspeedPortletContainerWrapper.doRender(JetspeedPortletContainerWrapper.java:69)
<br>at org.apache.jetspeed.aggregator.impl.RenderingJobImpl.execute(RenderingJobImpl.java:183)
<br>at org.apache.jetspeed.aggregator.impl.PortletRendererImpl.renderNow(PortletRendererImpl.java:160)
<br>at org.apache.jetspeed.aggregator.impl.PortletRendererImpl.renderNow(PortletRendererImpl.java:138)
<br>at org.apache.jetspeed.aggregator.impl.BaseAggregatorImpl.renderMaximizedWindow(BaseAggregatorImpl.java:101)
<br>at org.apache.jetspeed.aggregator.impl.PageAggregatorImpl.build(PageAggregatorImpl.java:73)
<br>at org.apache.jetspeed.aggregator.AggregatorValve.invoke(AggregatorValve.java:46)
<br>at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>at org.apache.jetspeed.aggregator.HeaderAggregatorValve.invoke(HeaderAggregatorValve.java:53)
<br>at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>at org.apache.jetspeed.decoration.DecorationValve.invoke(DecorationValve.java:137)
<br>at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>at org.apache.jetspeed.resource.ResourceValveImpl.invoke(ResourceValveImpl.java:84)
<br>at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>at org.apache.jetspeed.pipeline.valve.impl.ActionValveImpl.invoke(ActionValveImpl.java:139)
<br>at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>at org.apache.jetspeed.container.ContainerValve.invoke(ContainerValve.java:88)
<br>at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>at org.apache.jetspeed.container.PageHistoryValve.invoke(PageHistoryValve.java:108)
<br>at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>at org.apache.jetspeed.profiler.impl.RefreshUserHomepageValveImpl.invoke(RefreshUserHomepageValveImpl.java:110)
<br>at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>at org.apache.jetspeed.profiler.impl.ProfilerValveImpl.invoke(ProfilerValveImpl.java:251)
<br>at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>at org.apache.jetspeed.security.impl.LoginValidationValveImpl.invoke(LoginValidationValveImpl.java:158)
<br>at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>at org.apache.jetspeed.security.impl.PasswordCredentialValveImpl.invoke(PasswordCredentialValveImpl.java:151)
<br>at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>at org.apache.jetspeed.localization.impl.LocalizationValveImpl.invoke(LocalizationValveImpl.java:170)
<br>at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>at org.apache.jetspeed.security.impl.AbstractSecurityValve$1.run(AbstractSecurityValve.java:138)
<br>at java.security.AccessController.doPrivileged(Native Method)
<br>at javax.security.auth.Subject.doAsPrivileged(Subject.java:454)
<br>at org.apache.jetspeed.security.JSSubject.doAsPrivileged(JSSubject.java:179)
<br>at org.apache.jetspeed.security.impl.AbstractSecurityValve.invoke(AbstractSecurityValve.java:132)
<br>at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>at org.apache.jetspeed.container.url.impl.PortalURLValveImpl.invoke(PortalURLValveImpl.java:67)
<br>at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>at org.apache.jetspeed.capabilities.impl.CapabilityValveImpl.invoke(CapabilityValveImpl.java:127)
<br>at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
<br>at org.apache.jetspeed.pipeline.JetspeedPipeline.invoke(JetspeedPipeline.java:146)
<br>at org.apache.jetspeed.engine.JetspeedEngine.service(JetspeedEngine.java:225)
<br>at org.apache.jetspeed.engine.JetspeedServlet.doGet(JetspeedServlet.java:300)
<br>at javax.servlet.http.HttpServlet.service(HttpServlet.java:617)
<br>at javax.servlet.http.HttpServlet.service(HttpServlet.java:717)
<br>at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290)
<br>at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
<br>at org.apache.jetspeed.engine.servlet.XXSUrlAttackFilter.doFilter(XXSUrlAttackFilter.java:52)
<br>at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235)
<br>at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
<br>at gr.uportal.filter.CASPortalFilter.doFilter(CASPortalFilter.java:154)
<br>at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235)
<br>at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
<br>at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:233)
<br>at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:191)
<br>at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:433)
<br>at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:128)
<br>at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:102)
<br>at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:109)
<br>at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:293)
<br>at org.apache.coyote.http11.Http11Processor.process(Http11Processor.java:849)
<br>at org.apache.coyote.http11.Http11Protocol$Http11ConnectionHandler.process(Http11Protocol.java:583)
<br>at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:454)
<br>at java.lang.Thread.run(Thread.java:595)
<br><br>-----Original Message-----
<br>From: Woonsan Ko [mailto:<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26663107&i=0" target="_top" rel="nofollow">woon_san@...</a>]
<br>Sent: Friday, December 04, 2009 11:27 AM
<br>To: Jetspeed Developers List
<br>Subject: Re: wicket portlet
<br><br>Hi Vlachogiannis,
<br><br>There's a simple guideline here:
<br><br><a href="http://cwiki.apache.org/WICKET/portal-howto.html" target="_top" rel="nofollow">http://cwiki.apache.org/WICKET/portal-howto.html</a><br><br>Regards,
<br><br>Woonsan
<br><br><br><br>----- Original Message ----
<div class='shrinkable-quote'><br>> From: Vlachogiannis Evangelos <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26663107&i=1" target="_top" rel="nofollow">evlach@...</a>>
<br>> To: Jetspeed Developers List <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26663107&i=2" target="_top" rel="nofollow">jetspeed-dev@...</a>>
<br>> Sent: Fri, December 4, 2009 9:14:06 AM
<br>> Subject: wicket portlet
<br>>
<br>> Hi list,
<br>>
<br>> Is there a howto page for developing a wicket portlet for jetspeed? Some hints?
<br>>
<br>> Thanks a lot,
<br>> Vangelis
</div><br><br><br>
<br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26663107&i=3" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26663107&i=4" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26663107&i=5" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26663107&i=6" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26650731
svn commit: r887431 - /portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java
2009-12-04T15:04:52Z
2009-12-04T15:04:52Z
taylor-8
Author: taylor
<br>Date: Fri Dec 4 23:04:51 2009
<br>New Revision: 887431
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=887431&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=887431&view=rev</a><br>Log:
<br>JS2-1087: Adding portlets bug fix
<br><br>Modified:
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java?rev=887431&r1=887430&r2=887431&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java?rev=887431&r1=887430&r2=887431&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java Fri Dec 4 23:04:51 2009
<br>@@ -553,37 +553,58 @@
<br>
<br> }
<br>
<br>+ protected ContentFragment findFirstUnlockedFragment(ContentFragment fragment)
<br>+ {
<br>+ if (fragment.isLocked())
<br>+ {
<br>+ List<ContentFragment> fragments = (List<ContentFragment>)fragment.getFragments();
<br>+ for (ContentFragment f : fragments)
<br>+ {
<br>+ if (f.getType().equals(Fragment.LAYOUT))
<br>+ {
<br>+ fragment = findFirstUnlockedFragment(f);
<br>+ if (fragment != null)
<br>+ return fragment;
<br>+ }
<br>+ }
<br>+ return null;
<br>+ }
<br>+ return fragment;
<br>+ }
<br>+
<br> // BOZO: this only works with flat collections of 1,2,3,4 column layouts. Not meant to work with nested layouts
<br> // TODO: move code to an AJAX API
<br> protected void addPortletToLeastUsedColumn(ContentPage page, String portletName)
<br> {
<br>- ContentFragment layoutFragment = page.getRootFragment();
<br>- String layoutType = layoutFragment.getName();
<br>- List<ContentFragment> fragments = (List<ContentFragment>)layoutFragment.getFragments();
<br>- int columnCounts[] = new int[getLayoutSize(layoutType)];
<br>- for (ContentFragment fragment : fragments)
<br>+ ContentFragment layoutFragment = findFirstUnlockedFragment(page.getRootFragment());
<br>+ if (layoutFragment != null)
<br> {
<br>- int column = fragment.getLayoutColumn();
<br>- int row = fragment.getLayoutRow();
<br>- if (column == -1)
<br>- column = min(columnCounts);
<br>- if (row == -1)
<br>- row = columnCounts[column];
<br>- if (column > fragments.size() -1)
<br>+ String layoutType = layoutFragment.getName();
<br>+ List<ContentFragment> fragments = (List<ContentFragment>)layoutFragment.getFragments();
<br>+ int columnCounts[] = new int[getLayoutSize(layoutType)];
<br>+ for (ContentFragment fragment : fragments)
<br> {
<br>- fragment.updateRowColumn(-1, 0);
<br>- column = 0;
<br>+ int column = fragment.getLayoutColumn();
<br>+ int row = fragment.getLayoutRow();
<br>+ if (column == -1)
<br>+ column = min(columnCounts);
<br>+ if (row == -1)
<br>+ row = columnCounts[column];
<br>+ if (column > fragments.size() -1)
<br>+ {
<br>+ fragment.updateRowColumn(-1, 0);
<br>+ column = 0;
<br>+ }
<br>+ columnCounts[column]++;
<br> }
<br>- columnCounts[column]++;
<br>- }
<br>- int placedColumn = 0;
<br>- for (int ix = 1; ix < columnCounts.length; ix++)
<br>- {
<br>- if (columnCounts[ix] < columnCounts[placedColumn])
<br>- placedColumn = ix;
<br>+ int placedColumn = 0;
<br>+ for (int ix = 1; ix < columnCounts.length; ix++)
<br>+ {
<br>+ if (columnCounts[ix] < columnCounts[placedColumn])
<br>+ placedColumn = ix;
<br>+ }
<br>+ layoutFragment.addPortlet(ContentFragment.PORTLET, portletName, columnCounts[placedColumn], placedColumn);
<br> }
<br>- System.out.println("adding portlet at row = " + columnCounts[placedColumn] + ", col = " + placedColumn);
<br>- layoutFragment.addPortlet(ContentFragment.PORTLET, portletName, columnCounts[placedColumn], placedColumn);
<br> }
<br>
<br> public static int min(int[] numbers)
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26650731&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26650731&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26646666
svn commit: r887303 - in /portals/jetspeed-2/portal/trunk: components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/ components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/util/ jetspeed-portal-resources/src/main/r...
2009-12-04T10:07:48Z
2009-12-04T10:07:48Z
woonsan
Author: woonsan
<br>Date: Fri Dec 4 18:07:47 2009
<br>New Revision: 887303
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=887303&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=887303&view=rev</a><br>Log:
<br>JS2-1087: Adding access control for portlet definition query
<br><br>Modified:
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/util/PaginationUtils.java
<br> portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java?rev=887303&r1=887302&r2=887303&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java?rev=887303&r1=887302&r2=887303&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java Fri Dec 4 18:07:47 2009
<br>@@ -18,6 +18,7 @@
<br>
<br> import java.util.ArrayList;
<br> import java.util.Collection;
<br>+import java.util.Collections;
<br> import java.util.List;
<br>
<br> import javax.servlet.ServletConfig;
<br>@@ -33,12 +34,14 @@
<br>
<br> import org.apache.commons.lang.StringUtils;
<br> import org.apache.commons.lang.math.NumberUtils;
<br>+import org.apache.jetspeed.JetspeedActions;
<br> import org.apache.jetspeed.components.portletregistry.PortletRegistry;
<br> import org.apache.jetspeed.om.portlet.PortletApplication;
<br> import org.apache.jetspeed.om.portlet.PortletDefinition;
<br> import org.apache.jetspeed.search.ParsedObject;
<br> import org.apache.jetspeed.search.SearchEngine;
<br> import org.apache.jetspeed.search.SearchResults;
<br>+import org.apache.jetspeed.security.SecurityAccessController;
<br> import org.apache.jetspeed.services.beans.PortletApplicationBean;
<br> import org.apache.jetspeed.services.beans.PortletApplicationBeanCollection;
<br> import org.apache.jetspeed.services.beans.PortletDefinitionBean;
<br>@@ -66,12 +69,15 @@
<br> @Context
<br> private ServletContext servletContext;
<br>
<br>+ private SecurityAccessController securityAccessController;
<br>+
<br> private PortletRegistry portletRegistry;
<br>
<br> private SearchEngine searchEngine;
<br>
<br>- public PortletRegistryService(PortletRegistry portletRegistry, SearchEngine searchEngine)
<br>+ public PortletRegistryService(SecurityAccessController securityAccessController, PortletRegistry portletRegistry, SearchEngine searchEngine)
<br> {
<br>+ this.securityAccessController = securityAccessController;
<br> this.portletRegistry = portletRegistry;
<br> this.searchEngine = searchEngine;
<br> }
<br>@@ -194,9 +200,9 @@
<br> "AND " + queryParam;
<br> SearchResults searchResults = searchEngine.search(queryText);
<br> List<ParsedObject> searchResultList = searchResults.getResults();
<br>- pdBeans.setTotalSize(searchResultList.size());
<br>+ ArrayList<PortletDefinition> searchedPortletDefinitions = new ArrayList<PortletDefinition>();
<br>
<br>- for (ParsedObject parsedObject : (List<ParsedObject>) PaginationUtils.subList(searchResultList, beginIndex, maxResults))
<br>+ for (ParsedObject parsedObject : searchResultList)
<br> {
<br> String uniqueName = SearchEngineUtils.getPortletUniqueName(parsedObject);
<br>
<br>@@ -207,17 +213,25 @@
<br>
<br> PortletDefinition pd = portletRegistry.getPortletDefinitionByUniqueName(uniqueName);
<br>
<br>- if (pd != null)
<br>+ if (pd != null && securityAccessController.checkPortletAccess(pd, JetspeedActions.MASK_VIEW))
<br> {
<br>- pdBeanList.add(new PortletDefinitionBean(pd));
<br>+ searchedPortletDefinitions.add(pd);
<br> }
<br> }
<br>+
<br>+ Collection<PortletDefinition> filteredPortletDefinitions = filterPortletDefinitionsBySecurityAccess(searchedPortletDefinitions, JetspeedActions.MASK_VIEW);
<br>+ pdBeans.setTotalSize(filteredPortletDefinitions.size());
<br>+
<br>+ for (PortletDefinition pd : (Collection<PortletDefinition>) PaginationUtils.subCollection(filteredPortletDefinitions, beginIndex, maxResults))
<br>+ {
<br>+ pdBeanList.add(new PortletDefinitionBean(pd));
<br>+ }
<br> }
<br> else
<br> {
<br> if (StringUtils.isBlank(applicationName) && StringUtils.isBlank(definitionName))
<br> {
<br>- Collection<PortletDefinition> pds = portletRegistry.getAllPortletDefinitions();
<br>+ Collection<PortletDefinition> pds = filterPortletDefinitionsBySecurityAccess(portletRegistry.getAllPortletDefinitions(), JetspeedActions.MASK_VIEW);
<br> pdBeans.setTotalSize(pds.size());
<br>
<br> for (PortletDefinition pd : (Collection<PortletDefinition>) PaginationUtils.subCollection(pds, beginIndex, maxResults))
<br>@@ -233,22 +247,19 @@
<br> {
<br> if (StringUtils.isBlank(definitionName))
<br> {
<br>- if (pa != null)
<br>+ Collection<PortletDefinition> pds = filterPortletDefinitionsBySecurityAccess(pa.getPortlets(), JetspeedActions.MASK_VIEW);
<br>+ pdBeans.setTotalSize(pds.size());
<br>+
<br>+ for (PortletDefinition pd : (List<PortletDefinition>) PaginationUtils.subCollection(pds, beginIndex, maxResults))
<br> {
<br>- Collection<PortletDefinition> pds = pa.getPortlets();
<br>- pdBeans.setTotalSize(pds.size());
<br>-
<br>- for (PortletDefinition pd : (List<PortletDefinition>) PaginationUtils.subList(pa.getPortlets(), beginIndex, maxResults))
<br>- {
<br>- pdBeanList.add(new PortletDefinitionBean(pd));
<br>- }
<br>+ pdBeanList.add(new PortletDefinitionBean(pd));
<br> }
<br> }
<br> else
<br> {
<br> PortletDefinition pd = pa.getPortlet(definitionName);
<br>
<br>- if (pd != null)
<br>+ if (pd != null && securityAccessController.checkPortletAccess(pd, JetspeedActions.MASK_VIEW))
<br> {
<br> pdBeanList.add(new PortletDefinitionBean(pd));
<br> pdBeans.setTotalSize(1);
<br>@@ -263,4 +274,29 @@
<br> return pdBeans;
<br> }
<br>
<br>+ private Collection<PortletDefinition> filterPortletDefinitionsBySecurityAccess(Collection<PortletDefinition> collection, int mask)
<br>+ {
<br>+ if (securityAccessController == null)
<br>+ {
<br>+ return collection;
<br>+ }
<br>+
<br>+ if (collection == null || collection.isEmpty())
<br>+ {
<br>+ return Collections.emptyList();
<br>+ }
<br>+
<br>+ ArrayList<PortletDefinition> filteredCollection = new ArrayList<PortletDefinition>();
<br>+
<br>+ for (PortletDefinition pd : collection)
<br>+ {
<br>+ if (securityAccessController.checkPortletAccess(pd, mask))
<br>+ {
<br>+ filteredCollection.add(pd);
<br>+ }
<br>+ }
<br>+
<br>+ return filteredCollection;
<br>+ }
<br>+
<br> }
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/util/PaginationUtils.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/util/PaginationUtils.java?rev=887303&r1=887302&r2=887303&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/util/PaginationUtils.java?rev=887303&r1=887302&r2=887303&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/util/PaginationUtils.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/util/PaginationUtils.java Fri Dec 4 18:07:47 2009
<br>@@ -59,35 +59,13 @@
<br>
<br> public static Collection<? extends Object> subCollection(final Collection<? extends Object> collection, int beginIndex, int maxResults)
<br> {
<br>- if (beginIndex < 0 || (beginIndex == 0 && maxResults < 0))
<br>+ if (collection instanceof List)
<br> {
<br>- return collection;
<br>- }
<br>- else if (beginIndex >= collection.size())
<br>- {
<br>- return Collections.emptyList();
<br>+ return subList((List<? extends Object>) collection, beginIndex, maxResults);
<br> }
<br> else
<br> {
<br>- List<Object> list = null;
<br>-
<br>- if (collection instanceof List)
<br>- {
<br>- list = (List<Object>) collection;
<br>- }
<br>- else
<br>- {
<br>- list = new ArrayList<Object>(collection);
<br>- }
<br>-
<br>- if (maxResults < 0)
<br>- {
<br>- return list.subList(beginIndex, list.size());
<br>- }
<br>- else
<br>- {
<br>- return list.subList(beginIndex, Math.min(list.size(), beginIndex + maxResults));
<br>- }
<br>+ return subList(new ArrayList<Object>(collection), beginIndex, maxResults);
<br> }
<br> }
<br>
<br><br>Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml?rev=887303&r1=887302&r2=887303&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml?rev=887303&r1=887302&r2=887303&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml (original)
<br>+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml Fri Dec 4 18:07:47 2009
<br>@@ -108,6 +108,7 @@
<br> <!-- Portlet Registry JAX-RS Service -->
<br> <bean id="jaxrsPortletRegistryService" class="org.apache.jetspeed.services.rest.PortletRegistryService">
<br> <meta key="j2:cat" value="default" />
<br>+ <constructor-arg ref="org.apache.jetspeed.security.SecurityAccessController" />
<br> <constructor-arg ref="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
<br> <constructor-arg ref="org.apache.jetspeed.search.SearchEngine" />
<br> </bean>
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26646666&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26646666&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26645757
svn commit: r887270 - in /portals/jetspeed-2/portal/trunk: components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/ components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/ jetspeed-portal-resources/src/main/resou...
2009-12-04T09:06:36Z
2009-12-04T09:06:36Z
woonsan
Author: woonsan
<br>Date: Fri Dec 4 17:06:33 2009
<br>New Revision: 887270
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=887270&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=887270&view=rev</a><br>Log:
<br>JS2-1087: Adding pagination attribute in the returned jax-rs service results.
<br><br>Added:
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/BeanCollection.java (with props)
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeanCollection.java (contents, props changed)
<br> - copied, changed from r886744, portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeans.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeanCollection.java (contents, props changed)
<br> - copied, changed from r886744, portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeans.java
<br>Removed:
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeans.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeans.java
<br>Modified:
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java
<br> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java
<br> portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml
<br><br>Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/BeanCollection.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/BeanCollection.java?rev=887270&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/BeanCollection.java?rev=887270&view=auto</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/BeanCollection.java (added)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/BeanCollection.java Fri Dec 4 17:06:33 2009
<br>@@ -0,0 +1,91 @@
<br>+/*
<br>+ * Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ * contributor license agreements. See the NOTICE file distributed with
<br>+ * this work for additional information regarding copyright ownership.
<br>+ * The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ * (the "License"); you may not use this file except in compliance with
<br>+ * the License. You may obtain a copy of the License at
<br>+ *
<br>+ * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+ *
<br>+ * Unless required by applicable law or agreed to in writing, software
<br>+ * distributed under the License is distributed on an "AS IS" BASIS,
<br>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ * See the License for the specific language governing permissions and
<br>+ * limitations under the License.
<br>+ */
<br>+package org.apache.jetspeed.services.beans;
<br>+
<br>+import java.io.Serializable;
<br>+import java.util.Collection;
<br>+
<br>+import javax.xml.bind.annotation.XmlAttribute;
<br>+import javax.xml.bind.annotation.XmlElement;
<br>+import javax.xml.bind.annotation.XmlElements;
<br>+import javax.xml.bind.annotation.XmlRootElement;
<br>+
<br>+/**
<br>+ * BeansCollection
<br>+ *
<br>+ * @version $Id$
<br>+ */
<br>+@XmlRootElement(name="collection")
<br>+public class BeanCollection<T> implements Serializable
<br>+{
<br>+ private static final long serialVersionUID = 1L;
<br>+
<br>+ private Collection<T> collection;
<br>+
<br>+ private int totalSize = -1;
<br>+
<br>+ private int beginIndex = -1;
<br>+
<br>+ public BeanCollection()
<br>+ {
<br>+
<br>+ }
<br>+
<br>+ protected Collection<T> getCollection()
<br>+ {
<br>+ return collection;
<br>+ }
<br>+
<br>+ protected void setCollection(Collection<T> collection)
<br>+ {
<br>+ this.collection = collection;
<br>+ }
<br>+
<br>+ @XmlAttribute(name="size")
<br>+ public int getSize()
<br>+ {
<br>+ return (collection != null ? collection.size() : 0);
<br>+ }
<br>+
<br>+ public void setSize()
<br>+ {
<br>+
<br>+ }
<br>+
<br>+ @XmlAttribute(name="totalSize")
<br>+ public int getTotalSize()
<br>+ {
<br>+ return totalSize;
<br>+ }
<br>+
<br>+ public void setTotalSize(int totalSize)
<br>+ {
<br>+ this.totalSize = totalSize;
<br>+ }
<br>+
<br>+ @XmlAttribute(name="beginIndex")
<br>+ public int getBeginIndex()
<br>+ {
<br>+ return beginIndex;
<br>+ }
<br>+
<br>+ public void setBeginIndex(int beginIndex)
<br>+ {
<br>+ this.beginIndex = beginIndex;
<br>+ }
<br>+
<br>+}
<br><br>Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/BeanCollection.java
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/BeanCollection.java
<br>------------------------------------------------------------------------------
<br> svn:keywords = Id
<br><br>Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/BeanCollection.java
<br>------------------------------------------------------------------------------
<br> svn:mime-type = text/plain
<br><br>Copied: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeanCollection.java (from r886744, portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeans.java)
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeanCollection.java?p2=portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeanCollection.java&p1=portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeans.java&r1=886744&r2=887270&rev=887270&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeanCollection.java?p2=portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeanCollection.java&p1=portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeans.java&r1=886744&r2=887270&rev=887270&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeans.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeanCollection.java Fri Dec 4 17:06:33 2009
<br>@@ -16,7 +16,6 @@
<br> */
<br> package org.apache.jetspeed.services.beans;
<br>
<br>-import java.io.Serializable;
<br> import java.util.Collection;
<br>
<br> import javax.xml.bind.annotation.XmlElement;
<br>@@ -29,25 +28,24 @@
<br> * @version $Id$
<br> */
<br> @XmlRootElement(name="applications")
<br>-public class PortletApplicationBeans implements Serializable
<br>+public class PortletApplicationBeanCollection extends BeanCollection<PortletApplicationBean>
<br> {
<br> private static final long serialVersionUID = 1L;
<br>
<br>- private Collection<PortletApplicationBean> portletApplicationBeans;
<br>-
<br>- public PortletApplicationBeans()
<br>+ public PortletApplicationBeanCollection()
<br> {
<br>-
<br>+ super();
<br> }
<br>
<br>+ @Override
<br> @XmlElements(@XmlElement(name="application"))
<br>- public Collection<PortletApplicationBean> getPortletApplicationBeans()
<br>+ public Collection<PortletApplicationBean> getCollection()
<br> {
<br>- return portletApplicationBeans;
<br>+ return super.getCollection();
<br> }
<br>
<br>- public void setPortletApplicationBeans(Collection<PortletApplicationBean> portletApplicationBeans)
<br>+ public void setPortletApplicationBeans(Collection<PortletApplicationBean> collection)
<br> {
<br>- this.portletApplicationBeans = portletApplicationBeans;
<br>+ super.setCollection(collection);
<br> }
<br> }
<br><br>Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeanCollection.java
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeanCollection.java
<br>------------------------------------------------------------------------------
<br> svn:keywords = Id
<br><br>Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeanCollection.java
<br>------------------------------------------------------------------------------
<br> svn:mime-type = text/plain
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java?rev=887270&r1=887269&r2=887270&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java?rev=887270&r1=887269&r2=887270&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java Fri Dec 4 17:06:33 2009
<br>@@ -28,6 +28,7 @@
<br> import org.apache.jetspeed.om.portlet.ContainerRuntimeOption;
<br> import org.apache.jetspeed.om.portlet.Description;
<br> import org.apache.jetspeed.om.portlet.DisplayName;
<br>+import org.apache.jetspeed.om.portlet.InitParam;
<br> import org.apache.jetspeed.om.portlet.Language;
<br> import org.apache.jetspeed.om.portlet.PortletDefinition;
<br> import org.apache.jetspeed.om.portlet.Supports;
<br>@@ -52,6 +53,7 @@
<br> private Collection<LanguageBean> languageBeans;
<br> private GenericMetadataBean metadataBean;
<br> private Collection<ContainerRuntimeOptionBean> containerRuntimeOptionBeans;
<br>+ private Collection<InitParamBean> initParamBeans;
<br>
<br> public PortletDefinitionBean()
<br> {
<br>@@ -101,6 +103,13 @@
<br> containerRuntimeOptionBeanList.add(new ContainerRuntimeOptionBean(containerRuntimeOption));
<br> }
<br> containerRuntimeOptionBeans = containerRuntimeOptionBeanList;
<br>+
<br>+ ArrayList<InitParamBean> initParamBeanList = new ArrayList<InitParamBean>();
<br>+ for (InitParam initParam : portletDefinition.getInitParams())
<br>+ {
<br>+ initParamBeanList.add(new InitParamBean(initParam));
<br>+ }
<br>+ initParamBeans = initParamBeanList;
<br> }
<br>
<br> public String getApplicationName()
<br>@@ -215,4 +224,16 @@
<br> this.containerRuntimeOptionBeans = containerRuntimeOptionBeans;
<br> }
<br>
<br>+ @XmlElementWrapper(name="initparams")
<br>+ @XmlElements(@XmlElement(name="initparam"))
<br>+ public Collection<InitParamBean> getInitParamBeans()
<br>+ {
<br>+ return initParamBeans;
<br>+ }
<br>+
<br>+ public void setInitParamBeans(Collection<InitParamBean> initParamBeans)
<br>+ {
<br>+ this.initParamBeans = initParamBeans;
<br>+ }
<br>+
<br> }
<br><br>Copied: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeanCollection.java (from r886744, portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeans.java)
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeanCollection.java?p2=portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeanCollection.java&p1=portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeans.java&r1=886744&r2=887270&rev=887270&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeanCollection.java?p2=portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeanCollection.java&p1=portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeans.java&r1=886744&r2=887270&rev=887270&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeans.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeanCollection.java Fri Dec 4 17:06:33 2009
<br>@@ -16,7 +16,6 @@
<br> */
<br> package org.apache.jetspeed.services.beans;
<br>
<br>-import java.io.Serializable;
<br> import java.util.Collection;
<br>
<br> import javax.xml.bind.annotation.XmlElement;
<br>@@ -29,26 +28,25 @@
<br> * @version $Id$
<br> */
<br> @XmlRootElement(name="definitions")
<br>-public class PortletDefinitionBeans implements Serializable
<br>+public class PortletDefinitionBeanCollection extends BeanCollection<PortletDefinitionBean>
<br> {
<br> private static final long serialVersionUID = 1L;
<br>
<br>- private Collection<PortletDefinitionBean> portletDefinitionBeans;
<br>-
<br>- public PortletDefinitionBeans()
<br>+ public PortletDefinitionBeanCollection()
<br> {
<br>-
<br>+ super();
<br> }
<br>
<br>+ @Override
<br> @XmlElements(@XmlElement(name="definition"))
<br>- public Collection<PortletDefinitionBean> getPortletDefinitionBean()
<br>+ public Collection<PortletDefinitionBean> getCollection()
<br> {
<br>- return portletDefinitionBeans;
<br>+ return super.getCollection();
<br> }
<br>
<br>- public void setPortletApplicationBeans(Collection<PortletDefinitionBean> portletDefinitionBeans)
<br>+ public void setPortletApplicationBeans(Collection<PortletDefinitionBean> collection)
<br> {
<br>- this.portletDefinitionBeans = portletDefinitionBeans;
<br>+ super.setCollection(collection);
<br> }
<br>
<br> }
<br><br>Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeanCollection.java
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeanCollection.java
<br>------------------------------------------------------------------------------
<br> svn:keywords = Id
<br><br>Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeanCollection.java
<br>------------------------------------------------------------------------------
<br> svn:mime-type = text/plain
<br><br>Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java?rev=887270&r1=887269&r2=887270&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java?rev=887270&r1=887269&r2=887270&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java (original)
<br>+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java Fri Dec 4 17:06:33 2009
<br>@@ -40,9 +40,9 @@
<br> import org.apache.jetspeed.search.SearchEngine;
<br> import org.apache.jetspeed.search.SearchResults;
<br> import org.apache.jetspeed.services.beans.PortletApplicationBean;
<br>-import org.apache.jetspeed.services.beans.PortletApplicationBeans;
<br>+import org.apache.jetspeed.services.beans.PortletApplicationBeanCollection;
<br> import org.apache.jetspeed.services.beans.PortletDefinitionBean;
<br>-import org.apache.jetspeed.services.beans.PortletDefinitionBeans;
<br>+import org.apache.jetspeed.services.beans.PortletDefinitionBeanCollection;
<br> import org.apache.jetspeed.services.rest.util.PaginationUtils;
<br> import org.apache.jetspeed.services.rest.util.SearchEngineUtils;
<br> import org.slf4j.Logger;
<br>@@ -78,7 +78,7 @@
<br>
<br> @GET
<br> @Path("/application/{path:.*}")
<br>- public PortletApplicationBeans getPortletApplication(@Context HttpServletRequest servletRequest,
<br>+ public PortletApplicationBeanCollection getPortletApplication(@Context HttpServletRequest servletRequest,
<br> @Context UriInfo uriInfo,
<br> @PathParam("path") List<PathSegment> pathSegments,
<br> @QueryParam("query") String queryParam,
<br>@@ -95,7 +95,9 @@
<br> int beginIndex = NumberUtils.toInt(beginIndexParam, -1);
<br> int maxResults = NumberUtils.toInt(maxResultsParam, -1);
<br>
<br>- PortletApplicationBeans paBeans = new PortletApplicationBeans();
<br>+ PortletApplicationBeanCollection paBeans = new PortletApplicationBeanCollection();
<br>+ paBeans.setBeginIndex(beginIndex);
<br>+ paBeans.setTotalSize(0);
<br> List<PortletApplicationBean> paBeanList = new ArrayList<PortletApplicationBean>();
<br>
<br> if (!StringUtils.isBlank(queryParam))
<br>@@ -103,6 +105,7 @@
<br> String queryText = ParsedObject.FIELDNAME_TYPE + ":\"" + ParsedObject.OBJECT_TYPE_PORTLET_APPLICATION + "\" AND " + queryParam;
<br> SearchResults searchResults = searchEngine.search(queryText);
<br> List<ParsedObject> searchResultList = searchResults.getResults();
<br>+ paBeans.setTotalSize(searchResultList.size());
<br>
<br> for (ParsedObject parsedObject : (List<ParsedObject>) PaginationUtils.subList(searchResultList, beginIndex, maxResults))
<br> {
<br>@@ -125,7 +128,10 @@
<br> {
<br> if (StringUtils.isBlank(applicationName))
<br> {
<br>- for (PortletApplication pa : (Collection<PortletApplication>) PaginationUtils.subCollection(portletRegistry.getPortletApplications(), beginIndex, maxResults))
<br>+ Collection<PortletApplication> pas = portletRegistry.getPortletApplications();
<br>+ paBeans.setTotalSize(pas.size());
<br>+
<br>+ for (PortletApplication pa : (Collection<PortletApplication>) PaginationUtils.subCollection(pas, beginIndex, maxResults))
<br> {
<br> paBeanList.add(new PortletApplicationBean(pa));
<br> }
<br>@@ -136,18 +142,20 @@
<br>
<br> if (pa != null)
<br> {
<br>+ paBeans.setTotalSize(1);
<br> paBeanList.add(new PortletApplicationBean(pa));
<br> }
<br> }
<br> }
<br>
<br> paBeans.setPortletApplicationBeans(paBeanList);
<br>+
<br> return paBeans;
<br> }
<br>
<br> @GET
<br> @Path("/definition/{path:.*}")
<br>- public PortletDefinitionBeans getPortletDefinition(@Context HttpServletRequest servletRequest,
<br>+ public PortletDefinitionBeanCollection getPortletDefinition(@Context HttpServletRequest servletRequest,
<br> @Context UriInfo uriInfo,
<br> @PathParam("path") List<PathSegment> pathSegments,
<br> @QueryParam("query") String queryParam,
<br>@@ -173,7 +181,9 @@
<br> int beginIndex = NumberUtils.toInt(beginIndexParam, -1);
<br> int maxResults = NumberUtils.toInt(maxResultsParam, -1);
<br>
<br>- PortletDefinitionBeans pdBeans = new PortletDefinitionBeans();
<br>+ PortletDefinitionBeanCollection pdBeans = new PortletDefinitionBeanCollection();
<br>+ pdBeans.setBeginIndex(beginIndex);
<br>+ pdBeans.setTotalSize(0);
<br> List<PortletDefinitionBean> pdBeanList = new ArrayList<PortletDefinitionBean>();
<br>
<br> if (!StringUtils.isBlank(queryParam))
<br>@@ -184,6 +194,7 @@
<br> "AND " + queryParam;
<br> SearchResults searchResults = searchEngine.search(queryText);
<br> List<ParsedObject> searchResultList = searchResults.getResults();
<br>+ pdBeans.setTotalSize(searchResultList.size());
<br>
<br> for (ParsedObject parsedObject : (List<ParsedObject>) PaginationUtils.subList(searchResultList, beginIndex, maxResults))
<br> {
<br>@@ -206,7 +217,10 @@
<br> {
<br> if (StringUtils.isBlank(applicationName) && StringUtils.isBlank(definitionName))
<br> {
<br>- for (PortletDefinition pd : (Collection<PortletDefinition>) PaginationUtils.subCollection(portletRegistry.getAllPortletDefinitions(), beginIndex, maxResults))
<br>+ Collection<PortletDefinition> pds = portletRegistry.getAllPortletDefinitions();
<br>+ pdBeans.setTotalSize(pds.size());
<br>+
<br>+ for (PortletDefinition pd : (Collection<PortletDefinition>) PaginationUtils.subCollection(pds, beginIndex, maxResults))
<br> {
<br> pdBeanList.add(new PortletDefinitionBean(pd));
<br> }
<br>@@ -221,6 +235,9 @@
<br> {
<br> if (pa != null)
<br> {
<br>+ Collection<PortletDefinition> pds = pa.getPortlets();
<br>+ pdBeans.setTotalSize(pds.size());
<br>+
<br> for (PortletDefinition pd : (List<PortletDefinition>) PaginationUtils.subList(pa.getPortlets(), beginIndex, maxResults))
<br> {
<br> pdBeanList.add(new PortletDefinitionBean(pd));
<br>@@ -234,6 +251,7 @@
<br> if (pd != null)
<br> {
<br> pdBeanList.add(new PortletDefinitionBean(pd));
<br>+ pdBeans.setTotalSize(1);
<br> }
<br> }
<br> }
<br>@@ -241,6 +259,7 @@
<br> }
<br>
<br> pdBeans.setPortletApplicationBeans(pdBeanList);
<br>+
<br> return pdBeans;
<br> }
<br>
<br><br>Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml?rev=887270&r1=887269&r2=887270&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml?rev=887270&r1=887269&r2=887270&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml (original)
<br>+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml Fri Dec 4 17:06:33 2009
<br>@@ -15,8 +15,9 @@
<br> See the License for the specific language governing permissions and
<br> limitations under the License.
<br> -->
<br>-<beans xmlns="<a href="http://www.springframework.org/schema/beans" target="_top" rel="nofollow">http://www.springframework.org/schema/beans</a>" xmlns:xsi="<a href="http://www.w3.org/2001/XMLSchema-instance" target="_top" rel="nofollow">http://www.w3.org/2001/XMLSchema-instance</a>"
<br>- xsi:schemaLocation="<a href="http://www.springframework.org/schema/beans" target="_top" rel="nofollow">http://www.springframework.org/schema/beans</a> <a href="http://www.springframework.org/schema/beans/spring-beans-2.5.xsd" target="_top" rel="nofollow">http://www.springframework.org/schema/beans/spring-beans-2.5.xsd</a>">
<br>+<beans xmlns="<a href="http://www.springframework.org/schema/beans" target="_top" rel="nofollow">http://www.springframework.org/schema/beans</a>"
<br>+ xmlns:xsi="<a href="http://www.w3.org/2001/XMLSchema-instance" target="_top" rel="nofollow">http://www.w3.org/2001/XMLSchema-instance</a>"
<br>+ xsi:schemaLocation="<a href="http://www.springframework.org/schema/beans" target="_top" rel="nofollow">http://www.springframework.org/schema/beans</a> <a href="http://www.springframework.org/schema/beans/spring-beans-2.5.xsd" target="_top" rel="nofollow">http://www.springframework.org/schema/beans/spring-beans-2.5.xsd</a>">
<br>
<br> <!-- To enable log4j logging instead of the default java logging of cxf. -->
<br> <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
<br>@@ -68,12 +69,38 @@
<br> </property>
<br> </bean>
<br>
<br>+ <bean id="jaxrsJsonProvider" class="org.apache.cxf.jaxrs.provider.JSONProvider">
<br>+ <meta key="j2:cat" value="default" />
<br>+ <property name="serializeAsArray" value="true"/>
<br>+ <property name="arrayKeys">
<br>+ <list>
<br>+ <!--
<br>+ <value>displayName</value>
<br>+ <value>description</value>
<br>+ <value>initparam</value>
<br>+ <value>language</value>
<br>+ <value>field</value>
<br>+ <value>portletMode</value>
<br>+ <value>windowState</value>
<br>+ <value>definition</value>
<br>+ <value>application</value>
<br>+ -->
<br>+ </list>
<br>+ </property>
<br>+ </bean>
<br>+
<br> <!-- JAX-RS Service Singleton Resource Beans -->
<br> <bean id="org.apache.jetspeed.services.rest.singletons" class="org.springframework.beans.factory.config.SetFactoryBean">
<br> <meta key="j2:cat" value="default" />
<br> <property name="sourceSet">
<br> <set>
<br>+
<br>+ <!-- JAX-RS Providers -->
<br>+ <ref bean="jaxrsJsonProvider" />
<br>+
<br>+ <!-- Resource providers -->
<br> <ref bean="jaxrsPortletRegistryService" />
<br>+
<br> </set>
<br> </property>
<br> </bean>
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26645757&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26645757&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26643768
svn commit: r887219 - in /portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login: login-xhtmlbasic.jsp login.jsp portal-login.jsp
2009-12-04T07:01:20Z
2009-12-04T07:01:20Z
Ate Douma-2
Author: ate
<br>Date: Fri Dec 4 15:01:19 2009
<br>New Revision: 887219
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=887219&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=887219&view=rev</a><br>Log:
<br>Also deriving "login" destination url dynamically for the LoginPortlet to stay within the currently used pipeline, e.g. /portal, /ui, etc.
<br><br>Modified:
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp?rev=887219&r1=887218&r2=887219&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp?rev=887219&r1=887218&r2=887219&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp Fri Dec 4 15:01:19 2009
<br>@@ -47,7 +47,7 @@
<br> </c:if>
<br> </c:otherwise>
<br> </c:choose>
<br>- <form method="post" action='<c:url context="${portalContextPath}" value="/login/proxy"/>'>
<br>+ <form method="post" action='<c:url context="${portalContextPath}" value="/login/proxy?${loginDestination}=${requestContext.portalURL.basePath}"/>'>
<br> <div>
<br> <fmt:message key="login.label.Username"/>
<br> <c_rt:set var="userName" value="<%=((RequestContext)request.getAttribute(RequestContext.REQUEST_PORTALENV)).getSessionAttribute(LoginConstants.USERNAME)%>"/>
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp?rev=887219&r1=887218&r2=887219&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp?rev=887219&r1=887218&r2=887219&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp Fri Dec 4 15:01:19 2009
<br>@@ -29,12 +29,12 @@
<br> <c:set var="portalContextPath" value="/"/>
<br> </c:if>
<br> <c:set var="encoder" value="${requestContext.request.parameterMap.encoder[0]}"/>
<br>-<c:set var="destLogin" value="/login/proxy"/>
<br>+<c:set var="destLogin" value="/login/proxy?${loginDestination}=${requestContext.portalURL.basePath}"/>
<br> <c:set var="destLogout" value="/login/logout?${loginDestination}=${requestContext.portalURL.basePath}"/>
<br> <c:set var="destAccount" value="${requestContext.portalURL.basePath}/my-account.psml"/>
<br> <c:set var="destContext" value="/"/>
<br> <c:if test="${not empty encoder && encoder == 'desktop'}">
<br>- <c:set var="destLogin" value="${destLogin}?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<br>+ <c:set var="destLogin" value="/login/proxy?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<br> <c:set var="destLogout" value="/login/logout?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<br> <c:set var="destAccount" value="/desktop/my-account.psml?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<br> <c:set var="destContext" value="${portalContextPath}"/>
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp?rev=887219&r1=887218&r2=887219&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp?rev=887219&r1=887218&r2=887219&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp Fri Dec 4 15:01:19 2009
<br>@@ -30,12 +30,12 @@
<br> <c:set var="portalContextPath" value="/"/>
<br> </c:if>
<br> <c:set var="encoder" value="${requestContext.request.parameterMap.encoder[0]}"/>
<br>-<c:set var="destLogin" value="/login/proxy"/>
<br>+<c:set var="destLogin" value="/login/proxy?${loginDestination}=${requestContext.portalURL.basePath}"/>
<br> <c:set var="destLogout" value="/login/logout?${loginDestination}=${requestContext.portalURL.basePath}"/>
<br> <c:set var="destAccount" value="${requestContext.portalURL.basePath}/my-account.psml"/>
<br> <c:set var="destContext" value="/"/>
<br> <c:if test="${not empty encoder && encoder == 'desktop'}">
<br>- <c:set var="destLogin" value="${destLogin}?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<br>+ <c:set var="destLogin" value="/login/proxy?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<br> <c:set var="destLogout" value="/login/logout?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<br> <c:set var="destAccount" value="/desktop/my-account.psml?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<br> <c:set var="destContext" value="${portalContextPath}"/>
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26643768&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26643768&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>
tag:old.nabble.com,2006:post-26643568
svn commit: r887214 - in /portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login: login-xhtmlbasic.jsp login.jsp portal-login.jsp
2009-12-04T06:46:47Z
2009-12-04T06:46:47Z
Ate Douma-2
Author: ate
<br>Date: Fri Dec 4 14:46:46 2009
<br>New Revision: 887214
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=887214&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=887214&view=rev</a><br>Log:
<br>Deriving "change password" link and destination url for logout dynamically for the LoginPortlet to stay within the currently used pipeline, e.g. /portal, /ui, etc.
<br><br>Modified:
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp
<br> portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp?rev=887214&r1=887213&r2=887214&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp?rev=887214&r1=887213&r2=887214&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp Fri Dec 4 14:46:46 2009
<br>@@ -28,9 +28,9 @@
<br> <c:choose>
<br> <c:when test="${pageContext.request.userPrincipal != null}">
<br> <fmt:message key="login.label.Welcome"><fmt:param><c:out value="${pageContext.request.userPrincipal.name}"/></fmt:param></fmt:message><br/>
<br>- <a href='<c:url context="${portalContextPath}" value="/login/logout"/>'><fmt:message key="login.label.Logout"/></a>
<br>+ <a href='<c:url context="${portalContextPath}" value="/login/logout?${loginDestination}=${requestContext.portalURL.basePath}"/>'><fmt:message key="login.label.Logout"/></a>
<br> <br/>
<br>- <a href='<c:url context="${portalContextPath}" value="/portal/my-account.psml"/>'><fmt:message key="login.label.ChangePassword"/></a>
<br>+ <a href='<c:url context="/" value="${requestContext.portalURL.basePath}/my-account.psml"/>'><fmt:message key="login.label.ChangePassword"/></a>
<br> </c:when>
<br> <c:otherwise>
<br> <%-- backdoor access to the portal session to get the login error count --%>
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp?rev=887214&r1=887213&r2=887214&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp?rev=887214&r1=887213&r2=887214&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp Fri Dec 4 14:46:46 2009
<br>@@ -30,12 +30,14 @@
<br> </c:if>
<br> <c:set var="encoder" value="${requestContext.request.parameterMap.encoder[0]}"/>
<br> <c:set var="destLogin" value="/login/proxy"/>
<br>-<c:set var="destLogout" value="/login/logout"/>
<br>-<c:set var="destAccount" value="/portal/my-account.psml"/>
<br>+<c:set var="destLogout" value="/login/logout?${loginDestination}=${requestContext.portalURL.basePath}"/>
<br>+<c:set var="destAccount" value="${requestContext.portalURL.basePath}/my-account.psml"/>
<br>+<c:set var="destContext" value="/"/>
<br> <c:if test="${not empty encoder && encoder == 'desktop'}">
<br> <c:set var="destLogin" value="${destLogin}?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<br>- <c:set var="destLogout" value="${destLogout}?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<br>+ <c:set var="destLogout" value="/login/logout?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<br> <c:set var="destAccount" value="/desktop/my-account.psml?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<br>+ <c:set var="destContext" value="${portalContextPath}"/>
<br> </c:if>
<br> <div class="portlet-section-text">
<br> <c:choose>
<br>@@ -43,7 +45,7 @@
<br> <fmt:message key="login.label.Welcome"><fmt:param><c:out value="${pageContext.request.userPrincipal.name}"/></fmt:param></fmt:message><br>
<br> <a href='<c:url context="${portalContextPath}" value="${destLogout}"/>'><fmt:message key="login.label.Logout"/></a>
<br> <br>
<br>- <a href='<c:url context="${portalContextPath}" value="${destAccount}"/>'><fmt:message key="login.label.ChangePassword"/></a>
<br>+ <a href='<c:url context="${destContext}" value="${destAccount}"/>'><fmt:message key="login.label.ChangePassword"/></a>
<br> </c:when>
<br> <c:otherwise>
<br> <%-- backdoor access to the portal session to get the login error count --%>
<br><br>Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp
<br>URL: <a href="http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp?rev=887214&r1=887213&r2=887214&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp?rev=887214&r1=887213&r2=887214&view=diff</a><br>==============================================================================
<br>--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp (original)
<br>+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp Fri Dec 4 14:46:46 2009
<br>@@ -31,12 +31,14 @@
<br> </c:if>
<br> <c:set var="encoder" value="${requestContext.request.parameterMap.encoder[0]}"/>
<br> <c:set var="destLogin" value="/login/proxy"/>
<br>-<c:set var="destLogout" value="/login/logout"/>
<br>-<c:set var="destAccount" value="/portal/my-account.psml"/>
<br>+<c:set var="destLogout" value="/login/logout?${loginDestination}=${requestContext.portalURL.basePath}"/>
<br>+<c:set var="destAccount" value="${requestContext.portalURL.basePath}/my-account.psml"/>
<br>+<c:set var="destContext" value="/"/>
<br> <c:if test="${not empty encoder && encoder == 'desktop'}">
<br> <c:set var="destLogin" value="${destLogin}?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<br>- <c:set var="destLogout" value="${destLogout}?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<br>+ <c:set var="destLogout" value="/login/logout?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<br> <c:set var="destAccount" value="/desktop/my-account.psml?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<br>+ <c:set var="destContext" value="${portalContextPath}"/>
<br> </c:if>
<br>
<br> <c_rt:set var="contentType" value="<%=renderRequest.getResponseContentType()%>"/>
<br>@@ -80,7 +82,7 @@
<br> <fmt:message key="login.label.Welcome"><fmt:param><c:out value="${pageContext.request.userPrincipal.name}"/></fmt:param></fmt:message><br>
<br> <a href='<c:url context="${portalContextPath}" value="${destLogout}"/>'><fmt:message key="login.label.Logout"/></a>
<br> <br>
<br>- <a href='<c:url context="${portalContextPath}" value="${destAccount}"/>'><fmt:message key="login.label.ChangePassword"/></a>
<br>+ <a href='<c:url context="${destContext}" value="${destAccount}"/>'><fmt:message key="login.label.ChangePassword"/></a>
<br> </c:when>
<br> <c:otherwise>
<br> <%-- backdoor access to the portal session to get the login error count --%>
<br><br><br><br>---------------------------------------------------------------------
<br>To unsubscribe, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26643568&i=0" target="_top" rel="nofollow">jetspeed-dev-unsubscribe@...</a>
<br>For additional commands, e-mail: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26643568&i=1" target="_top" rel="nofollow">jetspeed-dev-help@...</a>
<br><br><p>From forum: <a href="http://old.nabble.com/Jetspeed---Dev-f199.html" embed="fixTarget[199]" target="_top" >Jetspeed - Dev</a></p>