Index: topia2/changelog
diff -u topia2/changelog:1.27 topia2/changelog:1.28
--- topia2/changelog:1.27	Thu Nov  8 20:14:59 2007
+++ topia2/changelog	Fri Nov  9 09:18:15 2007
@@ -1,5 +1,11 @@
 ver-2-0-?? ??? ???
 
+ * 20071109 [chatellier] add type="string" on topiaId in templates
+    - update hibernate version to 3.2.5.ga (event patch)
+    - jetty version 5.1.10 (better pom.xml)
+ 
+ * 20071001 [chatellier] move tapestry version to 5.0.5
+
  * 20070528 [chatellier] add stateModel generation support
     - tapestry generation templates
     - tapestry 5.0.4 dependency

Index: topia2/pom.xml
diff -u topia2/pom.xml:1.30 topia2/pom.xml:1.31
--- topia2/pom.xml:1.30	Tue Jul 24 12:55:37 2007
+++ topia2/pom.xml	Fri Nov  9 09:18:15 2007
@@ -117,16 +117,9 @@
         </dependency>
 				
         <dependency>
-            <groupId>hibernate</groupId>
+            <groupId>org.hibernate</groupId>
             <artifactId>hibernate</artifactId>
-            <version>3.2-patchevent</version>
-			<scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>antlr</groupId>
-            <artifactId>antlr</artifactId>
-            <version>2.7.2</version>
+            <version>3.2.5.ga-eventpatch</version>
 			<scope>compile</scope>
         </dependency>
 
@@ -181,35 +174,20 @@
             <version>10.1.2.1</version>
 			<scope>test</scope>
         </dependency>
-		
-		<!--Runtime-->
-		<dependency>
-            <groupId>net.sf.ehcache</groupId>
-            <artifactId>ehcache</artifactId>
-            <version>1.2.1RC</version>
-            <scope>runtime</scope>
-        </dependency>
 
-		<dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib</artifactId>
-            <version>2.1_3</version>
-			<scope>runtime</scope>
-        </dependency>
-		
 		<!-- Dependencies for services -->
-	<dependency>
+        <dependency>
             <groupId>xmlrpc</groupId>
             <artifactId>xmlrpc-server</artifactId>
             <version>3.0</version>
             <scope>compile</scope>
         </dependency>
 		
-	<dependency>
+        <dependency>
             <groupId>xmlrpc</groupId>
             <artifactId>xmlrpc-client</artifactId>
             <version>3.0</version>
-	    <scope>compile</scope>
+            <scope>compile</scope>
         </dependency>
 		
 		<dependency>
@@ -228,8 +206,8 @@
 		<!-- branch 5.1 : ne fonctionne pas en 6+ -->
 	    <dependency>
 	        <groupId>jetty</groupId>
-	        <artifactId>org.mortbay.jetty</artifactId>
-	        <version>5.1.12</version>
+	        <artifactId>jetty</artifactId>
+	        <version>5.1.10</version>
 	    </dependency>
 		
 	    <dependency>