Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r4684 - in labs/jbosslabs/trunk/portal-extensions: forge-freezone/src/java/org/jboss/forge/projects/freezone forge-freezone/src/web/WEB-INF forge-tagme forge-tagme/src/java/org/jboss/labs/tagme/gwt/client forge-tagme/src/java/org/jboss/labs/tagme/services forge-theme
|
From: <jbo...@li...> - 2006-06-08 21:03:29
|
Author: szimano
Date: 2006-06-08 17:03:18 -0400 (Thu, 08 Jun 2006)
New Revision: 4684
Removed:
labs/jbosslabs/trunk/portal-extensions/forge-freezone/src/web/WEB-INF/jsp/
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/project.xml
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMe.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java
labs/jbosslabs/trunk/portal-extensions/forge-theme/project.xml
Log:
tags compatible with new tagserv code, tagme.jsp for freezone in cms
Modified: labs/jbosslabs/trunk/portal-extensions/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2006-06-08 21:02:32 UTC (rev 4683)
+++ labs/jbosslabs/trunk/portal-extensions/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2006-06-08 21:03:18 UTC (rev 4684)
@@ -57,6 +57,8 @@
private final static String ERROR_404_MSG = "404 - Not found.";
+ private final static String TAGME_JSP = "freezone/tagme.jsp";
+
private void sendResponseNotFound(JBossRenderResponse response)
throws IOException {
response.setContentType(Constants.PAGES_MIME_TYPE);
@@ -114,7 +116,7 @@
// (possibly) create a new page.ru
if (isAllowedToEdit(portalName, request, response)) {
response.setContentType(Constants.PAGES_MIME_TYPE);
- writeTagmeButton(request, response, requestedPath);
+ writeTagmeButton(portalName, request, response, requestedPath);
writeEditLink(portalName, requestedPath, request, response);
response.getWriter().println(ERROR_404_MSG);
} else {
@@ -125,7 +127,7 @@
}
response.setContentType(Constants.PAGES_MIME_TYPE);
- writeTagmeButton(request, response, requestedPath);
+ writeTagmeButton(portalName, request, response, requestedPath);
if (isAllowedToEdit(portalName, request, response)) {
writeEditLink(portalName, requestedPath, request, response);
Tools.transfer(requestedNode.getContentInputStream(), response
@@ -136,15 +138,17 @@
}
}
- private void writeTagmeButton(JBossRenderRequest request,
- JBossRenderResponse response, String requestedPath)
- throws PortletException, IOException {
+ private void writeTagmeButton(String portalName,
+ JBossRenderRequest request, JBossRenderResponse response,
+ String requestedPath) throws PortletException, IOException {
if (request.getUser() != null) {
request.setAttribute("TAGME_PATH", requestedPath);
request.setAttribute("TAGME_USER", request.getUser().getUserName());
-
+
PortletRequestDispatcher rd = getPortletContext()
- .getRequestDispatcher("/WEB-INF/jsp/normal.jsp");
+ .getRequestDispatcher(
+ ForgeHelper.createRepoAccessPath(portalName,
+ TAGME_JSP));
rd.include(request, response);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/project.xml 2006-06-08 21:02:32 UTC (rev 4683)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/project.xml 2006-06-08 21:03:18 UTC (rev 4684)
@@ -42,5 +42,26 @@
<version>1.0</version>
<jar>shotoku-tags.jar</jar>
</dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>ejb3-persistence</artifactId>
+ <jar>ejb3-persistence.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-ejb3x</artifactId>
+ <jar>jboss-ejb3x.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-j2ee</artifactId>
+ <jar>jboss-j2ee.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-annotations-ejb3</artifactId>
+ <jar>jboss-annotations-ejb3.jar</jar>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMe.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMe.java 2006-06-08 21:02:32 UTC (rev 4683)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMe.java 2006-06-08 21:03:18 UTC (rev 4684)
@@ -26,6 +26,7 @@
import com.google.gwt.core.client.EntryPoint;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.RootPanel;
public class TagMe implements EntryPoint {
@@ -109,9 +110,14 @@
}
}
- private Button getButton(String path, String user, String clas) {
+ private Image getButton(String path, String user, String clas) {
- return new Button("TagMe", new TagMeShowPopupListener(path, user, clas));
+ Image image = new Image("/file-access/default/theme/images/but_tagme.gif");
+ image.setStyleName("tagme_btn");
+ image.addClickListener(new TagMeShowPopupListener(path, user, clas));
+
+ return image;
+ //return new Button("TagMe", new TagMeShowPopupListener(path, user, clas));
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java 2006-06-08 21:02:32 UTC (rev 4683)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java 2006-06-08 21:03:18 UTC (rev 4684)
@@ -21,7 +21,9 @@
*/
package org.jboss.labs.tagme.services;
+import java.util.Date;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.Vector;
@@ -32,6 +34,14 @@
import org.jboss.shotoku.exceptions.RepositoryException;
import org.jboss.shotoku.exceptions.ResourceDoesNotExist;
import org.jboss.shotoku.exceptions.SaveException;
+import org.jboss.shotoku.tags.ShotokuTag;
+import org.jboss.shotoku.tags.Tag;
+import org.jboss.shotoku.tags.TagList;
+import org.jboss.shotoku.tags.TagService;
+import org.jboss.shotoku.tags.TagTools;
+import org.jboss.shotoku.tags.exceptions.TagAddException;
+import org.jboss.shotoku.tags.exceptions.TagDeleteException;
+import org.jboss.shotoku.tags.exceptions.TagGetException;
public class ShotokuTaggingService implements TagMeTagger {
@@ -40,108 +50,117 @@
private static final Logger log = Logger
.getLogger(ShotokuTaggingService.class);
+ private TagService service = TagTools.getService();
+
public Vector getTags(String path) {
log.info("Getting tags for: " + path);
- ContentManager manager = ContentManager.getContentManager();
Vector<String> tags = new Vector<String>();
- Node node;
try {
- node = manager.getNode(path);
+ TagList tagList = service.getTags(path);
- Map<String, String> map = node.getProperties();
+ if (tagList != null) {
+ List<Tag> allTags = tagList.getList();
- for (String key : map.keySet()) {
- log.info(key);
- if (key.startsWith(SHOTOKU_TAG)) {
- String tag = (String) map.get(key);
- String user = (String) key.substring(key.indexOf(':') + 1,
- key.lastIndexOf(':'));
- tags.add(tag + TagMeClickListener.TAG_SEP + user
- + TagMeClickListener.TAG_SEP + user);
+ for (Tag tag : allTags) {
+ tags.add(tag.getName() + TagMeClickListener.TAG_SEP
+ + tag.getAuthor() + TagMeClickListener.TAG_SEP
+ + tag.getAuthor());
}
}
- } catch (RepositoryException e) {
+ } catch (TagGetException e) {
// TODO Auto-generated catch block
e.printStackTrace();
- } catch (ResourceDoesNotExist e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
}
+ /*
+ * ContentManager manager = ContentManager.getContentManager();
+ *
+ * Node node; try { node = manager.getNode(path);
+ *
+ * Map<String, String> map = node.getProperties();
+ *
+ * for (String key : map.keySet()) { log.info(key); if
+ * (key.startsWith(SHOTOKU_TAG)) { String tag = (String) map.get(key);
+ * String user = (String) key.substring(key.indexOf(':') + 1,
+ * key.lastIndexOf(':')); tags.add(tag + TagMeClickListener.TAG_SEP +
+ * user + TagMeClickListener.TAG_SEP + user); } } } catch
+ * (RepositoryException e) { // TODO Auto-generated catch block
+ * e.printStackTrace(); } catch (ResourceDoesNotExist e) { // TODO
+ * Auto-generated catch block e.printStackTrace(); }
+ */
return tags;
}
public void addTag(String user, String path, String tag) {
log.info("Adding tag: " + tag + " for node: " + path);
- ContentManager manager = ContentManager.getContentManager();
-
- Node node;
-
try {
- node = manager.getNode(path);
-
- if (!getTags(path).contains(tag)) {
- int i = 0;
- while (node.getProperty(SHOTOKU_TAG + ":" + user + ":" + i) != null) {
- i++;
- }
-
- node.setProperty(SHOTOKU_TAG + ":" + user + ":" + i, tag);
-
- try {
- node.save("Saving tag: " + tag + " by: " + user);
- } catch (SaveException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- } catch (RepositoryException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (ResourceDoesNotExist e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ service.addTag(new ShotokuTag(tag, user, path, null, new Date()));
+ } catch (TagAddException e) {
+ throw new RuntimeException(e);
}
+ /*
+ * ContentManager manager = ContentManager.getContentManager();
+ *
+ * Node node;
+ *
+ * try { node = manager.getNode(path);
+ *
+ * if (!getTags(path).contains(tag)) { int i = 0; while
+ * (node.getProperty(SHOTOKU_TAG + ":" + user + ":" + i) != null) { i++; }
+ *
+ * node.setProperty(SHOTOKU_TAG + ":" + user + ":" + i, tag);
+ *
+ * try { node.save("Saving tag: " + tag + " by: " + user); } catch
+ * (SaveException e) { // TODO Auto-generated catch block
+ * e.printStackTrace(); } } } catch (RepositoryException e) { // TODO
+ * Auto-generated catch block e.printStackTrace(); } catch
+ * (ResourceDoesNotExist e) { // TODO Auto-generated catch block
+ * e.printStackTrace(); }
+ */
}
public void deleteTag(String user, String path, String tag) {
+ log.info("Deleting tag " + tag + " " + path + "...");
+
try {
- log.info("Deleting tag " + tag + " " + path + "...");
+ List<Tag> tags = service.getTags(path).getList();
- Node node = ContentManager.getContentManager().getNode(path);
-
- Iterator it = node.getProperties().keySet().iterator();
- boolean found = false;
- String key = null;
-
- while (!found && it.hasNext()) {
- key = (String) it.next();
- if (node.getProperties().get(key).equals(tag)) {
- found = true;
+ for (Tag tagObj : tags) {
+ if (tagObj.getName().equals(tag)
+ && tagObj.getAuthor().equals(user)) {
+ service.deleteTag(tagObj);
}
}
+ } catch (TagGetException e) {
+ throw new RuntimeException(e);
+ } catch (TagDeleteException e) {
+ throw new RuntimeException(e);
+ }
- if (found) {
- node.deleteProperty(key);
- try {
- node.save("Removing tag: " + tag + " by user: " + user);
-
- log.info("tag deleted ! (key: " + key + " )");
- } catch (SaveException e) {
- e.printStackTrace();
- }
- }
-
- } catch (RepositoryException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (ResourceDoesNotExist e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ /*
+ * try {
+ *
+ *
+ * Node node = ContentManager.getContentManager().getNode(path);
+ *
+ * Iterator it = node.getProperties().keySet().iterator(); boolean found =
+ * false; String key = null;
+ *
+ * while (!found && it.hasNext()) { key = (String) it.next(); if
+ * (node.getProperties().get(key).equals(tag)) { found = true; } }
+ *
+ * if (found) { node.deleteProperty(key); try { node.save("Removing tag: " +
+ * tag + " by user: " + user);
+ *
+ * log.info("tag deleted ! (key: " + key + " )"); } catch (SaveException
+ * e) { e.printStackTrace(); } } } catch (RepositoryException e) { //
+ * TODO Auto-generated catch block e.printStackTrace(); } catch
+ * (ResourceDoesNotExist e) { // TODO Auto-generated catch block
+ * e.printStackTrace(); }
+ */
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-theme/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-theme/project.xml 2006-06-08 21:02:32 UTC (rev 4683)
+++ labs/jbosslabs/trunk/portal-extensions/forge-theme/project.xml 2006-06-08 21:03:18 UTC (rev 4684)
@@ -45,5 +45,6 @@
<version>1.0</version>
<jar>javax.servlet.jar</jar>
</dependency>
+
</dependencies>
</project>
|
