[jboss-svn-commits] JBL Code SVN: r5081 - in labs/jbosslabs/trunk/portal-extensions: forge-contributor/src/web/WEB-INF/tld forge-file-access/src/web/WEB-INF/tld forge-podcast/src/web/WEB-INF/tld forge-root-redirect/src/web/WEB-INF/tld forge-status/src/web/WEB-INF/tld forge-tagme/src/java/org/jboss/labs/tagme forge-tagme/src/java/org/jboss/labs/tagme/gwt/client forge-tagme/src/java/org/jboss/labs/tagme/services forge-tagme/src/web/WEB-INF/tld forge-timetracker/src/web/WEB-INF/tld jbosswiki/forge-wiki/src/web/WEB-INF/jsp polls/src/web/WEB-INF/tld primates/src/web/WEB-INF/tld
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jul 13 16:24:17 EDT 2006
Author: szimano
Date: 2006-07-13 16:24:01 -0400 (Thu, 13 Jul 2006)
New Revision: 5081
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/tld/forge.tld
labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/web/WEB-INF/tld/forge.tld
labs/jbosslabs/trunk/portal-extensions/forge-podcast/src/web/WEB-INF/tld/forge.tld
labs/jbosslabs/trunk/portal-extensions/forge-root-redirect/src/web/WEB-INF/tld/forge.tld
labs/jbosslabs/trunk/portal-extensions/forge-status/src/web/WEB-INF/tld/forge.tld
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java
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/TagMeClickListener.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingService.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingServiceAsync.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagmeSet.java
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/TagMeTagger.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/web/WEB-INF/tld/forge.tld
labs/jbosslabs/trunk/portal-extensions/forge-timetracker/src/web/WEB-INF/tld/forge.tld
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp
labs/jbosslabs/trunk/portal-extensions/polls/src/web/WEB-INF/tld/forge.tld
labs/jbosslabs/trunk/portal-extensions/primates/src/web/WEB-INF/tld/forge.tld
Log:
tagme for website tags and wiki
Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/tld/forge.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/tld/forge.tld 2006-07-13 20:21:07 UTC (rev 5080)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/tld/forge.tld 2006-07-13 20:24:01 UTC (rev 5081)
@@ -55,6 +55,11 @@
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
+ <attribute>
+ <name>website</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
</tag>
<tag>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/web/WEB-INF/tld/forge.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/web/WEB-INF/tld/forge.tld 2006-07-13 20:21:07 UTC (rev 5080)
+++ labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/web/WEB-INF/tld/forge.tld 2006-07-13 20:24:01 UTC (rev 5081)
@@ -55,6 +55,11 @@
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
+ <attribute>
+ <name>website</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
</tag>
<tag>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-podcast/src/web/WEB-INF/tld/forge.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-podcast/src/web/WEB-INF/tld/forge.tld 2006-07-13 20:21:07 UTC (rev 5080)
+++ labs/jbosslabs/trunk/portal-extensions/forge-podcast/src/web/WEB-INF/tld/forge.tld 2006-07-13 20:24:01 UTC (rev 5081)
@@ -55,6 +55,11 @@
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
+ <attribute>
+ <name>website</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
</tag>
<tag>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-root-redirect/src/web/WEB-INF/tld/forge.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-root-redirect/src/web/WEB-INF/tld/forge.tld 2006-07-13 20:21:07 UTC (rev 5080)
+++ labs/jbosslabs/trunk/portal-extensions/forge-root-redirect/src/web/WEB-INF/tld/forge.tld 2006-07-13 20:24:01 UTC (rev 5081)
@@ -55,6 +55,11 @@
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
+ <attribute>
+ <name>website</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
</tag>
<tag>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/web/WEB-INF/tld/forge.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/web/WEB-INF/tld/forge.tld 2006-07-13 20:21:07 UTC (rev 5080)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/web/WEB-INF/tld/forge.tld 2006-07-13 20:24:01 UTC (rev 5081)
@@ -55,6 +55,11 @@
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
+ <attribute>
+ <name>website</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
</tag>
<tag>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java 2006-07-13 20:21:07 UTC (rev 5080)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java 2006-07-13 20:24:01 UTC (rev 5081)
@@ -62,7 +62,7 @@
return vect;
}
- public boolean addTag(String user, String path, String clas, String tags, String descriptions) {
+ public boolean addTag(String user, String path, String clas, String tags, String descriptions, boolean website) {
try {
TagMeTagger tagger = (TagMeTagger) Class.forName(clas)
.newInstance();
@@ -73,7 +73,7 @@
String[] descTable = descriptions.split(TagMeClickListener.TAG_SEP);
for (int i = 0; i < tagsTable.length; i++) {
- tagger.addTag(user, path, tagsTable[i], descTable[i]);
+ tagger.addTag(user, path, tagsTable[i], descTable[i], website);
}
return true;
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-07-13 20:21:07 UTC (rev 5080)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMe.java 2006-07-13 20:24:01 UTC (rev 5081)
@@ -36,9 +36,11 @@
private static final String DIV_PREFFIX = "tagMeDiv";
private static final String PATH_PREFIX = "tagMePath";
-
+
private static final String USER_PREFIX = "tagMeUser";
+ private static final String WEBSITE_PREFIX = "tagMeWebsite";
+
private static final String CLASS_PREFIX = "tagMeClass";
private Vector sets = new Vector();
@@ -53,15 +55,15 @@
* @return value of property
*/
public static native String getProperty(String name) /*-{
- return $wnd.__gwt_getMetaProperty(name);
+ return $wnd.__gwt_getMetaProperty(name);
}-*/;
public static native String getPropertiesUnsplited() /*-{
var __gwt_all = '';
- for (var tag in $wnd.__gwt_metaProps) {
- __gwt_all += tag + ';';
- }
+ for (var tag in $wnd.__gwt_metaProps) {
+ __gwt_all += tag + ';';
+ }
return __gwt_all;
}-*/;
@@ -80,24 +82,29 @@
// find correct props describing where tagme buttons should be placed
for (int i = 0; i < propNames.length; i++) {
- //Window.alert(propNames[i]);
+ // Window.alert(propNames[i]);
if (propNames[i] != null && propNames[i].startsWith(TAG_PREFFIX)) {
- //Window.alert("found: "+propNames[i]);
+ // Window.alert("found: "+propNames[i]);
String suff = getProperty(propNames[i]);
String div = getProperty(DIV_PREFFIX + suff);
String path = getProperty(PATH_PREFIX + suff);
String user = getProperty(USER_PREFIX + suff);
String clas = getProperty(CLASS_PREFIX + suff);
+ String website = getProperty(WEBSITE_PREFIX + suff);
- //Window.alert("Added: "+propNames[i]+" div: "+div+" path: "+path+" user: "+user);
- if (div != null && path != null && user != null && clas != null) {
- TagmeSet set = new TagmeSet(div, path, user, clas);
+ // Window.alert("Added: "+propNames[i]+" div: "+div+" path:
+ // "+path+" user: "+user);
+ if (div != null && path != null && user != null && clas != null
+ && website != null) {
+ TagmeSet set = new TagmeSet(div, path, user, clas, Boolean
+ .valueOf(website).booleanValue());
sets.add(set);
+ } else {
+ Window.alert("Wrong set: " + suff + " div= " + div
+ + " path= " + path + " user= " + user + " class= "
+ + clas);
}
- else {
- Window.alert("Wrong set: "+suff+" div= "+div+" path= "+path+" user= "+user+" class= "+clas);
- }
}
}
@@ -106,18 +113,24 @@
String path = set.getPath();
String user = set.getUser();
String clas = set.getClas();
- RootPanel.get(set.getDiv()).add(getButton(path, user, clas));
+ boolean website = set.isWebsite();
+ RootPanel.get(set.getDiv()).add(
+ getButton(path, user, clas, website));
}
}
- private Image getButton(String path, String user, String clas) {
+ private Image getButton(String path, String user, String clas,
+ boolean website) {
- Image image = new Image("/file-access/default/theme/images/but_tagme.gif");
+ Image image = new Image(
+ "/file-access/default/theme/images/but_tagme.gif");
image.setStyleName("tagme_btn");
- image.addClickListener(new TagMeShowPopupListener(path, user, clas, image));
-
+ image.addClickListener(new TagMeShowPopupListener(path, user, clas,
+ image, website));
+
return image;
- //return new Button("TagMe", new TagMeShowPopupListener(path, user, clas));
+ // return new Button("TagMe", new TagMeShowPopupListener(path, user,
+ // clas));
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeClickListener.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeClickListener.java 2006-07-13 20:21:07 UTC (rev 5080)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeClickListener.java 2006-07-13 20:24:01 UTC (rev 5081)
@@ -56,9 +56,11 @@
private TagMeShowPopupListener parent;
private Vector suggestionCheckboxes;
+
+ private boolean website;
public TagMeClickListener(String path, String user, String clas,
- Vector textBoxes, Vector descBoxes, Label info, Vector suggestionCheckboxes, TagMeShowPopupListener parent) {
+ Vector textBoxes, Vector descBoxes, Label info, Vector suggestionCheckboxes, TagMeShowPopupListener parent, boolean website) {
this.path = path;
this.user = user;
this.textBoxes = textBoxes;
@@ -67,6 +69,7 @@
this.parent = parent;
this.suggestionCheckboxes = suggestionCheckboxes;
this.descBoxes = descBoxes;
+ this.website = website;
}
public void onClick(Widget sender) {
@@ -107,7 +110,7 @@
descs = desc;
} else {
tags += TAG_SEP + tag;
- descs += TAG_SEP + desc;
+ descs += TAG_SEP + ((desc != null && desc.length() > 0) ? desc : " ");
}
}
}
@@ -125,7 +128,7 @@
}
}
- tagging.addTag(user, path, clas, tags, descs, callback);
+ tagging.addTag(user, path, clas, tags, descs, website, callback);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java 2006-07-13 20:21:07 UTC (rev 5080)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java 2006-07-13 20:24:01 UTC (rev 5081)
@@ -70,12 +70,15 @@
private ListBox listBox;
+ private boolean website;
+
public TagMeShowPopupListener(String path, String user, String clas,
- Image parentButton) {
+ Image parentButton, boolean website) {
this.path = path;
this.currentUser = user;
this.clas = clas;
this.parentButton = parentButton;
+ this.website = website;
}
public TagMeShowPopupListener getMyself() {
@@ -290,7 +293,7 @@
HorizontalPanel btnPanel = new HorizontalPanel();
this.saveBtn = new Button("Save", new TagMeClickListener(path,
currentUser, clas, textBoxes, descBoxes, info,
- suggestionCheckboxes, this));
+ suggestionCheckboxes, this, website));
btnPanel.add(saveBtn);
btnPanel.add(new Button("Close", new ClickListener() {
@@ -314,6 +317,7 @@
// popUp.show();
TabPanel tabs = new TabPanel();
+
tabs.add(panel, "Tag Content");
VerticalPanel searchPanel = new VerticalPanel();
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingService.java 2006-07-13 20:21:07 UTC (rev 5080)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingService.java 2006-07-13 20:24:01 UTC (rev 5081)
@@ -41,7 +41,7 @@
*/
public Vector getTags(String path, String clas);
- public boolean addTag(String user, String path, String clas, String tags, String descriptions);
+ public boolean addTag(String user, String path, String clas, String tags, String descriptions, boolean website);
public boolean deleteTag(String user, String path, String clas, String tag);
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingServiceAsync.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingServiceAsync.java 2006-07-13 20:21:07 UTC (rev 5080)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingServiceAsync.java 2006-07-13 20:24:01 UTC (rev 5081)
@@ -34,7 +34,7 @@
public void getTags(String path, String clas, AsyncCallback callback);
public void addTag(String user, String path, String clas, String tags, String descriptions,
- AsyncCallback callback);
+ boolean website, AsyncCallback callback);
public void deleteTag(String user, String path, String clas, String tag,
AsyncCallback callback);
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagmeSet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagmeSet.java 2006-07-13 20:21:07 UTC (rev 5080)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagmeSet.java 2006-07-13 20:24:01 UTC (rev 5081)
@@ -27,12 +27,14 @@
private String path;
private String user;
private String clas;
+ private boolean website;
- public TagmeSet(String div, String path, String user, String clas) {
+ public TagmeSet(String div, String path, String user, String clas, boolean website) {
this.div = div;
this.path = path;
this.user = user;
this.clas = clas;
+ this.website = website;
}
public String getPath() {
@@ -51,4 +53,8 @@
return clas;
}
+ public boolean isWebsite() {
+ return website;
+ }
+
}
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-07-13 20:21:07 UTC (rev 5080)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java 2006-07-13 20:24:01 UTC (rev 5081)
@@ -32,6 +32,7 @@
import org.jboss.shotoku.tags.ShotokuTag;
import org.jboss.shotoku.tags.Tag;
import org.jboss.shotoku.tags.TagService;
+import org.jboss.shotoku.tags.WebsiteTag;
import org.jboss.shotoku.tags.exceptions.TagAddException;
import org.jboss.shotoku.tags.exceptions.TagDeleteException;
import org.jboss.shotoku.tags.exceptions.TagGetException;
@@ -110,51 +111,25 @@
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, String desc) {
+ public void addTag(String user, String path, String tag, String desc,
+ boolean website) {
log.info("Adding tag: " + tag + " for node: " + path);
try {
- service.addTag(new ShotokuTag(tag, user, path, desc, new Date()));
+ if (website) {
+ service
+ .addTag(new WebsiteTag(tag, user, path, desc,
+ new Date()));
+ } else {
+ service
+ .addTag(new ShotokuTag(tag, user, path, desc,
+ 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(); }
- */
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java 2006-07-13 20:21:07 UTC (rev 5080)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java 2006-07-13 20:24:01 UTC (rev 5081)
@@ -26,7 +26,7 @@
public interface TagMeTagger {
public Vector getTags(String path);
- public void addTag(String user, String path, String tag, String desc);
+ public void addTag(String user, String path, String tag, String desc, boolean website);
public void deleteTag(String user, String path, String tag);
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/web/WEB-INF/tld/forge.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/web/WEB-INF/tld/forge.tld 2006-07-13 20:21:07 UTC (rev 5080)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/web/WEB-INF/tld/forge.tld 2006-07-13 20:24:01 UTC (rev 5081)
@@ -55,6 +55,11 @@
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
+ <attribute>
+ <name>website</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
</tag>
<tag>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-timetracker/src/web/WEB-INF/tld/forge.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-timetracker/src/web/WEB-INF/tld/forge.tld 2006-07-13 20:21:07 UTC (rev 5080)
+++ labs/jbosslabs/trunk/portal-extensions/forge-timetracker/src/web/WEB-INF/tld/forge.tld 2006-07-13 20:24:01 UTC (rev 5081)
@@ -55,6 +55,11 @@
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
+ <attribute>
+ <name>website</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
</tag>
<tag>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2006-07-13 20:21:07 UTC (rev 5080)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2006-07-13 20:24:01 UTC (rev 5081)
@@ -4,7 +4,9 @@
See terms of license at gnu.org.
-->
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" contentType="text/html; charset=UTF-8"%>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
<%@ page isELIgnored ="false" %>
+<portlet:defineObjects />
<%
String actionURL = (String)request.getAttribute("actionURL");
@@ -27,8 +29,21 @@
boolean logedIn = ((Boolean)request.getAttribute("logedIn")).booleanValue();
%>
+<%
+ if (request.getUserPrincipal() != null) {
+ out.println("<meta name='gwt:property' content='tagMeSet/wiki/"+wikiPage+"=/wiki/"+wikiPage+"' />");
+ out.println("<meta name='gwt:property' content='tagMeDiv/wiki/"+wikiPage+"=tagMeWiki' />");
+ out.println("<meta name='gwt:property' content='tagMePath/wiki/"+wikiPage+"=/wiki/"+wikiPage+"' />");
+ out.println("<meta name='gwt:property' content='tagMeUser/wiki/"+wikiPage+"="+request.getUserPrincipal().getName()+"' />");
+ out.println("<meta name='gwt:property' content='tagMeClass/wiki/"+wikiPage+"=org.jboss.labs.tagme.services.ShotokuTaggingService' />");
+ out.println("<meta name='gwt:property' content='tagMeWebsite/wiki/"+wikiPage+"=true' />");
+ }
+%>
+
<link rel="stylesheet" href="<%=wikiImagesUrl%>wikiStyle.css" type="text/css" media="all">
+<div id="tagMeWiki"><!-- tagme div --></div>
+
<table style="width: 100%" border="0">
<tr>
<td style="font-size: large">
Modified: labs/jbosslabs/trunk/portal-extensions/polls/src/web/WEB-INF/tld/forge.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/polls/src/web/WEB-INF/tld/forge.tld 2006-07-13 20:21:07 UTC (rev 5080)
+++ labs/jbosslabs/trunk/portal-extensions/polls/src/web/WEB-INF/tld/forge.tld 2006-07-13 20:24:01 UTC (rev 5081)
@@ -55,6 +55,11 @@
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
+ <attribute>
+ <name>website</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
</tag>
<tag>
Modified: labs/jbosslabs/trunk/portal-extensions/primates/src/web/WEB-INF/tld/forge.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/primates/src/web/WEB-INF/tld/forge.tld 2006-07-13 20:21:07 UTC (rev 5080)
+++ labs/jbosslabs/trunk/portal-extensions/primates/src/web/WEB-INF/tld/forge.tld 2006-07-13 20:24:01 UTC (rev 5081)
@@ -55,6 +55,11 @@
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
+ <attribute>
+ <name>website</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
</tag>
<tag>
More information about the jboss-svn-commits
mailing list