jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1576966 - in /jmeter/trunk: ./ licenses/bin/ res/maven/ src/components/org/apache/jmeter/extractor/ src/protocol/http/org/apache/jmeter/protocol/http/parser/
Date Wed, 12 Mar 2014 22:37:16 GMT
Author: pmouawad
Date: Wed Mar 12 22:37:16 2014
New Revision: 1576966

URL: http://svn.apache.org/r1576966
Log:
Upgrade to jodd 3.5
Add jodd-log dependency

Added:
    jmeter/trunk/licenses/bin/jodd-log-3.5.txt   (with props)
Modified:
    jmeter/trunk/build.properties
    jmeter/trunk/build.xml
    jmeter/trunk/eclipse.classpath
    jmeter/trunk/res/maven/ApacheJMeter_parent.pom
    jmeter/trunk/src/components/org/apache/jmeter/extractor/JoddExtractor.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java

Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1576966&r1=1576965&r2=1576966&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Wed Mar 12 22:37:16 2014
@@ -212,6 +212,11 @@ jodd-lagarto.jar            = jodd-lagar
 jodd-lagarto.loc            = ${maven2.repo}/org/jodd/jodd-lagarto/${jodd-lagarto.version}
 jodd-lagarto.md5            = fa3840315a84132bb4bcd9b537cb5c6d
 
+jodd-log.version           = 3.5
+jodd-log.jar               = jodd-log-${jodd-log.version}.jar
+jodd-log.loc               = ${maven2.repo}/org/jodd/jodd-log/${jodd-log.version}
+jodd-log.md5               = 8225aaad3fb9539381a740d6fdccb50f
+
 jsoup.version               = 1.7.3
 jsoup.jar                   = jsoup-${jsoup.version}.jar
 jsoup.loc                   = ${maven2.repo}/org/jsoup/jsoup/${jsoup.version}

Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1576966&r1=1576965&r2=1576966&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Wed Mar 12 22:37:16 2014
@@ -385,6 +385,7 @@
     <include name="${lib.dir}/${rhino.jar}"/>
     <include name="${lib.dir}/${jodd-core.jar}"/>
     <include name="${lib.dir}/${jodd-lagarto.jar}"/>
+    <include name="${lib.dir}/${jodd-log.jar}"/>
     <include name="${lib.dir}/${jsoup.jar}"/>
     <include name="${lib.dir}/${junit.jar}"/>
     <include name="${lib.dir}/${logkit.jar}"/>
@@ -456,6 +457,7 @@
     <pathelement location="${lib.dir}/${rhino.jar}"/>
     <pathelement location="${lib.dir}/${jodd-core.jar}"/>
     <pathelement location="${lib.dir}/${jodd-lagarto.jar}"/>
+    <pathelement location="${lib.dir}/${jodd-log.jar}"/>
     <pathelement location="${lib.dir}/${jsoup.jar}"/>
     <pathelement location="${lib.dir}/${junit.jar}"/>
     <pathelement location="${lib.dir}/${logkit.jar}"/>
@@ -2921,6 +2923,7 @@ run JMeter unless all the JMeter jars ar
         <process_jarfile jarname="rhino"/>
         <process_jarfile jarname="jodd-core"/>
         <process_jarfile jarname="jodd-lagarto"/>
+        <process_jarfile jarname="jodd-log"/>
         <process_jarfile jarname="jsoup"/>
         <process_jarfile jarname="junit"/>
         <process_jarfile jarname="logkit"/>

Modified: jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1576966&r1=1576965&r2=1576966&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Wed Mar 12 22:37:16 2014
@@ -72,6 +72,7 @@
 	<classpathentry kind="lib" path="lib/jdom-1.1.3.jar"/>
 	<classpathentry kind="lib" path="lib/jodd-core-3.5.jar"/>
 	<classpathentry kind="lib" path="lib/jodd-lagarto-3.5.jar"/>
+    <classpathentry kind="lib" path="lib/jodd-log-3.5.jar"/>
 	<classpathentry kind="lib" path="lib/jsoup-1.7.3.jar"/>
 	<classpathentry kind="lib" path="lib/jtidy-r938.jar"/>
 	<classpathentry kind="lib" path="lib/junit-4.11.jar"/>

Added: jmeter/trunk/licenses/bin/jodd-log-3.5.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/jodd-log-3.5.txt?rev=1576966&view=auto
==============================================================================
--- jmeter/trunk/licenses/bin/jodd-log-3.5.txt (added)
+++ jmeter/trunk/licenses/bin/jodd-log-3.5.txt Wed Mar 12 22:37:16 2014
@@ -0,0 +1 @@
+See jodd-core-3.4.10.txt
\ No newline at end of file

Propchange: jmeter/trunk/licenses/bin/jodd-log-3.5.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1576966&r1=1576965&r2=1576966&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Wed Mar 12 22:37:16 2014
@@ -82,6 +82,7 @@ under the License.
       <jdom.version>1.1.3</jdom.version>
       <jodd-core.version>3.5</jodd-core.version>
       <jodd-lagarto.version>3.5</jodd-lagarto.version>
+      <jodd-log.version>3.5</jodd-log.version>
       <jsoup.version>1.7.3</jsoup.version>
       <rhino.version>1.7R4</rhino.version>
       <junit.version>4.11</junit.version>
@@ -361,6 +362,11 @@ under the License.
         <version>${jodd-lagarto.version}</version>
       </dependency>
       <dependency>
+        <groupId>org.jodd</groupId>
+        <artifactId>jodd-log</artifactId>
+        <version>${jodd-log.version}</version>
+      </dependency>
+      <dependency>
         <groupId>org.mongodb</groupId>
         <artifactId>mongo-java-driver</artifactId>
         <version>${mongo-java-driver.version}</version>

Modified: jmeter/trunk/src/components/org/apache/jmeter/extractor/JoddExtractor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/JoddExtractor.java?rev=1576966&r1=1576965&r2=1576966&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/JoddExtractor.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/JoddExtractor.java Wed Mar 12
22:37:16 2014
@@ -23,6 +23,8 @@ import java.util.List;
 import jodd.lagarto.dom.LagartoDOMBuilder;
 import jodd.lagarto.dom.Node;
 import jodd.lagarto.dom.NodeSelector;
+import jodd.log.LoggerFactory;
+import jodd.log.impl.Slf4jLoggerFactory;
 
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jorphan.util.JOrphanUtils;
@@ -40,6 +42,10 @@ public class JoddExtractor implements Ex
     private static final long serialVersionUID = -7235814605293262972L;
 
     private static final String CACHE_KEY_PREFIX = JoddExtractor.class.getName()+"_PARSED_BODY";
+    
+    static {
+        LoggerFactory.setLoggerFactory(new Slf4jLoggerFactory());
+    }
 
     /**
      * 

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java?rev=1576966&r1=1576965&r2=1576966&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
Wed Mar 12 22:37:16 2014
@@ -27,6 +27,8 @@ import jodd.lagarto.EmptyTagVisitor;
 import jodd.lagarto.LagartoException;
 import jodd.lagarto.LagartoParser;
 import jodd.lagarto.Tag;
+import jodd.log.LoggerFactory;
+import jodd.log.impl.Slf4jLoggerFactory;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.protocol.http.util.ConversionUtils;
@@ -39,6 +41,9 @@ import org.apache.log.Logger;
  */
 public class LagartoBasedHtmlParser extends HTMLParser {
     private static final Logger log = LoggingManager.getLoggerForClass();
+    static {
+        LoggerFactory.setLoggerFactory(new Slf4jLoggerFactory());
+    }
 
     /*
      * A dummy class to pass the pointer of URL.



Mime
View raw message