OFBiz › OFBiz - Commits

svn commit: r809136 - in /ofbiz/trunk: LICENSE applications/accounting/data/helpdata/HELP_ACCOUNTING.xml applications/content/webapp/content/WEB-INF/controller.xml framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

hansbak-2

svn commit: r809136 - in /ofbiz/trunk: LICENSE applications/accounting/data/helpdata/HELP_ACCOUNTING.xml applications/content/webapp/content/WEB-INF/controller.xml framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java

Author: hansbak
Date: Sat Aug 29 14:45:00 2009
New Revision: 809136

URL: http://svn.apache.org/viewvc?rev=809136&view=rev
Log:
updated license files and improved docbook pdf generation: still however an empty pdf document

Modified:
ofbiz/trunk/LICENSE
ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING.xml
ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java

Modified: ofbiz/trunk/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=809136&r1=809135&r2=809136&view=diff
==============================================================================
--- ofbiz/trunk/LICENSE (original)
+++ ofbiz/trunk/LICENSE Sat Aug 29 14:45:00 2009
@@ -90,7 +90,7 @@
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 @@
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,
+<[hidden email]>, and members of the DocBook Project,
+<[hidden email]>
+===============================================================
+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)

Modified: ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING.xml?rev=809136&r1=809135&r2=809136&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING.xml (original)
+++ ofbiz/trunk/applications/accounting/data/helpdata/HELP_ACCOUNTING.xml Sat Aug 29 14:45:00 2009
@@ -20,12 +20,8 @@
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd">
- <title>
- The Accounting Manager.
- </title>
<para>
-
- The accounting manager
+ The help screen text
</para>
</section>

Modified: ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml?rev=809136&r1=809135&r2=809136&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml Sat Aug 29 14:45:00 2009
@@ -1966,7 +1966,7 @@
<view-map name="EditDocument" type="screen" page="component://content/widget/content/ContentScreens.xml#EditDocument"/>
<view-map name="ListDocument" type="screen" page="component://content/widget/content/ContentScreens.xml#ListDocument"/>
<view-map name="showContent" type="screen" page="component://content/widget/content/ContentScreens.xml#ShowContent"/>
- <view-map name="showContentPdf" type="screen" page="component://content/widget/content/ContentScreens.xml#ShowContent" content-type="application/pdf" encoding="none"/>
+ <view-map name="showContentPdf" type="screen" page="component://content/widget/content/ContentScreens.xml#ShowContent" content-type="application/pdf"/>


</site-conf>

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java?rev=809136&r1=809135&r2=809136&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java Sat Aug 29 14:45:00 2009
@@ -1118,7 +1118,7 @@
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 @@
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 @@
fend.write(baos.toString());
fend.close();

-*/
+
} catch(Exception e) {
Debug.logError("================================Exception: " + e, module);
}