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

[Christian Bauer]

  User: cbauer  
  Date: 07/09/25 10:30:46

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/action   
                        CommentHome.java DirectoryHome.java AdminHome.java
  Log:
  Recommending upgrade of JBoss-bundled Hibernate instead of deploying our own (which caused weird conflicts at runtime)
  
  Revision  Changes    Path
  1.10      +0 -3      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/CommentHome.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CommentHome.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/CommentHome.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- CommentHome.java	24 Sep 2007 08:23:21 -0000	1.9
  +++ CommentHome.java	25 Sep 2007 14:30:46 -0000	1.10
  @@ -55,7 +55,6 @@
   
       @Observer(value = {"org.jboss.seam.postAuthenticate", "PreferenceComponent.refresh.commentsPreferences"}, create = false)
       public void refreshComments() {
  -        entityManager.joinTransaction();
   
           comments = new ArrayList<Comment>();
           
  @@ -83,7 +82,6 @@
   
       public void persist() {
   
  -        entityManager.joinTransaction();
           Document currentDocument = entityManager.merge(documentHome.getInstance());
           comment.setDocument(currentDocument);
           currentDocument.getComments().add(comment);
  @@ -108,7 +106,6 @@
       }
   
       public void remove(Long commentId) {
  -        entityManager.joinTransaction();
   
           Comment foundCommment = entityManager.find(Comment.class, commentId);
           if (foundCommment != null) {
  
  
  
  1.19      +0 -1      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DirectoryHome.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DirectoryHome.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DirectoryHome.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- DirectoryHome.java	24 Sep 2007 08:23:21 -0000	1.18
  +++ DirectoryHome.java	25 Sep 2007 14:30:46 -0000	1.19
  @@ -121,7 +121,6 @@
   
           } else if (!hasFeed && getInstance().getFeed() != null) {
               // Does have feed but user doesn't want it anymore... delete it
  -            getEntityManager().joinTransaction();
               getEntityManager().remove(getInstance().getFeed());
               getInstance().setFeed(null);
   
  
  
  
  1.11      +0 -2      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/AdminHome.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AdminHome.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/AdminHome.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- AdminHome.java	24 Sep 2007 08:23:21 -0000	1.10
  +++ AdminHome.java	25 Sep 2007 14:30:46 -0000	1.11
  @@ -116,7 +116,6 @@
       }
   
       public void addLinkProtocol() {
  -        entityManager.joinTransaction();
   
           // TODO: http://jira.jboss.com/jira/browse/JBSEAM-1297
           ClassValidator<LinkProtocol> validator = Validators.instance().getValidator(LinkProtocol.class);
  @@ -135,7 +134,6 @@
       }
   
       public void removeLinkProtocol() {
  -        entityManager.joinTransaction();
           entityManager.remove(selectedLinkProtocol);
           linkProtocols.remove(selectedLinkProtocol);
       }