Author: mstruk Date: 2011-04-27 09:56:44 -0400 (Wed, 27 Apr 2011) New Revision: 6364 Added: portal/trunk/docs/reference-guide/en/en-US/ portal/trunk/docs/reference-guide/en/en-US/Reference_Guide.ent portal/trunk/docs/reference-guide/en/en-US/images/ portal/trunk/docs/reference-guide/en/en-US/master.xml portal/trunk/docs/reference-guide/en/en-US/modules/ portal/trunk/docs/user-guide/en/en-US/ portal/trunk/docs/user-guide/en/en-US/User_Guide.ent portal/trunk/docs/user-guide/en/en-US/images/ portal/trunk/docs/user-guide/en/en-US/master.xml portal/trunk/docs/user-guide/en/en-US/modules/ Removed: portal/trunk/docs/reference-guide/en/Reference_Guide.ent portal/trunk/docs/reference-guide/en/images/ portal/trunk/docs/reference-guide/en/master.xml portal/trunk/docs/reference-guide/en/modules/ portal/trunk/docs/user-guide/en/User_Guide.ent portal/trunk/docs/user-guide/en/images/ portal/trunk/docs/user-guide/en/master.xml portal/trunk/docs/user-guide/en/modules/ Modified: portal/trunk/docs/pom.xml Log: GTNPORTAL-1740 GateIn 3.1.0-GA won't build with Maven 3 - upgraded to maven-jdocbook-plugin 2.3.4, and adjusted dir layout Modified: portal/trunk/docs/pom.xml =================================================================== --- portal/trunk/docs/pom.xml 2011-04-27 13:47:16 UTC (rev 6363) +++ portal/trunk/docs/pom.xml 2011-04-27 13:56:44 UTC (rev 6364) @@ -44,7 +44,7 @@ <plugin> <groupId>org.jboss.maven.plugins</groupId> <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.1.1</version> + <version>2.3.4</version> <extensions>true</extensions> <dependencies> <dependency> @@ -63,7 +63,7 @@ <sourceDocumentName>master.xml</sourceDocumentName> <sourceDirectory>${pom.basedir}/en</sourceDirectory> <imageResource> - <directory>${pom.basedir}/en</directory> + <directory>${pom.basedir}/en/en-US</directory> <includes> <include>images/**/*</include> </includes> Deleted: portal/trunk/docs/reference-guide/en/Reference_Guide.ent =================================================================== --- portal/trunk/docs/reference-guide/en/Reference_Guide.ent 2011-04-27 13:47:16 UTC (rev 6363) +++ portal/trunk/docs/reference-guide/en/Reference_Guide.ent 2011-04-27 13:56:44 UTC (rev 6364) @@ -1,8 +0,0 @@ -<!ENTITY PRODUCT "GateIn 3.2"> -<!ENTITY PRODUCT_NAME "GateIn"> -<!ENTITY PRODUCT_VERSION "3.2"> -<!ENTITY BOOKID "Reference Guide"> -<!ENTITY YEAR "2010"> -<!ENTITY HOLDER "Red Hat, Inc"> -<!ENTITY WSRP_VERSION "2.0.0-GA"> -<!ENTITY PORTAL_VERSION "3.2.0-GA"> Copied: portal/trunk/docs/reference-guide/en/en-US/Reference_Guide.ent (from rev 6348, portal/trunk/docs/reference-guide/en/Reference_Guide.ent) =================================================================== --- portal/trunk/docs/reference-guide/en/en-US/Reference_Guide.ent (rev 0) +++ portal/trunk/docs/reference-guide/en/en-US/Reference_Guide.ent 2011-04-27 13:56:44 UTC (rev 6364) @@ -0,0 +1,8 @@ +<!ENTITY PRODUCT "GateIn 3.2"> +<!ENTITY PRODUCT_NAME "GateIn"> +<!ENTITY PRODUCT_VERSION "3.2"> +<!ENTITY BOOKID "Reference Guide"> +<!ENTITY YEAR "2010"> +<!ENTITY HOLDER "Red Hat, Inc"> +<!ENTITY WSRP_VERSION "2.0.0-GA"> +<!ENTITY PORTAL_VERSION "3.2.0-GA"> Copied: portal/trunk/docs/reference-guide/en/en-US/master.xml (from rev 6348, portal/trunk/docs/reference-guide/en/master.xml) =================================================================== --- portal/trunk/docs/reference-guide/en/en-US/master.xml (rev 0) +++ portal/trunk/docs/reference-guide/en/en-US/master.xml 2011-04-27 13:56:44 UTC (rev 6364) @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent"> +%BOOK_ENTITIES; +]> + +<book lang="en"> + <bookinfo> + <title>GateIn Reference Guide</title> + <subtitle> +<!-- +LT 20010312: could not find a way to configure image scaling properly (tried width, scale, etc...). Feel free to investigate. +--> + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/Common/gatein_logo.png" format="PNG" align="center"/> + </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/Common/gatein_logo.png" format="PNG" align="center"/> + </imageobject> + </mediaobject> + + </subtitle> + + + <authorgroup> + <author> + <firstname>the GateIn community</firstname> + <surname></surname> + </author> + <author> + <firstname>JBoss by Red Hat</firstname> + <surname></surname> + </author> + <author> + <firstname>eXo Platform</firstname> + <surname></surname> + </author> + + <editor> + <firstname>Scott</firstname> + <surname>Mumford</surname> + <affiliation> + <shortaffil>Red Hat</shortaffil> + <orgdiv>Engineering Content Services</orgdiv> + </affiliation> + <email&gt;smumford(a)redhat.com&lt;/email&gt; + </editor> + <editor> + <firstname>Thomas</firstname> + <surname>Heute</surname> + <affiliation> + <shortaffil>Red Hat</shortaffil> + <orgdiv>JBoss Engineering</orgdiv> + </affiliation> + <email&gt;theute(a)redhat.com&lt;/email&gt; + </editor> + <editor> + <firstname>Luc</firstname> + <surname>Texier</surname> + <affiliation> + <shortaffil>Red Hat</shortaffil> + <orgdiv>JBoss Engineering, Management</orgdiv> + </affiliation> + <email&gt;ltexier(a)redhat.com&lt;/email&gt; + </editor> + <editor> + <firstname>Christophe</firstname> + <surname>Laprun</surname> + <affiliation> + <shortaffil>Red Hat</shortaffil> + <orgdiv>JBoss Engineering</orgdiv> + </affiliation> + <email&gt;claprun(a)redhat.com&lt;/email&gt; + </editor> +<!-- + <othercredit> + <affiliation> + <orgname><emphasis role="bold"><ulink type="http" url="http://www.jboss.org/gatein/">GateIn Portal</ulink></emphasis> and <emphasis role="bold"><ulink type="http" url="http://www.exoplatform.com/portal/public/website/">Exo Platform</ulink></emphasis> teams</orgname> + </affiliation> + <contrib>Original product documentation by:</contrib> + </othercredit> +--> + </authorgroup> + + + </bookinfo> + + + <xi:include href="modules/Introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + + <!-- Only in the project --> + <xi:include href="modules/Configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + + <xi:include href="modules/PortalDevelopment.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + <xi:include href="modules/PortletDevelopment.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + <xi:include href="modules/GadgetDevelopment.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + <xi:include href="modules/AuthenticationAndIdentity.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + <xi:include href="modules/WSRP.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + <xi:include href="modules/Advanced.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> +</book> Deleted: portal/trunk/docs/reference-guide/en/master.xml =================================================================== --- portal/trunk/docs/reference-guide/en/master.xml 2011-04-27 13:47:16 UTC (rev 6363) +++ portal/trunk/docs/reference-guide/en/master.xml 2011-04-27 13:56:44 UTC (rev 6364) @@ -1,102 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" - "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ -<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent"> -%BOOK_ENTITIES; -]> - -<book lang="en"> - <bookinfo> - <title>GateIn Reference Guide</title> - <subtitle> -<!-- -LT 20010312: could not find a way to configure image scaling properly (tried width, scale, etc...). Feel free to investigate. ---> - <mediaobject> - <imageobject role="html"> - <imagedata fileref="images/Common/gatein_logo.png" format="PNG" align="center"/> - </imageobject> - <imageobject role="fo"> - <imagedata fileref="images/Common/gatein_logo.png" format="PNG" align="center"/> - </imageobject> - </mediaobject> - - </subtitle> - - - <authorgroup> - <author> - <firstname>the GateIn community</firstname> - <surname></surname> - </author> - <author> - <firstname>JBoss by Red Hat</firstname> - <surname></surname> - </author> - <author> - <firstname>eXo Platform</firstname> - <surname></surname> - </author> - - <editor> - <firstname>Scott</firstname> - <surname>Mumford</surname> - <affiliation> - <shortaffil>Red Hat</shortaffil> - <orgdiv>Engineering Content Services</orgdiv> - </affiliation> - <email&gt;smumford(a)redhat.com&lt;/email&gt; - </editor> - <editor> - <firstname>Thomas</firstname> - <surname>Heute</surname> - <affiliation> - <shortaffil>Red Hat</shortaffil> - <orgdiv>JBoss Engineering</orgdiv> - </affiliation> - <email&gt;theute(a)redhat.com&lt;/email&gt; - </editor> - <editor> - <firstname>Luc</firstname> - <surname>Texier</surname> - <affiliation> - <shortaffil>Red Hat</shortaffil> - <orgdiv>JBoss Engineering, Management</orgdiv> - </affiliation> - <email&gt;ltexier(a)redhat.com&lt;/email&gt; - </editor> - <editor> - <firstname>Christophe</firstname> - <surname>Laprun</surname> - <affiliation> - <shortaffil>Red Hat</shortaffil> - <orgdiv>JBoss Engineering</orgdiv> - </affiliation> - <email&gt;claprun(a)redhat.com&lt;/email&gt; - </editor> -<!-- - <othercredit> - <affiliation> - <orgname><emphasis role="bold"><ulink type="http" url="http://www.jboss.org/gatein/">GateIn Portal</ulink></emphasis> and <emphasis role="bold"><ulink type="http" url="http://www.exoplatform.com/portal/public/website/">Exo Platform</ulink></emphasis> teams</orgname> - </affiliation> - <contrib>Original product documentation by:</contrib> - </othercredit> ---> - </authorgroup> - - - </bookinfo> - - - <xi:include href="modules/Introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - - <!-- Only in the project --> - <xi:include href="modules/Configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - - <xi:include href="modules/PortalDevelopment.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - <xi:include href="modules/PortletDevelopment.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - <xi:include href="modules/GadgetDevelopment.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - <xi:include href="modules/AuthenticationAndIdentity.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - <xi:include href="modules/WSRP.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - <xi:include href="modules/Advanced.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -</book> Deleted: portal/trunk/docs/user-guide/en/User_Guide.ent =================================================================== --- portal/trunk/docs/user-guide/en/User_Guide.ent 2011-04-27 13:47:16 UTC (rev 6363) +++ portal/trunk/docs/user-guide/en/User_Guide.ent 2011-04-27 13:56:44 UTC (rev 6364) @@ -1,4 +0,0 @@ -<!ENTITY PRODUCT "GateIn 3.0"> -<!ENTITY BOOKID "User Guide"> -<!ENTITY YEAR "2010"> -<!ENTITY HOLDER "Red Hat, Inc"> Copied: portal/trunk/docs/user-guide/en/en-US/User_Guide.ent (from rev 6348, portal/trunk/docs/user-guide/en/User_Guide.ent) =================================================================== --- portal/trunk/docs/user-guide/en/en-US/User_Guide.ent (rev 0) +++ portal/trunk/docs/user-guide/en/en-US/User_Guide.ent 2011-04-27 13:56:44 UTC (rev 6364) @@ -0,0 +1,4 @@ +<!ENTITY PRODUCT "GateIn 3.0"> +<!ENTITY BOOKID "User Guide"> +<!ENTITY YEAR "2010"> +<!ENTITY HOLDER "Red Hat, Inc"> Copied: portal/trunk/docs/user-guide/en/en-US/master.xml (from rev 6348, portal/trunk/docs/user-guide/en/master.xml) =================================================================== --- portal/trunk/docs/user-guide/en/en-US/master.xml (rev 0) +++ portal/trunk/docs/user-guide/en/en-US/master.xml 2011-04-27 13:56:44 UTC (rev 6364) @@ -0,0 +1,118 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +<!ENTITY % BOOK_ENTITIES SYSTEM "User_Guide.ent"> +%BOOK_ENTITIES; +]> + +<book lang="en"> + <bookinfo> + <title>GateIn User Guide</title> + <subtitle> +<!-- +LT 20010312: could not find a way to configure image scaling properly (tried width, scale, etc...). Feel free to investigate. +--> + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/gatein_logo.png" format="PNG" align="center"/> + </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/gatein_logo.png" format="PNG" align="center"/> + </imageobject> + </mediaobject> + + </subtitle> + + + <authorgroup> + <author> + <firstname>the GateIn community</firstname> + <surname></surname> + </author> + <author> + <firstname>JBoss by Red Hat</firstname> + <surname></surname> + </author> + <author> + <firstname>eXo Platform</firstname> + <surname></surname> + </author> + + <editor> + <firstname>Scott</firstname> + <surname>Mumford</surname> + <affiliation> + <shortaffil>Red Hat</shortaffil> + <orgdiv>Engineering Content Services</orgdiv> + </affiliation> + <email&gt;smumford(a)redhat.com&lt;/email&gt; + </editor> + <editor> + <firstname>Thomas</firstname> + <surname>Heute</surname> + <affiliation> + <shortaffil>Red Hat</shortaffil> + <orgdiv>JBoss Engineering</orgdiv> + </affiliation> + <email&gt;theute(a)redhat.com&lt;/email&gt; + </editor> + <editor> + <firstname>Luc</firstname> + <surname>Texier</surname> + <affiliation> + <shortaffil>Red Hat</shortaffil> + <orgdiv>JBoss Engineering, Management</orgdiv> + </affiliation> + <email&gt;ltexier(a)redhat.com&lt;/email&gt; + </editor> +<!-- + <othercredit> + <affiliation> + <orgname><emphasis role="bold"><ulink type="http" url="http://www.jboss.org/gatein/">GateIn Portal</ulink></emphasis> and <emphasis role="bold"><ulink type="http" url="http://www.exoplatform.com/portal/public/website/">Exo Platform</ulink></emphasis> teams</orgname> + </affiliation> + <contrib>Original product documentation by:</contrib> + </othercredit> +--> + </authorgroup> + + + </bookinfo> + + + + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/Introduction.xml" /> + <!-- + Table of content in Wiki Format <xi:include + xmlns:xi="http://www.w3.org/2001/XInclude" + href="modules/Portal_Manual.xml" /> + --> + + <!-- 1 Terms --> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/Terms.xml" /> + + <!-- + Portal, Portlet, Navigation, Node, Gadget, Public mode and Private + mode, Permission levels, Workspace concept, Toolbar concept + --> + + <!-- 2 User Manual --> + + <!-- Portlets --> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/PortletsUser.xml" /> + + <!-- Account --> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/Account.xml" /> + + <!-- 3_Administration --> + + <!-- Portal --> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/Portal.xml" /> + + <!-- Language --> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/Language.xml" /> + + <!-- GadgetsAdmin --> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/GadgetsAdmin.xml" /> + + +</book> Deleted: portal/trunk/docs/user-guide/en/master.xml =================================================================== --- portal/trunk/docs/user-guide/en/master.xml 2011-04-27 13:47:16 UTC (rev 6363) +++ portal/trunk/docs/user-guide/en/master.xml 2011-04-27 13:56:44 UTC (rev 6364) @@ -1,118 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" - "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ -<!ENTITY % BOOK_ENTITIES SYSTEM "User_Guide.ent"> -%BOOK_ENTITIES; -]> - -<book lang="en"> - <bookinfo> - <title>GateIn User Guide</title> - <subtitle> -<!-- -LT 20010312: could not find a way to configure image scaling properly (tried width, scale, etc...). Feel free to investigate. ---> - <mediaobject> - <imageobject role="html"> - <imagedata fileref="images/gatein_logo.png" format="PNG" align="center"/> - </imageobject> - <imageobject role="fo"> - <imagedata fileref="images/gatein_logo.png" format="PNG" align="center"/> - </imageobject> - </mediaobject> - - </subtitle> - - - <authorgroup> - <author> - <firstname>the GateIn community</firstname> - <surname></surname> - </author> - <author> - <firstname>JBoss by Red Hat</firstname> - <surname></surname> - </author> - <author> - <firstname>eXo Platform</firstname> - <surname></surname> - </author> - - <editor> - <firstname>Scott</firstname> - <surname>Mumford</surname> - <affiliation> - <shortaffil>Red Hat</shortaffil> - <orgdiv>Engineering Content Services</orgdiv> - </affiliation> - <email&gt;smumford(a)redhat.com&lt;/email&gt; - </editor> - <editor> - <firstname>Thomas</firstname> - <surname>Heute</surname> - <affiliation> - <shortaffil>Red Hat</shortaffil> - <orgdiv>JBoss Engineering</orgdiv> - </affiliation> - <email&gt;theute(a)redhat.com&lt;/email&gt; - </editor> - <editor> - <firstname>Luc</firstname> - <surname>Texier</surname> - <affiliation> - <shortaffil>Red Hat</shortaffil> - <orgdiv>JBoss Engineering, Management</orgdiv> - </affiliation> - <email&gt;ltexier(a)redhat.com&lt;/email&gt; - </editor> -<!-- - <othercredit> - <affiliation> - <orgname><emphasis role="bold"><ulink type="http" url="http://www.jboss.org/gatein/">GateIn Portal</ulink></emphasis> and <emphasis role="bold"><ulink type="http" url="http://www.exoplatform.com/portal/public/website/">Exo Platform</ulink></emphasis> teams</orgname> - </affiliation> - <contrib>Original product documentation by:</contrib> - </othercredit> ---> - </authorgroup> - - - </bookinfo> - - - - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/Introduction.xml" /> - <!-- - Table of content in Wiki Format <xi:include - xmlns:xi="http://www.w3.org/2001/XInclude" - href="modules/Portal_Manual.xml" /> - --> - - <!-- 1 Terms --> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/Terms.xml" /> - - <!-- - Portal, Portlet, Navigation, Node, Gadget, Public mode and Private - mode, Permission levels, Workspace concept, Toolbar concept - --> - - <!-- 2 User Manual --> - - <!-- Portlets --> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/PortletsUser.xml" /> - - <!-- Account --> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/Account.xml" /> - - <!-- 3_Administration --> - - <!-- Portal --> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/Portal.xml" /> - - <!-- Language --> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/Language.xml" /> - - <!-- GadgetsAdmin --> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/GadgetsAdmin.xml" /> - - -</book>