gatein SVN: r1191 - in portal/trunk: webui/core/src/main/java/org/exoplatform/webui/application and 3 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-01-07 06:07:05 -0500 (Thu, 07 Jan 2010)
New Revision: 1191
Removed:
portal/trunk/component/web/src/main/java/org/exoplatform/web/application/ApplicationInfo.java
portal/trunk/component/web/src/main/java/org/exoplatform/web/application/annotation/
portal/trunk/component/web/src/main/java/org/exoplatform/web/application/mvc/
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/util/
Modified:
portal/trunk/component/web/src/main/java/org/exoplatform/web/application/Application.java
portal/trunk/component/web/src/main/java/org/exoplatform/web/application/RequestContext.java
portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/WebuiRequestContext.java
portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/portlet/PortletRequestContext.java
portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/UIComponent.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
Log:
- cleanup non used classes
- make PortalURLBuilder usage type safe
Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/Application.java
===================================================================
--- portal/trunk/component/web/src/main/java/org/exoplatform/web/application/Application.java 2010-01-07 06:14:22 UTC (rev 1190)
+++ portal/trunk/component/web/src/main/java/org/exoplatform/web/application/Application.java 2010-01-07 11:07:05 UTC (rev 1191)
@@ -52,7 +52,6 @@
private Hashtable<String, Object> attributes_ = new Hashtable<String, Object>();
- //TODO: Replcate by method public ApplicationInfo getApplicationInfo() ;
abstract public String getApplicationId();
abstract public String getApplicationType();
Deleted: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/ApplicationInfo.java
===================================================================
--- portal/trunk/component/web/src/main/java/org/exoplatform/web/application/ApplicationInfo.java 2010-01-07 06:14:22 UTC (rev 1190)
+++ portal/trunk/component/web/src/main/java/org/exoplatform/web/application/ApplicationInfo.java 2010-01-07 11:07:05 UTC (rev 1191)
@@ -1,37 +0,0 @@
-/**
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.exoplatform.web.application;
-
-/**
- * Created by The eXo Platform SARL
- * Author : Tuan Nguyen
- * tuan.nguyen(a)exoplatform.com
- * Apr 8, 2007
- */
-public class ApplicationInfo
-{
- private String applicationId_;
-
- private String applicationCategory_;
-
- private String applicationName_;
-
- private String applicationDescription_;
-}
Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/application/RequestContext.java
===================================================================
--- portal/trunk/component/web/src/main/java/org/exoplatform/web/application/RequestContext.java 2010-01-07 06:14:22 UTC (rev 1190)
+++ portal/trunk/component/web/src/main/java/org/exoplatform/web/application/RequestContext.java 2010-01-07 11:07:05 UTC (rev 1191)
@@ -53,8 +53,6 @@
private Map<String, Object> attributes;
- protected URLBuilder urlBuilder;
-
public RequestContext(Application app)
{
app_ = app;
@@ -91,7 +89,7 @@
return getParentAppRequestContext().getJavascriptManager();
}
- abstract public URLBuilder getURLBuilder();
+ abstract public URLBuilder<?> getURLBuilder();
public String getRemoteUser()
{
Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/WebuiRequestContext.java
===================================================================
--- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/WebuiRequestContext.java 2010-01-07 06:14:22 UTC (rev 1190)
+++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/WebuiRequestContext.java 2010-01-07 11:07:05 UTC (rev 1191)
@@ -23,6 +23,7 @@
import org.exoplatform.resolver.ResourceResolver;
import org.exoplatform.web.application.Application;
import org.exoplatform.web.application.RequestContext;
+import org.exoplatform.web.application.URLBuilder;
import org.exoplatform.webui.core.UIApplication;
import org.exoplatform.webui.core.UIComponent;
@@ -118,6 +119,9 @@
return UIComponent.UICOMPONENT;
}
+ @Override
+ public abstract URLBuilder<UIComponent> getURLBuilder();
+
abstract public String getRequestContextPath();
abstract public <T> T getRequest() throws Exception;
Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/portlet/PortletRequestContext.java
===================================================================
--- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/portlet/PortletRequestContext.java 2010-01-07 06:14:22 UTC (rev 1190)
+++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/portlet/PortletRequestContext.java 2010-01-07 11:07:05 UTC (rev 1191)
@@ -19,13 +19,12 @@
package org.exoplatform.webui.application.portlet;
-import org.exoplatform.commons.utils.WriterPrinter;
import org.exoplatform.services.resources.Orientation;
import org.exoplatform.web.application.URLBuilder;
import org.exoplatform.webui.application.WebuiApplication;
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.core.UIApplication;
-import org.exoplatform.webui.core.lifecycle.HtmlValidator;
+import org.exoplatform.webui.core.UIComponent;
import java.io.Writer;
@@ -62,6 +61,8 @@
private boolean hasProcessAction_ = false;
+ private final PortletURLBuilder urlBuilder;
+
public PortletRequestContext(WebuiApplication app, Writer writer, PortletRequest req, PortletResponse res)
{
super(app);
@@ -179,7 +180,7 @@
hasProcessAction_ = b;
}
- public URLBuilder getURLBuilder()
+ public URLBuilder<UIComponent> getURLBuilder()
{
RenderResponse renderRes = (RenderResponse)response_;
urlBuilder.setBaseURL(renderRes.createActionURL().toString());
Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/UIComponent.java
===================================================================
--- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/UIComponent.java 2010-01-07 06:14:22 UTC (rev 1190)
+++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/UIComponent.java 2010-01-07 11:07:05 UTC (rev 1191)
@@ -214,11 +214,11 @@
if (event == null)
return "??config??";
WebuiRequestContext context = WebuiRequestContext.getCurrentInstance();
- URLBuilder urlBuilder = context.getURLBuilder();
+ URLBuilder<UIComponent> urlBuilder = context.getURLBuilder();
if (urlBuilder == null)
return "??builder??";
String confirm = loadConfirmMesssage(event, context, beanId);
- return urlBuilder.createAjaxURL(this, event.getName(), confirm, beanId, params).toString();
+ return urlBuilder.createAjaxURL(this, event.getName(), confirm, beanId, params);
}
protected String loadConfirmMesssage(org.exoplatform.webui.config.Event event, WebuiRequestContext context,
@@ -258,7 +258,7 @@
String confirm = loadConfirmMesssage(event, context, beanId);
try
{
- return context.getURLBuilder().createURL(this, event.getName(), confirm, beanId, params).toString();
+ return context.getURLBuilder().createURL(this, event.getName(), confirm, beanId, params);
}
catch (Exception e)
{
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-01-07 06:14:22 UTC (rev 1190)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-01-07 11:07:05 UTC (rev 1191)
@@ -36,6 +36,7 @@
import org.exoplatform.web.application.URLBuilder;
import org.exoplatform.webui.application.WebuiApplication;
import org.exoplatform.webui.application.WebuiRequestContext;
+import org.exoplatform.webui.core.UIComponent;
import org.exoplatform.webui.core.lifecycle.HtmlValidator;
import javax.servlet.http.HttpServletRequest;
@@ -98,6 +99,8 @@
protected JavascriptManager jsmanager_ = new JavascriptManager();
+ private final PortalURLBuilder urlBuilder;
+
public JavascriptManager getJavascriptManager()
{
return jsmanager_;
@@ -255,7 +258,7 @@
return portalURI;
}
- public URLBuilder getURLBuilder()
+ public URLBuilder<UIComponent> getURLBuilder()
{
return urlBuilder;
}
14 years, 11 months
- 1
- 0
gatein SVN: r1190 - portal/trunk/docs/user-guide/en/modules/portal.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-01-07 01:14:22 -0500 (Thu, 07 Jan 2010)
New Revision: 1190
Modified:
portal/trunk/docs/user-guide/en/modules/portal/Manage_Page_Navigation.xml
portal/trunk/docs/user-guide/en/modules/portal/Manage_Pages.xml
Log:
edits to Manage_Portals.xml
Modified: portal/trunk/docs/user-guide/en/modules/portal/Manage_Page_Navigation.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Manage_Page_Navigation.xml 2010-01-07 03:04:13 UTC (rev 1189)
+++ portal/trunk/docs/user-guide/en/modules/portal/Manage_Page_Navigation.xml 2010-01-07 06:14:22 UTC (rev 1190)
@@ -23,7 +23,7 @@
--><title>Manage Page Navigation</title>
<para>
- Navigation types that &PRODUCT; supports are outlined in <xref linkend="sect-User_Guide-Navigation" />.
+ Navigation types in &PRODUCT; are outlined in <xref linkend="sect-User_Guide-Navigation" />.
</para>
<!-- <section id="User_Guide-Manage_Page_Navigation-Portals_page_navigation">
Modified: portal/trunk/docs/user-guide/en/modules/portal/Manage_Pages.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Manage_Pages.xml 2010-01-07 03:04:13 UTC (rev 1189)
+++ portal/trunk/docs/user-guide/en/modules/portal/Manage_Pages.xml 2010-01-07 06:14:22 UTC (rev 1190)
@@ -22,8 +22,13 @@
02110-1301 USA, or see the FSF site: http://www.fsf.org.
--><title>Manage Pages</title>
+<warning>
+<para>
+The <emphasis role="bold">Administration</emphasis> menu entry reported to be under the <emphasis role="bold">GateIn Start</emphasis> button does not exist in GateIn 3.0 Beta 3. Therefore some of the instructions in this section may be incomplete or inaccurate.
+</para>
+</warning>
<para>
- Only by using one page list can users add, edit, delete and view quickly and easily which pages you like to. Following these guides to manage pages:
+ &PRODUCT; users can quickly add, edit, delete and view pages effectively in a comprehensive list. Follow the guide below to manage portal pages:
</para>
<section id="sect-User_Guide-Manage_Pages-Add_a_new_Page_in_the_Page_List">
@@ -34,7 +39,7 @@
<procedure>
<step>
<para>
- Go to <emphasis role="bold">GateIn</emphasis> -><emphasis role="bold">Administration</emphasis> -> <emphasis role="bold">Advanced</emphasis> --> <emphasis role="bold">Manage Pages</emphasis>.
+ Go to <emphasis role="bold">Site </emphasis> -><emphasis role="bold">Administration</emphasis> -> <emphasis role="bold">Advanced</emphasis> --> <emphasis role="bold">Manage Pages</emphasis>.
</para>
<mediaobject>
<imageobject>
@@ -51,46 +56,27 @@
<imagedata fileref="images/ManagePage2.6.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
+ <variablelist>
+ <varlistentry>
+ <term>Add New Page</term>
+ <listitem>
+ <para>
+ This button allows you to add a new page.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Back</term>
+ <listitem>
+ <para>
+ This button returns you to home page.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</step>
<step>
<para>
- Details
- </para>
- <informaltable colsep="0" frame="none" rowsep="0">
- <tgroup cols="2">
- <colspec align="center"></colspec>
- <colspec align="center"></colspec>
- <tbody>
- <row>
- <entry>
- <emphasis role="bold"> Button </emphasis>
- </entry>
- <entry>
- <emphasis role="bold"> Description </emphasis>
- </entry>
- </row>
- <row>
- <entry>
- Add New Page
- </entry>
- <entry>
- allows you to add a new page.
- </entry>
- </row>
- <row>
- <entry>
- Back
- </entry>
- <entry>
- allows you to return to home page.
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- </step>
- <step>
- <para>
Click the <emphasis role="bold">Add New Page</emphasis> button.
</para>
</step>
@@ -103,145 +89,111 @@
<imagedata fileref="images/PageSetting.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
- <informaltable colsep="0" frame="none" rowsep="0">
- <tgroup cols="2">
- <colspec align="center"></colspec>
- <colspec align="center"></colspec>
- <tbody>
- <row>
- <entry>
- <emphasis role="bold"> Name </emphasis>
- </entry>
- <entry>
- <emphasis role="bold"> Description </emphasis>
- </entry>
- </row>
- <row>
- <entry>
- Page Id
- </entry>
- <entry>
- The string to identify the page. It is automatically generated when you will finish creating page.
- </entry>
- </row>
- <row>
- <entry>
- Owner type
- </entry>
- <entry>
- The owner type of the the page (portal, group or user). The "User" type is displayed by default. You can change the owner type by clicking on the icon.
- </entry>
- </row>
- <row>
- <entry>
- Owner Id
- </entry>
- <entry>
- The identification name of page owner. When the owner type is "group", there will be a list of groups of which you have to select one.
- </entry>
- </row>
- <row>
- <entry>
- Page Name
- </entry>
- <entry>
- The name of the page. This is a required field and must be unique. Only alpha, digit and underscore characters are allowed to be used for this field and it must have a length between 3 and 30 characters
- </entry>
- </row>
- <row>
- <entry>
- Page title
- </entry>
- <entry>
- The title of the the page. This field is not required and must have a length between 3 and 30 characters.
- </entry>
- </row>
- <row>
- <entry>
- Show Max Window
- </entry>
- <entry>
- The option allows to choose whether showing the page in maximum size or not.
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- <para>
- If the <emphasis role="bold">Owner type</emphasis> is "portal" or "group":
- </para>
- <itemizedlist>
- <listitem>
- <para>
- <emphasis role="bold">Owner type</emphasis> is 'portal': it means you create a page for a portal. Thus only users who have edit permissions on the portal can create this page type.
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis role="bold">Owner type</emphasis> is 'group': it means you create a page for a group. Thus only users who are 'manager' of a group can create this page type.
- </para>
+ <variablelist>
+ <varlistentry>
+ <term>Page Id</term>
+ <listitem>
+ <para>
+ A string that identifies the page. It is automatically generated when you finish creating the page.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Owner type</term>
+ <listitem>
+ <para>
+ If the page <emphasis role="bold">Owner type</emphasis> is <emphasis>portal</emphasis> the page is created for a portal. Therefore only users who have edit permissions on the portal level can create this page type.
+ </para>
+ <para>
+ The name of the current portal is automatically selected for <emphasis role="bold">Owner id</emphasis> ensuring the edit permissions are assigned to users who can edit the current portal.
+ </para>
+ <para>
+ If the page <emphasis role="bold">Owner type</emphasis> is <emphasis>group</emphasis> the page is created for a group. Therefore only users who have <emphasis>manager</emphasis> permissions for that group can create this page type.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/PageSetting1.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Owner Id</term>
+ <listitem>
+ <para>
+ The name of the page owner. When the owner type is set to <emphasis>group</emphasis>, a list of groups will allow you to select one user as the 'owner'.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Page Name</term>
+ <listitem>
+ <para>
+ The name of the page. This is a required field and must be unique. Only alphabetical, numerical and underscore characters are allowed to be used for this field and the name must be at least 3 and no more than 30 characters in length.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Page title</term>
+ <listitem>
+ <para>
+ The title of the the page. This is an optional field. If you choose to add a title to the page it must be at least 3 and no more than 30 characters in length.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Show Max Window</term>
+ <listitem>
+ <para>
+ The option allows users to choose whether the page is shown at maximum size or not.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </step>
+ <step>
+ <para>
+ Enter values for fields in the <emphasis role="bold">Permission Setting</emphasis> tab
+ </para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/PageSetting1.png" format="PNG" width="444" />
- </imageobject>
- </mediaobject>
- </listitem>
- <listitem>
- <para>
- Permission Setting is initialized
- </para>
- <mediaobject>
- <imageobject>
<imagedata fileref="images/PermissionSetting1.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
- </listitem>
- <listitem>
- <para>
- With <emphasis role="bold">Access Permission</emphasis>: The content of this tab is identical to the <emphasis role="bold">Owner type</emphasis> field in the <emphasis role="bold">Page Setting</emphasis> tab. Thus, all users have access rights of the page type selected in the <emphasis role="bold">Owner type</emphasis> field will appear in this tab. But you also can change the value of this tab as follows:
- </para>
- </listitem>
- <listitem>
- <para>
- Check the check box if you want to share access with everyone
- </para>
- </listitem>
- <listitem>
- <para>
- Or click the <emphasis role="bold">Add Permission</emphasis> button to assign permission on group level, then select a group and membership.
- </para>
- </listitem>
- <listitem>
- <para>
- Or click the trash can icon to remove a group from the list.
- </para>
- </listitem>
- <listitem>
- <para>
- With <emphasis role="bold">Edit Permission</emphasis>: The content of this tab depends on the value of the <emphasis role="bold">Owner type</emphasis> field in the <emphasis role="bold">Page Setting</emphasis> tab.
- </para>
- </listitem>
- <listitem>
- <para>
- If the <emphasis role="bold">Owner type</emphasis> is "group", edit permission is assigned to users who are "manager" of the group that is selected in <emphasis role="bold">Owner id</emphasis>. You only can change this value when editing the page.
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/EditPermission1.png" format="PNG" width="444" />
- </imageobject>
- </mediaobject>
- </listitem>
- <listitem>
- <para>
- If the <emphasis role="bold">Owner type</emphasis> is "portal": The name of the current portal is automatically selected for <emphasis role="bold">Owner id</emphasis> so that the edit permissions are assigned to users who can edit the current portal. Users only can change this value when editing the page.
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/EditPermission2.png" format="PNG" width="444" />
- </imageobject>
- </mediaobject>
- </listitem>
- </itemizedlist>
+ <variablelist>
+ <varlistentry>
+ <term>Access Permission</term>
+ <listitem>
+ <para>
+ The content of this tab is identical to the <emphasis role="bold">Owner type</emphasis> field in the <emphasis role="bold">Page Setting</emphasis> tab. Therefore, all users having access rights for the type selected in the <emphasis role="bold">Owner type</emphasis> field will appear in this tab. But users can also change the value of this tab.
+ </para>
+ <para>
+ Check the check box if you want to share access with everyone or click the <emphasis role="bold">Add Permission</emphasis> button to assign permission on group level, then select a group and membership or click the trash can icon to remove a group from the list.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/EditPermission1.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Edit Permission</term>
+ <listitem>
+ <para>
+ The content of this tab depends on the value of the <emphasis role="bold">Owner type</emphasis> field in the <emphasis role="bold">Page Setting</emphasis> tab.
+ </para>
+ <para>
+ If the <emphasis role="bold">Owner type</emphasis> is "group", edit permission is assigned to users who are "manager" of the group that is selected in <emphasis role="bold">Owner id</emphasis>. You can only change this value when editing the page.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/EditPermission2.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</step>
<step>
<para>
@@ -261,203 +213,75 @@
</step>
<step>
<para>
- In the existing pages list: click the edit icon on the row of page you want to edit.
+ Click the edit icon on the row of page you want to edit in the existing pages list.
</para>
- <!-- <informaltable colsep="0" frame="none" rowsep="0">
- <tgroup cols="2">
- <colspec align="center"></colspec>
- <colspec align="center"></colspec>
- <tbody>
- <row>
- <entry>
- <emphasis role="bold"> Indicator </emphasis>
- </entry>
- <entry>
- <emphasis role="bold"> Meaning </emphasis>
- </entry>
- </row>
- <row>
- <entry>
- !images/PreviewPage.png!
- </entry>
- <entry>
- Preview page: allows viewing node's page with preview mode in a Normal Page
- </entry>
- </row>
- <row>
- <entry>
- !images/EditPage.png!
- </entry>
- <entry>
- Edit page properties: allows editing node's page properties
- </entry>
- </row>
- <row>
- <entry>
- !images/ShowContainer.png!
- </entry>
- <entry>
- Show container: allows to list all existing containers that will be used to change the layout of a selected page
- </entry>
- </row>
- <row>
- <entry>
- !images/ShowPortlet.png!
- </entry>
- <entry>
- Show portlet: allows to list all existing portlets that will be used to re-arrange the content of selected page.
- </entry>
- </row>
- <row>
- <entry>
- !images/SavePage.png!
- </entry>
- <entry>
- Save page: allows saving changes of a page
- </entry>
- </row>
- <row>
- <entry>
- !images/Back.png!
- </entry>
- <entry>
- Back: allows returning to the page list without saving
- </entry>
- </row>
- <row>
- <entry>
- !images/Finish.png!
- </entry>
- <entry>
- Finish:allows saving and returning to the page list
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable> -->
<para>
- Edit page properties Click the edit!images/EditPage.png! icon to show a form to edit page properties.
+ Click the edit icon to show a form to edit page properties.
</para>
</step>
<step>
<para>
- In the <emphasis role="bold">Page Properties</emphasis> window:
+ The properties presented in the <emphasis role="bold">Page Properties</emphasis> window are the same as those outlined in <xref linkend="sect-User_Guide-Manage_Pages-Add_a_new_Page_in_the_Page_List"/>.
</para>
- <informaltable colsep="0" frame="none" rowsep="0">
- <tgroup cols="2">
- <colspec align="center"></colspec>
- <colspec align="center"></colspec>
- <tbody>
- <row>
- <entry>
- <emphasis role="bold"> Name </emphasis>
- </entry>
- <entry>
- <emphasis role="bold"> Description </emphasis>
- </entry>
- </row>
- <row>
- <entry>
- Page Id
- </entry>
- <entry>
- The string to identify editing page. This string is generated automatically, user can not change.
- </entry>
- </row>
- <row>
- <entry>
- Owner type
- </entry>
- <entry>
- The type of editing page. User can not change.
- </entry>
- </row>
- <row>
- <entry>
- Owner Id
- </entry>
- <entry>
- The identification name of page's owner. User can not change.
- </entry>
- </row>
- <row>
- <entry>
- Page name
- </entry>
- <entry>
- The name of the page. User can not change.
- </entry>
- </row>
- <row>
- <entry>
- Page title
- </entry>
- <entry>
- The title of page. User can change and it must have length from 3 to 30 characters.
- </entry>
- </row>
- <row>
- <entry>
- Show Max Window
- </entry>
- <entry>
- The option allows whether showing page in maximum size or not. User should check this option for desktop page only.
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- <itemizedlist>
- <listitem>
- <para>
- Permission Setting: This form is supported for pages of a group or a portal. Because page of an user is private, no one else can access or edit user's page except the creator, so you do not have to set permission for it. Permission on each page is set in two levels: Access right and Edit right.
- </para>
- </listitem>
- <listitem>
-<important>
-<title>This does not match GateIn-3.0.0-Beta02</title>
- <para>
- <emphasis role="bold">Access right</emphasis>: Page Access right can be set to some user groups or set to everyone (also includes unregistered users). There is a list of current access permissions on page. You can click delete icon to remove permission or click the <emphasis role="bold">Add Permission</emphasis> button to add more or tick on <emphasis role="bold">Make it public</emphasis> option check box to allow all users to access.
- </para>
-</important>
- </listitem>
- <listitem>
-<important>
-<title>This does not match GateIn-3.0.0-Beta02</title>
- <para>
- <emphasis role="bold">Edit right</emphasis>: It allows users to change information of page. Edit right only is set for a group of users. Edit right on a page can be set for one group with one specific membership type (or <emphasis role="bold">means every membership types in group). If you want to re-assign this right to another group, click</emphasis>Select Permission to choose another one.
- </para>
-</important>
- </listitem>
- <listitem>
- <para>
- Editing page container layout
- </para>
- </listitem>
- </itemizedlist>
+ <variablelist>
+ <varlistentry>
+ <term>Permission Setting</term>
+ <listitem>
+ <para>
+ This form is supported for pages with <emphasis>group</emphasis> or <emphasis>portal</emphasis> ownershuip types. Because a user's page is private, no user, other than the creator, can access or edit it.
+ </para>
+ <para>
+ Permission on each page is set in two levels: <emphasis role="bold">Access right</emphasis> and <emphasis role="bold">Edit right</emphasis>.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Access right</term>
+ <listitem>
+ <para>
+ The page <emphasis role="bold">Access right</emphasis> can be set to specific user groups or set to everyone (this includes unregistered users). Current access permissions on page are listed and you can remove permissions (by clicking the delete icon) or add further permission (by click the <emphasis role="bold">Add Permission</emphasis> button). Populating the <emphasis role="bold">Make it public</emphasis> check box will allow all users (registered or unregistered) to access the page.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Edit right</term>
+ <listitem>
+ <para>
+ The <emphasis role="bold">Edit right</emphasis> allows users to change information on a page. <emphasis role="bold">Edit right</emphasis> only is set for a group of users. <emphasis role="bold">Edit right</emphasis> can be set for one specific membership type within a particular group (<emphasis role="bold">*</emphasis> allows every membership type in a group). If you want to re-assign this right to another group, click <emphasis role="bold">Select Permission</emphasis> to choose another one.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</step>
<step>
- <para>
- Click !images/ShowContainer.png! icon to show current container layout of selected page on your right and all the container layouts list on the left pane.
- </para>
- <para>
- If you want to change current layout, select a layout type from the list on the left pane, then left click on the template you want and drag and drop it into the right pane. New container will be displayed on the right pane. You can change position of current container by left click and drag and drop it to another place on the right pane or remove current container by clicking delete icon on the right corner.
- </para>
- <itemizedlist>
- <listitem>
- <para>
- Editing page portlet layout
- </para>
- </listitem>
- </itemizedlist>
+ <variablelist>
+ <varlistentry>
+ <term>Editing page container layout</term>
+ <listitem>
+ <para>
+ Click the Show Container icon to show current container layout of selected page on your right and all the container layouts list on the left pane.
+ </para>
+ <para>
+ If you want to change the current layout, select a layout type from the list on the left pane, then drag the template you want into the right pane. The new container will be displayed on the right pane. You can change the position of the current container by dragging it to another place on the right pane or remove it completely by clicking the delete icon in the right corner.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</step>
<step>
- <para>
- Click !images/ShowPortlet.png! icon to show current portlet layout of page.
- </para>
- <para>
- If you want to change current layout, select layout type from the list on the left pane, then left click on the template you want and drag and drop it into the right pane. New portlet will be added and displayed in the right pane. You can change position of current portlet by left click and drag and drop it to the place you want on the right pane or remove current portlet by clicking delete icon.
- </para>
+ <variablelist>
+ <varlistentry>
+ <term>Editing page portlet layout</term>
+ <listitem>
+ <para>
+ Click the Show Portlet icon to show current portlet layout of page.
+ </para>
+ <para>
+ If you want to change the current layout, select a layout type from the list on the left pane, then drag it into the right pane. The new portlet will be added and displayed in the right pane. You can change the position of the current portlet by dragging it to the place you want on the right pane, or remove it completely by clicking the delete icon.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</step>
</procedure>
</section>
@@ -465,26 +289,34 @@
<section id="sect-User_Guide-Manage_Pages-View_a_Page">
<title>View a Page</title>
<para>
- You easily view a page by clicking on the!images/View.png! icon on the row of the page you want to view in the existing pages list.
+ View any page in the existing pages list by clicking on the <emphasis role="bold">View</emphasis> icon corresponding to the page you want to view.
</para>
</section>
<section id="sect-User_Guide-Manage_Pages-Delete_a_Page">
<title>Delete a Page</title>
- <para>
- 1. Go to <emphasis role="bold">GateIn Admin</emphasis> -> <emphasis role="bold">Administration</emphasis> -> <emphasis role="bold">Advanced</emphasis> --> <emphasis role="bold">Manage Pages</emphasis>
- </para>
- <para>
- 2. There is a list of all existing pages, click the trash can icon !images/DeleteIcon.png! on row of the page you want to delete. It will display the confirmation message.
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/http.png" format="PNG" />
- </imageobject>
- </mediaobject>
- <para>
- 3. Click the <emphasis role="bold">OK</emphasis> button to accept deleting or <emphasis role="bold">Cancel</emphasis> button to quit without deleting this page.
- </para>
+ <procedure>
+ <step>
+ <para>
+ Go to <emphasis role="bold">GateIn Admin</emphasis> -> <emphasis role="bold">Administration</emphasis> -> <emphasis role="bold">Advanced</emphasis> --> <emphasis role="bold">Manage Pages</emphasis>. You will be presented with a list of all existing pages.
+ </para>
+ </step>
+ <step>
+ <para>
+ Click the trash can icon in the row of the page you want to delete. It will display the confirmation message.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/http.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
+ Click the <emphasis role="bold">OK</emphasis> button to process the deletion or <emphasis role="bold">Cancel</emphasis> button to quit without deleting the page.
+ </para>
+ </step>
+ </procedure>
</section>
</section>
14 years, 11 months
- 1
- 0
gatein SVN: r1189 - in portal/trunk/portlet/exoadmin/src/main: webapp/groovy/wsrp/webui/component and 1 other directory.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-01-06 22:04:13 -0500 (Wed, 06 Jan 2010)
New Revision: 1189
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerEditor.java
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerOverview.java
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpProducerEditor.gtmpl
Log:
- More work on Producer configuration. UIWsrpProducerOverview will probably get removed at some point.
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerEditor.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerEditor.java 2010-01-06 23:36:01 UTC (rev 1188)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerEditor.java 2010-01-07 03:04:13 UTC (rev 1189)
@@ -22,63 +22,185 @@
*/
package org.exoplatform.wsrp.webui.component;
-import org.exoplatform.container.ExoContainer;
-import org.exoplatform.container.ExoContainerContext;
+import org.exoplatform.commons.utils.LazyPageList;
+import org.exoplatform.commons.utils.ListAccess;
import org.exoplatform.web.application.ApplicationMessage;
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.config.annotation.ComponentConfig;
+import org.exoplatform.webui.config.annotation.ComponentConfigs;
import org.exoplatform.webui.config.annotation.EventConfig;
import org.exoplatform.webui.core.UIApplication;
+import org.exoplatform.webui.core.UIGrid;
+import org.exoplatform.webui.core.UIPopupWindow;
import org.exoplatform.webui.core.lifecycle.UIFormLifecycle;
import org.exoplatform.webui.event.Event;
import org.exoplatform.webui.event.EventListener;
import org.exoplatform.webui.form.UIForm;
import org.exoplatform.webui.form.UIFormCheckBoxInput;
+import org.exoplatform.webui.form.UIFormInputBase;
+import org.exoplatform.webui.form.UIFormStringInput;
+import org.exoplatform.webui.form.validator.MandatoryValidator;
+import org.gatein.common.util.ParameterValidation;
+import org.gatein.registration.RegistrationPolicy;
+import org.gatein.registration.policies.DefaultRegistrationPolicy;
import org.gatein.wsrp.producer.config.ProducerConfiguration;
import org.gatein.wsrp.producer.config.ProducerConfigurationService;
import org.gatein.wsrp.producer.config.ProducerRegistrationRequirements;
+import org.gatein.wsrp.registration.RegistrationPropertyDescription;
+import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+
/** @author Wesley Hales */
-@ComponentConfig(template = "app:/groovy/wsrp/webui/component/UIWsrpProducerEditor.gtmpl", lifecycle = UIFormLifecycle.class, events = {
- @EventConfig(listeners = UIWsrpProducerEditor.SaveActionListener.class)})
+@ComponentConfigs({
+ @ComponentConfig(id = "RegistrationPropertySelector", type = UIGrid.class, template = "system:/groovy/webui/core/UIGrid.gtmpl"),
+ @ComponentConfig(
+ lifecycle = UIFormLifecycle.class,
+ template = "app:/groovy/wsrp/webui/component/UIWsrpProducerEditor.gtmpl",
+ events = {
+ @EventConfig(listeners = UIWsrpProducerEditor.AddPropertyActionListener.class),
+ @EventConfig(listeners = UIWsrpProducerEditor.EditPropertyActionListener.class),
+ @EventConfig(listeners = UIWsrpProducerEditor.DeletePropertyActionListener.class),
+ @EventConfig(listeners = UIWsrpProducerEditor.SaveActionListener.class)
+ }
+ )})
public class UIWsrpProducerEditor extends UIForm
{
+ private static String[] FIELDS = {"name", "description", "label", "hint"};
+ private static String[] SELECT_ACTIONS = {"AddProperty", "EditProperty", "DeleteProperty"};
- protected static final String REG_REQUIRED_FOR_DESCRIPTION = "registrationrequiredforfulldescription";
- protected static final String STRICT_MODE = "strictmode";
- protected static final String REQUIRES_REGISTRATION = "requiresregistration";
- protected static final String POLICY_CLASS = "policyClassName";
- protected static final String VALIDATOR_CLASS = "validatorClassName";
+ private static final String REG_REQUIRED_FOR_DESCRIPTION = "registrationrequiredforfulldescription";
+ private static final String STRICT_MODE = "strictmode";
+ private static final String REQUIRES_REGISTRATION = "requiresregistration";
+ private static final String POLICY_CLASS = "policyClassName";
+ private static final String VALIDATOR_CLASS = "validatorClassName";
+ private ProducerConfigurationService configService;
+
public UIWsrpProducerEditor() throws Exception
{
addUIFormInput(new UIFormCheckBoxInput(REG_REQUIRED_FOR_DESCRIPTION, REG_REQUIRED_FOR_DESCRIPTION, null));
addUIFormInput(new UIFormCheckBoxInput(STRICT_MODE, STRICT_MODE, null));
addUIFormInput(new UIFormCheckBoxInput(REQUIRES_REGISTRATION, REQUIRES_REGISTRATION, null));
- /*addUIFormInput(new UIFormStringInput(POLICY_CLASS, POLICY_CLASS, null).addValidator(MandatoryValidator.class));
- addUIFormInput(new UIFormStringInput(VALIDATOR_CLASS, VALIDATOR_CLASS, null).addValidator(MandatoryValidator.class));*/
+
+ //add the popup for property edit and adding new properties
+ UIPopupWindow popup = addChild(UIPopupWindow.class, null, null);
+ popup.setWindowSize(400, 300);
+ UIWsrpProducerPropertyEditor propertyForm = createUIComponent(UIWsrpProducerPropertyEditor.class, null, "Producer Property Editor");
+ popup.setUIComponent(propertyForm);
+ popup.setRendered(false);
}
- public void setProducerConfig(ProducerConfiguration producerConfiguration) throws Exception
+ public void initWith(ProducerConfigurationService configurationService) throws Exception
{
+ ParameterValidation.throwIllegalArgExceptionIfNull(configurationService, "ProducerConfigurationService");
+ configService = configurationService;
+ ProducerConfiguration configuration = configService.getConfiguration();
- ProducerRegistrationRequirements registrationRequirements = producerConfiguration.getRegistrationRequirements();
+ ProducerRegistrationRequirements registrationRequirements = configuration.getRegistrationRequirements();
getUIFormCheckBoxInput(REG_REQUIRED_FOR_DESCRIPTION).setValue(registrationRequirements.isRegistrationRequiredForFullDescription());
- getUIFormCheckBoxInput(STRICT_MODE).setValue(producerConfiguration.isUsingStrictMode());
- getUIFormCheckBoxInput(REQUIRES_REGISTRATION).setValue(registrationRequirements.isRegistrationRequired());
+ getUIFormCheckBoxInput(STRICT_MODE).setValue(configuration.isUsingStrictMode());
- /*RegistrationPolicy policy = registrationRequirements.getPolicy();
- String policyClassName = policy.getClass().getName();
- getUIStringInput(POLICY_CLASS).setValue(policyClassName);
+ boolean registrationRequired = registrationRequirements.isRegistrationRequired();
+ getUIFormCheckBoxInput(REQUIRES_REGISTRATION).setValue(registrationRequired);
- if (ProducerRegistrationRequirements.DEFAULT_POLICY_CLASS_NAME.equals(policyClassName))
+ // if registration is required then we display more information
+ if (registrationRequired)
{
- DefaultRegistrationPolicy defaultPolicy = (DefaultRegistrationPolicy)policy;
- getUIStringInput(VALIDATOR_CLASS).setValue(defaultPolicy.getValidator().getClass().getName());
- }*/
+ // registration policy
+ UIFormInputBase<String> policyInput = new UIFormStringInput(POLICY_CLASS, POLICY_CLASS, null).addValidator(MandatoryValidator.class);
+ addUIFormInput(policyInput);
+ RegistrationPolicy policy = registrationRequirements.getPolicy();
+ String policyClassName = policy.getClass().getName();
+ policyInput.setValue(policyClassName);
+
+ // if policy is the default one, display information about the validator
+ if (ProducerRegistrationRequirements.DEFAULT_POLICY_CLASS_NAME.equals(policyClassName))
+ {
+ UIFormInputBase<String> validatorInput = new UIFormStringInput(VALIDATOR_CLASS, VALIDATOR_CLASS, null).addValidator(MandatoryValidator.class);
+ addUIFormInput(validatorInput);
+ DefaultRegistrationPolicy defaultPolicy = (DefaultRegistrationPolicy)policy;
+ getUIStringInput(VALIDATOR_CLASS).setValue(defaultPolicy.getValidator().getClass().getName());
+ }
+
+ // registration properties
+ Map<QName, RegistrationPropertyDescription> regProps = configuration.getRegistrationRequirements().getRegistrationProperties();
+
+ UIGrid uiGrid = addChild(UIGrid.class, "RegistrationPropertySelector", null);
+ //configure the edit and delete buttons based on an id from the data list - this will also be passed as param to listener
+ uiGrid.configure("name", FIELDS, SELECT_ACTIONS);
+
+ //add the propery grid
+ uiGrid.getUIPageIterator().setId("ProducerPropPageIterator");
+ addChild(uiGrid.getUIPageIterator());
+ uiGrid.getUIPageIterator().setRendered(false);
+ LazyPageList propertyList = createPageList(getPropertyList(regProps));
+ uiGrid.getUIPageIterator().setPageList(propertyList);
+
+ }
}
+ private List<RegistrationPropertyDescription> getPropertyList(Map<QName, RegistrationPropertyDescription> descriptions) throws Exception
+ {
+ Comparator<RegistrationPropertyDescription> descComparator = new Comparator<RegistrationPropertyDescription>()
+ {
+ public int compare(RegistrationPropertyDescription o1, RegistrationPropertyDescription o2)
+ {
+ return o1.getName().toString().compareTo(o2.getName().toString());
+ }
+ };
+ List<RegistrationPropertyDescription> result = new ArrayList<RegistrationPropertyDescription>(descriptions.values());
+ Collections.sort(result, descComparator);
+ return result;
+ }
+
+ private LazyPageList<RegistrationPropertyDescription> createPageList(final List<RegistrationPropertyDescription> pageList)
+ {
+ return new LazyPageList<RegistrationPropertyDescription>(new ListAccess<RegistrationPropertyDescription>()
+ {
+
+ public int getSize() throws Exception
+ {
+ return pageList.size();
+ }
+
+ public RegistrationPropertyDescription[] load(int index, int length) throws Exception, IllegalArgumentException
+ {
+ RegistrationPropertyDescription[] pcs = new RegistrationPropertyDescription[pageList.size()];
+
+ if (index < 0)
+ {
+ throw new IllegalArgumentException("Illegal index: index must be a positive number");
+ }
+
+ if (length < 0)
+ {
+ throw new IllegalArgumentException("Illegal length: length must be a positive number");
+ }
+
+ if (index + length > pageList.size())
+ {
+ throw new IllegalArgumentException(
+ "Illegal index or length: sum of the index and the length cannot be greater than the list size");
+ }
+
+ for (int i = 0; i < length; i++)
+ {
+ pcs[i] = pageList.get(i + index);
+ }
+
+ return pcs;
+ }
+
+ }, 10);
+ }
+
+
static public class SaveActionListener extends EventListener<UIWsrpProducerEditor>
{
public void execute(Event<UIWsrpProducerEditor> event) throws Exception
@@ -98,8 +220,8 @@
//ProducerInfo producerInfo = consumerRegistry.getProducerInfoByKey("").getRegistrationInfo().
UIApplication uiApp = context.getUIApplication();
- ProducerConfigurationService pconfService = getProducerConfigurationService();
- ProducerConfiguration producerConfiguration = pconfService.getConfiguration();
+ ProducerConfiguration producerConfiguration = configService.getConfiguration();
+
try
{
ProducerRegistrationRequirements registrationRequirements = producerConfiguration.getRegistrationRequirements();
@@ -107,9 +229,9 @@
producerConfiguration.setUsingStrictMode(Boolean.parseBoolean(getUIFormCheckBoxInput(STRICT_MODE).getValue().toString()));
registrationRequirements.setRegistrationRequired(Boolean.parseBoolean(getUIFormCheckBoxInput(REQUIRES_REGISTRATION).getValue().toString()));
-// registrationRequirements.reloadPolicyFrom(getUIStringInput(POLICY_CLASS).getValue(), getUIStringInput(VALIDATOR_CLASS).getValue());
+ registrationRequirements.reloadPolicyFrom(getUIStringInput(POLICY_CLASS).getValue(), getUIStringInput(VALIDATOR_CLASS).getValue());
- pconfService.saveConfiguration();
+ configService.saveConfiguration();
uiApp.addMessage(new ApplicationMessage("Producer Successfully Changed", null));
}
catch (Exception e)
@@ -121,9 +243,68 @@
return true;
}
- public ProducerConfigurationService getProducerConfigurationService() throws Exception
+ static public class EditPropertyActionListener extends EventListener<UIWsrpProducerOverview>
{
- ExoContainer manager = ExoContainerContext.getCurrentContainer();
- return (ProducerConfigurationService)manager.getComponentInstanceOfType(ProducerConfigurationService.class);
+ public void execute(Event<UIWsrpProducerOverview> event) throws Exception
+ {
+ UIWsrpProducerOverview producerOverview = event.getSource();
+ UIApplication uiApp = event.getRequestContext().getUIApplication();
+ UIPopupWindow popup = producerOverview.getChild(UIPopupWindow.class);
+ UIWsrpProducerPropertyEditor editor = (UIWsrpProducerPropertyEditor)popup.getUIComponent();
+ String id = event.getRequestContext().getRequestParameter(OBJECTID);
+ try
+ {
+ editor.setRegistrationPropertyDescription(producerOverview.getProducerConfigurationService().getConfiguration().getRegistrationRequirements().getRegistrationPropertyWith(id));
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ popup.setUIComponent(editor);
+ popup.setRendered(true);
+ popup.setShow(true);
+
+ }
}
+
+ static public class DeletePropertyActionListener extends EventListener<UIWsrpProducerOverview>
+ {
+ public void execute(Event<UIWsrpProducerOverview> event)
+ {
+ UIWsrpProducerOverview producerOverview = event.getSource();
+ UIApplication uiApp = event.getRequestContext().getUIApplication();
+ UIPopupWindow popup = producerOverview.getChild(UIPopupWindow.class);
+ UIWsrpProducerPropertyEditor editor = (UIWsrpProducerPropertyEditor)popup.getUIComponent();
+ String id = event.getRequestContext().getRequestParameter(OBJECTID);
+ try
+ {
+ producerOverview.getProducerConfigurationService().getConfiguration().getRegistrationRequirements().removeRegistrationProperty(id);
+ producerOverview.getProducerConfigurationService().saveConfiguration();
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ uiApp.addMessage(new ApplicationMessage("Failed to delete Producer Property. Cause: " + e.getCause(), null, ApplicationMessage.ERROR));
+ }
+
+ }
+ }
+
+ static public class AddPropertyActionListener extends EventListener<UIWsrpProducerOverview>
+ {
+ public void execute(Event<UIWsrpProducerOverview> event) throws Exception
+ {
+ UIWsrpProducerOverview wsrpProducerOverview = event.getSource();
+ UIPopupWindow popup = wsrpProducerOverview.getChild(UIPopupWindow.class);
+ UIWsrpProducerPropertyEditor editor = (UIWsrpProducerPropertyEditor)popup.getUIComponent();
+
+ //reset the form
+ editor.setRegistrationPropertyDescription(null);
+ popup.setRendered(true);
+ popup.setShow(true);
+ popup.setShowCloseButton(true);
+ //popup.setShowMask(true);
+
+ }
+ }
}
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerOverview.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerOverview.java 2010-01-06 23:36:01 UTC (rev 1188)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerOverview.java 2010-01-07 03:04:13 UTC (rev 1189)
@@ -22,205 +22,29 @@
*/
package org.exoplatform.wsrp.webui.component;
-import org.exoplatform.commons.utils.LazyPageList;
-import org.exoplatform.commons.utils.ListAccess;
import org.exoplatform.container.ExoContainer;
import org.exoplatform.container.ExoContainerContext;
-import org.exoplatform.web.application.ApplicationMessage;
import org.exoplatform.webui.config.annotation.ComponentConfig;
-import org.exoplatform.webui.config.annotation.ComponentConfigs;
-import org.exoplatform.webui.config.annotation.EventConfig;
-import org.exoplatform.webui.core.UIApplication;
import org.exoplatform.webui.core.UIContainer;
-import org.exoplatform.webui.core.UIGrid;
-import org.exoplatform.webui.core.UIPopupWindow;
import org.exoplatform.webui.core.lifecycle.UIApplicationLifecycle;
-import org.exoplatform.webui.event.Event;
-import org.exoplatform.webui.event.EventListener;
-import org.gatein.wsrp.producer.config.ProducerConfiguration;
import org.gatein.wsrp.producer.config.ProducerConfigurationService;
-import org.gatein.wsrp.registration.RegistrationPropertyDescription;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-
/** @author Wesley Hales */
-@ComponentConfigs({
- @ComponentConfig(id = "RegistrationPropertySelector", type = UIGrid.class, template = "system:/groovy/webui/core/UIGrid.gtmpl"),
- @ComponentConfig(
- lifecycle = UIApplicationLifecycle.class,
- template = "app:/groovy/wsrp/webui/component/UIWsrpProducerOverview.gtmpl",
- events = {
-// @EventConfig(listeners = UIWsrpProducerOverview.AddPropertyActionListener.class),
- @EventConfig(listeners = UIWsrpProducerOverview.EditPropertyActionListener.class),
- @EventConfig(listeners = UIWsrpProducerOverview.DeletePropertyActionListener.class)
- }
- )})
+@ComponentConfig(
+ lifecycle = UIApplicationLifecycle.class,
+ template = "app:/groovy/wsrp/webui/component/UIWsrpProducerOverview.gtmpl"
+)
public class UIWsrpProducerOverview extends UIContainer
{
+ private UIWsrpProducerEditor producerForm;
- public static String[] FIELDS = {"name", "description", "label", "hint"};
-
- public static String[] SELECT_ACTIONS = {"AddProperty", "EditProperty", "DeleteProperty"};
-
public UIWsrpProducerOverview() throws Exception
{
- ProducerConfigurationService service = getProducerConfigurationService();
- ProducerConfiguration producerConfiguration = service.getConfiguration();
- UIWsrpProducerEditor producerForm = createUIComponent(UIWsrpProducerEditor.class, null, "Producer Editor");
- producerForm.setProducerConfig(producerConfiguration);
+ producerForm = createUIComponent(UIWsrpProducerEditor.class, null, "Producer Editor");
+ producerForm.initWith(getProducerConfigurationService());
addChild(producerForm);
-
- /*UIGrid uiGrid = addChild(UIGrid.class, "RegistrationPropertySelector", null);
- //configure the edit and delete buttons based on an id from the data list - this will also be passed as param to listener
- uiGrid.configure("name", FIELDS, SELECT_ACTIONS);
-
- //add the propery grid
- uiGrid.getUIPageIterator().setId("ProducerPropPageIterator");
- addChild(uiGrid.getUIPageIterator());
- uiGrid.getUIPageIterator().setRendered(false);
- LazyPageList propertyList = createPageList(getPropertyList());
- uiGrid.getUIPageIterator().setPageList(propertyList);
-
- //add the popup for property edit and adding new properties
- UIPopupWindow popup = addChild(UIPopupWindow.class, null, null);
- popup.setWindowSize(400, 300);
- UIWsrpProducerPropertyEditor propertyForm = createUIComponent(UIWsrpProducerPropertyEditor.class, null, "Producer Property Editor");
- popup.setUIComponent(propertyForm);
- popup.setRendered(false);*/
}
- public List<RegistrationPropertyDescription> getPropertyList() throws Exception
- {
- ProducerConfiguration producerConfiguration = getProducerConfigurationService().getConfiguration();
- Map descriptions = producerConfiguration.getRegistrationRequirements().getRegistrationProperties();
- Comparator<RegistrationPropertyDescription> descComparator = new Comparator<RegistrationPropertyDescription>()
- {
- public int compare(RegistrationPropertyDescription o1, RegistrationPropertyDescription o2)
- {
- return o1.getName().toString().compareTo(o2.getName().toString());
- }
- };
-
- List<RegistrationPropertyDescription> result = new ArrayList<RegistrationPropertyDescription>(descriptions.values());
- Collections.sort(result, descComparator);
- return result;
- }
-
- public List<String> getSupportedPropertyTypes()
- {
- return Collections.singletonList(("xsd:string"));
- }
-
- public LazyPageList<RegistrationPropertyDescription> createPageList(final List<RegistrationPropertyDescription> pageList)
- {
- return new LazyPageList<RegistrationPropertyDescription>(new ListAccess<RegistrationPropertyDescription>()
- {
-
- public int getSize() throws Exception
- {
- return pageList.size();
- }
-
- public RegistrationPropertyDescription[] load(int index, int length) throws Exception, IllegalArgumentException
- {
- RegistrationPropertyDescription[] pcs = new RegistrationPropertyDescription[pageList.size()];
-
- if (index < 0)
- {
- throw new IllegalArgumentException("Illegal index: index must be a positive number");
- }
-
- if (length < 0)
- {
- throw new IllegalArgumentException("Illegal length: length must be a positive number");
- }
-
- if (index + length > pageList.size())
- {
- throw new IllegalArgumentException(
- "Illegal index or length: sum of the index and the length cannot be greater than the list size");
- }
-
- for (int i = 0; i < length; i++)
- {
- pcs[i] = pageList.get(i + index);
- }
-
- return pcs;
- }
-
- }, 10);
- }
-
- static public class EditPropertyActionListener extends EventListener<UIWsrpProducerOverview>
- {
- public void execute(Event<UIWsrpProducerOverview> event) throws Exception
- {
- UIWsrpProducerOverview producerOverview = event.getSource();
- UIApplication uiApp = event.getRequestContext().getUIApplication();
- UIPopupWindow popup = producerOverview.getChild(UIPopupWindow.class);
- UIWsrpProducerPropertyEditor editor = (UIWsrpProducerPropertyEditor)popup.getUIComponent();
- String id = event.getRequestContext().getRequestParameter(OBJECTID);
- try
- {
- editor.setRegistrationPropertyDescription(producerOverview.getProducerConfigurationService().getConfiguration().getRegistrationRequirements().getRegistrationPropertyWith(id));
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- popup.setUIComponent(editor);
- popup.setRendered(true);
- popup.setShow(true);
-
- }
- }
-
- static public class DeletePropertyActionListener extends EventListener<UIWsrpProducerOverview>
- {
- public void execute(Event<UIWsrpProducerOverview> event)
- {
- UIWsrpProducerOverview producerOverview = event.getSource();
- UIApplication uiApp = event.getRequestContext().getUIApplication();
- UIPopupWindow popup = producerOverview.getChild(UIPopupWindow.class);
- UIWsrpProducerPropertyEditor editor = (UIWsrpProducerPropertyEditor)popup.getUIComponent();
- String id = event.getRequestContext().getRequestParameter(OBJECTID);
- try
- {
- producerOverview.getProducerConfigurationService().getConfiguration().getRegistrationRequirements().removeRegistrationProperty(id);
- producerOverview.getProducerConfigurationService().saveConfiguration();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- uiApp.addMessage(new ApplicationMessage("Failed to delete Producer Property. Cause: " + e.getCause(), null, ApplicationMessage.ERROR));
- }
-
- }
- }
-
- static public class AddPropertyActionListener extends EventListener<UIWsrpProducerOverview>
- {
- public void execute(Event<UIWsrpProducerOverview> event) throws Exception
- {
- UIWsrpProducerOverview wsrpProducerOverview = event.getSource();
- UIPopupWindow popup = wsrpProducerOverview.getChild(UIPopupWindow.class);
- UIWsrpProducerPropertyEditor editor = (UIWsrpProducerPropertyEditor)popup.getUIComponent();
-
- //reset the form
- editor.setRegistrationPropertyDescription(null);
- popup.setRendered(true);
- popup.setShow(true);
- popup.setShowCloseButton(true);
- //popup.setShowMask(true);
-
- }
- }
-
public ProducerConfigurationService getProducerConfigurationService() throws Exception
{
ExoContainer manager = ExoContainerContext.getCurrentContainer();
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpProducerEditor.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpProducerEditor.gtmpl 2010-01-06 23:36:01 UTC (rev 1188)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpProducerEditor.gtmpl 2010-01-07 03:04:13 UTC (rev 1189)
@@ -1,43 +1,61 @@
-<%
- import org.exoplatform.webui.form.UIFormStringInput;
-%>
+<div class="WSRPProducerConfiguration">
+ <%
+ uiform.begin()
+ for (field in uiform.getChildren())
+ {
+ if (field.isRendered())
+ {
+ %>
+ <div class="row">
+ <%
+ label = uicomponent.getLabel(field.getName());
+ if (!label.equals(uicomponent.getId()))
+ {
+ %>
+ <label>
+ <%
+ if (label != null && label.length() > 0)
+ {
+ %>
+ <%=label%>
+ <%
+ }
+ %>
+ </label>
+ <% uiform.renderField(field) %>
+ </div>
+ <%
+ }
+ }
+ }
+ %>
-<div class="UILoginForm" id="ChildTest">
- <% uiform.begin() %>
- <%
- UIFormStringInput name = uicomponent.getChild(UIFormStringInput.class);
- %>
- <div class="SignIn">Access to full service description requires consumers to be registered. <% uiform.renderChild(0); %></div>
- <div class="SignIn">Use strict WSRP compliance. <% uiform.renderChild(1); %></div>
- <div class="SignIn">Requires registration. Modifying this information will trigger invalidation of consumer registrations. <% uiform.renderChild(2); %></div>
+ <div class="FloatRight">
- <div class="FloatRight">
+ <div class="UIAction">
+ <table class="ActionContainer">
+ <tr>
+ <td>
-
- <div class="UIAction">
- <table class="ActionContainer">
- <tr>
- <td>
-
- </td>
- <td>
- <div onclick="<%=uicomponent.event("Save")%>" class="ActionButton LightBlueStyle">
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".action.Save")%></a>
+ </td>
+ <td>
+ <div onclick="<%=uicomponent.event("Save")%>" class="ActionButton LightBlueStyle">
+ <div class="ButtonLeft">
+ <div class="ButtonRight">
+ <div class="ButtonMiddle">
+ <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".action.Save")%></a>
+ </div>
+ </div>
+ </div>
</div>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
- </div>
+ </td>
+ </tr>
+ </table>
+ </div>
-
- <div class="ClearRight"><span></span></div>
- <% uiform.end() %>
-</div>
+
+ <div class="ClearRight"><span></span></div>
+ <% uiform.end() %>
+ </div>
</div>
\ No newline at end of file
14 years, 11 months
- 1
- 0
gatein SVN: r1188 - in portal/trunk: component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations and 2 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-01-06 18:36:01 -0500 (Wed, 06 Jan 2010)
New Revision: 1188
Modified:
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerMapping.java
portal/trunk/pom.xml
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsumerEditor.java
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerOverview.java
Log:
- Upgraded to WSRP 1.0.0-Beta04.
- Do not persist Consumer's status as it is now computed from its registrations.
- Added implementation of internalSaveChanges so that changes to Consumers can be persisted properly.
- Added ability to set timeout duration on WS operations for consumers.
- Started fixing UIWsrpProducerOverview.
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java 2010-01-06 21:58:38 UTC (rev 1187)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java 2010-01-06 23:36:01 UTC (rev 1188)
@@ -31,6 +31,7 @@
import org.gatein.portal.wsrp.state.producer.registrations.mapping.ConsumersAndGroupsMapping;
import org.gatein.portal.wsrp.state.producer.registrations.mapping.RegistrationMapping;
import org.gatein.portal.wsrp.state.producer.registrations.mapping.RegistrationPropertiesMapping;
+import org.gatein.registration.Consumer;
import org.gatein.registration.ConsumerGroup;
import org.gatein.registration.Registration;
import org.gatein.registration.RegistrationException;
@@ -162,7 +163,7 @@
return consumer;
}
- /*@Override
+ @Override
protected ConsumerSPI internalSaveChangesTo(Consumer consumer)
{
ConsumerSPI consumerSPI = super.internalSaveChangesTo(consumer);
@@ -181,7 +182,7 @@
}
return consumerSPI;
- }*/
+ }
@Override
protected ConsumerGroupSPI internalRemoveConsumerGroup(String name)
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerMapping.java 2010-01-06 21:58:38 UTC (rev 1187)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerMapping.java 2010-01-06 23:36:01 UTC (rev 1188)
@@ -28,9 +28,9 @@
import org.chromattic.api.annotations.Id;
import org.chromattic.api.annotations.ManyToOne;
import org.chromattic.api.annotations.MappedBy;
-import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.OneToMany;
import org.chromattic.api.annotations.OneToOne;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
import org.chromattic.api.annotations.RelatedMappedBy;
import org.gatein.portal.wsrp.state.producer.registrations.JCRRegistrationPersistenceManager;
@@ -38,7 +38,6 @@
import org.gatein.registration.ConsumerGroup;
import org.gatein.registration.Registration;
import org.gatein.registration.RegistrationException;
-import org.gatein.registration.RegistrationStatus;
import org.gatein.registration.spi.ConsumerSPI;
import java.util.List;
@@ -70,11 +69,6 @@
public abstract void setConsumerAgent(String consumerAgent);
- @Property(name = "status")
- public abstract RegistrationStatus getStatus();
-
- public abstract void setStatus(RegistrationStatus status);
-
@OneToMany
@RelatedMappedBy("consumer")
public abstract List<RegistrationMapping> getRegistrations();
@@ -134,7 +128,6 @@
setName(consumer.getName());
setId(consumer.getId());
setConsumerAgent(consumer.getConsumerAgent());
- setStatus(consumer.getStatus());
ConsumerGroup group = consumer.getGroup();
if (group != null)
@@ -163,7 +156,6 @@
{
ConsumerSPI consumer = persistenceManager.newConsumerSPI(getId(), getName());
consumer.setConsumerAgent(getConsumerAgent());
- consumer.setStatus(getStatus());
consumer.setPersistentKey(getPersistentKey());
consumer.setCapabilities(getCapabilities().toConsumerCapabilities());
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-01-06 21:58:38 UTC (rev 1187)
+++ portal/trunk/pom.xml 2010-01-06 23:36:01 UTC (rev 1188)
@@ -19,7 +19,8 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -47,7 +48,7 @@
<org.gatein.wci.version>2.0.0-CR02</org.gatein.wci.version>
<org.gatein.pc.version>2.1.0-CR01</org.gatein.pc.version>
<org.picketlink.idm>1.1.0.Beta1</org.picketlink.idm>
- <org.gatein.wsrp.version>1.0.0-Beta03</org.gatein.wsrp.version>
+ <org.gatein.wsrp.version>1.0.0-Beta04</org.gatein.wsrp.version>
<org.gatein.mop.version>1.0.0-Beta13</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
<rhino.version>1.6R5</rhino.version>
@@ -86,406 +87,406 @@
<module>packaging</module>
</modules>
- <dependencyManagement>
- <dependencies>
+ <dependencyManagement>
+ <dependencies>
- <!-- eXo JCR stack -->
- <dependency>
- <groupId>org.exoplatform.kernel</groupId>
- <artifactId>exo.kernel.commons</artifactId>
- <version>${org.exoplatform.kernel.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.kernel</groupId>
- <artifactId>exo.kernel.commons</artifactId>
- <version>${org.exoplatform.kernel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.kernel</groupId>
- <artifactId>exo.kernel.component.cache</artifactId>
- <version>${org.exoplatform.kernel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.kernel</groupId>
- <artifactId>exo.kernel.component.command</artifactId>
- <version>${org.exoplatform.kernel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.kernel</groupId>
- <artifactId>exo.kernel.component.common</artifactId>
- <version>${org.exoplatform.kernel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.kernel</groupId>
- <artifactId>exo.kernel.container</artifactId>
- <version>${org.exoplatform.kernel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.core</groupId>
- <artifactId>exo.core.component.organization.api</artifactId>
- <version>${org.exoplatform.core.version}</version>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.core</groupId>
- <artifactId>exo.core.component.database</artifactId>
- <version>${org.exoplatform.core.version}</version>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.core</groupId>
- <artifactId>exo.core.component.organization.api</artifactId>
- <version>${org.exoplatform.core.version}</version>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.core</groupId>
- <artifactId>exo.core.component.organization.jdbc</artifactId>
- <version>${org.exoplatform.core.version}</version>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.core</groupId>
- <artifactId>exo.core.component.security.core</artifactId>
- <version>${org.exoplatform.core.version}</version>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.core</groupId>
- <artifactId>exo.core.component.document</artifactId>
- <version>${org.exoplatform.core.version}</version>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.jcr</groupId>
- <artifactId>exo.jcr.component.core</artifactId>
- <version>${org.exoplatform.jcr.version}</version>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.jcr</groupId>
- <artifactId>exo.jcr.component.ext</artifactId>
- <version>${org.exoplatform.jcr.version}</version>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.ws</groupId>
- <artifactId>exo.ws.frameworks.servlet</artifactId>
- <version>${org.exoplatform.ws.version}</version>
- </dependency>
+ <!-- eXo JCR stack -->
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.commons</artifactId>
+ <version>${org.exoplatform.kernel.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.commons</artifactId>
+ <version>${org.exoplatform.kernel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.component.cache</artifactId>
+ <version>${org.exoplatform.kernel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.component.command</artifactId>
+ <version>${org.exoplatform.kernel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.component.common</artifactId>
+ <version>${org.exoplatform.kernel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.container</artifactId>
+ <version>${org.exoplatform.kernel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.core</groupId>
+ <artifactId>exo.core.component.organization.api</artifactId>
+ <version>${org.exoplatform.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.core</groupId>
+ <artifactId>exo.core.component.database</artifactId>
+ <version>${org.exoplatform.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.core</groupId>
+ <artifactId>exo.core.component.organization.api</artifactId>
+ <version>${org.exoplatform.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.core</groupId>
+ <artifactId>exo.core.component.organization.jdbc</artifactId>
+ <version>${org.exoplatform.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.core</groupId>
+ <artifactId>exo.core.component.security.core</artifactId>
+ <version>${org.exoplatform.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.core</groupId>
+ <artifactId>exo.core.component.document</artifactId>
+ <version>${org.exoplatform.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>exo.jcr.component.core</artifactId>
+ <version>${org.exoplatform.jcr.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>exo.jcr.component.ext</artifactId>
+ <version>${org.exoplatform.jcr.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.ws</groupId>
+ <artifactId>exo.ws.frameworks.servlet</artifactId>
+ <version>${org.exoplatform.ws.version}</version>
+ </dependency>
- <!-- GateIn components -->
- <dependency>
- <groupId>org.gatein.common</groupId>
- <artifactId>common-logging</artifactId>
- <version>${org.gatein.common.version}</version>
- </dependency>
- <dependency>
- <groupId>org.gatein.common</groupId>
- <artifactId>common-common</artifactId>
- <version>${org.gatein.common.version}</version>
- </dependency>
- <dependency>
- <groupId>org.gatein.wci</groupId>
- <artifactId>wci-wci</artifactId>
- <version>${org.gatein.wci.version}</version>
- </dependency>
- <dependency>
- <groupId>org.gatein.pc</groupId>
- <artifactId>pc-bridge</artifactId>
- <version>${org.gatein.pc.version}</version>
- </dependency>
- <dependency>
- <groupId>org.gatein.pc</groupId>
- <artifactId>pc-federation</artifactId>
- <version>${org.gatein.pc.version}</version>
- </dependency>
- <dependency>
- <groupId>org.gatein.pc</groupId>
- <artifactId>pc-mc</artifactId>
- <version>${org.gatein.pc.version}</version>
- </dependency>
- <dependency>
- <groupId>org.gatein.pc</groupId>
- <artifactId>pc-portlet</artifactId>
- <version>${org.gatein.pc.version}</version>
- </dependency>
- <dependency>
- <groupId>org.gatein.pc</groupId>
- <artifactId>pc-api</artifactId>
- <version>${org.gatein.pc.version}</version>
- </dependency>
- <dependency>
- <groupId>org.gatein.wsrp</groupId>
- <artifactId>wsrp-producer-lib</artifactId>
- <version>${org.gatein.wsrp.version}</version>
- </dependency>
- <dependency>
- <groupId>org.gatein.wsrp</groupId>
- <artifactId>wsrp-consumer</artifactId>
- <version>${org.gatein.wsrp.version}</version>
- </dependency>
- <dependency>
- <groupId>org.gatein.wsrp</groupId>
- <artifactId>wsrp-integration-api</artifactId>
- <version>${org.gatein.wsrp.version}</version>
- </dependency>
- <dependency>
- <groupId>org.gatein.mop</groupId>
- <artifactId>mop-api</artifactId>
- <version>${org.gatein.mop.version}</version>
- </dependency>
- <dependency>
- <groupId>org.gatein.mop</groupId>
- <artifactId>mop-spi</artifactId>
- <version>${org.gatein.mop.version}</version>
- </dependency>
- <dependency>
- <groupId>org.gatein.mop</groupId>
- <artifactId>mop-core</artifactId>
- <version>${org.gatein.mop.version}</version>
- </dependency>
+ <!-- GateIn components -->
+ <dependency>
+ <groupId>org.gatein.common</groupId>
+ <artifactId>common-logging</artifactId>
+ <version>${org.gatein.common.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.common</groupId>
+ <artifactId>common-common</artifactId>
+ <version>${org.gatein.common.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-wci</artifactId>
+ <version>${org.gatein.wci.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-bridge</artifactId>
+ <version>${org.gatein.pc.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-federation</artifactId>
+ <version>${org.gatein.pc.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-mc</artifactId>
+ <version>${org.gatein.pc.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-portlet</artifactId>
+ <version>${org.gatein.pc.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-api</artifactId>
+ <version>${org.gatein.pc.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wsrp</groupId>
+ <artifactId>wsrp-producer-lib</artifactId>
+ <version>${org.gatein.wsrp.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wsrp</groupId>
+ <artifactId>wsrp-consumer</artifactId>
+ <version>${org.gatein.wsrp.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wsrp</groupId>
+ <artifactId>wsrp-integration-api</artifactId>
+ <version>${org.gatein.wsrp.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.mop</groupId>
+ <artifactId>mop-api</artifactId>
+ <version>${org.gatein.mop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.mop</groupId>
+ <artifactId>mop-spi</artifactId>
+ <version>${org.gatein.mop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.mop</groupId>
+ <artifactId>mop-core</artifactId>
+ <version>${org.gatein.mop.version}</version>
+ </dependency>
- <!-- Chromattic -->
- <dependency>
- <groupId>org.chromattic</groupId>
- <artifactId>chromattic.apt</artifactId>
- <version>${version.chromattic}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.chromattic</groupId>
- <artifactId>chromattic.api</artifactId>
- <version>${version.chromattic}</version>
- </dependency>
- <dependency>
- <groupId>org.chromattic</groupId>
- <artifactId>chromattic.spi</artifactId>
- <version>${version.chromattic}</version>
- </dependency>
- <dependency>
- <groupId>org.chromattic</groupId>
- <artifactId>chromattic.core</artifactId>
- <version>${version.chromattic}</version>
- </dependency>
- <dependency>
- <groupId>org.chromattic</groupId>
- <artifactId>chromattic.ntdef</artifactId>
- <version>${version.chromattic}</version>
- </dependency>
+ <!-- Chromattic -->
+ <dependency>
+ <groupId>org.chromattic</groupId>
+ <artifactId>chromattic.apt</artifactId>
+ <version>${version.chromattic}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.chromattic</groupId>
+ <artifactId>chromattic.api</artifactId>
+ <version>${version.chromattic}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.chromattic</groupId>
+ <artifactId>chromattic.spi</artifactId>
+ <version>${version.chromattic}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.chromattic</groupId>
+ <artifactId>chromattic.core</artifactId>
+ <version>${version.chromattic}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.chromattic</groupId>
+ <artifactId>chromattic.ntdef</artifactId>
+ <version>${version.chromattic}</version>
+ </dependency>
- <!-- Picketlink -->
- <dependency>
- <groupId>org.picketlink.idm</groupId>
- <artifactId>picketlink-idm-core</artifactId>
- <version>${org.picketlink.idm}</version>
- </dependency>
- <dependency>
- <groupId>org.picketlink.idm</groupId>
- <artifactId>picketlink-idm-hibernate</artifactId>
- <version>${org.picketlink.idm}</version>
- </dependency>
- <dependency>
- <groupId>org.picketlink.idm</groupId>
- <artifactId>picketlink-idm-ldap</artifactId>
- <version>${org.picketlink.idm}</version>
- </dependency>
- <dependency>
- <groupId>org.picketlink.idm</groupId>
- <artifactId>picketlink-idm-cache</artifactId>
- <version>${org.picketlink.idm}</version>
- </dependency>
+ <!-- Picketlink -->
+ <dependency>
+ <groupId>org.picketlink.idm</groupId>
+ <artifactId>picketlink-idm-core</artifactId>
+ <version>${org.picketlink.idm}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink.idm</groupId>
+ <artifactId>picketlink-idm-hibernate</artifactId>
+ <version>${org.picketlink.idm}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink.idm</groupId>
+ <artifactId>picketlink-idm-ldap</artifactId>
+ <version>${org.picketlink.idm}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink.idm</groupId>
+ <artifactId>picketlink-idm-cache</artifactId>
+ <version>${org.picketlink.idm}</version>
+ </dependency>
- <dependency>
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
- <version>2.0</version>
- </dependency>
+ <dependency>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>2.0</version>
+ </dependency>
- <!-- Portlet bridge -->
- <dependency>
- <groupId>org.jboss.portletbridge</groupId>
- <artifactId>portletbridge-api</artifactId>
- <version>2.0.0.BETA</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.portletbridge</groupId>
- <artifactId>portletbridge-impl</artifactId>
- <version>2.0.0.BETA</version>
- </dependency>
+ <!-- Portlet bridge -->
+ <dependency>
+ <groupId>org.jboss.portletbridge</groupId>
+ <artifactId>portletbridge-api</artifactId>
+ <version>2.0.0.BETA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.portletbridge</groupId>
+ <artifactId>portletbridge-impl</artifactId>
+ <version>2.0.0.BETA</version>
+ </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.2.2</version>
- <exclusions>
- <exclusion>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20070829</version>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.7</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.resource</groupId>
+ <artifactId>connector-api</artifactId>
+ <version>1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${javax.servlet.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>${rhino.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>${org.codehaus.groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>caja</groupId>
+ <artifactId>caja</artifactId>
+ <version>r3375</version>
+ </dependency>
+ <dependency>
+ <groupId>caja</groupId>
+ <artifactId>json_simple</artifactId>
+ <version>r1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.oauth</groupId>
+ <artifactId>core</artifactId>
+ <version>20080621</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.collections</groupId>
+ <artifactId>google-collections</artifactId>
+ <version>1.0-rc2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>rome</groupId>
+ <artifactId>rome</artifactId>
+ <version>0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
+ <version>3.8</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ <version>1.9.9</version>
+ </dependency>
+ <dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20070829</version>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.7</version>
- </dependency>
- <dependency>
- <groupId>javax.resource</groupId>
- <artifactId>connector-api</artifactId>
- <version>1.5</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${javax.servlet.version}</version>
- </dependency>
- <dependency>
- <groupId>rhino</groupId>
- <artifactId>js</artifactId>
- <version>${rhino.version}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>${org.codehaus.groovy.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.0</version>
- </dependency>
+ <version>2.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>nu.validator.htmlparser</groupId>
+ <artifactId>htmlparser</artifactId>
+ <version>1.0.7</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.7</version>
+ </dependency>
- <dependency>
- <groupId>caja</groupId>
- <artifactId>caja</artifactId>
- <version>r3375</version>
- </dependency>
- <dependency>
- <groupId>caja</groupId>
- <artifactId>json_simple</artifactId>
- <version>r1</version>
- </dependency>
- <dependency>
- <groupId>net.oauth</groupId>
- <artifactId>core</artifactId>
- <version>20080621</version>
- </dependency>
- <dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- <version>1.0-rc2</version>
- </dependency>
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>rome</groupId>
- <artifactId>rome</artifactId>
- <version>0.9</version>
- </dependency>
- <dependency>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
- <version>3.8</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.nekohtml</groupId>
- <artifactId>nekohtml</artifactId>
- <version>1.9.9</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
- </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>nu.validator.htmlparser</groupId>
- <artifactId>htmlparser</artifactId>
- <version>1.0.7</version>
- </dependency>
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.7</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-gadgets</artifactId>
+ <version>${org.shindig.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-features</artifactId>
+ <version>${org.shindig.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-common</artifactId>
+ <version>${org.shindig.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-server</artifactId>
+ <version>${org.shindig.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-server</artifactId>
+ <version>${org.shindig.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-social-api</artifactId>
+ <version>${org.shindig.version}</version>
+ </dependency>
- <dependency>
- <groupId>org.apache.shindig</groupId>
- <artifactId>shindig-gadgets</artifactId>
- <version>${org.shindig.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shindig</groupId>
- <artifactId>shindig-features</artifactId>
- <version>${org.shindig.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shindig</groupId>
- <artifactId>shindig-common</artifactId>
- <version>${org.shindig.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shindig</groupId>
- <artifactId>shindig-server</artifactId>
- <version>${org.shindig.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shindig</groupId>
- <artifactId>shindig-server</artifactId>
- <version>${org.shindig.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.apache.shindig</groupId>
- <artifactId>shindig-social-api</artifactId>
- <version>${org.shindig.version}</version>
- </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
+ </dependencies>
- </dependencies>
+ </dependencyManagement>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
@@ -526,10 +527,10 @@
<version>1.1.1</version>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.4</version>
- </plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.4</version>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -570,11 +571,12 @@
<phase>compile</phase>
<configuration>
<tasks>
- <copy failonerror="false" todir="${project.build.directory}/${project.build.finalName}/WEB-INF/classes">
+ <copy failonerror="false"
+ todir="${project.build.directory}/${project.build.finalName}/WEB-INF/classes">
<fileset dir="${basedir}/src/main/webapp/WEB-INF/classes">
- <include name="**/*_en.properties" />
+ <include name="**/*_en.properties"/>
</fileset>
- <globmapper from="*_en.properties" to="*.properties" />
+ <globmapper from="*_en.properties" to="*.properties"/>
</copy>
</tasks>
</configuration>
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsumerEditor.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsumerEditor.java 2010-01-06 21:58:38 UTC (rev 1187)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsumerEditor.java 2010-01-06 23:36:01 UTC (rev 1188)
@@ -38,18 +38,21 @@
import org.exoplatform.webui.form.UIForm;
import org.exoplatform.webui.form.UIFormStringInput;
import org.exoplatform.webui.form.validator.MandatoryValidator;
+import org.gatein.common.util.ParameterValidation;
import org.gatein.wsrp.WSRPConsumer;
import org.gatein.wsrp.consumer.ConsumerException;
import org.gatein.wsrp.consumer.ProducerInfo;
import org.gatein.wsrp.consumer.registry.ConsumerRegistry;
+import org.gatein.wsrp.services.ManageableServiceFactory;
/** @author Wesley Hales */
@ComponentConfig(template = "app:/groovy/wsrp/webui/component/UIWsrpConsumerEditor.gtmpl", lifecycle = UIFormLifecycle.class, events = {
@EventConfig(listeners = UIWsrpConsumerEditor.SaveActionListener.class)})
public class UIWsrpConsumerEditor extends UIForm
{
- protected static final String CONSUMER_NAME = "Consumer Name: ";
- protected static final String CACHE_EXPIRATION = "Cache Expiration Seconds: ";
+ protected static final String CONSUMER_NAME = "Consumer name: ";
+ protected static final String CACHE_EXPIRATION = "Seconds before cache expiration: ";
+ protected static final String TIMEOUT = "Milliseconds before timeout: ";
protected static final String WSDL_URL = "WSDL URL: ";
public UIWsrpConsumerEditor() throws Exception
@@ -57,6 +60,7 @@
addUIFormInput(new UIFormStringInput(CONSUMER_NAME, CONSUMER_NAME, null).addValidator(MandatoryValidator.class));
addUIFormInput(new UIFormStringInput(CACHE_EXPIRATION, CACHE_EXPIRATION, null));
+ addUIFormInput(new UIFormStringInput(TIMEOUT, TIMEOUT, null));
addUIFormInput(new UIFormStringInput(WSDL_URL, WSDL_URL, null));
//addChild(UIWsrpEndpointConfigForm.class,null,null);
}
@@ -77,6 +81,18 @@
return cacheExp;
}
+ private Integer getTimeout()
+ {
+ int timeout = ManageableServiceFactory.DEFAULT_TIMEOUT_MS;
+ String timeoutString = getUIStringInput(TIMEOUT).getValue();
+ if (!ParameterValidation.isNullOrEmpty(timeoutString))
+ {
+ timeout = Integer.parseInt(timeoutString);
+ }
+
+ return timeout;
+ }
+
private String getWSDLURL()
{
return getUIStringInput(WSDL_URL).getValue();
@@ -106,8 +122,10 @@
getUIStringInput(CONSUMER_NAME).setEditable(UIFormStringInput.ENABLE);
getUIStringInput(CONSUMER_NAME).setValue(consumer.getProducerId());
- getUIStringInput(CACHE_EXPIRATION).setValue(consumer.getProducerInfo().getExpirationCacheSeconds().toString());
- getUIStringInput(WSDL_URL).setValue(consumer.getProducerInfo().getEndpointConfigurationInfo().getWsdlDefinitionURL());
+ ProducerInfo producerInfo = consumer.getProducerInfo();
+ getUIStringInput(CACHE_EXPIRATION).setValue(producerInfo.getExpirationCacheSeconds().toString());
+ getUIStringInput(TIMEOUT).setValue("" + producerInfo.getEndpointConfigurationInfo().getWSOperationTimeOut());
+ getUIStringInput(WSDL_URL).setValue(producerInfo.getEndpointConfigurationInfo().getWsdlDefinitionURL());
setNewConsumer(false);
//invokeGetBindingBean(consumer.getProducerInfo());
@@ -136,9 +154,12 @@
UIWsrpConsumerOverview consumerOverview = consumerEditor.getAncestorOfType(UIWsrpConsumerOverview.class);
WebuiRequestContext ctx = event.getRequestContext();
- if(consumerEditor.isNewConsumer()){
+ if (consumerEditor.isNewConsumer())
+ {
consumerEditor.save(ctx);
- }else{
+ }
+ else
+ {
consumerEditor.edit(ctx);
}
@@ -200,6 +221,7 @@
producerInfo.setId(getConsumerName());
producerInfo.setExpirationCacheSeconds(getCacheExpiration());
producerInfo.getEndpointConfigurationInfo().setWsdlDefinitionURL(getWSDLURL());
+ producerInfo.getEndpointConfigurationInfo().setWSOperationTimeOut(getTimeout());
UIApplication uiApp = context.getUIApplication();
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerOverview.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerOverview.java 2010-01-06 21:58:38 UTC (rev 1187)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerOverview.java 2010-01-06 23:36:01 UTC (rev 1188)
@@ -37,7 +37,6 @@
import org.exoplatform.webui.core.lifecycle.UIApplicationLifecycle;
import org.exoplatform.webui.event.Event;
import org.exoplatform.webui.event.EventListener;
-import org.gatein.wsrp.WSRPConsumer;
import org.gatein.wsrp.producer.config.ProducerConfiguration;
import org.gatein.wsrp.producer.config.ProducerConfigurationService;
import org.gatein.wsrp.registration.RegistrationPropertyDescription;
@@ -65,7 +64,7 @@
public static String[] FIELDS = {"name", "description", "label", "hint"};
- public static String[] SELECT_ACTIONS = {"EditProperty", "DeleteProperty"};
+ public static String[] SELECT_ACTIONS = {"AddProperty", "EditProperty", "DeleteProperty"};
public UIWsrpProducerOverview() throws Exception
{
@@ -116,9 +115,9 @@
return Collections.singletonList(("xsd:string"));
}
- public LazyPageList createPageList(final List pageList)
+ public LazyPageList<RegistrationPropertyDescription> createPageList(final List<RegistrationPropertyDescription> pageList)
{
- return new LazyPageList<WSRPConsumer>(new ListAccess<WSRPConsumer>()
+ return new LazyPageList<RegistrationPropertyDescription>(new ListAccess<RegistrationPropertyDescription>()
{
public int getSize() throws Exception
@@ -126,9 +125,9 @@
return pageList.size();
}
- public WSRPConsumer[] load(int index, int length) throws Exception, IllegalArgumentException
+ public RegistrationPropertyDescription[] load(int index, int length) throws Exception, IllegalArgumentException
{
- WSRPConsumer[] pcs = new WSRPConsumer[pageList.size()];
+ RegistrationPropertyDescription[] pcs = new RegistrationPropertyDescription[pageList.size()];
if (index < 0)
{
@@ -148,7 +147,7 @@
for (int i = 0; i < length; i++)
{
- pcs[i] = (WSRPConsumer)pageList.get(i + index);
+ pcs[i] = pageList.get(i + index);
}
return pcs;
14 years, 11 months
- 1
- 0
gatein SVN: r1187 - in components/wsrp/trunk: admin-gui and 7 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-01-06 16:58:38 -0500 (Wed, 06 Jan 2010)
New Revision: 1187
Modified:
components/wsrp/trunk/admin-gui/pom.xml
components/wsrp/trunk/api/pom.xml
components/wsrp/trunk/common/pom.xml
components/wsrp/trunk/consumer/pom.xml
components/wsrp/trunk/pom.xml
components/wsrp/trunk/producer/pom.xml
components/wsrp/trunk/test/pom.xml
components/wsrp/trunk/wsrp-producer-war/pom.xml
components/wsrp/trunk/wsrp1-ws/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2010-01-06 21:58:16 UTC (rev 1186)
+++ components/wsrp/trunk/admin-gui/pom.xml 2010-01-06 21:58:38 UTC (rev 1187)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta04</version>
+ <version>1.0.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-admin-gui</artifactId>
Modified: components/wsrp/trunk/api/pom.xml
===================================================================
--- components/wsrp/trunk/api/pom.xml 2010-01-06 21:58:16 UTC (rev 1186)
+++ components/wsrp/trunk/api/pom.xml 2010-01-06 21:58:38 UTC (rev 1187)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta04</version>
+ <version>1.0.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-integration-api</artifactId>
Modified: components/wsrp/trunk/common/pom.xml
===================================================================
--- components/wsrp/trunk/common/pom.xml 2010-01-06 21:58:16 UTC (rev 1186)
+++ components/wsrp/trunk/common/pom.xml 2010-01-06 21:58:38 UTC (rev 1187)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta04</version>
+ <version>1.0.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/trunk/consumer/pom.xml
===================================================================
--- components/wsrp/trunk/consumer/pom.xml 2010-01-06 21:58:16 UTC (rev 1186)
+++ components/wsrp/trunk/consumer/pom.xml 2010-01-06 21:58:38 UTC (rev 1187)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta04</version>
+ <version>1.0.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2010-01-06 21:58:16 UTC (rev 1186)
+++ components/wsrp/trunk/pom.xml 2010-01-06 21:58:38 UTC (rev 1187)
@@ -29,7 +29,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta04</version>
+ <version>1.0.0-Beta05-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -40,9 +40,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/1.0.0-...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/1.0.0-Beta04</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/1.0.0-Beta04</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/trunk/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/trunk/</url>
</scm>
<properties>
Modified: components/wsrp/trunk/producer/pom.xml
===================================================================
--- components/wsrp/trunk/producer/pom.xml 2010-01-06 21:58:16 UTC (rev 1186)
+++ components/wsrp/trunk/producer/pom.xml 2010-01-06 21:58:38 UTC (rev 1187)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta04</version>
+ <version>1.0.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-lib</artifactId>
Modified: components/wsrp/trunk/test/pom.xml
===================================================================
--- components/wsrp/trunk/test/pom.xml 2010-01-06 21:58:16 UTC (rev 1186)
+++ components/wsrp/trunk/test/pom.xml 2010-01-06 21:58:38 UTC (rev 1187)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta04</version>
+ <version>1.0.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-01-06 21:58:16 UTC (rev 1186)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-01-06 21:58:38 UTC (rev 1187)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta04</version>
+ <version>1.0.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp1-ws/pom.xml 2010-01-06 21:58:16 UTC (rev 1186)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2010-01-06 21:58:38 UTC (rev 1187)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta04</version>
+ <version>1.0.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
14 years, 11 months
- 1
- 0
gatein SVN: r1186 - components/wsrp/tags.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-01-06 16:58:16 -0500 (Wed, 06 Jan 2010)
New Revision: 1186
Added:
components/wsrp/tags/1.0.0-Beta04/
Log:
[maven-scm] copy for tag 1.0.0-Beta04
Copied: components/wsrp/tags/1.0.0-Beta04 (from rev 1185, components/wsrp/trunk)
14 years, 11 months
- 1
- 0
gatein SVN: r1185 - in components/wsrp/trunk: admin-gui and 7 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-01-06 16:57:53 -0500 (Wed, 06 Jan 2010)
New Revision: 1185
Modified:
components/wsrp/trunk/admin-gui/pom.xml
components/wsrp/trunk/api/pom.xml
components/wsrp/trunk/common/pom.xml
components/wsrp/trunk/consumer/pom.xml
components/wsrp/trunk/pom.xml
components/wsrp/trunk/producer/pom.xml
components/wsrp/trunk/test/pom.xml
components/wsrp/trunk/wsrp-producer-war/pom.xml
components/wsrp/trunk/wsrp1-ws/pom.xml
Log:
[maven-release-plugin] prepare release 1.0.0-Beta04
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2010-01-06 19:22:55 UTC (rev 1184)
+++ components/wsrp/trunk/admin-gui/pom.xml 2010-01-06 21:57:53 UTC (rev 1185)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta04-SNAPSHOT</version>
+ <version>1.0.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-admin-gui</artifactId>
Modified: components/wsrp/trunk/api/pom.xml
===================================================================
--- components/wsrp/trunk/api/pom.xml 2010-01-06 19:22:55 UTC (rev 1184)
+++ components/wsrp/trunk/api/pom.xml 2010-01-06 21:57:53 UTC (rev 1185)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta04-SNAPSHOT</version>
+ <version>1.0.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-integration-api</artifactId>
Modified: components/wsrp/trunk/common/pom.xml
===================================================================
--- components/wsrp/trunk/common/pom.xml 2010-01-06 19:22:55 UTC (rev 1184)
+++ components/wsrp/trunk/common/pom.xml 2010-01-06 21:57:53 UTC (rev 1185)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta04-SNAPSHOT</version>
+ <version>1.0.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/trunk/consumer/pom.xml
===================================================================
--- components/wsrp/trunk/consumer/pom.xml 2010-01-06 19:22:55 UTC (rev 1184)
+++ components/wsrp/trunk/consumer/pom.xml 2010-01-06 21:57:53 UTC (rev 1185)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta04-SNAPSHOT</version>
+ <version>1.0.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2010-01-06 19:22:55 UTC (rev 1184)
+++ components/wsrp/trunk/pom.xml 2010-01-06 21:57:53 UTC (rev 1185)
@@ -29,7 +29,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta04-SNAPSHOT</version>
+ <version>1.0.0-Beta04</version>
<packaging>pom</packaging>
@@ -40,9 +40,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/1.0.0-...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/1.0.0-Beta04</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/1.0.0-Beta04</url>
</scm>
<properties>
Modified: components/wsrp/trunk/producer/pom.xml
===================================================================
--- components/wsrp/trunk/producer/pom.xml 2010-01-06 19:22:55 UTC (rev 1184)
+++ components/wsrp/trunk/producer/pom.xml 2010-01-06 21:57:53 UTC (rev 1185)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta04-SNAPSHOT</version>
+ <version>1.0.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-lib</artifactId>
Modified: components/wsrp/trunk/test/pom.xml
===================================================================
--- components/wsrp/trunk/test/pom.xml 2010-01-06 19:22:55 UTC (rev 1184)
+++ components/wsrp/trunk/test/pom.xml 2010-01-06 21:57:53 UTC (rev 1185)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta04-SNAPSHOT</version>
+ <version>1.0.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-01-06 19:22:55 UTC (rev 1184)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-01-06 21:57:53 UTC (rev 1185)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta04-SNAPSHOT</version>
+ <version>1.0.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp1-ws/pom.xml 2010-01-06 19:22:55 UTC (rev 1184)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2010-01-06 21:57:53 UTC (rev 1185)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.0-Beta04-SNAPSHOT</version>
+ <version>1.0.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
14 years, 11 months
- 1
- 0
gatein SVN: r1184 - portal/branches.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-01-06 14:22:55 -0500 (Wed, 06 Jan 2010)
New Revision: 1184
Added:
portal/branches/cluster/
Log:
copy trunk from rev 1183 for clustering branch work
Copied: portal/branches/cluster (from rev 1183, portal/trunk)
14 years, 11 months
- 1
- 0
gatein SVN: r1183 - in portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget: impl and 1 other directory.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-01-06 13:24:59 -0500 (Wed, 06 Jan 2010)
New Revision: 1183
Modified:
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/LocalImporter.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/SourceStorageImpl.java
Log:
GTNPORTAL-406 : Change gadget MIME type XML file to "application/x-google-gadget"
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/LocalImporter.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/LocalImporter.java 2010-01-06 16:10:25 UTC (rev 1182)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/LocalImporter.java 2010-01-06 18:24:59 UTC (rev 1183)
@@ -202,6 +202,11 @@
encoding = EncodingDetector.detect(new ByteArrayInputStream(content));
}
+ // Correct mime type for gadgets
+ if (resourcePath.equals(gadgetPath)) {
+ mimeType = LocalGadgetData.GADGET_MIME_TYPE;
+ }
+
//
folder.createFile(name, new Resource(mimeType, encoding, content));
}
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java 2010-01-06 16:10:25 UTC (rev 1182)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java 2010-01-06 18:24:59 UTC (rev 1183)
@@ -45,6 +45,9 @@
public abstract class LocalGadgetData extends GadgetData
{
+ /** Mime type for gadgets. */
+ public static final String GADGET_MIME_TYPE = "application/x-google-gadget";
+
@ManyToOne
public abstract GadgetDefinition getDefinition();
@@ -84,7 +87,7 @@
// Update content
NTFile content = getGadgetContent();
- content.setContentResource(new Resource("application/xml", encoding, bytes));
+ content.setContentResource(new Resource(GADGET_MIME_TYPE, encoding, bytes));
}
public String getSource() throws Exception
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/SourceStorageImpl.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/SourceStorageImpl.java 2010-01-06 16:10:25 UTC (rev 1182)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/SourceStorageImpl.java 2010-01-06 18:24:59 UTC (rev 1183)
@@ -64,7 +64,7 @@
//
Source source = new Source(gadget.getName());
- source.setMimeType("application/xml");
+ source.setMimeType(LocalGadgetData.GADGET_MIME_TYPE);
source.setLastModified(lastModified);
source.setTextContent(content);
14 years, 11 months
- 1
- 0
gatein SVN: r1182 - in portal/trunk: component/application-registry/src/main/java/org/exoplatform/application/gadget/impl and 12 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-01-06 11:10:25 -0500 (Wed, 06 Jan 2010)
New Revision: 1182
Removed:
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/NodeAware.java
Modified:
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistry.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/RemoteGadgetData.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/CategoryDefinition.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentDefinition.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentRegistry.java
portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/FooEntity.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/ContentProviderHelper.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetState.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletState.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PreferenceState.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPState.java
portal/trunk/component/web/src/main/java/org/exoplatform/web/security/security/TokenContainer.java
portal/trunk/component/web/src/main/java/org/exoplatform/web/security/security/TokenEntry.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/EndpointInfoMapping.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfoMapping.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfosMapping.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationInfoMapping.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationPropertyMapping.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/mapping/RegistrationPropertyDescriptionMapping.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/ProducerConfigurationMapping.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/RegistrationRequirementsMapping.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerCapabilitiesMapping.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerGroupMapping.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerMapping.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumersAndGroupsMapping.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationMapping.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationPropertiesMapping.java
portal/trunk/pom.xml
Log:
GTNPORTAL-444 : Integrate MOP 1.0.0-Beta13
GTNPORTAL-445 : Integrate Chromattic 1.0.0-beta13 release
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -21,8 +21,9 @@
import org.chromattic.api.annotations.Create;
import org.chromattic.api.annotations.MappedBy;
import org.chromattic.api.annotations.Name;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.OneToOne;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
import org.chromattic.ntdef.NTFolder;
@@ -30,7 +31,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "app:gadgetdefinition")
+@PrimaryType(name = "app:gadgetdefinition")
public abstract class GadgetDefinition
{
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistry.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistry.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistry.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -19,7 +19,7 @@
package org.exoplatform.application.gadget.impl;
import org.chromattic.api.annotations.Create;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.OneToMany;
import java.util.Collection;
@@ -29,7 +29,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "app:gadgetregistry")
+@PrimaryType(name = "app:gadgetregistry")
public abstract class GadgetRegistry
{
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -23,13 +23,13 @@
import org.apache.shindig.gadgets.spec.ModulePrefs;
import org.chromattic.api.annotations.ManyToOne;
import org.chromattic.api.annotations.MappedBy;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.OneToOne;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
import org.chromattic.ntdef.NTFile;
import org.chromattic.ntdef.Resource;
import org.exoplatform.application.gadget.EncodingDetector;
-import org.exoplatform.application.registry.impl.NodeAware;
import org.chromattic.ntdef.NTFolder;
@@ -41,8 +41,8 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "app:localgadgetdata")
-public abstract class LocalGadgetData extends GadgetData implements NodeAware
+@PrimaryType(name = "app:localgadgetdata")
+public abstract class LocalGadgetData extends GadgetData
{
@ManyToOne
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/RemoteGadgetData.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/RemoteGadgetData.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/RemoteGadgetData.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -18,14 +18,14 @@
*/
package org.exoplatform.application.gadget.impl;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "app:remotegadgetdata")
+@PrimaryType(name = "app:remotegadgetdata")
public abstract class RemoteGadgetData extends GadgetData
{
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/CategoryDefinition.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/CategoryDefinition.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/CategoryDefinition.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -20,7 +20,7 @@
import org.chromattic.api.annotations.Create;
import org.chromattic.api.annotations.Name;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.OneToMany;
import org.chromattic.api.annotations.Property;
import org.exoplatform.portal.pom.config.POMSession;
@@ -36,7 +36,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "app:contentcategory")
+@PrimaryType(name = "app:contentcategory")
public abstract class CategoryDefinition
{
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentDefinition.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentDefinition.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentDefinition.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -21,7 +21,7 @@
import org.chromattic.api.annotations.Id;
import org.chromattic.api.annotations.ManyToOne;
import org.chromattic.api.annotations.Name;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
import org.exoplatform.portal.pom.config.POMSession;
import org.gatein.mop.api.content.Customization;
@@ -34,7 +34,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "app:content")
+@PrimaryType(name = "app:content")
public abstract class ContentDefinition
{
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentRegistry.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentRegistry.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentRegistry.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -19,7 +19,7 @@
package org.exoplatform.application.registry.impl;
import org.chromattic.api.annotations.Create;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.OneToMany;
import java.util.List;
@@ -29,7 +29,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "app:contentregistry")
+@PrimaryType(name = "app:contentregistry")
public abstract class ContentRegistry
{
Deleted: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/NodeAware.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/NodeAware.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/NodeAware.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.exoplatform.application.registry.impl;
-
-import javax.jcr.Node;
-
-/**
- * Temporary hack.
- *
- * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
- * @version $Revision$
- */
-public interface NodeAware
-{
- void setNode(Node node);
-}
Modified: portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/FooEntity.java
===================================================================
--- portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/FooEntity.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/FooEntity.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -18,14 +18,14 @@
*/
package org.exoplatform.commons.chromattic;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.WorkspaceName;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "nt:base")
+@PrimaryType(name = "nt:base")
public abstract class FooEntity
{
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -242,15 +242,15 @@
{
if (siteType == ObjectType.PORTAL_SITE)
{
- ownerTypeChunk = "portalsites";
+ ownerTypeChunk = "mop:portalsites";
}
else if (siteType == ObjectType.GROUP_SITE)
{
- ownerTypeChunk = "groupsites";
+ ownerTypeChunk = "mop:groupsites";
}
else
{
- ownerTypeChunk = "usersites";
+ ownerTypeChunk = "mop:usersites";
}
}
else
@@ -272,13 +272,13 @@
{
statement =
"jcr:path LIKE '" + workspaceChunk + "/" + ownerTypeChunk + "/" + ownerIdChunk
- + "/rootpage/children/pages/children/%'";
+ + "/mop:rootpage/mop:children/mop:pages/mop:children/%'";
}
else
{
statement =
"jcr:path LIKE '" + workspaceChunk + "/" + ownerTypeChunk + "/" + ownerIdChunk
- + "/rootnavigation/children/default'";
+ + "/mop:rootnavigation/mop:children/mop:default'";
}
}
catch (IllegalArgumentException e)
@@ -301,7 +301,7 @@
{
statement =
"jcr:path LIKE '" + workspaceChunk + "/" + ownerTypeChunk + "/" + ownerIdChunk
- + "/rootpage/children/pages/children/%' AND mop:title='" + title + "'";
+ + "/mop:rootpage/mop:children/mop:pages/mop:children/%' AND mop:title='" + title + "'";
}
else
{
@@ -314,13 +314,13 @@
{
statement =
"jcr:path LIKE '" + workspaceChunk + "/" + ownerTypeChunk + "/" + ownerIdChunk
- + "/rootpage/children/pages/children/%'";
+ + "/mop:rootpage/mop:children/mop:pages/mop:children/%'";
}
else
{
statement =
"jcr:path LIKE '" + workspaceChunk + "/" + ownerTypeChunk + "/" + ownerIdChunk
- + "/rootnavigation/children/default'";
+ + "/mop:rootnavigation/mop:children/mop:default'";
}
}
}
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/ContentProviderHelper.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/ContentProviderHelper.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/ContentProviderHelper.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -33,7 +33,8 @@
*/
public class ContentProviderHelper
{
- private static final String STATE = "state";
+ /** . */
+ private static final String STATE_NODE_NAME = "mop:state";
public static <InternalState, State> void setState(StateContainer container, State state,
HelpableContentProvider<InternalState, State> provider)
@@ -46,9 +47,9 @@
//
InternalState internalState;
- if (node.hasNode(STATE))
+ if (node.hasNode(STATE_NODE_NAME))
{
- Node stateNode = node.getNode(STATE);
+ Node stateNode = node.getNode(STATE_NODE_NAME);
internalState = (InternalState)session.findById(Object.class, stateNode.getUUID());
if (state == null)
{
@@ -64,7 +65,7 @@
}
else
{
- Node stateNode = node.addNode(STATE, provider.getNodeName());
+ Node stateNode = node.addNode(STATE_NODE_NAME, provider.getNodeName());
internalState = (InternalState)session.findById(Object.class, stateNode.getUUID());
}
}
@@ -89,9 +90,9 @@
//
InternalState prefs;
- if (node.hasNode(STATE))
+ if (node.hasNode(STATE_NODE_NAME))
{
- Node stateNode = node.getNode(STATE);
+ Node stateNode = node.getNode(STATE_NODE_NAME);
prefs = (InternalState)session.findById(Object.class, stateNode.getUUID());
return provider.getState(prefs);
}
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetState.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetState.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetState.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -19,14 +19,14 @@
package org.exoplatform.portal.pom.spi.gadget;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = GadgetState.MOP_NODE_NAME)
+@PrimaryType(name = GadgetState.MOP_NODE_NAME)
public abstract class GadgetState
{
static final String MOP_NODE_NAME = "mop:gadget";
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletState.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletState.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletState.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -20,7 +20,7 @@
package org.exoplatform.portal.pom.spi.portlet;
import org.chromattic.api.annotations.Create;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.OneToMany;
import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.RelatedMappedBy;
@@ -32,7 +32,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = PortletState.MOP_NODE_NAME)
+@PrimaryType(name = PortletState.MOP_NODE_NAME)
public abstract class PortletState
{
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PreferenceState.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PreferenceState.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PreferenceState.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -21,7 +21,7 @@
import org.chromattic.api.annotations.ManyToOne;
import org.chromattic.api.annotations.Name;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
import java.util.List;
@@ -30,7 +30,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "mop:portletpreference")
+@PrimaryType(name = "mop:portletpreference")
public abstract class PreferenceState
{
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPState.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPState.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPState.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -22,7 +22,7 @@
package org.exoplatform.portal.pom.spi.wsrp;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
import java.io.InputStream;
@@ -31,7 +31,7 @@
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
*/
-@NodeMapping(name = WSRPState.MOP_NODE_NAME)
+@PrimaryType(name = WSRPState.MOP_NODE_NAME)
public abstract class WSRPState
{
static final String MOP_NODE_NAME = "mop:wsrpstate";
Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/security/security/TokenContainer.java
===================================================================
--- portal/trunk/component/web/src/main/java/org/exoplatform/web/security/security/TokenContainer.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/web/src/main/java/org/exoplatform/web/security/security/TokenContainer.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -19,7 +19,7 @@
package org.exoplatform.web.security.security;
import org.chromattic.api.annotations.Create;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.OneToMany;
import org.exoplatform.web.security.Credentials;
import org.exoplatform.web.security.Token;
@@ -32,7 +32,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "lgn:tokencontainer")
+@PrimaryType(name = "lgn:tokencontainer")
public abstract class TokenContainer
{
Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/security/security/TokenEntry.java
===================================================================
--- portal/trunk/component/web/src/main/java/org/exoplatform/web/security/security/TokenEntry.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/web/src/main/java/org/exoplatform/web/security/security/TokenEntry.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -20,7 +20,7 @@
import org.chromattic.api.annotations.Destroy;
import org.chromattic.api.annotations.Name;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
import org.exoplatform.web.security.Credentials;
import org.exoplatform.web.security.Token;
@@ -31,7 +31,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "lgn:tokenentry")
+@PrimaryType(name = "lgn:tokenentry")
public abstract class TokenEntry
{
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/EndpointInfoMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/EndpointInfoMapping.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/EndpointInfoMapping.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -23,7 +23,7 @@
package org.gatein.portal.wsrp.state.consumer.mapping;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
import org.gatein.wsrp.consumer.EndpointConfigurationInfo;
@@ -31,7 +31,7 @@
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
*/
-@NodeMapping(name = EndpointInfoMapping.NODE_NAME)
+@PrimaryType(name = EndpointInfoMapping.NODE_NAME)
public abstract class EndpointInfoMapping
{
public static final String NODE_NAME = "wsrp:endpointinfo";
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfoMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfoMapping.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfoMapping.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -26,7 +26,7 @@
import org.chromattic.api.annotations.DefaultValue;
import org.chromattic.api.annotations.Id;
import org.chromattic.api.annotations.MappedBy;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.Property;
import org.gatein.wsrp.consumer.EndpointConfigurationInfo;
@@ -37,7 +37,7 @@
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
*/
-@NodeMapping(name = ProducerInfoMapping.NODE_NAME)
+@PrimaryType(name = ProducerInfoMapping.NODE_NAME)
public abstract class ProducerInfoMapping
{
public static final String NODE_NAME = "wsrp:producerinfo";
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfosMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfosMapping.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfosMapping.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -24,7 +24,7 @@
package org.gatein.portal.wsrp.state.consumer.mapping;
import org.chromattic.api.annotations.Create;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.OneToMany;
import java.util.List;
@@ -33,7 +33,7 @@
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
*/
-@NodeMapping(name = ProducerInfosMapping.NODE_NAME)
+@PrimaryType(name = ProducerInfosMapping.NODE_NAME)
public abstract class ProducerInfosMapping
{
public static final String NODE_NAME = "wsrp:producerinfos";
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationInfoMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationInfoMapping.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationInfoMapping.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -25,7 +25,7 @@
import org.chromattic.api.annotations.Create;
import org.chromattic.api.annotations.FormattedBy;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.OneToMany;
import org.chromattic.api.annotations.Property;
import org.exoplatform.commons.utils.Safe;
@@ -43,7 +43,7 @@
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
*/
-@NodeMapping(name = RegistrationInfoMapping.NODE_NAME)
+@PrimaryType(name = RegistrationInfoMapping.NODE_NAME)
@FormattedBy(JCRPersister.QNameFormatter.class)
public abstract class RegistrationInfoMapping
{
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationPropertyMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationPropertyMapping.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationPropertyMapping.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -25,7 +25,7 @@
import org.chromattic.api.annotations.Create;
import org.chromattic.api.annotations.MappedBy;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.Property;
import org.gatein.portal.wsrp.state.mapping.RegistrationPropertyDescriptionMapping;
@@ -36,7 +36,7 @@
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
*/
-@NodeMapping(name = RegistrationPropertyMapping.NODE_NAME)
+@PrimaryType(name = RegistrationPropertyMapping.NODE_NAME)
public abstract class RegistrationPropertyMapping
{
public static final String NODE_NAME = "wsrp:registrationproperty";
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/mapping/RegistrationPropertyDescriptionMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/mapping/RegistrationPropertyDescriptionMapping.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/mapping/RegistrationPropertyDescriptionMapping.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -23,7 +23,7 @@
package org.gatein.portal.wsrp.state.mapping;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
import org.gatein.wsrp.registration.LocalizedString;
import org.gatein.wsrp.registration.RegistrationPropertyDescription;
@@ -34,7 +34,7 @@
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
*/
-@NodeMapping(name = RegistrationPropertyDescriptionMapping.NODE_NAME)
+@PrimaryType(name = RegistrationPropertyDescriptionMapping.NODE_NAME)
public abstract class RegistrationPropertyDescriptionMapping
{
public static final String NODE_NAME = "wsrp:registrationpropertydescription";
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/ProducerConfigurationMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/ProducerConfigurationMapping.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/ProducerConfigurationMapping.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -23,7 +23,7 @@
package org.gatein.portal.wsrp.state.producer.configuration.mapping;
import org.chromattic.api.annotations.MappedBy;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.Property;
import org.gatein.wsrp.producer.config.ProducerConfiguration;
@@ -34,7 +34,7 @@
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
*/
-@NodeMapping(name = ProducerConfigurationMapping.NODE_NAME)
+@PrimaryType(name = ProducerConfigurationMapping.NODE_NAME)
public abstract class ProducerConfigurationMapping
{
public static final String NODE_NAME = "wsrp:producerconfiguration";
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/RegistrationRequirementsMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/RegistrationRequirementsMapping.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/RegistrationRequirementsMapping.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -23,7 +23,7 @@
package org.gatein.portal.wsrp.state.producer.configuration.mapping;
import org.chromattic.api.annotations.Create;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.OneToMany;
import org.chromattic.api.annotations.Property;
import org.gatein.portal.wsrp.state.mapping.RegistrationPropertyDescriptionMapping;
@@ -37,7 +37,7 @@
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
*/
-@NodeMapping(name = RegistrationRequirementsMapping.NODE_NAME)
+@PrimaryType(name = RegistrationRequirementsMapping.NODE_NAME)
public abstract class RegistrationRequirementsMapping
{
public static final String NODE_NAME = "wsrp:registrationrequirements";
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerCapabilitiesMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerCapabilitiesMapping.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerCapabilitiesMapping.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -23,7 +23,7 @@
package org.gatein.portal.wsrp.state.producer.registrations.mapping;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
import org.gatein.common.util.ParameterValidation;
import org.gatein.pc.api.Mode;
@@ -38,7 +38,7 @@
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
*/
-@NodeMapping(name = ConsumerCapabilitiesMapping.NODE_NAME)
+@PrimaryType(name = ConsumerCapabilitiesMapping.NODE_NAME)
public abstract class ConsumerCapabilitiesMapping
{
public static final String NODE_NAME = "wsrp:consumercapabilities";
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerGroupMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerGroupMapping.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerGroupMapping.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -24,7 +24,7 @@
import org.chromattic.api.annotations.FindById;
import org.chromattic.api.annotations.Id;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.OneToMany;
import org.chromattic.api.annotations.Property;
import org.chromattic.api.annotations.RelatedMappedBy;
@@ -42,7 +42,7 @@
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
*/
-@NodeMapping(name = ConsumerGroupMapping.NODE_NAME)
+@PrimaryType(name = ConsumerGroupMapping.NODE_NAME)
public abstract class ConsumerGroupMapping
{
public static final String NODE_NAME = "wsrp:consumergroup";
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerMapping.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerMapping.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -28,7 +28,7 @@
import org.chromattic.api.annotations.Id;
import org.chromattic.api.annotations.ManyToOne;
import org.chromattic.api.annotations.MappedBy;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.OneToMany;
import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.Property;
@@ -47,7 +47,7 @@
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
*/
-@NodeMapping(name = ConsumerMapping.NODE_NAME)
+@PrimaryType(name = ConsumerMapping.NODE_NAME)
public abstract class ConsumerMapping
{
public static final String NODE_NAME = "wsrp:consumer";
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumersAndGroupsMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumersAndGroupsMapping.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumersAndGroupsMapping.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -23,7 +23,7 @@
package org.gatein.portal.wsrp.state.producer.registrations.mapping;
import org.chromattic.api.annotations.Create;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.OneToMany;
import java.util.List;
@@ -32,7 +32,7 @@
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
*/
-@NodeMapping(name = ConsumersAndGroupsMapping.NODE_NAME)
+@PrimaryType(name = ConsumersAndGroupsMapping.NODE_NAME)
public abstract class ConsumersAndGroupsMapping
{
public static final String NODE_NAME = "wsrp:consumersandgroups";
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationMapping.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationMapping.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -26,7 +26,7 @@
import org.chromattic.api.annotations.Id;
import org.chromattic.api.annotations.ManyToOne;
import org.chromattic.api.annotations.MappedBy;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.Property;
import org.gatein.common.util.ParameterValidation;
@@ -45,7 +45,7 @@
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
*/
-@NodeMapping(name = RegistrationMapping.NODE_NAME)
+@PrimaryType(name = RegistrationMapping.NODE_NAME)
public abstract class RegistrationMapping
{
public static final String NODE_NAME = "wsrp:registration";
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationPropertiesMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationPropertiesMapping.java 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationPropertiesMapping.java 2010-01-06 16:10:25 UTC (rev 1182)
@@ -22,7 +22,7 @@
package org.gatein.portal.wsrp.state.producer.registrations.mapping;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Properties;
import javax.xml.namespace.QName;
@@ -34,7 +34,7 @@
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
*/
-@NodeMapping(name = RegistrationPropertiesMapping.NODE_NAME)
+@PrimaryType(name = RegistrationPropertiesMapping.NODE_NAME)
public abstract class RegistrationPropertiesMapping
{
public static final String NODE_NAME = "wsrp:registrationproperties";
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-01-06 15:55:44 UTC (rev 1181)
+++ portal/trunk/pom.xml 2010-01-06 16:10:25 UTC (rev 1182)
@@ -48,13 +48,13 @@
<org.gatein.pc.version>2.1.0-CR01</org.gatein.pc.version>
<org.picketlink.idm>1.1.0.Beta1</org.picketlink.idm>
<org.gatein.wsrp.version>1.0.0-Beta03</org.gatein.wsrp.version>
- <org.gatein.mop.version>1.0.0-Beta12</org.gatein.mop.version>
+ <org.gatein.mop.version>1.0.0-Beta13</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
<rhino.version>1.6R5</rhino.version>
<org.codehaus.groovy.version>1.6.5</org.codehaus.groovy.version>
<javax.servlet.version>2.5</javax.servlet.version>
- <version.chromattic>1.0.0-beta11</version.chromattic>
- <version.reflect>1.0.0-beta4</version.reflect>
+ <version.chromattic>1.0.0-beta13</version.chromattic>
+ <version.reflect>1.0.0-beta5</version.reflect>
<!-- ************** -->
<!-- Build settings -->
14 years, 11 months
- 1
- 0