[jboss-cvs] jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model ...

Christian Bauer christian at hibernate.org
Thu Apr 19 10:58:32 EDT 2007


  User: cbauer  
  Date: 07/04/19 10:58:32

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/model          
                        FeedEntry.java Role.java HistoricalNode.hbm.xml
                        Feed.java User.java LinkProtocol.java
                        UserImage.java Comment.java Node.java
  Added:       examples/wiki/src/main/org/jboss/seam/wiki/core/model          
                        package-info.java
  Log:
  Switched to new Hibernate unified sequence generator, solving the identity-insert bugs which were breaking some atomic conversation
  
  Revision  Changes    Path
  1.3       +1 -1      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/FeedEntry.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FeedEntry.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/FeedEntry.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- FeedEntry.java	9 Apr 2007 08:43:53 -0000	1.2
  +++ FeedEntry.java	19 Apr 2007 14:58:32 -0000	1.3
  @@ -13,7 +13,7 @@
   public class FeedEntry implements Serializable {
   
       @Id
  -    @GeneratedValue
  +    @GeneratedValue(generator = "wikiSequenceGenerator")
       @Column(name = "FEEDENTRY_ID")
       private Long id;
   
  
  
  
  1.4       +1 -1      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/Role.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Role.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/Role.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- Role.java	18 Mar 2007 15:44:37 -0000	1.3
  +++ Role.java	19 Apr 2007 14:58:32 -0000	1.4
  @@ -11,7 +11,7 @@
   public class Role implements Serializable, Comparable {
   
       @Id
  -    @GeneratedValue
  +    @GeneratedValue(generator = "wikiSequenceGenerator")
       @Column(name = "ROLE_ID")
       private Long id = null;
   
  
  
  
  1.3       +5 -1      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/HistoricalNode.hbm.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HistoricalNode.hbm.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/HistoricalNode.hbm.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- HistoricalNode.hbm.xml	18 Mar 2007 15:44:37 -0000	1.2
  +++ HistoricalNode.hbm.xml	19 Apr 2007 14:58:32 -0000	1.3
  @@ -12,7 +12,11 @@
   
       <class name="Node" entity-name="HistoricalNode" abstract="true" table="NODE_HISTORY" polymorphism="explicit">
           <id name="historicalNodeId" column="NODE_HISTORY_ID">
  -            <generator class="native"/>
  +            <generator class="org.hibernate.id.enhanced.SequenceStyleGenerator">
  +                <param name="sequence_name">WIKI_SEQUENCE</param>
  +                <param name="initial_value">1000</param>
  +                <param name="increment_size">1</param>
  +            </generator>
           </id>
   
           <discriminator column="NODE_TYPE" length="255"/>
  
  
  
  1.2       +1 -1      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/Feed.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Feed.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/Feed.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- Feed.java	8 Apr 2007 15:10:36 -0000	1.1
  +++ Feed.java	19 Apr 2007 14:58:32 -0000	1.2
  @@ -9,7 +9,7 @@
   public class Feed implements Serializable {
   
       @Id
  -    @GeneratedValue
  +    @GeneratedValue(generator = "wikiSequenceGenerator")
       @Column(name = "FEED_ID")
       private Long id;
   
  
  
  
  1.6       +2 -1      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/User.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: User.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/User.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- User.java	8 Apr 2007 15:10:36 -0000	1.5
  +++ User.java	19 Apr 2007 14:58:32 -0000	1.6
  @@ -13,7 +13,8 @@
   @Table(name = "USERS")
   public class User implements Serializable {
   
  -    @Id @GeneratedValue
  +    @Id
  +    @GeneratedValue(generator = "wikiSequenceGenerator")
       @Column(name = "USER_ID")
       private Long id = null;
   
  
  
  
  1.2       +1 -2      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/LinkProtocol.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LinkProtocol.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/LinkProtocol.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- LinkProtocol.java	9 Apr 2007 10:57:58 -0000	1.1
  +++ LinkProtocol.java	19 Apr 2007 14:58:32 -0000	1.2
  @@ -10,9 +10,8 @@
   @Table(name = "LINK_PROTOCOL")
   public class LinkProtocol {
   
  -
       @Id
  -    @GeneratedValue
  +    @GeneratedValue(generator = "wikiSequenceGenerator")
       @Column(name = "LINK_PROTOCOL_ID")
       private Long id;
   
  
  
  
  1.2       +1 -1      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/UserImage.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UserImage.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/UserImage.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- UserImage.java	7 Mar 2007 18:37:35 -0000	1.1
  +++ UserImage.java	19 Apr 2007 14:58:32 -0000	1.2
  @@ -12,7 +12,7 @@
   public class UserImage implements Serializable {
   
       @Id
  -    @GeneratedValue
  +    @GeneratedValue(generator = "wikiSequenceGenerator")
       @Column(name = "USER_IMAGE_ID")
       private Long id;
   
  
  
  
  1.2       +1 -1      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/Comment.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Comment.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/Comment.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- Comment.java	19 Apr 2007 09:32:05 -0000	1.1
  +++ Comment.java	19 Apr 2007 14:58:32 -0000	1.2
  @@ -14,7 +14,7 @@
   public class Comment implements Serializable {
   
       @Id
  -    @GeneratedValue
  +    @GeneratedValue(generator = "wikiSequenceGenerator")
       @Column(name = "COMMENT_ID")
       private Long id = null;
   
  
  
  
  1.9       +1 -1      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/Node.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Node.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/Node.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- Node.java	8 Apr 2007 15:10:36 -0000	1.8
  +++ Node.java	19 Apr 2007 14:58:32 -0000	1.9
  @@ -40,7 +40,7 @@
       private int revision = 0;
   
       @Id
  -    @GeneratedValue
  +    @GeneratedValue(generator = "wikiSequenceGenerator")
       @Column(name = "NODE_ID")
       protected Long nodeId;
   
  
  
  
  1.1      date: 2007/04/19 14:58:32;  author: cbauer;  state: Exp;jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/package-info.java
  
  Index: package-info.java
  ===================================================================
  @GenericGenerator(
      name = "wikiSequenceGenerator",
      strategy = "org.hibernate.id.enhanced.SequenceStyleGenerator",
      parameters = {
          @Parameter(name = "sequence_name", value = "WIKI_SEQUENCE"),
          @Parameter(name = "initial_value", value = "1000"),
          @Parameter(name = "increment_size", value = "1")
      }
  )
  
  package org.jboss.seam.wiki.core.model;
  
  import org.hibernate.annotations.GenericGenerator;
  import org.hibernate.annotations.Parameter;
  
  
  
  



More information about the jboss-cvs-commits mailing list