upgrade dal-model codegen

cat-consumer/pom.xml

@@ -29,7 +29,7 @@
 			<plugin>
 				<groupId>com.site.maven.plugins</groupId>
 				<artifactId>maven-codegen-plugin</artifactId>
-				<version>1.0.0-a1</version>
+				<version>1.0.0-a2</version>
 				<executions>
 					<execution>
 						<!-- 

cat-consumer/src/main/resources/META-INF/dal/model/failure-report-codegen.xml

@@ -4,14 +4,15 @@
     <attribute name="startTime" value-type="Date" format="yyyy-MM-dd HH:mm:ss" />
     <attribute name="endTime" value-type="Date" format="yyyy-MM-dd HH:mm:ss" />
     <entity-ref name="machines" />
-    <entity-ref name="segment" map="true" map-name="segments" />
+    <entity-ref name="segment" type="list" names="segments" />
   </entity>
   <entity name="machines">
     <element name="machine" value-type="String" type="list" names="machines" />
   </entity>
   <entity name="segment">
+	<attribute name="id" value-type="String" />
     <attribute name="timestamp" value-type="Date" format="yyyy-MM-dd HH:mm:ss" />
-    <entity-ref name="entry" list="true" list-name="entries" />
+    <entity-ref name="entry" type="list" names="entries" />
   </entity>
   <entity name="entry">
     <attribute name="type" value-type="String" />

cat-consumer/src/main/resources/META-INF/dal/model/failure-report.xml

-<model model-package="com.dianping.cat.consumer.model.failure"
-	enable-merger="true" enable-json-builder="true" enable-xml-parser="true" enable-base-visitor="true">
-  <entity name="failure-report" root="true">
-    <entity-ref name="segment" map="true" map-name="segments" />
-  </entity>
-  <entity name="machines">
-    <element name="machine" value-type="String" type="set" />
-  </entity>
-  <entity name="segment">
-    <attribute name="id" value-type="String" key="true" />
-  </entity>
+<model model-package="com.dianping.cat.consumer.model.failure" enable-merger="true" enable-json-builder="true"
+	enable-xml-parser="true" enable-base-visitor="true">
+	<entity name="failure-report" root="true">
+		<entity-ref name="segment" type="map" />
+	</entity>
+	<entity name="machines">
+		<element name="machine" type="set" />
+	</entity>
+	<entity name="segment">
+		<attribute name="id" key="true" />
+	</entity>
 </model>
\ No newline at end of file

cat-consumer/src/main/resources/META-INF/dal/model/transaction-report-codegen.xml

@@ -2,11 +2,11 @@
 <model>
   <entity name="transaction-report" root="true">
     <attribute name="domain" value-type="String" />
-    <entity-ref name="type" list="true" list-name="types" />
+    <entity-ref name="type" type="list" names="types" />
   </entity>
   <entity name="type">
     <attribute name="id" value-type="String" />
-    <entity-ref name="name" list="true" list-name="names" />
+    <entity-ref name="name" type="list" names="names" />
   </entity>
   <entity name="name">
     <attribute name="id" value-type="String" />

cat-consumer/src/main/resources/META-INF/dal/model/transaction-report.xml

@@ -3,11 +3,11 @@
 	enable-xml-parser="true" enable-base-visitor="true">
 	<entity name="transaction-report" root="true">
 		<attribute name="domain" key="true" />
-		<entity-ref name="type" map="true" map-name="types" />
+		<entity-ref name="type" type="map" />
 	</entity>
 	<entity name="type" class-name="TransactionType">
 		<attribute name="id" key="true" />
-		<entity-ref name="name" map="true" map-name="names" />
+		<entity-ref name="name" type="map" />
 	</entity>
 	<entity name="name" class-name="TransactionName">
 		<attribute name="id" key="true" />

cat-core/pom.xml

@@ -29,7 +29,7 @@
 			<plugin>
 				<groupId>com.site.maven.plugins</groupId>
 				<artifactId>maven-codegen-plugin</artifactId>
-				<version>1.0.0-a1</version>
+				<version>1.0.0-a2</version>
 				<executions>
 					<execution>
 						<id>default-cli</id>

cat-core/src/main/resources/META-INF/dal/model/codegen.xml

@@ -5,7 +5,7 @@
 		<attribute name="base-log-dir" value-type="String" />
 		<attribute name="base-log-url" value-type="String" />
 		<entity-ref name="app" />
-		<entity-ref name="server" list="true" list-name="servers" xml-indent="true" />
+		<entity-ref name="server" type="list" names="servers" xml-indent="true" />
 		<entity-ref name="bind" />
 		<entity-ref name="filter" />
 	</entity>
@@ -23,7 +23,6 @@
 		<attribute name="port" value-type="int" />
 	</entity>
 	<entity name="filter">
-		<element name="domain" value-type="String" list="true" list-name="domains" />
+		<element name="domain" value-type="String" type="list" names="domains" />
 	</entity>
 </model>
-