You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2013/07/13 13:12:49 UTC
svn commit: r1502773 - in /jmeter/trunk: build.properties build.xml lib/
lib/doc/ xdocs/changes.xml
Author: sebb
Date: Sat Jul 13 11:12:49 2013
New Revision: 1502773
URL: http://svn.apache.org/r1502773
Log:
Commons-lang 2.6 is only needed for document generation, so move to lib/docs
Modified:
jmeter/trunk/build.properties
jmeter/trunk/build.xml
jmeter/trunk/lib/ (props changed)
jmeter/trunk/lib/doc/ (props changed)
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1502773&r1=1502772&r2=1502773&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sat Jul 13 11:12:49 2013
@@ -102,11 +102,6 @@ commons-jexl2.jar = commons-je
commons-jexl2.loc = ${maven2.repo}/org/apache/commons/commons-jexl/${commons-jexl2.version}
commons-jexl2.md5 = 4ad8f5c161dd3a50e190334555675db9
-commons-lang.version = 2.6
-commons-lang.jar = commons-lang-${commons-lang.version}.jar
-commons-lang.loc = ${maven2.repo}/commons-lang/commons-lang/${commons-lang.version}
-commons-lang.md5 = 4d5c1693079575b362edf41500630bbd
-
commons-lang3.version = 3.1
commons-lang3.jar = commons-lang3-${commons-lang3.version}.jar
commons-lang3.loc = ${maven2.repo}/org/apache/commons/commons-lang3/${commons-lang3.version}
@@ -322,3 +317,9 @@ velocity.version = 1.7
velocity.jar = velocity-${velocity.version}.jar
velocity.loc = ${maven2.repo}/org/apache/velocity/velocity/${velocity.version}
velocity.md5 = 3692dd72f8367cb35fb6280dc2916725
+
+# required by Velocity
+commons-lang.version = 2.6
+commons-lang.jar = commons-lang-${commons-lang.version}.jar
+commons-lang.loc = ${maven2.repo}/commons-lang/commons-lang/${commons-lang.version}
+commons-lang.md5 = 4d5c1693079575b362edf41500630bbd
Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1502773&r1=1502772&r2=1502773&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sat Jul 13 11:12:49 2013
@@ -362,7 +362,6 @@
<include name="${lib.dir}/${commons-io.jar}"/>
<include name="${lib.dir}/${commons-jexl.jar}"/>
<include name="${lib.dir}/${commons-jexl2.jar}"/>
- <include name="${lib.dir}/${commons-lang.jar}"/>
<include name="${lib.dir}/${commons-lang3.jar}"/>
<include name="${lib.dir}/${commons-logging.jar}"/>
<include name="${lib.dir}/${commons-net.jar}"/>
@@ -2857,7 +2856,6 @@ run JMeter unless all the JMeter jars ar
<process_jarfile jarname="commons-io"/>
<process_jarfile jarname="commons-jexl"/>
<process_jarfile jarname="commons-jexl2"/>
- <process_jarfile jarname="commons-lang"/>
<process_jarfile jarname="commons-lang3"/>
<process_jarfile jarname="commons-logging"/>
<process_jarfile jarname="commons-net"/>
@@ -2889,6 +2887,7 @@ run JMeter unless all the JMeter jars ar
<process_jarfile jarname="tika-core"/>
<process_jarfile jarname="tika-parsers"/>
<process_jarfile jarname="velocity" dest.dir="${lib.doc}"/>
+ <process_jarfile jarname="commons-lang" dest.dir="${lib.doc}"/>
<process_jarfile jarname="xalan"/>
<process_jarfile jarname="xerces"/>
<process_jarfile jarname="xml-apis"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jul 13 11:12:49 2013
@@ -11,7 +11,6 @@ commons-httpclient-3.1.jar
commons-io-2.4.jar
commons-jexl-1.1.jar
commons-jexl-2.1.1.jar
-commons-lang-2.6.jar
commons-lang3-3.1.jar
commons-logging-1.1.3.jar
commons-net-3.3.jar
Propchange: jmeter/trunk/lib/doc/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jul 13 11:12:49 2013
@@ -1 +1,2 @@
velocity-1.7.jar
+commons-lang-2.6.jar
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1502773&r1=1502772&r2=1502773&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sat Jul 13 11:12:49 2013
@@ -311,6 +311,7 @@ Transaction Controller now sets Response
<li>Updated to xstream 1.4.4 (from 1.4.2)</li>
<li><bugzilla>54912</bugzilla> - JMeterTreeListener should use constants</li>
<li><bugzilla>54903</bugzilla> - Remove the dependency on the Activation Framework</li>
+<li>Moved commons-lang (2.6) to lib/doc as it's only needed by Velocity</li>
</ul>
</section>
Re: svn commit: r1502773 - in /jmeter/trunk: build.properties
build.xml lib/ lib/doc/ xdocs/changes.xml
Posted by sebb <se...@gmail.com>.
Oops, fixed.
On 14 July 2013 01:09, Milamber <mi...@apache.org> wrote:
>
> Le 13/07/2013 11:12, sebb@apache.org a ecrit :
>
>> Author: sebb
>> Date: Sat Jul 13 11:12:49 2013
>> New Revision: 1502773
>>
>> URL: http://svn.apache.org/r1502773
>> Log:
>> Commons-lang 2.6 is only needed for document generation, so move to
>> lib/docs
>
>
>
> Seems introduce some issue with ant distribution task.
>
>
> docs-printable:
> [anakia] Transforming into: /home/milamber/temp/jmetertemp/printable_docs
>
> BUILD FAILED
> /home/milmaber/temp/jmetertemp/build.xml:2352:
> java.lang.NoClassDefFoundError: org/apache/commons/lang/StringUtils
> at
> org.apache.velocity.runtime.resource.ResourceManagerImpl.initialize(ResourceManagerImpl.java:161)
> at
> org.apache.velocity.runtime.RuntimeInstance.initializeResourceManager(RuntimeInstance.java:730)
> at
> org.apache.velocity.runtime.RuntimeInstance.init(RuntimeInstance.java:263)
> at org.apache.velocity.app.VelocityEngine.init(VelocityEngine.java:93)
> at org.apache.velocity.anakia.AnakiaTask.execute(AnakiaTask.java:287)
> at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:291)
> at sun.reflect.GeneratedMethodAccessor4.invoke(Unknown Source)
> at
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
> at java.lang.reflect.Method.invoke(Method.java:606)
> at
> org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:106)
> at org.apache.tools.ant.Task.perform(Task.java:348)
> at org.apache.tools.ant.Target.execute(Target.java:435)
> at org.apache.tools.ant.Target.performTasks(Target.java:456)
> at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1393)
> at org.apache.tools.ant.Project.executeTarget(Project.java:1364)
> at
> org.apache.tools.ant.helper.DefaultExecutor.executeTargets(DefaultExecutor.java:41)
> at org.apache.tools.ant.Project.executeTargets(Project.java:1248)
> at org.apache.tools.ant.Main.runBuild(Main.java:851)
> at org.apache.tools.ant.Main.startAnt(Main.java:235)
> at org.apache.tools.ant.launch.Launcher.run(Launcher.java:280)
> at org.apache.tools.ant.launch.Launcher.main(Launcher.java:109)
> Caused by: java.lang.ClassNotFoundException:
> org.apache.commons.lang.StringUtils
> at
> org.apache.tools.ant.AntClassLoader.findClassInComponents(AntClassLoader.java:1366)
> at
> org.apache.tools.ant.AntClassLoader.findClass(AntClassLoader.java:1315)
> at
> org.apache.tools.ant.AntClassLoader.loadClass(AntClassLoader.java:1068)
> at java.lang.ClassLoader.loadClass(ClassLoader.java:357)
> ... 21 more
>
>
>
>
>
>> Modified:
>> jmeter/trunk/build.properties
>> jmeter/trunk/build.xml
>> jmeter/trunk/lib/ (props changed)
>> jmeter/trunk/lib/doc/ (props changed)
>> jmeter/trunk/xdocs/changes.xml
>>
>> Modified: jmeter/trunk/build.properties
>> URL:
>> http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1502773&r1=1502772&r2=1502773&view=diff
>>
>> ==============================================================================
>> --- jmeter/trunk/build.properties (original)
>> +++ jmeter/trunk/build.properties Sat Jul 13 11:12:49 2013
>> @@ -102,11 +102,6 @@ commons-jexl2.jar = commons-je
>> commons-jexl2.loc =
>> ${maven2.repo}/org/apache/commons/commons-jexl/${commons-jexl2.version}
>> commons-jexl2.md5 = 4ad8f5c161dd3a50e190334555675db9
>> -commons-lang.version = 2.6
>> -commons-lang.jar = commons-lang-${commons-lang.version}.jar
>> -commons-lang.loc =
>> ${maven2.repo}/commons-lang/commons-lang/${commons-lang.version}
>> -commons-lang.md5 = 4d5c1693079575b362edf41500630bbd
>> -
>> commons-lang3.version = 3.1
>> commons-lang3.jar =
>> commons-lang3-${commons-lang3.version}.jar
>> commons-lang3.loc =
>> ${maven2.repo}/org/apache/commons/commons-lang3/${commons-lang3.version}
>> @@ -322,3 +317,9 @@ velocity.version = 1.7
>> velocity.jar = velocity-${velocity.version}.jar
>> velocity.loc =
>> ${maven2.repo}/org/apache/velocity/velocity/${velocity.version}
>> velocity.md5 = 3692dd72f8367cb35fb6280dc2916725
>> +
>> +# required by Velocity
>> +commons-lang.version = 2.6
>> +commons-lang.jar = commons-lang-${commons-lang.version}.jar
>> +commons-lang.loc =
>> ${maven2.repo}/commons-lang/commons-lang/${commons-lang.version}
>> +commons-lang.md5 = 4d5c1693079575b362edf41500630bbd
>>
>> Modified: jmeter/trunk/build.xml
>> URL:
>> http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1502773&r1=1502772&r2=1502773&view=diff
>>
>> ==============================================================================
>> --- jmeter/trunk/build.xml (original)
>> +++ jmeter/trunk/build.xml Sat Jul 13 11:12:49 2013
>> @@ -362,7 +362,6 @@
>> <include name="${lib.dir}/${commons-io.jar}"/>
>> <include name="${lib.dir}/${commons-jexl.jar}"/>
>> <include name="${lib.dir}/${commons-jexl2.jar}"/>
>> - <include name="${lib.dir}/${commons-lang.jar}"/>
>> <include name="${lib.dir}/${commons-lang3.jar}"/>
>> <include name="${lib.dir}/${commons-logging.jar}"/>
>> <include name="${lib.dir}/${commons-net.jar}"/>
>> @@ -2857,7 +2856,6 @@ run JMeter unless all the JMeter jars ar
>> <process_jarfile jarname="commons-io"/>
>> <process_jarfile jarname="commons-jexl"/>
>> <process_jarfile jarname="commons-jexl2"/>
>> - <process_jarfile jarname="commons-lang"/>
>> <process_jarfile jarname="commons-lang3"/>
>> <process_jarfile jarname="commons-logging"/>
>> <process_jarfile jarname="commons-net"/>
>> @@ -2889,6 +2887,7 @@ run JMeter unless all the JMeter jars ar
>> <process_jarfile jarname="tika-core"/>
>> <process_jarfile jarname="tika-parsers"/>
>> <process_jarfile jarname="velocity" dest.dir="${lib.doc}"/>
>> + <process_jarfile jarname="commons-lang" dest.dir="${lib.doc}"/>
>> <process_jarfile jarname="xalan"/>
>> <process_jarfile jarname="xerces"/>
>> <process_jarfile jarname="xml-apis"/>
>>
>> Propchange: jmeter/trunk/lib/
>>
>> ------------------------------------------------------------------------------
>> --- svn:ignore (original)
>> +++ svn:ignore Sat Jul 13 11:12:49 2013
>> @@ -11,7 +11,6 @@ commons-httpclient-3.1.jar
>> commons-io-2.4.jar
>> commons-jexl-1.1.jar
>> commons-jexl-2.1.1.jar
>> -commons-lang-2.6.jar
>> commons-lang3-3.1.jar
>> commons-logging-1.1.3.jar
>> commons-net-3.3.jar
>>
>> Propchange: jmeter/trunk/lib/doc/
>>
>> ------------------------------------------------------------------------------
>> --- svn:ignore (original)
>> +++ svn:ignore Sat Jul 13 11:12:49 2013
>> @@ -1 +1,2 @@
>> velocity-1.7.jar
>> +commons-lang-2.6.jar
>>
>> Modified: jmeter/trunk/xdocs/changes.xml
>> URL:
>> http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1502773&r1=1502772&r2=1502773&view=diff
>>
>> ==============================================================================
>> --- jmeter/trunk/xdocs/changes.xml (original)
>> +++ jmeter/trunk/xdocs/changes.xml Sat Jul 13 11:12:49 2013
>> @@ -311,6 +311,7 @@ Transaction Controller now sets Response
>> <li>Updated to xstream 1.4.4 (from 1.4.2)</li>
>> <li><bugzilla>54912</bugzilla> - JMeterTreeListener should use
>> constants</li>
>> <li><bugzilla>54903</bugzilla> - Remove the dependency on the Activation
>> Framework</li>
>> +<li>Moved commons-lang (2.6) to lib/doc as it's only needed by
>> Velocity</li>
>> </ul>
>> </section>
>>
>>
>>
>
Re: svn commit: r1502773 - in /jmeter/trunk: build.properties build.xml
lib/ lib/doc/ xdocs/changes.xml
Posted by Milamber <mi...@apache.org>.
Le 13/07/2013 11:12, sebb@apache.org a ecrit :
> Author: sebb
> Date: Sat Jul 13 11:12:49 2013
> New Revision: 1502773
>
> URL: http://svn.apache.org/r1502773
> Log:
> Commons-lang 2.6 is only needed for document generation, so move to lib/docs
Seems introduce some issue with ant distribution task.
docs-printable:
[anakia] Transforming into:
/home/milamber/temp/jmetertemp/printable_docs
BUILD FAILED
/home/milmaber/temp/jmetertemp/build.xml:2352:
java.lang.NoClassDefFoundError: org/apache/commons/lang/StringUtils
at
org.apache.velocity.runtime.resource.ResourceManagerImpl.initialize(ResourceManagerImpl.java:161)
at
org.apache.velocity.runtime.RuntimeInstance.initializeResourceManager(RuntimeInstance.java:730)
at
org.apache.velocity.runtime.RuntimeInstance.init(RuntimeInstance.java:263)
at org.apache.velocity.app.VelocityEngine.init(VelocityEngine.java:93)
at org.apache.velocity.anakia.AnakiaTask.execute(AnakiaTask.java:287)
at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:291)
at sun.reflect.GeneratedMethodAccessor4.invoke(Unknown Source)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at
org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:106)
at org.apache.tools.ant.Task.perform(Task.java:348)
at org.apache.tools.ant.Target.execute(Target.java:435)
at org.apache.tools.ant.Target.performTasks(Target.java:456)
at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1393)
at org.apache.tools.ant.Project.executeTarget(Project.java:1364)
at
org.apache.tools.ant.helper.DefaultExecutor.executeTargets(DefaultExecutor.java:41)
at org.apache.tools.ant.Project.executeTargets(Project.java:1248)
at org.apache.tools.ant.Main.runBuild(Main.java:851)
at org.apache.tools.ant.Main.startAnt(Main.java:235)
at org.apache.tools.ant.launch.Launcher.run(Launcher.java:280)
at org.apache.tools.ant.launch.Launcher.main(Launcher.java:109)
Caused by: java.lang.ClassNotFoundException:
org.apache.commons.lang.StringUtils
at
org.apache.tools.ant.AntClassLoader.findClassInComponents(AntClassLoader.java:1366)
at
org.apache.tools.ant.AntClassLoader.findClass(AntClassLoader.java:1315)
at
org.apache.tools.ant.AntClassLoader.loadClass(AntClassLoader.java:1068)
at java.lang.ClassLoader.loadClass(ClassLoader.java:357)
... 21 more
> Modified:
> jmeter/trunk/build.properties
> jmeter/trunk/build.xml
> jmeter/trunk/lib/ (props changed)
> jmeter/trunk/lib/doc/ (props changed)
> jmeter/trunk/xdocs/changes.xml
>
> Modified: jmeter/trunk/build.properties
> URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1502773&r1=1502772&r2=1502773&view=diff
> ==============================================================================
> --- jmeter/trunk/build.properties (original)
> +++ jmeter/trunk/build.properties Sat Jul 13 11:12:49 2013
> @@ -102,11 +102,6 @@ commons-jexl2.jar = commons-je
> commons-jexl2.loc = ${maven2.repo}/org/apache/commons/commons-jexl/${commons-jexl2.version}
> commons-jexl2.md5 = 4ad8f5c161dd3a50e190334555675db9
>
> -commons-lang.version = 2.6
> -commons-lang.jar = commons-lang-${commons-lang.version}.jar
> -commons-lang.loc = ${maven2.repo}/commons-lang/commons-lang/${commons-lang.version}
> -commons-lang.md5 = 4d5c1693079575b362edf41500630bbd
> -
> commons-lang3.version = 3.1
> commons-lang3.jar = commons-lang3-${commons-lang3.version}.jar
> commons-lang3.loc = ${maven2.repo}/org/apache/commons/commons-lang3/${commons-lang3.version}
> @@ -322,3 +317,9 @@ velocity.version = 1.7
> velocity.jar = velocity-${velocity.version}.jar
> velocity.loc = ${maven2.repo}/org/apache/velocity/velocity/${velocity.version}
> velocity.md5 = 3692dd72f8367cb35fb6280dc2916725
> +
> +# required by Velocity
> +commons-lang.version = 2.6
> +commons-lang.jar = commons-lang-${commons-lang.version}.jar
> +commons-lang.loc = ${maven2.repo}/commons-lang/commons-lang/${commons-lang.version}
> +commons-lang.md5 = 4d5c1693079575b362edf41500630bbd
>
> Modified: jmeter/trunk/build.xml
> URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1502773&r1=1502772&r2=1502773&view=diff
> ==============================================================================
> --- jmeter/trunk/build.xml (original)
> +++ jmeter/trunk/build.xml Sat Jul 13 11:12:49 2013
> @@ -362,7 +362,6 @@
> <include name="${lib.dir}/${commons-io.jar}"/>
> <include name="${lib.dir}/${commons-jexl.jar}"/>
> <include name="${lib.dir}/${commons-jexl2.jar}"/>
> - <include name="${lib.dir}/${commons-lang.jar}"/>
> <include name="${lib.dir}/${commons-lang3.jar}"/>
> <include name="${lib.dir}/${commons-logging.jar}"/>
> <include name="${lib.dir}/${commons-net.jar}"/>
> @@ -2857,7 +2856,6 @@ run JMeter unless all the JMeter jars ar
> <process_jarfile jarname="commons-io"/>
> <process_jarfile jarname="commons-jexl"/>
> <process_jarfile jarname="commons-jexl2"/>
> - <process_jarfile jarname="commons-lang"/>
> <process_jarfile jarname="commons-lang3"/>
> <process_jarfile jarname="commons-logging"/>
> <process_jarfile jarname="commons-net"/>
> @@ -2889,6 +2887,7 @@ run JMeter unless all the JMeter jars ar
> <process_jarfile jarname="tika-core"/>
> <process_jarfile jarname="tika-parsers"/>
> <process_jarfile jarname="velocity" dest.dir="${lib.doc}"/>
> + <process_jarfile jarname="commons-lang" dest.dir="${lib.doc}"/>
> <process_jarfile jarname="xalan"/>
> <process_jarfile jarname="xerces"/>
> <process_jarfile jarname="xml-apis"/>
>
> Propchange: jmeter/trunk/lib/
> ------------------------------------------------------------------------------
> --- svn:ignore (original)
> +++ svn:ignore Sat Jul 13 11:12:49 2013
> @@ -11,7 +11,6 @@ commons-httpclient-3.1.jar
> commons-io-2.4.jar
> commons-jexl-1.1.jar
> commons-jexl-2.1.1.jar
> -commons-lang-2.6.jar
> commons-lang3-3.1.jar
> commons-logging-1.1.3.jar
> commons-net-3.3.jar
>
> Propchange: jmeter/trunk/lib/doc/
> ------------------------------------------------------------------------------
> --- svn:ignore (original)
> +++ svn:ignore Sat Jul 13 11:12:49 2013
> @@ -1 +1,2 @@
> velocity-1.7.jar
> +commons-lang-2.6.jar
>
> Modified: jmeter/trunk/xdocs/changes.xml
> URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1502773&r1=1502772&r2=1502773&view=diff
> ==============================================================================
> --- jmeter/trunk/xdocs/changes.xml (original)
> +++ jmeter/trunk/xdocs/changes.xml Sat Jul 13 11:12:49 2013
> @@ -311,6 +311,7 @@ Transaction Controller now sets Response
> <li>Updated to xstream 1.4.4 (from 1.4.2)</li>
> <li><bugzilla>54912</bugzilla> - JMeterTreeListener should use constants</li>
> <li><bugzilla>54903</bugzilla> - Remove the dependency on the Activation Framework</li>
> +<li>Moved commons-lang (2.6) to lib/doc as it's only needed by Velocity</li>
> </ul>
>
> </section>
>
>
>