[parfait] 3 new revisions pushed by tallpsm...@gmail.com on 2011-03-10 23:21 GMT
par...@googlecode.com
Revision: 8015d8b848
Author: Paul Smith <psm...@apache.org>
Date: Thu Mar 10 02:32:11 2011
Log: Updating POM to reflect next 0.2.x version
http://code.google.com/p/parfait/source/detail?r=8015d8b848
Revision: 7242101a13
Author: Paul Smith <psm...@apache.org>
Date: Thu Mar 10 02:40:05 2011
Log: Manual hand merge of fixMDC branch changes to address Issue 11.
Subtl...
http://code.google.com/p/parfait/source/detail?r=7242101a13
Revision: f2e2612a00
Author: Paul Smith <psm...@apache.org>
Date: Thu Mar 10 15:20:56 2011
Log: [maven-release-plugin] prepare release parfait-0.2.7
http://code.google.com/p/parfait/source/detail?r=f2e2612a00
==============================================================================
Revision: 8015d8b848
Author: Paul Smith <psm...@apache.org>
Date: Thu Mar 10 02:32:11 2011
Log: Updating POM to reflect next 0.2.x version
http://code.google.com/p/parfait/source/detail?r=8015d8b848
Modified:
/dxm/pom.xml
/parfait-core/pom.xml
/parfait-cxf/pom.xml
/parfait-io/pom.xml
/parfait-jdbc/pom.xml
/parfait-jmx/pom.xml
/parfait-pcp/pom.xml
/parfait-spring/pom.xml
/pom.xml
=======================================
--- /dxm/pom.xml Mon Dec 6 16:25:28 2010
+++ /dxm/pom.xml Thu Mar 10 02:32:11 2011
@@ -2,14 +2,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.custardsource.parfait</groupId>
<artifactId>dxm</artifactId>
- <version>0.2.6</version>
+ <version>0.2.7-SNAPSHOT</version>
<packaging>jar</packaging>
<name>parfait DXM</name>
<description>Java implementation of the PCP MMV (memory-mapped values)
PMDA format, allowing extremely simple passing of Java values across to the
PCP system</description>
<parent>
<groupId>com.custardsource</groupId>
<artifactId>parfait</artifactId>
- <version>0.2.6</version>
+ <version>0.2.7-SNAPSHOT</version>
</parent>
<dependencies>
<!--
=======================================
--- /parfait-core/pom.xml Mon Dec 6 16:25:28 2010
+++ /parfait-core/pom.xml Thu Mar 10 02:32:11 2011
@@ -2,14 +2,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.custardsource.parfait</groupId>
<artifactId>parfait-core</artifactId>
- <version>0.2.6</version>
+ <version>0.2.7-SNAPSHOT</version>
<packaging>jar</packaging>
<name>parfait-core</name>
<description>Java performance monitoring framework, including PCP
bridge</description>
<parent>
<groupId>com.custardsource</groupId>
<artifactId>parfait</artifactId>
- <version>0.2.6</version>
+ <version>0.2.7-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
=======================================
--- /parfait-cxf/pom.xml Mon Dec 6 16:25:28 2010
+++ /parfait-cxf/pom.xml Thu Mar 10 02:32:11 2011
@@ -2,7 +2,7 @@
<parent>
<artifactId>parfait</artifactId>
<groupId>com.custardsource</groupId>
- <version>0.2.6</version>
+ <version>0.2.7-SNAPSHOT</version>
</parent>
<properties>
<cxf.version>2.2.3</cxf.version>
@@ -11,7 +11,7 @@
<groupId>com.custardsource.parfait</groupId>
<artifactId>parfait-cxf</artifactId>
<name>parfait-cxf</name>
- <version>0.2.6</version>
+ <version>0.2.7-SNAPSHOT</version>
<description>Library for performance monitoring of Apache CXF web
services</description>
<dependencies>
<dependency>
=======================================
--- /parfait-io/pom.xml Mon Dec 6 16:25:28 2010
+++ /parfait-io/pom.xml Thu Mar 10 02:32:11 2011
@@ -2,14 +2,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.custardsource.parfait</groupId>
<artifactId>parfait-io</artifactId>
- <version>0.2.6</version>
+ <version>0.2.7-SNAPSHOT</version>
<packaging>jar</packaging>
<name>parfait-io</name>
<description>Toolset for collection IO-related metrics for
parfait</description>
<parent>
<groupId>com.custardsource</groupId>
<artifactId>parfait</artifactId>
- <version>0.2.6</version>
+ <version>0.2.7-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
=======================================
--- /parfait-jdbc/pom.xml Mon Dec 6 16:25:28 2010
+++ /parfait-jdbc/pom.xml Thu Mar 10 02:32:11 2011
@@ -2,14 +2,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.custardsource.parfait</groupId>
<artifactId>parfait-jdbc</artifactId>
- <version>0.2.6</version>
+ <version>0.2.7-SNAPSHOT</version>
<packaging>jar</packaging>
<name>parfait-jdbc</name>
<description>JDBC driver to allow collection of Parfait performance
metrics</description>
<parent>
<groupId>com.custardsource</groupId>
<artifactId>parfait</artifactId>
- <version>0.2.6</version>
+ <version>0.2.7-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
=======================================
--- /parfait-jmx/pom.xml Mon Dec 6 16:25:28 2010
+++ /parfait-jmx/pom.xml Thu Mar 10 02:32:11 2011
@@ -2,14 +2,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.custardsource.parfait</groupId>
<artifactId>parfait-jmx</artifactId>
- <version>0.2.6</version>
+ <version>0.2.7-SNAPSHOT</version>
<packaging>jar</packaging>
<name>parfait-jmx</name>
<description>Library to allow Parfait to import metric values from, and
export results to, JMX</description>
<parent>
<groupId>com.custardsource</groupId>
<artifactId>parfait</artifactId>
- <version>0.2.6</version>
+ <version>0.2.7-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
=======================================
--- /parfait-pcp/pom.xml Mon Dec 6 16:25:28 2010
+++ /parfait-pcp/pom.xml Thu Mar 10 02:32:11 2011
@@ -2,14 +2,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.custardsource.parfait</groupId>
<artifactId>parfait-pcp</artifactId>
- <version>0.2.6</version>
+ <version>0.2.7-SNAPSHOT</version>
<packaging>jar</packaging>
<name>parfait-pcp</name>
<description>Bridge between Parfait-collected metrics and the DXM PCP
Bridge to enable monitoring of Java applications via PCP</description>
<parent>
<groupId>com.custardsource</groupId>
<artifactId>parfait</artifactId>
- <version>0.2.6</version>
+ <version>0.2.7-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
=======================================
--- /parfait-spring/pom.xml Mon Dec 6 16:25:28 2010
+++ /parfait-spring/pom.xml Thu Mar 10 02:32:11 2011
@@ -2,13 +2,13 @@
<parent>
<artifactId>parfait</artifactId>
<groupId>com.custardsource</groupId>
- <version>0.2.6</version>
+ <version>0.2.7-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.custardsource.parfait</groupId>
<artifactId>parfait-spring</artifactId>
<name>parfait-spring</name>
- <version>0.2.6</version>
+ <version>0.2.7-SNAPSHOT</version>
<description>Library enabling parfait timing collection around Spring
beans using Spring AOP</description>
<dependencies>
<dependency>
=======================================
--- /pom.xml Mon Dec 6 16:25:28 2010
+++ /pom.xml Thu Mar 10 02:32:11 2011
@@ -9,7 +9,7 @@
<groupId>com.custardsource</groupId>
<artifactId>parfait</artifactId>
<packaging>pom</packaging>
- <version>0.2.6</version>
+ <version>0.2.7-SNAPSHOT</version>
<name>parfait</name>
<description>Java performance monitoring framework, including PCP
bridge</description>
<modules>
==============================================================================
Revision: 7242101a13
Author: Paul Smith <psm...@apache.org>
Date: Thu Mar 10 02:40:05 2011
Log: Manual hand merge of fixMDC branch changes to address Issue 11.
Subtle changes required to align with this branch.
http://code.google.com/p/parfait/source/detail?r=7242101a13
Modified:
/parfait-core/src/main/java/com/custardsource/parfait/timing/ThreadContext.java
/parfait-core/src/test/java/com/custardsource/parfait/timing/ThreadContextTest.java
=======================================
---
/parfait-core/src/main/java/com/custardsource/parfait/timing/ThreadContext.java
Tue Aug 31 16:42:06 2010
+++
/parfait-core/src/main/java/com/custardsource/parfait/timing/ThreadContext.java
Thu Mar 10 02:40:05 2011
@@ -69,6 +69,15 @@
* Clears all values for the current thread.
*/
public void clear() {
+
+ /**
+ * Unfortunately log4j's MDC historically never had a mechanism to
block remove keys,
+ * so we're forced to do this one by one.
+ */
+ for (String key : allKeys()) {
+ MDC.remove(key);
+ }
+
PER_THREAD_CONTEXTS.get(Thread.currentThread()).clear();
}
=======================================
---
/parfait-core/src/test/java/com/custardsource/parfait/timing/ThreadContextTest.java
Tue Feb 16 20:21:06 2010
+++
/parfait-core/src/test/java/com/custardsource/parfait/timing/ThreadContextTest.java
Thu Mar 10 02:40:05 2011
@@ -1,8 +1,11 @@
package com.custardsource.parfait.timing;
+import java.util.Hashtable;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
+import org.apache.log4j.MDC;
+
import junit.framework.TestCase;
public class ThreadContextTest extends TestCase {
@@ -10,7 +13,14 @@
public void setUp() {
context = new ThreadContext();
- }
+
+ Hashtable hashtable = MDC.getContext();
+ if (hashtable != null) {
+ hashtable.clear();
+ }
+ }
+
+
public void testGetOfUnusedKeyReturnsNull() {
final String testKey = "handy";
@@ -59,4 +69,24 @@
context.clear();
assertNull("get() after clear should return null",
context.get(testKey));
}
-}
+
+ public void testClearRemovesMDCValue(){
+
+ ThreadContext log4jThreadContext = new ThreadContext();
+
+ Hashtable mdcContext = MDC.getContext();
+
+ final String testKey = "painter";
+ log4jThreadContext.put(testKey, 7);
+
+ mdcContext = MDC.getContext();
+ assertEquals(1, mdcContext.size());
+
+
+ log4jThreadContext.clear();
+
+ assertEquals(0, mdcContext.size());
+
+ assertNull("get() after clear should return null",
log4jThreadContext.get(testKey));
+ }
+}
==============================================================================
Revision: f2e2612a00
Author: Paul Smith <psm...@apache.org>
Date: Thu Mar 10 15:20:56 2011
Log: [maven-release-plugin] prepare release parfait-0.2.7
http://code.google.com/p/parfait/source/detail?r=f2e2612a00
Modified:
/dxm/pom.xml
/parfait-core/pom.xml
/parfait-cxf/pom.xml
/parfait-io/pom.xml
/parfait-jdbc/pom.xml
/parfait-jmx/pom.xml
/parfait-pcp/pom.xml
/parfait-spring/pom.xml
/pom.xml
=======================================
--- /dxm/pom.xml Thu Mar 10 02:32:11 2011
+++ /dxm/pom.xml Thu Mar 10 15:20:56 2011
@@ -2,14 +2,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.custardsource.parfait</groupId>
<artifactId>dxm</artifactId>
- <version>0.2.7-SNAPSHOT</version>
+ <version>0.2.7</version>
<packaging>jar</packaging>
<name>parfait DXM</name>
<description>Java implementation of the PCP MMV (memory-mapped values)
PMDA format, allowing extremely simple passing of Java values across to the
PCP system</description>
<parent>
<groupId>com.custardsource</groupId>
<artifactId>parfait</artifactId>
- <version>0.2.7-SNAPSHOT</version>
+ <version>0.2.7</version>
</parent>
<dependencies>
<!--
=======================================
--- /parfait-core/pom.xml Thu Mar 10 02:32:11 2011
+++ /parfait-core/pom.xml Thu Mar 10 15:20:56 2011
@@ -2,14 +2,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.custardsource.parfait</groupId>
<artifactId>parfait-core</artifactId>
- <version>0.2.7-SNAPSHOT</version>
+ <version>0.2.7</version>
<packaging>jar</packaging>
<name>parfait-core</name>
<description>Java performance monitoring framework, including PCP
bridge</description>
<parent>
<groupId>com.custardsource</groupId>
<artifactId>parfait</artifactId>
- <version>0.2.7-SNAPSHOT</version>
+ <version>0.2.7</version>
</parent>
<dependencies>
<dependency>
=======================================
--- /parfait-cxf/pom.xml Thu Mar 10 02:32:11 2011
+++ /parfait-cxf/pom.xml Thu Mar 10 15:20:56 2011
@@ -2,7 +2,7 @@
<parent>
<artifactId>parfait</artifactId>
<groupId>com.custardsource</groupId>
- <version>0.2.7-SNAPSHOT</version>
+ <version>0.2.7</version>
</parent>
<properties>
<cxf.version>2.2.3</cxf.version>
@@ -11,7 +11,7 @@
<groupId>com.custardsource.parfait</groupId>
<artifactId>parfait-cxf</artifactId>
<name>parfait-cxf</name>
- <version>0.2.7-SNAPSHOT</version>
+ <version>0.2.7</version>
<description>Library for performance monitoring of Apache CXF web
services</description>
<dependencies>
<dependency>
=======================================
--- /parfait-io/pom.xml Thu Mar 10 02:32:11 2011
+++ /parfait-io/pom.xml Thu Mar 10 15:20:56 2011
@@ -2,14 +2,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.custardsource.parfait</groupId>
<artifactId>parfait-io</artifactId>
- <version>0.2.7-SNAPSHOT</version>
+ <version>0.2.7</version>
<packaging>jar</packaging>
<name>parfait-io</name>
<description>Toolset for collection IO-related metrics for
parfait</description>
<parent>
<groupId>com.custardsource</groupId>
<artifactId>parfait</artifactId>
- <version>0.2.7-SNAPSHOT</version>
+ <version>0.2.7</version>
</parent>
<dependencies>
<dependency>
=======================================
--- /parfait-jdbc/pom.xml Thu Mar 10 02:32:11 2011
+++ /parfait-jdbc/pom.xml Thu Mar 10 15:20:56 2011
@@ -2,14 +2,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.custardsource.parfait</groupId>
<artifactId>parfait-jdbc</artifactId>
- <version>0.2.7-SNAPSHOT</version>
+ <version>0.2.7</version>
<packaging>jar</packaging>
<name>parfait-jdbc</name>
<description>JDBC driver to allow collection of Parfait performance
metrics</description>
<parent>
<groupId>com.custardsource</groupId>
<artifactId>parfait</artifactId>
- <version>0.2.7-SNAPSHOT</version>
+ <version>0.2.7</version>
</parent>
<dependencies>
<dependency>
=======================================
--- /parfait-jmx/pom.xml Thu Mar 10 02:32:11 2011
+++ /parfait-jmx/pom.xml Thu Mar 10 15:20:56 2011
@@ -2,14 +2,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.custardsource.parfait</groupId>
<artifactId>parfait-jmx</artifactId>
- <version>0.2.7-SNAPSHOT</version>
+ <version>0.2.7</version>
<packaging>jar</packaging>
<name>parfait-jmx</name>
<description>Library to allow Parfait to import metric values from, and
export results to, JMX</description>
<parent>
<groupId>com.custardsource</groupId>
<artifactId>parfait</artifactId>
- <version>0.2.7-SNAPSHOT</version>
+ <version>0.2.7</version>
</parent>
<dependencies>
<dependency>
=======================================
--- /parfait-pcp/pom.xml Thu Mar 10 02:32:11 2011
+++ /parfait-pcp/pom.xml Thu Mar 10 15:20:56 2011
@@ -2,14 +2,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.custardsource.parfait</groupId>
<artifactId>parfait-pcp</artifactId>
- <version>0.2.7-SNAPSHOT</version>
+ <version>0.2.7</version>
<packaging>jar</packaging>
<name>parfait-pcp</name>
<description>Bridge between Parfait-collected metrics and the DXM PCP
Bridge to enable monitoring of Java applications via PCP</description>
<parent>
<groupId>com.custardsource</groupId>
<artifactId>parfait</artifactId>
- <version>0.2.7-SNAPSHOT</version>
+ <version>0.2.7</version>
</parent>
<dependencies>
<dependency>
=======================================
--- /parfait-spring/pom.xml Thu Mar 10 02:32:11 2011
+++ /parfait-spring/pom.xml Thu Mar 10 15:20:56 2011
@@ -2,13 +2,13 @@
<parent>
<artifactId>parfait</artifactId>
<groupId>com.custardsource</groupId>
- <version>0.2.7-SNAPSHOT</version>
+ <version>0.2.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.custardsource.parfait</groupId>
<artifactId>parfait-spring</artifactId>
<name>parfait-spring</name>
- <version>0.2.7-SNAPSHOT</version>
+ <version>0.2.7</version>
<description>Library enabling parfait timing collection around Spring
beans using Spring AOP</description>
<dependencies>
<dependency>
=======================================
--- /pom.xml Thu Mar 10 02:32:11 2011
+++ /pom.xml Thu Mar 10 15:20:56 2011
@@ -9,7 +9,7 @@
<groupId>com.custardsource</groupId>
<artifactId>parfait</artifactId>
<packaging>pom</packaging>
- <version>0.2.7-SNAPSHOT</version>
+ <version>0.2.7</version>
<name>parfait</name>
<description>Java performance monitoring framework, including PCP
bridge</description>
<modules>