[jboss-cvs] jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action ...
Christian Bauer
christian at hibernate.org
Mon Sep 24 04:23:21 EDT 2007
User: cbauer
Date: 07/09/24 04:23:21
Modified: examples/wiki/src/main/org/jboss/seam/wiki/core/action
Authenticator.java DirectoryHome.java
AdminHome.java WikiRequestResolver.java
DocumentHome.java CommentHome.java
Added: examples/wiki/src/main/org/jboss/seam/wiki/core/action
Help.java
Log:
New help system and improved wiki text editor
Revision Changes Path
1.8 +2 -4 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/Authenticator.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Authenticator.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/Authenticator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- Authenticator.java 17 Aug 2007 13:00:28 -0000 1.7
+++ Authenticator.java 24 Sep 2007 08:23:21 -0000 1.8
@@ -33,10 +33,10 @@
@In
private Identity identity;
- @RequestParameter
private String activationCode;
+ public String getActivationCode() { return activationCode; }
+ public void setActivationCode(String activationCode) { this.activationCode = activationCode; }
- @Transactional
public boolean authenticate() {
if (org.jboss.seam.wiki.core.dao.UserRoleAccessFactory.GUEST_USERNAME.equals(identity.getUsername())) return false;
@@ -60,7 +60,6 @@
return true;
}
- @Transactional
public String activate() {
User user = userDAO.findUserWithActivationCode(activationCode);
if (user != null) {
@@ -81,7 +80,6 @@
}
}
- @Transactional
public void createHomeDirectory(User user) {
NodeDAO nodeDAO = (NodeDAO)Component.getInstance("nodeDAO");
1.18 +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.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- DirectoryHome.java 15 Sep 2007 17:06:19 -0000 1.17
+++ DirectoryHome.java 24 Sep 2007 08:23:21 -0000 1.18
@@ -104,7 +104,6 @@
}
}
- @Transactional
private void createOrRemoveFeed() {
if (hasFeed && getInstance().getFeed() == null) {
// Does not have a feed but user wants one, create it
1.10 +0 -4 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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- AdminHome.java 15 Sep 2007 17:06:19 -0000 1.9
+++ AdminHome.java 24 Sep 2007 08:23:21 -0000 1.10
@@ -105,7 +105,6 @@
LinkProtocol newLinkProtocol;
@Factory("linkProtocols")
- @Transactional
public void loadLinkProtocols() {
//noinspection unchecked
Map<String, LinkProtocol> linkProtocolMap = (Map<String, LinkProtocol>)Component.getInstance("linkProtocolMap");
@@ -116,7 +115,6 @@
return linkProtocol;
}
- @Transactional
public void addLinkProtocol() {
entityManager.joinTransaction();
@@ -136,7 +134,6 @@
linkProtocol = new LinkProtocol();
}
- @Transactional
public void removeLinkProtocol() {
entityManager.joinTransaction();
entityManager.remove(selectedLinkProtocol);
@@ -152,7 +149,6 @@
private SearchableEntity selectedIndexedEntity;
@Factory("indexedEntities")
- @Transactional
public void loadIndexedEntities() throws Exception {
SearchRegistry registry = (SearchRegistry)Component.getInstance("searchRegistry");
1.2 +0 -1 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/WikiRequestResolver.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: WikiRequestResolver.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/WikiRequestResolver.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- WikiRequestResolver.java 25 Aug 2007 17:59:24 -0000 1.1
+++ WikiRequestResolver.java 24 Sep 2007 08:23:21 -0000 1.2
@@ -101,7 +101,6 @@
protected Directory currentDirectory = null;
public Directory getCurrentDirectory() { return currentDirectory; }
- @Transactional
public String resolve() {
// Queue a message if requested (for message passing across session invalidations)
1.28 +9 -0 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DocumentHome.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: DocumentHome.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DocumentHome.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- DocumentHome.java 15 Sep 2007 17:06:19 -0000 1.27
+++ DocumentHome.java 24 Sep 2007 08:23:21 -0000 1.28
@@ -15,6 +15,7 @@
import org.jboss.seam.wiki.core.dao.FeedDAO;
import org.jboss.seam.wiki.core.dao.UserRoleAccessFactory;
import org.jboss.seam.wiki.core.action.prefs.DocumentEditorPreferences;
+import org.jboss.seam.wiki.core.action.prefs.CommentsPreferences;
import org.jboss.seam.wiki.preferences.PreferenceSupport;
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
@@ -84,6 +85,12 @@
/* -------------------------- Custom CUD ------------------------------ */
+ protected Document createInstance() {
+ Document newDoc = super.createInstance();
+ newDoc.setEnableComments( ((CommentsPreferences)Component.getInstance("commentsPreferences")).getEnableByDefault() );
+ return newDoc;
+ }
+
protected boolean beforePersist() {
// Sync document content
syncFormToInstance(getParentDirectory());
@@ -174,6 +181,7 @@
}
private String findPluginsUsed() {
+ if (formContent == null) return null;
final StringBuilder usedPlugins = new StringBuilder();
WikiTextParser parser = new WikiTextParser(formContent, false, false);
parser.setCurrentDocument(getInstance());
@@ -206,6 +214,7 @@
public void setFormContent(String formContent) {
this.formContent = formContent;
+ if (formContent != null) syncFormToInstance(getParentDirectory());
}
public boolean isMinorRevision() { return minorRevision; }
1.9 +2 -4 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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- CommentHome.java 25 Aug 2007 17:59:24 -0000 1.8
+++ CommentHome.java 24 Sep 2007 08:23:21 -0000 1.9
@@ -7,6 +7,7 @@
package org.jboss.seam.wiki.core.action;
import org.jboss.seam.annotations.*;
+import org.jboss.seam.annotations.remoting.WebRemote;
import org.jboss.seam.ScopeType;
import org.jboss.seam.Component;
import org.jboss.seam.security.Identity;
@@ -23,7 +24,7 @@
import java.util.ArrayList;
@Name("commentHome")
- at Scope(ScopeType.CONVERSATION)
+ at Scope(ScopeType.PAGE)
public class CommentHome implements Serializable {
@In
@@ -53,7 +54,6 @@
}
@Observer(value = {"org.jboss.seam.postAuthenticate", "PreferenceComponent.refresh.commentsPreferences"}, create = false)
- @Transactional
public void refreshComments() {
entityManager.joinTransaction();
@@ -81,7 +81,6 @@
comment.setSubject(documentHome.getInstance().getName());
}
- @Transactional
public void persist() {
entityManager.joinTransaction();
@@ -108,7 +107,6 @@
refreshComments();
}
- @Transactional
public void remove(Long commentId) {
entityManager.joinTransaction();
1.1 date: 2007/09/24 08:23:21; author: cbauer; state: Exp;jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/Help.java
Index: Help.java
===================================================================
package org.jboss.seam.wiki.core.action;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.In;
import org.jboss.seam.ScopeType;
import org.jboss.seam.Component;
import org.jboss.seam.framework.EntityNotFoundException;
import org.jboss.seam.wiki.core.model.Document;
import org.jboss.seam.wiki.core.model.Directory;
import org.jboss.seam.wiki.core.model.Node;
import org.jboss.seam.wiki.core.dao.NodeDAO;
import org.jboss.seam.wiki.core.action.prefs.WikiPreferences;
import org.jboss.seam.wiki.core.nestedset.NestedSetNodeWrapper;
import org.jboss.seam.wiki.util.WikiUtil;
@Name("help")
@Scope(ScopeType.PAGE)
public class Help {
@In
NodeDAO nodeDAO;
@In
WikiPreferences wikiPreferences;
NestedSetNodeWrapper<Node> root;
public NestedSetNodeWrapper<Node> getRoot() {
// If this is the first time or if the preferences changed... (re)load the help document tree
if (root == null || !root.getWrappedNode().getName().equals(wikiPreferences.getHelpArea()) ) {
Directory helpAreaRoot = nodeDAO.findArea(WikiUtil.convertToWikiName(wikiPreferences.getHelpArea()));
if (helpAreaRoot != null) {
root = nodeDAO.findMenuItems(helpAreaRoot, 99l, 1l, false);
} else {
throw new EntityNotFoundException("Help Area: '" + wikiPreferences.getHelpArea() + "'", Directory.class);
}
}
return root;
}
Document selectedDocument;
Directory selectedDirectory;
public Document getSelectedDocument() { return selectedDocument; }
public Directory getSelectedDirectory() { return selectedDirectory; }
NestedSetNodeWrapper<Node> selectedNode;
public NestedSetNodeWrapper<Node> getSelectedNode() { return selectedNode; }
public void setSelectedNode(NestedSetNodeWrapper<Node> selectedNode) {
this.selectedNode = selectedNode;
selectedDirectory = null;
selectedDocument = null;
if (selectedNode != null) {
if (WikiUtil.isDirectory( selectedNode.getWrappedNode() )) {
selectedDirectory = (Directory)selectedNode.getWrappedNode();
} else if (WikiUtil.isDocument( selectedNode.getWrappedNode() ) ) {
selectedDocument = (Document)selectedNode.getWrappedNode();
selectedDirectory = selectedNode.getWrappedNode().getParent();
}
} else {
selectedDirectory = (Directory)root.getWrappedNode();
}
}
public void selectDocumentByName(String documentName) {
Node foundNode = nodeDAO.findDocumentInArea(root.getWrappedNode().getAreaNumber(), WikiUtil.convertToWikiName(documentName));
if (foundNode == null)
throw new EntityNotFoundException("Help document: "+documentName, Document.class);
setSelectedNode(new NestedSetNodeWrapper(foundNode));
}
}
More information about the jboss-cvs-commits
mailing list