From 841efcfafdabeddcc8560f2cfcf341f8d0408aaa Mon Sep 17 00:00:00 2001 From: Hans Bakker Date: Sat, 29 Aug 2009 14:45:00 +0000 Subject: [PATCH] updated license files and improved docbook pdf generation: still however an empty pdf document git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@809136 13f79535-47bb-0310-9956-ffa450edef68 --- LICENSE | 59 ++++++++++++++++++- .../data/helpdata/HELP_ACCOUNTING.xml | 6 +- .../webapp/content/WEB-INF/controller.xml | 2 +- .../widget/screen/ModelScreenWidget.java | 6 +- 4 files changed, 63 insertions(+), 10 deletions(-) diff --git a/LICENSE b/LICENSE index c4b6c1314a..fb44e27348 100644 --- a/LICENSE +++ b/LICENSE @@ -90,7 +90,7 @@ ofbiz/trunk/framework/webapp/lib/json-lib-2.2.3-jdk15.jar ofbiz/trunk/framework/webapp/lib/ezmorph-0.9.1.jar ofbiz/trunk/framework/webapp/lib/rome-0.9.jar ofbiz/trunk/framework/webapp/lib/serializer-2.7.0.jar -ofbiz/trunk/framework/webapp/lib/xalan-2.7.0.jar +ofbiz/trunk/framework/webapp/lib/xalan-2.7.1.jar ofbiz/trunk/framework/webapp/lib/xmlrpc-client-3.0.jar ofbiz/trunk/framework/webapp/lib/xmlrpc-common-3.0.jar ofbiz/trunk/framework/webapp/lib/xmlrpc-server-3.0.jar @@ -2573,3 +2573,60 @@ Apache Ofbiz includes jsr166 backport support library from http://backport-jsr166.sourceforge.net/ framework/base/lib/backport-util-concurrent-Java50-3.1.jar This file is licensed into the public domain. +==================================================================================== +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, +, and members of the DocBook Project, + +=============================================================== +The docbook schemas in te file docbook.xsd, docbook.dtd xlink.xsl +and xml.xsl are distributed under the GNU Free Documentation License +GNU Free Documentation License +It was allowed by the author to use the docbook files within the +Apache OFBiz system in an email to H.Bakker from N.Walsh dd +Tue, 25 Aug 2009 07:27:51 -0400 (18:27 ICT) diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING.xml index 8a3f4459e7..7264ce482e 100644 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING.xml +++ b/applications/accounting/data/helpdata/HELP_ACCOUNTING.xml @@ -20,12 +20,8 @@
- - The Accounting Manager. - - - The accounting manager + The help screen text
diff --git a/applications/content/webapp/content/WEB-INF/controller.xml b/applications/content/webapp/content/WEB-INF/controller.xml index 37508c370f..d1d15498f6 100644 --- a/applications/content/webapp/content/WEB-INF/controller.xml +++ b/applications/content/webapp/content/WEB-INF/controller.xml @@ -1966,7 +1966,7 @@ under the License. - + diff --git a/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java b/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java index 1d0619f75f..9247c6070a 100644 --- a/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java +++ b/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java @@ -1118,7 +1118,7 @@ public abstract class ModelScreenWidget extends ModelWidget implements Serializa if (mimeTypeId.equals("application/pdf")) { TransformerFactory tfactory = TransformerFactory.newInstance(); try{ -/* + // // this part is not working. If somebody can help to make it work? // currently using only real temp files for debugging purposes. @@ -1154,7 +1154,7 @@ public abstract class ModelScreenWidget extends ModelWidget implements Serializa Debug.log("================start fo processor============================="); ByteArrayOutputStream baos = new ByteArrayOutputStream(); StreamSource src = new StreamSource("/tmp/file1.fo"); - FopFactory fopFactory = ApacheFopWorker.getFactoryInstance(); + FopFactory fopFactory = FopFactory.newInstance(); FOUserAgent foUserAgent = fopFactory.newFOUserAgent(); Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, foUserAgent, baos); TransformerFactory factory = TransformerFactory.newInstance(); @@ -1169,7 +1169,7 @@ public abstract class ModelScreenWidget extends ModelWidget implements Serializa fend.write(baos.toString()); fend.close(); -*/ + } catch(Exception e) { Debug.logError("================================Exception: " + e, module); }