gatein SVN: r6670 - epp/docs/branches/5.1/Site_Publisher/Release_Notes/en-US.
by do-not-reply＠jboss.org
Author: smumford
Date: 2011-06-16 19:44:35 -0400 (Thu, 16 Jun 2011)
New Revision: 6670
Modified:
epp/docs/branches/5.1/Site_Publisher/Release_Notes/en-US/Article_Info.xml
epp/docs/branches/5.1/Site_Publisher/Release_Notes/en-US/Revision_History.xml
epp/docs/branches/5.1/Site_Publisher/Release_Notes/en-US/resolved_issues.xml
Log:
Updated with fixes from eXo changelog
Modified: epp/docs/branches/5.1/Site_Publisher/Release_Notes/en-US/Article_Info.xml
===================================================================
--- epp/docs/branches/5.1/Site_Publisher/Release_Notes/en-US/Article_Info.xml 2011-06-16 13:29:45 UTC (rev 6669)
+++ epp/docs/branches/5.1/Site_Publisher/Release_Notes/en-US/Article_Info.xml 2011-06-16 23:44:35 UTC (rev 6670)
@@ -9,7 +9,7 @@
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.1</productnumber>
<edition>1</edition>
- <pubsnumber>1.2</pubsnumber>
+ <pubsnumber>1.3</pubsnumber>
<abstract>
<para>
These release notes contain important information related to JBoss Site Publisher &VZ; that may not be currently available in the Product Manuals. You should read these Release Notes in their entirety before installing the product.
Modified: epp/docs/branches/5.1/Site_Publisher/Release_Notes/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/5.1/Site_Publisher/Release_Notes/en-US/Revision_History.xml 2011-06-16 13:29:45 UTC (rev 6669)
+++ epp/docs/branches/5.1/Site_Publisher/Release_Notes/en-US/Revision_History.xml 2011-06-16 23:44:35 UTC (rev 6670)
@@ -8,6 +8,20 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>1-1.3</revnumber>
+ <date>Wed Jun 15 2011</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Added 'Issues Fixed Upstream' section and populated with eXo ECMS fixes.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>1-1.2</revnumber>
<date>Thu Jun 02 2011</date>
<author>
Modified: epp/docs/branches/5.1/Site_Publisher/Release_Notes/en-US/resolved_issues.xml
===================================================================
--- epp/docs/branches/5.1/Site_Publisher/Release_Notes/en-US/resolved_issues.xml 2011-06-16 13:29:45 UTC (rev 6669)
+++ epp/docs/branches/5.1/Site_Publisher/Release_Notes/en-US/resolved_issues.xml 2011-06-16 23:44:35 UTC (rev 6670)
@@ -9,7 +9,7 @@
<term><ulink type="http" url="https://jira.exoplatform.org/browse/ECMS-2248"></ulink></term>
<listitem>
<para>
- <remark>DOCS NOTE: Does not present in my EPP 5.1 instance</remark>
+ <remark>DOCS NOTE: This works as expected in my EPP 5.1 instance (downloaded from CSP 15 June)</remark>
</para>
<para>
A bug that prevented users from logging in using the pre-formatted URL <ulink type="http" url="http://localhost:8080/ecmdemo/login?username=john&password=gtn&in..."></ulink> has been corrected with an upstream patch.
@@ -31,7 +31,7 @@
<term><ulink type="http" url="https://jira.exoplatform.org/browse/ECMS-1688"></ulink></term>
<listitem>
<para>
- A bug which prevented custom gadget <filename>.war</filename> files from being successfully imported through the <application>Application Registry</application> of the <literal>ecmdemo</literal> domain has been corrected.
+ A bug which prevented custom <filename>.war</filename> files from being successfully imported through the <application>Application Registry</application> of the <literal>ecmdemo</literal> domain has been corrected.
</para>
</listitem>
</varlistentry>
@@ -39,7 +39,7 @@
<term><ulink type="http" url="https://jira.exoplatform.org/browse/ECMS-1890"></ulink></term>
<listitem>
<para>
- <remark>DOCS NOTE: Does not present in my EPP 5.1 instance</remark>
+ <remark>DOCS NOTE: Does not present in my EPP 5.1 instance (downloaded from CSP 15 June)</remark>
</para>
<para>
A bug resulting in an <literal>Unexpected Error</literal> encountered when adding a document to <parameter>/exo:ecm/exo:taxonomyTrees/definition/acme</parameter> has been resolved.
@@ -74,7 +74,7 @@
<term><ulink type="http" url="https://jira.exoplatform.org/browse/ECMS-1980"></ulink></term>
<listitem>
<para>
- A code bug prevented <filename>PDF</filename> files attached to <literal>Article</literal> documents from being viewable in the <literal>Content Detail Portlet</literal>. This has been corrected with an upstream patch.
+ A code bug prevented <filename>PDF</filename> files attached to <literal>Article</literal> documents from being viewable in the <emphasis>Content Detail Portlet</emphasis>. This has been corrected with an upstream patch.
</para>
</listitem>
</varlistentry>
@@ -82,7 +82,7 @@
<term><ulink type="http" url="https://jira.exoplatform.org/browse/ECMS-1981"></ulink></term>
<listitem>
<para>
- A bug was encountered that caused the <emphasis>Content by URL</emphasis> portlet to, in some instances, display incorrect content to public users. For instance; the URL pointing to <emphasis>document1</emphasis> might correctly show <emphasis>document1</emphasis> in one browser window, while the same URL might incorrectly present <emphasis>document2</emphasis> in another window.
+ A bug was encountered that caused the <emphasis>Content by URL</emphasis> portlet to, in some instances, display incorrect content to public users. For instance; the URL pointing to <filename>document1</filename> might correctly show <filename>document1</filename> in one browser window, while the same URL might incorrectly present <filename>document2</filename> in a different browser tab or window.
</para>
<para>
An upstream patch has resolved this issue.
@@ -119,9 +119,6 @@
<para>
Upstream patches have corrected code bugs that resulted in multi-valued <emphasis>WYSIWYG</emphasis> fields being uneditable and set to <parameter>null</parameter>.
</para>
- <para>
- <remark>Does this apply only to the FCK Editor (which isn't in Site Publisher) or do other components have WYSIWYG fields?</remark>
- </para>
</listitem>
</varlistentry>
<varlistentry>
@@ -152,7 +149,7 @@
<term><ulink type="http" url="https://jira.exoplatform.org/browse/ECMS-1446"></ulink></term>
<listitem>
<para>
- A bug that prevented the <emphasis>Manage Lock</emphasis> list from updating with a group selected in <emphasis>Group Management</emphasis> has been corrected in a upstream patch.
+ A bug that prevented the <emphasis>Manage Lock</emphasis> list from updating with a group added to the lock list in <emphasis>Group Management</emphasis> has been corrected in a upstream patch.
</para>
</listitem>
</varlistentry>
@@ -193,7 +190,7 @@
<term><ulink type="http" url="https://jira.exoplatform.org/browse/ECMS-1782"></ulink></term>
<listitem>
<para>
- A bug which resulted in newly added node properties not appearing on the property list has been corrected in an upstream patch.
+ A bug which resulted in newly added node properties not appearing in the property list has been corrected in an upstream patch.
</para>
</listitem>
</varlistentry>
@@ -218,7 +215,7 @@
<term><ulink type="http" url="https://jira.exoplatform.org/browse/ECMS-1836"></ulink></term>
<listitem>
<para>
- A bug which produced an error pop-up when attempting to view an uploaded image while in "<emphasis>jailed</emphasis> mode has been corrected in an upstream patch.
+ A bug which produced an error pop-up when attempting to view an uploaded image while in "<emphasis>jailed</emphasis>" mode has been corrected in an upstream patch.
</para>
</listitem>
</varlistentry>
@@ -242,7 +239,7 @@
<term><ulink type="http" url="https://jira.exoplatform.org/browse/ECMS-1857"></ulink></term>
<listitem>
<para>
- A code bug was found to revert the mode selector in the administration bar from <emphasis>Edit</emphasis> to <emphasis>Published</emphasis> when the user switched from one site to another, while the <guilabel>edit</guilabel> buttons remained visible on page elements. This bug has been corrected in an upstream patch.
+ A code bug was found to revert the mode selector in the administration bar from <emphasis>Edit</emphasis> to <emphasis>Published</emphasis> when the user switched from one site to another, even though the <guilabel>edit</guilabel> buttons remained visible on page elements. This bug has been corrected in an upstream patch.
</para>
</listitem>
</varlistentry>
@@ -258,7 +255,7 @@
<term><ulink type="http" url="https://jira.exoplatform.org/browse/ECMS-1862"></ulink></term>
<listitem>
<para>
- A bug in the code caused Site Publisher to attempt to open a new page from the last opened folder/ rather than the correct file path. This caused an exception to be thrown in the console. This bug has been corrected in an upstream patch.
+ A bug in the code caused Site Publisher to attempt to open a new page from the last opened folder rather than the correct file path. This caused an exception to be thrown in the console. This bug has been corrected in an upstream patch.
</para>
</listitem>
</varlistentry>
@@ -266,7 +263,7 @@
<term><ulink type="http" url="https://jira.exoplatform.org/browse/ECMS-1863"></ulink></term>
<listitem>
<para>
- A bug which caused Site Publisher to thow an exception when a user attempted to create and use a Category which contained an accented character has been corrected in an upstream patch.
+ A bug which caused Site Publisher to thow an exception when a user attempted to create and use a <emphasis>Category</emphasis> which contained an accented character has been corrected in an upstream patch.
</para>
</listitem>
</varlistentry>
@@ -282,7 +279,7 @@
<term><ulink type="http" url="https://jira.exoplatform.org/browse/ECMS-1868"></ulink></term>
<listitem>
<para>
- A bug which caused published content in CLV portlets to remain visible and accessible even after it had been deleted has been corrected in an upstream patch.
+ A bug which caused published content in <emphasis>CLV</emphasis> portlets to remain visible and accessible even after it had been deleted has been corrected in an upstream patch.
</para>
</listitem>
</varlistentry>
@@ -303,34 +300,34 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><ulink type="http" url="https://jira.exoplatform.org/browse/ECMS-1882"></ulink></term>
+ <term><ulink type="http" url="https://jira.exoplatform.org/browse/ECMS-1887"></ulink></term>
<listitem>
<para>
- A bug which threw an exception after a user attemped to access a Newsletter category after having deleted a newsletter from that category has been corrected in an upstream patch.
+ A bug that prevented commenting on documents when using IE7 has been corrected.
</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><ulink type="http" url="https://jira.exoplatform.org/browse/ECMS-1885"></ulink></term>
+ <term><ulink type="http" url="https://jira.exoplatform.org/browse/ECMS-1882"></ulink></term>
<listitem>
<para>
- A bug which prevented a node that was locked by a user from being ulocked by an administrator has been corrected in an upstream patch.
+ A bug which threw an exception after a user attemped to access a Newsletter category after having deleted a newsletter from that category has been corrected in an upstream patch.
</para>
</listitem>
</varlistentry>
- <varlistentry>
- <term><ulink type="http" url="https://jira.exoplatform.org/browse/ECMS-1887"></ulink></term>
+ <varlistentry>
+ <term><ulink type="http" url="https://jira.exoplatform.org/browse/ECMS-1916"></ulink></term>
<listitem>
<para>
- A bug that prevented commenting on documents when using IE7 has been corrected.
+ A bug which prevented newly created documents from appearing in simple searches has been corrected.
</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><ulink type="http" url="https://jira.exoplatform.org/browse/ECMS-1916"></ulink></term>
+ <term><ulink type="http" url="https://jira.exoplatform.org/browse/ECMS-1885"></ulink></term>
<listitem>
<para>
- A bug which prevented newly created documents from appearing in simple searches has been corrected.
+ A bug which prevented a node that was locked by a user from being ulocked by an administrator has been corrected in an upstream patch.
</para>
</listitem>
</varlistentry>
14 years, 3 months
- 1
- 0
gatein SVN: r6669 - in components/pc/trunk/test/servers: jboss51 and 3 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-06-16 09:29:45 -0400 (Thu, 16 Jun 2011)
New Revision: 6669
Modified:
components/pc/trunk/test/servers/jboss42/pom.xml
components/pc/trunk/test/servers/jboss51/pom.xml
components/pc/trunk/test/servers/jboss6/pom.xml
components/pc/trunk/test/servers/jetty6/pom.xml
components/pc/trunk/test/servers/tomcat6/pom.xml
Log:
fix broken build
Modified: components/pc/trunk/test/servers/jboss42/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss42/pom.xml 2011-06-16 08:26:41 UTC (rev 6668)
+++ components/pc/trunk/test/servers/jboss42/pom.xml 2011-06-16 13:29:45 UTC (rev 6669)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Beta02-SNAPSHOT</version>
+ <version>2.3.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jboss42</artifactId>
Modified: components/pc/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss51/pom.xml 2011-06-16 08:26:41 UTC (rev 6668)
+++ components/pc/trunk/test/servers/jboss51/pom.xml 2011-06-16 13:29:45 UTC (rev 6669)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Beta02-SNAPSHOT</version>
+ <version>2.3.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jboss51</artifactId>
@@ -165,7 +165,7 @@
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-core</artifactId>
- <version>2.3.0-Beta02-SNAPSHOT</version>
+ <version>2.3.0-Beta04-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified: components/pc/trunk/test/servers/jboss6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss6/pom.xml 2011-06-16 08:26:41 UTC (rev 6668)
+++ components/pc/trunk/test/servers/jboss6/pom.xml 2011-06-16 13:29:45 UTC (rev 6669)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Beta02-SNAPSHOT</version>
+ <version>2.3.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jboss6</artifactId>
@@ -165,7 +165,7 @@
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-core</artifactId>
- <version>2.3.0-Beta02-SNAPSHOT</version>
+ <version>2.3.0-Beta04-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified: components/pc/trunk/test/servers/jetty6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jetty6/pom.xml 2011-06-16 08:26:41 UTC (rev 6668)
+++ components/pc/trunk/test/servers/jetty6/pom.xml 2011-06-16 13:29:45 UTC (rev 6669)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Beta02-SNAPSHOT</version>
+ <version>2.3.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jetty6</artifactId>
@@ -171,7 +171,7 @@
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-core</artifactId>
- <version>2.3.0-Beta02-SNAPSHOT</version>
+ <version>2.3.0-Beta04-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified: components/pc/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/pom.xml 2011-06-16 08:26:41 UTC (rev 6668)
+++ components/pc/trunk/test/servers/tomcat6/pom.xml 2011-06-16 13:29:45 UTC (rev 6669)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Beta02-SNAPSHOT</version>
+ <version>2.3.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-tomcat6</artifactId>
@@ -165,7 +165,7 @@
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-core</artifactId>
- <version>2.3.0-Beta02-SNAPSHOT</version>
+ <version>2.3.0-Beta04-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
14 years, 3 months
- 1
- 0
gatein SVN: r6667 - in epp/docs/branches/5.1/Reference_Guide/en-US: fallback_content and 9 other directories.
by do-not-reply＠jboss.org
Author: smumford
Date: 2011-06-16 00:58:24 -0400 (Thu, 16 Jun 2011)
New Revision: 6667
Removed:
epp/docs/branches/5.1/Reference_Guide/en-US/Middleware_Feedback.xml
Modified:
epp/docs/branches/5.1/Reference_Guide/en-US/Book_Info.xml
epp/docs/branches/5.1/Reference_Guide/en-US/Preface.xml
epp/docs/branches/5.1/Reference_Guide/en-US/Reference_Guide.xml
epp/docs/branches/5.1/Reference_Guide/en-US/fallback_content/Feedback.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/Foundations.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/configuration-persister.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/external-value-storages.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/intro.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/jbosscache-configuration-templates.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/jbossts-transaction-service.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/multilanguage-support.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/search-configuration.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/transaction-manager-lookup.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/AccessingUserProfile.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/AuthenticationTokenConfiguration.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/LDAP.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/OrganizationAPI.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/PredefinedUserConfiguration.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/Configuration.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/Configuration/DatabaseConfiguration.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/Configuration/EMailServiceConfiguration.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/GadgetDevelopment.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/GadgetDevelopment/Gadgets.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/GadgetDevelopment/SetupGadgetServer.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/Introduction.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalConfiguration.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalPermissionConfiguration.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/InternationalizationConfiguration.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/JavascriptConfiguration.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/JavascriptInterApplicationCommunication.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/PortalLifecycle.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/RTLFramework.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/XMLResourceBundles.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/configuration.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/overview.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/portlet_development.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/WSRP.xml
Log:
Added directory levels (../) to .ent declarations for Maven build
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/Book_Info.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/Book_Info.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -15,13 +15,23 @@
This Reference Guide is a high-level usage document. It deals with more advanced topics than the Installation and User Guides, adding new content or taking concepts discussed in the earlier documents further. It aims to provide supporting documentation for advanced users of the JBoss Enterprise Portal Platform product. Its primary focus is on advanced use of the product and it assumes an intermediate or advanced knowledge of the technology and terms.
</para>
</abstract>
- <corpauthor>
- <inlinemediaobject>
+ <corpauthor>
+ <inlinemediaobject>
<imageobject>
<imagedata fileref="Common_Content/images/title_logo.svg" format="SVG" />
</imageobject>
</inlinemediaobject>
</corpauthor>
- <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+ <!--FOR PUBLICAN -->
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="Common_Content/Legal_Notice.xml">
+ <!--FOR JDOCBOOK:-->
+ <xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude">
+ <xi:include href="fallback_content/Legal_Notice.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ </xi:fallback>
+ </xi:include>
+
<xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
</bookinfo>
Deleted: epp/docs/branches/5.1/Reference_Guide/en-US/Middleware_Feedback.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/Middleware_Feedback.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/Middleware_Feedback.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,52 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-]>
-
- <!--NOTE: THE FOLLOWING ENTITIES WILL NOT BE REPLACED IN YOUR BUGZILLA URL.
- YOU WILL NEED TO CORRECT THE URL MANUALLY.
- &PRODUCT_NAME; of the form "JBoss Enterprise Application Platform"
- &BZ_COMPONENT; of the form "doc-triage" (as listed in Bugzilla)
- &PRODUCT_VERSION; of the form "5.0.0" (as listed in Bugzilla, to minimise confusion)
- The above entities should be defined in your Book_Name.ent file so that
- this file can be included in your Publican Common Content directory and added to
- all Middleware books with minimal fuss.
-
- These entities should not affect translated documents, since Bugzilla is not localised.
- -->
-
-<section id="jboss-feedback">
- <title>Give us Feedback</title>
-
- <para>
- If you find a typographical error, or know how this guide can be improved, we would love to hear from you. Submit a report in Bugzilla against the &BOOKID;. The following link will take you to bug report for JBoss Enterprise Portal Platform <ulink type="http" url="https://bugzilla.redhat.com/enter_bug.cgi?product=JBoss%20Enterprise%20Po...">https://bugzilla.redhat.com/</ulink>.
- </para>
- <para>
- Select the document name and version number relevant to the document you found the error in from the available lists then complete the description with as much detail as you can provide.
- </para>
-
-<!-- <para>
- Fill out the following template and add it to Bugzilla's <literal>Description</literal> field. Be as specific as possible when describing the issue; this will help ensure that we can fix it quickly.
- </para>
-
- <screen>Document URL:
-
-
-Section Number and Name:
-
-
-Describe the issue:
-
-
-Suggestions for improvement:
-
-
-Additional information:
-
-
-</screen>-->
-
- <para>
- Be sure to give us your name so that you can receive full credit for reporting the issue.
- </para>
-
-</section>
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/Preface.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/Preface.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/Preface.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -5,16 +5,26 @@
]>
<preface id="pref-Reference_Guide-Preface">
<title>Preface</title>
-<!--FOR PUBLICAN -->
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Common_Content/Conventions.xml">
-<!--FOR JDOCBOOK:-->
- <xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude">
- <xi:include href="fallback_content/Conventions.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
- </xi:fallback>
-</xi:include>
+
+ <!--FOR PUBLICAN -->
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="Common_Content/Conventions.xml">
+ <!--FOR JDOCBOOK:-->
+ <xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude">
+ <xi:include href="fallback_content/Conventions.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ </xi:fallback>
+ </xi:include>
-<!--FOR PUBLICAN -->
-<xi:include href="Common_Content/Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude"><xi:include href="fallback_content/Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- </xi:fallback>
-</xi:include>
+ <!--FOR PUBLICAN -->
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="Common_Content/Feedback.xml">
+ <!--FOR JDOCBOOK:-->
+ <xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude">
+ <xi:include href="fallback_content/Feedback.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ </xi:fallback>
+ </xi:include>
+
+
</preface>
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/Reference_Guide.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/Reference_Guide.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/Reference_Guide.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -5,7 +5,7 @@
]>
<book status="draft">
<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="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/PortalDevelopment.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="modules/PortletDevelopment.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/fallback_content/Feedback.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/fallback_content/Feedback.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/fallback_content/Feedback.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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 "../Installation_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<section>
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/Foundations.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/Foundations.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/Foundations.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="chap-Reference_Guide-Foundations">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/configuration-persister.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/configuration-persister.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/configuration-persister.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/external-value-storages.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/external-value-storages.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/external-value-storages.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/intro.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/intro.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/intro.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-Reference_Guide-Introduction">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/jbosscache-configuration-templates.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/jbosscache-configuration-templates.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/jbosscache-configuration-templates.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-Reference_Guide-JBoss_Cache_configuration">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/jbossts-transaction-service.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/jbossts-transaction-service.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/jbossts-transaction-service.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-Reference_Guide-JBossTransactionsService">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-Reference_Guide-JDBC_Data_Container_Config">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-Reference_Guide-LockManager">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/multilanguage-support.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/multilanguage-support.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/multilanguage-support.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-Reference_Guide-Multilanguage_support_in_eXo_JCR_RDB_backend">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-Reference_Guide-QueryHandler_configuration">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/search-configuration.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/search-configuration.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/search-configuration.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-Reference_Guide-Search_Configuration">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-Reference_Guide-eXo_JCR_statistics">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/transaction-manager-lookup.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/transaction-manager-lookup.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/transaction-manager-lookup.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-Reference_Guide-TransactionManagerLookup">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="chap-Reference_Guide-eXo_JCR">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE part 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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<part id="part-Reference_Guide-Advanced_Development">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/AccessingUserProfile.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/AccessingUserProfile.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/AccessingUserProfile.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-Reference_Guide-Accessing_User_Profile">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/AuthenticationTokenConfiguration.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/AuthenticationTokenConfiguration.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/AuthenticationTokenConfiguration.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-Reference_Guide-Authentication_Token_Configuration">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-Reference_Guide-PicketLink_IDM_integration">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/LDAP.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/LDAP.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/LDAP.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,7 +1,7 @@
<?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" [
%BOOK_ENTITIES;
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
]>
<section id="sect-Reference_Guide-LDAP_Integration">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/OrganizationAPI.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/OrganizationAPI.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/OrganizationAPI.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-Reference_Guide-Organization_API">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/PredefinedUserConfiguration.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/PredefinedUserConfiguration.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/PredefinedUserConfiguration.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-Reference_Guide-Predefined_User_Configuration">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-Reference_Guide-SSO_Single_Sign_On">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="chap-Reference_Guide-Authentication_and_Identity">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Configuration/DatabaseConfiguration.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Configuration/DatabaseConfiguration.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Configuration/DatabaseConfiguration.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-Reference_Guide-Database_Configuration">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Configuration/EMailServiceConfiguration.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Configuration/EMailServiceConfiguration.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Configuration/EMailServiceConfiguration.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-Reference_Guide-E_Mail_Service_Configuration">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Configuration.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Configuration.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Configuration.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="chap-Reference_Guide-Configuration">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/GadgetDevelopment/Gadgets.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/GadgetDevelopment/Gadgets.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/GadgetDevelopment/Gadgets.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -2,7 +2,7 @@
<!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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-Reference_Guide-Concept">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/GadgetDevelopment/SetupGadgetServer.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/GadgetDevelopment/SetupGadgetServer.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/GadgetDevelopment/SetupGadgetServer.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -2,7 +2,7 @@
<!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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-Reference_Guide-Advanced_Gadget_Administration">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/GadgetDevelopment.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/GadgetDevelopment.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/GadgetDevelopment.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="chap-Reference_Guide-Gadgets">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Introduction.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Introduction.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Introduction.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="chap-Reference_Guide-Introduction">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalConfiguration.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalConfiguration.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalConfiguration.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="chap-Reference_Guide-Default_Portal_Configuration">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="chap-Reference_Guide-Portal_Navigation_Configuration">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalPermissionConfiguration.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalPermissionConfiguration.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalPermissionConfiguration.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="chap-Reference_Guide-Portal_Default_Permission_Configuration">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/InternationalizationConfiguration.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/InternationalizationConfiguration.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/InternationalizationConfiguration.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="chap-Reference_Guide-Internationalization_Configuration">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/JavascriptConfiguration.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/JavascriptConfiguration.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/JavascriptConfiguration.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/JavascriptInterApplicationCommunication.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/JavascriptInterApplicationCommunication.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/JavascriptInterApplicationCommunication.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="chap-Reference_Guide-JavaScript_Inter_Application_Communication">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/PortalLifecycle.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/PortalLifecycle.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/PortalLifecycle.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="chap-Reference_Guide-Portal_Life_cycle">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/RTLFramework.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/RTLFramework.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/RTLFramework.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="chap-Reference_Guide-Right_To_Left_RTL_Framework">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="chap-Reference_Guide-Skinning_the_Portal">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/XMLResourceBundles.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/XMLResourceBundles.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/XMLResourceBundles.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="chap-Reference_Guide-XML_Resources_Bundles">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE part 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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<part id="part-Reference_Guide-Portal_Development">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/configuration.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/configuration.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/configuration.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-Reference_Guide-Bridge_Configuration">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-Reference_Guide-Getting_started_with_JBoss_Portlet_Bridge">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/overview.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/overview.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/overview.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-Reference_Guide-JBoss_Portlet_Bridge_Overview">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/portlet_development.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/portlet_development.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/portlet_development.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-Reference_Guide-Developing_Portlets_with_the_Bridge">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="chap-Reference_Guide-Building_JSF_Portlets">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="chap-Reference_Guide-Portlet_Primer">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE part 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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<part id="part-Reference_Guide-Portlet_development">
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/WSRP.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/WSRP.xml 2011-06-16 00:08:14 UTC (rev 6666)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/WSRP.xml 2011-06-16 04:58:24 UTC (rev 6667)
@@ -1,6 +1,6 @@
<?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">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="chap-Reference_Guide-Web_Services_for_Remote_Portlets_WSRP">
@@ -69,7 +69,7 @@
The following list of support files uses the following notational devices:
</para>
<variablelist>
- <title></title>
+ <title>Notations:</title>
<varlistentry>
<term><replaceable>JBOSS_HOME</replaceable></term>
<listitem>
@@ -274,7 +274,7 @@
The WSDL file can be accessed at:
</para>
<variablelist>
- <title></title>
+ <title>File paths:</title>
<varlistentry>
<term>WSRP 1.0:</term>
<listitem>
@@ -881,7 +881,7 @@
</para>
</formalpara>
<variablelist>
- <title></title>
+ <title>Additional Functions:</title>
<varlistentry>
<term>Export</term>
<listitem>
@@ -960,7 +960,7 @@
This screen presents the list of available exports with available operations for each.
</para>
<variablelist>
- <title></title>
+ <title>Operations:</title>
<varlistentry>
<term>View</term>
<listitem>
14 years, 3 months
- 1
- 0
gatein SVN: r6666 - epp/docs/branches/5.1/Reference_Guide/en-US.
by do-not-reply＠jboss.org
Author: smumford
Date: 2011-06-15 20:08:14 -0400 (Wed, 15 Jun 2011)
New Revision: 6666
Removed:
epp/docs/branches/5.1/Reference_Guide/en-US/Common_Content/
Log:
Removing redundant Common_Content directory
14 years, 3 months
- 1
- 0
gatein SVN: r6665 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2011-06-15 17:55:32 -0400 (Wed, 15 Jun 2011)
New Revision: 6665
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java
Log:
GTNPORTAL-1935: update the UIPortletLifecycle to check if the windowstate or portletmode changes during a portletInvocation. If a change does occur, we need to broadcast the event with the new proper values.
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2011-06-15 19:29:16 UTC (rev 6664)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2011-06-15 21:55:32 UTC (rev 6665)
@@ -76,6 +76,9 @@
{
public static final String PORTLET_EVENTS = "PortletEvents";
+
+ public static final String CHANGE_WINDOW_STATE_EVENT = "PortletChangeWindowStateEvent";
+ public static final String CHANGE_PORTLET_MODE_EVENT = "ChangePortletModeEvent";
protected static Log log = ExoLogger.getLogger("portal:UIPortletActionListener");
@@ -753,11 +756,29 @@
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
pcontext.ignoreAJAXUpdateOnPortlets(true);
- String windowState = event.getRequestContext().getRequestParameter(Constants.PORTAL_WINDOW_STATE);
+ String windowState = null;
+
+ Object changeWindowStateAttribute = event.getRequestContext().getAttribute(CHANGE_WINDOW_STATE_EVENT);
+ if (changeWindowStateAttribute != null && changeWindowStateAttribute instanceof String)
+ {
+ windowState = (String)changeWindowStateAttribute;
+ }
+
if (windowState == null)
{
+ windowState = event.getRequestContext().getRequestParameter(Constants.PORTAL_WINDOW_STATE);
+ }
+ if (windowState == null)
+ {
windowState = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID).trim();
}
+
+ if (windowState == null)
+ {
+ windowState = uiPortlet.getCurrentWindowState().toString();
+ }
+
+
UIPageBody uiPageBody = uiPortlet.getAncestorOfType(UIPageBody.class);
UIPage uiPage = uiPortlet.getAncestorOfType(UIPage.class);
if (windowState.equals(WindowState.MAXIMIZED.toString()))
@@ -816,11 +837,27 @@
public void execute(Event<UIPortlet> event) throws Exception
{
UIPortlet uiPortlet = event.getSource();
- String portletMode = event.getRequestContext().getRequestParameter(Constants.PORTAL_PORTLET_MODE);
+
+ String portletMode = null;
+
+ Object changePortletModeAttribute = event.getRequestContext().getAttribute(CHANGE_PORTLET_MODE_EVENT);
+ if (changePortletModeAttribute != null && changePortletModeAttribute instanceof String)
+ {
+ portletMode = (String)changePortletModeAttribute;
+ }
+
if (portletMode == null)
{
+ portletMode = event.getRequestContext().getRequestParameter(Constants.PORTAL_PORTLET_MODE);
+ }
+ if (portletMode == null)
+ {
portletMode = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID);
}
+ if (portletMode == null)
+ {
+ portletMode = uiPortlet.getCurrentPortletMode().toString();
+ }
log.trace("Change portlet mode of " + uiPortlet.getPortletContext().getId() + " to " + portletMode);
if (portletMode.equals(PortletMode.HELP.toString()))
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2011-06-15 19:29:16 UTC (rev 6664)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2011-06-15 21:55:32 UTC (rev 6665)
@@ -83,6 +83,12 @@
{
try
{
+ //The PortletMode and WindowState can change during a portlet invocation, so we need
+ //to be able to compare the results before and after invoking the portlet to know if
+ //we need to broadcast a change event or not.
+ PortletMode currentPortletMode = uicomponent.getCurrentPortletMode();
+ WindowState currentWindowState = uicomponent.getCurrentWindowState();
+
String action = context.getRequestParameter(PortalRequestContext.UI_COMPONENT_ACTION);
if (action != null)
{
@@ -139,7 +145,27 @@
if (event != null)
event.broadcast();
}
-
+
+ //These two checks needs to go after the ProcessAction, ServeResource or Render broadcast events.
+ //The mode or state can change during the invocation and we need to be able to broadcast the change
+ //event if this occurs.
+ if (currentPortletMode != null && !currentPortletMode.equals(uicomponent.getCurrentPortletMode()))
+ {
+ context.setAttribute(UIPortletActionListener.CHANGE_PORTLET_MODE_EVENT, uicomponent.getCurrentPortletMode().toString());
+ Event<UIComponent> event = uicomponent.createEvent("ChangePortletMode", Event.Phase.PROCESS, context);
+ if (event != null)
+ event.broadcast();
+ context.setAttribute(UIPortletActionListener.CHANGE_PORTLET_MODE_EVENT, null);
+ }
+ if (currentWindowState != null && !currentWindowState.equals(uicomponent.getCurrentWindowState()))
+ {
+ context.setAttribute(UIPortletActionListener.CHANGE_WINDOW_STATE_EVENT, uicomponent.getCurrentWindowState().toString());
+ Event<UIComponent> event = uicomponent.createEvent("ChangeWindowState", Event.Phase.PROCESS, context);
+ if (event != null)
+ event.broadcast();
+ context.setAttribute(UIPortletActionListener.CHANGE_WINDOW_STATE_EVENT, null);
+ }
+
context.addUIComponentToUpdateByAjax(uicomponent);
}
catch (Exception e)
14 years, 3 months
- 1
- 0
gatein SVN: r6664 - in components/mop/trunk: api and 2 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-06-15 15:29:16 -0400 (Wed, 15 Jun 2011)
New Revision: 6664
Modified:
components/mop/trunk/api/pom.xml
components/mop/trunk/core/pom.xml
components/mop/trunk/pom.xml
components/mop/trunk/spi/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/mop/trunk/api/pom.xml
===================================================================
--- components/mop/trunk/api/pom.xml 2011-06-15 19:29:05 UTC (rev 6663)
+++ components/mop/trunk/api/pom.xml 2011-06-15 19:29:16 UTC (rev 6664)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.1.0-Beta05</version>
+ <version>1.1.0-Beta06-SNAPSHOT</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2011-06-15 19:29:05 UTC (rev 6663)
+++ components/mop/trunk/core/pom.xml 2011-06-15 19:29:16 UTC (rev 6664)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.1.0-Beta05</version>
+ <version>1.1.0-Beta06-SNAPSHOT</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2011-06-15 19:29:05 UTC (rev 6663)
+++ components/mop/trunk/pom.xml 2011-06-15 19:29:16 UTC (rev 6664)
@@ -34,16 +34,16 @@
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.1.0-Beta05</version>
+ <version>1.1.0-Beta06-SNAPSHOT</version>
<packaging>pom</packaging>
<name>GateIn - MOP</name>
<description>Model Object for Portal</description>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/tags/1.1.0-B...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/tags/1.1.0-Beta05</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/mop/tags/1.1.0-Beta05</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/</url>
</scm>
<dependencyManagement>
Modified: components/mop/trunk/spi/pom.xml
===================================================================
--- components/mop/trunk/spi/pom.xml 2011-06-15 19:29:05 UTC (rev 6663)
+++ components/mop/trunk/spi/pom.xml 2011-06-15 19:29:16 UTC (rev 6664)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.1.0-Beta05</version>
+ <version>1.1.0-Beta06-SNAPSHOT</version>
</parent>
<!-- ****************** -->
14 years, 3 months
- 1
- 0
gatein SVN: r6663 - components/mop/tags.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-06-15 15:29:05 -0400 (Wed, 15 Jun 2011)
New Revision: 6663
Added:
components/mop/tags/1.1.0-Beta05/
Log:
[maven-scm] copy for tag 1.1.0-Beta05
14 years, 3 months
- 1
- 0
gatein SVN: r6662 - in components/mop/trunk: api and 2 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-06-15 15:28:41 -0400 (Wed, 15 Jun 2011)
New Revision: 6662
Modified:
components/mop/trunk/api/pom.xml
components/mop/trunk/core/pom.xml
components/mop/trunk/pom.xml
components/mop/trunk/spi/pom.xml
Log:
[maven-release-plugin] prepare release 1.1.0-Beta05
Modified: components/mop/trunk/api/pom.xml
===================================================================
--- components/mop/trunk/api/pom.xml 2011-06-15 19:26:36 UTC (rev 6661)
+++ components/mop/trunk/api/pom.xml 2011-06-15 19:28:41 UTC (rev 6662)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.1.0-Beta05-SNAPSHOT</version>
+ <version>1.1.0-Beta05</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2011-06-15 19:26:36 UTC (rev 6661)
+++ components/mop/trunk/core/pom.xml 2011-06-15 19:28:41 UTC (rev 6662)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.1.0-Beta05-SNAPSHOT</version>
+ <version>1.1.0-Beta05</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2011-06-15 19:26:36 UTC (rev 6661)
+++ components/mop/trunk/pom.xml 2011-06-15 19:28:41 UTC (rev 6662)
@@ -34,16 +34,16 @@
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.1.0-Beta05-SNAPSHOT</version>
+ <version>1.1.0-Beta05</version>
<packaging>pom</packaging>
<name>GateIn - MOP</name>
<description>Model Object for Portal</description>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/tags/1.1.0-B...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/tags/1.1.0-Beta05</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/mop/tags/1.1.0-Beta05</url>
</scm>
<dependencyManagement>
Modified: components/mop/trunk/spi/pom.xml
===================================================================
--- components/mop/trunk/spi/pom.xml 2011-06-15 19:26:36 UTC (rev 6661)
+++ components/mop/trunk/spi/pom.xml 2011-06-15 19:28:41 UTC (rev 6662)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.1.0-Beta05-SNAPSHOT</version>
+ <version>1.1.0-Beta05</version>
</parent>
<!-- ****************** -->
14 years, 3 months
- 1
- 0
gatein SVN: r6661 - in components/mop/trunk: api/src/main/java/org/gatein/mop/api and 5 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-06-15 15:26:36 -0400 (Wed, 15 Jun 2011)
New Revision: 6661
Added:
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/AdapterRegistration.java
components/mop/trunk/core/src/test/resources/META-INF/services/org.gatein.mop.spi.AdapterLifeCycle
components/mop/trunk/spi/src/main/java/org/gatein/mop/spi/AdapterLifeCycle.java
Removed:
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/AdapterFactoryRegistration.java
components/mop/trunk/core/src/test/resources/META-INF/services/org.gatein.mop.spi.AdapterFactory
components/mop/trunk/spi/src/main/java/org/gatein/mop/spi/AdapterFactory.java
Modified:
components/mop/trunk/api/src/main/java/org/gatein/mop/api/Adaptable.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java
components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/AdapterTestCase.java
components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/Bar.java
components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/Foo.java
components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/Juu.java
components/mop/trunk/pom.xml
Log:
GTNMOP-42 : Upgrade to Chromattic 1.1.0-beta6
GTNMOP-41 : Support for adapter removal
Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/Adaptable.java
===================================================================
--- components/mop/trunk/api/src/main/java/org/gatein/mop/api/Adaptable.java 2011-06-15 12:46:31 UTC (rev 6660)
+++ components/mop/trunk/api/src/main/java/org/gatein/mop/api/Adaptable.java 2011-06-15 19:26:36 UTC (rev 6661)
@@ -29,11 +29,11 @@
{
/**
- * Returns an adaptee for the specified type.
+ * Returns an adapter for the specified type.
*
* @param adapterType the adapter type class
* @param <A> the adapter type
- * @return the adaptee or null
+ * @return the adapter or null
*/
<A> A adapt(Class<A> adapterType);
@@ -43,6 +43,14 @@
* @param adapterType the adapter type
* @return the adaptability of the current object
*/
- boolean isAdapted(Class<?> adapterType);
+ <A> boolean isAdapted(Class<A> adapterType);
+ /**
+ * Removes the adapter from this adaptable object.
+ *
+ * @param adapterType the adapter type class
+ * @param <A> the adapter generic type
+ */
+ <A> void removeAdapter(Class<A> adapterType);
+
}
Deleted: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/AdapterFactoryRegistration.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/AdapterFactoryRegistration.java 2011-06-15 12:46:31 UTC (rev 6660)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/AdapterFactoryRegistration.java 2011-06-15 19:26:36 UTC (rev 6661)
@@ -1,72 +0,0 @@
-/**
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.gatein.mop.core.api;
-
-import org.gatein.mop.core.util.Tools;
-import org.gatein.mop.spi.AdapterFactory;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.ServiceLoader;
-
-/**
- * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
- * @version $Revision$
- */
-class AdapterFactoryRegistration<T, A>
-{
-
- /** . */
- private static final Map<Class<?>, AdapterFactoryRegistration<?, ?>> instances;
-
- static
- {
- ServiceLoader<AdapterFactory> loader = ServiceLoader.load(AdapterFactory.class);
- Map<Class<?>, AdapterFactoryRegistration<?, ?>> map = new HashMap<Class<?>, AdapterFactoryRegistration<?, ?>>();
- for (AdapterFactory factory : loader)
- {
- AdapterFactoryRegistration registration = new AdapterFactoryRegistration(factory);
- map.put(registration.adapterType, registration);
- }
-
- //
- instances = map;
- }
-
- static <A> AdapterFactoryRegistration<Object, A> getInstance(Class<A> type)
- {
- return (AdapterFactoryRegistration<Object, A>)instances.get(type);
- }
-
- /** . */
- final AdapterFactory<T, A> factory;
-
- /** . */
- final Class<T> adapteeType;
-
- /** . */
- final Class<A> adapterType;
-
- AdapterFactoryRegistration(AdapterFactory<T, A> factory)
- {
- this.factory = factory;
- this.adapteeType = (Class<T>)Tools.resolve(factory.getClass(), AdapterFactory.class, 0);
- this.adapterType = (Class<A>)Tools.resolve(factory.getClass(), AdapterFactory.class, 1);
- }
-}
Copied: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/AdapterRegistration.java (from rev 6646, components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/AdapterFactoryRegistration.java)
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/AdapterRegistration.java (rev 0)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/AdapterRegistration.java 2011-06-15 19:26:36 UTC (rev 6661)
@@ -0,0 +1,72 @@
+/**
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.gatein.mop.core.api;
+
+import org.gatein.mop.core.util.Tools;
+import org.gatein.mop.spi.AdapterLifeCycle;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.ServiceLoader;
+
+/**
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+class AdapterRegistration<T, A>
+{
+
+ /** . */
+ private static final Map<Class<?>, AdapterRegistration<?, ?>> instances;
+
+ static
+ {
+ ServiceLoader<AdapterLifeCycle> loader = ServiceLoader.load(AdapterLifeCycle.class);
+ Map<Class<?>, AdapterRegistration<?, ?>> map = new HashMap<Class<?>, AdapterRegistration<?, ?>>();
+ for (AdapterLifeCycle factory : loader)
+ {
+ AdapterRegistration registration = new AdapterRegistration(factory);
+ map.put(registration.adapterType, registration);
+ }
+
+ //
+ instances = map;
+ }
+
+ static <A> AdapterRegistration<Object, A> getInstance(Class<A> type)
+ {
+ return (AdapterRegistration<Object, A>)instances.get(type);
+ }
+
+ /** . */
+ final AdapterLifeCycle<T, A> factory;
+
+ /** . */
+ final Class<T> adapteeType;
+
+ /** . */
+ final Class<A> adapterType;
+
+ AdapterRegistration(AdapterLifeCycle<T, A> factory)
+ {
+ this.factory = factory;
+ this.adapteeType = (Class<T>)Tools.resolve(factory.getClass(), AdapterLifeCycle.class, 0);
+ this.adapterType = (Class<A>)Tools.resolve(factory.getClass(), AdapterLifeCycle.class, 1);
+ }
+}
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java 2011-06-15 12:46:31 UTC (rev 6660)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java 2011-06-15 19:26:36 UTC (rev 6661)
@@ -44,6 +44,7 @@
import org.gatein.mop.api.Model;
import org.chromattic.api.ChromatticSession;
import org.chromattic.api.event.LifeCycleListener;
+import org.gatein.mop.spi.AdapterLifeCycle;
import java.util.Iterator;
import java.util.Map;
@@ -123,16 +124,16 @@
return getWorkspaceImpl();
}
- public <A> A getAdapter(Object o, Class<A> adapterType)
+ public <A> AdapterLifeCycle<Object, A> getAdapter(Object o, Class<A> adapterType)
{
- AdapterFactoryRegistration<Object, A> registration = AdapterFactoryRegistration.getInstance(adapterType);
+ AdapterRegistration<Object, A> registration = AdapterRegistration.getInstance(adapterType);
//
if (registration != null)
{
if (registration.adapteeType.isInstance(o))
{
- return registration.factory.getAdapter(o, adapterType);
+ return registration.factory;
}
else
{
@@ -147,7 +148,7 @@
public <A> boolean isAdaptable(Class<A> adapterType)
{
- return AdapterFactoryRegistration.getInstance(adapterType) != null;
+ return AdapterRegistration.getInstance(adapterType) != null;
}
private WorkspaceImpl getWorkspaceImpl()
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java 2011-06-15 12:46:31 UTC (rev 6660)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java 2011-06-15 19:26:36 UTC (rev 6661)
@@ -26,6 +26,7 @@
import org.gatein.mop.api.content.CustomizationContext;
import org.gatein.mop.core.api.AttributesImpl;
import org.gatein.mop.core.api.ModelImpl;
+import org.gatein.mop.spi.AdapterLifeCycle;
import java.util.HashMap;
import java.util.Map;
@@ -44,7 +45,7 @@
public ModelImpl model;
/** . */
- private Map adapters;
+ private Map<Class<?>, Object> adapters;
@Name
public abstract String getNodeName();
@@ -75,15 +76,20 @@
A adapter;
if (model.isAdaptable(adapterType))
{
- adapter = model.getAdapter(this, adapterType);
- if (adapter != null)
+ AdapterLifeCycle<Object, A> lifeCycle = model.getAdapter(this, adapterType);
+ if (lifeCycle != null)
{
if (adapters == null)
{
- adapters = new HashMap();
+ adapters = new HashMap<Class<?>, Object>();
}
+ adapter = lifeCycle.create(this, adapterType);
adapters.put(adapterType, adapter);
}
+ else
+ {
+ adapter = null;
+ }
}
else
{
@@ -94,7 +100,7 @@
return adapter;
}
- public final boolean isAdapted(Class<?> adapterType)
+ public final <A> boolean isAdapted(Class<A> adapterType)
{
if (adapters != null)
{
@@ -115,11 +121,31 @@
}
}
- private <A> A getMixin(Class<A> type, boolean adapt)
+ public <A> void removeAdapter(Class<A> adapterType)
{
+ if (model.isAdaptable(adapterType))
+ {
+ if (adapters != null)
+ {
+ A adapter = (A)adapters.remove(adapterType);
+ if (adapter != null)
+ {
+ AdapterLifeCycle<Object, A> lifeCycle = model.getAdapter(this, adapterType);
+ lifeCycle.destroy(adapter, this, adapterType);
+ }
+ }
+ }
+ else
+ {
+ removeMixin(adapterType);
+ }
+ }
+
+ private <A> A getMixin(Class<A> type, boolean create)
+ {
ChromatticSession session = model.getSession();
A a = session.getEmbedded(this, type);
- if (a == null && adapt)
+ if (a == null && create)
{
a = session.create(type);
session.setEmbedded(this, type, a);
@@ -127,6 +153,12 @@
return a;
}
+ private <A> void removeMixin(Class<A> type)
+ {
+ ChromatticSession session = model.getSession();
+ session.setEmbedded(this, type, null);
+ }
+
public String getName()
{
return getNodeName();
Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/AdapterTestCase.java
===================================================================
--- components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/AdapterTestCase.java 2011-06-15 12:46:31 UTC (rev 6660)
+++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/AdapterTestCase.java 2011-06-15 19:26:36 UTC (rev 6661)
@@ -35,12 +35,42 @@
public class AdapterTestCase extends AbstractPOMTestCase
{
- public void testSecured() throws Exception
+ public void testLifeCycle() throws Exception
{
ModelImpl model = pomService.getModel();
Workspace workspace = model.getWorkspace();
+ Site site = workspace.addSite(ObjectType.PORTAL_SITE, "adaptable_foo");
+
+ //
+ assertFalse(site.isAdapted(Foo.class));
+
+ //
+ Foo foo = site.adapt(Foo.class);
+ assertNotNull(foo);
+ assertSame(foo, site.adapt(Foo.class));
+ assertSame(site, foo.adapteeCreated);
+ assertSame(Foo.class, foo.typeCreated);
+ assertNull(foo.adapteeRemoved);
+ assertNull(foo.typeRemoved);
+ assertTrue(site.isAdapted(Foo.class));
+
+ //
+ site.removeAdapter(Foo.class);
+ assertSame(site, foo.adapteeRemoved);
+ assertSame(Foo.class, foo.typeRemoved);
+ assertFalse(site.isAdapted(Foo.class));
+ }
+
+ public void testMixinLifeCycle() throws Exception
+ {
+ ModelImpl model = pomService.getModel();
+ Workspace workspace = model.getWorkspace();
Site site = workspace.addSite(ObjectType.PORTAL_SITE, "adaptable_secured");
+
+ //
assertFalse(site.isAdapted(Secured.class));
+
+ //
Secured secured = site.adapt(Secured.class);
assertNotNull(secured);
assertTrue(site.isAdapted(Secured.class));
@@ -49,6 +79,10 @@
assertTrue(permissions.isEmpty());
permissions.add("FOO");
model.save();
+
+ //
+ site.removeAdapter(Secured.class);
+ assertFalse(site.isAdapted(Secured.class));
}
public void testWorkspaceObjectType() throws Exception
@@ -60,8 +94,8 @@
Foo foo = site.adapt(Foo.class);
assertNotNull(foo);
assertSame(foo, site.adapt(Foo.class));
- assertSame(site, foo.adaptee);
- assertSame(Foo.class, foo.adapterType);
+ assertSame(site, foo.adapteeCreated);
+ assertSame(Foo.class, foo.typeCreated);
assertTrue(site.isAdapted(Foo.class));
}
@@ -84,7 +118,6 @@
ModelImpl model = pomService.getModel();
Workspace workspace = model.getWorkspace();
assertNull(workspace.adapt(Juu.class));
-
Site site = workspace.addSite(ObjectType.PORTAL_SITE, "adaptable_juu");
assertFalse(site.isAdapted(Juu.class));
Juu juu = site.adapt(Juu.class);
Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/Bar.java
===================================================================
--- components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/Bar.java 2011-06-15 12:46:31 UTC (rev 6660)
+++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/Bar.java 2011-06-15 19:26:36 UTC (rev 6661)
@@ -18,7 +18,7 @@
*/
package org.gatein.mop.core.api.workspace;
-import org.gatein.mop.spi.AdapterFactory;
+import org.gatein.mop.spi.AdapterLifeCycle;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
@@ -39,11 +39,16 @@
this.adapterType = adapterType;
}
- public static class Factory extends AdapterFactory<WorkspaceObjectImpl, Bar>
+ public static class Factory extends AdapterLifeCycle<WorkspaceObjectImpl, Bar>
{
- public Bar getAdapter(WorkspaceObjectImpl adaptee, Class<Bar> adapterType)
+ public Bar create(WorkspaceObjectImpl adaptee, Class<Bar> adapterType)
{
return new Bar(adaptee, adapterType);
}
+
+ @Override
+ public void destroy(Bar adapter, WorkspaceObjectImpl adaptee, Class<Bar> adapterType)
+ {
+ }
}
}
Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/Foo.java
===================================================================
--- components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/Foo.java 2011-06-15 12:46:31 UTC (rev 6660)
+++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/Foo.java 2011-06-15 19:26:36 UTC (rev 6661)
@@ -19,7 +19,7 @@
package org.gatein.mop.core.api.workspace;
import org.gatein.mop.api.workspace.WorkspaceObject;
-import org.gatein.mop.spi.AdapterFactory;
+import org.gatein.mop.spi.AdapterLifeCycle;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
@@ -29,23 +29,36 @@
{
/** . */
- final WorkspaceObject adaptee;
+ final WorkspaceObject adapteeCreated;
/** . */
- final Class<Foo> adapterType;
+ final Class<Foo> typeCreated;
+ /** . */
+ WorkspaceObject adapteeRemoved;
+
+ /** . */
+ Class<Foo> typeRemoved;
+
public Foo(WorkspaceObject adaptee, Class<Foo> adapterType)
{
- this.adaptee = adaptee;
- this.adapterType = adapterType;
+ this.adapteeCreated = adaptee;
+ this.typeCreated = adapterType;
}
- public static class Factory extends AdapterFactory<WorkspaceObject, Foo>
+ public static class Factory extends AdapterLifeCycle<WorkspaceObject, Foo>
{
@Override
- public Foo getAdapter(WorkspaceObject adaptee, Class<Foo> adapterType)
+ public Foo create(WorkspaceObject adaptee, Class<Foo> adapterType)
{
return new Foo(adaptee, adapterType);
}
+
+ @Override
+ public void destroy(Foo adapter, WorkspaceObject adaptee, Class<Foo> adapterType)
+ {
+ adapter.adapteeRemoved = adaptee;
+ adapter.typeRemoved = adapterType;
+ }
}
}
Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/Juu.java
===================================================================
--- components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/Juu.java 2011-06-15 12:46:31 UTC (rev 6660)
+++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/Juu.java 2011-06-15 19:26:36 UTC (rev 6661)
@@ -19,7 +19,7 @@
package org.gatein.mop.core.api.workspace;
import org.gatein.mop.api.workspace.Site;
-import org.gatein.mop.spi.AdapterFactory;
+import org.gatein.mop.spi.AdapterLifeCycle;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
@@ -40,12 +40,17 @@
this.adapterType = adapterType;
}
- public static class Factory extends AdapterFactory<Site, Juu>
+ public static class Factory extends AdapterLifeCycle<Site, Juu>
{
@Override
- public Juu getAdapter(Site adaptee, Class<Juu> adapterType)
+ public Juu create(Site adaptee, Class<Juu> adapterType)
{
return new Juu(adaptee, adapterType);
}
+
+ @Override
+ public void destroy(Juu adapter, Site adaptee, Class<Juu> adapterType)
+ {
+ }
}
}
Deleted: components/mop/trunk/core/src/test/resources/META-INF/services/org.gatein.mop.spi.AdapterFactory
===================================================================
--- components/mop/trunk/core/src/test/resources/META-INF/services/org.gatein.mop.spi.AdapterFactory 2011-06-15 12:46:31 UTC (rev 6660)
+++ components/mop/trunk/core/src/test/resources/META-INF/services/org.gatein.mop.spi.AdapterFactory 2011-06-15 19:26:36 UTC (rev 6661)
@@ -1,3 +0,0 @@
-org.gatein.mop.core.api.workspace.Foo$Factory
-org.gatein.mop.core.api.workspace.Bar$Factory
-org.gatein.mop.core.api.workspace.Juu$Factory
Copied: components/mop/trunk/core/src/test/resources/META-INF/services/org.gatein.mop.spi.AdapterLifeCycle (from rev 6646, components/mop/trunk/core/src/test/resources/META-INF/services/org.gatein.mop.spi.AdapterFactory)
===================================================================
--- components/mop/trunk/core/src/test/resources/META-INF/services/org.gatein.mop.spi.AdapterLifeCycle (rev 0)
+++ components/mop/trunk/core/src/test/resources/META-INF/services/org.gatein.mop.spi.AdapterLifeCycle 2011-06-15 19:26:36 UTC (rev 6661)
@@ -0,0 +1,3 @@
+org.gatein.mop.core.api.workspace.Foo$Factory
+org.gatein.mop.core.api.workspace.Bar$Factory
+org.gatein.mop.core.api.workspace.Juu$Factory
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2011-06-15 12:46:31 UTC (rev 6660)
+++ components/mop/trunk/pom.xml 2011-06-15 19:26:36 UTC (rev 6661)
@@ -124,7 +124,7 @@
<!-- Build settings -->
<!-- ************** -->
- <org.chromattic.version>1.1.0-beta5</org.chromattic.version>
+ <org.chromattic.version>1.1.0-beta6</org.chromattic.version>
<!--
Current testuite doesn't work with surefire 2.7 defined in parent pom
Deleted: components/mop/trunk/spi/src/main/java/org/gatein/mop/spi/AdapterFactory.java
===================================================================
--- components/mop/trunk/spi/src/main/java/org/gatein/mop/spi/AdapterFactory.java 2011-06-15 12:46:31 UTC (rev 6660)
+++ components/mop/trunk/spi/src/main/java/org/gatein/mop/spi/AdapterFactory.java 2011-06-15 19:26:36 UTC (rev 6661)
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2010 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.gatein.mop.spi;
-
-/**
- * The adapter factory.
- *
- * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
- * @version $Revision$
- */
-public abstract class AdapterFactory<T, A>
-{
-
- public abstract A getAdapter(T adaptee, Class<A> adapterType);
-
-}
Copied: components/mop/trunk/spi/src/main/java/org/gatein/mop/spi/AdapterLifeCycle.java (from rev 6646, components/mop/trunk/spi/src/main/java/org/gatein/mop/spi/AdapterFactory.java)
===================================================================
--- components/mop/trunk/spi/src/main/java/org/gatein/mop/spi/AdapterLifeCycle.java (rev 0)
+++ components/mop/trunk/spi/src/main/java/org/gatein/mop/spi/AdapterLifeCycle.java 2011-06-15 19:26:36 UTC (rev 6661)
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2010 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.gatein.mop.spi;
+
+/**
+ * The adapter factory.
+ *
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public abstract class AdapterLifeCycle<T, A>
+{
+
+ public abstract A create(T adaptee, Class<A> adapterType);
+
+ public abstract void destroy(A adapter, T adaptee, Class<A> adapterType);
+
+}
14 years, 3 months
- 1
- 0
gatein SVN: r6660 - epp/portal/branches/EPP_5_1_Branch.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-06-15 08:46:31 -0400 (Wed, 15 Jun 2011)
New Revision: 6660
Modified:
epp/portal/branches/EPP_5_1_Branch/pom.xml
Log:
Add version to name
Modified: epp/portal/branches/EPP_5_1_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-06-15 12:41:22 UTC (rev 6659)
+++ epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-06-15 12:46:31 UTC (rev 6660)
@@ -34,7 +34,7 @@
<version>5.1.1-epp-DEV02</version>
<packaging>pom</packaging>
- <name>EPP GateIn - Portal</name>
+ <name>EPP GateIn - Portal - ${project.version}</name>
<properties>
<org.exoplatform.kernel.version>2.2.8-GA</org.exoplatform.kernel.version>
14 years, 3 months
- 1
- 0