jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1556884 - in /jmeter/trunk: build.properties build.xml eclipse.classpath lib/ res/maven/ApacheJMeter_parent.pom
Date Thu, 09 Jan 2014 17:12:27 GMT
Author: sebb
Date: Thu Jan  9 17:12:26 2014
New Revision: 1556884

URL: http://svn.apache.org/r1556884
Log:
Jdbc pool keepalive flooding - update Excalibur versions
Bugzilla Id: 55977

Modified:
    jmeter/trunk/build.properties
    jmeter/trunk/build.xml
    jmeter/trunk/eclipse.classpath
    jmeter/trunk/lib/   (props changed)
    jmeter/trunk/res/maven/ApacheJMeter_parent.pom

Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1556884&r1=1556883&r2=1556884&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Thu Jan  9 17:12:26 2014
@@ -122,11 +122,6 @@ commons-net.jar             = commons-ne
 commons-net.loc             = ${maven2.repo}/commons-net/commons-net/${commons-net.version}
 commons-net.md5             = c077ca61598e9c21f43f8b6488fbbee9
 
-excalibur-datasource.version = 1.1.1
-excalibur-datasource.jar    = excalibur-datasource-${excalibur-datasource.version}.jar
-excalibur-datasource.loc    = ${maven2.repo}/excalibur-datasource/excalibur-datasource/${excalibur-datasource.version}
-excalibur-datasource.md5    = 59A9EDFF1005D70DFA638CF3A4D3AD6D
- 
 excalibur-instrument.version = 1.0
 excalibur-instrument.jar    = excalibur-instrument-${excalibur-instrument.version}.jar
 excalibur-instrument.loc    = ${maven2.repo}/excalibur-instrument/excalibur-instrument/${excalibur-instrument.version}
@@ -137,10 +132,27 @@ excalibur-logger.jar        = excalibur-
 excalibur-logger.loc        = ${maven2.repo}/excalibur-logger/excalibur-logger/${excalibur-logger.version}
 excalibur-logger.md5        = E8246C546B7B0CAFD65947E9B80BB884
 
-excalibur-pool.version      = 1.2
-excalibur-pool.jar          = excalibur-pool-${excalibur-pool.version}.jar
-excalibur-pool.loc          = ${maven2.repo}/excalibur-pool/excalibur-pool/${excalibur-pool.version}
-excalibur-pool.md5          = 0AF05C8811A2912D62D6E189799FD518
+excalibur-datasource.version = 2.1
+excalibur-datasource.jar    = excalibur-datasource-${excalibur-datasource.version}.jar
+excalibur-datasource.loc    = ${maven2.repo}/excalibur-datasource/excalibur-datasource/${excalibur-datasource.version}
+excalibur-datasource.md5    = 7a57ccdfeda3a4f157016f5a9270a4f9
+ 
+# pool has been split into 3 parts
+excalibur-pool.version       = 2.1
+excalibur-pool-api.version   = ${excalibur-pool.version}
+excalibur-pool-api.jar       = excalibur-pool-api-${excalibur-pool-api.version}.jar
+excalibur-pool-api.loc       = ${maven2.repo}/excalibur-pool/excalibur-pool-api/${excalibur-pool-api.version}
+excalibur-pool-api.md5       = f9a224e1ee0896764aadbf7ddd253acc
+
+excalibur-pool-impl.version  = ${excalibur-pool.version}
+excalibur-pool-impl.jar      = excalibur-pool-impl-${excalibur-pool-impl.version}.jar
+excalibur-pool-impl.loc      = ${maven2.repo}/excalibur-pool/excalibur-pool-impl/${excalibur-pool-impl.version}
+excalibur-pool-impl.md5      = 8be9c177894998090b4662326d7f22de
+
+excalibur-pool-instrumented.version = ${excalibur-pool.version}
+excalibur-pool-instrumented.jar     = excalibur-pool-instrumented-${excalibur-pool-instrumented.version}.jar
+excalibur-pool-instrumented.loc     = ${maven2.repo}/excalibur-pool/excalibur-pool-instrumented/${excalibur-pool-instrumented.version}
+excalibur-pool-instrumented.md5     = 1b5425fe0fe63dc67da6fe995db6be31
 
 # Common file containing both htmlparser and htmllexer jars
 htmlparser.version          = 2.1

Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1556884&r1=1556883&r2=1556884&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Thu Jan  9 17:12:26 2014
@@ -369,7 +369,9 @@
     <include name="${lib.dir}/${excalibur-datasource.jar}"/>
     <include name="${lib.dir}/${excalibur-instrument.jar}"/>
     <include name="${lib.dir}/${excalibur-logger.jar}"/>
-    <include name="${lib.dir}/${excalibur-pool.jar}"/>
+    <include name="${lib.dir}/${excalibur-pool-api.jar}"/>
+    <include name="${lib.dir}/${excalibur-pool-impl.jar}"/>
+    <include name="${lib.dir}/${excalibur-pool-instrumented.jar}"/>
     <include name="${lib.dir}/${htmllexer.jar}"/>
     <include name="${lib.dir}/${htmlparser.jar}"/>
     <include name="${lib.dir}/${httpclient.jar}"/>
@@ -438,7 +440,9 @@
     <pathelement location="${lib.dir}/${excalibur-datasource.jar}"/>
     <pathelement location="${lib.dir}/${excalibur-instrument.jar}"/>
     <pathelement location="${lib.dir}/${excalibur-logger.jar}"/>
-    <pathelement location="${lib.dir}/${excalibur-pool.jar}"/>
+    <pathelement location="${lib.dir}/${excalibur-pool-api.jar}"/>
+    <pathelement location="${lib.dir}/${excalibur-pool-impl.jar}"/>
+    <pathelement location="${lib.dir}/${excalibur-pool-instrumented.jar}"/>
     <pathelement location="${lib.dir}/${htmllexer.jar}"/>
     <pathelement location="${lib.dir}/${htmlparser.jar}"/>
     <pathelement location="${lib.dir}/${httpclient.jar}"/>
@@ -2893,7 +2897,9 @@ run JMeter unless all the JMeter jars ar
         <process_jarfile jarname="excalibur-datasource"/>
         <process_jarfile jarname="excalibur-instrument"/>
         <process_jarfile jarname="excalibur-logger"/>
-        <process_jarfile jarname="excalibur-pool"/>
+        <process_jarfile jarname="excalibur-pool-api"/>
+        <process_jarfile jarname="excalibur-pool-impl"/>
+        <process_jarfile jarname="excalibur-pool-instrumented"/>
         <process_jarfile jarname="htmllexer"/>
         <process_jarfile jarname="htmlparser"/>
         <process_jarfile jarname="httpclient"/>
@@ -2948,6 +2954,8 @@ run JMeter unless all the JMeter jars ar
         <!-- bcprov jars no longer have the same prefix so the wildcard delete does not
work; drop any old ones -->
         <delete verbose="true">
           <fileset dir="${lib.api}" includes="bcmail-jdk15-*.jar bcprov-jdk15-*.jar"/>
+          <!-- tidy up old pool jar -->
+          <fileset dir="${lib.dir}" includes="excalibur-pool-1.2.jar"/>
         </delete>
         <antcall target="_process_all_jars">
             <param name="_get_file" value="true"/>

Modified: jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1556884&r1=1556883&r2=1556884&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Thu Jan  9 17:12:26 2014
@@ -56,10 +56,12 @@
 	<classpathentry kind="lib" path="lib/commons-lang3-3.1.jar"/>
 	<classpathentry kind="lib" path="lib/commons-logging-1.1.3.jar"/>
 	<classpathentry kind="lib" path="lib/commons-net-3.3.jar"/>
-	<classpathentry kind="lib" path="lib/excalibur-datasource-1.1.1.jar"/>
+	<classpathentry kind="lib" path="lib/excalibur-datasource-2.1.jar"/>
 	<classpathentry kind="lib" path="lib/excalibur-instrument-1.0.jar"/>
 	<classpathentry kind="lib" path="lib/excalibur-logger-1.1.jar"/>
-	<classpathentry kind="lib" path="lib/excalibur-pool-1.2.jar"/>
+	<classpathentry kind="lib" path="lib/excalibur-pool-api-2.1.jar"/>
+    <classpathentry kind="lib" path="lib/excalibur-pool-impl-2.1.jar"/>
+    <classpathentry kind="lib" path="lib/excalibur-pool-instrumented-2.1.jar"/>
 	<classpathentry kind="lib" path="lib/geronimo-jms_1.1_spec-1.1.1.jar"/>
 	<classpathentry kind="lib" path="lib/htmllexer-2.1.jar"/>
 	<classpathentry kind="lib" path="lib/htmlparser-2.1.jar"/>

Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jan  9 17:12:26 2014
@@ -13,10 +13,12 @@ commons-jexl-2.1.1.jar
 commons-lang3-3.1.jar
 commons-logging-1.1.3.jar
 commons-net-3.3.jar
-excalibur-datasource-1.1.1.jar
 excalibur-instrument-1.0.jar
 excalibur-logger-1.1.jar
-excalibur-pool-1.2.jar
+excalibur-datasource-2.1.jar
+excalibur-pool-api-2.1.jar
+excalibur-pool-impl-2.1.jar
+excalibur-pool-instrumented-2.1.jar
 geronimo*.jar
 htmllexer-2.1.jar
 htmlparser-2.1.jar

Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1556884&r1=1556883&r2=1556884&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Thu Jan  9 17:12:26 2014
@@ -67,10 +67,13 @@ under the License.
       <commons-lang3.version>3.1</commons-lang3.version>
       <commons-logging.version>1.1.3</commons-logging.version>
       <commons-net.version>3.3</commons-net.version>
-      <excalibur-datasource.version>1.1.1</excalibur-datasource.version>
+      <excalibur-datasource.version>2.1</excalibur-datasource.version>
       <excalibur-instrument.version>1.0</excalibur-instrument.version>
       <excalibur-logger.version>1.1</excalibur-logger.version>
-      <excalibur-pool.version>1.2</excalibur-pool.version>
+      <excalibur-pool.version>2.1</excalibur-pool.version>
+      <excalibur-pool-api.version>${excalibur-pool.version}</excalibur-pool-api.version>
+      <excalibur-pool-impl.version>${excalibur-pool.version}</excalibur-pool-impl.version>
+      <excalibur-pool-instrumented.version>${excalibur-pool.version}</excalibur-pool-instrumented.version>
       <htmlparser.version>2.1</htmlparser.version>
       <httpclient.version>4.2.6</httpclient.version>
       <httpcore.version>4.2.5</httpcore.version>
@@ -197,8 +200,18 @@ under the License.
       </dependency>
       <dependency>
         <groupId>excalibur-pool</groupId>
-        <artifactId>excalibur-pool</artifactId>
-        <version>${excalibur-pool.version}</version>
+        <artifactId>excalibur-pool-api</artifactId>
+        <version>${excalibur-pool-api.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>excalibur-pool</groupId>
+        <artifactId>excalibur-pool-impl</artifactId>
+        <version>${excalibur-pool-impl.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>excalibur-pool</groupId>
+        <artifactId>excalibur-pool-instrumented</artifactId>
+        <version>${excalibur-pool-instrumented.version}</version>
       </dependency>
       <dependency>
         <groupId>org.htmlparser</groupId>



Mime
View raw message