change version from 0.4.1 to 0.4.2

bee-engine/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.4.1</version>
+		<version>0.4.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.dianping.bee</groupId>

cat-consumer/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.4.1</version>
+		<version>0.4.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-consumer</artifactId>
@@ -30,116 +30,28 @@
 			<plugin>
 				<groupId>org.unidal.maven.plugins</groupId>
 				<artifactId>codegen-maven-plugin</artifactId>
-				<version>1.1.5</version>
+				<version>1.1.6</version>
 				<executions>
 					<execution>
-						<id>generate database report model</id>
+						<id>generate report models</id>
 						<phase>generate-sources</phase>
 						<goals>
 							<goal>dal-model</goal>
 						</goals>
 						<configuration>
-							<manifest>${basedir}/src/main/resources/META-INF/dal/model/database-report-manifest.xml</manifest>
-						</configuration>
-					</execution>
-					<execution>
-						<id>generate sql report model</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>dal-model</goal>
-						</goals>
-						<configuration>
-							<manifest>${basedir}/src/main/resources/META-INF/dal/model/sql-report-manifest.xml</manifest>
-						</configuration>
-					</execution>
-					<execution>
-						<id>generate month report model</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>dal-model</goal>
-						</goals>
-						<configuration>
-							<manifest>${basedir}/src/main/resources/META-INF/dal/model/month-report-manifest.xml</manifest>
-						</configuration>
-					</execution>
-					<execution>
-						<id>generate common report model</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>dal-model</goal>
-						</goals>
-						<configuration>
-							<manifest>${basedir}/src/main/resources/META-INF/dal/model/common-report-manifest.xml</manifest>
-						</configuration>
-					</execution>
-					<execution>
-						<id>generate cross report model</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>dal-model</goal>
-						</goals>
-						<configuration>
-							<manifest>${basedir}/src/main/resources/META-INF/dal/model/cross-report-manifest.xml</manifest>
-						</configuration>
-					</execution>
-					<execution>
-						<id>generate matrix report model</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>dal-model</goal>
-						</goals>
-						<configuration>
-							<manifest>${basedir}/src/main/resources/META-INF/dal/model/matrix-report-manifest.xml</manifest>
-						</configuration>
-					</execution>
-					<execution>
-						<id>generate heartbeat report model</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>dal-model</goal>
-						</goals>
-						<configuration>
-							<manifest>${basedir}/src/main/resources/META-INF/dal/model/heartbeat-report-manifest.xml</manifest>
-						</configuration>
-					</execution>
-					<execution>
-						<id>generate problem report model</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>dal-model</goal>
-						</goals>
-						<configuration>
-							<manifest>${basedir}/src/main/resources/META-INF/dal/model/problem-report-manifest.xml</manifest>
-						</configuration>
-					</execution>
-					<execution>
-						<id>generate transaction report model</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>dal-model</goal>
-						</goals>
-						<configuration>
-							<manifest>${basedir}/src/main/resources/META-INF/dal/model/transaction-report-manifest.xml</manifest>
-						</configuration>
-					</execution>
-					<execution>
-						<id>generate event report model</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>dal-model</goal>
-						</goals>
-						<configuration>
-							<manifest>${basedir}/src/main/resources/META-INF/dal/model/event-report-manifest.xml</manifest>
-						</configuration>
-					</execution>
-					<execution>
-						<id>generate IP report model</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>dal-model</goal>
-						</goals>
-						<configuration>
-							<manifest>${basedir}/src/main/resources/META-INF/dal/model/ip-report-manifest.xml</manifest>
+							<manifest>
+							${basedir}/src/main/resources/META-INF/dal/model/database-report-manifest.xml,
+							${basedir}/src/main/resources/META-INF/dal/model/sql-report-manifest.xml,
+							${basedir}/src/main/resources/META-INF/dal/model/month-report-manifest.xml,
+							${basedir}/src/main/resources/META-INF/dal/model/common-report-manifest.xml,
+							${basedir}/src/main/resources/META-INF/dal/model/cross-report-manifest.xml,
+							${basedir}/src/main/resources/META-INF/dal/model/matrix-report-manifest.xml,
+							${basedir}/src/main/resources/META-INF/dal/model/heartbeat-report-manifest.xml,
+							${basedir}/src/main/resources/META-INF/dal/model/problem-report-manifest.xml,
+							${basedir}/src/main/resources/META-INF/dal/model/transaction-report-manifest.xml,
+							${basedir}/src/main/resources/META-INF/dal/model/event-report-manifest.xml,
+							${basedir}/src/main/resources/META-INF/dal/model/ip-report-manifest.xml,
+							</manifest>
 						</configuration>
 					</execution>
 					<execution>

cat-core/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.4.1</version>
+		<version>0.4.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-core</artifactId>

cat-data/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.4.1</version>
+		<version>0.4.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-data</artifactId>

cat-hadoop/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.4.1</version>
+		<version>0.4.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-hadoop</artifactId>

cat-home/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.dianping.cat</groupId>
     <artifactId>parent</artifactId>
-    <version>0.4.1</version>
+    <version>0.4.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cat-home</artifactId>

cat-home/src/main/webapp/jsp/report/home.jsp

@@ -26,6 +26,7 @@ Welcome to <b>Central Application Tracking (CAT)</b>.
 <br>
 <table class='version'>
 	<tr class="odd"><td>版本</td><td>说明</td><td>发布时间</td></tr>
+	<tr class="even"><td>0.4.1</td><td>1、默认禁止心跳线程获取线程锁信息，以降低对业务线程的影响。</td><td>2012-09-06</td></tr>
 	<tr class="even"><td>0.4.0</td><td>1、支持开关动态关闭。2、支持分布式Logview的查看(关联pigeon的call)。</td><td>2012-08-20</td></tr>
 	<tr class="odd"><td>0.3.4</td><td>1、规范了CAT客户端的日志。2、规范了后台模块的加载顺序。3、统一服务端配置存取。4、新增心跳报表的Http线程 </td><td>2012-07-25</td></tr>
 	<tr class="even"><td>0.3.3</td><td>1、修改CAT线程为后台Dameon线程。2、减少CAT的日志输出。3、修复了极端情况客户端丢失部分消息。4、支持CAT的延迟加载。5、修复了0.3.2一个getLog的bug</td><td>2012-07-17</td></tr>

cat-job/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.4.1</version>
+		<version>0.4.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-job</artifactId>

cat-notify/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.dianping.cat</groupId>
     <artifactId>parent</artifactId>
-    <version>0.4.1</version>
+    <version>0.4.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <inceptionYear>2012</inceptionYear>

dog-gateway/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.4.1</version>
+		<version>0.4.2</version>
 	</parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>dog-gateway</artifactId>

dog-home/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.4.1</version>
+		<version>0.4.2</version>
 	</parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>dog-home</artifactId>

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.dianping.cat</groupId>
 	<artifactId>parent</artifactId>
-	<version>0.4.1</version>
+	<version>0.4.2</version>
 	<name>arch-cat</name>
 	<description>Central Application Tracking</description>
 	<packaging>pom</packaging>