Author: jacopoc
Date: Tue Sep 17 16:14:47 2013
New Revision: 1524115
URL: http://svn.apache.org/r1524115
Log:
Backported rev. 1524112: removed from applications the docbook distribution
that is only required by a specialpurpose component (cmssite).
Removed:
ofbiz/branches/release13.07/applications/commonext/data/CommonExtSeedData.xml
ofbiz/branches/release13.07/applications/commonext/documents/ApacheOfbiz.xml
ofbiz/branches/release13.07/applications/commonext/documents/ApacheOfbizTechnical.xml
ofbiz/branches/release13.07/applications/commonext/documents/ApacheOfbizUser.xml
ofbiz/branches/release13.07/applications/content/template/docbook/
Modified:
ofbiz/branches/release13.07/LICENSE
ofbiz/branches/release13.07/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem.xml
ofbiz/branches/release13.07/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem_FR.xml
ofbiz/branches/release13.07/applications/commonext/ofbiz-component.xml
ofbiz/branches/release13.07/applications/content/data/ContentTypeData.xml
Modified: ofbiz/branches/release13.07/LICENSE
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/LICENSE?rev=1524115&r1=1524114&r2=1524115&view=diff
==============================================================================
--- ofbiz/branches/release13.07/LICENSE (original)
+++ ofbiz/branches/release13.07/LICENSE Tue Sep 17 16:14:47 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,
<n...@nwalsh.com>, and members of the DocBook Project,
<docbook-develop...@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/branches/release13.07/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem.xml?rev=1524115&r1=1524114&r2=1524115&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem.xml
(original)
+++
ofbiz/branches/release13.07/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem.xml
Tue Sep 17 16:14:47 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/branches/release13.07/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem_FR.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem_FR.xml?rev=1524115&r1=1524114&r2=1524115&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem_FR.xml
(original)
+++
ofbiz/branches/release13.07/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem_FR.xml
Tue Sep 17 16:14:47 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/branches/release13.07/applications/commonext/ofbiz-component.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/commonext/ofbiz-component.xml?rev=1524115&r1=1524114&r2=1524115&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/commonext/ofbiz-component.xml
(original)
+++ ofbiz/branches/release13.07/applications/commonext/ofbiz-component.xml Tue
Sep 17 16:14:47 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/branches/release13.07/applications/content/data/ContentTypeData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/content/data/ContentTypeData.xml?rev=1524115&r1=1524114&r2=1524115&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/content/data/ContentTypeData.xml
(original)
+++ ofbiz/branches/release13.07/applications/content/data/ContentTypeData.xml
Tue Sep 17 16:14:47 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"/>
