[jboss-cvs] jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model ...
Christian Bauer
christian at hibernate.org
Wed Jan 9 10:59:23 EST 2008
User: cbauer
Date: 08/01/09 10:59:23
Modified: examples/wiki/src/main/org/jboss/seam/wiki/core/model
WikiFeed.java WikiCommentFeedEntry.java
WikiDirectory.java WikiDocument.java User.java
WikiNode.java DatabaseObjects.hbm.xml
WikiComment.java WikiFile.java WikiUpload.java
WikiUploadImage.java WikiMenuItem.java
WikiDocumentFeedEntry.java
Log:
JBSEAM-2397 and JBSEAM-1883 - implemented trashcan feature and more reliable update of 2nd level cache and lucene index
Revision Changes Path
1.2 +1 -1 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiFeed.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: WikiFeed.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiFeed.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- WikiFeed.java 2 Jan 2008 18:59:47 -0000 1.1
+++ WikiFeed.java 9 Jan 2008 15:59:23 -0000 1.2
@@ -19,7 +19,7 @@
@OneToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "DIRECTORY_ID", nullable = true, updatable = false, unique = true)
@org.hibernate.annotations.ForeignKey(name = "FK_FEED_WIKI_DIRECTORY_ID")
- @org.hibernate.annotations.OnDelete(action = org.hibernate.annotations.OnDeleteAction.CASCADE)
+ //TODO: @org.hibernate.annotations.OnDelete(action = org.hibernate.annotations.OnDeleteAction.CASCADE)
private WikiDirectory directory;
public WikiFeed() {
1.2 +1 -1 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiCommentFeedEntry.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: WikiCommentFeedEntry.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiCommentFeedEntry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- WikiCommentFeedEntry.java 19 Dec 2007 04:29:20 -0000 1.1
+++ WikiCommentFeedEntry.java 9 Jan 2008 15:59:23 -0000 1.2
@@ -9,7 +9,7 @@
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "WIKI_COMMENT_ID", nullable = true)
@org.hibernate.annotations.ForeignKey(name = "FK_FEEDENTRY_WIKI_COMMENT_ID")
- @org.hibernate.annotations.OnDelete(action = org.hibernate.annotations.OnDeleteAction.CASCADE)
+ //TODO: @org.hibernate.annotations.OnDelete(action = org.hibernate.annotations.OnDeleteAction.CASCADE)
private WikiComment comment;
public WikiComment getComment() {
1.5 +1 -1 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiDirectory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: WikiDirectory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiDirectory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- WikiDirectory.java 2 Jan 2008 18:59:47 -0000 1.4
+++ WikiDirectory.java 9 Jan 2008 15:59:23 -0000 1.5
@@ -13,7 +13,7 @@
@Entity
@Table(name = "WIKI_DIRECTORY")
@org.hibernate.annotations.ForeignKey(name = "FK_WIKI_DIRECTORY_NODE_ID")
- at org.hibernate.annotations.OnDelete(action = org.hibernate.annotations.OnDeleteAction.CASCADE)
+//TODO: @org.hibernate.annotations.OnDelete(action = org.hibernate.annotations.OnDeleteAction.CASCADE)
public class WikiDirectory extends WikiNode<WikiDirectory> implements NestedSetNode<WikiDirectory>, Serializable {
@Column(name = "DESCRIPTION", nullable = true)
1.5 +1 -1 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiDocument.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: WikiDocument.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiDocument.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- WikiDocument.java 4 Jan 2008 22:28:52 -0000 1.4
+++ WikiDocument.java 9 Jan 2008 15:59:23 -0000 1.5
@@ -12,7 +12,7 @@
@Entity
@Table(name = "WIKI_DOCUMENT")
@org.hibernate.annotations.ForeignKey(name = "FK_WIKI_DOCUMENT_NODE_ID")
- at org.hibernate.annotations.OnDelete(action = org.hibernate.annotations.OnDeleteAction.CASCADE)
+//TODO: @org.hibernate.annotations.OnDelete(action = org.hibernate.annotations.OnDeleteAction.CASCADE)
@org.hibernate.search.annotations.Indexed
@Searchable(description = "Documents")
1.18 +1 -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.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- User.java 2 Jan 2008 21:07:00 -0000 1.17
+++ User.java 9 Jan 2008 15:59:23 -0000 1.18
@@ -93,7 +93,7 @@
private List<Role> roles = new ArrayList<Role>();
@ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "MEMBER_HOME_WIKI_DIRECTORY_ID", nullable = true)
+ @JoinColumn(name = "MEMBER_HOME_WIKI_DIRECTORY_ID", nullable = true, unique = true)
@org.hibernate.annotations.ForeignKey(name = "FK_USER_MEMBER_HOME_WIKI_DIRECTORY_ID")
private WikiDirectory memberHome;
1.4 +1 -1 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiNode.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: WikiNode.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiNode.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- WikiNode.java 30 Dec 2007 02:33:22 -0000 1.3
+++ WikiNode.java 9 Jan 2008 15:59:23 -0000 1.4
@@ -97,7 +97,7 @@
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "PARENT_NODE_ID", nullable = true)
- @org.hibernate.annotations.OnDelete(action = org.hibernate.annotations.OnDeleteAction.CASCADE)
+ //TODO: @org.hibernate.annotations.OnDelete(action = org.hibernate.annotations.OnDeleteAction.CASCADE)
@org.hibernate.annotations.ForeignKey(name = "FK_WIKI_NODE_PARENT_NODE_ID")
@org.hibernate.annotations.Fetch(org.hibernate.annotations.FetchMode.JOIN)
protected WikiNode parent;
1.10 +39 -55 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/DatabaseObjects.hbm.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: DatabaseObjects.hbm.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/DatabaseObjects.hbm.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- DatabaseObjects.hbm.xml 30 Dec 2007 02:33:22 -0000 1.9
+++ DatabaseObjects.hbm.xml 9 Jan 2008 15:59:23 -0000 1.10
@@ -21,8 +21,8 @@
<database-object>
<create>
- alter table FEED_FEEDENTRY drop constraint FK_FEED_FEEDENTRY_FEED_ID;
- alter table FEED_FEEDENTRY add constraint FK_FEED_FEEDENTRY_FEED_ID foreign key (FEED_ID) references FEED on delete cascade;
+ alter table WIKI_TAG drop constraint FK_WIKI_TAG_FILE_ID;
+ alter table WIKI_TAG add constraint FK_WIKI_TAG_FILE_ID foreign key (FILE_ID) references WIKI_FILE on delete cascade;
</create>
<drop/>
<dialect-scope name="org.hibernate.dialect.HSQLDialect"/>
@@ -30,8 +30,8 @@
<database-object>
<create>
- alter table FEED_FEEDENTRY drop constraint FK_FEED_FEEDENTRY_FEEDENTRY_ID;
- alter table FEED_FEEDENTRY add constraint FK_FEED_FEEDENTRY_FEEDENTRY_ID foreign key (FEEDENTRY_ID) references FEEDENTRY on delete cascade;
+ alter table WIKI_FILE_LINK drop constraint FK_SOURCE_WIKI_FILE_ID;
+ alter table WIKI_FILE_LINK add constraint FK_SOURCE_WIKI_FILE_ID foreign key (SOURCE_WIKI_FILE_ID) references WIKI_FILE on delete cascade;
</create>
<drop/>
<dialect-scope name="org.hibernate.dialect.HSQLDialect"/>
@@ -39,17 +39,18 @@
<database-object>
<create>
- alter table WIKI_DIRECTORY drop constraint FK_WIKI_DIRECTORY_DEFAULT_FILE_ID;
- alter table WIKI_DIRECTORY add constraint FK_WIKI_DIRECTORY_DEFAULT_FILE_ID foreign key (DEFAULT_FILE_ID) references WIKI_FILE on delete set null;
+ alter table WIKI_FILE_LINK drop constraint FK_TARGET_WIKI_FILE_ID;
+ alter table WIKI_FILE_LINK add constraint FK_TARGET_WIKI_FILE_ID foreign key (TARGET_WIKI_FILE_ID) references WIKI_FILE on delete cascade;
</create>
<drop/>
<dialect-scope name="org.hibernate.dialect.HSQLDialect"/>
</database-object>
+ <!--
<database-object>
<create>
- alter table WIKI_TAG drop constraint FK_WIKI_TAG_FILE_ID;
- alter table WIKI_TAG add constraint FK_WIKI_TAG_FILE_ID foreign key (FILE_ID) references WIKI_FILE on delete cascade;
+ alter table FEED_FEEDENTRY drop constraint FK_FEED_FEEDENTRY_FEED_ID;
+ alter table FEED_FEEDENTRY add constraint FK_FEED_FEEDENTRY_FEED_ID foreign key (FEED_ID) references FEED on delete cascade;
</create>
<drop/>
<dialect-scope name="org.hibernate.dialect.HSQLDialect"/>
@@ -57,8 +58,8 @@
<database-object>
<create>
- alter table WIKI_FILE_LINK drop constraint FK_SOURCE_WIKI_FILE_ID;
- alter table WIKI_FILE_LINK add constraint FK_SOURCE_WIKI_FILE_ID foreign key (SOURCE_WIKI_FILE_ID) references WIKI_FILE on delete cascade;
+ alter table FEED_FEEDENTRY drop constraint FK_FEED_FEEDENTRY_FEEDENTRY_ID;
+ alter table FEED_FEEDENTRY add constraint FK_FEED_FEEDENTRY_FEEDENTRY_ID foreign key (FEEDENTRY_ID) references FEEDENTRY on delete cascade;
</create>
<drop/>
<dialect-scope name="org.hibernate.dialect.HSQLDialect"/>
@@ -66,8 +67,8 @@
<database-object>
<create>
- alter table WIKI_FILE_LINK drop constraint FK_TARGET_WIKI_FILE_ID;
- alter table WIKI_FILE_LINK add constraint FK_TARGET_WIKI_FILE_ID foreign key (TARGET_WIKI_FILE_ID) references WIKI_FILE on delete cascade;
+ alter table WIKI_DIRECTORY drop constraint FK_WIKI_DIRECTORY_DEFAULT_FILE_ID;
+ alter table WIKI_DIRECTORY add constraint FK_WIKI_DIRECTORY_DEFAULT_FILE_ID foreign key (DEFAULT_FILE_ID) references WIKI_FILE on delete set null;
</create>
<drop/>
<dialect-scope name="org.hibernate.dialect.HSQLDialect"/>
@@ -108,52 +109,21 @@
<drop/>
<dialect-scope name="org.hibernate.dialect.HSQLDialect"/>
</database-object>
-
- <database-object>
- <create>
- create index IDX_PREFERENCE_ENTITY_NAME on PREFERENCE (ENTITY_NAME);
- </create>
- <drop>
- drop index IDX_PREFERENCE_ENTITY_NAME
- </drop>
- <dialect-scope name="org.hibernate.dialect.HSQLDialect"/>
- </database-object>
-
- <database-object>
- <create>
- create index IDX_PREFERENCE_ENTITY_PROPERTY_NAME on PREFERENCE (PROPERTY_NAME, ENTITY_NAME);
- </create>
- <drop>
- drop index IDX_PREFERENCE_ENTITY_PROPERTY_NAME
- </drop>
- <dialect-scope name="org.hibernate.dialect.HSQLDialect"/>
- </database-object>
+-->
<!-- ############################### MySQL ############################### -->
- <database-object>
- <create>
- alter table FEED_FEEDENTRY drop foreign key FK_FEED_FEEDENTRY_FEED_ID;
- </create><drop/><dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/>
- </database-object>
- <database-object>
- <create>
- alter table FEED_FEEDENTRY
- add constraint FK_FEED_FEEDENTRY_FEED_ID foreign key (FEED_ID) references FEED (FEED_ID) on delete cascade;
- </create><drop/><dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/>
- </database-object>
<database-object>
<create>
- alter table FEED_FEEDENTRY drop foreign key FK_FEED_FEEDENTRY_FEEDENTRY_ID;
+ alter table WIKI_TAG drop foreign key FK_WIKI_TAG_FILE_ID;
</create>
<drop/>
<dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/>
</database-object>
<database-object>
<create>
- alter table FEED_FEEDENTRY
- add constraint FK_FEED_FEEDENTRY_FEEDENTRY_ID foreign key (FEEDENTRY_ID) references FEEDENTRY (FEEDENTRY_ID) on delete cascade;
+ alter table WIKI_TAG add constraint FK_WIKI_TAG_FILE_ID foreign key (FILE_ID) references WIKI_FILE(NODE_ID) on delete cascade;
</create>
<drop/>
<dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/>
@@ -161,14 +131,14 @@
<database-object>
<create>
- alter table WIKI_DIRECTORY drop foreign key FK_WIKI_DIRECTORY_DEFAULT_FILE_ID;
+ alter table WIKI_FILE_LINK drop foreign key FK_SOURCE_WIKI_FILE_ID;
</create>
<drop/>
<dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/>
</database-object>
<database-object>
<create>
- alter table WIKI_DIRECTORY add constraint FK_WIKI_DIRECTORY_DEFAULT_FILE_ID foreign key (DEFAULT_FILE_ID) references WIKI_FILE(NODE_ID) on delete set null;
+ alter table WIKI_FILE_LINK add constraint FK_SOURCE_WIKI_FILE_ID foreign key (SOURCE_WIKI_FILE_ID) references WIKI_FILE(NODE_ID) on delete cascade;
</create>
<drop/>
<dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/>
@@ -176,29 +146,43 @@
<database-object>
<create>
- alter table WIKI_TAG drop foreign key FK_WIKI_TAG_FILE_ID;
+ alter table WIKI_FILE_LINK drop foreign key FK_TARGET_WIKI_FILE_ID;
</create>
<drop/>
<dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/>
</database-object>
<database-object>
<create>
- alter table WIKI_TAG add constraint FK_WIKI_TAG_FILE_ID foreign key (FILE_ID) references WIKI_FILE(NODE_ID) on delete cascade;
+ alter table WIKI_FILE_LINK add constraint FK_TARGET_WIKI_FILE_ID foreign key (TARGET_WIKI_FILE_ID) references WIKI_FILE(NODE_ID) on delete cascade;
</create>
<drop/>
<dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/>
</database-object>
+ <!--
<database-object>
<create>
- alter table WIKI_FILE_LINK drop foreign key FK_SOURCE_WIKI_FILE_ID;
+ alter table FEED_FEEDENTRY drop foreign key FK_FEED_FEEDENTRY_FEED_ID;
+ </create><drop/><dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/>
+ </database-object>
+ <database-object>
+ <create>
+ alter table FEED_FEEDENTRY
+ add constraint FK_FEED_FEEDENTRY_FEED_ID foreign key (FEED_ID) references FEED (FEED_ID) on delete cascade;
+ </create><drop/><dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/>
+ </database-object>
+
+ <database-object>
+ <create>
+ alter table FEED_FEEDENTRY drop foreign key FK_FEED_FEEDENTRY_FEEDENTRY_ID;
</create>
<drop/>
<dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/>
</database-object>
<database-object>
<create>
- alter table WIKI_FILE_LINK add constraint FK_SOURCE_WIKI_FILE_ID foreign key (SOURCE_WIKI_FILE_ID) references WIKI_FILE(NODE_ID) on delete cascade;
+ alter table FEED_FEEDENTRY
+ add constraint FK_FEED_FEEDENTRY_FEEDENTRY_ID foreign key (FEEDENTRY_ID) references FEEDENTRY (FEEDENTRY_ID) on delete cascade;
</create>
<drop/>
<dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/>
@@ -206,14 +190,14 @@
<database-object>
<create>
- alter table WIKI_FILE_LINK drop foreign key FK_TARGET_WIKI_FILE_ID;
+ alter table WIKI_DIRECTORY drop foreign key FK_WIKI_DIRECTORY_DEFAULT_FILE_ID;
</create>
<drop/>
<dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/>
</database-object>
<database-object>
<create>
- alter table WIKI_FILE_LINK add constraint FK_TARGET_WIKI_FILE_ID foreign key (TARGET_WIKI_FILE_ID) references WIKI_FILE(NODE_ID) on delete cascade;
+ alter table WIKI_DIRECTORY add constraint FK_WIKI_DIRECTORY_DEFAULT_FILE_ID foreign key (DEFAULT_FILE_ID) references WIKI_FILE(NODE_ID) on delete set null;
</create>
<drop/>
<dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/>
@@ -278,7 +262,7 @@
<drop/>
<dialect-scope name="org.hibernate.dialect.MySQL5InnoDBDialect"/>
</database-object>
-
+-->
<database-object>
<create>
create index IDX_PREFERENCE_ENTITY_NAME on PREFERENCE (ENTITY_NAME)
1.4 +4 -3 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiComment.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: WikiComment.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiComment.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- WikiComment.java 30 Dec 2007 02:33:22 -0000 1.3
+++ WikiComment.java 9 Jan 2008 15:59:23 -0000 1.4
@@ -16,7 +16,7 @@
@Entity
@Table(name = "WIKI_COMMENT")
@org.hibernate.annotations.ForeignKey(name = "FK_WIKI_COMMENT_NODE_ID")
- at org.hibernate.annotations.OnDelete(action = org.hibernate.annotations.OnDeleteAction.CASCADE)
+//TODO: @org.hibernate.annotations.OnDelete(action = org.hibernate.annotations.OnDeleteAction.CASCADE)
@org.hibernate.search.annotations.Indexed
@Searchable(description = "Comments")
@@ -152,8 +152,9 @@
}
public String toString() {
- return "Comment (" + getId() + "), " +
- "Subject: '" + getSubject() + "'";
+ return "Comment (" + getId() + ")," +
+ " Level: " + getLevel() +
+ " Subject: '" + getSubject() + "'";
}
}
1.3 +1 -1 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiFile.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: WikiFile.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiFile.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- WikiFile.java 20 Dec 2007 12:23:04 -0000 1.2
+++ WikiFile.java 9 Jan 2008 15:59:23 -0000 1.3
@@ -6,7 +6,7 @@
@Entity
@Table(name = "WIKI_FILE")
@org.hibernate.annotations.ForeignKey(name = "FK_WIKI_FILE_NODE_ID")
- at org.hibernate.annotations.OnDelete(action = org.hibernate.annotations.OnDeleteAction.CASCADE)
+//TODO: @org.hibernate.annotations.OnDelete(action = org.hibernate.annotations.OnDeleteAction.CASCADE)
public abstract class WikiFile<N extends WikiFile> extends WikiNode<N> {
@org.hibernate.annotations.CollectionOfElements(fetch = FetchType.LAZY)
1.3 +1 -1 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiUpload.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: WikiUpload.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiUpload.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- WikiUpload.java 20 Dec 2007 12:23:04 -0000 1.2
+++ WikiUpload.java 9 Jan 2008 15:59:23 -0000 1.3
@@ -11,7 +11,7 @@
@Entity
@Table(name = "WIKI_UPLOAD")
@org.hibernate.annotations.ForeignKey(name = "FK_WIKI_UPLOAD_NODE_ID")
- at org.hibernate.annotations.OnDelete(action = org.hibernate.annotations.OnDeleteAction.CASCADE)
+//TODO: @org.hibernate.annotations.OnDelete(action = org.hibernate.annotations.OnDeleteAction.CASCADE)
public class WikiUpload<U extends WikiUpload> extends WikiFile<U> {
@Column(name = "FILENAME", length = 255, nullable = false)
1.3 +1 -1 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiUploadImage.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: WikiUploadImage.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiUploadImage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- WikiUploadImage.java 20 Dec 2007 12:23:04 -0000 1.2
+++ WikiUploadImage.java 9 Jan 2008 15:59:23 -0000 1.3
@@ -5,7 +5,7 @@
@Entity
@Table(name = "WIKI_UPLOAD_IMAGE")
@org.hibernate.annotations.ForeignKey(name = "FK_WIKI_UPLOAD_IMAGE_NODE_ID")
- at org.hibernate.annotations.OnDelete(action = org.hibernate.annotations.OnDeleteAction.CASCADE)
+//TODO: @org.hibernate.annotations.OnDelete(action = org.hibernate.annotations.OnDeleteAction.CASCADE)
public class WikiUploadImage extends WikiUpload<WikiUploadImage> {
@Column(name = "SIZE_X")
1.2 +1 -1 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiMenuItem.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: WikiMenuItem.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiMenuItem.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- WikiMenuItem.java 19 Dec 2007 04:29:20 -0000 1.1
+++ WikiMenuItem.java 9 Jan 2008 15:59:23 -0000 1.2
@@ -14,7 +14,7 @@
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "DIRECTORY_ID", insertable = false, updatable = false)
@org.hibernate.annotations.ForeignKey(name = "FK_MENU_ITEM_DIRECTORY_ID")
- @org.hibernate.annotations.OnDelete(action = org.hibernate.annotations.OnDeleteAction.CASCADE)
+ //TODO: @org.hibernate.annotations.OnDelete(action = org.hibernate.annotations.OnDeleteAction.CASCADE)
private WikiDirectory directory;
@Column(name = "DISPLAY_POSITION", nullable = false)
1.3 +1 -1 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiDocumentFeedEntry.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: WikiDocumentFeedEntry.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/WikiDocumentFeedEntry.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- WikiDocumentFeedEntry.java 30 Dec 2007 02:33:22 -0000 1.2
+++ WikiDocumentFeedEntry.java 9 Jan 2008 15:59:23 -0000 1.3
@@ -9,7 +9,7 @@
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "WIKI_DOCUMENT_ID", nullable = true)
@org.hibernate.annotations.ForeignKey(name = "FK_FEEDENTRY_WIKI_DOCUMENT_ID")
- @org.hibernate.annotations.OnDelete(action = org.hibernate.annotations.OnDeleteAction.CASCADE)
+ //TODO: @org.hibernate.annotations.OnDelete(action = org.hibernate.annotations.OnDeleteAction.CASCADE)
private WikiDocument document;
public WikiDocument getDocument() {
More information about the jboss-cvs-commits
mailing list