Index: lams_svggenerator/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_svggenerator/build.xml,v diff -u -r1.2 -r1.3 --- lams_svggenerator/build.xml 3 Sep 2010 18:11:54 -0000 1.2 +++ lams_svggenerator/build.xml 13 Sep 2010 18:26:55 -0000 1.3 @@ -49,16 +49,7 @@ - - - - - - - - - - + @@ -79,4 +70,24 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: lams_svggenerator/conf/batikjar/META-INF/LICENSE =================================================================== RCS file: /usr/local/cvsroot/lams_svggenerator/conf/batikjar/META-INF/LICENSE,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_svggenerator/conf/batikjar/META-INF/LICENSE 13 Sep 2010 18:26:55 -0000 1.1 @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file Index: lams_svggenerator/conf/batikjar/META-INF/MANIFEST.MF =================================================================== RCS file: /usr/local/cvsroot/lams_svggenerator/conf/batikjar/META-INF/MANIFEST.MF,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_svggenerator/conf/batikjar/META-INF/MANIFEST.MF 13 Sep 2010 18:26:55 -0000 1.1 @@ -0,0 +1,11 @@ +Manifest-Version: 1.0 +Ant-Version: Apache Ant 1.6.5 +Created-By: 1.4.2_12-b03 (Sun Microsystems Inc.) +Implementation-Title: Batik +Implementation-Version: 1.7+r608262 +Implementation-Vendor: The Apache Software Foundation (http://xmlgraph + ics.apache.org/batik/) +Build-Id: 20080106-111140-EST (cam [Linux 2.6.22.8 i386, Java 1.4.2_12 + -b03]) +Comment: Original libraries batik-anim.jar batik-awt-util.jar batik-bridge.jar batik-codec.jar batik-css.jar batik-dom.jar batik-ext.jar batik-gvt.jar batik-parser.jar batik-script.jar batik-svg-dom.jar batik-transcoder.jar batik-util.jar batik-xml.jar +Class-Path: \ No newline at end of file Index: lams_svggenerator/conf/batikjar/META-INF/NOTICE =================================================================== RCS file: /usr/local/cvsroot/lams_svggenerator/conf/batikjar/META-INF/NOTICE,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_svggenerator/conf/batikjar/META-INF/NOTICE 13 Sep 2010 18:26:55 -0000 1.1 @@ -0,0 +1,18 @@ +Apache Batik +Copyright 1999-2007 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +This software contains code from the World Wide Web Consortium (W3C) for the +Document Object Model API (DOM API) and SVG Document Type Definition (DTD). + +This software contains code from the International Organisation for +Standardization for the definition of character entities used in the software's +documentation. + +This product includes images from the Tango Desktop Project +(http://tango.freedesktop.org/). + +This product includes images from the Pasodoble Icon Theme +(http://www.jesusda.com/projects/pasodoble). Index: lams_svggenerator/lib/batik-anim.jar =================================================================== RCS file: /usr/local/cvsroot/lams_svggenerator/lib/batik-anim.jar,v diff -u Binary files differ Index: lams_svggenerator/lib/batik-awt-util.jar =================================================================== RCS file: /usr/local/cvsroot/lams_svggenerator/lib/batik-awt-util.jar,v diff -u Binary files differ Index: lams_svggenerator/lib/batik-bridge.jar =================================================================== RCS file: /usr/local/cvsroot/lams_svggenerator/lib/batik-bridge.jar,v diff -u Binary files differ Index: lams_svggenerator/lib/batik-codec.jar =================================================================== RCS file: /usr/local/cvsroot/lams_svggenerator/lib/batik-codec.jar,v diff -u Binary files differ Index: lams_svggenerator/lib/batik-css.jar =================================================================== RCS file: /usr/local/cvsroot/lams_svggenerator/lib/batik-css.jar,v diff -u Binary files differ Index: lams_svggenerator/lib/batik-dom.jar =================================================================== RCS file: /usr/local/cvsroot/lams_svggenerator/lib/batik-dom.jar,v diff -u Binary files differ Index: lams_svggenerator/lib/batik-ext.jar =================================================================== RCS file: /usr/local/cvsroot/lams_svggenerator/lib/batik-ext.jar,v diff -u Binary files differ Index: lams_svggenerator/lib/batik-gvt.jar =================================================================== RCS file: /usr/local/cvsroot/lams_svggenerator/lib/batik-gvt.jar,v diff -u Binary files differ Index: lams_svggenerator/lib/batik-parser.jar =================================================================== RCS file: /usr/local/cvsroot/lams_svggenerator/lib/batik-parser.jar,v diff -u Binary files differ Index: lams_svggenerator/lib/batik-script.jar =================================================================== RCS file: /usr/local/cvsroot/lams_svggenerator/lib/batik-script.jar,v diff -u Binary files differ Index: lams_svggenerator/lib/batik-svg-dom.jar =================================================================== RCS file: /usr/local/cvsroot/lams_svggenerator/lib/batik-svg-dom.jar,v diff -u Binary files differ Index: lams_svggenerator/lib/batik-transcoder.jar =================================================================== RCS file: /usr/local/cvsroot/lams_svggenerator/lib/batik-transcoder.jar,v diff -u Binary files differ Index: lams_svggenerator/lib/batik-util.jar =================================================================== RCS file: /usr/local/cvsroot/lams_svggenerator/lib/batik-util.jar,v diff -u Binary files differ Index: lams_svggenerator/lib/batik-xml.jar =================================================================== RCS file: /usr/local/cvsroot/lams_svggenerator/lib/batik-xml.jar,v diff -u Binary files differ Index: lams_svggenerator/src/java/org/lamsfoundation/lams/svg/CommanLineSVGGenerator.java =================================================================== RCS file: /usr/local/cvsroot/lams_svggenerator/src/java/org/lamsfoundation/lams/svg/CommanLineSVGGenerator.java,v diff -u -r1.4 -r1.5 --- lams_svggenerator/src/java/org/lamsfoundation/lams/svg/CommanLineSVGGenerator.java 3 Sep 2010 17:51:19 -0000 1.4 +++ lams_svggenerator/src/java/org/lamsfoundation/lams/svg/CommanLineSVGGenerator.java 13 Sep 2010 18:26:55 -0000 1.5 @@ -24,17 +24,16 @@ /* $Id$ */ -import java.io.BufferedWriter; -import java.io.FileWriter; +import java.io.FileOutputStream; import java.io.IOException; +import java.io.OutputStream; +import org.apache.batik.transcoder.TranscoderException; import org.apache.commons.cli.BasicParser; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; -import org.apache.xml.serialize.OutputFormat; -import org.apache.xml.serialize.XMLSerializer; import org.jdom.JDOMException; import org.lamsfoundation.lams.learningdesign.dto.LearningDesignDTO; import org.lamsfoundation.lams.util.FileUtil; @@ -47,14 +46,13 @@ */ public class CommanLineSVGGenerator { - public static void main(String[] args) throws JDOMException, IOException, ParseException { + public static void main(String[] args) throws JDOMException, IOException, ParseException, TranscoderException { Options options = new Options(); options.addOption("file", true, "* Absolute path to file"); options.addOption("width", true, "SVG width"); - options.addOption("height", true, "SVG height"); - options.addOption("scale", true, "scale"); + options.addOption("output", true, "Directory to output resulted files"); BasicParser parser = new BasicParser(); CommandLine cl = parser.parse(options, args); @@ -66,13 +64,12 @@ } String fullFilePath = cl.getOptionValue("file"); - String width = cl.getOptionValue("width"); - String height = cl.getOptionValue("height"); - Double scale = null; - if (cl.hasOption("scale")) { - String scaleStr = cl.getOptionValue("scale"); + String outputOption = cl.getOptionValue("output"); + String widthStr = cl.getOptionValue("width"); + Integer width = null; + if (widthStr != null) { try { - scale = Double.valueOf(scaleStr); + width = Integer.valueOf(widthStr); } catch (NumberFormatException e) { HelpFormatter f = new HelpFormatter(); f.printHelp("java -jar lams-svggenerator.jar", options); @@ -82,36 +79,29 @@ LearningDesignDTO learningDesign = (LearningDesignDTO) FileUtil.getObjectFromXML(null, fullFilePath); - SVGGenerator svgGenerator = new SVGGenerator(); - svgGenerator.setSVGDocumentParameters(width, height, scale); - svgGenerator.generateSvg(learningDesign); + SVGGenerator svgGenerator = new SVGGenerator(); + svgGenerator.adjustDocumentWidth(width); + svgGenerator.generateSvgDom(learningDesign); - // // Stream out svg document to display - // OutputFormat format = new OutputFormat(svgGenerator.getSVGDocument()); - // format.setLineWidth(65); - // format.setIndenting(true); - // format.setIndent(2); - // Writer out = new StringWriter(); - // XMLSerializer serializer = new XMLSerializer(out, format); - // serializer.serialize(svgGenerator.getSVGDocument()); - // System.out.println(out.toString()); - - OutputFormat format = new OutputFormat(svgGenerator.getSVGDocument()); - format.setLineWidth(65); - format.setIndenting(true); - format.setIndent(2); - // Create file - String svgFileName = FileUtil.getFileName(fullFilePath); - String fileExtension = FileUtil.getFileExtension(svgFileName); - svgFileName = svgFileName.replaceFirst(fileExtension + "$", "svg"); - String svgFileFullPath = FileUtil.getFullPath(FileUtil.getFileDirectory(fullFilePath), svgFileName); - FileWriter fstream = new FileWriter(svgFileFullPath); - BufferedWriter out = new BufferedWriter(fstream); - XMLSerializer serializer = new XMLSerializer(out, format); - serializer.serialize(svgGenerator.getSVGDocument()); - System.out.println("Creating a file " + svgFileFullPath ); - // Close the output stream - out.close(); + // Create output file + String fileName = FileUtil.getFileName(fullFilePath); + String fileExtension = FileUtil.getFileExtension(fileName); + String svgFileName = fileName.replaceFirst(fileExtension + "$", "svg"); + String svgOutputPath = (outputOption == null) + ? FileUtil.getFullPath(FileUtil.getFileDirectory(fullFilePath), svgFileName) + : FileUtil.getFullPath(outputOption, svgFileName); + OutputStream svgOutputStream = new FileOutputStream(svgOutputPath); + svgGenerator.streamOutDocument(svgOutputStream, SVGGenerator.OUTPUT_FORMAT_SVG); + System.out.println("Creating a file " + svgOutputPath); + + String pngFileName = fileName.replaceFirst(fileExtension + "$", "png"); + String pngOutputPath = (outputOption == null) + ? FileUtil.getFullPath(FileUtil.getFileDirectory(fullFilePath), pngFileName) + : FileUtil.getFullPath(outputOption, pngFileName); + OutputStream pngOutputStream = new FileOutputStream(pngOutputPath); + svgGenerator.streamOutDocument(pngOutputStream, SVGGenerator.OUTPUT_FORMAT_PNG); + System.out.println("Creating a file " + pngOutputPath); + } }