You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2013/09/17 18:11:00 UTC

svn commit: r1524112 - in /ofbiz/trunk: ./ applications/commonext/ applications/commonext/data/ applications/commonext/data/helpdata/ applications/commonext/documents/ applications/content/data/ applications/content/template/docbook/ applications/order...

Author: jacopoc
Date: Tue Sep 17 16:11:00 2013
New Revision: 1524112

URL: http://svn.apache.org/r1524112
Log:
Moved the docbook distribution from applications/content to specialpurpose/cmssite, the only component that requires it. The Docbook schemas are still in the content component because they are required to render the online help screens of the applications.


Added:
    ofbiz/trunk/specialpurpose/cmssite/documents/
    ofbiz/trunk/specialpurpose/cmssite/documents/ApacheOfbiz.xml   (props changed)
      - copied unchanged from r1523953, ofbiz/trunk/applications/commonext/documents/ApacheOfbiz.xml
    ofbiz/trunk/specialpurpose/cmssite/documents/ApacheOfbizTechnical.xml   (contents, props changed)
      - copied, changed from r1523953, ofbiz/trunk/applications/commonext/documents/ApacheOfbizTechnical.xml
    ofbiz/trunk/specialpurpose/cmssite/documents/ApacheOfbizUser.xml   (contents, props changed)
      - copied, changed from r1523953, ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml
    ofbiz/trunk/specialpurpose/cmssite/template/docbook/
      - copied from r1523953, ofbiz/trunk/applications/content/template/docbook/
Removed:
    ofbiz/trunk/applications/commonext/data/CommonExtSeedData.xml
    ofbiz/trunk/applications/commonext/documents/ApacheOfbiz.xml
    ofbiz/trunk/applications/commonext/documents/ApacheOfbizTechnical.xml
    ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml
    ofbiz/trunk/applications/content/template/docbook/
Modified:
    ofbiz/trunk/LICENSE
    ofbiz/trunk/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem.xml
    ofbiz/trunk/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem_FR.xml
    ofbiz/trunk/applications/commonext/ofbiz-component.xml
    ofbiz/trunk/applications/content/data/ContentTypeData.xml
    ofbiz/trunk/applications/order/documents/Order.xml
    ofbiz/trunk/specialpurpose/LICENSE
    ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml

Modified: ofbiz/trunk/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=1524112&r1=1524111&r2=1524112&view=diff
==============================================================================
--- ofbiz/trunk/LICENSE (original)
+++ ofbiz/trunk/LICENSE Tue Sep 17 16:11:00 2013
@@ -110,13 +110,10 @@ applications/content/lib/poi-3.8-2012032
 applications/content/lib/poi-ooxml-3.8-20120326.jar
 applications/content/lib/poi-ooxml-schemas-3.8-20120326.jar
 applications/content/lib/poi-scratchpad-3.8-20120326.jar
-applications/content/template/docbook/extensions/tagsoup-1.2.1.jar
 applications/content/lib/tika-core-1.0.jar
 applications/content/lib/tika-parsers-1.0.jar
-applications/content/template/docbook/extensions/xalan27.jar
 applications/product/lib/dozer-4.2.1.jar
 applications/product/lib/watermarker-0.0.4.jar
-applications/content/template/docbook/extensions/webhelpindexer.jar
 framework/images/webapp/images/date/timezones*
 =========================================================================
                                  Apache License
@@ -519,7 +516,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 The following libraries distributed with Apache OFBiz are licensed under the
 Mozilla Public License Version 1.1:
 framework/webapp/lib/iText-2.1.7.jar
-applications/content/template/docbook/extensions/saxon65.jar
 =========================================================================
                           MOZILLA PUBLIC LICENSE
                                 Version 1.1
@@ -1219,7 +1215,6 @@ framework/base/lib/jcl-over-slf4j-1.6.4.
 framework/base/lib/slf4j-api-1.6.4.jar
 framework/base/lib/slf4j-log4j12-1.6.4.jar
 framework/images/webapp/images/jquery/*
-applications/content/template/docbook/webhelp/*
 framework/images/webapp/images/date/date.format-1.2.3*.js
 =========================================================================
 The MIT License
@@ -2406,56 +2401,9 @@ after the cause of action arose. Each pa
 any resulting litigation.
 
 =========================================================================
-Apache Ofbiz includes docbook templates in the /applications/content/template/docbook
-directory with the following licence:
-Copyright
----------
-Copyright (C) 1999-2007 Norman Walsh
-Copyright (C) 2003 Jiří Kosek
-Copyright (C) 2004-2007 Steve Ball
-Copyright (C) 2005-2008 The DocBook Project
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the ``Software''), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-Except as contained in this notice, the names of individuals
-credited with contribution to this software shall not be used in
-advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization
-from the individuals in question.
-
-Any stylesheet derived from this Software that is publically
-distributed will be identified with a different name and the
-version strings in any derived Software will be changed so that
-no possibility of confusion between the derived package and this
-Software will exist.
-
-Warranty
---------
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT.  IN NO EVENT SHALL NORMAN WALSH OR ANY OTHER
-CONTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Contacting the Author
----------------------
 The DocBook XSL stylesheets are maintained by Norman Walsh,
 <nd...@nwalsh.com>, and members of the DocBook Project,
 <do...@sf.net>
-=========================================================================
 The docbook schemas in the files docbook.xsd, docbook.dtd xlink.xsd
 and xml.xsd are distributed under the GNU Free Documentation License
 GNU Free Documentation License

Modified: ofbiz/trunk/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem.xml?rev=1524112&r1=1524111&r2=1524112&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem.xml (original)
+++ ofbiz/trunk/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem.xml Tue Sep 17 16:11:00 2013
@@ -30,9 +30,7 @@
           files. In general the files are stored within the subject
           component either in the 'documents' or data/helpdata
           directories.
-          The 'master' document is stored in the file
-          applications/commonext/documents/ApacheOfbiz.xml. The
-          docbook schemas are stored in the applications/content/dtd
+          The docbook schemas are stored in the applications/content/dtd
           directory and the stylesheets are
           stored in the applications/content/templates/docbook directory.
       </para>
@@ -46,8 +44,6 @@
           If you are looking for docbook files format examples, please
           look at the following files:
           <orderedlist>
-            <listitem><para>The master document at:
-              applications/commonext/documents/ApacheOfbiz.xml</para></listitem>
             <listitem><para>An example for a chapter of a component at:
               applications/accounting/documents/Accounting.xml</para></listitem>
             <listitem><para>An example of a help screen:

Modified: ofbiz/trunk/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem_FR.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem_FR.xml?rev=1524112&r1=1524111&r2=1524112&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem_FR.xml (original)
+++ ofbiz/trunk/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem_FR.xml Tue Sep 17 16:11:00 2013
@@ -30,7 +30,6 @@
           En général, les fichiers sont stockés à l'intérieur de chacun des composants, soit dans le répertoire 'document' soit dans le répertoire data/helpdata.
       </para>
       <para>
-          Le document 'racine' est stocké dans le fichier applications/commonext/documents/ApacheOfbiz.xml.
           La grammaire DocBook est stockée dans le répertoire application/content/dtd et les feuilles de style sont stockées dans le répertoire applications/content/templates/docbook.
       </para>
       <para>
@@ -42,8 +41,6 @@
       <para>
           Si vous souhaitez avoir des exemples de fichier au format DocBook, regardez les fichiers suivants :
           <orderedlist>
-            <listitem><para>Le document principal : 
-              applications/commonext/documents/ApacheOfbiz.xml</para></listitem>
             <listitem><para>Un exemple pour un chapitre d'un composant :
               applications/accounting/documents/Accounting.xml</para></listitem>
             <listitem><para>Un exemple pour un écran d'aide :

Modified: ofbiz/trunk/applications/commonext/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/ofbiz-component.xml?rev=1524112&r1=1524111&r2=1524112&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/commonext/ofbiz-component.xml Tue Sep 17 16:11:00 2013
@@ -25,7 +25,6 @@ under the License.
     <classpath type="dir" location="config"/>
     
     <entity-resource type="data" reader-name="seed" loader="main" location="data/EntityDiagramGroupData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtSeedData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtSecurityPermissionSeedData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/CommonExtSecurityGroupDemoData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtHelpData.xml"/>

Modified: ofbiz/trunk/applications/content/data/ContentTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/ContentTypeData.xml?rev=1524112&r1=1524111&r2=1524112&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/data/ContentTypeData.xml (original)
+++ ofbiz/trunk/applications/content/data/ContentTypeData.xml Tue Sep 17 16:11:00 2013
@@ -256,8 +256,6 @@ under the License.
     <Content contentId="STDWRAP001" contentTypeId="DOCUMENT" dataResourceId="STDWRAP001" contentName="Standard SubContent Wrapper" description="Standard SubContent Wrapper"/>
 
     <Content contentId="TREE_ROOT"/>
-    <DataResource dataResourceId="DOCBOOK_HTML_TEMPL" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/template/docbook/html/docbook.xsl" dataTemplateTypeId="XSLT" statusId="CTNT_IN_PROGRESS" dataResourceName="Help template file" mimeTypeId="text/html" isPublic="Y"/>
-    <DataResource dataResourceId="DOCBOOK_PDF_TEMPL" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/template/docbook/fo/docbook.xsl" dataTemplateTypeId="XSLT" statusId="CTNT_IN_PROGRESS" dataResourceName="Help template file" mimeTypeId="text/html" isPublic="Y"/>
 
     <WebAnalyticsType description="Web Analytics" hasTable="N" parentTypeId="" webAnalyticsTypeId="WEB_ANALYTICS"/>
     <WebAnalyticsType webAnalyticsTypeId="GOOGLE_ANALYTICS" parentTypeId="WEB_ANALYTICS" hasTable="N" description="Google Analytics"/>

Modified: ofbiz/trunk/applications/order/documents/Order.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/documents/Order.xml?rev=1524112&r1=1524111&r2=1524112&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/documents/Order.xml (original)
+++ ofbiz/trunk/applications/order/documents/Order.xml Tue Sep 17 16:11:00 2013
@@ -23,7 +23,7 @@ under the License.
     xsi:schemaLocation="http://docbook.org/ns/docbook ../../content/dtd/docbook.xsd"
     xmlns="http://docbook.org/ns/docbook">
     <title>The Order Component.</title>
-    <xi:include href="../data/helpdata/HELP_ORDER.xml" />
-    <xi:include href="../data/helpdata/HELP_ORDER_View.xml" />
-    <xi:include href="../data/helpdata/HELP_ORDER_Report.xml" />
+    <xi:include href="../data/helpdata/HELP_ORDERMGR.xml" />
+    <xi:include href="../data/helpdata/HELP_ORDERMGR_View.xml" />
+    <xi:include href="../data/helpdata/HELP_ORDERMGR_Report.xml" />
 </chapter>

Modified: ofbiz/trunk/specialpurpose/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/LICENSE?rev=1524112&r1=1524111&r2=1524112&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/LICENSE (original)
+++ ofbiz/trunk/specialpurpose/LICENSE Tue Sep 17 16:11:00 2013
@@ -12,6 +12,9 @@ For additional details, see the NOTICE f
 The following libraries are licensed under the Apache License Version 2.0:
 specialpurpose/birt/lib/axis-ant-1.4.jar
 specialpurpose/birt/lib/axis-1.4.jar
+specialpurpose/cmssite/template/docbook/extensions/tagsoup-1.2.1.jar
+specialpurpose/cmssite/template/docbook/extensions/xalan27.jar
+specialpurpose/cmssite/template/docbook/extensions/webhelpindexer.jar
 specialpurpose/googlecheckout/lib/checkout-sdk-0.8.8.jar
 specialpurpose/lucene/lib/lucene-analyzers-common-4.4.0.jar
 specialpurpose/lucene/lib/lucene-core-4.4.0.jar
@@ -285,6 +288,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 =========================================================================
 The following libraries distributed with Apache OFBiz are licensed under the
 Mozilla Public License Version 1.1:
+specialpurpose/cmssite/template/docbook/extensions/saxon65.jar
 specialpurpose/pos/lib/XuiCoreSwing-v3.2rc2b.jar
 specialpurpose/pos/lib/XuiOptional-v3.2rc2b.jar
 
@@ -983,6 +987,7 @@ any resulting litigation.
 =========================================================================
 The following libraries distributed with Apache OFBiz are licensed under the
 MIT/X License:
+specialpurpose/cmssite/template/docbook/webhelp/*
 specialpurpose/webpos/webapp/webpos/images/js/jquery.hotkeys-0.7.9.min.js
 specialpurpose/webpos/webapp/webpos/images/js/WebPosHotkeys.js
 
@@ -1617,4 +1622,47 @@ Agreement will bring a legal action unde
 after the cause of action arose. Each party waives its rights to a jury trial in
 any resulting litigation.
 
-=========================================================================
\ No newline at end of file
+=========================================================================
+Apache Ofbiz includes docbook templates in the specialpurpose/cmssite/template/docbook
+directory with the following licence:
+Copyright
+---------
+Copyright (C) 1999-2007 Norman Walsh
+Copyright (C) 2003 Jiří Kosek
+Copyright (C) 2004-2007 Steve Ball
+Copyright (C) 2005-2008 The DocBook Project
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the ``Software''), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+Except as contained in this notice, the names of individuals
+credited with contribution to this software shall not be used in
+advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization
+from the individuals in question.
+
+Any stylesheet derived from this Software that is publically
+distributed will be identified with a different name and the
+version strings in any derived Software will be changed so that
+no possibility of confusion between the derived package and this
+Software will exist.
+
+Warranty
+--------
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT.  IN NO EVENT SHALL NORMAN WALSH OR ANY OTHER
+CONTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

Modified: ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml?rev=1524112&r1=1524111&r2=1524112&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml (original)
+++ ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml Tue Sep 17 16:11:00 2013
@@ -198,8 +198,27 @@ under the License.
     <WebSiteContent webSiteId="OfbizSite" contentId="OFBIZ_HOME" webSiteContentTypeId="DEFAULT_PAGE" fromDate="2001-01-01 00:00:00"/>
 
     <!-- documents website -->
+    <DataResource dataResourceId="DOCBOOK_HTML_TEMPL" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/cmssite/template/docbook/html/docbook.xsl" dataTemplateTypeId="XSLT" statusId="CTNT_IN_PROGRESS" dataResourceName="Help template file" mimeTypeId="text/html" isPublic="Y"/>
+    <DataResource dataResourceId="DOCBOOK_PDF_TEMPL" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/cmssite/template/docbook/fo/docbook.xsl" dataTemplateTypeId="XSLT" statusId="CTNT_IN_PROGRESS" dataResourceName="Help template file" mimeTypeId="text/html" isPublic="Y"/>
+
     <DataResource dataResourceId="PUBLIC_DOCS" dataResourceTypeId="URL_RESOURCE" dataTemplateTypeId="SCREEN_COMBINED" objectInfo="component://cmssite/widget/CmssiteScreens.xml#publicDocs"/>
     <Content contentId="PUBLIC_DOCS" contentTypeId="DOCUMENT" contentName="OFBIz public documents" dataResourceId="PUBLIC_DOCS"/>
+
+    <DataResource dataResourceId="APACHE_OFBIZ" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/cmssite/documents/ApacheOfbiz.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Apache OFBiz document" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="APACHE_OFBIZ_HTML" contentTypeId="DOCUMENT" templateDataResourceId="DOCBOOK_HTML_TEMPL" dataResourceId="APACHE_OFBIZ" localeString="en" statusId="CTNT_IN_PROGRESS" contentName="The User &amp; Technical Apache OFBiz document in one page HTML" mimeTypeId="text/html"/>
+    <ContentAssoc contentId="DOCUMENTS" contentIdTo="APACHE_OFBIZ_HTML" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01" sequenceNum=""/>
+
+    <Content contentId="APACHE_OFBIZ_PDF" contentTypeId="DOCUMENT" templateDataResourceId="DOCBOOK_PDF_TEMPL" dataResourceId="APACHE_OFBIZ" localeString="en" statusId="CTNT_IN_PROGRESS" contentName="The general Apache document in PDF format" mimeTypeId="application/pdf"/>
+    <ContentAssoc contentId="DOCUMENTS" contentIdTo="APACHE_OFBIZ_PDF" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01" sequenceNum=""/>
+
+    <DataResource dataResourceId="APACHE_OFBIZ_TECH" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/cmssite/documents/ApacheOfbizTechnical.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Apache OFBiz document" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="APACHE_OFBIZ_T_HTML" contentTypeId="DOCUMENT" templateDataResourceId="DOCBOOK_HTML_TEMPL" dataResourceId="APACHE_OFBIZ_TECH" localeString="en" statusId="CTNT_IN_PROGRESS" contentName="The Apache OFBiz Technical Guide in one page HTML" mimeTypeId="text/html"/>
+    <ContentAssoc contentId="DOCUMENTS" contentIdTo="APACHE_OFBIZ_T_HTML" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01" sequenceNum=""/>
+    <DataResource dataResourceId="APACHE_OFBIZ_USER" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/cmssite/documents/ApacheOfbizUser.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Apache OFBiz User document" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="APACHE_OFBIZ_U_HTML" contentTypeId="DOCUMENT" templateDataResourceId="DOCBOOK_HTML_TEMPL" dataResourceId="APACHE_OFBIZ_USER" localeString="en" statusId="CTNT_IN_PROGRESS" contentName="The Apache OFBizUser Guide in one page HTML" mimeTypeId="text/html"/>
+    <ContentAssoc contentId="DOCUMENTS" contentIdTo="APACHE_OFBIZ_U_HTML" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01" sequenceNum=""/>
+
+
     <ContentAssoc contentId="CMSS_PPOINT" contentIdTo="PUBLIC_DOCS" contentAssocTypeId="SUB_CONTENT" fromDate="2001-01-01 00:00:00"/>
     <ContentAssoc contentId="CMSS_PPOINT" contentIdTo="APACHE_OFBIZ_HTML" contentAssocTypeId="SUB_CONTENT" fromDate="2001-01-01 00:00:00" mapKey="documents"/>
     <ContentAssoc contentId="CMSS_PPOINT" contentIdTo="APACHE_OFBIZ_PDF" contentAssocTypeId="SUB_CONTENT" fromDate="2001-01-01 00:00:00" mapKey="documents"/>

Propchange: ofbiz/trunk/specialpurpose/cmssite/documents/ApacheOfbiz.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/cmssite/documents/ApacheOfbiz.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/cmssite/documents/ApacheOfbiz.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: ofbiz/trunk/specialpurpose/cmssite/documents/ApacheOfbizTechnical.xml (from r1523953, ofbiz/trunk/applications/commonext/documents/ApacheOfbizTechnical.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/documents/ApacheOfbizTechnical.xml?p2=ofbiz/trunk/specialpurpose/cmssite/documents/ApacheOfbizTechnical.xml&p1=ofbiz/trunk/applications/commonext/documents/ApacheOfbizTechnical.xml&r1=1523953&r2=1524112&rev=1524112&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/documents/ApacheOfbizTechnical.xml (original)
+++ ofbiz/trunk/specialpurpose/cmssite/documents/ApacheOfbizTechnical.xml Tue Sep 17 16:11:00 2013
@@ -198,13 +198,12 @@ image=/boot/vmlinuzNew
     <xi:include href="../../../framework/entity/documents/EntityEngine.xml" />
     <xi:include href="../../../framework/service/documents/ServiceEngine.xml" />
     <xi:include href="../../../framework/webtools/documents/Webtools.xml" />
-    <xi:include href="../../../framework/testtools/documents/TestTools.xml" />
     <xi:include href="../../../framework/documents/UnitTest.xml" />
     <xi:include href="../../../framework/documents/SingleSignOn.xml" />
     <xi:include href="../../../framework/documents/DataFiles.xml"/>
 
     <appendix>
-        <xi:include href="../data/helpdata/HELP_OFBizDocumentationSystem.xml"/>
+        <xi:include href="../../../applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem.xml"/>
     </appendix>
     
     <appendix>

Propchange: ofbiz/trunk/specialpurpose/cmssite/documents/ApacheOfbizTechnical.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/cmssite/documents/ApacheOfbizTechnical.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/cmssite/documents/ApacheOfbizTechnical.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: ofbiz/trunk/specialpurpose/cmssite/documents/ApacheOfbizUser.xml (from r1523953, ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/documents/ApacheOfbizUser.xml?p2=ofbiz/trunk/specialpurpose/cmssite/documents/ApacheOfbizUser.xml&p1=ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml&r1=1523953&r2=1524112&rev=1524112&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/documents/ApacheOfbizUser.xml (original)
+++ ofbiz/trunk/specialpurpose/cmssite/documents/ApacheOfbizUser.xml Tue Sep 17 16:11:00 2013
@@ -41,7 +41,7 @@
         </para>
         
     </chapter>
-    <xi:include href="Setup.xml"/>
+    <xi:include href="../../../applications/commonext/documents/Setup.xml"/>
     <xi:include href="../../../applications/accounting/documents/Accounting.xml"/>
     <xi:include href="../../../applications/party/documents/Party.xml"/>
     <xi:include href="../../../applications/product/documents/Product.xml"/>
@@ -49,10 +49,10 @@
     <xi:include href="../../../applications/content/documents/Content.xml"/>
     <xi:include href="../../../applications/marketing/documents/Marketing.xml"/>
     <xi:include href="../../../applications/humanres/documents/Humanres.xml"/>
-    <xi:include href="../../../specialpurpose/myportal/documents/MyPortal.xml"/>
-    <xi:include href="../../../specialpurpose/projectmgr/documents/ProjectMgr.xml"/>
-    <xi:include href="../../../specialpurpose/ebay/documents/Ebay.xml"/>
-    <xi:include href="../../../specialpurpose/ebaystore/documents/EbayStore.xml"/>
+    <xi:include href="../../myportal/documents/MyPortal.xml"/>
+    <xi:include href="../../projectmgr/documents/ProjectMgr.xml"/>
+    <xi:include href="../../ebay/documents/Ebay.xml"/>
+    <xi:include href="../../ebaystore/documents/EbayStore.xml"/>
     
     <appendix>
         <title>New features recently added</title>

Propchange: ofbiz/trunk/specialpurpose/cmssite/documents/ApacheOfbizUser.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/cmssite/documents/ApacheOfbizUser.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/cmssite/documents/ApacheOfbizUser.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml