Replaced commons-logging with slf4j

Split CLI into separate module git-svn-id: https://jodreports.svn.sourceforge.net/svnroot/jodreports/trunk@54 d507b1d9-9123-0410-be71-93f138d682fd
jodreports · Jan 26, 2011 · c6372da · c6372da
1 parent bdc9a1a
commit c6372da
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 146 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,3 +1,11 @@
+2.4.0
+---
+Improvement
+  * Replaced commons-logging with slf4j
+  * Split CLI into separate module
+  * Support more attribute NamespaceURI in tag attribute replacement.
+	(Available Namespaces: draw, script, table, text, style, xlink)
+
 2.3.0
 ---
 

diff --git a/README.txt b/README.txt
@@ -1,4 +1,4 @@
-This is JODReports version 2.2.1, released on 2010-01-13
+This is JODReports version 2.4.0, released on 2011-01-26
 
 Please see
 
@@ -12,9 +12,9 @@ Requirements
 JODReports requires Java 1.4 or later (although with minor modifications
 it can be made to work with 1.3 as well).
 
-To create documents in formats other than OpenDocument Text (odt) an
-OpenOffice.org instance running as a service is also required
-See http://www.artofsolving.com/node/7 for more info.
+To create documents in formats other than OpenDocument Text (odt) 
+please use JODConverter library
+See http://www.artofsolving.com/opensource/jodconverter for more info.
 
 To run the webapp a servlet 2.3 container such as Apache Tomcat 4.1
 or later is also required.
@@ -35,34 +35,17 @@ own webapp without restrictions.)
 JODReports includes the following third-party libraries so you must
 agree to their respective licenses as well
 
- * OpenOffice.org Java/UNO bridge - http://www.openoffice.org
-   GNU LGPL
-
  * FreeMarker - http://www.freemarker.org
    BSD-style
 
- * Jakarta Commons - IO, Logging and FileUpload - http://jakarta.apache.org/commons/
+ * Jakarta Commons - IO and FileUpload - http://jakarta.apache.org/commons/
    Apache License 2.0
 
  * XOM - http://xom.nu
    GNU LGPL
 
  * slf4j - http://slf4j.org
-   optional (used by JODConverter) - MIT License
-
- * Spring Framework - http://www.springframework.org
-   Apache License 2.0
-
- * XStream - http://xstream.codehaus.org
-   only if you use XmlDocumentFormatRegistry - BSD-style (revised) 
-
- * JFreeChart - http://www.jfree.org/jfreechart/
-   optional (used by report sample) - GNU LGPL
-
- * PDFBox - http://www.pdfbox.org
-   optional (used by unit tests) - BSD-style (revised)
-
-Third-party licenses are included in lib/licenses.
+   MIT License
 
 In compliance to some of the above licenses I also need to state here
 that JODReports includes software developed by
@@ -72,4 +55,4 @@ that JODReports includes software developed by
  * the Spring Framework project (http://www.springframework.org)
 
 -- Mirko Nasato (mirko at artofsolving.com)
--- Terry Liang (terry at polonious.com.au)
+-- Terry Liang (terry at poloniouslive.com)
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
   <artifactId>jodreports</artifactId>
   <packaging>jar</packaging>
   <name>JODReports</name>
-  <version>2.3.1-SNAPSHOT</version>
+  <version>2.4.0</version>
   <description>
     JODReports generates dynamic documents and reports based on the
     OpenDocument Format and FreeMarker.
@@ -21,7 +21,7 @@
   <scm>
     <url>http://jodreports.svn.sourceforge.net</url>
     <connection>
-    	scm:svn:https://jodreports.svn.sourceforge.net/svnroot/jodreports/trunk/jodreports
+    	scm:svn:https://jodreports.svn.sourceforge.net/svnroot/jodreports/tags/2.4.0/jodreports
     </connection>
   </scm>
   <developers>
@@ -33,33 +33,15 @@
     <developer>
       <id>terryliang</id>
       <name>Yongtai Liang</name>
-      <email>terry@polonious.com.au</email>
+      <email>terry@poloniouslive.com</email>
     </developer>
   </developers>
   <dependencies>
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1</version>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.6.1</version>
       <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>avalon-framework</groupId>
-          <artifactId>avalon-framework</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>logkit</groupId>
-          <artifactId>logkit</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>servlet-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
@@ -79,25 +61,17 @@
       <version>1.2.5</version>
       <scope>compile</scope>
       <exclusions>
-        <exclusion>
-          <groupId>jaxen</groupId>
-          <artifactId>jaxen</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>xalan</groupId>
           <artifactId>xalan</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>xerces</groupId>
-          <artifactId>xerces</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>xerces</groupId>
           <artifactId>xercesImpl</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>xerces</groupId>
-          <artifactId>xmlParserAPIs</artifactId>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -107,6 +81,12 @@
       <version>3.8.2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jdk14</artifactId>
+      <version>1.6.1</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -118,20 +98,6 @@
           <target>1.4</target>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifest>
-              <mainClass>
-                net.sf.jooreports.tools.CreateDocument
-              </mainClass>
-              <addClasspath>true</addClasspath>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
   <reporting>

diff --git a/src/main/java/net/sf/jooreports/templates/TemplateFreemarkerNamespace.java b/src/main/java/net/sf/jooreports/templates/TemplateFreemarkerNamespace.java
@@ -5,8 +5,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Element;
 
 import net.sf.jooreports.templates.image.FileImageSource;
@@ -21,7 +21,7 @@
 public class TemplateFreemarkerNamespace {
 
 	public static final String NAME = "jooscript";
-	private static final Log log = LogFactory.getLog(TemplateFreemarkerNamespace.class);
+	private static final Logger log = LoggerFactory.getLogger(TemplateFreemarkerNamespace.class);
 	private final Map configurations;
 
 	private int imageIndex = 0;

diff --git a/src/main/java/net/sf/jooreports/templates/xmlfilters/DynamicImageFilter.java b/src/main/java/net/sf/jooreports/templates/xmlfilters/DynamicImageFilter.java
@@ -7,8 +7,8 @@
 import nu.xom.Element;
 import nu.xom.Nodes;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Processes content.xml for dynamic images<p>
@@ -31,7 +31,7 @@ public class DynamicImageFilter extends XmlEntryFilter {
 	private static final String IMAGE_WIDTH_PREFIX	= TemplateFreemarkerNamespace.NAME + ".imageWidth(";
 	private static final String IMAGE_HEIGHT_PREFIX = TemplateFreemarkerNamespace.NAME + ".imageHeight(";
 
-	private static final Log log = LogFactory.getLog(DynamicImageFilter.class);
+	private static final Logger log = LoggerFactory.getLogger(DynamicImageFilter.class);
 
 	public void doFilter(Document document) {
 		Nodes nodes = document.query("//draw:image", OpenDocumentNamespaces.XPATH_CONTEXT);

diff --git a/src/main/java/net/sf/jooreports/templates/xmlfilters/ScriptTagFilter.java b/src/main/java/net/sf/jooreports/templates/xmlfilters/ScriptTagFilter.java
@@ -36,8 +36,8 @@
 import nu.xom.Nodes;
 import nu.xom.ParentNode;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * OpenDocument XML entry filter that replaces <tt>script</tt> elements with FreeMarker directives.
@@ -49,7 +49,7 @@
  */
 public class ScriptTagFilter extends XmlEntryFilter {
 
-	private static final Log log = LogFactory.getLog(ScriptTagFilter.class);
+	private static final Logger log = LoggerFactory.getLogger(ScriptTagFilter.class);
 
 	private final Map/*<String,JooScriptTag>*/ tags;
 

diff --git a/src/main/java/net/sf/jooreports/tools/CreateDocument.java b/src/main/java/net/sf/jooreports/tools/CreateDocument.java
diff --git a/src/test/java/net/sf/jooreports/opendocument/OpenDocumentIOTest.java b/src/test/java/net/sf/jooreports/opendocument/OpenDocumentIOTest.java
@@ -6,10 +6,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Writer;
-import java.util.Enumeration;
 import java.util.Set;
 import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
 import java.util.zip.ZipInputStream;
 
 import junit.framework.TestCase;