Nabble - Jetspeed - Dev

Re: Progress...

2009-12-06T22:33:21Z

Woonsan,

Not sure what was intended here in toolbox.jsp:

<div id="<portlet:namespace/>portletItemTemplate" style="display: none">
<table style="border-collapse: collapse; width: 100%; margin-top:
0px; margin-bottom: 0px; float: left;">
<tr>
<td rowspan="2" width="20%" class="portlet-section-body">
<img src='' />

the img src is causing an extra pipeline hit

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@...
For additional commands, e-mail: jetspeed-dev-help@...

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

Author: ate
Date: Sun Dec 6 15:15:47 2009
New Revision: 887690

URL: http://svn.apache.org/viewvc?rev=887690&view=rev
Log:
Adding lookup of ContentFragment by underlying PSML Fragment id to support decorators actively pulling in specific fragments at a specific place within the markup

Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentPageImpl.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentPage.java

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentImpl.java
URL: 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
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentImpl.java (original)
+++ 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
@@ -745,6 +745,31 @@
}

/**
+ * Get content fragment by underlying PSML Fragment id.
+ *
+ * @param id PSML fragment id
+ * @return content fragment
+ */
+ public ContentFragmentImpl getFragmentByFragmentId(String id)
+ {
+ if (fragment != null && fragment.getId().equals(id))
+ {
+ return this;
+ }
+ Iterator fragmentIter = getFragments().iterator();
+ while (fragmentIter.hasNext())
+ {
+ ContentFragmentImpl childFragment = (ContentFragmentImpl)fragmentIter.next();
+ ContentFragmentImpl fragment = childFragment.getFragmentByFragmentId(id);
+ if (fragment != null)
+ {
+ return fragment;
+ }
+ }
+ return null;
+ }
+
+ /**
* Get content fragment nesting level.
*
* @param fragmentId fragment id to find

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentPageImpl.java
URL: 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
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentPageImpl.java (original)
+++ 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
@@ -154,6 +154,18 @@
}

/* (non-Javadoc)
+ * @see org.apache.jetspeed.om.page.ContentPage#getFragmentByFragmentId(java.lang.String)
+ */
+ public ContentFragment getFragmentByFragmentId(String id)
+ {
+ if (rootContentFragment != null)
+ {
+ return rootContentFragment.getFragmentByFragmentId(id);
+ }
+ return null;
+ }
+
+ /* (non-Javadoc)
* @see org.apache.jetspeed.om.page.ContentPage#getFragmentsByName(java.lang.String)
*/
public List getFragmentsByName(String name)

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentPage.java
URL: 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
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentPage.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentPage.java Sun Dec 6 15:15:47 2009
@@ -159,6 +159,13 @@
ContentFragment getFragmentById(String id);

/**
+ * Returns a ContentFragment represented by the underlying PSML Fragment fragment id argument.
+ * @param id unique id of the ContentFragment we want to retrieve.
+ * @return
+ */
+ ContentFragment getFragmentByFragmentId(String id);
+
+ /**
* Returns a list of ContentFragment fragments represented by the name argument.
* @param name name of the ContentFragments we want to retrieve.
* @return list of ContentFragment

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@...
For additional commands, e-mail: jetspeed-dev-help@...

RE: wicket portlet

2009-12-06T00:44:46Z

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?

Unexpected RuntimeException

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).

1. [MarkupContainer [Component id = tree]]
2. [MarkupContainer [Component id = i]]
3. [MarkupContainer [Component id = 0]]
4. [MarkupContainer [Component id = junctionLink]]
5. [MarkupContainer [Component id = nodeComponent]]
6. [MarkupContainer [Component id = iconLink]]
7. [Component id = icon]
8. [MarkupContainer [Component id = contentLink]]
9. [Component id = content]

Root cause:

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).

1. [MarkupContainer [Component id = tree]]
2. [MarkupContainer [Component id = i]]
3. [MarkupContainer [Component id = 0]]
4. [MarkupContainer [Component id = junctionLink]]
5. [MarkupContainer [Component id = nodeComponent]]
6. [MarkupContainer [Component id = iconLink]]
7. [Component id = icon]
8. [MarkupContainer [Component id = contentLink]]
9. [Component id = content]

at org.apache.wicket.Page.checkRendering(Page.java:1162)
at org.apache.wicket.Page.renderPage(Page.java:922)
at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.respond(BookmarkablePageRequestTarget.java:262)
at org.apache.wicket.request.AbstractRequestCycleProcessor.respond(AbstractRequestCycleProcessor.java:105)
at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1258)
at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329)
at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428)
at org.apache.wicket.RequestCycle.request(RequestCycle.java:545)
at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468)
at org.apache.wicket.protocol.http.WicketFilter.doFilter(WicketFilter.java:301)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
at org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:646)
at org.apache.catalina.core.ApplicationDispatcher.doInclude(ApplicationDispatcher.java:551)
at org.apache.catalina.core.ApplicationDispatcher.include(ApplicationDispatcher.java:488)
at org.apache.pluto.container.impl.PortletRequestDispatcherImpl.doDispatch(PortletRequestDispatcherImpl.java:174)
at org.apache.pluto.container.impl.PortletRequestDispatcherImpl.include(PortletRequestDispatcherImpl.java:222)
at org.apache.wicket.protocol.http.portlet.WicketPortlet.processMimeResponseRequest(WicketPortlet.java:655)
at org.apache.wicket.protocol.http.portlet.WicketPortlet.processRequest(WicketPortlet.java:608)
at org.apache.wicket.protocol.http.portlet.WicketPortlet.doView(WicketPortlet.java:469)
at javax.portlet.GenericPortlet.doDispatch(GenericPortlet.java:348)
at javax.portlet.GenericPortlet.render(GenericPortlet.java:253)
at org.apache.jetspeed.portlet.PortletObjectProxy.proxyRender(PortletObjectProxy.java:244)
at org.apache.jetspeed.portlet.PortletObjectProxy.invoke(PortletObjectProxy.java:159)
at $Proxy19.render(Unknown Source)
at org.apache.jetspeed.factory.JetspeedPortletInstance.render(JetspeedPortletInstance.java:110)
at org.apache.jetspeed.container.services.JetspeedFilterChain.doFilter(JetspeedFilterChain.java:142)
at org.apache.jetspeed.container.services.JetspeedFilterChain.processFilter(JetspeedFilterChain.java:92)
at org.apache.jetspeed.container.services.JetspeedFilterManager.processFilter(JetspeedFilterManager.java:112)
at org.apache.jetspeed.container.JetspeedContainerServlet.doGet(JetspeedContainerServlet.java:272)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:617)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:717)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
at org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:646)
at org.apache.catalina.core.ApplicationDispatcher.doInclude(ApplicationDispatcher.java:551)
at org.apache.catalina.core.ApplicationDispatcher.include(ApplicationDispatcher.java:488)
at org.apache.jetspeed.container.invoker.ServletPortletInvoker.invoke(ServletPortletInvoker.java:165)
at org.apache.jetspeed.container.invoker.JetspeedPortletInvokerService.render(JetspeedPortletInvokerService.java:127)
at org.apache.pluto.container.impl.PortletContainerImpl.doRender(PortletContainerImpl.java:157)
at org.apache.jetspeed.container.JetspeedPortletContainerWrapper.doRender(JetspeedPortletContainerWrapper.java:69)
at org.apache.jetspeed.aggregator.impl.RenderingJobImpl.execute(RenderingJobImpl.java:183)
at org.apache.jetspeed.aggregator.impl.PortletRendererImpl.renderNow(PortletRendererImpl.java:160)
at org.apache.jetspeed.aggregator.impl.PortletRendererImpl.renderNow(PortletRendererImpl.java:138)
at org.apache.jetspeed.aggregator.impl.BaseAggregatorImpl.renderMaximizedWindow(BaseAggregatorImpl.java:101)
at org.apache.jetspeed.aggregator.impl.PageAggregatorImpl.build(PageAggregatorImpl.java:73)
at org.apache.jetspeed.aggregator.AggregatorValve.invoke(AggregatorValve.java:46)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.aggregator.HeaderAggregatorValve.invoke(HeaderAggregatorValve.java:53)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.decoration.DecorationValve.invoke(DecorationValve.java:137)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.resource.ResourceValveImpl.invoke(ResourceValveImpl.java:84)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.pipeline.valve.impl.ActionValveImpl.invoke(ActionValveImpl.java:139)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.container.ContainerValve.invoke(ContainerValve.java:88)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.container.PageHistoryValve.invoke(PageHistoryValve.java:108)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.profiler.impl.RefreshUserHomepageValveImpl.invoke(RefreshUserHomepageValveImpl.java:110)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.profiler.impl.ProfilerValveImpl.invoke(ProfilerValveImpl.java:251)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.security.impl.LoginValidationValveImpl.invoke(LoginValidationValveImpl.java:158)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.security.impl.PasswordCredentialValveImpl.invoke(PasswordCredentialValveImpl.java:151)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.localization.impl.LocalizationValveImpl.invoke(LocalizationValveImpl.java:170)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.security.impl.AbstractSecurityValve$1.run(AbstractSecurityValve.java:138)
at java.security.AccessController.doPrivileged(Native Method)
at javax.security.auth.Subject.doAsPrivileged(Subject.java:454)
at org.apache.jetspeed.security.JSSubject.doAsPrivileged(JSSubject.java:179)
at org.apache.jetspeed.security.impl.AbstractSecurityValve.invoke(AbstractSecurityValve.java:132)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.container.url.impl.PortalURLValveImpl.invoke(PortalURLValveImpl.java:67)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.capabilities.impl.CapabilityValveImpl.invoke(CapabilityValveImpl.java:127)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.pipeline.JetspeedPipeline.invoke(JetspeedPipeline.java:146)
at org.apache.jetspeed.engine.JetspeedEngine.service(JetspeedEngine.java:225)
at org.apache.jetspeed.engine.JetspeedServlet.doGet(JetspeedServlet.java:300)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:617)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:717)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
at org.apache.jetspeed.engine.servlet.XXSUrlAttackFilter.doFilter(XXSUrlAttackFilter.java:52)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
at gr.uportal.filter.CASPortalFilter.doFilter(CASPortalFilter.java:154)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:233)
at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:191)
at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:433)
at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:128)
at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:102)
at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:109)
at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:293)
at org.apache.coyote.http11.Http11Processor.process(Http11Processor.java:849)
at org.apache.coyote.http11.Http11Protocol$Http11ConnectionHandler.process(Http11Protocol.java:583)
at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:454)
at java.lang.Thread.run(Thread.java:595)

-----Original Message-----
From: Woonsan Ko [mailto:woon_san@...]
Sent: Friday, December 04, 2009 11:27 AM
To: Jetspeed Developers List
Subject: Re: wicket portlet

Hi Vlachogiannis,

There's a simple guideline here:

http://cwiki.apache.org/WICKET/portal-howto.html

Regards,

Woonsan

----- Original Message ----

> From: Vlachogiannis Evangelos <evlach@...>
> To: Jetspeed Developers List <jetspeed-dev@...>
> Sent: Fri, December 4, 2009 9:14:06 AM
> Subject: wicket portlet
>
> Hi list,
>
> Is there a howto page for developing a wicket portlet for jetspeed? Some hints?
>
> Thanks a lot,
> Vangelis

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@...
For additional commands, e-mail: jetspeed-dev-help@...

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@...
For additional commands, e-mail: jetspeed-dev-help@...

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

Author: taylor
Date: Fri Dec 4 23:04:51 2009
New Revision: 887431

URL: http://svn.apache.org/viewvc?rev=887431&view=rev
Log:
JS2-1087: Adding portlets bug fix

Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java
URL: 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
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java Fri Dec 4 23:04:51 2009
@@ -553,37 +553,58 @@

}

+ protected ContentFragment findFirstUnlockedFragment(ContentFragment fragment)
+ {
+ if (fragment.isLocked())
+ {
+ List<ContentFragment> fragments = (List<ContentFragment>)fragment.getFragments();
+ for (ContentFragment f : fragments)
+ {
+ if (f.getType().equals(Fragment.LAYOUT))
+ {
+ fragment = findFirstUnlockedFragment(f);
+ if (fragment != null)
+ return fragment;
+ }
+ }
+ return null;
+ }
+ return fragment;
+ }
+
// BOZO: this only works with flat collections of 1,2,3,4 column layouts. Not meant to work with nested layouts
// TODO: move code to an AJAX API
protected void addPortletToLeastUsedColumn(ContentPage page, String portletName)
{
- ContentFragment layoutFragment = page.getRootFragment();
- String layoutType = layoutFragment.getName();
- List<ContentFragment> fragments = (List<ContentFragment>)layoutFragment.getFragments();
- int columnCounts[] = new int[getLayoutSize(layoutType)];
- for (ContentFragment fragment : fragments)
+ ContentFragment layoutFragment = findFirstUnlockedFragment(page.getRootFragment());
+ if (layoutFragment != null)
{
- int column = fragment.getLayoutColumn();
- int row = fragment.getLayoutRow();
- if (column == -1)
- column = min(columnCounts);
- if (row == -1)
- row = columnCounts[column];
- if (column > fragments.size() -1)
+ String layoutType = layoutFragment.getName();
+ List<ContentFragment> fragments = (List<ContentFragment>)layoutFragment.getFragments();
+ int columnCounts[] = new int[getLayoutSize(layoutType)];
+ for (ContentFragment fragment : fragments)
{
- fragment.updateRowColumn(-1, 0);
- column = 0;
+ int column = fragment.getLayoutColumn();
+ int row = fragment.getLayoutRow();
+ if (column == -1)
+ column = min(columnCounts);
+ if (row == -1)
+ row = columnCounts[column];
+ if (column > fragments.size() -1)
+ {
+ fragment.updateRowColumn(-1, 0);
+ column = 0;
+ }
+ columnCounts[column]++;
}
- columnCounts[column]++;
- }
- int placedColumn = 0;
- for (int ix = 1; ix < columnCounts.length; ix++)
- {
- if (columnCounts[ix] < columnCounts[placedColumn])
- placedColumn = ix;
+ int placedColumn = 0;
+ for (int ix = 1; ix < columnCounts.length; ix++)
+ {
+ if (columnCounts[ix] < columnCounts[placedColumn])
+ placedColumn = ix;
+ }
+ layoutFragment.addPortlet(ContentFragment.PORTLET, portletName, columnCounts[placedColumn], placedColumn);
}
- System.out.println("adding portlet at row = " + columnCounts[placedColumn] + ", col = " + placedColumn);
- layoutFragment.addPortlet(ContentFragment.PORTLET, portletName, columnCounts[placedColumn], placedColumn);
}

public static int min(int[] numbers)

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@...
For additional commands, e-mail: jetspeed-dev-help@...

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

Author: woonsan
Date: Fri Dec 4 18:07:47 2009
New Revision: 887303

URL: http://svn.apache.org/viewvc?rev=887303&view=rev
Log:
JS2-1087: Adding access control for portlet definition query

Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/util/PaginationUtils.java
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java
URL: 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
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java (original)
+++ 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
@@ -18,6 +18,7 @@

import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.List;

import javax.servlet.ServletConfig;
@@ -33,12 +34,14 @@

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.math.NumberUtils;
+import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.om.portlet.PortletApplication;
import org.apache.jetspeed.om.portlet.PortletDefinition;
import org.apache.jetspeed.search.ParsedObject;
import org.apache.jetspeed.search.SearchEngine;
import org.apache.jetspeed.search.SearchResults;
+import org.apache.jetspeed.security.SecurityAccessController;
import org.apache.jetspeed.services.beans.PortletApplicationBean;
import org.apache.jetspeed.services.beans.PortletApplicationBeanCollection;
import org.apache.jetspeed.services.beans.PortletDefinitionBean;
@@ -66,12 +69,15 @@
@Context
private ServletContext servletContext;

+ private SecurityAccessController securityAccessController;
+
private PortletRegistry portletRegistry;

private SearchEngine searchEngine;

- public PortletRegistryService(PortletRegistry portletRegistry, SearchEngine searchEngine)
+ public PortletRegistryService(SecurityAccessController securityAccessController, PortletRegistry portletRegistry, SearchEngine searchEngine)
{
+ this.securityAccessController = securityAccessController;
this.portletRegistry = portletRegistry;
this.searchEngine = searchEngine;
}
@@ -194,9 +200,9 @@
"AND " + queryParam;
SearchResults searchResults = searchEngine.search(queryText);
List<ParsedObject> searchResultList = searchResults.getResults();
- pdBeans.setTotalSize(searchResultList.size());
+ ArrayList<PortletDefinition> searchedPortletDefinitions = new ArrayList<PortletDefinition>();

- for (ParsedObject parsedObject : (List<ParsedObject>) PaginationUtils.subList(searchResultList, beginIndex, maxResults))
+ for (ParsedObject parsedObject : searchResultList)
{
String uniqueName = SearchEngineUtils.getPortletUniqueName(parsedObject);

@@ -207,17 +213,25 @@

PortletDefinition pd = portletRegistry.getPortletDefinitionByUniqueName(uniqueName);

- if (pd != null)
+ if (pd != null && securityAccessController.checkPortletAccess(pd, JetspeedActions.MASK_VIEW))
{
- pdBeanList.add(new PortletDefinitionBean(pd));
+ searchedPortletDefinitions.add(pd);
}
}
+
+ Collection<PortletDefinition> filteredPortletDefinitions = filterPortletDefinitionsBySecurityAccess(searchedPortletDefinitions, JetspeedActions.MASK_VIEW);
+ pdBeans.setTotalSize(filteredPortletDefinitions.size());
+
+ for (PortletDefinition pd : (Collection<PortletDefinition>) PaginationUtils.subCollection(filteredPortletDefinitions, beginIndex, maxResults))
+ {
+ pdBeanList.add(new PortletDefinitionBean(pd));
+ }
}
else
{
if (StringUtils.isBlank(applicationName) && StringUtils.isBlank(definitionName))
{
- Collection<PortletDefinition> pds = portletRegistry.getAllPortletDefinitions();
+ Collection<PortletDefinition> pds = filterPortletDefinitionsBySecurityAccess(portletRegistry.getAllPortletDefinitions(), JetspeedActions.MASK_VIEW);
pdBeans.setTotalSize(pds.size());

for (PortletDefinition pd : (Collection<PortletDefinition>) PaginationUtils.subCollection(pds, beginIndex, maxResults))
@@ -233,22 +247,19 @@
{
if (StringUtils.isBlank(definitionName))
{
- if (pa != null)
+ Collection<PortletDefinition> pds = filterPortletDefinitionsBySecurityAccess(pa.getPortlets(), JetspeedActions.MASK_VIEW);
+ pdBeans.setTotalSize(pds.size());
+
+ for (PortletDefinition pd : (List<PortletDefinition>) PaginationUtils.subCollection(pds, beginIndex, maxResults))
{
- Collection<PortletDefinition> pds = pa.getPortlets();
- pdBeans.setTotalSize(pds.size());
-
- for (PortletDefinition pd : (List<PortletDefinition>) PaginationUtils.subList(pa.getPortlets(), beginIndex, maxResults))
- {
- pdBeanList.add(new PortletDefinitionBean(pd));
- }
+ pdBeanList.add(new PortletDefinitionBean(pd));
}
}
else
{
PortletDefinition pd = pa.getPortlet(definitionName);

- if (pd != null)
+ if (pd != null && securityAccessController.checkPortletAccess(pd, JetspeedActions.MASK_VIEW))
{
pdBeanList.add(new PortletDefinitionBean(pd));
pdBeans.setTotalSize(1);
@@ -263,4 +274,29 @@
return pdBeans;
}

+ private Collection<PortletDefinition> filterPortletDefinitionsBySecurityAccess(Collection<PortletDefinition> collection, int mask)
+ {
+ if (securityAccessController == null)
+ {
+ return collection;
+ }
+
+ if (collection == null || collection.isEmpty())
+ {
+ return Collections.emptyList();
+ }
+
+ ArrayList<PortletDefinition> filteredCollection = new ArrayList<PortletDefinition>();
+
+ for (PortletDefinition pd : collection)
+ {
+ if (securityAccessController.checkPortletAccess(pd, mask))
+ {
+ filteredCollection.add(pd);
+ }
+ }
+
+ return filteredCollection;
+ }
+
}

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/util/PaginationUtils.java
URL: 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
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/util/PaginationUtils.java (original)
+++ 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
@@ -59,35 +59,13 @@

public static Collection<? extends Object> subCollection(final Collection<? extends Object> collection, int beginIndex, int maxResults)
{
- if (beginIndex < 0 || (beginIndex == 0 && maxResults < 0))
+ if (collection instanceof List)
{
- return collection;
- }
- else if (beginIndex >= collection.size())
- {
- return Collections.emptyList();
+ return subList((List<? extends Object>) collection, beginIndex, maxResults);
}
else
{
- List<Object> list = null;
-
- if (collection instanceof List)
- {
- list = (List<Object>) collection;
- }
- else
- {
- list = new ArrayList<Object>(collection);
- }
-
- if (maxResults < 0)
- {
- return list.subList(beginIndex, list.size());
- }
- else
- {
- return list.subList(beginIndex, Math.min(list.size(), beginIndex + maxResults));
- }
+ return subList(new ArrayList<Object>(collection), beginIndex, maxResults);
}
}

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml
URL: 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
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml Fri Dec 4 18:07:47 2009
@@ -108,6 +108,7 @@

<bean id="jaxrsPortletRegistryService" class="org.apache.jetspeed.services.rest.PortletRegistryService">
<meta key="j2:cat" value="default" />
+ <constructor-arg ref="org.apache.jetspeed.security.SecurityAccessController" />
<constructor-arg ref="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
<constructor-arg ref="org.apache.jetspeed.search.SearchEngine" />
</bean>

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@...
For additional commands, e-mail: jetspeed-dev-help@...

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

Author: woonsan
Date: Fri Dec 4 17:06:33 2009
New Revision: 887270

URL: http://svn.apache.org/viewvc?rev=887270&view=rev
Log:
JS2-1087: Adding pagination attribute in the returned jax-rs service results.

Added:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/BeanCollection.java (with props)
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeanCollection.java (contents, props changed)
- copied, changed from r886744, portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeans.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeanCollection.java (contents, props changed)
- copied, changed from r886744, portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeans.java
Removed:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeans.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeans.java
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml

Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/BeanCollection.java
URL: 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
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/BeanCollection.java (added)
+++ 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
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.services.beans;
+
+import java.io.Serializable;
+import java.util.Collection;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * BeansCollection
+ *
+ * @version $Id$
+ */
+@XmlRootElement(name="collection")
+public class BeanCollection<T> implements Serializable
+{
+ private static final long serialVersionUID = 1L;
+
+ private Collection<T> collection;
+
+ private int totalSize = -1;
+
+ private int beginIndex = -1;
+
+ public BeanCollection()
+ {
+
+ }
+
+ protected Collection<T> getCollection()
+ {
+ return collection;
+ }
+
+ protected void setCollection(Collection<T> collection)
+ {
+ this.collection = collection;
+ }
+
+ @XmlAttribute(name="size")
+ public int getSize()
+ {
+ return (collection != null ? collection.size() : 0);
+ }
+
+ public void setSize()
+ {
+
+ }
+
+ @XmlAttribute(name="totalSize")
+ public int getTotalSize()
+ {
+ return totalSize;
+ }
+
+ public void setTotalSize(int totalSize)
+ {
+ this.totalSize = totalSize;
+ }
+
+ @XmlAttribute(name="beginIndex")
+ public int getBeginIndex()
+ {
+ return beginIndex;
+ }
+
+ public void setBeginIndex(int beginIndex)
+ {
+ this.beginIndex = beginIndex;
+ }
+
+}

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/BeanCollection.java
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/BeanCollection.java
------------------------------------------------------------------------------
svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/BeanCollection.java
------------------------------------------------------------------------------
svn:mime-type = text/plain

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)
URL: 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
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeans.java (original)
+++ 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
@@ -16,7 +16,6 @@
*/
package org.apache.jetspeed.services.beans;

-import java.io.Serializable;
import java.util.Collection;

import javax.xml.bind.annotation.XmlElement;
@@ -29,25 +28,24 @@
* @version $Id$
*/
@XmlRootElement(name="applications")
-public class PortletApplicationBeans implements Serializable
+public class PortletApplicationBeanCollection extends BeanCollection<PortletApplicationBean>
{
private static final long serialVersionUID = 1L;

- private Collection<PortletApplicationBean> portletApplicationBeans;
-
- public PortletApplicationBeans()
+ public PortletApplicationBeanCollection()
{
-
+ super();
}

+ @Override
@XmlElements(@XmlElement(name="application"))
- public Collection<PortletApplicationBean> getPortletApplicationBeans()
+ public Collection<PortletApplicationBean> getCollection()
{
- return portletApplicationBeans;
+ return super.getCollection();
}

- public void setPortletApplicationBeans(Collection<PortletApplicationBean> portletApplicationBeans)
+ public void setPortletApplicationBeans(Collection<PortletApplicationBean> collection)
{
- this.portletApplicationBeans = portletApplicationBeans;
+ super.setCollection(collection);
}
}

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeanCollection.java
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeanCollection.java
------------------------------------------------------------------------------
svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeanCollection.java
------------------------------------------------------------------------------
svn:mime-type = text/plain

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java
URL: 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
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java (original)
+++ 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
@@ -28,6 +28,7 @@
import org.apache.jetspeed.om.portlet.ContainerRuntimeOption;
import org.apache.jetspeed.om.portlet.Description;
import org.apache.jetspeed.om.portlet.DisplayName;
+import org.apache.jetspeed.om.portlet.InitParam;
import org.apache.jetspeed.om.portlet.Language;
import org.apache.jetspeed.om.portlet.PortletDefinition;
import org.apache.jetspeed.om.portlet.Supports;
@@ -52,6 +53,7 @@
private Collection<LanguageBean> languageBeans;
private GenericMetadataBean metadataBean;
private Collection<ContainerRuntimeOptionBean> containerRuntimeOptionBeans;
+ private Collection<InitParamBean> initParamBeans;

public PortletDefinitionBean()
{
@@ -101,6 +103,13 @@
containerRuntimeOptionBeanList.add(new ContainerRuntimeOptionBean(containerRuntimeOption));
}
containerRuntimeOptionBeans = containerRuntimeOptionBeanList;
+
+ ArrayList<InitParamBean> initParamBeanList = new ArrayList<InitParamBean>();
+ for (InitParam initParam : portletDefinition.getInitParams())
+ {
+ initParamBeanList.add(new InitParamBean(initParam));
+ }
+ initParamBeans = initParamBeanList;
}

public String getApplicationName()
@@ -215,4 +224,16 @@
this.containerRuntimeOptionBeans = containerRuntimeOptionBeans;
}

+ @XmlElementWrapper(name="initparams")
+ @XmlElements(@XmlElement(name="initparam"))
+ public Collection<InitParamBean> getInitParamBeans()
+ {
+ return initParamBeans;
+ }
+
+ public void setInitParamBeans(Collection<InitParamBean> initParamBeans)
+ {
+ this.initParamBeans = initParamBeans;
+ }
+
}

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)
URL: 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
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeans.java (original)
+++ 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
@@ -16,7 +16,6 @@
*/
package org.apache.jetspeed.services.beans;

-import java.io.Serializable;
import java.util.Collection;

import javax.xml.bind.annotation.XmlElement;
@@ -29,26 +28,25 @@
* @version $Id$
*/
@XmlRootElement(name="definitions")
-public class PortletDefinitionBeans implements Serializable
+public class PortletDefinitionBeanCollection extends BeanCollection<PortletDefinitionBean>
{
private static final long serialVersionUID = 1L;

- private Collection<PortletDefinitionBean> portletDefinitionBeans;
-
- public PortletDefinitionBeans()
+ public PortletDefinitionBeanCollection()
{
-
+ super();
}

+ @Override
@XmlElements(@XmlElement(name="definition"))
- public Collection<PortletDefinitionBean> getPortletDefinitionBean()
+ public Collection<PortletDefinitionBean> getCollection()
{
- return portletDefinitionBeans;
+ return super.getCollection();
}

- public void setPortletApplicationBeans(Collection<PortletDefinitionBean> portletDefinitionBeans)
+ public void setPortletApplicationBeans(Collection<PortletDefinitionBean> collection)
{
- this.portletDefinitionBeans = portletDefinitionBeans;
+ super.setCollection(collection);
}

}

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeanCollection.java
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeanCollection.java
------------------------------------------------------------------------------
svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeanCollection.java
------------------------------------------------------------------------------
svn:mime-type = text/plain

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java
URL: 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
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java (original)
+++ 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
@@ -40,9 +40,9 @@
import org.apache.jetspeed.search.SearchEngine;
import org.apache.jetspeed.search.SearchResults;
import org.apache.jetspeed.services.beans.PortletApplicationBean;
-import org.apache.jetspeed.services.beans.PortletApplicationBeans;
+import org.apache.jetspeed.services.beans.PortletApplicationBeanCollection;
import org.apache.jetspeed.services.beans.PortletDefinitionBean;
-import org.apache.jetspeed.services.beans.PortletDefinitionBeans;
+import org.apache.jetspeed.services.beans.PortletDefinitionBeanCollection;
import org.apache.jetspeed.services.rest.util.PaginationUtils;
import org.apache.jetspeed.services.rest.util.SearchEngineUtils;
import org.slf4j.Logger;
@@ -78,7 +78,7 @@

@GET
@Path("/application/{path:.*}")
- public PortletApplicationBeans getPortletApplication(@Context HttpServletRequest servletRequest,
+ public PortletApplicationBeanCollection getPortletApplication(@Context HttpServletRequest servletRequest,
@Context UriInfo uriInfo,
@PathParam("path") List<PathSegment> pathSegments,
@QueryParam("query") String queryParam,
@@ -95,7 +95,9 @@
int beginIndex = NumberUtils.toInt(beginIndexParam, -1);
int maxResults = NumberUtils.toInt(maxResultsParam, -1);

- PortletApplicationBeans paBeans = new PortletApplicationBeans();
+ PortletApplicationBeanCollection paBeans = new PortletApplicationBeanCollection();
+ paBeans.setBeginIndex(beginIndex);
+ paBeans.setTotalSize(0);
List<PortletApplicationBean> paBeanList = new ArrayList<PortletApplicationBean>();

if (!StringUtils.isBlank(queryParam))
@@ -103,6 +105,7 @@
String queryText = ParsedObject.FIELDNAME_TYPE + ":\"" + ParsedObject.OBJECT_TYPE_PORTLET_APPLICATION + "\" AND " + queryParam;
SearchResults searchResults = searchEngine.search(queryText);
List<ParsedObject> searchResultList = searchResults.getResults();
+ paBeans.setTotalSize(searchResultList.size());

for (ParsedObject parsedObject : (List<ParsedObject>) PaginationUtils.subList(searchResultList, beginIndex, maxResults))
{
@@ -125,7 +128,10 @@
{
if (StringUtils.isBlank(applicationName))
{
- for (PortletApplication pa : (Collection<PortletApplication>) PaginationUtils.subCollection(portletRegistry.getPortletApplications(), beginIndex, maxResults))
+ Collection<PortletApplication> pas = portletRegistry.getPortletApplications();
+ paBeans.setTotalSize(pas.size());
+
+ for (PortletApplication pa : (Collection<PortletApplication>) PaginationUtils.subCollection(pas, beginIndex, maxResults))
{
paBeanList.add(new PortletApplicationBean(pa));
}
@@ -136,18 +142,20 @@

if (pa != null)
{
+ paBeans.setTotalSize(1);
paBeanList.add(new PortletApplicationBean(pa));
}
}
}

paBeans.setPortletApplicationBeans(paBeanList);
+
return paBeans;
}

@GET
@Path("/definition/{path:.*}")
- public PortletDefinitionBeans getPortletDefinition(@Context HttpServletRequest servletRequest,
+ public PortletDefinitionBeanCollection getPortletDefinition(@Context HttpServletRequest servletRequest,
@Context UriInfo uriInfo,
@PathParam("path") List<PathSegment> pathSegments,
@QueryParam("query") String queryParam,
@@ -173,7 +181,9 @@
int beginIndex = NumberUtils.toInt(beginIndexParam, -1);
int maxResults = NumberUtils.toInt(maxResultsParam, -1);

- PortletDefinitionBeans pdBeans = new PortletDefinitionBeans();
+ PortletDefinitionBeanCollection pdBeans = new PortletDefinitionBeanCollection();
+ pdBeans.setBeginIndex(beginIndex);
+ pdBeans.setTotalSize(0);
List<PortletDefinitionBean> pdBeanList = new ArrayList<PortletDefinitionBean>();

if (!StringUtils.isBlank(queryParam))
@@ -184,6 +194,7 @@
"AND " + queryParam;
SearchResults searchResults = searchEngine.search(queryText);
List<ParsedObject> searchResultList = searchResults.getResults();
+ pdBeans.setTotalSize(searchResultList.size());

for (ParsedObject parsedObject : (List<ParsedObject>) PaginationUtils.subList(searchResultList, beginIndex, maxResults))
{
@@ -206,7 +217,10 @@
{
if (StringUtils.isBlank(applicationName) && StringUtils.isBlank(definitionName))
{
- for (PortletDefinition pd : (Collection<PortletDefinition>) PaginationUtils.subCollection(portletRegistry.getAllPortletDefinitions(), beginIndex, maxResults))
+ Collection<PortletDefinition> pds = portletRegistry.getAllPortletDefinitions();
+ pdBeans.setTotalSize(pds.size());
+
+ for (PortletDefinition pd : (Collection<PortletDefinition>) PaginationUtils.subCollection(pds, beginIndex, maxResults))
{
pdBeanList.add(new PortletDefinitionBean(pd));
}
@@ -221,6 +235,9 @@
{
if (pa != null)
{
+ Collection<PortletDefinition> pds = pa.getPortlets();
+ pdBeans.setTotalSize(pds.size());
+
for (PortletDefinition pd : (List<PortletDefinition>) PaginationUtils.subList(pa.getPortlets(), beginIndex, maxResults))
{
pdBeanList.add(new PortletDefinitionBean(pd));
@@ -234,6 +251,7 @@
if (pd != null)
{
pdBeanList.add(new PortletDefinitionBean(pd));
+ pdBeans.setTotalSize(1);
}
}
}
@@ -241,6 +259,7 @@
}

pdBeans.setPortletApplicationBeans(pdBeanList);
+
return pdBeans;
}

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml
URL: 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
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml Fri Dec 4 17:06:33 2009
@@ -15,8 +15,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">


<bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
@@ -68,12 +69,38 @@
</property>
</bean>

+ <bean id="jaxrsJsonProvider" class="org.apache.cxf.jaxrs.provider.JSONProvider">
+ <meta key="j2:cat" value="default" />
+ <property name="serializeAsArray" value="true"/>
+ <property name="arrayKeys">
+ <list>
+ 
+ </list>
+ </property>
+ </bean>
+

<bean id="org.apache.jetspeed.services.rest.singletons" class="org.springframework.beans.factory.config.SetFactoryBean">
<meta key="j2:cat" value="default" />
<property name="sourceSet">
<set>
+
+ 
+ <ref bean="jaxrsJsonProvider" />
+
+ 
<ref bean="jaxrsPortletRegistryService" />
+
</set>
</property>
</bean>

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@...
For additional commands, e-mail: jetspeed-dev-help@...

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

Author: ate
Date: Fri Dec 4 15:01:19 2009
New Revision: 887219

URL: http://svn.apache.org/viewvc?rev=887219&view=rev
Log:
Also deriving "login" destination url dynamically for the LoginPortlet to stay within the currently used pipeline, e.g. /portal, /ui, etc.

Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp
URL: 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
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp Fri Dec 4 15:01:19 2009
@@ -47,7 +47,7 @@
</c:if>
</c:otherwise>
</c:choose>
- <form method="post" action='<c:url context="${portalContextPath}" value="/login/proxy"/>'>
+ <form method="post" action='<c:url context="${portalContextPath}" value="/login/proxy?${loginDestination}=${requestContext.portalURL.basePath}"/>'>
<div>
<fmt:message key="login.label.Username"/>
<c_rt:set var="userName" value="<%=((RequestContext)request.getAttribute(RequestContext.REQUEST_PORTALENV)).getSessionAttribute(LoginConstants.USERNAME)%>"/>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp
URL: 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
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp Fri Dec 4 15:01:19 2009
@@ -29,12 +29,12 @@
<c:set var="portalContextPath" value="/"/>
</c:if>
<c:set var="encoder" value="${requestContext.request.parameterMap.encoder[0]}"/>
-<c:set var="destLogin" value="/login/proxy"/>
+<c:set var="destLogin" value="/login/proxy?${loginDestination}=${requestContext.portalURL.basePath}"/>
<c:set var="destLogout" value="/login/logout?${loginDestination}=${requestContext.portalURL.basePath}"/>
<c:set var="destAccount" value="${requestContext.portalURL.basePath}/my-account.psml"/>
<c:set var="destContext" value="/"/>
<c:if test="${not empty encoder && encoder == 'desktop'}">
- <c:set var="destLogin" value="${destLogin}?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
+ <c:set var="destLogin" value="/login/proxy?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<c:set var="destLogout" value="/login/logout?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<c:set var="destAccount" value="/desktop/my-account.psml?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<c:set var="destContext" value="${portalContextPath}"/>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp
URL: 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
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp Fri Dec 4 15:01:19 2009
@@ -30,12 +30,12 @@
<c:set var="portalContextPath" value="/"/>
</c:if>
<c:set var="encoder" value="${requestContext.request.parameterMap.encoder[0]}"/>
-<c:set var="destLogin" value="/login/proxy"/>
+<c:set var="destLogin" value="/login/proxy?${loginDestination}=${requestContext.portalURL.basePath}"/>
<c:set var="destLogout" value="/login/logout?${loginDestination}=${requestContext.portalURL.basePath}"/>
<c:set var="destAccount" value="${requestContext.portalURL.basePath}/my-account.psml"/>
<c:set var="destContext" value="/"/>
<c:if test="${not empty encoder && encoder == 'desktop'}">
- <c:set var="destLogin" value="${destLogin}?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
+ <c:set var="destLogin" value="/login/proxy?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<c:set var="destLogout" value="/login/logout?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<c:set var="destAccount" value="/desktop/my-account.psml?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<c:set var="destContext" value="${portalContextPath}"/>

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@...
For additional commands, e-mail: jetspeed-dev-help@...

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

Author: ate
Date: Fri Dec 4 14:46:46 2009
New Revision: 887214

URL: http://svn.apache.org/viewvc?rev=887214&view=rev
Log:
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.

Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp
URL: 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
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp Fri Dec 4 14:46:46 2009
@@ -28,9 +28,9 @@
<c:choose>
<c:when test="${pageContext.request.userPrincipal != null}">
<fmt:message key="login.label.Welcome"><fmt:param><c:out value="${pageContext.request.userPrincipal.name}"/></fmt:param></fmt:message><br/>
- <a href='<c:url context="${portalContextPath}" value="/login/logout"/>'><fmt:message key="login.label.Logout"/></a>
+ <a href='<c:url context="${portalContextPath}" value="/login/logout?${loginDestination}=${requestContext.portalURL.basePath}"/>'><fmt:message key="login.label.Logout"/></a>
<br/>
- <a href='<c:url context="${portalContextPath}" value="/portal/my-account.psml"/>'><fmt:message key="login.label.ChangePassword"/></a>
+ <a href='<c:url context="/" value="${requestContext.portalURL.basePath}/my-account.psml"/>'><fmt:message key="login.label.ChangePassword"/></a>
</c:when>
<c:otherwise>
<%-- backdoor access to the portal session to get the login error count --%>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp
URL: 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
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp Fri Dec 4 14:46:46 2009
@@ -30,12 +30,14 @@
</c:if>
<c:set var="encoder" value="${requestContext.request.parameterMap.encoder[0]}"/>
<c:set var="destLogin" value="/login/proxy"/>
-<c:set var="destLogout" value="/login/logout"/>
-<c:set var="destAccount" value="/portal/my-account.psml"/>
+<c:set var="destLogout" value="/login/logout?${loginDestination}=${requestContext.portalURL.basePath}"/>
+<c:set var="destAccount" value="${requestContext.portalURL.basePath}/my-account.psml"/>
+<c:set var="destContext" value="/"/>
<c:if test="${not empty encoder && encoder == 'desktop'}">
<c:set var="destLogin" value="${destLogin}?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
- <c:set var="destLogout" value="${destLogout}?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
+ <c:set var="destLogout" value="/login/logout?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<c:set var="destAccount" value="/desktop/my-account.psml?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
+ <c:set var="destContext" value="${portalContextPath}"/>
</c:if>
<div class="portlet-section-text">
<c:choose>
@@ -43,7 +45,7 @@
<fmt:message key="login.label.Welcome"><fmt:param><c:out value="${pageContext.request.userPrincipal.name}"/></fmt:param></fmt:message><br>
<a href='<c:url context="${portalContextPath}" value="${destLogout}"/>'><fmt:message key="login.label.Logout"/></a>
<br>
- <a href='<c:url context="${portalContextPath}" value="${destAccount}"/>'><fmt:message key="login.label.ChangePassword"/></a>
+ <a href='<c:url context="${destContext}" value="${destAccount}"/>'><fmt:message key="login.label.ChangePassword"/></a>
</c:when>
<c:otherwise>
<%-- backdoor access to the portal session to get the login error count --%>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp
URL: 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
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp Fri Dec 4 14:46:46 2009
@@ -31,12 +31,14 @@
</c:if>
<c:set var="encoder" value="${requestContext.request.parameterMap.encoder[0]}"/>
<c:set var="destLogin" value="/login/proxy"/>
-<c:set var="destLogout" value="/login/logout"/>
-<c:set var="destAccount" value="/portal/my-account.psml"/>
+<c:set var="destLogout" value="/login/logout?${loginDestination}=${requestContext.portalURL.basePath}"/>
+<c:set var="destAccount" value="${requestContext.portalURL.basePath}/my-account.psml"/>
+<c:set var="destContext" value="/"/>
<c:if test="${not empty encoder && encoder == 'desktop'}">
<c:set var="destLogin" value="${destLogin}?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
- <c:set var="destLogout" value="${destLogout}?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
+ <c:set var="destLogout" value="/login/logout?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<c:set var="destAccount" value="/desktop/my-account.psml?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
+ <c:set var="destContext" value="${portalContextPath}"/>
</c:if>

<c_rt:set var="contentType" value="<%=renderRequest.getResponseContentType()%>"/>
@@ -80,7 +82,7 @@
<fmt:message key="login.label.Welcome"><fmt:param><c:out value="${pageContext.request.userPrincipal.name}"/></fmt:param></fmt:message><br>
<a href='<c:url context="${portalContextPath}" value="${destLogout}"/>'><fmt:message key="login.label.Logout"/></a>
<br>
- <a href='<c:url context="${portalContextPath}" value="${destAccount}"/>'><fmt:message key="login.label.ChangePassword"/></a>
+ <a href='<c:url context="${destContext}" value="${destAccount}"/>'><fmt:message key="login.label.ChangePassword"/></a>
</c:when>
<c:otherwise>
<%-- backdoor access to the portal session to get the login error count --%>

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@...
For additional commands, e-mail: jetspeed-dev-help@...

Re: Apa-RSS

2009-12-04T03:36:25Z

Ok. I will send it to you today...

El jue, 03-12-2009 a las 12:59 -0800, David Sean Taylor escribió:

> On Nov 30, 2009, at 5:50 AM, Woonsan Ko wrote:
>
> > Hi Gonzalo,
> >
> > I'd like to inform you of commons-logging issue.
> > Because the current commons-logging is not proper for cross-context
> > application environment like portal, we removed commons-logging
> > dependencies in jetspeed-2 and apa projects.
> > Please see https://issues.apache.org/jira/browse/JS2-972 for details.
> > It is recommended to use slf4j instead.
> >
> +1
> I will wait for a new patch with slf4j before committing this
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: jetspeed-dev-unsubscribe@...
> For additional commands, e-mail: jetspeed-dev-help@...
>

Re: wicket portlet

2009-12-04T01:27:09Z

Hi Vlachogiannis,

There's a simple guideline here:

http://cwiki.apache.org/WICKET/portal-howto.html

Regards,

Woonsan

----- Original Message ----

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@...
For additional commands, e-mail: jetspeed-dev-help@...

wicket portlet

2009-12-04T00:14:06Z

Hi list,

Is there a howto page for developing a wicket portlet for jetspeed? Some hints?

Thanks a lot,
Vangelis

Re: Apa-RSS

2009-12-03T12:59:09Z

On Nov 30, 2009, at 5:50 AM, Woonsan Ko wrote:

> Hi Gonzalo,
>
> I'd like to inform you of commons-logging issue.
> Because the current commons-logging is not proper for cross-context
> application environment like portal, we removed commons-logging
> dependencies in jetspeed-2 and apa projects.
> Please see https://issues.apache.org/jira/browse/JS2-972 for details.
> It is recommended to use slf4j instead.
>
+1
I will wait for a new patch with slf4j before committing this

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@...
For additional commands, e-mail: jetspeed-dev-help@...

svn commit: r886901 - in /portals/jetspeed-2/portal/trunk: applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java

2009-12-03T12:15:39Z

Author: taylor
Date: Thu Dec 3 20:15:39 2009
New Revision: 886901

URL: http://svn.apache.org/viewvc?rev=886901&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-1084
- fixing /portal pipeline

Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm?rev=886901&r1=886900&r2=886901&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm Thu Dec 3 20:15:39 2009
@@ -310,6 +310,7 @@

#foreach($f in $column)
## Set up coordinates for this fragment
+ #if($f.isLocked() == false)
#set($coords = $columnLayout.getCoordinate($f))
#set($col = $coords.x)
#set($lastRow = $columnLayout.getLastRowNumber($col))
@@ -381,6 +382,7 @@
$f.renderedContent
#end
</div>
+ #end
#end
</div>
#set ($columnIndex = $columnIndex + 1)

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java?rev=886901&r1=886900&r2=886901&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java Thu Dec 3 20:15:39 2009
@@ -104,8 +104,7 @@
}
}
}
- if (!f.isLocked()) // FIXME: this is still not the desired behavior, need to check if its docked
- renderer.renderNow(f, context);
+ renderer.renderNow(f, context);
}

}

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@...
For additional commands, e-mail: jetspeed-dev-help@...

svn commit: r886193 - in /portals/jetspeed-2/portal/trunk: components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/ jetspeed-portal-resources/src/main/...

2009-12-02T08:25:47Z

Author: woonsan
Date: Wed Dec 2 16:25:46 2009
New Revision: 886193

URL: http://svn.apache.org/viewvc?rev=886193&view=rev
Log:
JS2-1087: Makes service beans leverage spring dependency injection.

Added:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/JetspeedJaxrsApplication.java (with props)
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ServletDelegatingValve.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ServletDelegatingValve.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ServletDelegatingValve.java?rev=886193&r1=886192&r2=886193&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ServletDelegatingValve.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ServletDelegatingValve.java Wed Dec 2 16:25:46 2009
@@ -38,6 +38,7 @@
{
protected HttpServlet servlet;
protected ServletConfig config;
+ protected boolean servletInitialized;

public ServletDelegatingValve(HttpServlet servlet, ServletConfig config)
{
@@ -48,19 +49,21 @@
@Override
public void initialize() throws PipelineException
{
- try
- {
- servlet.init(config);
- }
- catch (Exception e)
- {
- throw new PipelineException(e);
- }
}
-
+
public void destroy()
{
- servlet.destroy();
+ if (servlet != null && servletInitialized)
+ {
+ try
+ {
+ servlet.destroy();
+ }
+ finally
+ {
+ servletInitialized = false;
+ }
+ }
}

@Override
@@ -68,6 +71,11 @@
{
try
{
+ if (!servletInitialized)
+ {
+ initServlet();
+ }
+
servlet.service(request.getRequest(), request.getResponse());
}
catch (Exception e)
@@ -78,6 +86,22 @@
// continue
context.invokeNext(request);
}
+
+ private synchronized void initServlet() throws PipelineException
+ {
+ if (!servletInitialized)
+ {
+ try
+ {
+ servlet.init(config);
+ servletInitialized = true;
+ }
+ catch (Exception e)
+ {
+ throw new PipelineException(e);
+ }
+ }
+ }

public static class ServletConfigImpl implements ServletConfig
{

Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/JetspeedJaxrsApplication.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/JetspeedJaxrsApplication.java?rev=886193&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/JetspeedJaxrsApplication.java (added)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/JetspeedJaxrsApplication.java Wed Dec 2 16:25:46 2009
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.services.rest;
+
+import java.util.Set;
+import java.util.HashSet;
+
+import javax.ws.rs.core.Application;
+
+import org.apache.jetspeed.Jetspeed;
+
+/**
+ * JetspeedJaxrsApplication
+ *
+ * @version $Id$
+ */
+public class JetspeedJaxrsApplication extends Application
+{
+
+ public static final String CLASSES_ID = JetspeedJaxrsApplication.class.getPackage().getName() + ".classes";
+
+ public static final String SINGLETONS_ID = JetspeedJaxrsApplication.class.getPackage().getName() + ".singletons";
+
+
+ private Set<Class<?>> classes = new HashSet<Class<?>>();
+
+ private Set<Object> singletons = new HashSet<Object>();
+
+ public JetspeedJaxrsApplication()
+ {
+ super();
+
+ String classesId = System.getProperty(CLASSES_ID);
+
+ if (classesId != null && Jetspeed.getComponentManager().containsComponent(classesId))
+ {
+ classes = (Set<Class<?>>) Jetspeed.getComponentManager().getComponent(classesId);
+ }
+
+ String singletonsId = System.getProperty(SINGLETONS_ID);
+
+ if (singletonsId != null && Jetspeed.getComponentManager().containsComponent(singletonsId))
+ {
+ singletons = (Set<Object>) Jetspeed.getComponentManager().getComponent(singletonsId);
+ }
+ }
+
+ @Override
+ public Set<Class<?>> getClasses()
+ {
+ return classes;
+ }
+
+ public void setClasses(final Set<Class<?>> classes)
+ {
+ this.classes = classes;
+ }
+
+ @Override
+ public Set<Object> getSingletons()
+ {
+ return singletons;
+ }
+
+ public void setSingletons(final Set<Object> singletons)
+ {
+ this.singletons = singletons;
+ }
+
+}
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/JetspeedJaxrsApplication.java
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/JetspeedJaxrsApplication.java
------------------------------------------------------------------------------
svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/JetspeedJaxrsApplication.java
------------------------------------------------------------------------------
svn:mime-type = text/plain

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java?rev=886193&r1=886192&r2=886193&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java Wed Dec 2 16:25:46 2009
@@ -33,7 +33,6 @@

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.math.NumberUtils;
-import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.om.portlet.PortletApplication;
import org.apache.jetspeed.om.portlet.PortletDefinition;
@@ -67,25 +66,21 @@
@Context
private ServletContext servletContext;

- @Context
- private HttpServletRequest servletRequest;
-
- @Context
- private UriInfo uriInfo;
-
private PortletRegistry portletRegistry;

private SearchEngine searchEngine;

- public PortletRegistryService()
+ public PortletRegistryService(PortletRegistry portletRegistry, SearchEngine searchEngine)
{
- portletRegistry = (PortletRegistry) Jetspeed.getComponentManager().getComponent(PortletRegistry.class);
- searchEngine = (SearchEngine) Jetspeed.getComponentManager().getComponent(SearchEngine.class);
+ this.portletRegistry = portletRegistry;
+ this.searchEngine = searchEngine;
}

@GET
@Path("/application/{path:.*}")
- public PortletApplicationBeans getPortletApplication(@PathParam("path") List<PathSegment> pathSegments,
+ public PortletApplicationBeans getPortletApplication(@Context HttpServletRequest servletRequest,
+ @Context UriInfo uriInfo,
+ @PathParam("path") List<PathSegment> pathSegments,
@QueryParam("query") String queryParam,
@QueryParam("begin") String beginIndexParam,
@QueryParam("max") String maxResultsParam)
@@ -152,7 +147,9 @@

@GET
@Path("/definition/{path:.*}")
- public PortletDefinitionBeans getPortletDefinition(@PathParam("path") List<PathSegment> pathSegments,
+ public PortletDefinitionBeans getPortletDefinition(@Context HttpServletRequest servletRequest,
+ @Context UriInfo uriInfo,
+ @PathParam("path") List<PathSegment> pathSegments,
@QueryParam("query") String queryParam,
@QueryParam("begin") String beginIndexParam,
@QueryParam("max") String maxResultsParam)

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml?rev=886193&r1=886192&r2=886193&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml Wed Dec 2 16:25:46 2009
@@ -18,7 +18,9 @@
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">

+ 
<bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+ <meta key="j2:cat" value="default" />
<property name="targetClass" value="java.lang.System"/>
<property name="targetMethod" value="setProperty"/>
<property name="arguments">
@@ -29,18 +31,32 @@
</property>
</bean>

+ 
+ <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+ <meta key="j2:cat" value="default" />
+ <property name="targetClass" value="java.lang.System"/>
+ <property name="targetMethod" value="setProperty"/>
+ <property name="arguments">
+ <list>
+ <value>org.apache.jetspeed.services.rest.singletons</value>
+ <value>org.apache.jetspeed.services.rest.singletons</value>
+ </list>
+ </property>
+ </bean>
+
+ 
<bean id="cxfServlet" class="org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet">
<meta key="j2:cat" value="default" />
</bean>

+ 
<bean id="cxfServletConfig" class="org.apache.jetspeed.pipeline.valve.impl.ServletDelegatingValve$ServletConfigImpl">
<meta key="j2:cat" value="default" />
<constructor-arg value="CXFNonSpringJaxrsServlet" />
<constructor-arg>
<props>
- 
- <prop key="jaxrs.serviceClasses">
- org.apache.jetspeed.services.rest.PortletRegistryService
+ <prop key="javax.ws.rs.Application">
+ org.apache.jetspeed.services.rest.JetspeedJaxrsApplication
</prop>
</props>
</constructor-arg>
@@ -52,4 +68,21 @@
</property>
</bean>

+ 
+ <bean id="org.apache.jetspeed.services.rest.singletons" class="org.springframework.beans.factory.config.SetFactoryBean">
+ <meta key="j2:cat" value="default" />
+ <property name="sourceSet">
+ <set>
+ <ref bean="jaxrsPortletRegistryService" />
+ </set>
+ </property>
+ </bean>
+
+ 
+ <bean id="jaxrsPortletRegistryService" class="org.apache.jetspeed.services.rest.PortletRegistryService">
+ <meta key="j2:cat" value="default" />
+ <constructor-arg ref="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
+ <constructor-arg ref="org.apache.jetspeed.search.SearchEngine" />
+ </bean>
+
</beans>
\ No newline at end of file

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@...
For additional commands, e-mail: jetspeed-dev-help@...

Jetspeed 2.2.0

2009-12-01T13:01:25Z

I'm getting the following error when I try to create my own Jetspeed2 portal and portal app. I'm not quite sure what's causing the issue. It worked when I created the jetexpress example, but the j2-admin failed once I tried creating my own. Any suggestions would be greatly appreciated.

From jetspeed.log:

ERROR org.apache.jetspeed.engine.JetspeedEngine - 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; 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; nested exception is org.springframework.beans.BeanInstantiationException: Could not instantiate bean class [org.apache.jetspeed.container.state.impl.JetspeedNavigationalStateComponent]: Constructor threw exception; 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; 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'; 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; 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'; 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; 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"
2009-12-01 13:43:10,217 [main] ERROR org.apache.jetspeed.engine.JetspeedServlet - Jetspeed: init() failed:

Regards,

Nathan Smith

svn commit: r885673 - in /portals/jetspeed-2/portal/trunk: applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/ applications/jetspeed/src/main/webapp/WEB-INF/pages/ applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/ compon...

2009-11-30T21:10:36Z

Author: taylor
Date: Tue Dec 1 05:10:34 2009
New Revision: 885673

URL: http://svn.apache.org/viewvc?rev=885673&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-1084
- dabbling with using templates and lock status on fragments
- adding a template fragment (tpsml) for merging the toolbox and navigator into all pages under /
(i am trying to preserve the /portal pipeline behavior for now)

will give templates a more serious look once I sort out some nesting issues...

Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/definition.fpsml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/template.tpsml
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-page.psml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPageAction.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/seed/j2-seed.xml

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp?rev=885673&r1=885672&r2=885673&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp Tue Dec 1 05:10:34 2009
@@ -145,22 +145,19 @@
int subindex = 0;
for (ContentFragment fragment : collections)
{
- if (!(fragment.getName().equals("j2-admin::JetspeedToolbox") || fragment.getName().equals("j2-admin::JetspeedNavigator")))
- {
- //String content = jetui.renderPortletWindow(fragment.getId(), fragment.getName(), rc);
- String content = jetui.getRenderedContent((ContentFragment)fragment, rc);
- request.setAttribute("content", content);
- String decorator = fragment.getDecorator();
- if (decorator == null)
- decorator = pageDec;
- request.setAttribute("decorator", decorator);
- request.setAttribute("fragment", fragment);
- request.setAttribute("coordinate", columnLayout.getCoordinate(fragment));
+ //String content = jetui.renderPortletWindow(fragment.getId(), fragment.getName(), rc);
+ String content = jetui.getRenderedContent((ContentFragment)fragment, rc);
+ request.setAttribute("content", content);
+ String decorator = fragment.getDecorator();
+ if (decorator == null)
+ decorator = pageDec;
+ request.setAttribute("decorator", decorator);
+ request.setAttribute("fragment", fragment);
+ request.setAttribute("coordinate", columnLayout.getCoordinate(fragment));
%>
<jsp:include page="jetui-portlet.jsp"/>
<%
subindex++;
- }
}
index++;
%>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-page.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-page.psml?rev=885673&r1=885672&r2=885673&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-page.psml (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-page.psml Tue Dec 1 05:10:34 2009
@@ -46,10 +46,10 @@
<property layout="TwoColumns" name="row" value="3" />
<property layout="TwoColumns" name="column" value="1" />
</fragment>
- <fragment id="dp-24" type="portlet" name="demo::WeatherPortlet">
+ <fragment-reference id="dp-24-wp-reference" refid="wp-definition">
<property name="row" value="4"/>
<property name="column" value="1"/>
- </fragment>
+ </fragment-reference>

<fragment id="dp-7" type="portlet" name="demo::PickANumberPortlet" >
<property layout="TwoColumns" name="row" value="1" />

Added: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/definition.fpsml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/definition.fpsml?rev=885673&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/definition.fpsml (added)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/definition.fpsml Tue Dec 1 05:10:34 2009
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fragment-definition id="definition"
+ xmlns="http://portals.apache.org/jetspeed"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
+
+ <title>DEFINITION</title>
+ <fragment id="wp-definition" type="portlet" name="demo::WeatherPortlet"/>
+</fragment-definition>

Added: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/template.tpsml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/template.tpsml?rev=885673&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/template.tpsml (added)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/template.tpsml Tue Dec 1 05:10:34 2009
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<page-template id="definition"
+ xmlns="http://portals.apache.org/jetspeed"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
+
+ <title>TEMPLATE</title>
+ <fragment id="template-top" type="layout" name="jetspeed-layouts::VelocityOneColumn">
+
+ <fragment id="_jsNavigator-1001" type="portlet" name="j2-admin::JetspeedNavigator">
+ <property name="z" value="201.0"></property>
+ <property name="row" value="0"></property>
+ <property name="width" value="267.0"></property>
+ <property name="height" value="388.0"></property>
+ <property name="column" value="0"></property>
+ <property name="y" value="104.0"></property>
+ <property name="x" value="1.0"></property>
+ <property name="jsdesktop" value="staticpos=false;fitheight=false"></property>
+ </fragment>
+ <page-fragment id="page-template">
+ <property name="row" value="1"/>
+ </page-fragment>
+
+ <fragment id="_jsToolbox-1001" type="portlet" name="j2-admin::JetspeedToolbox">
+ <property name="z" value="201.0"></property>
+ <property name="row" value="2"></property>
+ <property name="width" value="267.0"></property>
+ <property name="height" value="388.0"></property>
+ <property name="column" value="0"></property>
+ <property name="y" value="500.0"></property>
+ <property name="x" value="1.0"></property>
+ <property name="jsdesktop" value="staticpos=false;fitheight=false"></property>
+ </fragment>
+
+
+ </fragment>
+</page-template>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm?rev=885673&r1=885672&r2=885673&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm Tue Dec 1 05:10:34 2009
@@ -309,7 +309,6 @@
style="float:${columnFloat}; width:${columnWidth};">

#foreach($f in $column)
- #if ($f.getName() != "j2-admin::JetspeedNavigator" && $f.getName() != "j2-admin::JetspeedToolbox")
## Set up coordinates for this fragment
#set($coords = $columnLayout.getCoordinate($f))
#set($col = $coords.x)
@@ -382,7 +381,6 @@
$f.renderedContent
#end
</div>
- #end
#end
</div>
#set ($columnIndex = $columnIndex + 1)

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java?rev=885673&r1=885672&r2=885673&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java Tue Dec 1 05:10:34 2009
@@ -103,13 +103,9 @@
aggregateAndRender(child, context, page);
}
}
- }
-
- // ** DST: DEMO: Hack
- if (!"j2-admin::JetspeedNavigator".equals(f.getName()) && !"j2-admin::JetspeedToolbox".equals(f.getName()))
- {
+ }
+ if (!f.isLocked()) // FIXME: this is still not the desired behavior, need to check if its docked
renderer.renderNow(f, context);
- }
}

}

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPageAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPageAction.java?rev=885673&r1=885672&r2=885673&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPageAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetPageAction.java Tue Dec 1 05:10:34 2009
@@ -32,11 +32,11 @@
import org.apache.jetspeed.decoration.Theme;
import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
import org.apache.jetspeed.om.page.BaseFragmentElement;
+import org.apache.jetspeed.om.page.ContentFragment;
+import org.apache.jetspeed.om.page.ContentPage;
import org.apache.jetspeed.om.page.Fragment;
import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.page.PageManager;
-import org.apache.jetspeed.page.PageNotFoundException;
-import org.apache.jetspeed.page.document.NodeException;
import org.apache.jetspeed.portalsite.PortalSiteRequestContext;
import org.apache.jetspeed.profiler.impl.ProfilerValveImpl;
import org.apache.jetspeed.request.RequestContext;
@@ -93,20 +93,16 @@
// Run the Decoration valve to get actions
decorationValve.invoke( requestContext, null );

- Page page = requestContext.getPage().getPage();
+ ContentPage page = requestContext.getPage();
String pageName = getActionParameter( requestContext, PAGE );
- if ( pageName != null )
- {
- page = retrievePage( requestContext, pageName );
- }
+// if ( pageName != null )
+// {
+// page = retrievePage( requestContext, pageName );
+// }
if (page == null)
{
throw new AJAXException("Missing current page or '" + PAGE + "' parameter");
- }
-
- // ** DST: DEMO: Hack
- insertNavigator(page);
-
+ }
resultMap.put( STATUS, status );
resultMap.put( PAGE, page );

@@ -133,7 +129,7 @@

String profiledPath = siteRequestContext.getPage().getPath();
resultMap.put( PROFILED_PATH, profiledPath );
- putSecurityInformation( resultMap, page );
+ putSecurityInformation( resultMap, page.getPage() ); //TODO: REVIEW: RANDY

PageActionAccess pageActionAccess = (PageActionAccess)requestContext.getAttribute( PortalReservedParameters.PAGE_EDIT_ACCESS_ATTRIBUTE );
Boolean userIsAnonymous = Boolean.TRUE;
@@ -170,43 +166,43 @@
String singleLayoutId = getActionParameter( requestContext, LAYOUTID );
if ( singleLayoutId != null )
{ // build page representation with single layout
- BaseFragmentElement singleLayoutFragment = page.getFragmentById( singleLayoutId );
- if ( ! ( singleLayoutFragment instanceof Fragment) )
- {
- throw new Exception( "layout id not found: " + singleLayoutId );
- }
- Fragment currentLayoutFragment = (Fragment) singleLayoutFragment;
- Fragment currentPortletFragment = null;
-
- String singlePortletId = getActionParameter( requestContext, PORTLETENTITY );
- if ( singlePortletId != null )
- {
- Iterator layoutChildIter = currentLayoutFragment.getFragments().iterator();
- while ( layoutChildIter.hasNext() )
- {
- Fragment childFrag = (Fragment)layoutChildIter.next();
- if ( childFrag != null )
- {
- if ( singlePortletId.equals( childFrag.getId() ) )
- {
- currentPortletFragment = childFrag;
- break;
- }
- }
- }
- if ( currentPortletFragment == null )
- {
- throw new Exception( "portlet id " + singlePortletId + " not found in layout " + singleLayoutId );
- }
- resultMap.put( "portletsingleId", currentPortletFragment.getId() );
- }
-
- retrieveFragmentSpecialProperties( requestContext, currentLayoutFragment, fragSizes, portletIcons );
- resultMap.put( "layoutsingle", currentLayoutFragment );
+// BaseFragmentElement singleLayoutFragment = page.getPage().getFragmentById( singleLayoutId ); //TODO: REVIEW: RANDY
+// if ( ! ( singleLayoutFragment instanceof ContentFragment) )
+// {
+// throw new Exception( "layout id not found: " + singleLayoutId );
+// }
+// ContentFragment currentLayoutFragment = singleLayoutFragment;
+// ContentFragment currentPortletFragment = null;
+//
+// String singlePortletId = getActionParameter( requestContext, PORTLETENTITY );
+// if ( singlePortletId != null )
+// {
+// Iterator layoutChildIter = currentLayoutFragment.getFragments().iterator();
+// while ( layoutChildIter.hasNext() )
+// {
+// Fragment childFrag = (Fragment)layoutChildIter.next();
+// if ( childFrag != null )
+// {
+// if ( singlePortletId.equals( childFrag.getId() ) )
+// {
+// currentPortletFragment = childFrag;
+// break;
+// }
+// }
+// }
+// if ( currentPortletFragment == null )
+// {
+// throw new Exception( "portlet id " + singlePortletId + " not found in layout " + singleLayoutId );
+// }
+// resultMap.put( "portletsingleId", currentPortletFragment.getId() );
+// }
+//
+// retrieveFragmentSpecialProperties( requestContext, currentLayoutFragment, fragSizes, portletIcons );
+// resultMap.put( "layoutsingle", currentLayoutFragment );
}
- else if (page.getRootFragment() instanceof Fragment)
+ else if (page.getRootFragment() instanceof ContentFragment)
{
- retrieveFragmentSpecialProperties( requestContext, (Fragment)page.getRootFragment(), fragSizes, portletIcons );
+ retrieveFragmentSpecialProperties( requestContext, page.getRootFragment(), fragSizes, portletIcons );
}
else
{
@@ -239,7 +235,7 @@
}

- protected void retrieveFragmentSpecialProperties( RequestContext requestContext, Fragment frag, Map fragSizes, Map portletIcons )
+ protected void retrieveFragmentSpecialProperties( RequestContext requestContext, ContentFragment frag, Map fragSizes, Map portletIcons )
{
if ( frag == null )
{
@@ -259,7 +255,7 @@
Iterator childFragIter = childFragments.iterator();
while ( childFragIter.hasNext() )
{
- Fragment childFrag = (Fragment)childFragIter.next();
+ ContentFragment childFrag = (ContentFragment)childFragIter.next();
retrieveFragmentSpecialProperties( requestContext, childFrag, fragSizes, portletIcons );
}
}
@@ -288,62 +284,5 @@
}
}

- private void insertNavigator(Page page)
- {
- Page nav;
- try
- {
- if (page.getRootFragment() instanceof Fragment)
- {
- Fragment root = (Fragment)page.getRootFragment();
- boolean found = findFragment(root);
- if (!found)
- {
- nav = this.pageManager.getPage("/_user/template/navigator.psml");
- if (nav.getRootFragment() instanceof Fragment)
- {
- List<Fragment> navFragments = ((Fragment)nav.getRootFragment()).getFragments();
- Fragment source1 = navFragments.get(0);
- root.getFragments().add(0, source1);
- Fragment source2 = navFragments.get(1);
- root.getFragments().add(1, source2);
- // save?
- }
- }
- }
- }
- catch (PageNotFoundException e)
- {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- catch (NodeException e)
- {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
- private boolean findFragment(Fragment f)
- {
- List<Fragment> fragments = f.getFragments();
-
- //if ("_jsNavigator-1001".equals(f.getId())) // BUG: won't work on db psml
- if ("j2-admin::JetspeedNavigator".equals(f.getName()) || "j2-admin::JetspeedToolbox".equals(f.getName()))
- {
- return true;
- }
-
- if (fragments != null && !fragments.isEmpty())
- {
- for (Fragment child : fragments)
- {
- boolean found = findFragment(child);
- if (found)
- return true;
- }
- }
- return false;
- }

}

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java?rev=885673&r1=885672&r2=885673&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java Tue Dec 1 05:10:34 2009
@@ -64,9 +64,20 @@
{
RequestDispatcher dispatcher = request.getRequest().getRequestDispatcher(layoutTemplate);
request.setAttribute("jetui", this);
+ ContentFragment rootFragment = request.getPage().getRootFragment();
+ if (rootFragment.isLocked())
+ {
+ for (ContentFragment f : (List<ContentFragment>)rootFragment.getFragments())
+ {
+ if (!f.isLocked() && f.getType().equals(ContentFragment.LAYOUT))
+ {
+ rootFragment = f;
+ break;
+ }
+ }
+ }
if (maximized == null)
{
- ContentFragment rootFragment = request.getPage().getRootFragment();
String jetspeedLayout = rootFragment.getName();
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// BOGUS: I would prefer to put all layout information directly in PSML, not in portlet.xml, right now its mixed
@@ -93,13 +104,13 @@
fragmentColumnSizes = "25%,25%,25%,25%";
}
String [] fragmentColumnSizesArray = fragmentColumnSizes.split("\\,");
- /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
ColumnLayout columnLayout = new ColumnLayout(numberOfColumns, layoutType, rootFragment.getFragments(), fragmentColumnSizesArray);
request.setAttribute("columnLayout", columnLayout);
}
else
{
- ColumnLayout columnLayout = new ColumnLayout(1, "maximized", request.getPage().getRootFragment().getFragments(), new String[] { "100%" });
+ ColumnLayout columnLayout = new ColumnLayout(1, "maximized", rootFragment.getFragments(), new String[] { "100%" });
request.setAttribute("columnLayout", columnLayout);
}
dispatcher.include(request.getRequest(), request.getResponse());

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties?rev=885673&r1=885672&r2=885673&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties Tue Dec 1 05:10:34 2009
@@ -363,3 +363,11 @@
# Registration default profiling rules assigned during registration or new user creation
# comma separated list
registration.rules.default =
+
+#-------------------------------------------------------------------------
+# J E T U I
+#-------------------------------------------------------------------------
+# client | server
+jetui.render.engine = server
+# xml | json
+jetui.ajax.transport = json

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/seed/j2-seed.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/seed/j2-seed.xml?rev=885673&r1=885672&r2=885673&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/seed/j2-seed.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/seed/j2-seed.xml Tue Dec 1 05:10:34 2009
@@ -316,11 +316,11 @@
<userinfo>
<preference>
<name value="user.name.given"/>
- <value value="Test Dude"/>
+ <value value="Portal"/>
</preference>
<preference>
<name value="user.name.family"/>
- <value value="Dudley"/>
+ <value value="Administrator"/>
</preference>
</userinfo>
<Rules/>
@@ -330,7 +330,16 @@
<roles>user,manager</roles>
<groups></groups>
<preferences/>
- <userinfo/>
+ <userinfo>
+ <preference>
+ <name value="user.name.given"/>
+ <value value="Site"/>
+ </preference>
+ <preference>
+ <name value="user.name.family"/>
+ <value value="Manager"/>
+ </preference>
+ </userinfo>
<Rules/>
</User>
<User name="user">
@@ -338,7 +347,16 @@
<roles>user</roles>
<groups>accounting</groups>
<preferences/>
- <userinfo/>
+ <userinfo>
+ <preference>
+ <name value="user.name.given"/>
+ <value value="Portal"/>
+ </preference>
+ <preference>
+ <name value="user.name.family"/>
+ <value value="User"/>
+ </preference>
+ </userinfo>
<Rules>
<Rule locator="menu" rule="role-group"/>
<Rule locator="page" rule="j2"/>
@@ -349,7 +367,16 @@
<roles>user</roles>
<groups>accounting</groups>
<preferences/>
- <userinfo/>
+ <userinfo>
+ <preference>
+ <name value="user.name.given"/>
+ <value value="Local"/>
+ </preference>
+ <preference>
+ <name value="user.name.family"/>
+ <value value="User"/>
+ </preference>
+ </userinfo>
<Rules>
<Rule locator="page" rule="localhost-fallback"/>
</Rules>
@@ -359,7 +386,16 @@
<roles>user</roles>
<groups>accounting</groups>
<preferences/>
- <userinfo/>
+ <userinfo>
+ <preference>
+ <name value="user.name.given"/>
+ <value value="Sublocal"/>
+ </preference>
+ <preference>
+ <name value="user.name.family"/>
+ <value value="User"/>
+ </preference>
+ </userinfo>
<Rules>
<Rule locator="page" rule="subsite-by-hostname"/>
</Rules>
@@ -369,7 +405,16 @@
<roles></roles>
<groups></groups>
<preferences/>
- <userinfo/>
+ <userinfo>
+ <preference>
+ <name value="user.name.given"/>
+ <value value="Tomcat"/>
+ </preference>
+ <preference>
+ <name value="user.name.family"/>
+ <value value="User"/>
+ </preference>
+ </userinfo>
<Rules/>
</User>
<User name="jetspeed">
@@ -377,7 +422,16 @@
<roles>manager</roles>
<groups>engineering</groups>
<preferences/>
- <userinfo/>
+ <userinfo>
+ <preference>
+ <name value="user.name.given"/>
+ <value value="Jetspeed"/>
+ </preference>
+ <preference>
+ <name value="user.name.family"/>
+ <value value="User"/>
+ </preference>
+ </userinfo>
<Rules>
<Rule locator="menu" rule="role-group"/>
<Rule locator="page" rule="role-fallback"/>
@@ -388,7 +442,16 @@
<roles>guest</roles>
<groups></groups>
<preferences/>
- <userinfo/>
+ <userinfo>
+ <preference>
+ <name value="user.name.given"/>
+ <value value=""/>
+ </preference>
+ <preference>
+ <name value="user.name.family"/>
+ <value value="Guest"/>
+ </preference>
+ </userinfo>
<Rules>
<Rule locator="page" rule="j2"/>
</Rules>

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@...
For additional commands, e-mail: jetspeed-dev-help@...

svn commit: r885484 - /portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp

2009-11-30T08:32:07Z

Author: woonsan
Date: Mon Nov 30 16:32:07 2009
New Revision: 885484

URL: http://svn.apache.org/viewvc?rev=885484&view=rev
Log:
JS2-1057: Not to refresh when the selected category is the same one as before.
Also, set the default category to "News".

Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=885484&r1=885483&r2=885484&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp Mon Nov 30 16:32:07 2009
@@ -187,7 +187,7 @@
}
var categories = Y.Node.getDOMNode(Y.Node.one("#<portlet:namespace/>categories"));
for (var i = 0; i < categories.options.length; i++) {
- if (category == categories.options[i].value) {
+ if (category == categories.options[i].value && i != categories.selectedIndex) {
categories.options[i].selected = true;
loadPortletsInCategory(category);
break;

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@...
For additional commands, e-mail: jetspeed-dev-help@...

svn commit: r885475 - /portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp

2009-11-30T08:15:46Z

Author: woonsan
Date: Mon Nov 30 16:15:45 2009
New Revision: 885475

URL: http://svn.apache.org/viewvc?rev=885475&view=rev
Log:
JS2-1057: Makes it remember last-selected tab and category

Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=885475&r1=885474&r2=885475&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp Mon Nov 30 16:15:45 2009
@@ -50,7 +50,7 @@
</tr>
</table>

-<table id="<portlet:namespace/>portletsTab" style="border-collapse: collapse; width: 100%; margin-top: 0px; margin-bottom: 0px; float: left;">
+<table id="<portlet:namespace/>portletsTab" style="display: none; border-collapse: collapse; width: 100%; margin-top: 0px; margin-bottom: 0px; float: left;">
<form onsubmit="return false;">
<tr>
<th class="portlet-section-header" colspan="10">Portlets</th>
@@ -65,7 +65,7 @@
<tr>
<td class="portlet-section-subheader" colspan='10'>
<select id="<portlet:namespace/>categories">
- <option value="">All categories</option>
+ <option value="">Choose a category</option>
<c:forEach var="category" items="${categories}">
<option value="${category.name}">${category.name}</option>
</c:forEach>
@@ -75,7 +75,7 @@

<tr>
<td>
- <div id="<portlet:namespace/>portletItemsPanel" style="height: 400px; overflow: auto;"></div>
+ <div id="<portlet:namespace/>portletItemsPanel"></div>
</td>
</tr>

@@ -168,17 +168,36 @@
</table>

<script language="javascript">
-YUI(yuiConfig).use('io', 'dataschema-json', 'node-base', function(Y) {
+YUI().use('io', 'dataschema-json', 'node-base', 'cookie', function(Y) {

function switchTab(e) {
- var tabId = e.target.get("id");
+ var tabId = ('string' == typeof(e) ? e : e.target.get("id"));

Y.Node.one("#<portlet:namespace/>portletsTab").setStyle("display", (tabId == "<portlet:namespace/>portletsTabAction" ? "" : "none"));
Y.Node.one("#<portlet:namespace/>layoutsTab").setStyle("display", (tabId == "<portlet:namespace/>layoutsTabAction" ? "" : "none"));
Y.Node.one("#<portlet:namespace/>themesTab").setStyle("display", (tabId == "<portlet:namespace/>themesTabAction" ? "" : "none"));
Y.Node.one("#<portlet:namespace/>widgetsTab").setStyle("display", (tabId == "<portlet:namespace/>widgetsTabAction" ? "" : "none"));

- e.halt();
+ Y.Cookie.set("toolboxtab", tabId);
+
+ if (tabId == "<portlet:namespace/>portletsTabAction") {
+ var category = Y.Cookie.get("toolboxcat");
+ if (!category) {
+ category = "News";
+ }
+ var categories = Y.Node.getDOMNode(Y.Node.one("#<portlet:namespace/>categories"));
+ for (var i = 0; i < categories.options.length; i++) {
+ if (category == categories.options[i].value) {
+ categories.options[i].selected = true;
+ loadPortletsInCategory(category);
+ break;
+ }
+ }
+ }
+
+ if ('string' != typeof(e)) {
+ e.halt();
+ }
}

var onLoadPortletComplete = function(id, o, args) {
@@ -240,15 +259,19 @@
};

var loadPortletsInCategory = function(e) {
- var categories = Y.Node.getDOMNode(e.target);
- var category = categories.options[categories.selectedIndex].value;
- var uri = "${portalContextPath}/ajaxapi/?action=getportlets&format=json";
- if (category) {
- uri += "&filter=" + category;
+ var category = ('string' == typeof(e) ? e : null);
+ if (!category) {
+ var categories = Y.Node.getDOMNode(e.target);
+ category = categories.options[categories.selectedIndex].value;
}
+ if (!category) {
+ return;
+ }
+ Y.Cookie.set("toolboxcat", category);
+ var uri = "${portalContextPath}/ajaxapi/?action=getportlets&format=json";
+ uri += "&filter=" + category;
Y.on('io:complete', onLoadPortletComplete, this, []);
var request = Y.io(uri);
-
Y.Node.one("#<portlet:namespace/>query").set("value", "");
}

@@ -270,7 +293,12 @@
Y.on("click", switchTab, "#<portlet:namespace/>widgetsTabAction");
Y.on("change", loadPortletsInCategory, "#<portlet:namespace/>categories");
Y.on("click", loadPortletsByQuery, "#<portlet:namespace/>search");
+
+ var tabId = Y.Cookie.get("toolboxtab");
+ if (!tabId) {
+ tabId = "<portlet:namespace/>portletsTabAction";
+ }

- loadPortletsByQuery("");
+ switchTab(tabId);
});
</script>

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@...
For additional commands, e-mail: jetspeed-dev-help@...

Re: Apa-RSS

2009-11-30T05:50:31Z

Hi Gonzalo,

I'd like to inform you of commons-logging issue.
Because the current commons-logging is not proper for cross-context application environment like portal, we removed commons-logging dependencies in jetspeed-2 and apa projects.
Please see https://issues.apache.org/jira/browse/JS2-972 for details.
It is recommended to use slf4j instead.

Kind regards,

Woonsan

>
>From: Gonzalo Aguilar Delgado <gaguilar@...>
>To: David Sean Taylor <d.taylor@...>
>Cc: woonsan@...; Jetspeed Developers List <jetspeed-dev@...>
>Sent: Fri, November 27, 2009 7:54:08 PM
>Subject: Apa-RSS
>
> >
>
>
>
>
>Hi there,
>
>>I made some changes to the apa-rss project.
>
>>Normally it escapes all the rss feed. For some feeds this is not a good solution as html code will be shown.
>>I added a parameter to the portlet to handle this.
>
>>Also, I added preliminary Junit support. For now it just test that transformation is done without errors.
>
>>pom.xml modifications went with the patch. I added junit dependency and commons-logging.
>
>
>>Thank you.
>
>
>

Apa-RSS

2009-11-27T10:54:08Z

Hi there,

I made some changes to the apa-rss project.

Normally it escapes all the rss feed. For some feeds this is not a good solution as html code will be shown.
I added a parameter to the portlet to handle this.

Also, I added preliminary Junit support. For now it just test that transformation is done without errors.

pom.xml modifications went with the patch. I added junit dependency and commons-logging.

Thank you.

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@...
For additional commands, e-mail: jetspeed-dev-help@...

apa-rss-add-html-support-20091127.patch.gz (6K) Download Attachment

Re: Other toolkits

2009-11-27T10:49:22Z

Hi David,

> Double work, double bugs, and then when you decide to go off and do
> something else when you get bored with this project, double
> maintenance for me. And not only a zero feature gain, but a negative
> feature gain since the work you could be doing on features (developed
> in collaboration between all developers) is instead "wasted" (I say
> wasted from the team POV) on duplicating everything. We are a small
> team.
>
> Sorry, thats just my POV, and maybe some fear from getting burnt in
> the past by people who are gung-ho one day, and disappear the next. I
> try to put the project quality first.

Yes. I know that point and that's true. It's better to be cautious. This
is why I will go slow
with this point. Apache is a meritocracy so I have to slowly grow up as
a apache developer.

No prob. I have lot's of things to do and it's not my first objective
also. But don't want to
close doors...

> > But can at least leave door open for other AJAX toolkits?
> >
> Point taken. What I will do is investigate introducing a Jetspeed
> Javascript API layer, so all high level Javascript operations are
> programmed against a higher level Javascript API, minimizing
> dependencies on one Javascript library. If we are going to put in this
> layer, we need to closely consider the costs/benefits. The costs to
> consider are flexibility, bugs introduced by layering and delegating
> everything, introducing yet another programming api, and feature work
> not being implemented due to time spent writing layer and delegate
> code -- all against the benefits, which you should talk more about...

I found that it should be not much work for now. I think current work
done with the new ui
is well established and can be used with other toolkits... Don't waste
too much time on this
but just think about it.

Also, maybe there are other ways to do it... Don't know.

> I should point out that the AJAX Customizations API is callable from
> any Javascript library. So you are free to implement your own client
> side code from that POV

Maybe I mix things but what I'm talking about is about replacing
clientside code with anything else.

> Lets discuss it more. Now that I am beginning to learn about your what
> you want to do, there are a few coordination improvements we need to
> make:

Sure... Let's take time and do it well...

>
> 1. I have an in-progress issue I am actively working on. https://issues.apache.org/jira/browse/JS2-1084)
> . I would like the opportunity to contribute too, with your approval
> of course...

I will finish some things I have pending with Woonsan and the will go
with this...

> 2. Your patches are going to be out of date. I am working and
> committing as I go on a documented JIRA issue. If you want to work on
> any part of this issue, you need to work closer with me and we can
> decide who works on what so we don't have conflicts and so that we can
> coordinate and collaborate on the work. I would very much like to
> collaborate with you on this work, please do not misinterpret my
> caution to jump on the 'layering API approach' before analyzing the
> costs/benefits as something else.

Let me take a look closer on how things works, then we can take time to
plan... If it has
any benefits...

Thank you for considering...

Re: Other toolkits

2009-11-27T10:24:33Z

Gonzalo, here is an initiative that may interest you in respect to
your need to use other toolkits:

http://www.openajax.org/member/wiki/OpenAjax_Hub_2.0_Specification_Introduction

I personally cannot commit any time, as I am already committed to
working on JS2-1084

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@...
For additional commands, e-mail: jetspeed-dev-help@...

svn commit: r884933 - in /portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest: PortletRegistryService.java util/ util/PaginationUtils.java util/SearchEngineUtils.java

2009-11-27T10:09:58Z

Author: woonsan
Date: Fri Nov 27 18:09:57 2009
New Revision: 884933

URL: http://svn.apache.org/viewvc?rev=884933&view=rev
Log:
JS2-1087: Adding query parameter and pagination params.
The following query parameters can be used:
"query": query string parameter (optional)
"begin": begin index for pagination (optional)
"max": max item count for pagination (optional)

So, for example,

(1) GET all PA infos with query:
http://localhost:8080/jetspeed/services/portletregistry/application/?_type=json&query=demo&begin=0&max=2
(2) GET demo PA info:
http://localhost:8080/jetspeed/services/portletregistry/application/demo/?_type=json&query=demo&begin=0&max=2
(3) GET all PD infos:
http://localhost:8080/jetspeed/services/portletregistry/definition/?_type=json&query=demo&begin=0&max=2
(4) GET all PD infos of demo PA:
http://localhost:8080/jetspeed/services/portletregistry/definition/demo/?_type=json&query=demo&begin=0&max=2
(5) GET demo::PickANumberPortlet PD info:
http://localhost:8080/jetspeed/services/portletregistry/definition/demo/PickANumberPortlet/?_type=json&query=demo&begin=0&max=2

TODO:
- I think that a new search index field for portlet application name needs to be added.
- Also, "type" search index field can be either "portlet" or "portlet_application". However, the former should be renamed to something like "portlet_definition" because search by "type: portlet" index field will search portlet applications too.

Added:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/util/
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/util/PaginationUtils.java (with props)
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/util/SearchEngineUtils.java (with props)
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java?rev=884933&r1=884932&r2=884933&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java Fri Nov 27 18:09:57 2009
@@ -17,6 +17,7 @@
package org.apache.jetspeed.services.rest;

import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;

import javax.servlet.ServletConfig;
@@ -25,19 +26,26 @@
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
+import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.PathSegment;
import javax.ws.rs.core.UriInfo;

import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.om.portlet.PortletApplication;
import org.apache.jetspeed.om.portlet.PortletDefinition;
+import org.apache.jetspeed.search.ParsedObject;
+import org.apache.jetspeed.search.SearchEngine;
+import org.apache.jetspeed.search.SearchResults;
import org.apache.jetspeed.services.beans.PortletApplicationBean;
import org.apache.jetspeed.services.beans.PortletApplicationBeans;
import org.apache.jetspeed.services.beans.PortletDefinitionBean;
import org.apache.jetspeed.services.beans.PortletDefinitionBeans;
+import org.apache.jetspeed.services.rest.util.PaginationUtils;
+import org.apache.jetspeed.services.rest.util.SearchEngineUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@@ -67,14 +75,20 @@

private PortletRegistry portletRegistry;

+ private SearchEngine searchEngine;
+
public PortletRegistryService()
{
portletRegistry = (PortletRegistry) Jetspeed.getComponentManager().getComponent(PortletRegistry.class);
+ searchEngine = (SearchEngine) Jetspeed.getComponentManager().getComponent(SearchEngine.class);
}

@GET
@Path("/application/{path:.*}")
- public PortletApplicationBeans getPortletApplication(@PathParam("path") List<PathSegment> pathSegments)
+ public PortletApplicationBeans getPortletApplication(@PathParam("path") List<PathSegment> pathSegments,
+ @QueryParam("query") String queryParam,
+ @QueryParam("begin") String beginIndexParam,
+ @QueryParam("max") String maxResultsParam)
{
String applicationName = null;

@@ -83,23 +97,52 @@
applicationName = pathSegments.get(0).getPath();
}

+ int beginIndex = NumberUtils.toInt(beginIndexParam, -1);
+ int maxResults = NumberUtils.toInt(maxResultsParam, -1);
+
PortletApplicationBeans paBeans = new PortletApplicationBeans();
List<PortletApplicationBean> paBeanList = new ArrayList<PortletApplicationBean>();

- if (StringUtils.isBlank(applicationName))
+ if (!StringUtils.isBlank(queryParam))
{
- for (PortletApplication pa : portletRegistry.getPortletApplications())
+ String queryText = ParsedObject.FIELDNAME_TYPE + ":\"" + ParsedObject.OBJECT_TYPE_PORTLET_APPLICATION + "\" AND " + queryParam;
+ SearchResults searchResults = searchEngine.search(queryText);
+ List<ParsedObject> searchResultList = searchResults.getResults();
+
+ for (ParsedObject parsedObject : (List<ParsedObject>) PaginationUtils.subList(searchResultList, beginIndex, maxResults))
{
- paBeanList.add(new PortletApplicationBean(pa));
+ String appName = SearchEngineUtils.getFieldAsString(parsedObject, "ID", null);
+
+ if (StringUtils.isBlank(appName))
+ {
+ continue;
+ }
+
+ PortletApplication pa = portletRegistry.getPortletApplication(appName);
+
+ if (pa != null)
+ {
+ paBeanList.add(new PortletApplicationBean(pa));
+ }
}
}
else
{
- PortletApplication pa = portletRegistry.getPortletApplication(applicationName, true);
-
- if (pa != null)
+ if (StringUtils.isBlank(applicationName))
{
- paBeanList.add(new PortletApplicationBean(pa));
+ for (PortletApplication pa : (Collection<PortletApplication>) PaginationUtils.subCollection(portletRegistry.getPortletApplications(), beginIndex, maxResults))
+ {
+ paBeanList.add(new PortletApplicationBean(pa));
+ }
+ }
+ else
+ {
+ PortletApplication pa = portletRegistry.getPortletApplication(applicationName, true);
+
+ if (pa != null)
+ {
+ paBeanList.add(new PortletApplicationBean(pa));
+ }
}
}

@@ -109,7 +152,10 @@

@GET
@Path("/definition/{path:.*}")
- public PortletDefinitionBeans getPortletDefinition(@PathParam("path") List<PathSegment> pathSegments)
+ public PortletDefinitionBeans getPortletDefinition(@PathParam("path") List<PathSegment> pathSegments,
+ @QueryParam("query") String queryParam,
+ @QueryParam("begin") String beginIndexParam,
+ @QueryParam("max") String maxResultsParam)
{
String applicationName = null;
String definitionName = null;
@@ -127,39 +173,71 @@
}
}

+ int beginIndex = NumberUtils.toInt(beginIndexParam, -1);
+ int maxResults = NumberUtils.toInt(maxResultsParam, -1);
+
PortletDefinitionBeans pdBeans = new PortletDefinitionBeans();
List<PortletDefinitionBean> pdBeanList = new ArrayList<PortletDefinitionBean>();

- if (StringUtils.isBlank(applicationName) && StringUtils.isBlank(definitionName))
+ if (!StringUtils.isBlank(queryParam))
{
- for (PortletDefinition pd : portletRegistry.getAllPortletDefinitions())
+ String queryText =
+ ParsedObject.FIELDNAME_TYPE + ":\"" + ParsedObject.OBJECT_TYPE_PORTLET + "\" " +
+ "AND NOT " + ParsedObject.FIELDNAME_TYPE + ":\"" + ParsedObject.OBJECT_TYPE_PORTLET_APPLICATION + "\" " +
+ "AND " + queryParam;
+ SearchResults searchResults = searchEngine.search(queryText);
+ List<ParsedObject> searchResultList = searchResults.getResults();
+
+ for (ParsedObject parsedObject : (List<ParsedObject>) PaginationUtils.subList(searchResultList, beginIndex, maxResults))
{
- pdBeanList.add(new PortletDefinitionBean(pd));
+ String uniqueName = SearchEngineUtils.getPortletUniqueName(parsedObject);
+
+ if (StringUtils.isBlank(uniqueName))
+ {
+ continue;
+ }
+
+ PortletDefinition pd = portletRegistry.getPortletDefinitionByUniqueName(uniqueName);
+
+ if (pd != null)
+ {
+ pdBeanList.add(new PortletDefinitionBean(pd));
+ }
}
}
else
{
- PortletApplication pa = portletRegistry.getPortletApplication(applicationName, true);
-
- if (pa != null)
+ if (StringUtils.isBlank(applicationName) && StringUtils.isBlank(definitionName))
{
- if (StringUtils.isBlank(definitionName))
+ for (PortletDefinition pd : (Collection<PortletDefinition>) PaginationUtils.subCollection(portletRegistry.getAllPortletDefinitions(), beginIndex, maxResults))
{
- if (pa != null)
+ pdBeanList.add(new PortletDefinitionBean(pd));
+ }
+ }
+ else
+ {
+ PortletApplication pa = portletRegistry.getPortletApplication(applicationName, true);
+
+ if (pa != null)
+ {
+ if (StringUtils.isBlank(definitionName))
{
- for (PortletDefinition pd : pa.getPortlets())
+ if (pa != null)
{
- pdBeanList.add(new PortletDefinitionBean(pd));
+ for (PortletDefinition pd : (List<PortletDefinition>) PaginationUtils.subList(pa.getPortlets(), beginIndex, maxResults))
+ {
+ pdBeanList.add(new PortletDefinitionBean(pd));
+ }
}
}
- }
- else
- {
- PortletDefinition pd = pa.getPortlet(definitionName);
-
- if (pd != null)
+ else
{
- pdBeanList.add(new PortletDefinitionBean(pd));
+ PortletDefinition pd = pa.getPortlet(definitionName);
+
+ if (pd != null)
+ {
+ pdBeanList.add(new PortletDefinitionBean(pd));
+ }
}
}
}

Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/util/PaginationUtils.java
URL: 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=884933&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/util/PaginationUtils.java (added)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/util/PaginationUtils.java Fri Nov 27 18:09:57 2009
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.services.rest.util;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * PaginationUtils
+ *
+ * @version $Id$
+ */
+public class PaginationUtils
+{
+
+ private PaginationUtils()
+ {
+
+ }
+
+ public static List<? extends Object> subList(final List<? extends Object> list, int beginIndex, int maxResults)
+ {
+ if (beginIndex < 0 || (beginIndex == 0 && maxResults < 0))
+ {
+ return list;
+ }
+ else if (beginIndex >= list.size())
+ {
+ return Collections.emptyList();
+ }
+ else
+ {
+ if (maxResults < 0)
+ {
+ return list.subList(beginIndex, list.size());
+ }
+ else
+ {
+ return list.subList(beginIndex, Math.min(list.size(), beginIndex + maxResults));
+ }
+ }
+ }
+
+ public static Collection<? extends Object> subCollection(final Collection<? extends Object> collection, int beginIndex, int maxResults)
+ {
+ if (beginIndex < 0 || (beginIndex == 0 && maxResults < 0))
+ {
+ return collection;
+ }
+ else if (beginIndex >= collection.size())
+ {
+ return Collections.emptyList();
+ }
+ else
+ {
+ List<Object> list = null;
+
+ if (collection instanceof List)
+ {
+ list = (List<Object>) collection;
+ }
+ else
+ {
+ list = new ArrayList<Object>(collection);
+ }
+
+ if (maxResults < 0)
+ {
+ return list.subList(beginIndex, list.size());
+ }
+ else
+ {
+ return list.subList(beginIndex, Math.min(list.size(), beginIndex + maxResults));
+ }
+ }
+ }
+
+}

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/util/PaginationUtils.java
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/util/PaginationUtils.java
------------------------------------------------------------------------------
svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/util/PaginationUtils.java
------------------------------------------------------------------------------
svn:mime-type = text/plain

Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/util/SearchEngineUtils.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/util/SearchEngineUtils.java?rev=884933&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/util/SearchEngineUtils.java (added)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/util/SearchEngineUtils.java Fri Nov 27 18:09:57 2009
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.services.rest.util;
+
+import java.util.Collection;
+import java.util.Map;
+
+import org.apache.jetspeed.search.ParsedObject;
+
+/**
+ * SearchEngineUtils
+ *
+ * @version $Id$
+ */
+public class SearchEngineUtils
+{
+
+ private SearchEngineUtils()
+ {
+
+ }
+
+ public static Object getField(final ParsedObject parsedObject, final String fieldName, final Object defaultValue)
+ {
+ Map fields = parsedObject.getFields();
+
+ if (fields == null)
+ {
+ return null;
+ }
+
+ Object field = fields.get(fieldName);
+
+ if (field == null)
+ {
+ return defaultValue;
+ }
+
+ return field;
+ }
+
+ public static String getFieldAsString(final ParsedObject parsedObject, final String fieldName, final String defaultValue)
+ {
+ Object field = getField(parsedObject, fieldName, defaultValue);
+
+ if (field instanceof Collection)
+ {
+ return (String) ((Collection) field).iterator().next();
+ }
+ else
+ {
+ return (String) field;
+ }
+ }
+
+ public static String getPortletUniqueName(final ParsedObject parsedObject)
+ {
+ if (!"portlet".equals(parsedObject.getType()))
+ {
+ return null;
+ }
+
+ String portletName = getFieldAsString(parsedObject, "ID", null);
+
+ if (portletName == null)
+ {
+ return null;
+ }
+
+ String applicationName = getFieldAsString(parsedObject, "portlet_application", null);
+
+ if (applicationName == null)
+ {
+ return null;
+ }
+
+ return applicationName + "::" + portletName;
+ }
+}

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/util/SearchEngineUtils.java
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/util/SearchEngineUtils.java
------------------------------------------------------------------------------
svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/util/SearchEngineUtils.java
------------------------------------------------------------------------------
svn:mime-type = text/plain

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@...
For additional commands, e-mail: jetspeed-dev-help@...

Re: Other toolkits

2009-11-27T09:14:02Z

On Nov 27, 2009, at 5:14 AM, Gonzalo Aguilar Delgado wrote:

> First of all... I know that this proposition doubles work...
>

Double work, double bugs, and then when you decide to go off and do
something else when you get bored with this project, double
maintenance for me. And not only a zero feature gain, but a negative
feature gain since the work you could be doing on features (developed
in collaboration between all developers) is instead "wasted" (I say
wasted from the team POV) on duplicating everything. We are a small
team.

Sorry, thats just my POV, and maybe some fear from getting burnt in
the past by people who are gung-ho one day, and disappear the next. I
try to put the project quality first.

> But can at least leave door open for other AJAX toolkits?
>
Point taken. What I will do is investigate introducing a Jetspeed
Javascript API layer, so all high level Javascript operations are
programmed against a higher level Javascript API, minimizing
dependencies on one Javascript library. If we are going to put in this
layer, we need to closely consider the costs/benefits. The costs to
consider are flexibility, bugs introduced by layering and delegating
everything, introducing yet another programming api, and feature work
not being implemented due to time spent writing layer and delegate
code -- all against the benefits, which you should talk more about...

> I mean, it would be nice if ajax implementation doesn't rely on only
> one
> toolkit or implementation. So others can implement their own.
>

I should point out that the AJAX Customizations API is callable from
any Javascript library. So you are free to implement your own client
side code from that POV

> Maybe I can propone patches to leave door open to other toolkits and
> make
> jetspeed interface generic...
>
Lets discuss it more. Now that I am beginning to learn about your what
you want to do, there are a few coordination improvements we need to
make:

1. I have an in-progress issue I am actively working on. https://issues.apache.org/jira/browse/JS2-1084)
. I would like the opportunity to contribute too, with your approval
of course...

2. Your patches are going to be out of date. I am working and
committing as I go on a documented JIRA issue. If you want to work on
any part of this issue, you need to work closer with me and we can
decide who works on what so we don't have conflicts and so that we can
coordinate and collaborate on the work. I would very much like to
collaborate with you on this work, please do not misinterpret my
caution to jump on the 'layering API approach' before analyzing the
costs/benefits as something else.

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@...
For additional commands, e-mail: jetspeed-dev-help@...

svn commit: r884883 - in /portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services: beans/ rest/

2009-11-27T06:17:57Z

Author: woonsan
Date: Fri Nov 27 14:17:56 2009
New Revision: 884883

URL: http://svn.apache.org/viewvc?rev=884883&view=rev
Log:
JS2-1087: Removing '%20' path parameter
Following urls with json marshaling are available.
(You can use '?_type=xml' instead for xml marshaling. If you don't specify this parameter, then the ACCEPT http header is used to decide the best marshaling type.)
Also, replace the '::' separated portlet unique name by path segments separated by slash.

(1) GET all PA infos:
http://localhost:8080/jetspeed/services/portletregistry/application/?_type=json
(2) GET demo PA info:
http://localhost:8080/jetspeed/services/portletregistry/application/demo/?_type=json
(3) GET all PD infos:
http://localhost:8080/jetspeed/services/portletregistry/definition/?_type=json
(4) GET all PD infos of demo PA:
http://localhost:8080/jetspeed/services/portletregistry/definition/demo/?_type=json
(5) GET demo::PickANumberPortlet PD info:
http://localhost:8080/jetspeed/services/portletregistry/definition/demo/PickANumberPortlet/?_type=json

TODO: support search query.

Added:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/ContainerRuntimeOptionBean.java (with props)
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/GenericMetadataBean.java (with props)
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/LocalizedFieldBean.java (with props)
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DescriptionBean.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DisplayNameBean.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBean.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java

Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/ContainerRuntimeOptionBean.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/ContainerRuntimeOptionBean.java?rev=884883&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/ContainerRuntimeOptionBean.java (added)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/ContainerRuntimeOptionBean.java Fri Nov 27 14:17:56 2009
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.services.beans;
+
+import java.io.Serializable;
+import java.util.Collection;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.apache.jetspeed.om.portlet.ContainerRuntimeOption;
+
+/**
+ * ContainerRuntimeOptionBean
+ *
+ * @version $Id$
+ */
+@XmlRootElement(name="containerRuntimeOption")
+public class ContainerRuntimeOptionBean implements Serializable
+{
+ private static final long serialVersionUID = 1L;
+
+ private String name;
+ private Collection<String> values;
+
+ public ContainerRuntimeOptionBean()
+ {
+
+ }
+
+ public ContainerRuntimeOptionBean(final ContainerRuntimeOption containerRuntimeOption)
+ {
+ name = containerRuntimeOption.getName();
+ values = containerRuntimeOption.getValues();
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ @XmlElementWrapper(name="values")
+ @XmlElements(@XmlElement(name="value"))
+ public Collection<String> getValues()
+ {
+ return values;
+ }
+
+ public void setValues(Collection<String> values)
+ {
+ this.values = values;
+ }
+
+}

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/ContainerRuntimeOptionBean.java
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/ContainerRuntimeOptionBean.java
------------------------------------------------------------------------------
svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/ContainerRuntimeOptionBean.java
------------------------------------------------------------------------------
svn:mime-type = text/plain

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DescriptionBean.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DescriptionBean.java?rev=884883&r1=884882&r2=884883&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DescriptionBean.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DescriptionBean.java Fri Nov 27 14:17:56 2009
@@ -33,7 +33,7 @@
{
private static final long serialVersionUID = 1L;

- private String description;
+ private String value;
private String lang;
private String localeString;

@@ -44,7 +44,7 @@

public DescriptionBean(final Description description)
{
- this.description = description.getDescription();
+ this.value = description.getDescription();
lang = description.getLang();

Locale locale = description.getLocale();
@@ -55,14 +55,14 @@
}
}

- public String getDescription()
+ public String getValue()
{
- return description;
+ return value;
}

- public void setDescription(String description)
+ public void setValue(String value)
{
- this.description = description;
+ this.value = value;
}

public String getLang()

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DisplayNameBean.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DisplayNameBean.java?rev=884883&r1=884882&r2=884883&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DisplayNameBean.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DisplayNameBean.java Fri Nov 27 14:17:56 2009
@@ -33,7 +33,7 @@
{
private static final long serialVersionUID = 1L;

- private String displayName;
+ private String value;
private String lang;
private String localeString;

@@ -44,7 +44,7 @@

public DisplayNameBean(final DisplayName displayName)
{
- this.displayName = displayName.getDisplayName();
+ this.value = displayName.getDisplayName();
lang = displayName.getLang();

Locale locale = displayName.getLocale();
@@ -55,14 +55,14 @@
}
}

- public String getDisplayName()
+ public String getValue()
{
- return displayName;
+ return value;
}

- public void setDisplayName(String displayName)
+ public void setValue(String value)
{
- this.displayName = displayName;
+ this.value = value;
}

public String getLang()

Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/GenericMetadataBean.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/GenericMetadataBean.java?rev=884883&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/GenericMetadataBean.java (added)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/GenericMetadataBean.java Fri Nov 27 14:17:56 2009
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.services.beans;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.apache.jetspeed.om.portlet.GenericMetadata;
+import org.apache.jetspeed.om.portlet.LocalizedField;
+
+/**
+ * GenericMetadataBean
+ *
+ * @version $Id$
+ */
+@XmlRootElement(name="metadata")
+public class GenericMetadataBean implements Serializable
+{
+ private static final long serialVersionUID = 1L;
+
+ private Collection<LocalizedFieldBean> localizedFieldBeans;
+
+ public GenericMetadataBean()
+ {
+
+ }
+
+ public GenericMetadataBean(final GenericMetadata metadata)
+ {
+ List<LocalizedFieldBean> localizedFieldBeanList = new ArrayList<LocalizedFieldBean>();
+
+ for (LocalizedField field : metadata.getFields())
+ {
+ localizedFieldBeanList.add(new LocalizedFieldBean(field));
+ }
+
+ localizedFieldBeans = localizedFieldBeanList;
+ }
+
+ @XmlElementWrapper(name="fields")
+ @XmlElements(@XmlElement(name="field"))
+ public Collection<LocalizedFieldBean> getLocalizedFieldBeans()
+ {
+ return localizedFieldBeans;
+ }
+
+ public void setLocalizedFieldBeans(Collection<LocalizedFieldBean> localizedFieldBeans)
+ {
+ this.localizedFieldBeans = localizedFieldBeans;
+ }
+
+}

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/GenericMetadataBean.java
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/GenericMetadataBean.java
------------------------------------------------------------------------------
svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/GenericMetadataBean.java
------------------------------------------------------------------------------
svn:mime-type = text/plain

Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/LocalizedFieldBean.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/LocalizedFieldBean.java?rev=884883&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/LocalizedFieldBean.java (added)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/LocalizedFieldBean.java Fri Nov 27 14:17:56 2009
@@ -0,0 +1,88 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.services.beans;
+
+import java.io.Serializable;
+import java.util.Locale;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.apache.jetspeed.om.portlet.LocalizedField;
+
+/**
+ * LocalizedFieldBean
+ *
+ * @version $Id$
+ */
+@XmlRootElement(name="field")
+public class LocalizedFieldBean implements Serializable
+{
+ private static final long serialVersionUID = 1L;
+
+ private String name;
+ private String value;
+ private String localeString;
+
+ public LocalizedFieldBean()
+ {
+
+ }
+
+ public LocalizedFieldBean(final LocalizedField localizedField)
+ {
+ name = localizedField.getName();
+ value = localizedField.getValue();
+
+ Locale locale = localizedField.getLocale();
+
+ if (locale != null)
+ {
+ localeString = locale.toString();
+ }
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ public String getValue()
+ {
+ return value;
+ }
+
+ public void setValue(String value)
+ {
+ this.value = value;
+ }
+
+ public String getLocaleString()
+ {
+ return localeString;
+ }
+
+ public void setLocaleString(String localeString)
+ {
+ this.localeString = localeString;
+ }
+
+}

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/LocalizedFieldBean.java
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/LocalizedFieldBean.java
------------------------------------------------------------------------------
svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/LocalizedFieldBean.java
------------------------------------------------------------------------------
svn:mime-type = text/plain

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBean.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBean.java?rev=884883&r1=884882&r2=884883&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBean.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBean.java Fri Nov 27 14:17:56 2009
@@ -25,6 +25,7 @@
import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlRootElement;

+import org.apache.jetspeed.om.portlet.ContainerRuntimeOption;
import org.apache.jetspeed.om.portlet.Description;
import org.apache.jetspeed.om.portlet.DisplayName;
import org.apache.jetspeed.om.portlet.PortletApplication;
@@ -41,12 +42,15 @@

private String name;
private String contextPath;
+ private String localContextPath;
private String defaultNamespace;
private int applicationType;
private long checksum;
private long revision;
private Collection<DisplayNameBean> displayNameBeans;
private Collection<DescriptionBean> descriptionBeans;
+ private GenericMetadataBean metadataBean;
+ private Collection<ContainerRuntimeOptionBean> containerRuntimeOptionBeans;

public PortletApplicationBean()
{
@@ -57,6 +61,7 @@
{
name = portletApplication.getName();
contextPath = portletApplication.getContextPath();
+ localContextPath = portletApplication.getLocalContextPath();
defaultNamespace = portletApplication.getDefaultNamespace();
applicationType = portletApplication.getApplicationType();
checksum = portletApplication.getChecksum();
@@ -75,6 +80,15 @@
descriptionBeanList.add(new DescriptionBean(description));
}
descriptionBeans = descriptionBeanList;
+
+ metadataBean = new GenericMetadataBean(portletApplication.getMetadata());
+
+ ArrayList<ContainerRuntimeOptionBean> containerRuntimeOptionBeanList = new ArrayList<ContainerRuntimeOptionBean>();
+ for (ContainerRuntimeOption containerRuntimeOption : portletApplication.getContainerRuntimeOptions())
+ {
+ containerRuntimeOptionBeanList.add(new ContainerRuntimeOptionBean(containerRuntimeOption));
+ }
+ containerRuntimeOptionBeans = containerRuntimeOptionBeanList;
}

public String getName()
@@ -97,6 +111,16 @@
this.contextPath = contextPath;
}

+ public String getLocalContextPath()
+ {
+ return localContextPath;
+ }
+
+ public void setLocalContextPath(String localContextPath)
+ {
+ this.localContextPath = localContextPath;
+ }
+
public String getDefaultNamespace()
{
return defaultNamespace;
@@ -161,4 +185,26 @@
this.descriptionBeans = descriptionBeans;
}

+ @XmlElement(name="metadata")
+ public GenericMetadataBean getMetadataBean()
+ {
+ return metadataBean;
+ }
+
+ public void setMetadataBean(GenericMetadataBean metadataBean)
+ {
+ this.metadataBean = metadataBean;
+ }
+
+ @XmlElementWrapper(name="containerRuntimeOptions")
+ @XmlElements(@XmlElement(name="containerRuntimeOption"))
+ public Collection<ContainerRuntimeOptionBean> getContainerRuntimeOptionBeans()
+ {
+ return containerRuntimeOptionBeans;
+ }
+
+ public void setContainerRuntimeOptionBeans(Collection<ContainerRuntimeOptionBean> containerRuntimeOptionBeans)
+ {
+ this.containerRuntimeOptionBeans = containerRuntimeOptionBeans;
+ }
}

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java?rev=884883&r1=884882&r2=884883&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java Fri Nov 27 14:17:56 2009
@@ -25,6 +25,7 @@
import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlRootElement;

+import org.apache.jetspeed.om.portlet.ContainerRuntimeOption;
import org.apache.jetspeed.om.portlet.Description;
import org.apache.jetspeed.om.portlet.DisplayName;
import org.apache.jetspeed.om.portlet.Language;
@@ -43,11 +44,14 @@

private String applicationName;
private String portletName;
+ private String uniqueName;
private PortletInfoBean portletInfoBean;
private Collection<DisplayNameBean> displayNameBeans;
private Collection<DescriptionBean> descriptionBeans;
private Collection<SupportsBean> supportsBeans;
private Collection<LanguageBean> languageBeans;
+ private GenericMetadataBean metadataBean;
+ private Collection<ContainerRuntimeOptionBean> containerRuntimeOptionBeans;

public PortletDefinitionBean()
{
@@ -58,6 +62,7 @@
{
applicationName = portletDefinition.getApplication().getName();
portletName = portletDefinition.getPortletName();
+ uniqueName = portletDefinition.getUniqueName();
portletInfoBean = new PortletInfoBean(portletDefinition.getPortletInfo());

ArrayList<DisplayNameBean> displayNameBeanList = new ArrayList<DisplayNameBean>();
@@ -87,6 +92,15 @@
languageBeanList.add(new LanguageBean(language));
}
languageBeans = languageBeanList;
+
+ metadataBean = new GenericMetadataBean(portletDefinition.getMetadata());
+
+ ArrayList<ContainerRuntimeOptionBean> containerRuntimeOptionBeanList = new ArrayList<ContainerRuntimeOptionBean>();
+ for (ContainerRuntimeOption containerRuntimeOption : portletDefinition.getContainerRuntimeOptions())
+ {
+ containerRuntimeOptionBeanList.add(new ContainerRuntimeOptionBean(containerRuntimeOption));
+ }
+ containerRuntimeOptionBeans = containerRuntimeOptionBeanList;
}

public String getApplicationName()
@@ -109,6 +123,16 @@
this.portletName = portletName;
}

+ public String getUniqueName()
+ {
+ return uniqueName;
+ }
+
+ public void setUniqueName(String uniqueName)
+ {
+ this.uniqueName = uniqueName;
+ }
+
@XmlElement(name="portletInfo")
public PortletInfoBean getPortletInfoBean()
{
@@ -168,4 +192,27 @@
this.languageBeans = languageBeans;
}

+ @XmlElement(name="metadata")
+ public GenericMetadataBean getMetadataBean()
+ {
+ return metadataBean;
+ }
+
+ public void setMetadataBean(GenericMetadataBean metadataBean)
+ {
+ this.metadataBean = metadataBean;
+ }
+
+ @XmlElementWrapper(name="containerRuntimeOptions")
+ @XmlElements(@XmlElement(name="containerRuntimeOption"))
+ public Collection<ContainerRuntimeOptionBean> getContainerRuntimeOptionBeans()
+ {
+ return containerRuntimeOptionBeans;
+ }
+
+ public void setContainerRuntimeOptionBeans(Collection<ContainerRuntimeOptionBean> containerRuntimeOptionBeans)
+ {
+ this.containerRuntimeOptionBeans = containerRuntimeOptionBeans;
+ }
+
}

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java?rev=884883&r1=884882&r2=884883&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java Fri Nov 27 14:17:56 2009
@@ -26,6 +26,7 @@
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.core.Context;
+import javax.ws.rs.core.PathSegment;
import javax.ws.rs.core.UriInfo;

import org.apache.commons.lang.StringUtils;
@@ -72,13 +73,20 @@
}

@GET
- @Path("/application/{name}")
- public PortletApplicationBeans getPortletApplication(@PathParam("name") String name)
+ @Path("/application/{path:.*}")
+ public PortletApplicationBeans getPortletApplication(@PathParam("path") List<PathSegment> pathSegments)
{
+ String applicationName = null;
+
+ if (pathSegments != null && !pathSegments.isEmpty())
+ {
+ applicationName = pathSegments.get(0).getPath();
+ }
+
PortletApplicationBeans paBeans = new PortletApplicationBeans();
List<PortletApplicationBean> paBeanList = new ArrayList<PortletApplicationBean>();

- if (StringUtils.isBlank(name))
+ if (StringUtils.isBlank(applicationName))
{
for (PortletApplication pa : portletRegistry.getPortletApplications())
{
@@ -87,7 +95,7 @@
}
else
{
- PortletApplication pa = portletRegistry.getPortletApplication(name, true);
+ PortletApplication pa = portletRegistry.getPortletApplication(applicationName, true);

if (pa != null)
{
@@ -100,13 +108,29 @@
}

@GET
- @Path("/definition/{uniqueName}")
- public PortletDefinitionBeans getPortletDefinition(@PathParam("uniqueName") String uniqueName)
+ @Path("/definition/{path:.*}")
+ public PortletDefinitionBeans getPortletDefinition(@PathParam("path") List<PathSegment> pathSegments)
{
+ String applicationName = null;
+ String definitionName = null;
+
+ if (pathSegments != null)
+ {
+ if (pathSegments.size() > 0)
+ {
+ applicationName = pathSegments.get(0).getPath();
+ }
+
+ if (pathSegments.size() > 1)
+ {
+ definitionName = pathSegments.get(1).getPath();
+ }
+ }
+
PortletDefinitionBeans pdBeans = new PortletDefinitionBeans();
List<PortletDefinitionBean> pdBeanList = new ArrayList<PortletDefinitionBean>();

- if (StringUtils.isBlank(uniqueName))
+ if (StringUtils.isBlank(applicationName) && StringUtils.isBlank(definitionName))
{
for (PortletDefinition pd : portletRegistry.getAllPortletDefinitions())
{
@@ -115,24 +139,25 @@
}
else
{
- int offset = uniqueName.indexOf("::");
+ PortletApplication pa = portletRegistry.getPortletApplication(applicationName, true);

- if (offset != -1)
+ if (pa != null)
{
- PortletDefinition pd = portletRegistry.getPortletDefinitionByUniqueName(uniqueName, true);
-
- if (pd != null)
+ if (StringUtils.isBlank(definitionName))
{
- pdBeanList.add(new PortletDefinitionBean(pd));
+ if (pa != null)
+ {
+ for (PortletDefinition pd : pa.getPortlets())
+ {
+ pdBeanList.add(new PortletDefinitionBean(pd));
+ }
+ }
}
- }
- else
- {
- PortletApplication pa = portletRegistry.getPortletApplication(uniqueName, true);
-
- if (pa != null)
+ else
{
- for (PortletDefinition pd : pa.getPortlets())
+ PortletDefinition pd = pa.getPortlet(definitionName);
+
+ if (pd != null)
{
pdBeanList.add(new PortletDefinitionBean(pd));
}

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@...
For additional commands, e-mail: jetspeed-dev-help@...

Re: BIRT and portal

2009-11-27T05:38:27Z

Gonzalo Aguilar Delgado wrote:
> Hi Ate,
>
> I'm sorry for my late answer but I was really busy this week...
So was I, hence this delayed response :)

>
> I think you should look for a BI environment...
>
> Maybe you will want to take a look to pentaho (http://www.pentaho.com/)
Yes, I'm aware of the pentaho project.
For our purposes however, and the desire to deliver a *generic* reporting service manageable and usable from within the portal itself to be
provided through either the Apache Jetspeed Portal project itself or, preferably, the Apache Portals Applications project, it really isn't
an option.
The Pentaho community edition uses a mixture of licenses (very confusing), most of which are incompatible with the ASF license nor endorsed
as such, e.g. GPL and LGPL are not allowed by the ASF.
Furthermore, the Pentaho BI suite is imo too "overweight" for our purposes, although certainly valuable if you need full blown BI support.
Besides the license problems, making use of Pentaho probably would end up as a separate solution with some "integration" bridging to make it
accessible and usable from within the portal, but unlikely to provide the "integrated" management we're looking for.
However, I'm not a real Pentaho expert so I might be mistaken in this regard.
But anyway, the license issue really is such a blocker that there is no use for me to spend more time to investigate it (now).

>
> I brought some books (I'm waiting for them) about implementation because
> this makes more sense for my
> objectives. And maybe yours...
>
> With pentaho you can build the BI environment in the back and server
> reports with
> jetspeed as needed.
>
> I'm looking for this solution to see if Jetspeed connections make sense.
>
> I'm not sure about the right way to go right now but your project looks
> big enough
> to take a look around before choosing way...

Sure, I agree on that, but AFAIK the BIRT engine itself already should be embeddable (with some effort) and as such, I'm expecting the
integration efforts to do so probably wouldn't amount to more (probably even less) than trying to integrate a BI solution like Pentaho.
And, as the BIRT license *is* acceptable for the ASF (as binary distribution, not for customizations), my plan is to continue with that
route, unless someone comes up with a better idea or has something already available to contribute :)

Besides the reporting engine itself though, we'll also need some base Reporting Portlets, providing access to and capable of rendering BIRT
based reports... As AFAIK Pentaho also (just) uses BIRT for that, and you already have some experience by leveraging this from within
portlets, your knowledge and experience in this will be very valuable!
So if you want to help in this area, we would very much appreciate that.

Regards,

Ate

>
>
>
>
>
>> Well, sure :)
>>
>> As I mentioned before, we have a request to provide a BIRT reporting *service* with Jetspeed so to bring standard reporting capabilities
>> accessible from portlets.
>> Our goal is to provide both report definition and maintenance features, e.g. through dedicated admin portlets and a report (configuration)
>> repository, as well as allowing portlets to "serve" such reports.
>> Primary (first) target for such reports would be the Jetspeed own configuration, e.g. like the security data, but as a generic BIRT
>> reporting service and configuration repository it should be extendable and usable for any (business) application reporting integration.
>> Our preference would be to provide this as a "standard" portal and portlets solution, e.g. even usable for other portals, by hosting this as
>> a "standards" compliant solution at Apache Portals Application, http://portals.apache.org/applications/, but of course it should work in
>> Jetspeed-2 first and foremost, so this is not yet a strict requirement.
>>
>> If you want to help out and collaborate on this or even just provide some valuable input, that would be much appreciated.
>> You can also contact me directly if you'd prefer to discuss this offline first.
>>> Thank you.
>>>
>>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: jetspeed-dev-unsubscribe@...
>> For additional commands, e-mail: jetspeed-dev-help@...
>>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@...
For additional commands, e-mail: jetspeed-dev-help@...

Re: svn commit: r884670 - in /portals/jetspeed-2/portal/trunk: ./ applications/jetspeed/src/main/resources/ applications/jetspeed/src/main/webapp/WEB-INF/ components/jetspeed-portal/ components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/val...

2009-11-27T05:15:59Z

Hi Gonzalo,

Ah, I think you're right. It seems better to set the default category to something like "News". Yes, please go ahead. Thanks a lot!

Cheers, Woonsan

----- Original Message ----
From: Gonzalo Aguilar Delgado <gaguilar@...>
To: Jetspeed Developers List <jetspeed-dev@...>
Sent: Fri, November 27, 2009 2:10:52 PM
Subject: Re: svn commit: r884670 - in /portals/jetspeed-2/portal/trunk: ./ applications/jetspeed/src/main/resources/ applications/jetspeed/src/main/webapp/WEB-INF/ components/jetspeed-portal/ components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/val...

Hi Woonsan,

Ok. I will try to implement this into the toolbox and add a new service
to get all categories. So they will
be updated dynamically when new apps are added. This also will help me
to dive into JAX-RS services.

I also recommend to set default category in toolbox to "News" or some
other because it will get messy
when lot's of portlets are in place. Can I do it also?

Tnx

El vie, 27-11-2009 a las 04:59 -0800, Woonsan Ko escribió:

> Hi Gonzalo,
>
> Yes, I'm implementing JAX-RS services which possibly replaces the old ajax apis. It should be regarded as a prototype until other committers get satisfied with this new one.
> However, I'd like to see this new JAX-RS service used in the toolbox portlet. It would help evaluation.
> If you are interested in this, please dive into it. I will really appreciate it. :-)
>
> By the way, many Jetspeed developers prefer json to xml, so I think we'd better use json marshaling instead of xml marshaling in toolbox portlet.
> Also, I found a problem to fix. It should be more consistently mappable between xml and json marshaling. I hope to fix these today. I will update the status in the commit messages.
> FYI, you can use json marshaling by adding "?_type=json" parameter as follows:
>
> (1) GET all PAs: http://localhost:8080/jetspeed/services/portletregistry/application/%20?_type=json
> (2) GET demo PA: http://localhost:8080/jetspeed/services/portletregistry/application/demo/?_type=json
> (3) GET all PDs: http://localhost:8080/jetspeed/services/portletregistry/definition/%20?_type=json
> (4) GET all PDs of demo PA: http://localhost:8080/jetspeed/services/portletregistry/definition/demo/?_type=json
> (5) GET demo::PickANumberPortlet PD: http://localhost:8080/jetspeed/services/portletregistry/definition/demo::PickANumberPortlet/?_type=json
>
> Apache CXF allows to change marshaling types by Accept header as well, but I think this is very handy.
>
> Kind regards,
>
> Woonsan
>
>
>
> ----- Original Message ----
> From: Gonzalo Aguilar Delgado <gaguilar@...>
> To: Jetspeed Developers List <jetspeed-dev@...>
> Sent: Fri, November 27, 2009 1:26:28 PM
> Subject: Re: svn commit: r884670 - in /portals/jetspeed-2/portal/trunk: ./ applications/jetspeed/src/main/resources/ applications/jetspeed/src/main/webapp/WEB-INF/ components/jetspeed-portal/ components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/val...
>
> Woonsan,
>
> Is this a new type of service implementation? Will Jetspeed go in that
> direction?
>
> Do you want me to put this into the toolbox?
>
> Tnx
>
>
> El jue, 26-11-2009 a las 19:21 +0000, woonsan@... escribió:
>
> > Author: woonsan
> > Date: Thu Nov 26 19:21:39 2009
> > New Revision: 884670
> >
> > URL: http://svn.apache.org/viewvc?rev=884670&view=rev
> > Log:
> > JS2-1087: Adding initial JAX-RS support as prototype
> > The following urls are testable:
> >
> > (1) GET all PAs: http://localhost:8080/jetspeed/services/portletregistry/application/%20
> > (2) GET demo PA: http://localhost:8080/jetspeed/services/portletregistry/application/demo/
> > (3) GET all PDs: http://localhost:8080/jetspeed/services/portletregistry/definition/%20
> > (4) GET all PDs of demo PA: http://localhost:8080/jetspeed/services/portletregistry/definition/demo/
> > (5) GET demo::PickANumberPortlet PD: http://localhost:8080/jetspeed/services/portletregistry/definition/demo::PickANumberPortlet/
> >
> > TODO: Remove '%20' in the urls to indicate '*', test with json client and integrate it with toolbox portlet.
> >
> > Added:
> > portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ServletDelegatingValve.java (with props)
> > portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/
> > portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DescriptionBean.java (with props)
> > portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DisplayNameBean.java (with props)
> > portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/InitParamBean.java (with props)
> > portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/LanguageBean.java (with props)
> > portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBean.java (with props)
> > portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeans.java (with props)
> > portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java (with props)
> > portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeans.java (with props)
> > portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletInfoBean.java (with props)
> > portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/SupportsBean.java (with props)
> > portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/
> > portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java (with props)
> > portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml (with props)
> > Modified:
> > portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.xml
> > portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/web.xml
> > portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
> > portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/ (props changed)
> > portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml
> > portals/jetspeed-2/portal/trunk/pom.xml
> >
> > Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.xml
> > URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.xml?rev=884670&r1=884669&r2=884670&view=diff
> > ==============================================================================
> > --- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.xml (original)
> > +++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.xml Thu Nov 26 19:21:39 2009
> > @@ -94,7 +94,15 @@
> > <param name="ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} %-5p [%C.%M():%L] %m%n"/>
> > </layout>
> > </appender>
> > -
> > +
> > + 
> > + <appender name="cxf" class="org.apache.log4j.FileAppender">
> > + <param name="File" value="${org.apache.portals.logdir}/jetspeed-cxf.log"/>
> > + <layout class="org.apache.log4j.PatternLayout">
> > + <param name="ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} %-5p [%C.%M():%L] %m%n"/>
> > + </layout>
> > + </appender>
> > +
> > 
> > 
> > 
> > @@ -134,6 +142,11 @@
> > <appender-ref ref="ojb"/>
> > </category>
> >
> > + <category additivity="false" name="org.apache.cxf">
> > + <level value="ERROR"/>
> > + <appender-ref ref="cxf"/>
> > + </category>
> > +
> > <category additivity="false" name="scheduler">
> > <level value="ERROR"/>
> > <appender-ref ref="scheduler"/>
> >
> > Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/web.xml
> > URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/web.xml?rev=884670&r1=884669&r2=884670&view=diff
> > ==============================================================================
> > --- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/web.xml (original)
> > +++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/web.xml Thu Nov 26 19:21:39 2009
> > @@ -180,6 +180,10 @@
> > </servlet-mapping>
> > <servlet-mapping>
> > <servlet-name>jetspeed</servlet-name>
> > + <url-pattern>/services/*</url-pattern>
> > + </servlet-mapping>
> > + <servlet-mapping>
> > + <servlet-name>jetspeed</servlet-name>
> > <url-pattern>/desktop/*</url-pattern>
> > </servlet-mapping>
> > <servlet-mapping>
> >
> > Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
> > URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml?rev=884670&r1=884669&r2=884670&view=diff
> > ==============================================================================
> > --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml (original)
> > +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml Thu Nov 26 19:21:39 2009
> > @@ -165,6 +165,15 @@
> > <groupId>org.springframework</groupId>
> > <artifactId>spring-context-support</artifactId>
> > </dependency>
> > + <dependency>
> > + <groupId>javax.ws.rs</groupId>
> > + <artifactId>jsr311-api</artifactId>
> > + </dependency>
> > + <dependency>
> > + <groupId>org.apache.cxf</groupId>
> > + <artifactId>cxf-rt-frontend-jaxrs</artifactId>
> > + <scope>runtime</scope>
> > + </dependency>
> >
> > 
> > <dependency>
> >
> > Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ServletDelegatingValve.java
> > URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ServletDelegatingValve.java?rev=884670&view=auto
> > ==============================================================================
> > --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ServletDelegatingValve.java (added)
> > +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ServletDelegatingValve.java Thu Nov 26 19:21:39 2009
> > @@ -0,0 +1,125 @@
> > +/*
> > + * Licensed to the Apache Software Foundation (ASF) under one or more
> > + * contributor license agreements. See the NOTICE file distributed with
> > + * this work for additional information regarding copyright ownership.
> > + * The ASF licenses this file to You under the Apache License, Version 2.0
> > + * (the "License"); you may not use this file except in compliance with
> > + * the License. You may obtain a copy of the License at
> > + *
> > + * http://www.apache.org/licenses/LICENSE-2.0
> > + *
> > + * Unless required by applicable law or agreed to in writing, software
> > + * distributed under the License is distributed on an "AS IS" BASIS,
> > + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> > + * See the License for the specific language governing permissions and
> > + * limitations under the License.
> > + */
> > +package org.apache.jetspeed.pipeline.valve.impl;
> > +
> > +import java.util.Collections;
> > +import java.util.Enumeration;
> > +import java.util.Map;
> > +
> > +import javax.servlet.ServletConfig;
> > +import javax.servlet.ServletContext;
> > +import javax.servlet.http.HttpServlet;
> > +
> > +import org.apache.jetspeed.pipeline.PipelineException;
> > +import org.apache.jetspeed.pipeline.valve.AbstractValve;
> > +import org.apache.jetspeed.pipeline.valve.ValveContext;
> > +import org.apache.jetspeed.request.RequestContext;
> > +
> > +/**
> > + * ServletDelegatingValve
> > + *
> > + * @version $Id$
> > + */
> > +public class ServletDelegatingValve extends AbstractValve
> > +{
> > + protected HttpServlet servlet;
> > + protected ServletConfig config;
> > +
> > + public ServletDelegatingValve(HttpServlet servlet, ServletConfig config)
> > + {
> > + this.servlet = servlet;
> > + this.config = config;
> > + }
> > +
> > + @Override
> > + public void initialize() throws PipelineException
> > + {
> > + try
> > + {
> > + servlet.init(config);
> > + }
> > + catch (Exception e)
> > + {
> > + throw new PipelineException(e);
> > + }
> > + }
> > +
> > + public void destroy()
> > + {
> > + servlet.destroy();
> > + }
> > +
> > + @Override
> > + public void invoke(RequestContext request, ValveContext context) throws PipelineException
> > + {
> > + try
> > + {
> > + servlet.service(request.getRequest(), request.getResponse());
> > + }
> > + catch (Exception e)
> > + {
> > + throw new PipelineException(e);
> > + }
> > +
> > + // continue
> > + context.invokeNext(request);
> > + }
> > +
> > + public static class ServletConfigImpl implements ServletConfig
> > + {
> > + protected String servletName;
> > + protected Map<String, String> initParams;
> > + protected ServletContext servletContext;
> > +
> > + public ServletConfigImpl(String servletName, Map<String, String> initParams)
> > + {
> > + this(servletName, initParams, null);
> > + }
> > +
> > + public ServletConfigImpl(String servletName, Map<String, String> initParams, ServletContext servletContext)
> > + {
> > + this.servletName = servletName;
> > + this.initParams = initParams;
> > + this.servletContext = servletContext;
> > + }
> > +
> > + public String getInitParameter(String paramName)
> > + {
> > + return initParams.get(paramName);
> > + }
> > +
> > + public Enumeration getInitParameterNames()
> > + {
> > + return Collections.enumeration(initParams.keySet());
> > + }
> > +
> > + public ServletContext getServletContext()
> > + {
> > + return servletContext;
> > + }
> > +
> > + public void setServletContext(ServletContext servletContext)
> > + {
> > + this.servletContext = servletContext;
> > + }
> > +
> > + public String getServletName()
> > + {
> > + return servletName;
> > + }
> > + }
> > +}
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ServletDelegatingValve.java
> > ------------------------------------------------------------------------------
> > svn:eol-style = native
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ServletDelegatingValve.java
> > ------------------------------------------------------------------------------
> > svn:keywords = Id
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ServletDelegatingValve.java
> > ------------------------------------------------------------------------------
> > svn:mime-type = text/plain
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/
> > ------------------------------------------------------------------------------
> > --- svn:ignore (original)
> > +++ svn:ignore Thu Nov 26 19:21:39 2009
> > @@ -1,2 +1,2 @@
> > -target
> > +target
> > surefire*.properties
> >
> > Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DescriptionBean.java
> > URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DescriptionBean.java?rev=884670&view=auto
> > ==============================================================================
> > --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DescriptionBean.java (added)
> > +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DescriptionBean.java Thu Nov 26 19:21:39 2009
> > @@ -0,0 +1,87 @@
> > +/*
> > + * Licensed to the Apache Software Foundation (ASF) under one or more
> > + * contributor license agreements. See the NOTICE file distributed with
> > + * this work for additional information regarding copyright ownership.
> > + * The ASF licenses this file to You under the Apache License, Version 2.0
> > + * (the "License"); you may not use this file except in compliance with
> > + * the License. You may obtain a copy of the License at
> > + *
> > + * http://www.apache.org/licenses/LICENSE-2.0
> > + *
> > + * Unless required by applicable law or agreed to in writing, software
> > + * distributed under the License is distributed on an "AS IS" BASIS,
> > + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> > + * See the License for the specific language governing permissions and
> > + * limitations under the License.
> > + */
> > +package org.apache.jetspeed.services.beans;
> > +
> > +import java.io.Serializable;
> > +import java.util.Locale;
> > +
> > +import javax.xml.bind.annotation.XmlRootElement;
> > +
> > +import org.apache.jetspeed.om.portlet.Description;
> > +
> > +/**
> > + * DescriptionBean
> > + *
> > + * @version $Id$
> > + */
> > +@XmlRootElement(name="description")
> > +public class DescriptionBean implements Serializable
> > +{
> > + private static final long serialVersionUID = 1L;
> > +
> > + private String description;
> > + private String lang;
> > + private String localeString;
> > +
> > + public DescriptionBean()
> > + {
> > +
> > + }
> > +
> > + public DescriptionBean(final Description description)
> > + {
> > + this.description = description.getDescription();
> > + lang = description.getLang();
> > +
> > + Locale locale = description.getLocale();
> > +
> > + if (locale != null)
> > + {
> > + localeString = locale.toString();
> > + }
> > + }
> > +
> > + public String getDescription()
> > + {
> > + return description;
> > + }
> > +
> > + public void setDescription(String description)
> > + {
> > + this.description = description;
> > + }
> > +
> > + public String getLang()
> > + {
> > + return lang;
> > + }
> > +
> > + public void setLang(String lang)
> > + {
> > + this.lang = lang;
> > + }
> > +
> > + public String getLocaleString()
> > + {
> > + return localeString;
> > + }
> > +
> > + public void setLocaleString(String localeString)
> > + {
> > + this.localeString = localeString;
> > + }
> > +}
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DescriptionBean.java
> > ------------------------------------------------------------------------------
> > svn:eol-style = native
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DescriptionBean.java
> > ------------------------------------------------------------------------------
> > svn:keywords = Id
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DescriptionBean.java
> > ------------------------------------------------------------------------------
> > svn:mime-type = text/plain
> >
> > Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DisplayNameBean.java
> > URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DisplayNameBean.java?rev=884670&view=auto
> > ==============================================================================
> > --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DisplayNameBean.java (added)
> > +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DisplayNameBean.java Thu Nov 26 19:21:39 2009
> > @@ -0,0 +1,88 @@
> > +/*
> > + * Licensed to the Apache Software Foundation (ASF) under one or more
> > + * contributor license agreements. See the NOTICE file distributed with
> > + * this work for additional information regarding copyright ownership.
> > + * The ASF licenses this file to You under the Apache License, Version 2.0
> > + * (the "License"); you may not use this file except in compliance with
> > + * the License. You may obtain a copy of the License at
> > + *
> > + * http://www.apache.org/licenses/LICENSE-2.0
> > + *
> > + * Unless required by applicable law or agreed to in writing, software
> > + * distributed under the License is distributed on an "AS IS" BASIS,
> > + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> > + * See the License for the specific language governing permissions and
> > + * limitations under the License.
> > + */
> > +package org.apache.jetspeed.services.beans;
> > +
> > +import java.io.Serializable;
> > +import java.util.Locale;
> > +
> > +import javax.xml.bind.annotation.XmlRootElement;
> > +
> > +import org.apache.jetspeed.om.portlet.DisplayName;
> > +
> > +/**
> > + * DisplayNameBean
> > + *
> > + * @version $Id$
> > + */
> > +@XmlRootElement(name="displayName")
> > +public class DisplayNameBean implements Serializable
> > +{
> > + private static final long serialVersionUID = 1L;
> > +
> > + private String displayName;
> > + private String lang;
> > + private String localeString;
> > +
> > + public DisplayNameBean()
> > + {
> > +
> > + }
> > +
> > + public DisplayNameBean(final DisplayName displayName)
> > + {
> > + this.displayName = displayName.getDisplayName();
> > + lang = displayName.getLang();
> > +
> > + Locale locale = displayName.getLocale();
> > +
> > + if (locale != null)
> > + {
> > + localeString = locale.toString();
> > + }
> > + }
> > +
> > + public String getDisplayName()
> > + {
> > + return displayName;
> > + }
> > +
> > + public void setDisplayName(String displayName)
> > + {
> > + this.displayName = displayName;
> > + }
> > +
> > + public String getLang()
> > + {
> > + return lang;
> > + }
> > +
> > + public void setLang(String lang)
> > + {
> > + this.lang = lang;
> > + }
> > +
> > + public String getLocaleString()
> > + {
> > + return localeString;
> > + }
> > +
> > + public void setLocaleString(String localeString)
> > + {
> > + this.localeString = localeString;
> > + }
> > +
> > +}
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DisplayNameBean.java
> > ------------------------------------------------------------------------------
> > svn:eol-style = native
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DisplayNameBean.java
> > ------------------------------------------------------------------------------
> > svn:keywords = Id
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DisplayNameBean.java
> > ------------------------------------------------------------------------------
> > svn:mime-type = text/plain
> >
> > Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/InitParamBean.java
> > URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/InitParamBean.java?rev=884670&view=auto
> > ==============================================================================
> > --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/InitParamBean.java (added)
> > +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/InitParamBean.java Thu Nov 26 19:21:39 2009
> > @@ -0,0 +1,98 @@
> > +/*
> > + * Licensed to the Apache Software Foundation (ASF) under one or more
> > + * contributor license agreements. See the NOTICE file distributed with
> > + * this work for additional information regarding copyright ownership.
> > + * The ASF licenses this file to You under the Apache License, Version 2.0
> > + * (the "License"); you may not use this file except in compliance with
> > + * the License. You may obtain a copy of the License at
> > + *
> > + * http://www.apache.org/licenses/LICENSE-2.0
> > + *
> > + * Unless required by applicable law or agreed to in writing, software
> > + * distributed under the License is distributed on an "AS IS" BASIS,
> > + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> > + * See the License for the specific language governing permissions and
> > + * limitations under the License.
> > + */
> > +package org.apache.jetspeed.services.beans;
> > +
> > +import java.io.Serializable;
> > +import java.util.ArrayList;
> > +import java.util.Collection;
> > +
> > +import javax.xml.bind.annotation.XmlElement;
> > +import javax.xml.bind.annotation.XmlElementWrapper;
> > +import javax.xml.bind.annotation.XmlElements;
> > +import javax.xml.bind.annotation.XmlRootElement;
> > +
> > +import org.apache.jetspeed.om.portlet.Description;
> > +import org.apache.jetspeed.om.portlet.InitParam;
> > +
> > +/**
> > + * InitParamBean
> > + *
> > + * @version $Id$
> > + */
> > +@XmlRootElement(name="initParam")
> > +public class InitParamBean implements Serializable
> > +{
> > + private static final long serialVersionUID = 1L;
> > +
> > + private String paramName;
> > + private String paramValue;
> > + private Collection<DescriptionBean> descriptionBeans;
> > +
> > + public InitParamBean()
> > + {
> > +
> > + }
> > +
> > + public InitParamBean(final InitParam initParam)
> > + {
> > + paramName = initParam.getParamName();
> > + paramValue = initParam.getParamValue();
> > +
> > + ArrayList<DescriptionBean> descriptionBeanList = new ArrayList<DescriptionBean>();
> > +
> > + for (Description description : initParam.getDescriptions())
> > + {
> > + descriptionBeanList.add(new DescriptionBean(description));
> > + }
> > +
> > + descriptionBeans = descriptionBeanList;
> > + }
> > +
> > + public String getParamName()
> > + {
> > + return paramName;
> > + }
> > +
> > + public void setParamName(String paramName)
> > + {
> > + this.paramName = paramName;
> > + }
> > +
> > + public String getParamValue()
> > + {
> > + return paramValue;
> > + }
> > +
> > + public void setParamValue(String paramValue)
> > + {
> > + this.paramValue = paramValue;
> > + }
> > +
> > + @XmlElementWrapper(name="descriptions")
> > + @XmlElements(@XmlElement(name="description"))
> > + public Collection<DescriptionBean> getDescriptionBeans()
> > + {
> > + return descriptionBeans;
> > + }
> > +
> > + public void setDescriptionBeans(Collection<DescriptionBean> descriptionBeans)
> > + {
> > + this.descriptionBeans = descriptionBeans;
> > + }
> > +
> > +
> > +}
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/InitParamBean.java
> > ------------------------------------------------------------------------------
> > svn:eol-style = native
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/InitParamBean.java
> > ------------------------------------------------------------------------------
> > svn:keywords = Id
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/InitParamBean.java
> > ------------------------------------------------------------------------------
> > svn:mime-type = text/plain
> >
> > Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/LanguageBean.java
> > URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/LanguageBean.java?rev=884670&view=auto
> > ==============================================================================
> > --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/LanguageBean.java (added)
> > +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/LanguageBean.java Thu Nov 26 19:21:39 2009
> > @@ -0,0 +1,64 @@
> > +/*
> > + * Licensed to the Apache Software Foundation (ASF) under one or more
> > + * contributor license agreements. See the NOTICE file distributed with
> > + * this work for additional information regarding copyright ownership.
> > + * The ASF licenses this file to You under the Apache License, Version 2.0
> > + * (the "License"); you may not use this file except in compliance with
> > + * the License. You may obtain a copy of the License at
> > + *
> > + * http://www.apache.org/licenses/LICENSE-2.0
> > + *
> > + * Unless required by applicable law or agreed to in writing, software
> > + * distributed under the License is distributed on an "AS IS" BASIS,
> > + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> > + * See the License for the specific language governing permissions and
> > + * limitations under the License.
> > + */
> > +package org.apache.jetspeed.services.beans;
> > +
> > +import java.util.Locale;
> > +
> > +import javax.xml.bind.annotation.XmlRootElement;
> > +
> > +import org.apache.jetspeed.om.portlet.Language;
> > +
> > +/**
> > + * LanguageBean
> > + *
> > + * @version $Id$
> > + */
> > +@XmlRootElement(name="language")
> > +public class LanguageBean extends PortletInfoBean
> > +{
> > + private static final long serialVersionUID = 1L;
> > +
> > + private String localeString;
> > +
> > + public LanguageBean()
> > + {
> > + super();
> > + }
> > +
> > + public LanguageBean(final Language language)
> > + {
> > + super(language);
> > +
> > + Locale locale = language.getLocale();
> > +
> > + if (locale != null)
> > + {
> > + localeString = locale.toString();
> > + }
> > + }
> > +
> > + public String getLocaleString()
> > + {
> > + return localeString;
> > + }
> > +
> > + public void setLocaleString(String localeString)
> > + {
> > + this.localeString = localeString;
> > + }
> > +
> > +}
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/LanguageBean.java
> > ------------------------------------------------------------------------------
> > svn:eol-style = native
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/LanguageBean.java
> > ------------------------------------------------------------------------------
> > svn:keywords = Id
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/LanguageBean.java
> > ------------------------------------------------------------------------------
> > svn:mime-type = text/plain
> >
> > Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBean.java
> > URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBean.java?rev=884670&view=auto
> > ==============================================================================
> > --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBean.java (added)
> > +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBean.java Thu Nov 26 19:21:39 2009
> > @@ -0,0 +1,164 @@
> > +/*
> > + * Licensed to the Apache Software Foundation (ASF) under one or more
> > + * contributor license agreements. See the NOTICE file distributed with
> > + * this work for additional information regarding copyright ownership.
> > + * The ASF licenses this file to You under the Apache License, Version 2.0
> > + * (the "License"); you may not use this file except in compliance with
> > + * the License. You may obtain a copy of the License at
> > + *
> > + * http://www.apache.org/licenses/LICENSE-2.0
> > + *
> > + * Unless required by applicable law or agreed to in writing, software
> > + * distributed under the License is distributed on an "AS IS" BASIS,
> > + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> > + * See the License for the specific language governing permissions and
> > + * limitations under the License.
> > + */
> > +package org.apache.jetspeed.services.beans;
> > +
> > +import java.io.Serializable;
> > +import java.util.ArrayList;
> > +import java.util.Collection;
> > +
> > +import javax.xml.bind.annotation.XmlElement;
> > +import javax.xml.bind.annotation.XmlElementWrapper;
> > +import javax.xml.bind.annotation.XmlElements;
> > +import javax.xml.bind.annotation.XmlRootElement;
> > +
> > +import org.apache.jetspeed.om.portlet.Description;
> > +import org.apache.jetspeed.om.portlet.DisplayName;
> > +import org.apache.jetspeed.om.portlet.PortletApplication;
> > +
> > +/**
> > + * PortletApplicationBean
> > + *
> > + * @version $Id$
> > + */
> > +@XmlRootElement(name="application")
> > +public class PortletApplicationBean implements Serializable
> > +{
> > + private static final long serialVersionUID = 1L;
> > +
> > + private String name;
> > + private String contextPath;
> > + private String defaultNamespace;
> > + private int applicationType;
> > + private long checksum;
> > + private long revision;
> > + private Collection<DisplayNameBean> displayNameBeans;
> > + private Collection<DescriptionBean> descriptionBeans;
> > +
> > + public PortletApplicationBean()
> > + {
> > +
> > + }
> > +
> > + public PortletApplicationBean(final PortletApplication portletApplication)
> > + {
> > + name = portletApplication.getName();
> > + contextPath = portletApplication.getContextPath();
> > + defaultNamespace = portletApplication.getDefaultNamespace();
> > + applicationType = portletApplication.getApplicationType();
> > + checksum = portletApplication.getChecksum();
> > + revision = portletApplication.getRevision();
> > +
> > + ArrayList<DisplayNameBean> displayNameBeanList = new ArrayList<DisplayNameBean>();
> > + for (DisplayName displayName : portletApplication.getDisplayNames())
> > + {
> > + displayNameBeanList.add(new DisplayNameBean(displayName));
> > + }
> > + displayNameBeans = displayNameBeanList;
> > +
> > + ArrayList<DescriptionBean> descriptionBeanList = new ArrayList<DescriptionBean>();
> > + for (Description description : portletApplication.getDescriptions())
> > + {
> > + descriptionBeanList.add(new DescriptionBean(description));
> > + }
> > + descriptionBeans = descriptionBeanList;
> > + }
> > +
> > + public String getName()
> > + {
> > + return name;
> > + }
> > +
> > + public void setName(String name)
> > + {
> > + this.name = name;
> > + }
> > +
> > + public String getContextPath()
> > + {
> > + return contextPath;
> > + }
> > +
> > + public void setContextPath(String contextPath)
> > + {
> > + this.contextPath = contextPath;
> > + }
> > +
> > + public String getDefaultNamespace()
> > + {
> > + return defaultNamespace;
> > + }
> > +
> > + public void setDefaultNamespace(String defaultNamespace)
> > + {
> > + this.defaultNamespace = defaultNamespace;
> > + }
> > +
> > + public int getApplicationType()
> > + {
> > + return applicationType;
> > + }
> > +
> > + public void setApplicationType(int applicationType)
> > + {
> > + this.applicationType = applicationType;
> > + }
> > +
> > + public long getChecksum()
> > + {
> > + return checksum;
> > + }
> > +
> > + public void setChecksum(long checksum)
> > + {
> > + this.checksum = checksum;
> > + }
> > +
> > + public long getRevision()
> > + {
> > + return revision;
> > + }
> > +
> > + public void setRevision(long revision)
> > + {
> > + this.revision = revision;
> > + }
> > +
> > + @XmlElementWrapper(name="displayNames")
> > + @XmlElements(@XmlElement(name="displayName"))
> > + public Collection<DisplayNameBean> getDisplayNameBeans()
> > + {
> > + return displayNameBeans;
> > + }
> > +
> > + public void setDisplayNameBeans(Collection<DisplayNameBean> displayNameBeans)
> > + {
> > + this.displayNameBeans = displayNameBeans;
> > + }
> > +
> > + @XmlElementWrapper(name="descriptions")
> > + @XmlElements(@XmlElement(name="description"))
> > + public Collection<DescriptionBean> getDescriptionBeans()
> > + {
> > + return descriptionBeans;
> > + }
> > +
> > + public void setDescriptionBeans(Collection<DescriptionBean> descriptionBeans)
> > + {
> > + this.descriptionBeans = descriptionBeans;
> > + }
> > +
> > +}
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBean.java
> > ------------------------------------------------------------------------------
> > svn:eol-style = native
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBean.java
> > ------------------------------------------------------------------------------
> > svn:keywords = Id
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBean.java
> > ------------------------------------------------------------------------------
> > svn:mime-type = text/plain
> >
> > Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeans.java
> > URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeans.java?rev=884670&view=auto
> > ==============================================================================
> > --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeans.java (added)
> > +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeans.java Thu Nov 26 19:21:39 2009
> > @@ -0,0 +1,53 @@
> > +/*
> > + * Licensed to the Apache Software Foundation (ASF) under one or more
> > + * contributor license agreements. See the NOTICE file distributed with
> > + * this work for additional information regarding copyright ownership.
> > + * The ASF licenses this file to You under the Apache License, Version 2.0
> > + * (the "License"); you may not use this file except in compliance with
> > + * the License. You may obtain a copy of the License at
> > + *
> > + * http://www.apache.org/licenses/LICENSE-2.0
> > + *
> > + * Unless required by applicable law or agreed to in writing, software
> > + * distributed under the License is distributed on an "AS IS" BASIS,
> > + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> > + * See the License for the specific language governing permissions and
> > + * limitations under the License.
> > + */
> > +package org.apache.jetspeed.services.beans;
> > +
> > +import java.io.Serializable;
> > +import java.util.Collection;
> > +
> > +import javax.xml.bind.annotation.XmlElement;
> > +import javax.xml.bind.annotation.XmlElements;
> > +import javax.xml.bind.annotation.XmlRootElement;
> > +
> > +/**
> > + * PortletApplicationBeans
> > + *
> > + * @version $Id$
> > + */
> > +@XmlRootElement(name="applications")
> > +public class PortletApplicationBeans implements Serializable
> > +{
> > + private static final long serialVersionUID = 1L;
> > +
> > + private Collection<PortletApplicationBean> portletApplicationBeans;
> > +
> > + public PortletApplicationBeans()
> > + {
> > +
> > + }
> > +
> > + @XmlElements(@XmlElement(name="application"))
> > + public Collection<PortletApplicationBean> getPortletApplicationBeans()
> > + {
> > + return portletApplicationBeans;
> > + }
> > +
> > + public void setPortletApplicationBeans(Collection<PortletApplicationBean> portletApplicationBeans)
> > + {
> > + this.portletApplicationBeans = portletApplicationBeans;
> > + }
> > +}
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeans.java
> > ------------------------------------------------------------------------------
> > svn:eol-style = native
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeans.java
> > ------------------------------------------------------------------------------
> > svn:keywords = Id
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeans.java
> > ------------------------------------------------------------------------------
> > svn:mime-type = text/plain
> >
> > Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java
> > URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java?rev=884670&view=auto
> > ==============================================================================
> > --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java (added)
> > +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java Thu Nov 26 19:21:39 2009
> > @@ -0,0 +1,171 @@
> > +/*
> > + * Licensed to the Apache Software Foundation (ASF) under one or more
> > + * contributor license agreements. See the NOTICE file distributed with
> > + * this work for additional information regarding copyright ownership.
> > + * The ASF licenses this file to You under the Apache License, Version 2.0
> > + * (the "License"); you may not use this file except in compliance with
> > + * the License. You may obtain a copy of the License at
> > + *
> > + * http://www.apache.org/licenses/LICENSE-2.0
> > + *
> > + * Unless required by applicable law or agreed to in writing, software
> > + * distributed under the License is distributed on an "AS IS" BASIS,
> > + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> > + * See the License for the specific language governing permissions and
> > + * limitations under the License.
> > + */
> > +package org.apache.jetspeed.services.beans;
> > +
> > +import java.io.Serializable;
> > +import java.util.ArrayList;
> > +import java.util.Collection;
> > +
> > +import javax.xml.bind.annotation.XmlElement;
> > +import javax.xml.bind.annotation.XmlElementWrapper;
> > +import javax.xml.bind.annotation.XmlElements;
> > +import javax.xml.bind.annotation.XmlRootElement;
> > +
> > +import org.apache.jetspeed.om.portlet.Description;
> > +import org.apache.jetspeed.om.portlet.DisplayName;
> > +import org.apache.jetspeed.om.portlet.Language;
> > +import org.apache.jetspeed.om.portlet.PortletDefinition;
> > +import org.apache.jetspeed.om.portlet.Supports;
> > +
> > +/**
> > + * PortletDefinitionBean
> > + *
> > + * @version $Id$
> > + */
> > +@XmlRootElement(name="definition")
> > +public class PortletDefinitionBean implements Serializable
> > +{
> > + private static final long serialVersionUID = 1L;
> > +
> > + private String applicationName;
> > + private String portletName;
> > + private PortletInfoBean portletInfoBean;
> > + private Collection<DisplayNameBean> displayNameBeans;
> > + private Collection<DescriptionBean> descriptionBeans;
> > + private Collection<SupportsBean> supportsBeans;
> > + private Collection<LanguageBean> languageBeans;
> > +
> > + public PortletDefinitionBean()
> > + {
> > +
> > + }
> > +
> > + public PortletDefinitionBean(final PortletDefinition portletDefinition)
> > + {
> > + applicationName = portletDefinition.getApplication().getName();
> > + portletName = portletDefinition.getPortletName();
> > + portletInfoBean = new PortletInfoBean(portletDefinition.getPortletInfo());
> > +
> > + ArrayList<DisplayNameBean> displayNameBeanList = new ArrayList<DisplayNameBean>();
> > + for (DisplayName displayName : portletDefinition.getDisplayNames())
> > + {
> > + displayNameBeanList.add(new DisplayNameBean(displayName));
> > + }
> > + displayNameBeans = displayNameBeanList;
> > +
> > + ArrayList<DescriptionBean> descriptionBeanList = new ArrayList<DescriptionBean>();
> > + for (Description description : portletDefinition.getDescriptions())
> > + {
> > + descriptionBeanList.add(new DescriptionBean(description));
> > + }
> > + descriptionBeans = descriptionBeanList;
> > +
> > + ArrayList<SupportsBean> supportsBeanList = new ArrayList<SupportsBean>();
> > + for (Supports supports : portletDefinition.getSupports())
> > + {
> > + supportsBeanList.add(new SupportsBean(supports));
> > + }
> > + supportsBeans = supportsBeanList;
> > +
> > + ArrayList<LanguageBean> languageBeanList = new ArrayList<LanguageBean>();
> > + for (Language language : portletDefinition.getLanguages())
> > + {
> > + languageBeanList.add(new LanguageBean(language));
> > + }
> > + languageBeans = languageBeanList;
> > + }
> > +
> > + public String getApplicationName()
> > + {
> > + return applicationName;
> > + }
> > +
> > + public void setApplicationName(String applicationName)
> > + {
> > + this.applicationName = applicationName;
> > + }
> > +
> > + public String getPortletName()
> > + {
> > + return portletName;
> > + }
> > +
> > + public void setPortletName(String portletName)
> > + {
> > + this.portletName = portletName;
> > + }
> > +
> > + @XmlElement(name="portletInfo")
> > + public PortletInfoBean getPortletInfoBean()
> > + {
> > + return portletInfoBean;
> > + }
> > +
> > + public void setPortletInfoBean(PortletInfoBean portletInfoBean)
> > + {
> > + this.portletInfoBean = portletInfoBean;
> > + }
> > +
> > + @XmlElementWrapper(name="displayNames")
> > + @XmlElements(@XmlElement(name="displayName"))
> > + public Collection<DisplayNameBean> getDisplayNameBeans()
> > + {
> > + return displayNameBeans;
> > + }
> > +
> > + public void setDisplayNameBeans(Collection<DisplayNameBean> displayNameBeans)
> > + {
> > + this.displayNameBeans = displayNameBeans;
> > + }
> > +
> > + @XmlElementWrapper(name="descriptions")
> > + @XmlElements(@XmlElement(name="description"))
> > + public Collection<DescriptionBean> getDescriptionBeans()
> > + {
> > + return descriptionBeans;
> > + }
> > +
> > + public void setDescriptionBeans(Collection<DescriptionBean> descriptionBeans)
> > + {
> > + this.descriptionBeans = descriptionBeans;
> > + }
> > +
> > + @XmlElementWrapper(name="supports")
> > + @XmlElements(@XmlElement(name="support"))
> > + public Collection<SupportsBean> getSupportsBeans()
> > + {
> > + return supportsBeans;
> > + }
> > +
> > + public void setSupportsBeans(Collection<SupportsBean> supportsBeans)
> > + {
> > + this.supportsBeans = supportsBeans;
> > + }
> > +
> > + @XmlElementWrapper(name="languages")
> > + @XmlElements(@XmlElement(name="language"))
> > + public Collection<LanguageBean> getLanguageBeans()
> > + {
> > + return languageBeans;
> > + }
> > +
> > + public void setLanguageBeans(Collection<LanguageBean> languageBeans)
> > + {
> > + this.languageBeans = languageBeans;
> > + }
> > +
> > +}
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java
> > ------------------------------------------------------------------------------
> > svn:eol-style = native
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java
> > ------------------------------------------------------------------------------
> > svn:keywords = Id
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java
> > ------------------------------------------------------------------------------
> > svn:mime-type = text/plain
> >
> > Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeans.java
> > URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeans.java?rev=884670&view=auto
> > ==============================================================================
> > --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeans.java (added)
> > +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeans.java Thu Nov 26 19:21:39 2009
> > @@ -0,0 +1,54 @@
> > +/*
> > + * Licensed to the Apache Software Foundation (ASF) under one or more
> > + * contributor license agreements. See the NOTICE file distributed with
> > + * this work for additional information regarding copyright ownership.
> > + * The ASF licenses this file to You under the Apache License, Version 2.0
> > + * (the "License"); you may not use this file except in compliance with
> > + * the License. You may obtain a copy of the License at
> > + *
> > + * http://www.apache.org/licenses/LICENSE-2.0
> > + *
> > + * Unless required by applicable law or agreed to in writing, software
> > + * distributed under the License is distributed on an "AS IS" BASIS,
> > + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> > + * See the License for the specific language governing permissions and
> > + * limitations under the License.
> > + */
> > +package org.apache.jetspeed.services.beans;
> > +
> > +import java.io.Serializable;
> > +import java.util.Collection;
> > +
> > +import javax.xml.bind.annotation.XmlElement;
> > +import javax.xml.bind.annotation.XmlElements;
> > +import javax.xml.bind.annotation.XmlRootElement;
> > +
> > +/**
> > + * PortletDefinitionBeans
> > + *
> > + * @version $Id$
> > + */
> > +@XmlRootElement(name="definitions")
> > +public class PortletDefinitionBeans implements Serializable
> > +{
> > + private static final long serialVersionUID = 1L;
> > +
> > + private Collection<PortletDefinitionBean> portletDefinitionBeans;
> > +
> > + public PortletDefinitionBeans()
> > + {
> > +
> > + }
> > +
> > + @XmlElements(@XmlElement(name="definition"))
> > + public Collection<PortletDefinitionBean> getPortletDefinitionBean()
> > + {
> > + return portletDefinitionBeans;
> > + }
> > +
> > + public void setPortletApplicationBeans(Collection<PortletDefinitionBean> portletDefinitionBeans)
> > + {
> > + this.portletDefinitionBeans = portletDefinitionBeans;
> > + }
> > +
> > +}
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeans.java
> > ------------------------------------------------------------------------------
> > svn:eol-style = native
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeans.java
> > ------------------------------------------------------------------------------
> > svn:keywords = Id
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeans.java
> > ------------------------------------------------------------------------------
> > svn:mime-type = text/plain
> >
> > Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletInfoBean.java
> > URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletInfoBean.java?rev=884670&view=auto
> > ==============================================================================
> > --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletInfoBean.java (added)
> > +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletInfoBean.java Thu Nov 26 19:21:39 2009
> > @@ -0,0 +1,81 @@
> > +/*
> > + * Licensed to the Apache Software Foundation (ASF) under one or more
> > + * contributor license agreements. See the NOTICE file distributed with
> > + * this work for additional information regarding copyright ownership.
> > + * The ASF licenses this file to You under the Apache License, Version 2.0
> > + * (the "License"); you may not use this file except in compliance with
> > + * the License. You may obtain a copy of the License at
> > + *
> > + * http://www.apache.org/licenses/LICENSE-2.0
> > + *
> > + * Unless required by applicable law or agreed to in writing, software
> > + * distributed under the License is distributed on an "AS IS" BASIS,
> > + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> > + * See the License for the specific language governing permissions and
> > + * limitations under the License.
> > + */
> > +package org.apache.jetspeed.services.beans;
> > +
> > +import java.io.Serializable;
> > +
> > +import javax.xml.bind.annotation.XmlRootElement;
> > +
> > +import org.apache.jetspeed.om.portlet.PortletInfo;
> > +
> > +/**
> > + * PortletInfoBean
> > + *
> > + * @version $Id$
> > + */
> > +@XmlRootElement(name="portletInfo")
> > +public class PortletInfoBean implements Serializable
> > +{
> > + private static final long serialVersionUID = 1L;
> > +
> > + private String keywords;
> > + private String shortTitle;
> > + private String title;
> > +
> > + public PortletInfoBean()
> > + {
> > +
> > + }
> > +
> > + public PortletInfoBean(final PortletInfo portletInfo)
> > + {
> > + keywords = portletInfo.getKeywords();
> > + shortTitle = portletInfo.getShortTitle();
> > + title = portletInfo.getTitle();
> > + }
> > +
> > + public String getKeywords()
> > + {
> > + return keywords;
> > + }
> > +
> > + public void setKeywords(String keywords)
> > + {
> > + this.keywords = keywords;
> > + }
> > +
> > + public String getShortTitle()
> > + {
> > + return shortTitle;
> > + }
> > +
> > + public void setShortTitle(String shortTitle)
> > + {
> > + this.shortTitle = shortTitle;
> > + }
> > +
> > + public String getTitle()
> > + {
> > + return title;
> > + }
> > +
> > + public void setTitle(String title)
> > + {
> > + this.title = title;
> > + }
> > +
> > +}
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletInfoBean.java
> > ------------------------------------------------------------------------------
> > svn:eol-style = native
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletInfoBean.java
> > ------------------------------------------------------------------------------
> > svn:keywords = Id
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletInfoBean.java
> > ------------------------------------------------------------------------------
> > svn:mime-type = text/plain
> >
> > Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/SupportsBean.java
> > URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/SupportsBean.java?rev=884670&view=auto
> > ==============================================================================
> > --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/SupportsBean.java (added)
> > +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/SupportsBean.java Thu Nov 26 19:21:39 2009
> > @@ -0,0 +1,89 @@
> > +/*
> > + * Licensed to the Apache Software Foundation (ASF) under one or more
> > + * contributor license agreements. See the NOTICE file distributed with
> > + * this work for additional information regarding copyright ownership.
> > + * The ASF licenses this file to You under the Apache License, Version 2.0
> > + * (the "License"); you may not use this file except in compliance with
> > + * the License. You may obtain a copy of the License at
> > + *
> > + * http://www.apache.org/licenses/LICENSE-2.0
> > + *
> > + * Unless required by applicable law or agreed to in writing, software
> > + * distributed under the License is distributed on an "AS IS" BASIS,
> > + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> > + * See the License for the specific language governing permissions and
> > + * limitations under the License.
> > + */
> > +package org.apache.jetspeed.services.beans;
> > +
> > +import java.io.Serializable;
> > +import java.util.Collection;
> > +
> > +import javax.xml.bind.annotation.XmlElement;
> > +import javax.xml.bind.annotation.XmlElementWrapper;
> > +import javax.xml.bind.annotation.XmlElements;
> > +import javax.xml.bind.annotation.XmlRootElement;
> > +
> > +import org.apache.jetspeed.om.portlet.Supports;
> > +
> > +/**
> > + * SupportsBean
> > + *
> > + * @version $Id$
> > + */
> > +@XmlRootElement(name="support")
> > +public class SupportsBean implements Serializable
> > +{
> > + private static final long serialVersionUID = 1L;
> > +
> > + private String mimeType;
> > + private Collection<String> portletModes;
> > + private Collection<String> windowStates;
> > +
> > + public SupportsBean()
> > + {
> > +
> > + }
> > +
> > + public SupportsBean(final Supports supports)
> > + {
> > + mimeType = supports.getMimeType();
> > + portletModes = supports.getPortletModes();
> > + windowStates = supports.getWindowStates();
> > + }
> > +
> > + public String getMimeType()
> > + {
> > + return mimeType;
> > + }
> > +
> > + public void setMimeType(String mimeType)
> > + {
> > + this.mimeType = mimeType;
> > + }
> > +
> > + @XmlElementWrapper(name="portletModes")
> > + @XmlElements(@XmlElement(name="portletMode"))
> > + public Collection<String> getPortletModes()
> > + {
> > + return portletModes;
> > + }
> > +
> > + public void setPortletModes(Collection<String> portletModes)
> > + {
> > + this.portletModes = portletModes;
> > + }
> > +
> > + @XmlElementWrapper(name="windowStates")
> > + @XmlElements(@XmlElement(name="windowState"))
> > + public Collection<String> getWindowStates()
> > + {
> > + return windowStates;
> > + }
> > +
> > + public void setWindowStates(Collection<String> windowStates)
> > + {
> > + this.windowStates = windowStates;
> > + }
> > +
> > +}
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/SupportsBean.java
> > ------------------------------------------------------------------------------
> > svn:eol-style = native
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/SupportsBean.java
> > ------------------------------------------------------------------------------
> > svn:keywords = Id
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/SupportsBean.java
> > ------------------------------------------------------------------------------
> > svn:mime-type = text/plain
> >
> > Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java
> > URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java?rev=884670&view=auto
> > ==============================================================================
> > --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java (added)
> > +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java Thu Nov 26 19:21:39 2009
> > @@ -0,0 +1,147 @@
> > +/*
> > + * Licensed to the Apache Software Foundation (ASF) under one or more
> > + * contributor license agreements. See the NOTICE file distributed with
> > + * this work for additional information regarding copyright ownership.
> > + * The ASF licenses this file to You under the Apache License, Version 2.0
> > + * (the "License"); you may not use this file except in compliance with
> > + * the License. You may obtain a copy of the License at
> > + *
> > + * http://www.apache.org/licenses/LICENSE-2.0
> > + *
> > + * Unless required by applicable law or agreed to in writing, software
> > + * distributed under the License is distributed on an "AS IS" BASIS,
> > + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> > + * See the License for the specific language governing permissions and
> > + * limitations under the License.
> > + */
> > +package org.apache.jetspeed.services.rest;
> > +
> > +import java.util.ArrayList;
> > +import java.util.List;
> > +
> > +import javax.servlet.ServletConfig;
> > +import javax.servlet.ServletContext;
> > +import javax.servlet.http.HttpServletRequest;
> > +import javax.ws.rs.GET;
> > +import javax.ws.rs.Path;
> > +import javax.ws.rs.PathParam;
> > +import javax.ws.rs.core.Context;
> > +import javax.ws.rs.core.UriInfo;
> > +
> > +import org.apache.commons.lang.StringUtils;
> > +import org.apache.jetspeed.Jetspeed;
> > +import org.apache.jetspeed.components.portletregistry.PortletRegistry;
> > +import org.apache.jetspeed.om.portlet.PortletApplication;
> > +import org.apache.jetspeed.om.portlet.PortletDefinition;
> > +import org.apache.jetspeed.services.beans.PortletApplicationBean;
> > +import org.apache.jetspeed.services.beans.PortletApplicationBeans;
> > +import org.apache.jetspeed.services.beans.PortletDefinitionBean;
> > +import org.apache.jetspeed.services.beans.PortletDefinitionBeans;
> > +import org.slf4j.Logger;
> > +import org.slf4j.LoggerFactory;
> > +
> > +/**
> > + * PortletRegistryService
> > + *
> > + * @vesion $Id$
> > + */
> > +
> > +@Path("/portletregistry/")
> > +public class PortletRegistryService
> > +{
> > +
> > + private static Logger log = LoggerFactory.getLogger(PortletRegistryService.class);
> > +
> > + @Context
> > + private ServletConfig servletConfig;
> > +
> > + @Context
> > + private ServletContext servletContext;
> > +
> > + @Context
> > + private HttpServletRequest servletRequest;
> > +
> > + @Context
> > + private UriInfo uriInfo;
> > +
> > + private PortletRegistry portletRegistry;
> > +
> > + public PortletRegistryService()
> > + {
> > + portletRegistry = (PortletRegistry) Jetspeed.getComponentManager().getComponent(PortletRegistry.class);
> > + }
> > +
> > + @GET
> > + @Path("/application/{name}")
> > + public PortletApplicationBeans getPortletApplication(@PathParam("name") String name)
> > + {
> > + PortletApplicationBeans paBeans = new PortletApplicationBeans();
> > + List<PortletApplicationBean> paBeanList = new ArrayList<PortletApplicationBean>();
> > +
> > + if (StringUtils.isBlank(name))
> > + {
> > + for (PortletApplication pa : portletRegistry.getPortletApplications())
> > + {
> > + paBeanList.add(new PortletApplicationBean(pa));
> > + }
> > + }
> > + else
> > + {
> > + PortletApplication pa = portletRegistry.getPortletApplication(name, true);
> > +
> > + if (pa != null)
> > + {
> > + paBeanList.add(new PortletApplicationBean(pa));
> > + }
> > + }
> > +
> > + paBeans.setPortletApplicationBeans(paBeanList);
> > + return paBeans;
> > + }
> > +
> > + @GET
> > + @Path("/definition/{uniqueName}")
> > + public PortletDefinitionBeans getPortletDefinition(@PathParam("uniqueName") String uniqueName)
> > + {
> > + PortletDefinitionBeans pdBeans = new PortletDefinitionBeans();
> > + List<PortletDefinitionBean> pdBeanList = new ArrayList<PortletDefinitionBean>();
> > +
> > + if (StringUtils.isBlank(uniqueName))
> > + {
> > + for (PortletDefinition pd : portletRegistry.getAllPortletDefinitions())
> > + {
> > + pdBeanList.add(new PortletDefinitionBean(pd));
> > + }
> > + }
> > + else
> > + {
> > + int offset = uniqueName.indexOf("::");
> > +
> > + if (offset != -1)
> > + {
> > + PortletDefinition pd = portletRegistry.getPortletDefinitionByUniqueName(uniqueName, true);
> > +
> > + if (pd != null)
> > + {
> > + pdBeanList.add(new PortletDefinitionBean(pd));
> > + }
> > + }
> > + else
> > + {
> > + PortletApplication pa = portletRegistry.getPortletApplication(uniqueName, true);
> > +
> > + if (pa != null)
> > + {
> > + for (PortletDefinition pd : pa.getPortlets())
> > + {
> > + pdBeanList.add(new PortletDefinitionBean(pd));
> > + }
> > + }
> > + }
> > + }
> > +
> > + pdBeans.setPortletApplicationBeans(pdBeanList);
> > + return pdBeans;
> > + }
> > +
> > +}
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java
> > ------------------------------------------------------------------------------
> > svn:eol-style = native
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java
> > ------------------------------------------------------------------------------
> > svn:keywords = Id
> >
> > Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java
> > ------------------------------------------------------------------------------
> > svn:mime-type = text/plain
> >
> > Added: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml
> > URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml?rev=884670&view=auto
> > ==============================================================================
> > --- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml (added)
> > +++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml Thu Nov 26 19:21:39 2009
> > @@ -0,0 +1,55 @@
> > +<?xml version="1.0" encoding="UTF-8"?>
> > +
> > +<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
> > + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
> > +
> > + <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
> > + <property name="targetClass" value="java.lang.System"/>
> > + <property name="targetMethod" value="setProperty"/>
> > + <property name="arguments">
> > + <list>
> > + <value>org.apache.cxf.Logger</value>
> > + <value>org.apache.cxf.common.logging.Log4jLogger</value>
> > + </list>
> > + </property>
> > + </bean>
> > +
> > + <bean id="cxfServlet" class="org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet">
> > + <meta key="j2:cat" value="default" />
> > + </bean>
> > +
> > + <bean id="cxfServletConfig" class="org.apache.jetspeed.pipeline.valve.impl.ServletDelegatingValve$ServletConfigImpl">
> > + <meta key="j2:cat" value="default" />
> > + <constructor-arg value="CXFNonSpringJaxrsServlet" />
> > + <constructor-arg>
> > + <props>
> > + 
> > + <prop key="jaxrs.serviceClasses">
> > + org.apache.jetspeed.services.rest.PortletRegistryService
> > + </prop>
> > + </props>
> > + </constructor-arg>
> > + <property name="servletContext">
> > + <bean class="org.springframework.beans.factory.config.PropertyPathFactoryBean">
> > + <property name="targetObject" ref="javax.servlet.ServletConfig" />
> > + <property name="propertyPath" value="servletContext"/>
> > + </bean>
> > + </property>
> > + </bean>
> > +
> > +</beans>
> > \ No newline at end of file
> >
> > Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml
> > ------------------------------------------------------------------------------
> > svn:eol-style = native
> >
> > Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml
> > ------------------------------------------------------------------------------
> > svn:keywords = Id
> >
> > Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml
> > ------------------------------------------------------------------------------
> > svn:mime-type = text/plain
> >
> > Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml
> > URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml?rev=884670&r1=884669&r2=884670&view=diff
> > ==============================================================================
> > --- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml (original)
> > +++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml Thu Nov 26 19:21:39 2009
> > @@ -349,7 +349,14 @@
> > <ref bean="RolesSecurityBehavior" />
> > </constructor-arg>
> > </bean>
> > -
> > +
> > + <bean id="RestfulServicesValve" class="org.apache.jetspeed.pipeline.valve.impl.ServletDelegatingValve"
> > + init-method="initialize" destroy-method="destroy">
> > + <meta key="j2:cat" value="default" />
> > + <constructor-arg ref="cxfServlet" />
> > + <constructor-arg ref="cxfServletConfig" />
> > + </bean>
> > +
> > <bean id="DecorationValve" class="org.apache.jetspeed.decoration.DecorationValve" init-method="initialize">
> > <meta key="j2:cat" value="default" />
> > <constructor-arg index='0'>
> > @@ -714,6 +721,25 @@
> > </constructor-arg>
> > </bean>
> >
> > + <bean id="restful-services-pipeline" class="org.apache.jetspeed.pipeline.JetspeedPipeline" init-method="initialize">
> > + <meta key="j2:cat" value="default" />
> > + <constructor-arg>
> > + <value>RestfulServicesPipeline</value>
> > + </constructor-arg>
> > + <constructor-arg>
> > + <list>
> > + <ref bean="capabilityValve" />
> > + <ref bean="portalURLValve" />
> > + <ref bean="securityValve" />
> > + <ref bean="localizationValve" />
> > + <ref bean="profilerValve" />
> > + <ref bean="refreshUserHomepageValve" />
> > + <ref bean="containerValve" />
> > + <ref bean="RestfulServicesValve" />
> > + </list>
> > + </constructor-arg>
> > + </bean>
> > +
> > <bean id="fileserver-pipeline" class="org.apache.jetspeed.pipeline.JetspeedPipeline" init-method="initialize">
> > <meta key="j2:cat" value="default" />
> > <constructor-arg>
> > @@ -793,18 +819,21 @@
> > <entry key='/portal'>
> > <value>jetspeed-pipeline</value>
> > </entry>
> > - <entry key='/ajaxapi'>
> > - <value>ajax-pipeline</value>
> > - </entry>
> > <entry key='/login'>
> > <value>jetspeed-pipeline</value>
> > </entry>
> > <entry key='/fileserver'>
> > <value>fileserver-pipeline</value>
> > </entry>
> > + <entry key='/ajaxapi'>
> > + <value>ajax-pipeline</value>
> > + </entry>
> > <entry key='/ajax'>
> > <value>ajax-direct-pipeline</value>
> > </entry>
> > + <entry key='/services'>
> > + <value>restful-services-pipeline</value>
> > + </entry>
> > <entry key='/desktop'>
> > <value>desktop-pipeline</value>
> > </entry>
> >
> > Modified: portals/jetspeed-2/portal/trunk/pom.xml
> > URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=884670&r1=884669&r2=884670&view=diff
> > ==============================================================================
> > --- portals/jetspeed-2/portal/trunk/pom.xml (original)
> > +++ portals/jetspeed-2/portal/trunk/pom.xml Thu Nov 26 19:21:39 2009
> > @@ -269,6 +269,7 @@
> > <javax.servlet.jsp.version>2.0</javax.servlet.jsp.version>
> > <javax.sql.version>2.0</javax.sql.version>
> > <javax.transaction.version>1.0.1B</javax.transaction.version>
> > + <javax.ws.rs.version>1.0</javax.ws.rs.version>
> > <jaxen.version>1.0-FCS</jaxen.version>
> > <jaxb.version>2.1</jaxb.version>
> > <jaxb-impl.version>2.1.9</jaxb-impl.version>
> > @@ -311,6 +312,7 @@
> > <ccpp.version>1.0</ccpp.version>
> > <commonj.version>1.1</commonj.version>
> > <tyrex.version>1.0.1</tyrex.version>
> > + <cxf.version>2.2.5</cxf.version>
> > </properties>
> >
> > 
> > @@ -974,7 +976,44 @@
> > <artifactId>jaxb-impl</artifactId>
> > <version>${jaxb-impl.version}</version>
> > </dependency>
> > -
> > +
> > + 
> > + <dependency>
> > + <groupId>javax.ws.rs</groupId>
> > + <artifactId>jsr311-api</artifactId>
> > + <version>${javax.ws.rs.version}</version>
> > + </dependency>
> > +
> > + 
> > + <dependency>
> > + <groupId>org.apache.cxf</groupId>
> > + <artifactId>cxf-rt-frontend-jaxrs</artifactId>
> > + <version>${cxf.version}</version>
> > + <scope>runtime</scope>
> > + <exclusions>
> > + <exclusion>
> > + <groupId>commons-logging</groupId>
> > + <artifactId>commons-logging</artifactId>
> > + </exclusion>
> > + <exclusion>
> > + <groupId>org.springframework</groupId>
> > + <artifactId>spring-core</artifactId>
> > + </exclusion>
> > + <exclusion>
> > + <groupId>org.springframework</groupId>
> > + <artifactId>spring-beans</artifactId>
> > + </exclusion>
> > + <exclusion>
> > + <groupId>org.springframework</groupId>
> > + <artifactId>spring-context</artifactId>
> > + </exclusion>
> > + <exclusion>
> > + <groupId>org.springframework</groupId>
> > + <artifactId>spring-web</artifactId>
> > + </exclusion>
> > + </exclusions>
> > + </dependency>
> > +
> > 
> > <dependency>
> > <groupId>junit</groupId>
> >
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: jetspeed-dev-unsubscribe@...
> > For additional commands, e-mail: jetspeed-dev-help@...
> >
>
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: jetspeed-dev-unsubscribe@...
> For additional commands, e-mail: jetspeed-dev-help@...
>

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@...
For additional commands, e-mail: jetspeed-dev-help@...

Other toolkits

2009-11-27T05:14:16Z

First of all... I know that this proposition doubles work...

But can at least leave door open for other AJAX toolkits?

I mean, it would be nice if ajax implementation doesn't rely on only one
toolkit or implementation. So others can implement their own.

Maybe I can propone patches to leave door open to other toolkits and
make
jetspeed interface generic...

Tnx

Re: svn commit: r884670 - in /portals/jetspeed-2/portal/trunk: ./ applications/jetspeed/src/main/resources/ applications/jetspeed/src/main/webapp/WEB-INF/ components/jetspeed-portal/ components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/val...

2009-11-27T05:10:52Z

Hi Woonsan,

Ok. I will try to implement this into the toolbox and add a new service
to get all categories. So they will
be updated dynamically when new apps are added. This also will help me
to dive into JAX-RS services.

I also recommend to set default category in toolbox to "News" or some
other because it will get messy
when lot's of portlets are in place. Can I do it also?

Tnx

El vie, 27-11-2009 a las 04:59 -0800, Woonsan Ko escribió:

Re: svn commit: r884670 - in /portals/jetspeed-2/portal/trunk: ./ applications/jetspeed/src/main/resources/ applications/jetspeed/src/main/webapp/WEB-INF/ components/jetspeed-portal/ components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/val...

2009-11-27T04:59:59Z

Hi Gonzalo,

Yes, I'm implementing JAX-RS services which possibly replaces the old ajax apis. It should be regarded as a prototype until other committers get satisfied with this new one.
However, I'd like to see this new JAX-RS service used in the toolbox portlet. It would help evaluation.
If you are interested in this, please dive into it. I will really appreciate it. :-)

By the way, many Jetspeed developers prefer json to xml, so I think we'd better use json marshaling instead of xml marshaling in toolbox portlet.
Also, I found a problem to fix. It should be more consistently mappable between xml and json marshaling. I hope to fix these today. I will update the status in the commit messages.
FYI, you can use json marshaling by adding "?_type=json" parameter as follows:

(1) GET all PAs: http://localhost:8080/jetspeed/services/portletregistry/application/%20?_type=json
(2) GET demo PA: http://localhost:8080/jetspeed/services/portletregistry/application/demo/?_type=json
(3) GET all PDs: http://localhost:8080/jetspeed/services/portletregistry/definition/%20?_type=json
(4) GET all PDs of demo PA: http://localhost:8080/jetspeed/services/portletregistry/definition/demo/?_type=json
(5) GET demo::PickANumberPortlet PD: http://localhost:8080/jetspeed/services/portletregistry/definition/demo::PickANumberPortlet/?_type=json

Apache CXF allows to change marshaling types by Accept header as well, but I think this is very handy.

Kind regards,

Woonsan

----- Original Message ----
From: Gonzalo Aguilar Delgado <gaguilar@...>
To: Jetspeed Developers List <jetspeed-dev@...>
Sent: Fri, November 27, 2009 1:26:28 PM
Subject: Re: svn commit: r884670 - in /portals/jetspeed-2/portal/trunk: ./ applications/jetspeed/src/main/resources/ applications/jetspeed/src/main/webapp/WEB-INF/ components/jetspeed-portal/ components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/val...

Woonsan,

Is this a new type of service implementation? Will Jetspeed go in that
direction?

Do you want me to put this into the toolbox?

Tnx

El jue, 26-11-2009 a las 19:21 +0000, woonsan@... escribió:

> Author: woonsan
> Date: Thu Nov 26 19:21:39 2009
> New Revision: 884670
>
> URL: http://svn.apache.org/viewvc?rev=884670&view=rev
> Log:
> JS2-1087: Adding initial JAX-RS support as prototype
> The following urls are testable:
>
> (1) GET all PAs: http://localhost:8080/jetspeed/services/portletregistry/application/%20
> (2) GET demo PA: http://localhost:8080/jetspeed/services/portletregistry/application/demo/
> (3) GET all PDs: http://localhost:8080/jetspeed/services/portletregistry/definition/%20
> (4) GET all PDs of demo PA: http://localhost:8080/jetspeed/services/portletregistry/definition/demo/
> (5) GET demo::PickANumberPortlet PD: http://localhost:8080/jetspeed/services/portletregistry/definition/demo::PickANumberPortlet/
>
> TODO: Remove '%20' in the urls to indicate '*', test with json client and integrate it with toolbox portlet.
>
> Added:
> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ServletDelegatingValve.java (with props)
> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/
> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DescriptionBean.java (with props)
> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DisplayNameBean.java (with props)
> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/InitParamBean.java (with props)
> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/LanguageBean.java (with props)
> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBean.java (with props)
> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeans.java (with props)
> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java (with props)
> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeans.java (with props)
> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletInfoBean.java (with props)
> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/SupportsBean.java (with props)
> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/
> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java (with props)
> portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml (with props)
> Modified:
> portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.xml
> portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/web.xml
> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
> portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/ (props changed)
> portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml
> portals/jetspeed-2/portal/trunk/pom.xml
>
> Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.xml
> URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.xml?rev=884670&r1=884669&r2=884670&view=diff
> ==============================================================================
> --- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.xml (original)
> +++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/resources/log4j.xml Thu Nov 26 19:21:39 2009
> @@ -94,7 +94,15 @@
> <param name="ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} %-5p [%C.%M():%L] %m%n"/>
> </layout>
> </appender>
> -
> +
> + 
> + <appender name="cxf" class="org.apache.log4j.FileAppender">
> + <param name="File" value="${org.apache.portals.logdir}/jetspeed-cxf.log"/>
> + <layout class="org.apache.log4j.PatternLayout">
> + <param name="ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} %-5p [%C.%M():%L] %m%n"/>
> + </layout>
> + </appender>
> +
> 
> 
> 
> @@ -134,6 +142,11 @@
> <appender-ref ref="ojb"/>
> </category>
>
> + <category additivity="false" name="org.apache.cxf">
> + <level value="ERROR"/>
> + <appender-ref ref="cxf"/>
> + </category>
> +
> <category additivity="false" name="scheduler">
> <level value="ERROR"/>
> <appender-ref ref="scheduler"/>
>
> Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/web.xml
> URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/web.xml?rev=884670&r1=884669&r2=884670&view=diff
> ==============================================================================
> --- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/web.xml (original)
> +++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/web.xml Thu Nov 26 19:21:39 2009
> @@ -180,6 +180,10 @@
> </servlet-mapping>
> <servlet-mapping>
> <servlet-name>jetspeed</servlet-name>
> + <url-pattern>/services/*</url-pattern>
> + </servlet-mapping>
> + <servlet-mapping>
> + <servlet-name>jetspeed</servlet-name>
> <url-pattern>/desktop/*</url-pattern>
> </servlet-mapping>
> <servlet-mapping>
>
> Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
> URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml?rev=884670&r1=884669&r2=884670&view=diff
> ==============================================================================
> --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml (original)
> +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml Thu Nov 26 19:21:39 2009
> @@ -165,6 +165,15 @@
> <groupId>org.springframework</groupId>
> <artifactId>spring-context-support</artifactId>
> </dependency>
> + <dependency>
> + <groupId>javax.ws.rs</groupId>
> + <artifactId>jsr311-api</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.cxf</groupId>
> + <artifactId>cxf-rt-frontend-jaxrs</artifactId>
> + <scope>runtime</scope>
> + </dependency>
>
> 
> <dependency>
>
> Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ServletDelegatingValve.java
> URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ServletDelegatingValve.java?rev=884670&view=auto
> ==============================================================================
> --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ServletDelegatingValve.java (added)
> +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ServletDelegatingValve.java Thu Nov 26 19:21:39 2009
> @@ -0,0 +1,125 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under one or more
> + * contributor license agreements. See the NOTICE file distributed with
> + * this work for additional information regarding copyright ownership.
> + * The ASF licenses this file to You under the Apache License, Version 2.0
> + * (the "License"); you may not use this file except in compliance with
> + * the License. You may obtain a copy of the License at
> + *
> + * http://www.apache.org/licenses/LICENSE-2.0
> + *
> + * Unless required by applicable law or agreed to in writing, software
> + * distributed under the License is distributed on an "AS IS" BASIS,
> + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> + * See the License for the specific language governing permissions and
> + * limitations under the License.
> + */
> +package org.apache.jetspeed.pipeline.valve.impl;
> +
> +import java.util.Collections;
> +import java.util.Enumeration;
> +import java.util.Map;
> +
> +import javax.servlet.ServletConfig;
> +import javax.servlet.ServletContext;
> +import javax.servlet.http.HttpServlet;
> +
> +import org.apache.jetspeed.pipeline.PipelineException;
> +import org.apache.jetspeed.pipeline.valve.AbstractValve;
> +import org.apache.jetspeed.pipeline.valve.ValveContext;
> +import org.apache.jetspeed.request.RequestContext;
> +
> +/**
> + * ServletDelegatingValve
> + *
> + * @version $Id$
> + */
> +public class ServletDelegatingValve extends AbstractValve
> +{
> + protected HttpServlet servlet;
> + protected ServletConfig config;
> +
> + public ServletDelegatingValve(HttpServlet servlet, ServletConfig config)
> + {
> + this.servlet = servlet;
> + this.config = config;
> + }
> +
> + @Override
> + public void initialize() throws PipelineException
> + {
> + try
> + {
> + servlet.init(config);
> + }
> + catch (Exception e)
> + {
> + throw new PipelineException(e);
> + }
> + }
> +
> + public void destroy()
> + {
> + servlet.destroy();
> + }
> +
> + @Override
> + public void invoke(RequestContext request, ValveContext context) throws PipelineException
> + {
> + try
> + {
> + servlet.service(request.getRequest(), request.getResponse());
> + }
> + catch (Exception e)
> + {
> + throw new PipelineException(e);
> + }
> +
> + // continue
> + context.invokeNext(request);
> + }
> +
> + public static class ServletConfigImpl implements ServletConfig
> + {
> + protected String servletName;
> + protected Map<String, String> initParams;
> + protected ServletContext servletContext;
> +
> + public ServletConfigImpl(String servletName, Map<String, String> initParams)
> + {
> + this(servletName, initParams, null);
> + }
> +
> + public ServletConfigImpl(String servletName, Map<String, String> initParams, ServletContext servletContext)
> + {
> + this.servletName = servletName;
> + this.initParams = initParams;
> + this.servletContext = servletContext;
> + }
> +
> + public String getInitParameter(String paramName)
> + {
> + return initParams.get(paramName);
> + }
> +
> + public Enumeration getInitParameterNames()
> + {
> + return Collections.enumeration(initParams.keySet());
> + }
> +
> + public ServletContext getServletContext()
> + {
> + return servletContext;
> + }
> +
> + public void setServletContext(ServletContext servletContext)
> + {
> + this.servletContext = servletContext;
> + }
> +
> + public String getServletName()
> + {
> + return servletName;
> + }
> + }
> +}
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ServletDelegatingValve.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ServletDelegatingValve.java
> ------------------------------------------------------------------------------
> svn:keywords = Id
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/ServletDelegatingValve.java
> ------------------------------------------------------------------------------
> svn:mime-type = text/plain
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/
> ------------------------------------------------------------------------------
> --- svn:ignore (original)
> +++ svn:ignore Thu Nov 26 19:21:39 2009
> @@ -1,2 +1,2 @@
> -target
> +target
> surefire*.properties
>
> Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DescriptionBean.java
> URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DescriptionBean.java?rev=884670&view=auto
> ==============================================================================
> --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DescriptionBean.java (added)
> +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DescriptionBean.java Thu Nov 26 19:21:39 2009
> @@ -0,0 +1,87 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under one or more
> + * contributor license agreements. See the NOTICE file distributed with
> + * this work for additional information regarding copyright ownership.
> + * The ASF licenses this file to You under the Apache License, Version 2.0
> + * (the "License"); you may not use this file except in compliance with
> + * the License. You may obtain a copy of the License at
> + *
> + * http://www.apache.org/licenses/LICENSE-2.0
> + *
> + * Unless required by applicable law or agreed to in writing, software
> + * distributed under the License is distributed on an "AS IS" BASIS,
> + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> + * See the License for the specific language governing permissions and
> + * limitations under the License.
> + */
> +package org.apache.jetspeed.services.beans;
> +
> +import java.io.Serializable;
> +import java.util.Locale;
> +
> +import javax.xml.bind.annotation.XmlRootElement;
> +
> +import org.apache.jetspeed.om.portlet.Description;
> +
> +/**
> + * DescriptionBean
> + *
> + * @version $Id$
> + */
> +@XmlRootElement(name="description")
> +public class DescriptionBean implements Serializable
> +{
> + private static final long serialVersionUID = 1L;
> +
> + private String description;
> + private String lang;
> + private String localeString;
> +
> + public DescriptionBean()
> + {
> +
> + }
> +
> + public DescriptionBean(final Description description)
> + {
> + this.description = description.getDescription();
> + lang = description.getLang();
> +
> + Locale locale = description.getLocale();
> +
> + if (locale != null)
> + {
> + localeString = locale.toString();
> + }
> + }
> +
> + public String getDescription()
> + {
> + return description;
> + }
> +
> + public void setDescription(String description)
> + {
> + this.description = description;
> + }
> +
> + public String getLang()
> + {
> + return lang;
> + }
> +
> + public void setLang(String lang)
> + {
> + this.lang = lang;
> + }
> +
> + public String getLocaleString()
> + {
> + return localeString;
> + }
> +
> + public void setLocaleString(String localeString)
> + {
> + this.localeString = localeString;
> + }
> +}
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DescriptionBean.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DescriptionBean.java
> ------------------------------------------------------------------------------
> svn:keywords = Id
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DescriptionBean.java
> ------------------------------------------------------------------------------
> svn:mime-type = text/plain
>
> Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DisplayNameBean.java
> URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DisplayNameBean.java?rev=884670&view=auto
> ==============================================================================
> --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DisplayNameBean.java (added)
> +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DisplayNameBean.java Thu Nov 26 19:21:39 2009
> @@ -0,0 +1,88 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under one or more
> + * contributor license agreements. See the NOTICE file distributed with
> + * this work for additional information regarding copyright ownership.
> + * The ASF licenses this file to You under the Apache License, Version 2.0
> + * (the "License"); you may not use this file except in compliance with
> + * the License. You may obtain a copy of the License at
> + *
> + * http://www.apache.org/licenses/LICENSE-2.0
> + *
> + * Unless required by applicable law or agreed to in writing, software
> + * distributed under the License is distributed on an "AS IS" BASIS,
> + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> + * See the License for the specific language governing permissions and
> + * limitations under the License.
> + */
> +package org.apache.jetspeed.services.beans;
> +
> +import java.io.Serializable;
> +import java.util.Locale;
> +
> +import javax.xml.bind.annotation.XmlRootElement;
> +
> +import org.apache.jetspeed.om.portlet.DisplayName;
> +
> +/**
> + * DisplayNameBean
> + *
> + * @version $Id$
> + */
> +@XmlRootElement(name="displayName")
> +public class DisplayNameBean implements Serializable
> +{
> + private static final long serialVersionUID = 1L;
> +
> + private String displayName;
> + private String lang;
> + private String localeString;
> +
> + public DisplayNameBean()
> + {
> +
> + }
> +
> + public DisplayNameBean(final DisplayName displayName)
> + {
> + this.displayName = displayName.getDisplayName();
> + lang = displayName.getLang();
> +
> + Locale locale = displayName.getLocale();
> +
> + if (locale != null)
> + {
> + localeString = locale.toString();
> + }
> + }
> +
> + public String getDisplayName()
> + {
> + return displayName;
> + }
> +
> + public void setDisplayName(String displayName)
> + {
> + this.displayName = displayName;
> + }
> +
> + public String getLang()
> + {
> + return lang;
> + }
> +
> + public void setLang(String lang)
> + {
> + this.lang = lang;
> + }
> +
> + public String getLocaleString()
> + {
> + return localeString;
> + }
> +
> + public void setLocaleString(String localeString)
> + {
> + this.localeString = localeString;
> + }
> +
> +}
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DisplayNameBean.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DisplayNameBean.java
> ------------------------------------------------------------------------------
> svn:keywords = Id
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/DisplayNameBean.java
> ------------------------------------------------------------------------------
> svn:mime-type = text/plain
>
> Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/InitParamBean.java
> URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/InitParamBean.java?rev=884670&view=auto
> ==============================================================================
> --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/InitParamBean.java (added)
> +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/InitParamBean.java Thu Nov 26 19:21:39 2009
> @@ -0,0 +1,98 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under one or more
> + * contributor license agreements. See the NOTICE file distributed with
> + * this work for additional information regarding copyright ownership.
> + * The ASF licenses this file to You under the Apache License, Version 2.0
> + * (the "License"); you may not use this file except in compliance with
> + * the License. You may obtain a copy of the License at
> + *
> + * http://www.apache.org/licenses/LICENSE-2.0
> + *
> + * Unless required by applicable law or agreed to in writing, software
> + * distributed under the License is distributed on an "AS IS" BASIS,
> + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> + * See the License for the specific language governing permissions and
> + * limitations under the License.
> + */
> +package org.apache.jetspeed.services.beans;
> +
> +import java.io.Serializable;
> +import java.util.ArrayList;
> +import java.util.Collection;
> +
> +import javax.xml.bind.annotation.XmlElement;
> +import javax.xml.bind.annotation.XmlElementWrapper;
> +import javax.xml.bind.annotation.XmlElements;
> +import javax.xml.bind.annotation.XmlRootElement;
> +
> +import org.apache.jetspeed.om.portlet.Description;
> +import org.apache.jetspeed.om.portlet.InitParam;
> +
> +/**
> + * InitParamBean
> + *
> + * @version $Id$
> + */
> +@XmlRootElement(name="initParam")
> +public class InitParamBean implements Serializable
> +{
> + private static final long serialVersionUID = 1L;
> +
> + private String paramName;
> + private String paramValue;
> + private Collection<DescriptionBean> descriptionBeans;
> +
> + public InitParamBean()
> + {
> +
> + }
> +
> + public InitParamBean(final InitParam initParam)
> + {
> + paramName = initParam.getParamName();
> + paramValue = initParam.getParamValue();
> +
> + ArrayList<DescriptionBean> descriptionBeanList = new ArrayList<DescriptionBean>();
> +
> + for (Description description : initParam.getDescriptions())
> + {
> + descriptionBeanList.add(new DescriptionBean(description));
> + }
> +
> + descriptionBeans = descriptionBeanList;
> + }
> +
> + public String getParamName()
> + {
> + return paramName;
> + }
> +
> + public void setParamName(String paramName)
> + {
> + this.paramName = paramName;
> + }
> +
> + public String getParamValue()
> + {
> + return paramValue;
> + }
> +
> + public void setParamValue(String paramValue)
> + {
> + this.paramValue = paramValue;
> + }
> +
> + @XmlElementWrapper(name="descriptions")
> + @XmlElements(@XmlElement(name="description"))
> + public Collection<DescriptionBean> getDescriptionBeans()
> + {
> + return descriptionBeans;
> + }
> +
> + public void setDescriptionBeans(Collection<DescriptionBean> descriptionBeans)
> + {
> + this.descriptionBeans = descriptionBeans;
> + }
> +
> +
> +}
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/InitParamBean.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/InitParamBean.java
> ------------------------------------------------------------------------------
> svn:keywords = Id
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/InitParamBean.java
> ------------------------------------------------------------------------------
> svn:mime-type = text/plain
>
> Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/LanguageBean.java
> URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/LanguageBean.java?rev=884670&view=auto
> ==============================================================================
> --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/LanguageBean.java (added)
> +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/LanguageBean.java Thu Nov 26 19:21:39 2009
> @@ -0,0 +1,64 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under one or more
> + * contributor license agreements. See the NOTICE file distributed with
> + * this work for additional information regarding copyright ownership.
> + * The ASF licenses this file to You under the Apache License, Version 2.0
> + * (the "License"); you may not use this file except in compliance with
> + * the License. You may obtain a copy of the License at
> + *
> + * http://www.apache.org/licenses/LICENSE-2.0
> + *
> + * Unless required by applicable law or agreed to in writing, software
> + * distributed under the License is distributed on an "AS IS" BASIS,
> + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> + * See the License for the specific language governing permissions and
> + * limitations under the License.
> + */
> +package org.apache.jetspeed.services.beans;
> +
> +import java.util.Locale;
> +
> +import javax.xml.bind.annotation.XmlRootElement;
> +
> +import org.apache.jetspeed.om.portlet.Language;
> +
> +/**
> + * LanguageBean
> + *
> + * @version $Id$
> + */
> +@XmlRootElement(name="language")
> +public class LanguageBean extends PortletInfoBean
> +{
> + private static final long serialVersionUID = 1L;
> +
> + private String localeString;
> +
> + public LanguageBean()
> + {
> + super();
> + }
> +
> + public LanguageBean(final Language language)
> + {
> + super(language);
> +
> + Locale locale = language.getLocale();
> +
> + if (locale != null)
> + {
> + localeString = locale.toString();
> + }
> + }
> +
> + public String getLocaleString()
> + {
> + return localeString;
> + }
> +
> + public void setLocaleString(String localeString)
> + {
> + this.localeString = localeString;
> + }
> +
> +}
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/LanguageBean.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/LanguageBean.java
> ------------------------------------------------------------------------------
> svn:keywords = Id
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/LanguageBean.java
> ------------------------------------------------------------------------------
> svn:mime-type = text/plain
>
> Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBean.java
> URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBean.java?rev=884670&view=auto
> ==============================================================================
> --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBean.java (added)
> +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBean.java Thu Nov 26 19:21:39 2009
> @@ -0,0 +1,164 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under one or more
> + * contributor license agreements. See the NOTICE file distributed with
> + * this work for additional information regarding copyright ownership.
> + * The ASF licenses this file to You under the Apache License, Version 2.0
> + * (the "License"); you may not use this file except in compliance with
> + * the License. You may obtain a copy of the License at
> + *
> + * http://www.apache.org/licenses/LICENSE-2.0
> + *
> + * Unless required by applicable law or agreed to in writing, software
> + * distributed under the License is distributed on an "AS IS" BASIS,
> + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> + * See the License for the specific language governing permissions and
> + * limitations under the License.
> + */
> +package org.apache.jetspeed.services.beans;
> +
> +import java.io.Serializable;
> +import java.util.ArrayList;
> +import java.util.Collection;
> +
> +import javax.xml.bind.annotation.XmlElement;
> +import javax.xml.bind.annotation.XmlElementWrapper;
> +import javax.xml.bind.annotation.XmlElements;
> +import javax.xml.bind.annotation.XmlRootElement;
> +
> +import org.apache.jetspeed.om.portlet.Description;
> +import org.apache.jetspeed.om.portlet.DisplayName;
> +import org.apache.jetspeed.om.portlet.PortletApplication;
> +
> +/**
> + * PortletApplicationBean
> + *
> + * @version $Id$
> + */
> +@XmlRootElement(name="application")
> +public class PortletApplicationBean implements Serializable
> +{
> + private static final long serialVersionUID = 1L;
> +
> + private String name;
> + private String contextPath;
> + private String defaultNamespace;
> + private int applicationType;
> + private long checksum;
> + private long revision;
> + private Collection<DisplayNameBean> displayNameBeans;
> + private Collection<DescriptionBean> descriptionBeans;
> +
> + public PortletApplicationBean()
> + {
> +
> + }
> +
> + public PortletApplicationBean(final PortletApplication portletApplication)
> + {
> + name = portletApplication.getName();
> + contextPath = portletApplication.getContextPath();
> + defaultNamespace = portletApplication.getDefaultNamespace();
> + applicationType = portletApplication.getApplicationType();
> + checksum = portletApplication.getChecksum();
> + revision = portletApplication.getRevision();
> +
> + ArrayList<DisplayNameBean> displayNameBeanList = new ArrayList<DisplayNameBean>();
> + for (DisplayName displayName : portletApplication.getDisplayNames())
> + {
> + displayNameBeanList.add(new DisplayNameBean(displayName));
> + }
> + displayNameBeans = displayNameBeanList;
> +
> + ArrayList<DescriptionBean> descriptionBeanList = new ArrayList<DescriptionBean>();
> + for (Description description : portletApplication.getDescriptions())
> + {
> + descriptionBeanList.add(new DescriptionBean(description));
> + }
> + descriptionBeans = descriptionBeanList;
> + }
> +
> + public String getName()
> + {
> + return name;
> + }
> +
> + public void setName(String name)
> + {
> + this.name = name;
> + }
> +
> + public String getContextPath()
> + {
> + return contextPath;
> + }
> +
> + public void setContextPath(String contextPath)
> + {
> + this.contextPath = contextPath;
> + }
> +
> + public String getDefaultNamespace()
> + {
> + return defaultNamespace;
> + }
> +
> + public void setDefaultNamespace(String defaultNamespace)
> + {
> + this.defaultNamespace = defaultNamespace;
> + }
> +
> + public int getApplicationType()
> + {
> + return applicationType;
> + }
> +
> + public void setApplicationType(int applicationType)
> + {
> + this.applicationType = applicationType;
> + }
> +
> + public long getChecksum()
> + {
> + return checksum;
> + }
> +
> + public void setChecksum(long checksum)
> + {
> + this.checksum = checksum;
> + }
> +
> + public long getRevision()
> + {
> + return revision;
> + }
> +
> + public void setRevision(long revision)
> + {
> + this.revision = revision;
> + }
> +
> + @XmlElementWrapper(name="displayNames")
> + @XmlElements(@XmlElement(name="displayName"))
> + public Collection<DisplayNameBean> getDisplayNameBeans()
> + {
> + return displayNameBeans;
> + }
> +
> + public void setDisplayNameBeans(Collection<DisplayNameBean> displayNameBeans)
> + {
> + this.displayNameBeans = displayNameBeans;
> + }
> +
> + @XmlElementWrapper(name="descriptions")
> + @XmlElements(@XmlElement(name="description"))
> + public Collection<DescriptionBean> getDescriptionBeans()
> + {
> + return descriptionBeans;
> + }
> +
> + public void setDescriptionBeans(Collection<DescriptionBean> descriptionBeans)
> + {
> + this.descriptionBeans = descriptionBeans;
> + }
> +
> +}
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBean.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBean.java
> ------------------------------------------------------------------------------
> svn:keywords = Id
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBean.java
> ------------------------------------------------------------------------------
> svn:mime-type = text/plain
>
> Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeans.java
> URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeans.java?rev=884670&view=auto
> ==============================================================================
> --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeans.java (added)
> +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeans.java Thu Nov 26 19:21:39 2009
> @@ -0,0 +1,53 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under one or more
> + * contributor license agreements. See the NOTICE file distributed with
> + * this work for additional information regarding copyright ownership.
> + * The ASF licenses this file to You under the Apache License, Version 2.0
> + * (the "License"); you may not use this file except in compliance with
> + * the License. You may obtain a copy of the License at
> + *
> + * http://www.apache.org/licenses/LICENSE-2.0
> + *
> + * Unless required by applicable law or agreed to in writing, software
> + * distributed under the License is distributed on an "AS IS" BASIS,
> + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> + * See the License for the specific language governing permissions and
> + * limitations under the License.
> + */
> +package org.apache.jetspeed.services.beans;
> +
> +import java.io.Serializable;
> +import java.util.Collection;
> +
> +import javax.xml.bind.annotation.XmlElement;
> +import javax.xml.bind.annotation.XmlElements;
> +import javax.xml.bind.annotation.XmlRootElement;
> +
> +/**
> + * PortletApplicationBeans
> + *
> + * @version $Id$
> + */
> +@XmlRootElement(name="applications")
> +public class PortletApplicationBeans implements Serializable
> +{
> + private static final long serialVersionUID = 1L;
> +
> + private Collection<PortletApplicationBean> portletApplicationBeans;
> +
> + public PortletApplicationBeans()
> + {
> +
> + }
> +
> + @XmlElements(@XmlElement(name="application"))
> + public Collection<PortletApplicationBean> getPortletApplicationBeans()
> + {
> + return portletApplicationBeans;
> + }
> +
> + public void setPortletApplicationBeans(Collection<PortletApplicationBean> portletApplicationBeans)
> + {
> + this.portletApplicationBeans = portletApplicationBeans;
> + }
> +}
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeans.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeans.java
> ------------------------------------------------------------------------------
> svn:keywords = Id
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeans.java
> ------------------------------------------------------------------------------
> svn:mime-type = text/plain
>
> Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java
> URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java?rev=884670&view=auto
> ==============================================================================
> --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java (added)
> +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java Thu Nov 26 19:21:39 2009
> @@ -0,0 +1,171 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under one or more
> + * contributor license agreements. See the NOTICE file distributed with
> + * this work for additional information regarding copyright ownership.
> + * The ASF licenses this file to You under the Apache License, Version 2.0
> + * (the "License"); you may not use this file except in compliance with
> + * the License. You may obtain a copy of the License at
> + *
> + * http://www.apache.org/licenses/LICENSE-2.0
> + *
> + * Unless required by applicable law or agreed to in writing, software
> + * distributed under the License is distributed on an "AS IS" BASIS,
> + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> + * See the License for the specific language governing permissions and
> + * limitations under the License.
> + */
> +package org.apache.jetspeed.services.beans;
> +
> +import java.io.Serializable;
> +import java.util.ArrayList;
> +import java.util.Collection;
> +
> +import javax.xml.bind.annotation.XmlElement;
> +import javax.xml.bind.annotation.XmlElementWrapper;
> +import javax.xml.bind.annotation.XmlElements;
> +import javax.xml.bind.annotation.XmlRootElement;
> +
> +import org.apache.jetspeed.om.portlet.Description;
> +import org.apache.jetspeed.om.portlet.DisplayName;
> +import org.apache.jetspeed.om.portlet.Language;
> +import org.apache.jetspeed.om.portlet.PortletDefinition;
> +import org.apache.jetspeed.om.portlet.Supports;
> +
> +/**
> + * PortletDefinitionBean
> + *
> + * @version $Id$
> + */
> +@XmlRootElement(name="definition")
> +public class PortletDefinitionBean implements Serializable
> +{
> + private static final long serialVersionUID = 1L;
> +
> + private String applicationName;
> + private String portletName;
> + private PortletInfoBean portletInfoBean;
> + private Collection<DisplayNameBean> displayNameBeans;
> + private Collection<DescriptionBean> descriptionBeans;
> + private Collection<SupportsBean> supportsBeans;
> + private Collection<LanguageBean> languageBeans;
> +
> + public PortletDefinitionBean()
> + {
> +
> + }
> +
> + public PortletDefinitionBean(final PortletDefinition portletDefinition)
> + {
> + applicationName = portletDefinition.getApplication().getName();
> + portletName = portletDefinition.getPortletName();
> + portletInfoBean = new PortletInfoBean(portletDefinition.getPortletInfo());
> +
> + ArrayList<DisplayNameBean> displayNameBeanList = new ArrayList<DisplayNameBean>();
> + for (DisplayName displayName : portletDefinition.getDisplayNames())
> + {
> + displayNameBeanList.add(new DisplayNameBean(displayName));
> + }
> + displayNameBeans = displayNameBeanList;
> +
> + ArrayList<DescriptionBean> descriptionBeanList = new ArrayList<DescriptionBean>();
> + for (Description description : portletDefinition.getDescriptions())
> + {
> + descriptionBeanList.add(new DescriptionBean(description));
> + }
> + descriptionBeans = descriptionBeanList;
> +
> + ArrayList<SupportsBean> supportsBeanList = new ArrayList<SupportsBean>();
> + for (Supports supports : portletDefinition.getSupports())
> + {
> + supportsBeanList.add(new SupportsBean(supports));
> + }
> + supportsBeans = supportsBeanList;
> +
> + ArrayList<LanguageBean> languageBeanList = new ArrayList<LanguageBean>();
> + for (Language language : portletDefinition.getLanguages())
> + {
> + languageBeanList.add(new LanguageBean(language));
> + }
> + languageBeans = languageBeanList;
> + }
> +
> + public String getApplicationName()
> + {
> + return applicationName;
> + }
> +
> + public void setApplicationName(String applicationName)
> + {
> + this.applicationName = applicationName;
> + }
> +
> + public String getPortletName()
> + {
> + return portletName;
> + }
> +
> + public void setPortletName(String portletName)
> + {
> + this.portletName = portletName;
> + }
> +
> + @XmlElement(name="portletInfo")
> + public PortletInfoBean getPortletInfoBean()
> + {
> + return portletInfoBean;
> + }
> +
> + public void setPortletInfoBean(PortletInfoBean portletInfoBean)
> + {
> + this.portletInfoBean = portletInfoBean;
> + }
> +
> + @XmlElementWrapper(name="displayNames")
> + @XmlElements(@XmlElement(name="displayName"))
> + public Collection<DisplayNameBean> getDisplayNameBeans()
> + {
> + return displayNameBeans;
> + }
> +
> + public void setDisplayNameBeans(Collection<DisplayNameBean> displayNameBeans)
> + {
> + this.displayNameBeans = displayNameBeans;
> + }
> +
> + @XmlElementWrapper(name="descriptions")
> + @XmlElements(@XmlElement(name="description"))
> + public Collection<DescriptionBean> getDescriptionBeans()
> + {
> + return descriptionBeans;
> + }
> +
> + public void setDescriptionBeans(Collection<DescriptionBean> descriptionBeans)
> + {
> + this.descriptionBeans = descriptionBeans;
> + }
> +
> + @XmlElementWrapper(name="supports")
> + @XmlElements(@XmlElement(name="support"))
> + public Collection<SupportsBean> getSupportsBeans()
> + {
> + return supportsBeans;
> + }
> +
> + public void setSupportsBeans(Collection<SupportsBean> supportsBeans)
> + {
> + this.supportsBeans = supportsBeans;
> + }
> +
> + @XmlElementWrapper(name="languages")
> + @XmlElements(@XmlElement(name="language"))
> + public Collection<LanguageBean> getLanguageBeans()
> + {
> + return languageBeans;
> + }
> +
> + public void setLanguageBeans(Collection<LanguageBean> languageBeans)
> + {
> + this.languageBeans = languageBeans;
> + }
> +
> +}
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java
> ------------------------------------------------------------------------------
> svn:keywords = Id
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBean.java
> ------------------------------------------------------------------------------
> svn:mime-type = text/plain
>
> Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeans.java
> URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeans.java?rev=884670&view=auto
> ==============================================================================
> --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeans.java (added)
> +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeans.java Thu Nov 26 19:21:39 2009
> @@ -0,0 +1,54 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under one or more
> + * contributor license agreements. See the NOTICE file distributed with
> + * this work for additional information regarding copyright ownership.
> + * The ASF licenses this file to You under the Apache License, Version 2.0
> + * (the "License"); you may not use this file except in compliance with
> + * the License. You may obtain a copy of the License at
> + *
> + * http://www.apache.org/licenses/LICENSE-2.0
> + *
> + * Unless required by applicable law or agreed to in writing, software
> + * distributed under the License is distributed on an "AS IS" BASIS,
> + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> + * See the License for the specific language governing permissions and
> + * limitations under the License.
> + */
> +package org.apache.jetspeed.services.beans;
> +
> +import java.io.Serializable;
> +import java.util.Collection;
> +
> +import javax.xml.bind.annotation.XmlElement;
> +import javax.xml.bind.annotation.XmlElements;
> +import javax.xml.bind.annotation.XmlRootElement;
> +
> +/**
> + * PortletDefinitionBeans
> + *
> + * @version $Id$
> + */
> +@XmlRootElement(name="definitions")
> +public class PortletDefinitionBeans implements Serializable
> +{
> + private static final long serialVersionUID = 1L;
> +
> + private Collection<PortletDefinitionBean> portletDefinitionBeans;
> +
> + public PortletDefinitionBeans()
> + {
> +
> + }
> +
> + @XmlElements(@XmlElement(name="definition"))
> + public Collection<PortletDefinitionBean> getPortletDefinitionBean()
> + {
> + return portletDefinitionBeans;
> + }
> +
> + public void setPortletApplicationBeans(Collection<PortletDefinitionBean> portletDefinitionBeans)
> + {
> + this.portletDefinitionBeans = portletDefinitionBeans;
> + }
> +
> +}
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeans.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeans.java
> ------------------------------------------------------------------------------
> svn:keywords = Id
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeans.java
> ------------------------------------------------------------------------------
> svn:mime-type = text/plain
>
> Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletInfoBean.java
> URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletInfoBean.java?rev=884670&view=auto
> ==============================================================================
> --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletInfoBean.java (added)
> +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletInfoBean.java Thu Nov 26 19:21:39 2009
> @@ -0,0 +1,81 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under one or more
> + * contributor license agreements. See the NOTICE file distributed with
> + * this work for additional information regarding copyright ownership.
> + * The ASF licenses this file to You under the Apache License, Version 2.0
> + * (the "License"); you may not use this file except in compliance with
> + * the License. You may obtain a copy of the License at
> + *
> + * http://www.apache.org/licenses/LICENSE-2.0
> + *
> + * Unless required by applicable law or agreed to in writing, software
> + * distributed under the License is distributed on an "AS IS" BASIS,
> + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> + * See the License for the specific language governing permissions and
> + * limitations under the License.
> + */
> +package org.apache.jetspeed.services.beans;
> +
> +import java.io.Serializable;
> +
> +import javax.xml.bind.annotation.XmlRootElement;
> +
> +import org.apache.jetspeed.om.portlet.PortletInfo;
> +
> +/**
> + * PortletInfoBean
> + *
> + * @version $Id$
> + */
> +@XmlRootElement(name="portletInfo")
> +public class PortletInfoBean implements Serializable
> +{
> + private static final long serialVersionUID = 1L;
> +
> + private String keywords;
> + private String shortTitle;
> + private String title;
> +
> + public PortletInfoBean()
> + {
> +
> + }
> +
> + public PortletInfoBean(final PortletInfo portletInfo)
> + {
> + keywords = portletInfo.getKeywords();
> + shortTitle = portletInfo.getShortTitle();
> + title = portletInfo.getTitle();
> + }
> +
> + public String getKeywords()
> + {
> + return keywords;
> + }
> +
> + public void setKeywords(String keywords)
> + {
> + this.keywords = keywords;
> + }
> +
> + public String getShortTitle()
> + {
> + return shortTitle;
> + }
> +
> + public void setShortTitle(String shortTitle)
> + {
> + this.shortTitle = shortTitle;
> + }
> +
> + public String getTitle()
> + {
> + return title;
> + }
> +
> + public void setTitle(String title)
> + {
> + this.title = title;
> + }
> +
> +}
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletInfoBean.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletInfoBean.java
> ------------------------------------------------------------------------------
> svn:keywords = Id
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletInfoBean.java
> ------------------------------------------------------------------------------
> svn:mime-type = text/plain
>
> Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/SupportsBean.java
> URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/SupportsBean.java?rev=884670&view=auto
> ==============================================================================
> --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/SupportsBean.java (added)
> +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/SupportsBean.java Thu Nov 26 19:21:39 2009
> @@ -0,0 +1,89 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under one or more
> + * contributor license agreements. See the NOTICE file distributed with
> + * this work for additional information regarding copyright ownership.
> + * The ASF licenses this file to You under the Apache License, Version 2.0
> + * (the "License"); you may not use this file except in compliance with
> + * the License. You may obtain a copy of the License at
> + *
> + * http://www.apache.org/licenses/LICENSE-2.0
> + *
> + * Unless required by applicable law or agreed to in writing, software
> + * distributed under the License is distributed on an "AS IS" BASIS,
> + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> + * See the License for the specific language governing permissions and
> + * limitations under the License.
> + */
> +package org.apache.jetspeed.services.beans;
> +
> +import java.io.Serializable;
> +import java.util.Collection;
> +
> +import javax.xml.bind.annotation.XmlElement;
> +import javax.xml.bind.annotation.XmlElementWrapper;
> +import javax.xml.bind.annotation.XmlElements;
> +import javax.xml.bind.annotation.XmlRootElement;
> +
> +import org.apache.jetspeed.om.portlet.Supports;
> +
> +/**
> + * SupportsBean
> + *
> + * @version $Id$
> + */
> +@XmlRootElement(name="support")
> +public class SupportsBean implements Serializable
> +{
> + private static final long serialVersionUID = 1L;
> +
> + private String mimeType;
> + private Collection<String> portletModes;
> + private Collection<String> windowStates;
> +
> + public SupportsBean()
> + {
> +
> + }
> +
> + public SupportsBean(final Supports supports)
> + {
> + mimeType = supports.getMimeType();
> + portletModes = supports.getPortletModes();
> + windowStates = supports.getWindowStates();
> + }
> +
> + public String getMimeType()
> + {
> + return mimeType;
> + }
> +
> + public void setMimeType(String mimeType)
> + {
> + this.mimeType = mimeType;
> + }
> +
> + @XmlElementWrapper(name="portletModes")
> + @XmlElements(@XmlElement(name="portletMode"))
> + public Collection<String> getPortletModes()
> + {
> + return portletModes;
> + }
> +
> + public void setPortletModes(Collection<String> portletModes)
> + {
> + this.portletModes = portletModes;
> + }
> +
> + @XmlElementWrapper(name="windowStates")
> + @XmlElements(@XmlElement(name="windowState"))
> + public Collection<String> getWindowStates()
> + {
> + return windowStates;
> + }
> +
> + public void setWindowStates(Collection<String> windowStates)
> + {
> + this.windowStates = windowStates;
> + }
> +
> +}
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/SupportsBean.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/SupportsBean.java
> ------------------------------------------------------------------------------
> svn:keywords = Id
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/SupportsBean.java
> ------------------------------------------------------------------------------
> svn:mime-type = text/plain
>
> Added: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java
> URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java?rev=884670&view=auto
> ==============================================================================
> --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java (added)
> +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java Thu Nov 26 19:21:39 2009
> @@ -0,0 +1,147 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under one or more
> + * contributor license agreements. See the NOTICE file distributed with
> + * this work for additional information regarding copyright ownership.
> + * The ASF licenses this file to You under the Apache License, Version 2.0
> + * (the "License"); you may not use this file except in compliance with
> + * the License. You may obtain a copy of the License at
> + *
> + * http://www.apache.org/licenses/LICENSE-2.0
> + *
> + * Unless required by applicable law or agreed to in writing, software
> + * distributed under the License is distributed on an "AS IS" BASIS,
> + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> + * See the License for the specific language governing permissions and
> + * limitations under the License.
> + */
> +package org.apache.jetspeed.services.rest;
> +
> +import java.util.ArrayList;
> +import java.util.List;
> +
> +import javax.servlet.ServletConfig;
> +import javax.servlet.ServletContext;
> +import javax.servlet.http.HttpServletRequest;
> +import javax.ws.rs.GET;
> +import javax.ws.rs.Path;
> +import javax.ws.rs.PathParam;
> +import javax.ws.rs.core.Context;
> +import javax.ws.rs.core.UriInfo;
> +
> +import org.apache.commons.lang.StringUtils;
> +import org.apache.jetspeed.Jetspeed;
> +import org.apache.jetspeed.components.portletregistry.PortletRegistry;
> +import org.apache.jetspeed.om.portlet.PortletApplication;
> +import org.apache.jetspeed.om.portlet.PortletDefinition;
> +import org.apache.jetspeed.services.beans.PortletApplicationBean;
> +import org.apache.jetspeed.services.beans.PortletApplicationBeans;
> +import org.apache.jetspeed.services.beans.PortletDefinitionBean;
> +import org.apache.jetspeed.services.beans.PortletDefinitionBeans;
> +import org.slf4j.Logger;
> +import org.slf4j.LoggerFactory;
> +
> +/**
> + * PortletRegistryService
> + *
> + * @vesion $Id$
> + */
> +
> +@Path("/portletregistry/")
> +public class PortletRegistryService
> +{
> +
> + private static Logger log = LoggerFactory.getLogger(PortletRegistryService.class);
> +
> + @Context
> + private ServletConfig servletConfig;
> +
> + @Context
> + private ServletContext servletContext;
> +
> + @Context
> + private HttpServletRequest servletRequest;
> +
> + @Context
> + private UriInfo uriInfo;
> +
> + private PortletRegistry portletRegistry;
> +
> + public PortletRegistryService()
> + {
> + portletRegistry = (PortletRegistry) Jetspeed.getComponentManager().getComponent(PortletRegistry.class);
> + }
> +
> + @GET
> + @Path("/application/{name}")
> + public PortletApplicationBeans getPortletApplication(@PathParam("name") String name)
> + {
> + PortletApplicationBeans paBeans = new PortletApplicationBeans();
> + List<PortletApplicationBean> paBeanList = new ArrayList<PortletApplicationBean>();
> +
> + if (StringUtils.isBlank(name))
> + {
> + for (PortletApplication pa : portletRegistry.getPortletApplications())
> + {
> + paBeanList.add(new PortletApplicationBean(pa));
> + }
> + }
> + else
> + {
> + PortletApplication pa = portletRegistry.getPortletApplication(name, true);
> +
> + if (pa != null)
> + {
> + paBeanList.add(new PortletApplicationBean(pa));
> + }
> + }
> +
> + paBeans.setPortletApplicationBeans(paBeanList);
> + return paBeans;
> + }
> +
> + @GET
> + @Path("/definition/{uniqueName}")
> + public PortletDefinitionBeans getPortletDefinition(@PathParam("uniqueName") String uniqueName)
> + {
> + PortletDefinitionBeans pdBeans = new PortletDefinitionBeans();
> + List<PortletDefinitionBean> pdBeanList = new ArrayList<PortletDefinitionBean>();
> +
> + if (StringUtils.isBlank(uniqueName))
> + {
> + for (PortletDefinition pd : portletRegistry.getAllPortletDefinitions())
> + {
> + pdBeanList.add(new PortletDefinitionBean(pd));
> + }
> + }
> + else
> + {
> + int offset = uniqueName.indexOf("::");
> +
> + if (offset != -1)
> + {
> + PortletDefinition pd = portletRegistry.getPortletDefinitionByUniqueName(uniqueName, true);
> +
> + if (pd != null)
> + {
> + pdBeanList.add(new PortletDefinitionBean(pd));
> + }
> + }
> + else
> + {
> + PortletApplication pa = portletRegistry.getPortletApplication(uniqueName, true);
> +
> + if (pa != null)
> + {
> + for (PortletDefinition pd : pa.getPortlets())
> + {
> + pdBeanList.add(new PortletDefinitionBean(pd));
> + }
> + }
> + }
> + }
> +
> + pdBeans.setPortletApplicationBeans(pdBeanList);
> + return pdBeans;
> + }
> +
> +}
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java
> ------------------------------------------------------------------------------
> svn:keywords = Id
>
> Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java
> ------------------------------------------------------------------------------
> svn:mime-type = text/plain
>
> Added: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml
> URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml?rev=884670&view=auto
> ==============================================================================
> --- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml (added)
> +++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml Thu Nov 26 19:21:39 2009
> @@ -0,0 +1,55 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +
> +<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
> + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
> +
> + <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
> + <property name="targetClass" value="java.lang.System"/>
> + <property name="targetMethod" value="setProperty"/>
> + <property name="arguments">
> + <list>
> + <value>org.apache.cxf.Logger</value>
> + <value>org.apache.cxf.common.logging.Log4jLogger</value>
> + </list>
> + </property>
> + </bean>
> +
> + <bean id="cxfServlet" class="org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet">
> + <meta key="j2:cat" value="default" />
> + </bean>
> +
> + <bean id="cxfServletConfig" class="org.apache.jetspeed.pipeline.valve.impl.ServletDelegatingValve$ServletConfigImpl">
> + <meta key="j2:cat" value="default" />
> + <constructor-arg value="CXFNonSpringJaxrsServlet" />
> + <constructor-arg>
> + <props>
> + 
> + <prop key="jaxrs.serviceClasses">
> + org.apache.jetspeed.services.rest.PortletRegistryService
> + </prop>
> + </props>
> + </constructor-arg>
> + <property name="servletContext">
> + <bean class="org.springframework.beans.factory.config.PropertyPathFactoryBean">
> + <property name="targetObject" ref="javax.servlet.ServletConfig" />
> + <property name="propertyPath" value="servletContext"/>
> + </bean>
> + </property>
> + </bean>
> +
> +</beans>
> \ No newline at end of file
>
> Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml
> ------------------------------------------------------------------------------
> svn:keywords = Id
>
> Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml
> ------------------------------------------------------------------------------
> svn:mime-type = text/plain
>
> Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml
> URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml?rev=884670&r1=884669&r2=884670&view=diff
> ==============================================================================
> --- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml (original)
> +++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml Thu Nov 26 19:21:39 2009
> @@ -349,7 +349,14 @@
> <ref bean="RolesSecurityBehavior" />
> </constructor-arg>
> </bean>
> -
> +
> + <bean id="RestfulServicesValve" class="org.apache.jetspeed.pipeline.valve.impl.ServletDelegatingValve"
> + init-method="initialize" destroy-method="destroy">
> + <meta key="j2:cat" value="default" />
> + <constructor-arg ref="cxfServlet" />
> + <constructor-arg ref="cxfServletConfig" />
> + </bean>
> +
> <bean id="DecorationValve" class="org.apache.jetspeed.decoration.DecorationValve" init-method="initialize">
> <meta key="j2:cat" value="default" />
> <constructor-arg index='0'>
> @@ -714,6 +721,25 @@
> </constructor-arg>
> </bean>
>
> + <bean id="restful-services-pipeline" class="org.apache.jetspeed.pipeline.JetspeedPipeline" init-method="initialize">
> + <meta key="j2:cat" value="default" />
> + <constructor-arg>
> + <value>RestfulServicesPipeline</value>
> + </constructor-arg>
> + <constructor-arg>
> + <list>
> + <ref bean="capabilityValve" />
> + <ref bean="portalURLValve" />
> + <ref bean="securityValve" />
> + <ref bean="localizationValve" />
> + <ref bean="profilerValve" />
> + <ref bean="refreshUserHomepageValve" />
> + <ref bean="containerValve" />
> + <ref bean="RestfulServicesValve" />
> + </list>
> + </constructor-arg>
> + </bean>
> +
> <bean id="fileserver-pipeline" class="org.apache.jetspeed.pipeline.JetspeedPipeline" init-method="initialize">
> <meta key="j2:cat" value="default" />
> <constructor-arg>
> @@ -793,18 +819,21 @@
> <entry key='/portal'>
> <value>jetspeed-pipeline</value>
> </entry>
> - <entry key='/ajaxapi'>
> - <value>ajax-pipeline</value>
> - </entry>
> <entry key='/login'>
> <value>jetspeed-pipeline</value>
> </entry>
> <entry key='/fileserver'>
> <value>fileserver-pipeline</value>
> </entry>
> + <entry key='/ajaxapi'>
> + <value>ajax-pipeline</value>
> + </entry>
> <entry key='/ajax'>
> <value>ajax-direct-pipeline</value>
> </entry>
> + <entry key='/services'>
> + <value>restful-services-pipeline</value>
> + </entry>
> <entry key='/desktop'>
> <value>desktop-pipeline</value>
> </entry>
>
> Modified: portals/jetspeed-2/portal/trunk/pom.xml
> URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=884670&r1=884669&r2=884670&view=diff
> ==============================================================================
> --- portals/jetspeed-2/portal/trunk/pom.xml (original)
> +++ portals/jetspeed-2/portal/trunk/pom.xml Thu Nov 26 19:21:39 2009
> @@ -269,6 +269,7 @@
> <javax.servlet.jsp.version>2.0</javax.servlet.jsp.version>
> <javax.sql.version>2.0</javax.sql.version>
> <javax.transaction.version>1.0.1B</javax.transaction.version>
> + <javax.ws.rs.version>1.0</javax.ws.rs.version>
> <jaxen.version>1.0-FCS</jaxen.version>
> <jaxb.version>2.1</jaxb.version>
> <jaxb-impl.version>2.1.9</jaxb-impl.version>
> @@ -311,6 +312,7 @@
> <ccpp.version>1.0</ccpp.version>
> <commonj.version>1.1</commonj.version>
> <tyrex.version>1.0.1</tyrex.version>
> + <cxf.version>2.2.5</cxf.version>
> </properties>
>
> 
> @@ -974,7 +976,44 @@
> <artifactId>jaxb-impl</artifactId>
> <version>${jaxb-impl.version}</version>
> </dependency>
> -
> +
> + 
> + <dependency>
> + <groupId>javax.ws.rs</groupId>
> + <artifactId>jsr311-api</artifactId>
> + <version>${javax.ws.rs.version}</version>
> + </dependency>
> +
> + 
> + <dependency>
> + <groupId>org.apache.cxf</groupId>
> + <artifactId>cxf-rt-frontend-jaxrs</artifactId>
> + <version>${cxf.version}</version>
> + <scope>runtime</scope>
> + <exclusions>
> + <exclusion>
> + <groupId>commons-logging</groupId>
> + <artifactId>commons-logging</artifactId>
> + </exclusion>
> + <exclusion>
> + <groupId>org.springframework</groupId>
> + <artifactId>spring-core</artifactId>
> + </exclusion>
> + <exclusion>
> + <groupId>org.springframework</groupId>
> + <artifactId>spring-beans</artifactId>
> + </exclusion>
> + <exclusion>
> + <groupId>org.springframework</groupId>
> + <artifactId>spring-context</artifactId>
> + </exclusion>
> + <exclusion>
> + <groupId>org.springframework</groupId>
> + <artifactId>spring-web</artifactId>
> + </exclusion>
> + </exclusions>
> + </dependency>
> +
> 
> <dependency>
> <groupId>junit</groupId>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: jetspeed-dev-unsubscribe@...
> For additional commands, e-mail: jetspeed-dev-help@...
>

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@...
For additional commands, e-mail: jetspeed-dev-help@...