gatein SVN: r2614 - portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-04-14 03:32:51 -0400 (Wed, 14 Apr 2010)
New Revision: 2614
Modified:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/pom.xml
Log:
Screenshot update
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/pom.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/pom.xml 2010-04-14 05:44:07 UTC (rev 2613)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/pom.xml 2010-04-14 07:32:51 UTC (rev 2614)
@@ -3,9 +3,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.project</groupId>
- <artifactId>${docname}-${translation}</artifactId>
- <version>1.0</version>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.parent</artifactId>
+ <version>3.0.1-GA-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>${bookname}-(${translation})</name>
14 years, 2 months
- 1
- 0
gatein SVN: r2613 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2010-04-14 01:44:07 -0400 (Wed, 14 Apr 2010)
New Revision: 2613
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java
Log:
GTNPORTAL-998 Some nodes have pageReference but the associated Page does not exist, we want to display these nodes in edit navigation, so add accessNodeWithioutPage paramater into filterNodeNavigation method
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java 2010-04-13 23:40:08 UTC (rev 2612)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java 2010-04-14 05:44:07 UTC (rev 2613)
@@ -143,7 +143,7 @@
// Still keep this method to have compatibility with legacy code
public static PageNavigation filter(PageNavigation nav, String userName) throws Exception
{
- return filterNavigation(nav, userName, false);
+ return filterNavigation(nav, userName, false, true);
}
/**
@@ -151,10 +151,11 @@
* @param nav
* @param userName
* @param acceptNonDisplayedNode
+ * @param acceptNodeWithoutPage
* @return
* @throws Exception
*/
- public static PageNavigation filterNavigation(PageNavigation nav, String userName, boolean acceptNonDisplayedNode) throws Exception
+ public static PageNavigation filterNavigation(PageNavigation nav, String userName, boolean acceptNonDisplayedNode, boolean acceptNodeWithoutPage) throws Exception
{
PageNavigation filter = nav.clone();
filter.setNodes(new ArrayList<PageNode>());
@@ -167,12 +168,44 @@
for (PageNode node : nav.getNodes())
{
- PageNode newNode = filterNodeNavigation(node, userName, acceptNonDisplayedNode, userService, userACL);
+ PageNode newNode = filterNodeNavigation(node, userName, acceptNonDisplayedNode, acceptNodeWithoutPage, userService, userACL);
if (newNode != null)
filter.addNode(newNode);
}
return filter;
}
+
+ /**
+ * use {@link #filterNavigation(PageNavigation, String, boolean, boolean)}
+ *
+ * @param nav
+ * @param userName
+ * @param acceptNonDisplayedNode
+ * @return
+ * @throws Exception
+ */
+ @Deprecated
+ public static PageNavigation filterNavigation(PageNavigation nav, String userName, boolean acceptNonDisplayedNode) throws Exception
+ {
+ return filterNavigation(nav, userName, acceptNonDisplayedNode, true);
+ }
+
+ /**
+ * Use {@link #filterNodeNavigation(PageNode, String, boolean, boolean, UserPortalConfigService, UserACL)}
+ * @param startNode
+ * @param userName
+ * @param acceptNonDisplayedNode
+ * @param userService
+ * @param userACL
+ * @return
+ * @throws Exception
+ */
+ @Deprecated
+ private static PageNode filterNodeNavigation(PageNode startNode, String userName, boolean acceptNonDisplayedNode,
+ UserPortalConfigService userService, UserACL userACL) throws Exception {
+ PageNode cloneStartNode = filterNodeNavigation(startNode, userName, acceptNonDisplayedNode, false, userService, userACL);
+ return cloneStartNode;
+ }
/**
* PageNode won't be processed in following cases:
@@ -181,16 +214,19 @@
*
* Case 2: Node 's visibility is not SYSTEM but the node is not display and the acceptNonDisplayedNode = false
*
- * Case 3: Node has non null pageReference but the associated Page does not exist
+ * Case 3: Node has non null pageReference but the associated Page does not exist and not accept this node is without page
*
*
* @param startNode
* @param userName
+ * @param acceptNonDisplayedNode
+ * @param acceptNodeWithoutPage
* @param userService
+ * @param userACL
* @return
* @throws Exception
*/
- private static PageNode filterNodeNavigation(PageNode startNode, String userName, boolean acceptNonDisplayedNode,
+ private static PageNode filterNodeNavigation(PageNode startNode, String userName, boolean acceptNonDisplayedNode, boolean acceptNodeWithoutPage,
UserPortalConfigService userService, UserACL userACL) throws Exception
{
@@ -199,7 +235,7 @@
boolean doNothingCase_1 = nodeVisibility == Visibility.SYSTEM && (!userACL.getSuperUser().equals(userName) || !acceptNonDisplayedNode);
boolean doNothingCase_2 = nodeVisibility != Visibility.SYSTEM && !startNode.isDisplay() && !acceptNonDisplayedNode;
- boolean doNothingCase_3 = (pageReference != null) && (userService.getPage(pageReference, userName) == null);
+ boolean doNothingCase_3 = (pageReference != null) && (userService.getPage(pageReference, userName) == null) && !acceptNodeWithoutPage;
@@ -217,7 +253,7 @@
{
for (PageNode child : children)
{
- PageNode filteredChildNode = filterNodeNavigation(child, userName, acceptNonDisplayedNode, userService, userACL);
+ PageNode filteredChildNode = filterNodeNavigation(child, userName, acceptNonDisplayedNode, acceptNodeWithoutPage, userService, userACL);
if (filteredChildNode != null)
{
filteredChildren.add(filteredChildNode);
14 years, 2 months
- 1
- 0
gatein SVN: r2612 - portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US.
by do-not-reply＠jboss.org
Author: benlc
Date: 2010-04-13 19:40:08 -0400 (Tue, 13 Apr 2010)
New Revision: 2612
Modified:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Installation.xml
Log:
'minor changes to <remark> tags for review highlighting'
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Installation.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Installation.xml 2010-04-13 21:24:07 UTC (rev 2611)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Installation.xml 2010-04-13 23:40:08 UTC (rev 2612)
@@ -52,26 +52,26 @@
</listitem>
<listitem>
<para>
- the <literal>default</literal> server configuration includes non-clustered Portal components contained within the <remark><literal>httpha-invoker.sar</literal> OR <literal>jbossweb.sar</literal> OR <literal>jbossws.sar</literal> OR <literal>uuid-key-generator.sar</literal></remark> service archive. This archive is located in the <literal>deploy</literal> folder. <remark>This is the server configuration that is started when no other configuration is specified</remark>
+ the <literal>default</literal> server configuration includes non-clustered Portal components contained within the <literal>httpha-invoker.sar</literal> <remark>OR</remark> <literal>jbossweb.sar</literal> <remark>OR</remark> <literal>jbossws.sar</literal> <remark>OR</remark> <literal>uuid-key-generator.sar</literal> service archive. This archive is located in the <literal>deploy</literal> folder. <remark>This is the server configuration that is started when no other configuration is specified</remark>
</para>
</listitem>
<listitem>
<para>
- the <literal>all</literal> server configuration includes clustered Portal components contained within <remark><literal>httpha-invoker.sar</literal> OR <literal>jbossweb.sar</literal> OR <literal>jbossws.sar</literal> OR <literal>juddi-service.sar</literal> OR <literal>snmp-adaptor.sar</literal></remark> service archive. This archive is located in the <literal>deploy</literal> folder.
+ the <literal>all</literal> server configuration includes clustered Portal components contained within <literal>httpha-invoker.sar</literal> <remark>OR</remark> <literal>jbossweb.sar</literal> <remark>OR</remark> <literal>jbossws.sar</literal> <remark>OR</remark> <literal>juddi-service.sar</literal> <remark>OR</remark> <literal>snmp-adaptor.sar</literal> service archive. This archive is located in the <literal>deploy</literal> folder.
</para>
</listitem>
<listitem>
<para>
- the <literal>production</literal> server configuration includes clustered Portal components contained within <remark><literal>httpha-invoker.sar</literal> OR <literal>jbossweb.sar</literal> OR <literal>jbossws.sar</literal> OR <literal>juddi-service.sar</literal> OR <literal>snmp-adaptor.sar</literal> OR <literal>uuid-key-generator.sar</literal>.</remark> This archive is located in the <literal>deploy</literal> folder.
+ the <literal>production</literal> server configuration includes clustered Portal components contained within <literal>httpha-invoker.sar</literal> <remark>OR</remark> <literal>jbossweb.sar</literal> <remark>OR</remark> <literal>jbossws.sar</literal> <remark>OR</remark> <literal>juddi-service.sar</literal> <remark>OR</remark> <literal>snmp-adaptor.sar</literal> <remark>OR</remark> <literal>uuid-key-generator.sar</literal>. This archive is located in the <literal>deploy</literal> folder.
</para>
</listitem>
</itemizedlist>
<note><title>Note: Production Server</title>
<para>
The <literal>production</literal> server configuration has several optimizations including logging and memory size.
- If you do not need the clustered portal version and want to use this optimized server configuration, you simply need to copy the <remark>
- <literal>WHICH FILE?</literal> file </remark> from <literal>default/deploy</literal> to <literal>production/deploy</literal>. Don't forget to
- remove <remark><literal>WHICH FILE as jboss-portal-ha.sar doesn't exist?</literal> </remark> though.
+ If you do not need the clustered portal version and want to use this optimized server configuration, you simply need to copy the
+ <literal>WHICH FILE?</literal> file from <literal>default/deploy</literal> to <literal>production/deploy</literal>. Don't forget to
+ remove <literal>WHICH FILE as jboss-portal-ha.sar doesn't exist?</literal> though.
</para>
</note>
</para>
14 years, 2 months
- 1
- 0
gatein SVN: r2611 - components/sso/trunk/agent/src/main/java/org/gatein/sso/agent.
by do-not-reply＠jboss.org
Author: sohil.shah(a)jboss.com
Date: 2010-04-13 17:24:07 -0400 (Tue, 13 Apr 2010)
New Revision: 2611
Modified:
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/GenericSSOAgent.java
Log:
GTNPORTAL-1027 - GateIn+SSO integration: Blank screen when SSO ticket is not valid (OpenSSO)
Modified: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/GenericSSOAgent.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/GenericSSOAgent.java 2010-04-13 21:12:40 UTC (rev 2610)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/GenericSSOAgent.java 2010-04-13 21:24:07 UTC (rev 2611)
@@ -70,7 +70,16 @@
{
try
{
- this.processSSOToken(req,resp);
+ this.processSSOToken(req,resp);
+
+ String portalContext = req.getContextPath();
+ if(req.getAttribute("abort") != null)
+ {
+ String ssoRedirect = portalContext + "/sso";
+ resp.sendRedirect(ssoRedirect);
+ return;
+ }
+
super.doGet(req, resp);
}
catch(Exception e)
@@ -105,8 +114,16 @@
}
else
{
- //See if an OpenSSO Token was used
- OpenSSOAgent.getInstance(this.ssoServerUrl, this.ssoCookieName).validateTicket(httpRequest);
+ try
+ {
+ //See if an OpenSSO Token was used
+ OpenSSOAgent.getInstance(this.ssoServerUrl, this.ssoCookieName).validateTicket(httpRequest);
+ }
+ catch(IllegalStateException ilse)
+ {
+ //somehow cookie failed validation, retry by starting the opensso login process again
+ httpRequest.setAttribute("abort", Boolean.TRUE);
+ }
}
}
}
14 years, 2 months
- 1
- 0
gatein SVN: r2610 - in portal/trunk/docs/reference-guide/en: modules and 3 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-13 17:12:40 -0400 (Tue, 13 Apr 2010)
New Revision: 2610
Added:
portal/trunk/docs/reference-guide/en/images/AuthenticationAndIdentity/OrganizationServiceClassDiagram.png
portal/trunk/docs/reference-guide/en/modules/AuthenticationAndIdentity/OrganizationAPI.xml
Removed:
portal/trunk/docs/reference-guide/en/modules/AuthenticationAndIdentity/APIs.xml
portal/trunk/docs/reference-guide/en/modules/PortletDevelopment/AJAXFramework.xml
portal/trunk/docs/reference-guide/en/modules/PortletDevelopment/GroovyTemplates.xml
portal/trunk/docs/reference-guide/en/modules/PortletDevelopment/PortletLifecycle.xml
portal/trunk/docs/reference-guide/en/modules/PortletDevelopment/WebUI.xml
Modified:
portal/trunk/docs/reference-guide/en/modules/AuthenticationAndIdentity.xml
portal/trunk/docs/reference-guide/en/modules/PortalDevelopment/InternationalizationConfiguration.xml
portal/trunk/docs/reference-guide/en/modules/PortletDevelopment.xml
Log:
- Added class diagram for OrganizationService
- Remove WebUI chatpers
Added: portal/trunk/docs/reference-guide/en/images/AuthenticationAndIdentity/OrganizationServiceClassDiagram.png
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/AuthenticationAndIdentity/OrganizationServiceClassDiagram.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: portal/trunk/docs/reference-guide/en/modules/AuthenticationAndIdentity/APIs.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/AuthenticationAndIdentity/APIs.xml 2010-04-13 20:06:54 UTC (rev 2609)
+++ portal/trunk/docs/reference-guide/en/modules/AuthenticationAndIdentity/APIs.xml 2010-04-13 21:12:40 UTC (rev 2610)
@@ -1,64 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
-%BOOK_ENTITIES;
-]>
-<section id="sect-Reference_Guide-APIs-Organization_API">
- <title>Organization API</title>
- <para>
- The
- <literal>exo.platform.services.organization</literal>
- package has five main components: user, user profile, group,
- membership type and membership.
- There is an additional component that serves as an entry point into
- Organization API -
- <literal>OrganizationService</literal>
- component,
- that provides handling functionality for the five components.
- </para>
- <para>
- The
- <literal>User</literal>
- component contains basic information about a user - such as
- username, password, first name, last name, and email. The
- <literal>User Profile</literal>
- component contains extra information about a user, such as user's
- personal information, and business information.
- You can also add additional information about a user if your application
- requires it.
- The
- <literal>Group</literal>
- component contains a group graph. The
- <literal>Membership Type</literal>
- component
- contains a list of predefined membership types.
- Finally, the
- <literal>Membership</literal>
- component connects a User, a Group and a Membership Type.
- </para>
- <para>
- A user can have one or more memberships within a group, for example:
- user A can have the 'member' and 'admin' memberships in group /user.
- A user belongs to a group if he has at least one membership in that
- group.
- </para>
- <para>
- Exposing the Organization API to developers the OrganizationService component
- provides developers with access
- to handler objects for managing each of the five components -
- UserHandler, UserProfileHandler, GroupHandler, MembershipTypeHandler,
- and MembershipHandler.
- </para>
- <para>
- The five central API components are really designed like persistent
- entities, and handlers are really specified like data access objects
- (DAO).
- </para>
- <para>
- Organization API simply describes a contract, meaning it is not a concrete
- implementation. The described components are interfaces,
- allowing for different concrete implementations. In practial terms that means,
- you can replace the existing implementation with a different one.
- </para>
-</section>
-
Copied: portal/trunk/docs/reference-guide/en/modules/AuthenticationAndIdentity/OrganizationAPI.xml (from rev 2605, portal/trunk/docs/reference-guide/en/modules/AuthenticationAndIdentity/APIs.xml)
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/AuthenticationAndIdentity/OrganizationAPI.xml (rev 0)
+++ portal/trunk/docs/reference-guide/en/modules/AuthenticationAndIdentity/OrganizationAPI.xml 2010-04-13 21:12:40 UTC (rev 2610)
@@ -0,0 +1,74 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="sect-Reference_Guide-APIs-Organization_API">
+ <title>Organization API</title>
+ <para>
+ The
+ <literal>exo.platform.services.organization</literal>
+ package has five main components: user, user profile, group,
+ membership type and membership.
+ There is an additional component that serves as an entry point into
+ Organization API -
+ <literal>OrganizationService</literal>
+ component,
+ that provides handling functionality for the five components.
+ </para>
+ <para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="images/AuthenticationAndIdentity/OrganizationServiceClassDiagram.png" format="PNG" align="center"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/AuthenticationAndIdentity/OrganizationServiceClassDiagram.png" scalefit="1" format="PNG" align="center"/>
+ </imageobject>
+ </mediaobject>
+ </para>
+ <para>
+ The
+ <literal>User</literal>
+ component contains basic information about a user - such as
+ username, password, first name, last name, and email. The
+ <literal>User Profile</literal>
+ component contains extra information about a user, such as user's
+ personal information, and business information.
+ You can also add additional information about a user if your application
+ requires it.
+ The
+ <literal>Group</literal>
+ component contains a group graph. The
+ <literal>Membership Type</literal>
+ component
+ contains a list of predefined membership types.
+ Finally, the
+ <literal>Membership</literal>
+ component connects a User, a Group and a Membership Type.
+ </para>
+ <para>
+ A user can have one or more memberships within a group, for example:
+ user A can have the 'member' and 'admin' memberships in group /user.
+ A user belongs to a group if he has at least one membership in that
+ group.
+ </para>
+ <para>
+ Exposing the Organization API to developers the OrganizationService component
+ provides developers with access
+ to handler objects for managing each of the five components -
+ UserHandler, UserProfileHandler, GroupHandler, MembershipTypeHandler,
+ and MembershipHandler.
+ </para>
+ <para>
+ The five central API components are really designed like persistent
+ entities, and handlers are really specified like data access objects
+ (DAO).
+ </para>
+ <para>
+ Organization API simply describes a contract, meaning it is not a concrete
+ implementation. The described components are interfaces,
+ allowing for different concrete implementations. In practial terms that means,
+ you can replace the existing implementation with a different one.
+ </para>
+</section>
+
Modified: portal/trunk/docs/reference-guide/en/modules/AuthenticationAndIdentity.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/AuthenticationAndIdentity.xml 2010-04-13 20:06:54 UTC (rev 2609)
+++ portal/trunk/docs/reference-guide/en/modules/AuthenticationAndIdentity.xml 2010-04-13 21:12:40 UTC (rev 2610)
@@ -12,7 +12,7 @@
<xi:include href="AuthenticationAndIdentity/SSO.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-->
<xi:include href="AuthenticationAndIdentity/DataInjectorConfiguration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="AuthenticationAndIdentity/OrganizationAPI.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="AuthenticationAndIdentity/AccessingUserProfile.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="AuthenticationAndIdentity/APIs.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
</chapter>
Modified: portal/trunk/docs/reference-guide/en/modules/PortalDevelopment/InternationalizationConfiguration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/PortalDevelopment/InternationalizationConfiguration.xml 2010-04-13 20:06:54 UTC (rev 2609)
+++ portal/trunk/docs/reference-guide/en/modules/PortalDevelopment/InternationalizationConfiguration.xml 2010-04-13 21:12:40 UTC (rev 2610)
@@ -295,35 +295,7 @@
javax.portlet.keywords=Breadcrumbs, Breadcrumb
</programlisting>
</section>
-
- <section id="sect-Reference_Guide-_Portlets_-Access">
- <title>Access</title>
- <para>
- These <emphasis>key</emphasis>s are used to display a property in the user language.
- </para>
- <para>
- The following access method enables translation to the preferred language for the connected user:
- </para>
- <itemizedlist>
- <listitem>
- <para>
- Groovy Template
-<programlisting>TODO
-</programlisting>
- </para>
- </listitem>
- <listitem>
- <para>
- Java
-<programlisting>WebuiRequestContext context = WebuiRequestContext.getCurrentInstance() ;
-ResourceBundle res = context.getApplicationResourceBundle() ;
-String translatedString = res.getString(key);
-</programlisting>
- </para>
- </listitem>
- </itemizedlist>
- </section>
-
+
<section id="sect-Reference_Guide-_Portlets_-Debugging_resource_bundle_usage">
<title>Debugging resource bundle usage</title>
<para>
Deleted: portal/trunk/docs/reference-guide/en/modules/PortletDevelopment/AJAXFramework.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/PortletDevelopment/AJAXFramework.xml 2010-04-13 20:06:54 UTC (rev 2609)
+++ portal/trunk/docs/reference-guide/en/modules/PortletDevelopment/AJAXFramework.xml 2010-04-13 21:12:40 UTC (rev 2610)
@@ -1,510 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
-%BOOK_ENTITIES;
-]>
-<section id="sect-Reference_Guide-AJAX_Framework">
- <title>AJAX Framework</title>
- <para>
- Ajax calls are easily managed in &PRODUCT;'s framework. Lines can be added to the relevant template file and java class. A simple Ajax update of a component does not require any JavaScript code to be written.
- </para>
- <section id="sect-Reference_Guide-AJAX_Framework-Portlet_Preparation">
- <title>Portlet Preparation</title>
- <para>
- &PRODUCT; portlets can use specific <literal>ActionListener</literal>s to receive and process Ajax calls. To set a portlet up to recieve Ajax calls, follow this procedure:
- </para>
- <procedure>
- <step>
- <para>
- Create an inner static class named with the following convention: <parameter>action name</parameter> followed by <literal>ActionListener</literal>.
- </para>
- <para>
- Example : <literal>ParentClass</literal> is the class being wrtitten in.
- </para>
-
-<programlisting>static public class SaveActionListener extends EventListener<ParentClass>
-</programlisting>
- </step>
- <step>
- <para>
- Declare this listener in the configuration of the portlet:
- </para>
-
-<programlisting>listeners = ParentClass.SaveActionListener.class
-</programlisting>
- </step>
- <step>
- <para>
- Add the correct annotation <literal>ComponentConfig</literal>, <literal>EventConfig</literal>, etc.
- </para>
- <para>
- For example; the configuration below is for <literal>UIAccountForm</literal>:
- </para>
-
-<programlisting role="JAVA">...
-@ComponentConfig(
- lifecycle = UIFormLifecycle.class,
- template = "system:/groovy/webui/form/UIFormTabPane.gtmpl",
- initParams = {
- @ParamConfig(
- name = "AccountTemplateConfigOption",
- value = "app:/WEB-INF/conf/uiconf/account/webui/component/model/AccountTemplateConfigOption.groovy"
- ),
- @ParamConfig(
- name = "help.UIAccountFormQuickHelp",
- value = "app:/WEB-INF/conf/uiconf/account/webui/component/model/UIAccountFormQuickHelp.xhtml"
- )
- },
- events = {
- @EventConfig(listeners = UIAccountForm.SaveActionListener.class ),
- @EventConfig(listeners = UIAccountForm.ResetActionListener.class, phase = Phase.DECODE),
- @EventConfig(listeners = UIAccountForm.SearchUserActionListener.class, phase = Phase.DECODE)
- }
-)
-...
-</programlisting>
- </step>
- <step>
- <para>
- Create an <literal>execute</literal> method inside this class:
- </para>
-
-<programlisting>public void execute(Event<ParentClass> event) throws Exception
-</programlisting>
- <para>
- This method is called every time the listener gets an event from the client. Hence you can process this event in it, using the even attribute. Use it to get parameters from a form in your client, to modify the status of your portlet, etc.,
- </para>
- <para>
- Possible ways to use the event attribute :
- </para>
- <itemizedlist>
- <listitem>
-
-<programlisting role="XML">String value = event.getRequestContext().getRequestParameter("name"); // to get a value from a form
-</programlisting>
- </listitem>
- <listitem>
-
-<programlisting role="XML">ParentClass parent = event.getSource(); // to get the parent object (the portlet that threw and caugth the event)
-</programlisting>
- </listitem>
- <listitem>
-
-<programlisting role="XML">UIMyComponent portal = parent.getAncestorOfType(UIMyComponent.class); // to get any node in the hierarchy of UIComponents
-</programlisting>
- </listitem>
- </itemizedlist>
- </step>
- <step>
- <para>
- If your action has to update an element on your client's interface, you must call <emphasis role="bold">addUIComponentToUpdateByAjax() </emphasis> at the end of the <literal>execute</literal> method:
- </para>
-
-<programlisting>event.getRequestContext().addUIComponentToUpdateByAjax(uicomponent);
-</programlisting>
- <para>
- The target component must be provided as parameter (the component that will be updated). We will come back on this later.
- </para>
- </step>
- <step>
- <para>
- You must create one inner action listener class for each Ajax call you want to handle on this portlet. All these classes must be declared in the configuration annotations of the main class, otherwise you will get an error.
- </para>
- </step>
- <step>
- <para>
- Done. Your portlet is ready to accept Ajax calls from your client.
- </para>
- </step>
- </procedure>
-
- </section>
-
- <section id="sect-Reference_Guide-AJAX_Framework-AJAX_in_Groovy">
- <title>AJAX in Groovy</title>
- <para>
- Once the server is configured to receive Ajax calls, you must configure the client interface to make these calls.
- </para>
- <procedure>
- <step>
- <para>
- Add the following code to the groovy template file associated with the appropriate portlet class ( <literal>ParentClass</literal> here):
- </para>
-
-<programlisting>uicomponent.event("YourOperation");
-</programlisting>
- <para>
- <literal>YourOperation</literal> is the same as in the <literal>ActionListener</literal> class (save in our example above).
- </para>
- </step>
- <step>
- <para>
- The event function will create an url starting with <literal>javascript:</literal>. Make sure this code can be executed in the environment where the portal is running.
- </para>
- </step>
- <step>
- <para>
- If your operation must update the content of a component, make sure that the target component is well rendered. The following is recommended:
- </para>
-
-<programlisting>uicomponent.renderChild(UITargetComponent.class) ;
-</programlisting>
- </step>
- <step>
- <para>
- The <literal>uicomponent</literal> must be of the <literal>UITargetComponent</literal> type as the component class;
-<programlisting>event.getRequestContext().addUIComponentToUpdateByAjax(uicomponent) ;
-</programlisting>
- will be updated when <literal>UITargetComponent</literal> is called.
- </para>
- </step>
- <step>
- <para>
- If this component is not rendered by default, set its <literal>rendered</literal> attribute (in the constructor of the portlet) to false when the portlet loads:
- </para>
-
-<programlisting>mycomponent.setRendered(false);
-</programlisting>
- </step>
- </procedure>
-
- </section>
-
- <section id="sect-Reference_Guide-AJAX_Framework-How_JavaScript_works">
- <title>How JavaScript works</title>
- <para>
- All javascript in &PRODUCT; is managed by the file <filename>02eXoresources:javascript/eXo/portal/PortalHttpRequest.js</filename>.
- </para>
- <para>
- In this class, there are four functions/classes:
- </para>
- <formalpara id="form-Reference_Guide-How_JavaScript_works-PortletResponse">
- <title>PortletResponse</title>
- <para>
- </para>
- </formalpara>
- <formalpara id="form-Reference_Guide-How_JavaScript_works-PortalResponse">
- <title>PortalResponse</title>
- <para>
- </para>
- </formalpara>
- <formalpara id="form-Reference_Guide-How_JavaScript_works-AjaxRequest">
- <title>AjaxRequest</title>
- <para>
- </para>
- </formalpara>
- <formalpara id="form-Reference_Guide-How_JavaScript_works-HttpResponseHandler">
- <title>HttpResponseHandler</title>
- <para>
- </para>
- </formalpara>
- <para>
- and 6 functions:
- </para>
- <variablelist>
- <varlistentry>
- <term>ajaxGet(url, callback)</term>
- <listitem>
- <para>
- This is the main entry method for every Ajax calls to the portal It is simply a dispatcher method that completes some <parameter>init</parameter> fields before calling the <literal>doRequest()</literal> method.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>ajaxPost(formElement, callback)</term>
- <listitem>
- <para>
- This method is called instead of an <literal>HTTP POST</literal> when, in an AJAX case, some manipulations are needed. Once the content of the form is placed into a string object, the call is delegated to the <literal>doRequest()</literal> method
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>doRequest(method, url, queryString, callback)</term>
- <listitem>
- <para>
- The <literal>doRequest()</literal> method takes incoming request from <literal>ajaxGet</literal> and <literal>ajaxPost</literal> calls. The second argument is the URL to target on the server The third argument is the query string object which is created out of a form element, this value is null except when there is a POST request.
- <orderedlist>
- <listitem>
- <para>
- An <literal>AjaxRequest</literal> object is instantiated. It holds the reference to the XHR method.
- </para>
- </listitem>
- <listitem>
- <para>
- An <literal>HttpResponseHandler</literal> object is instantiated and its methods (<literal>ajaxResponse</literal>, <literal>ajaxLoading</literal>, <literal>ajaxTimeout</literal>) are associated with the one from the <literal>AjaxRequest</literal> and will be called by the XHR during the process method.
- </para>
- </listitem>
- </orderedlist>
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>ajaxAbort()</term>
- <listitem>
- <para>
- Cancels the current request.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>ajaxAsyncGetRequest(url, async)</term>
- <listitem>
- <para>
- Allows to create and execute a sync or async GET request.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>ajaxRedirect(url)</term>
- <listitem>
- <para>
- A simple javascript redirection with <literal>window.location.href</literal> that are the entry points of these classes. These functions need not be called explicitly, as the template file and the portlet class manage everything.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </section>
-
- <section id="sect-Reference_Guide-AJAX_Framework-PortletResponse">
- <title>PortletResponse</title>
- <para>
- This class doesn't contain any methods. On creation, it retrieves the response elements from the xml returned by Ajax, and stores them in the corresponding attributes :
- </para>
- <variablelist>
- <varlistentry>
- <term>portletId</term>
- <listitem>
- <para>
- The component ID.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>portletTitle</term>
- <listitem>
- <para>
- The component title.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>portletMode</term>
- <listitem>
- <para>
- The mode the component runs in. The options are: View, Edit, Help or Config.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>portletState</term>
- <listitem>
- <para>
- The processing state of the component. The options are: Decode, Render.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>portletData</term>
- <listitem>
- <para>
- The updated data to put in the component.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>script</term>
- <listitem>
- <para>
- The javascript code to update the component.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>blocksToUpdate</term>
- <listitem>
- <para>
- An array containing the containers to update with this script.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- <para>
- Attributes can be accessed by calling them from the <literal>PortletResponse</literal> instance.
- </para>
- </section>
-
- <section id="sect-Reference_Guide-AJAX_Framework-PortalResponse">
- <title>PortalResponse</title>
- <para>
- This is an array of <literal>PortletResponse</literal>s (<literal>portletResponses</literal>) and two other attributes:
- </para>
- <variablelist>
- <varlistentry>
- <term>data</term>
- <listitem>
- <para>
- Data to update.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>script</term>
- <listitem>
- <para>
- Javascript code to update.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </section>
-
- <section id="sect-Reference_Guide-AJAX_Framework-AjaxRequest">
- <title>AjaxRequest</title>
- <para>
- By far the most important class of this file. It makes the <literal>XMLHttpRequest</literal> object easier to use by wrapping it with functions and attributes. You can find further documentation on this class <ulink type="http" url="http://www.ajaxtoolbox.com/request/documentation.php">here</ulink>.
- </para>
- </section>
-
- <section id="sect-Reference_Guide-AJAX_Framework-HttpResponseHandler">
- <title>HttpResponseHandler</title>
- <para>
- This class provides methods to handle the Ajax response.
- </para>
- <variablelist>
- <varlistentry>
- <term>executeScript</term>
- <listitem>
- <para>
- Used to execute javascript code.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>updateBlocks</term>
- <listitem>
- <para>
- Updates <literal>html</literal> components.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>ajaxTimeout</term>
- <listitem>
- <para>
- This function is called when the timeout of the ajax call exceeds its set limit.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>ajaxResponse</term>
- <listitem>
- <para>
- This function creates a <literal>PortalResponse</literal> object from the data in the Ajax request.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>ajaxLoading</term>
- <listitem>
- <para>
- This function shows the loading pop-up and mask layer.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- <formalpara id="form-Reference_Guide-HttpResponseHandler-Portal_Ajax_Response_Data_Structure">
- <title>Portal Ajax Response Data Structure:</title>
- <para>
-
-<programlisting>{PortalResponse}
- |
- |--->{PortletResponse}
- |
- |--->{PortletResponse}
- | |-->{portletId}
- | |-->{portletTitle}
- | |-->{portletMode}
- | |-->{portletState}
- | |
- | |-->{Data}
- | | |
- | | |--->{BlockToUpdate}
- | | | |-->{blockId}
- | | | |-->{data}
- | | |
- | | |--->{BlockToUpdate}
- | |--->{Script}
- |
- |--->{Data}
- | |
- | |--->{BlockToUpdate}
- | | |-->{blockId}
- | | |-->{data}
- | |
- | |--->{BlockToUpdate}
- |--->{Script}
-</programlisting>
- </para>
- </formalpara>
- </section>
-
- <section id="sect-Reference_Guide-AJAX_Framework-Manage_Several_Popups">
- <title>Manage Several Popups</title>
- <para>
- If there are several actions that need to appear in a pop-up, the following technique can be used to manage the different pop-up windows:
- </para>
- <procedure>
- <step>
- <para>
- Create a <literal>UIPopupAction</literal> in the main portlet class:
- </para>
-
-<programlisting>addChild(UIPopupAction.class, null, null);
-</programlisting>
- </step>
- <step>
- <para>
- Render this action in your template file:
- </para>
-
-<programlisting>uicomponent.renderChild(UIPopupAction.class) ;
-</programlisting>
- <para>
- (This creates an empty container (pop-up) that will receive the new content by Ajax)
- </para>
- </step>
- <step>
- <para>
- Put this component in your action listener class and update its content:
- </para>
-
-<programlisting>UIPopupAction uiPopupAction = uiMainPortlet.getChild(UIPopupAction.class) ;
-uiPopupAction.activate(UIReferencesList.class, 600) ;
-</programlisting>
- <para>
- <literal>UIReferenceList</literal> is the component that will appear in the pop-up. It does not have to declared in the main portlet class.
- </para>
- <para>
- The activate method creates the component and its rendering in the pop-up window.
- </para>
- </step>
- <step>
- <para>
- Allow this component to be updated by Ajax:
- </para>
-
-<programlisting>event.getRequestContext().addUIComponentToUpdateByAjax(uiPopupAction) ;
-</programlisting>
- </step>
- <step>
- <para>
- Add an action listener class (and repeat the steps above with the appropriate component type) for each component required to appear in a pop-up window .
- </para>
- </step>
- </procedure>
-
- </section>
-
-</section>
-
-
Deleted: portal/trunk/docs/reference-guide/en/modules/PortletDevelopment/GroovyTemplates.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/PortletDevelopment/GroovyTemplates.xml 2010-04-13 20:06:54 UTC (rev 2609)
+++ portal/trunk/docs/reference-guide/en/modules/PortletDevelopment/GroovyTemplates.xml 2010-04-13 21:12:40 UTC (rev 2610)
@@ -1,231 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
-%BOOK_ENTITIES;
-]>
-<section id="sect-Reference_Guide-Groovy_Templates">
- <title>Groovy Templates</title>
- <para>
- In addition to the content in this chapter, refer also to <xref linkend="sect-Reference_Guide-AJAX_Framework" /> in order to better understand the communication between the Groovy Template and the portlet.
- </para>
- <section id="sect-Reference_Guide-Groovy_Templates-Basic_structure">
- <title>Basic structure</title>
- <para>
- The structure of a template is quite simple. It consists of only two elements:
- </para>
- <orderedlist>
- <listitem>
- <para>
- The HTML code and;
- </para>
- </listitem>
- <listitem>
- <para>
- zero or more groovy language code blocks, enclosed by <% ... %> enclosures.
- </para>
- </listitem>
- </orderedlist>
- <para>
- The HTML code in the template doesn't have to contain the <literal>html</literal>, or <literal>body</literal> tags. This allows groovy templates for one component to also be rendered in another component.
- </para>
- <para>
- For example:
- </para>
-
-<programlisting role="HTML"><!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<%
- import org.exoplatform.webui.core.UIComponent;
- def currentPage = uicomponent.getCurrentPage();
- ...
-%>
- ...
- <div class="$uicomponent.skin" id="UIPortalApplication">
- <%uicomponent.renderChildren();%>
- </div>
-</programlisting>
- </section>
-
- <section id="sect-Reference_Guide-Groovy_Templates-Groovy_language">
- <title>Groovy language</title>
- <para>
- Groovy is a scripting language for Java. Some usage examples are included in this section, however further information is available at <ulink url="http://groovy.codehaus.org/Documentation" /> .
- </para>
- <variablelist id="vari-Reference_Guide-Groovy_language-Some_examples_of_Groovy">
- <title>Some examples of Groovy</title>
- <varlistentry>
- <term>Variables definition</term>
- <listitem>
- <para>
-
-<programlisting>int min = 1;
-def totalPage = uicomponent.getAvailablePage();
-String name = "uiPortlet";
-categories = uicomponent.getItemCategories();
-String columns = uicomponent.getColumns();
-</programlisting>
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Other expressions</term>
- <listitem>
- <para>
-
-<programlisting>for(category in categories) { ... }
-for(i in min..max) { ... } // min and max are int variables
-println "</div>" ;
-println """
- <div class="Item">
- <div class="OverflowContainer">
-""";
-<%=uicomponent.getToolbarStyle();%> // <%= to avoid a call of println method
-import org.exoplatform.portal.config.model.PageNode;
-</programlisting>
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </section>
-
- <section id="sect-Reference_Guide-Groovy_Templates-Linking_a_portlet_with_a_template">
- <title>Linking a portlet with a template</title>
- <section id="sect-Reference_Guide-Linking_a_portlet_with_a_template-Portlet_configuration">
- <title>Portlet configuration</title>
- <para>
- The configuration of a portlet is partly made with <literal>ComponentConfig</literal> annotations (others are <literal>ComponentConfigs</literal>, <literal>EventConfig</literal>, etc).
- </para>
- <para>
- One of the parameters of this annotation is <literal>template</literal>. This is where the path to the template file associated with this portlet is defined.
- </para>
- <para>
- To specify this parameter, add this statement to the configuration annotation.
- </para>
- <para>
- For example, in <emphasis role="bold">src:/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/ </emphasis> is the <emphasis role="bold">UIApplicationForm.java</emphasis> file:
- </para>
-
-<programlisting>@ComponentConfig(
- lifecycle = UIFormLifecycle.class,
- template = "system:/groovy/webui/form/UIFormWithTitle.gtmpl",
- events = {
- @EventConfig(listeners = UIApplicationForm.SaveActionListener.class),
- @EventConfig(phase = Phase.DECODE, listeners = UIApplicationForm.CancelActionListener.class)
- }
-)
-</programlisting>
- <para>
- The path is in the "<literal>system</literal>" namespace. This is a reference to the portal webapp.
- </para>
- <para>
- This webapp contains reusable groovy templates in the folder; <emphasis role="bold">src:/web/portal/src/main/webapp/groovy/webui/form/ </emphasis>.
- </para>
- <para>
- Use the following steps to create a new template;
- </para>
- <procedure>
- <step>
- <para>
- Create a groovy file in the appropriate webbapp and refer to it.
- </para>
- </step>
- <step>
- <para>
- Use the namespace "app" for refering to the same webapp as the component.
- </para>
- </step>
- <step>
- <para>
- &PRODUCT; stores the component templates in a folder that follows this placement convention: "<filename>/webapp/groovy/<literal>your_portlet_name</literal>/webui/component</filename>".
- </para>
- <para>
-
-<programlisting>template = "app:/groovy/your_portlet_name/webui/component/your_component.gtmpl"
-</programlisting>
- </para>
- </step>
- <step>
- <para>
- Edit the template file according to the information in the <xref linkend="sect-Reference_Guide-Linking_a_portlet_with_a_template-The_template_file" />.
- </para>
- </step>
- </procedure>
-
- </section>
-
- <section id="sect-Reference_Guide-Linking_a_portlet_with_a_template-The_template_file">
- <title>The template file</title>
- <para>
- Component template files are composed in HTML code and groovy code blocks. There are a few things more that you need to know to fully link your portlet with your template.
- </para>
- <para>
- To successfully link a portlet with a template, please ensure the following:
- </para>
- <itemizedlist>
- <listitem>
- <para>
- If the template defines the UI of a component, use the java object variable <literal>uicomponent</literal> to access this component instance.
- </para>
- <para>
- This should be the case in most instances, but it is recommended that the java class inherits from <literal>UIComponent</literal> are checked before this variable is used.
- </para>
- <para>
- Using the <literal>uicomponent</literal> variable, you can access all the attributes and functions of a component to use them in your template.
- </para>
- <para>
- Take, for example <literal>UIPageIterator.gtmpl</literal>:
- </para>
-
-<programlisting><%
- def currentPage = uicomponent.getCurrentPage();
-%>
-...
-<a href="<%=uicomponent.event("ShowPage","$currentPage")%>" class="Icon LastTopPageIcon">
- <span></span>
-</a>
-</programlisting>
- <para>
- The following example shows how <literal>uicomponent</literal> can be used to make Ajax calls using the <literal>event</literal> method. See <xref linkend="sect-Reference_Guide-AJAX_Framework" /> for more details.
- </para>
- </listitem>
- <listitem>
- <para>
- Another variable available is <literal>ctx</literal>. This variable gives access to the context in which the template is processed.
- </para>
- <para>
- Use this variable to retrieve elements such as; the request, the Javscript manager or the resource resolver (<literal>ctx.appRes</literal>).
- </para>
- <para>
- Some usage examples are:
- </para>
-
-<programlisting><%
- def rcontext = ctx.getRequestContext() ;
- context.getJavascriptManager().importJavascript('GateIn.webui.UIPopupWindow');
- ctx.appRes(popupId + ".title."+ title);
-%>
-</programlisting>
- </listitem>
- <listitem>
- <para>
- If the template defines the user interface of a component that includes a form use an instance of <literal>UIForm</literal> in a variable named <literal>uiform</literal>.
- </para>
- <para>
- The <literal>UIForm</literal> class provides the methods <literal>begin()</literal> and <literal>end()</literal> which write the HTML tags of the form.
- </para>
- <para>
- The form class must inherit from <literal>UIForm</literal>. In this class add the input elements (fields, checkboxes, lists) which are required in the form.
- </para>
- <para>
- Render the input elements in the groovy template using <literal>uiform.renderField(field)</literal>.
- </para>
- </listitem>
- </itemizedlist>
- </section>
-
- </section>
-
-</section>
-
-
Deleted: portal/trunk/docs/reference-guide/en/modules/PortletDevelopment/PortletLifecycle.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/PortletDevelopment/PortletLifecycle.xml 2010-04-13 20:06:54 UTC (rev 2609)
+++ portal/trunk/docs/reference-guide/en/modules/PortletDevelopment/PortletLifecycle.xml 2010-04-13 21:12:40 UTC (rev 2610)
@@ -1,324 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
-%BOOK_ENTITIES;
-]>
-<section id="sect-Reference_Guide-Portlet_Lifecycle">
- <title>Portlet Lifecycle</title>
- <para>
- This chapter does not to refer to the Portlet API specification lifecycle but focuses on the &PRODUCT; UI framework.
- </para>
- <para>
- This web framework has been developed specifically for &PRODUCT; and, while it is not necessary to use the native web framework to build portlets, all portlets packaged with &PRODUCT; are developed using this framework.
- </para>
- <para>
- This consistency allows portlets to use several UI components that can be used in different abstracted contexts (such as the portal itself or some portlets).
- </para>
- <note>
- <title>Recommended Reading</title>
- <para>
- This chapter is intended for advanced developers. It covers code implementation and logic. It is not a tutorial on how to write portlets.
- </para>
- <para>
- Refer to <xref linkend="sect-Reference_Guide-Portal_Lifecycle" /> for information on concepts that are similar and top hierarchy classes that are shared.
- </para>
- </note>
- <section id="sect-Reference_Guide-Portlet_Lifecycle-Portlet_init">
- <title>Portlet init</title>
- <para>
- The main entry point for configuring a portlet is in the <emphasis role="bold">portlet.xml</emphasis> file located in the portlet application WAR.
- </para>
- <para>
- Each portlet built using the &PRODUCT; web framework must reference the <emphasis role="bold">PortletApplicationController</emphasis> .
- </para>
- <para>
- The portlet configuration (such as the root component) is defined in <filename>configuration.xml</filename>. The path to this file is defined in the init-param "<emphasis role="bold">webui.configuration</emphasis>" of <filename>portlet.xml</filename>.
- </para>
-
-<programlisting><portlet>
- <description xml:lang="EN">Content Portlet</description>
- <portlet-name>ContentPortlet</portlet-name>
- <display-name xml:lang="EN">Content Portlet</display-name>
- <portlet-class>org.exoplatform.webui.application.portlet.PortletApplicationController</portlet-class>
-
- <init-param>
- <name>webui.configuration</name>
- <value>/WEB-INF/conf/portlet/content/ContentPortlet/webui/configuration.xml</value>
- </init-param>
-</portlet>
-</programlisting>
- <para>
- The structure of the <filename>configuration.xml</filename> file is exactly the same as the <filename>webui-configuration.xml</filename> which was introduced in <xref linkend="sect-Reference_Guide-Portal_Lifecycle" />.
- </para>
- <para>
- In the case of the content portlet it is formatted as:
- </para>
-
-<programlisting><webui-configuration>
- <application>
- <ui-component-root>org.exoplatform.content.webui.component.UIContentPortlet</ui-component-root>
- <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
- </application>
-</webui-configuration>
-</programlisting>
- <para>
- The <literal>PortletApplicationController</literal> class extends the <literal>GenericPortlet</literal> class defined in the Portlet API specification.
- </para>
- <para>
- All methods (like <literal>processAction()</literal> or <literal>render()</literal>) are delegated to the <literal>PortletApplication</literal>. The creation and caching inside the <literal>WebController</literal> object is shown in the example below:
- </para>
-
-<programlisting>/**
- * try to obtain the PortletApplication from the WebAppController.
- *
- * If it does not exist a new PortletApplication object is created, init and cached in the
- * controller
- */
-private PortletApplication getPortletApplication() throws Exception {
- PortalContainer container = PortalContainer.getInstance() ;
- WebAppController controller =
- (WebAppController)container.getComponentInstanceOfType(WebAppController.class) ;
- PortletApplication application = controller.getApplication(applicationId_) ;
- if(application == null) {
- application = new PortletApplication(getPortletConfig()) ;
- application.onInit() ;
- controller.addApplication(application) ;
- }
- return application ;
-}
-</programlisting>
- </section>
-
- <section id="sect-Reference_Guide-Portlet_Lifecycle-Portlet_request_handler">
- <title>Portlet request handler</title>
- <para>
- When a portlet using the native web framework is deployed in &PRODUCT;, all methods calls go through the <literal>PortletApplication</literal> object which extends the <literal>WebuiApplication</literal>.
- </para>
- </section>
-
- <section id="sect-Reference_Guide-Portlet_Lifecycle-ProcessAction_phase">
- <title>ProcessAction phase</title>
- <para>
- The code of the method in <literal>PortletApplication</literal> is described below. The business logic is shown in the javadoc:
- </para>
-
-<programlisting>/**
- * The processAction() method is the one modelled according to the Portlet API specification
- *
- * The process is quite simple and here are te different steps done in the method:
- *
- * 1) The current instance of the WebuiRequestContext (stored in a ThreadLocal in the class) is referenced
- * 2) A new request context of type PortletRequestContext (which extends the class WebuiRequestContext) is
- * created as a child of the current context instance
- * 3) The new context is place inside the ThreadLocal and hence overides its parent one there,
- * only for the portlet request lifeciclye
- * 4) The method onStartRequest() is called in all the ApplicationLifecycle objects referenced in the webui
- * configuration XML file
- * 5) The StateManager object (in case of portlet it is an object of type ParentAppStateManager) is used to get the RootComponent
- * also referenced in the XML configuration file
- * 6) The methods processDecode(UIApplication, WebuiRequestContext) and processAction(UIApplication, WebuiRequestContext)
- * are then called
- * 7) Finally, a flag, to tell that the processAction phase was done, in the context is set to true and the parent
- * context is restored in the Threadlocal
- */
-public void processAction(ActionRequest req, ActionResponse res) throws Exception {
- WebuiRequestContext parentAppRequestContext = WebuiRequestContext.getCurrentInstance() ;
- PortletRequestContext context = createRequestContext(req, res, parentAppRequestContext) ;
- WebuiRequestContext.setCurrentInstance(context) ;
- try {
- for(ApplicationLifecycle lifecycle : getApplicationLifecycle()) {
- lifecycle.onStartRequest(this, context) ;
- }
- UIApplication uiApp = getStateManager().restoreUIRootComponent(context) ;
- context.setUIApplication(uiApp) ;
- processDecode(uiApp, context) ;
- if(!images/context.isResponseComplete() &&!images/ context.getProcessRender()) {
- processAction(uiApp, context) ;
- }
- } finally {
- context.setProcessAction(true) ;
- WebuiRequestContext.setCurrentInstance(parentAppRequestContext) ;
- }
-}
-</programlisting>
- <para>
- The <literal>PortletRequestContext</literal> extends the <literal>WebuiRequestContext</literal> class and acts as a wrapper on all the portlet request information:
- </para>
-
-<programlisting>/**
- * In this method we try to get the PortletRequestContext object from the attribute map of the parent
- * WebuiRequestContext.
- *
- * If it is not cached then we create a new instance, if it is cached then we init it with the correct
- * writer, request and response objects
- *
- * We finally cache it in the parent attribute map
- *
- */
-private PortletRequestContext createRequestContext(PortletRequest req, PortletResponse res,
- WebuiRequestContext parentAppRequestContext) throws IOException {
- String attributeName = getApplicationId() + "$PortletRequest" ;
- PortletRequestContext context =
- (PortletRequestContext) parentAppRequestContext.getAttribute(attributeName) ;
- Writer w = null ;
- if(res instanceof RenderResponse){
- RenderResponse renderRes = (RenderResponse)res;
- renderRes.setContentType("text/html; charset=UTF-8");
- w = renderRes.getWriter() ;
- }
- if(context!images/= null) {
- context.init(w, req, res) ;
- } else {
- context = new PortletRequestContext(this, w, req, res) ;
- parentAppRequestContext.setAttribute(attributeName, context) ;
- }
- context.setParentAppRequestContext(parentAppRequestContext) ;
- return context;
-}
-</programlisting>
- <para>
- In the <literal>PortletApplication</literal>, the line;
- </para>
-
-<programlisting>UIApplication uiApp = getStateManager().restoreUIRootComponent(context);
-</programlisting>
- <para>
- asks the <literal>StateManager</literal> defined for the portlet to get the UI root component. In the case of a portlet the root component must extend <literal>UIPortletApplication</literal>.
- </para>
-
-<programlisting>public class ParentAppStateManager extends StateManager {
-
- /**
- * This method simply delegate the call to the same method of the parent WebuiRequestContext
- */
- @SuppressWarnings("unchecked")
- public UIApplication restoreUIRootComponent(WebuiRequestContext context) throws Exception {
- WebuiRequestContext pcontext = (WebuiRequestContext) context.getParentAppRequestContext() ;
- return pcontext.getStateManager().restoreUIRootComponent(context) ;
- }
-</programlisting>
- <para>
- Hence this is the PortalStateManager that will also handle the extraction of the root component.
- </para>
-
-<programlisting>public UIApplication restoreUIRootComponent(WebuiRequestContext context) throws Exception {
- context.setStateManager(this) ;
- WebuiApplication app = (WebuiApplication)context.getApplication() ;
-
- /*
- * If the request context is of type PortletRequestContext, we extract the parent context which will
- * allow to get access to the PortalApplicationState object thanks to the session id used as the key for the
- * syncronised Map uiApplications
- */
- if(context instanceof PortletRequestContext) {
- WebuiRequestContext preqContext = (WebuiRequestContext) context.getParentAppRequestContext() ;
- PortalApplicationState state = uiApplications.get(preqContext.getSessionId()) ;
- PortletRequestContext pcontext = (PortletRequestContext) context ;
- String key = pcontext.getApplication().getApplicationId() ;
- UIApplication uiApplication = state.get(key) ;
- if(uiApplication!images/= null) return uiApplication;
- synchronized(uiApplications) {
- ConfigurationManager cmanager = app.getConfigurationManager() ;
- String uirootClass = cmanager.getApplication().getUIRootComponent() ;
- Class type = Thread.currentThread().getContextClassLoader().loadClass(uirootClass) ;
- uiApplication = (UIApplication)app.createUIComponent(type, null, null, context) ;
- state.put(key, uiApplication) ;
- }
- return uiApplication ;
- }
-}
-</programlisting>
- </section>
-
- <section id="sect-Reference_Guide-Portlet_Lifecycle-Render_phase">
- <title>Render phase</title>
- <para>
- The render method business logic is quite similar to <literal>processAction()</literal>.
- </para>
-
-<programlisting>/**
- * The render method business logic is quite similar to the processAction() one.
- *
- * 1) A PortletRequestContext object is created (or extracted from the cache if it already exists)
- * and initialized
- * 2) The PortletRequestContext replaces the parent one in the WebuiRequestContext ThreadLocal object
- * 3) If the portal has already called the portlet processAction() then the call to all onStartRequest of
- * the ApplicationLifecycle has already been made, otherwise we call them
- * 4) The ParentStateManager is also used to get the UIApplication, as we have seen it delegates the call
- * to the PortalStateManager which caches the UI component root associated with the current application
- * 5) the processRender() method of the UIPortletApplucaton is called
- * 6) Finally, the method onEndRequest() is called on every ApplicationLifecycle referenced in the portlet
- * configuration XML file and the parent WebuiRequestContext is restored
- *
- */
-public void render(RenderRequest req, RenderResponse res) throws Exception {
- WebuiRequestContext parentAppRequestContext = WebuiRequestContext.getCurrentInstance() ;
- PortletRequestContext context = createRequestContext(req, res, parentAppRequestContext) ;
- WebuiRequestContext.setCurrentInstance(context) ;
- try {
- if(!context.hasProcessAction()) {
- for(ApplicationLifecycle lifecycle : getApplicationLifecycle()) {
- lifecycle.onStartRequest(this, context) ;
- }
- }
- UIApplication uiApp = getStateManager().restoreUIRootComponent(context) ;
- context.setUIApplication(uiApp) ;
- if(!context.isResponseComplete()) {
- UIPortletApplication uiPortletApp = (UIPortletApplication)uiApp;
- uiPortletApp.processRender(this, context) ;
- }
- uiApp.setLastAccessApplication(System.currentTimeMillis()) ;
- } finally {
- try {
- for(ApplicationLifecycle lifecycle : getApplicationLifecycle()) {
- lifecycle.onEndRequest(this, context) ;
- }
- } catch (Exception exception){
- log.error("Error while trying to call onEndRequest of the portlet ApplicationLifecycle",
- exception);
- }
- WebuiRequestContext.setCurrentInstance(parentAppRequestContext) ;
- }
-}
-</programlisting>
- <para>
- The following is the <literal>processRender()</literal> call made on the <literal>UIPortletApplication</literal>:
- </para>
-
-<programlisting>/**
- * The default processRender for an UIPortletApplication handles two cases:
- *
- * A. Ajax is used
- * ----
- * If Ajax is used and that the entire portal should not be re rendered, then an AJAX fragment is
- * generated with information such as the portlet id, the portlet title, the portlet modes, the window
- * states as well as the HTML for the block to render
- *
- * B. A full render is made
- * ----
- * a simple call to the method super.processRender(context) which will delegate the call to all the
- * Lifecycle components
- *
- */
-public void processRender(WebuiApplication app, WebuiRequestContext context) throws Exception {
- WebuiRequestContext pContext = (WebuiRequestContext)context.getParentAppRequestContext();
- if(context.useAjax() &&!images/pContext.getFullRender()) {
- Writer w = context.getWriter() ;
-
- Set<UIComponent> list = context.getUIComponentToUpdateByAjax() ;
- if(list!images/= null) {
- if(getUIPopupMessages().hasMessage()) context.addUIComponentToUpdateByAjax(getUIPopupMessages()) ;
- for(UIComponent uicomponent : list) {
- renderBlockToUpdate(uicomponent, context, w) ;
- }
- return ;
- }
- }
- super.processRender(context) ;
-}
-</programlisting>
- </section>
-
-</section>
-
-
Deleted: portal/trunk/docs/reference-guide/en/modules/PortletDevelopment/WebUI.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/PortletDevelopment/WebUI.xml 2010-04-13 20:06:54 UTC (rev 2609)
+++ portal/trunk/docs/reference-guide/en/modules/PortletDevelopment/WebUI.xml 2010-04-13 21:12:40 UTC (rev 2610)
@@ -1,70 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
-%BOOK_ENTITIES;
-]>
-<section id="sect-Reference_Guide-Web_User_Interface_WebUI">
- <title>Web User Interface - WebUI</title>
- <para>
- WebUI is the name of &PRODUCT;'s webframework.
- </para>
- <para>
- Using a self-contained framework ensures that the portal's architecture does not interfere with other web technologies deployed by the portlets.
- </para>
- <para>
- Using a particular technology raises potential difficulties for users with a differing version (either newer or older) of the same technology.
- </para>
- <para>
- The WebUI framework is a component tree based framework. The key aspects of WebUI are :
- </para>
- <itemizedlist>
- <listitem>
- <para>
- Events based flow.
- </para>
- </listitem>
- <listitem>
- <para>
- Components configuration by annotation
- </para>
- </listitem>
- <listitem>
- <para>
- <xref linkend="sect-Reference_Guide-Groovy_Templates" /> for rendering
- </para>
- </listitem>
- <listitem>
- <para>
- <xref linkend="sect-Reference_Guide-AJAX_Framework" /> support
- </para>
- </listitem>
- <listitem>
- <para>
- Portlet API friendly.
- </para>
- </listitem>
- </itemizedlist>
- <section id="sect-Reference_Guide-Web_User_Interface_WebUI-Relevant_Sections">
- <title>Relevant Sections</title>
- <itemizedlist>
- <listitem>
- <para>
- <xref linkend="sect-Reference_Guide-Portlet_Lifecycle" />: &PRODUCT; portlets are built with WebUI
- </para>
- </listitem>
- <listitem>
- <para>
- <xref linkend="sect-Reference_Guide-Portlet_Lifecycle" />: &PRODUCT; portal itself is a WebUI application
- </para>
- </listitem>
- <listitem>
- <para>
- <xref linkend="sect-Reference_Guide-Create_a_WebUI_Portlet" />: Learn how to write your own app with WebUI
- </para>
- </listitem>
- </itemizedlist>
- </section>
-
-</section>
-
-
Modified: portal/trunk/docs/reference-guide/en/modules/PortletDevelopment.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/PortletDevelopment.xml 2010-04-13 20:06:54 UTC (rev 2609)
+++ portal/trunk/docs/reference-guide/en/modules/PortletDevelopment.xml 2010-04-13 21:12:40 UTC (rev 2610)
@@ -6,9 +6,6 @@
<chapter id="chap-Reference_Guide-Portlet_development">
<title>Portlet development</title>
- <xi:include href="PortletDevelopment/AJAXFramework.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="PortletDevelopment/GroovyTemplates.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="PortletDevelopment/PortletLifecycle.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="PortletDevelopment/Standard.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
</chapter>
14 years, 2 months
- 1
- 0
gatein SVN: r2609 - in components/sso/trunk/agent/src/main/java/org/gatein/sso/agent: cas and 1 other directory.
by do-not-reply＠jboss.org
Author: sohil.shah(a)jboss.com
Date: 2010-04-13 16:06:54 -0400 (Tue, 13 Apr 2010)
New Revision: 2609
Modified:
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/GenericSSOAgent.java
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/cas/CASAgent.java
Log:
GTNPORTAL-1046 - GateIn and secure CAS integration: problem with renew parameter
Modified: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/GenericSSOAgent.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/GenericSSOAgent.java 2010-04-13 19:09:59 UTC (rev 2608)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/GenericSSOAgent.java 2010-04-13 20:06:54 UTC (rev 2609)
@@ -46,6 +46,7 @@
private String ssoServerUrl;
private String ssoCookieName;
+ private boolean casRenewTicket;
@Override
@@ -55,6 +56,12 @@
this.ssoServerUrl = this.getServletConfig().getInitParameter("ssoServerUrl");
this.ssoCookieName = this.getServletConfig().getInitParameter("ssoCookieName");
+
+ String casRenewTicketConfig = this.getServletConfig().getInitParameter("casRenewTicket");
+ if(casRenewTicketConfig != null)
+ {
+ this.casRenewTicket = Boolean.parseBoolean(casRenewTicketConfig);
+ }
}
@Override
@@ -87,7 +94,9 @@
if (ticket != null && ticket.trim().length() > 0)
{
- CASAgent.getInstance(this.ssoServerUrl).validateTicket(httpRequest, ticket);
+ CASAgent casagent = CASAgent.getInstance(this.ssoServerUrl);
+ casagent.setRenewTicket(this.casRenewTicket);
+ casagent.validateTicket(httpRequest, ticket);
}
else if (jossoAssertion != null && jossoAssertion.trim().length() > 0)
{
Modified: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/cas/CASAgent.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/cas/CASAgent.java 2010-04-13 19:09:59 UTC (rev 2608)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/cas/CASAgent.java 2010-04-13 20:06:54 UTC (rev 2609)
@@ -41,6 +41,7 @@
private static CASAgent singleton;
private String casServerUrl;
+ private boolean renewTicket;
private CASAgent(String casServerUrl)
{
@@ -62,10 +63,21 @@
return CASAgent.singleton;
}
+
+ public boolean isRenewTicket()
+ {
+ return renewTicket;
+ }
+
+ public void setRenewTicket(boolean renewTicket)
+ {
+ this.renewTicket = renewTicket;
+ }
+
public void validateTicket(HttpServletRequest httpRequest, String ticket) throws Exception
{
Cas20ProxyTicketValidator ticketValidator = new Cas20ProxyTicketValidator(casServerUrl);
- ticketValidator.setRenew(true);
+ ticketValidator.setRenew(this.renewTicket);
String serviceUrl = "http://"+ httpRequest.getServerName() +":" + httpRequest.getServerPort() +
httpRequest.getContextPath() +"/private/classic";
14 years, 2 months
- 1
- 0
gatein SVN: r2608 - portal/trunk/docs/reference-guide/en.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-13 15:09:59 -0400 (Tue, 13 Apr 2010)
New Revision: 2608
Modified:
portal/trunk/docs/reference-guide/en/master.xml
Log:
Introduction should be first
Modified: portal/trunk/docs/reference-guide/en/master.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/master.xml 2010-04-13 19:04:18 UTC (rev 2607)
+++ portal/trunk/docs/reference-guide/en/master.xml 2010-04-13 19:09:59 UTC (rev 2608)
@@ -78,10 +78,12 @@
</bookinfo>
+
+ <xi:include href="modules/Introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
<!-- Only in the project -->
<xi:include href="modules/Configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="modules/Introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="modules/PortalDevelopment.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="modules/PortletDevelopment.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="modules/GadgetDevelopment.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
14 years, 2 months
- 1
- 0
gatein SVN: r2607 - in portal/trunk/docs/reference-guide/en: images and 12 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-13 15:04:18 -0400 (Tue, 13 Apr 2010)
New Revision: 2607
Added:
portal/trunk/docs/reference-guide/en/images/AuthenticationAndIdentity/SSO/
portal/trunk/docs/reference-guide/en/images/AuthenticationAndIdentity/SSO/cas.png
portal/trunk/docs/reference-guide/en/images/AuthenticationAndIdentity/SSO/opensso-shot.png
portal/trunk/docs/reference-guide/en/images/AuthenticationAndIdentity/SSO/opensso.png
portal/trunk/docs/reference-guide/en/images/Common/gatein_logo.png
portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/Calculator.png
portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/Calendar.png
portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/Dashboard.png
portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/EditImportedOnline.png
portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/EditImportedWebDAV.png
portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/Import.png
portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/Imported.png
portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/Liste.png
portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/New.png
portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/Todo.png
portal/trunk/docs/reference-guide/en/images/PortalDevelopment/Skinning/windowStyles.png
portal/trunk/docs/reference-guide/en/images/PortletDevelopment/Standard/
portal/trunk/docs/reference-guide/en/images/WSRP/bea.png
portal/trunk/docs/reference-guide/en/images/WSRP/bea_insider.png
portal/trunk/docs/reference-guide/en/images/WSRP/config_create.png
portal/trunk/docs/reference-guide/en/images/WSRP/config_end.png
portal/trunk/docs/reference-guide/en/images/WSRP/config_init.png
portal/trunk/docs/reference-guide/en/images/WSRP/config_refresh.png
portal/trunk/docs/reference-guide/en/images/WSRP/config_self.png
portal/trunk/docs/reference-guide/en/images/WSRP/config_usewsdl.png
portal/trunk/docs/reference-guide/en/images/WSRP/consumer_operations.png
portal/trunk/docs/reference-guide/en/images/WSRP/erase_registration.png
portal/trunk/docs/reference-guide/en/images/WSRP/erase_registration_warning.png
portal/trunk/docs/reference-guide/en/images/WSRP/modify_reg_end.png
portal/trunk/docs/reference-guide/en/images/WSRP/modify_reg_modify.png
portal/trunk/docs/reference-guide/en/images/WSRP/modify_reg_self.png
portal/trunk/docs/reference-guide/en/images/WSRP/modify_reg_self_end.png
portal/trunk/docs/reference-guide/en/images/WSRP/modify_reg_start.png
portal/trunk/docs/reference-guide/en/images/WSRP/portlets.png
portal/trunk/docs/reference-guide/en/images/WSRP/producer_blank.png
portal/trunk/docs/reference-guide/en/images/WSRP/producer_default.png
portal/trunk/docs/reference-guide/en/images/WSRP/producer_email.png
portal/trunk/docs/reference-guide/en/images/WSRP/producer_registration.png
portal/trunk/docs/reference-guide/en/images/WSRP/result.png
Removed:
portal/trunk/docs/reference-guide/en/images/Calculator.png
portal/trunk/docs/reference-guide/en/images/Calendar.png
portal/trunk/docs/reference-guide/en/images/Dashboard.png
portal/trunk/docs/reference-guide/en/images/EditImportedOnline.png
portal/trunk/docs/reference-guide/en/images/EditImportedWebDAV.png
portal/trunk/docs/reference-guide/en/images/Import.png
portal/trunk/docs/reference-guide/en/images/Imported.png
portal/trunk/docs/reference-guide/en/images/Liste.png
portal/trunk/docs/reference-guide/en/images/New.png
portal/trunk/docs/reference-guide/en/images/Todo.png
portal/trunk/docs/reference-guide/en/images/cas.png
portal/trunk/docs/reference-guide/en/images/gatein_logo.png
portal/trunk/docs/reference-guide/en/images/image3.jpg
portal/trunk/docs/reference-guide/en/images/opensso-shot.png
portal/trunk/docs/reference-guide/en/images/opensso.png
portal/trunk/docs/reference-guide/en/images/portal.gif
portal/trunk/docs/reference-guide/en/images/tutorials/
portal/trunk/docs/reference-guide/en/images/windowStyles.png
portal/trunk/docs/reference-guide/en/images/wsrp/
Modified:
portal/trunk/docs/reference-guide/en/master.xml
portal/trunk/docs/reference-guide/en/modules/AuthenticationAndIdentity/SSO.xml
portal/trunk/docs/reference-guide/en/modules/GadgetDevelopment/Gadgets.xml
portal/trunk/docs/reference-guide/en/modules/PortalDevelopment/Skinning.xml
portal/trunk/docs/reference-guide/en/modules/PortletDevelopment/Standard.xml
portal/trunk/docs/reference-guide/en/modules/WSRP.xml
Log:
More reorg
Copied: portal/trunk/docs/reference-guide/en/images/AuthenticationAndIdentity/SSO/cas.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/cas.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/AuthenticationAndIdentity/SSO/cas.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/AuthenticationAndIdentity/SSO/opensso-shot.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/opensso-shot.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/AuthenticationAndIdentity/SSO/opensso-shot.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/AuthenticationAndIdentity/SSO/opensso.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/opensso.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/AuthenticationAndIdentity/SSO/opensso.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: portal/trunk/docs/reference-guide/en/images/Calculator.png
===================================================================
(Binary files differ)
Deleted: portal/trunk/docs/reference-guide/en/images/Calendar.png
===================================================================
(Binary files differ)
Copied: portal/trunk/docs/reference-guide/en/images/Common/gatein_logo.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/gatein_logo.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/Common/gatein_logo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: portal/trunk/docs/reference-guide/en/images/Dashboard.png
===================================================================
(Binary files differ)
Deleted: portal/trunk/docs/reference-guide/en/images/EditImportedOnline.png
===================================================================
(Binary files differ)
Deleted: portal/trunk/docs/reference-guide/en/images/EditImportedWebDAV.png
===================================================================
(Binary files differ)
Copied: portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/Calculator.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/Calculator.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/Calculator.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/Calendar.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/Calendar.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/Calendar.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/Dashboard.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/Dashboard.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/Dashboard.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/EditImportedOnline.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/EditImportedOnline.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/EditImportedOnline.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/EditImportedWebDAV.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/EditImportedWebDAV.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/EditImportedWebDAV.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/Import.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/Import.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/Import.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/Imported.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/Imported.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/Imported.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/Liste.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/Liste.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/Liste.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/New.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/New.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/New.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/Todo.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/Todo.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/GadgetDevelopment/Todo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: portal/trunk/docs/reference-guide/en/images/Import.png
===================================================================
(Binary files differ)
Deleted: portal/trunk/docs/reference-guide/en/images/Imported.png
===================================================================
(Binary files differ)
Deleted: portal/trunk/docs/reference-guide/en/images/Liste.png
===================================================================
(Binary files differ)
Deleted: portal/trunk/docs/reference-guide/en/images/New.png
===================================================================
(Binary files differ)
Copied: portal/trunk/docs/reference-guide/en/images/PortalDevelopment/Skinning/windowStyles.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/windowStyles.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/PortalDevelopment/Skinning/windowStyles.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/PortletDevelopment/Standard (from rev 2600, portal/trunk/docs/reference-guide/en/images/tutorials)
Deleted: portal/trunk/docs/reference-guide/en/images/Todo.png
===================================================================
(Binary files differ)
Copied: portal/trunk/docs/reference-guide/en/images/WSRP/bea.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/wsrp/bea.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/WSRP/bea.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/WSRP/bea_insider.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/wsrp/bea_insider.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/WSRP/bea_insider.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/WSRP/config_create.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/wsrp/config_create.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/WSRP/config_create.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/WSRP/config_end.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/wsrp/config_end.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/WSRP/config_end.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/WSRP/config_init.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/wsrp/config_init.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/WSRP/config_init.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/WSRP/config_refresh.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/wsrp/config_refresh.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/WSRP/config_refresh.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/WSRP/config_self.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/wsrp/config_self.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/WSRP/config_self.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/WSRP/config_usewsdl.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/wsrp/config_usewsdl.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/WSRP/config_usewsdl.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/WSRP/consumer_operations.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/wsrp/consumer_operations.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/WSRP/consumer_operations.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/WSRP/erase_registration.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/wsrp/erase_registration.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/WSRP/erase_registration.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/WSRP/erase_registration_warning.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/wsrp/erase_registration_warning.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/WSRP/erase_registration_warning.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/WSRP/modify_reg_end.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/wsrp/modify_reg_end.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/WSRP/modify_reg_end.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/WSRP/modify_reg_modify.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/wsrp/modify_reg_modify.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/WSRP/modify_reg_modify.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/WSRP/modify_reg_self.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/wsrp/modify_reg_self.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/WSRP/modify_reg_self.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/WSRP/modify_reg_self_end.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/wsrp/modify_reg_self_end.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/WSRP/modify_reg_self_end.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/WSRP/modify_reg_start.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/wsrp/modify_reg_start.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/WSRP/modify_reg_start.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/WSRP/portlets.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/wsrp/portlets.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/WSRP/portlets.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/WSRP/producer_blank.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/wsrp/producer_blank.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/WSRP/producer_blank.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/WSRP/producer_default.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/wsrp/producer_default.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/WSRP/producer_default.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/WSRP/producer_email.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/wsrp/producer_email.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/WSRP/producer_email.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/WSRP/producer_registration.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/wsrp/producer_registration.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/WSRP/producer_registration.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: portal/trunk/docs/reference-guide/en/images/WSRP/result.png (from rev 2600, portal/trunk/docs/reference-guide/en/images/wsrp/result.png)
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/WSRP/result.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Deleted: portal/trunk/docs/reference-guide/en/images/cas.png
===================================================================
(Binary files differ)
Deleted: portal/trunk/docs/reference-guide/en/images/gatein_logo.png
===================================================================
(Binary files differ)
Deleted: portal/trunk/docs/reference-guide/en/images/image3.jpg
===================================================================
(Binary files differ)
Deleted: portal/trunk/docs/reference-guide/en/images/opensso-shot.png
===================================================================
(Binary files differ)
Deleted: portal/trunk/docs/reference-guide/en/images/opensso.png
===================================================================
(Binary files differ)
Deleted: portal/trunk/docs/reference-guide/en/images/portal.gif
===================================================================
(Binary files differ)
Deleted: portal/trunk/docs/reference-guide/en/images/windowStyles.png
===================================================================
(Binary files differ)
Modified: portal/trunk/docs/reference-guide/en/master.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/master.xml 2010-04-13 17:57:22 UTC (rev 2606)
+++ portal/trunk/docs/reference-guide/en/master.xml 2010-04-13 19:04:18 UTC (rev 2607)
@@ -14,10 +14,10 @@
-->
<mediaobject>
<imageobject role="html">
- <imagedata fileref="images/gatein_logo.png" format="PNG" align="center"/>
+ <imagedata fileref="images/Common/gatein_logo.png" format="PNG" align="center"/>
</imageobject>
<imageobject role="fo">
- <imagedata fileref="images/gatein_logo.png" format="PNG" align="center"/>
+ <imagedata fileref="images/Common/gatein_logo.png" format="PNG" align="center"/>
</imageobject>
</mediaobject>
Modified: portal/trunk/docs/reference-guide/en/modules/AuthenticationAndIdentity/SSO.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/AuthenticationAndIdentity/SSO.xml 2010-04-13 17:57:22 UTC (rev 2606)
+++ portal/trunk/docs/reference-guide/en/modules/AuthenticationAndIdentity/SSO.xml 2010-04-13 19:04:18 UTC (rev 2607)
@@ -188,7 +188,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/cas.png" format="PNG" width="444" />
+ <imagedata fileref="images/AuthenticationAndIdentity/SSO/cas.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</step>
@@ -389,7 +389,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/opensso.png" format="PNG" width="444" />
+ <imagedata fileref="images/AuthenticationAndIdentity/SSO/opensso.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</step>
@@ -622,7 +622,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/opensso-shot.png" format="PNG" />
+ <imagedata fileref="images/AuthenticationAndIdentity/SSO/opensso-shot.png" format="PNG" />
</imageobject>
</mediaobject>
</step>
Modified: portal/trunk/docs/reference-guide/en/modules/GadgetDevelopment/Gadgets.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/GadgetDevelopment/Gadgets.xml 2010-04-13 17:57:22 UTC (rev 2606)
+++ portal/trunk/docs/reference-guide/en/modules/GadgetDevelopment/Gadgets.xml 2010-04-13 19:04:18 UTC (rev 2607)
@@ -21,7 +21,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Calendar.png" format="PNG" />
+ <imagedata fileref="images/GadgetDevelopment/Calendar.png" format="PNG" />
</imageobject>
</mediaobject>
</listitem>
@@ -34,7 +34,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Todo.png" format="PNG" />
+ <imagedata fileref="images/GadgetDevelopment/Todo.png" format="PNG" />
</imageobject>
</mediaobject>
</listitem>
@@ -47,7 +47,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Calculator.png" format="PNG" />
+ <imagedata fileref="images/GadgetDevelopment/Calculator.png" format="PNG" />
</imageobject>
</mediaobject>
</listitem>
@@ -60,7 +60,7 @@
</para>
<!-- <mediaobject>
<imageobject>
- <imagedata fileref="images/RSS.png" format="PNG"></imagedata>
+ <imagedata fileref="images/GadgetDevelopment/RSS.png" format="PNG"></imagedata>
</imageobject>
</mediaobject> -->
</listitem>
@@ -83,7 +83,7 @@
<title>Existing Gadgets</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Liste.png" format="PNG" width="444" />
+ <imagedata fileref="images/GadgetDevelopment/Liste.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</section>
@@ -92,7 +92,7 @@
<title>Create a new Gadget</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/New.png" format="PNG" width="444" />
+ <imagedata fileref="images/GadgetDevelopment/New.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</section>
@@ -104,7 +104,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Import.png" format="PNG" width="444" />
+ <imagedata fileref="images/GadgetDevelopment/Import.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</section>
@@ -116,7 +116,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Imported.png" format="PNG" width="444" />
+ <imagedata fileref="images/GadgetDevelopment/Imported.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</section>
@@ -128,7 +128,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/EditImportedOnline.png" format="PNG" width="444" />
+ <imagedata fileref="images/GadgetDevelopment/EditImportedOnline.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</section>
@@ -140,7 +140,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/EditImportedWebDAV.png" format="PNG" width="444" />
+ <imagedata fileref="images/GadgetDevelopment/EditImportedWebDAV.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</section>
@@ -152,7 +152,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Dashboard.png" format="PNG" width="444" />
+ <imagedata fileref="images/GadgetDevelopment/Dashboard.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</section>
Modified: portal/trunk/docs/reference-guide/en/modules/PortalDevelopment/Skinning.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/PortalDevelopment/Skinning.xml 2010-04-13 17:57:22 UTC (rev 2606)
+++ portal/trunk/docs/reference-guide/en/modules/PortalDevelopment/Skinning.xml 2010-04-13 19:04:18 UTC (rev 2607)
@@ -264,7 +264,7 @@
<para><mediaobject>
<imageobject>
- <imagedata fileref="images/windowStyles.png" format="PNG"
+ <imagedata fileref="images/PortalDevelopment/Skinning/windowStyles.png" format="PNG"
width="444" />
</imageobject>
</mediaobject></para>
Modified: portal/trunk/docs/reference-guide/en/modules/PortletDevelopment/Standard.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/PortletDevelopment/Standard.xml 2010-04-13 17:57:22 UTC (rev 2606)
+++ portal/trunk/docs/reference-guide/en/modules/PortletDevelopment/Standard.xml 2010-04-13 19:04:18 UTC (rev 2607)
@@ -33,7 +33,7 @@
<para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/tutorials/SpecPortalDef.png" format="PNG" scalefit="1" width="444" />
+ <imagedata fileref="images/PortletDevelopment/Standard/SpecPortalDef.png" format="PNG" scalefit="1" width="444" />
</imageobject>
</mediaobject>
</para>
@@ -159,7 +159,7 @@
<mediaobject>
<imageobject>
<objectinfo id="obje-Reference_Guide-Compiling-SimplestHelloWorldPortlet_deployed_on_a_new_page"><title>SimplestHelloWorldPortlet deployed on a new page</title>
- </objectinfo><imagedata fileref="images/tutorials/first_portlet/deployed.png" format="PNG" width="444" />
+ </objectinfo><imagedata fileref="images/PortletDevelopment/Standard/first_portlet/deployed.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</step>
@@ -416,7 +416,7 @@
<mediaobject>
<imageobject>
- <imagedata align="center" fileref="images/tutorials/jsp_portlet/output.png" format="PNG" scalefit="1" width="444" />
+ <imagedata align="center" fileref="images/PortletDevelopment/Standard/jsp_portlet/output.png" format="PNG" scalefit="1" width="444" />
</imageobject>
</mediaobject>
<note>
@@ -698,7 +698,7 @@
In the third method the action phase is triggered first then the render phase is triggered, which outputs some content back to the web browser based on the available render parameters.
<mediaobject>
<imageobject>
- <imagedata fileref="images/tutorials/jsp_portlet/process.png" format="PNG" scalefit="1" width="444" />
+ <imagedata fileref="images/PortletDevelopment/Standard/jsp_portlet/process.png" format="PNG" scalefit="1" width="444" />
</imageobject>
</mediaobject>
</para>
Modified: portal/trunk/docs/reference-guide/en/modules/WSRP.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/WSRP.xml 2010-04-13 17:57:22 UTC (rev 2606)
+++ portal/trunk/docs/reference-guide/en/modules/WSRP.xml 2010-04-13 19:04:18 UTC (rev 2607)
@@ -316,7 +316,7 @@
well, you should see something similar to this:
<mediaobject>
<imageobject>
- <imagedata fileref="images/wsrp/config_init.png" format="PNG" align="center" valign="middle"
+ <imagedata fileref="images/WSRP/config_init.png" format="PNG" align="center" valign="middle"
scalefit="1"/>
</imageobject>
</mediaobject>
@@ -335,7 +335,7 @@
the "Create a consumer named:" field then click on "Create consumer":
<mediaobject>
<imageobject>
- <imagedata fileref="images/wsrp/config_create.png" format="PNG" align="center" valign="middle"
+ <imagedata fileref="images/WSRP/config_create.png" format="PNG" align="center" valign="middle"
scalefit="1"/>
</imageobject>
</mediaobject>
@@ -344,7 +344,7 @@
and press the "Refresh & Save" button:
<mediaobject>
<imageobject>
- <imagedata fileref="images/wsrp/config_usewsdl.png" format="PNG" align="center" valign="middle"
+ <imagedata fileref="images/WSRP/config_usewsdl.png" format="PNG" align="center" valign="middle"
scalefit="1"/>
</imageobject>
</mediaobject>
@@ -354,7 +354,7 @@
property named<literal>registration/consumerRole</literal>:
<mediaobject>
<imageobject>
- <imagedata fileref="images/wsrp/config_refresh.png" format="PNG" align="center" valign="middle"
+ <imagedata fileref="images/WSRP/config_refresh.png" format="PNG" align="center" valign="middle"
scalefit="1"/>
</imageobject>
</mediaobject>
@@ -368,7 +368,7 @@
see something similar to:
<mediaobject>
<imageobject>
- <imagedata fileref="images/wsrp/config_end.png" format="PNG" align="center" valign="middle"
+ <imagedata fileref="images/WSRP/config_end.png" format="PNG" align="center" valign="middle"
scalefit="1"/>
</imageobject>
</mediaobject>
@@ -385,7 +385,7 @@
producer:
<mediaobject>
<imageobject>
- <imagedata fileref="images/wsrp/config_self.png" format="PNG" align="center" valign="middle"
+ <imagedata fileref="images/WSRP/config_self.png" format="PNG" align="center" valign="middle"
scalefit="1"/>
</imageobject>
</mediaobject>
@@ -443,7 +443,7 @@
you should see something similar to this:
<mediaobject>
<imageobject>
- <imagedata fileref="images/wsrp/portlets.png" format="PNG" align="center" valign="middle"
+ <imagedata fileref="images/WSRP/portlets.png" format="PNG" align="center" valign="middle"
scalefit="1"/>
</imageobject>
</mediaobject>
@@ -463,7 +463,7 @@
we just configured. Select it and click on "View portlets". You should now see something similar to:
<mediaobject>
<imageobject>
- <imagedata fileref="images/wsrp/bea.png" format="PNG" align="center" valign="middle" scalefit="1"/>
+ <imagedata fileref="images/WSRP/bea.png" format="PNG" align="center" valign="middle" scalefit="1"/>
</imageobject>
</mediaobject>
</para>
@@ -474,7 +474,7 @@
you should see something similar to below for this portlet:
<mediaobject>
<imageobject>
- <imagedata fileref="images/wsrp/result.png" format="PNG" align="center" valign="middle"/>
+ <imagedata fileref="images/WSRP/result.png" format="PNG" align="center" valign="middle"/>
</imageobject>
</mediaobject>
</para>
@@ -765,7 +765,7 @@
service level. This gave us access to three portlets as shown here:
<mediaobject>
<imageobject>
- <imagedata fileref="images/wsrp/bea.png" format="png" align="center" valign="middle" scalefit="1"/>
+ <imagedata fileref="images/WSRP/bea.png" format="png" align="center" valign="middle" scalefit="1"/>
</imageobject>
</mediaobject>
</para>
@@ -782,7 +782,7 @@
instead of<literal>public</literal>:
<mediaobject>
<imageobject>
- <imagedata fileref="images/wsrp/modify_reg_start.png" format="png" align="center" valign="middle"
+ <imagedata fileref="images/WSRP/modify_reg_start.png" format="png" align="center" valign="middle"
scalefit="1"/>
</imageobject>
</mediaobject>
@@ -790,7 +790,7 @@
let you send this new data to the remote producer:
<mediaobject>
<imageobject>
- <imagedata fileref="images/wsrp/modify_reg_modify.png" format="png" align="center"
+ <imagedata fileref="images/WSRP/modify_reg_modify.png" format="png" align="center"
valign="middle" scalefit="1"/>
</imageobject>
</mediaobject>
@@ -798,7 +798,7 @@
the remote producer, you should see something similar to:
<mediaobject>
<imageobject>
- <imagedata fileref="images/wsrp/modify_reg_end.png" format="png" align="center" valign="middle"
+ <imagedata fileref="images/WSRP/modify_reg_end.png" format="png" align="center" valign="middle"
scalefit="1"/>
</imageobject>
</mediaobject>
@@ -808,7 +808,7 @@
new portlets are now available:
<mediaobject>
<imageobject>
- <imagedata fileref="images/wsrp/bea_insider.png" format="png" align="center" valign="middle"
+ <imagedata fileref="images/WSRP/bea_insider.png" format="png" align="center" valign="middle"
scalefit="1"/>
</imageobject>
</mediaobject>
@@ -830,7 +830,7 @@
the configuration screen for this producer, you should see:
<mediaobject>
<imageobject>
- <imagedata fileref="images/wsrp/config_self.png" format="png" align="center" valign="middle"
+ <imagedata fileref="images/WSRP/config_self.png" format="png" align="center" valign="middle"
scalefit="1"/>
</imageobject>
</mediaobject>
@@ -844,7 +844,7 @@
the consumer by pressing "Refresh & Save":
<mediaobject>
<imageobject>
- <imagedata fileref="images/wsrp/modify_reg_self.png" format="png" align="center" valign="middle"
+ <imagedata fileref="images/WSRP/modify_reg_self.png" format="png" align="center" valign="middle"
scalefit="1"/>
</imageobject>
</mediaobject>
@@ -857,7 +857,7 @@
data, you should see something similar to:
<mediaobject>
<imageobject>
- <imagedata fileref="images/wsrp/modify_reg_self_end.png" format="png" align="center"
+ <imagedata fileref="images/WSRP/modify_reg_self_end.png" format="png" align="center"
valign="middle" scalefit="1"/>
</imageobject>
</mediaobject>
@@ -882,7 +882,7 @@
Several operations are available from the consumer list view of the WSRP configuration portlet:
<mediaobject>
<imageobject>
- <imagedata fileref="images/wsrp/consumer_operations.png" format="png" align="center" valign="middle"
+ <imagedata fileref="images/WSRP/consumer_operations.png" format="png" align="center" valign="middle"
scalefit="1"/>
</imageobject>
</mediaobject>
@@ -920,7 +920,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/wsrp/erase_registration.png" format="png" align="center" valign="middle"/>
+ <imagedata fileref="images/WSRP/erase_registration.png" format="png" align="center" valign="middle"/>
</imageobject>
</mediaobject>
<para>
@@ -930,7 +930,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/wsrp/erase_registration_warning.png" format="png" align="center"
+ <imagedata fileref="images/WSRP/erase_registration_warning.png" format="png" align="center"
valign="middle"/>
</imageobject>
</mediaobject>
@@ -975,7 +975,7 @@
should see with the default configuration:
<mediaobject>
<imageobject>
- <imagedata fileref="images/wsrp/producer_default.png" format="png" align="center" valign="middle"
+ <imagedata fileref="images/WSRP/producer_default.png" format="png" align="center" valign="middle"
scalefit="1"/>
</imageobject>
</mediaobject>
@@ -999,7 +999,7 @@
state:
<mediaobject>
<imageobject>
- <imagedata fileref="images/wsrp/producer_blank.png" format="png" align="center" valign="middle"
+ <imagedata fileref="images/WSRP/producer_blank.png" format="png" align="center" valign="middle"
scalefit="1"/>
</imageobject>
</mediaobject>
@@ -1010,7 +1010,7 @@
registrations."). The screen should now refresh and display:
<mediaobject>
<imageobject>
- <imagedata fileref="images/wsrp/producer_registration.png" format="png" align="center"
+ <imagedata fileref="images/WSRP/producer_registration.png" format="png" align="center"
valign="middle" scalefit="1"/>
</imageobject>
</mediaobject>
@@ -1026,7 +1026,7 @@
purpose:
<mediaobject>
<imageobject>
- <imagedata fileref="images/wsrp/producer_email.png" format="png" align="center" valign="middle"
+ <imagedata fileref="images/WSRP/producer_email.png" format="png" align="center" valign="middle"
scalefit="1"/>
</imageobject>
</mediaobject>
14 years, 2 months
- 1
- 0
gatein SVN: r2606 - portal/trunk/docs/reference-guide/en/modules.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-13 13:57:22 -0400 (Tue, 13 Apr 2010)
New Revision: 2606
Modified:
portal/trunk/docs/reference-guide/en/modules/PortalDevelopment.xml
Log:
Minor
Modified: portal/trunk/docs/reference-guide/en/modules/PortalDevelopment.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/PortalDevelopment.xml 2010-04-13 15:10:33 UTC (rev 2605)
+++ portal/trunk/docs/reference-guide/en/modules/PortalDevelopment.xml 2010-04-13 17:57:22 UTC (rev 2606)
@@ -4,7 +4,7 @@
%BOOK_ENTITIES;
]>
<chapter id="chap-Reference_Guide-Development">
- <title>Development</title>
+ <title>Portal Development</title>
<xi:include href="PortalDevelopment/Foundations.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="PortalDevelopment/Skinning.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="PortalDevelopment/PortalLifecycle.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
14 years, 2 months
- 1
- 0
gatein SVN: r2604 - portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-13 11:09:27 -0400 (Tue, 13 Apr 2010)
New Revision: 2604
Modified:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/Reference_Guide.xml
Log:
Reorg Reference guide
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/Reference_Guide.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/Reference_Guide.xml 2010-04-13 13:08:58 UTC (rev 2603)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/Reference_Guide.xml 2010-04-13 15:09:27 UTC (rev 2604)
@@ -6,15 +6,14 @@
<book>
<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
<xi:include href="modules/Introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="modules/Configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- <xi:include href="modules/Integration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/Foundations.xml"/>
- <xi:include href="modules/SSO.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="modules/Development.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="modules/Portlets.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="modules/Gadgets.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/WSRP.xml"/>
+ <xi:include href="modules/PortalDevelopment.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="modules/PortletDevelopment.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="modules/GadgetDevelopment.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="modules/AuthenticationAndIdentity.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="modules/WSRP.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
<xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<index />
</book>
14 years, 2 months
- 1
- 0