Updated DataVision to 1.0.0; removed MinML2 jars that was only needed…

… by the old DataVision jar.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@536788 13f79535-47bb-0310-9956-ffa450edef68

.classpath

@@ -36,8 +36,7 @@
 	<classpathentry kind="src" path="framework/widget/src"/>
 	<classpathentry kind="src" path="framework/workflow/src"/>
 	<classpathentry kind="lib" path="framework/webapp/lib/velocity-1.5.jar"/>
-	<classpathentry kind="lib" path="framework/webapp/lib/MinML2.jar"/>
-	<classpathentry kind="lib" path="framework/webapp/lib/DataVision-0.7.8.jar"/>
+	<classpathentry kind="lib" path="framework/webapp/lib/DataVision-1.0.0.jar"/>
 	<classpathentry kind="lib" path="framework/webapp/lib/batik-all-1.6.jar"/>
 	<classpathentry kind="lib" path="framework/service/lib/wsdl4j.jar"/>
 	<classpathentry kind="lib" path="framework/service/lib/axis-ant.jar"/>

LICENSE

@@ -301,7 +301,7 @@ ofbiz/trunk/framework/catalina/lib/jasper-compiler.jar
 ofbiz/trunk/framework/jetty/lib/jasper-compiler.jar
 ofbiz/trunk/framework/catalina/lib/jasper-runtime.jar
 ofbiz/trunk/framework/jetty/lib/jasper-runtime.jar
-ofbiz/trunk/framework/webapp/lib/DataVision-0.7.8.jar
+ofbiz/trunk/framework/webapp/lib/DataVision-1.0.0.jar
 =========================================================================
 Apache Software License
 
@@ -418,7 +418,6 @@ ofbiz/trunk/framework/base/lib/httpunit.jar
 ofbiz/trunk/framework/base/lib/freemarker-2.3.10.jar
 ofbiz/trunk/framework/base/lib/junitperf.jar
 ofbiz/trunk/specialpurpose/pos/lib/looks-2.0.2.jar
-ofbiz/trunk/framework/webapp/lib/MinML2.jar
 ofbiz/trunk/framework/base/lib/javolution-4.2.8.jar
 ofbiz/trunk/framework/images/webapp/images/dojo/*
 =========================================================================

NOTICE

@@ -196,3 +196,42 @@ framework\images\webapp\images\calendar1.js
 This product incudes software developed by
 Douglas Crockford (http://www.crockford.com).
 
+=========================================================================
+==  DataVision Notice                                                  ==
+=========================================================================
+
+Icons
+
+DataVision uses graphic images developed by Sun. The image files are copied
+into DataVision.jar.
+
+Copyright 2000 by Sun Microsystems, Inc. All Rights Reserved.
+
+Sun grants you (``Licensee'') a non-exclusive, royalty free, license to use,
+and redistribute this software graphics artwork, as individual graphics or
+as a collection, as part of software code or programs that you develop,
+provided that i) this copyright notice and license accompany the software
+graphics artwork; and ii) you do not utilize the software graphics artwork
+in a manner which is disparaging to Sun. Unless enforcement is prohibited
+by applicable law, you may not modify the graphics, and must use them true
+to color and unmodified in every way.
+
+This software graphics artwork is provided ``AS IS,'' without a warranty of
+any kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
+WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR
+A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN AND ITS
+LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A
+RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE GRAPHICS ARTWORK.
+
+IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE,
+PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL
+OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE GRAPHICS
+ARTWORK, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+If any of the above provisions are held to be in violation of applicable
+law, void, or unenforceable in any jurisdiction, then such provisions are
+waived to the extent necessary for this Disclaimer to be otherwise
+enforceable in such jurisdiction.
+
+================================================================

framework/webapp/src/org/ofbiz/webapp/view/DataVisionViewHandler.java

@@ -18,6 +18,7 @@
  *******************************************************************************/
 package org.ofbiz.webapp.view;
 
+import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import javax.servlet.ServletContext;
@@ -83,7 +84,7 @@ public void render(String name, String page, String info, String contentType, St
             */
 
             Debug.logInfo("before reading file", module);
-            report.readFile(context.getRealPath(page)); // Must be after password
+            report.read(new File(context.getRealPath(page))); // Must be after password
 
             /* NO support for param file yet... need to pull in page params or something
              if (there_are_params_in_report) {