Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r4713 - in labs/jbosslabs/branches/qa/jbosslabs/portal-extensions: . forge-common/src/java/org/jboss/forge/common/navigation forge-contributor/src/java/org/jboss/forge/contributor forge-tagme/src/java/org/jboss/labs/tagme/gwt/client forge-tagme/src/java/org/jboss/labs/tagme/services forge-theme/jbossForgeLayout.war/layouts
|
From: <jbo...@li...> - 2006-06-09 22:28:07
|
Author: dam...@jb... Date: 2006-06-09 18:28:00 -0400 (Fri, 09 Jun 2006) New Revision: 4713 Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/Entry.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/Menu.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConAccessBean.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/maven.xml Log: MERGED: -r 4703:4711 https://svn.labs.jboss.com/labs/jbosslabs/trunk into qa for Labs 1.1 testing. Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/Entry.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/Entry.java 2006-06-09 22:23:33 UTC (rev 4712) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/Entry.java 2006-06-09 22:28:00 UTC (rev 4713) @@ -179,9 +179,10 @@ User user = request.getUser(); if ((user == null) || - (!user.getRoleNames().contains(permission))) + (!user.getRoleNames().contains(permission))) { // The user doesn't have the given role. return; + } } innerFillContext(request, context, currentLink, projectId, levelId); Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/Menu.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/Menu.java 2006-06-09 22:23:33 UTC (rev 4712) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/Menu.java 2006-06-09 22:28:00 UTC (rev 4713) @@ -104,7 +104,7 @@ public void fillContext(JBossRenderRequest request, DelegateContext context, String currentLink, String projectId, String levelId) { for (Entry e : entries) { - e.innerFillContext(request, context, currentLink, projectId, levelId); + e.fillContext(request, context, currentLink, projectId, levelId); } } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConAccessBean.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConAccessBean.java 2006-06-09 22:23:33 UTC (rev 4712) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConAccessBean.java 2006-06-09 22:28:00 UTC (rev 4713) @@ -32,6 +32,6 @@ } public boolean isUserLogged() { - return ConTools.getRemoteUser() != null; + return ConTools.getRemoteUser() != null; } } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java 2006-06-09 22:23:33 UTC (rev 4712) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java 2006-06-09 22:28:00 UTC (rev 4713) @@ -33,6 +33,7 @@ import com.google.gwt.user.client.ui.ClickListener; import com.google.gwt.user.client.ui.DialogBox; import com.google.gwt.user.client.ui.FlexTable; +import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Label; @@ -96,6 +97,7 @@ String tag = to[0]; String user = to[1]; String fullName = to[2]; + String feed = to[3]; if (!rows.keySet().contains(user)) { rows.put(user, new Integer(rowsNum)); @@ -109,7 +111,8 @@ Image im = new Image("/tagme-servlet/images/delete.gif"); HorizontalPanel hpanel = new HorizontalPanel(); - hpanel.add(new Label(tag)); + hpanel.add(new HTML("<a href='" + feed + "' target='_blank' >" + tag + + "</a>")); hpanel.add(im); im.addClickListener(new DeleteTagClickListener( @@ -119,7 +122,8 @@ hpanel); } else { // just show tag - table.setText(curRow, table.getCellCount(curRow), tag); + table.setHTML(curRow, table.getCellCount(curRow), + "<a href='" + feed + "' target='_blank' >" + tag + "</a>"); } } } @@ -197,15 +201,15 @@ public void startProgressAnim(String text) { info.setText(text); - + timer = new Timer() { - + public void run() { info.setText(info.getText() + "."); } - + }; - + timer.scheduleRepeating(1000); } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java 2006-06-09 22:23:33 UTC (rev 4712) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java 2006-06-09 22:28:00 UTC (rev 4713) @@ -22,25 +22,19 @@ 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; import org.jboss.labs.tagme.gwt.client.TagMeClickListener; import org.jboss.logging.Logger; -import org.jboss.shotoku.ContentManager; -import org.jboss.shotoku.Node; -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.TagService; -import org.jboss.shotoku.tags.tools.TagTools; import org.jboss.shotoku.tags.exceptions.TagAddException; import org.jboss.shotoku.tags.exceptions.TagDeleteException; import org.jboss.shotoku.tags.exceptions.TagGetException; +import org.jboss.shotoku.tags.tools.FeedType; +import org.jboss.shotoku.tags.tools.TagTools; public class ShotokuTaggingService implements TagMeTagger { @@ -51,6 +45,10 @@ private TagService service = TagTools.getService(); + public String getFeedForTag(String tag, String type) { + return service.getFeedLink(FeedType.TAGS, tag, type); + } + public Vector getTags(String path) { log.info("Getting tags for: " + path); @@ -60,9 +58,14 @@ List<Tag> allTags = service.getTags(path); for (Tag tag : allTags) { - tags.add(tag.getName() + TagMeClickListener.TAG_SEP - + tag.getAuthor() + TagMeClickListener.TAG_SEP - + tag.getAuthor()); + tags.add(tag.getName() + + TagMeClickListener.TAG_SEP + + tag.getAuthor() + + TagMeClickListener.TAG_SEP + + tag.getAuthor() + + TagMeClickListener.TAG_SEP + + service.getFeedLink(FeedType.TAGS, tag.getName(), + "rss2")); } } catch (TagGetException e) { Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java 2006-06-09 22:23:33 UTC (rev 4712) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java 2006-06-09 22:28:00 UTC (rev 4713) @@ -29,4 +29,6 @@ public void addTag(String user, String path, String tag); public void deleteTag(String user, String path, String tag); + + public String getFeedForTag(String tag, String type); } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2006-06-09 22:23:33 UTC (rev 4712) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2006-06-09 22:28:00 UTC (rev 4713) @@ -1,4 +1,68 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %> <html xmlns="http://www.w3.org/1999/xhtml"> <!-- JBoss, the OpenSource J2EE webOS Distributable under LGPL license. See terms of license at gnu.org. --> <head><title>JBoss.ORG</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <meta name="gwt:module" content="/tagme-servlet/www/org.jboss.labs.tagme.gwt.TagMe/org.jboss.labs.tagme.gwt.TagMe" /> <link rel="stylesheet" href="/file-access/default/theme/css/print.css" type="text/css" media="print" /> <link rel="stylesheet" href="/file-access/default/theme/css/common.css" type="text/css" media="all" /> <link rel="stylesheet" href="/file-access/default/theme/css/jboss-forge.css" type="text/css" media="all" /> <link rel="stylesheet" href="/file-access/default/theme/css/jboss-forge-forums.css" type="text/css" media="all" /> <link rel="stylesheet" href="/file-access/default/theme/css/portlet.css" type="text/css" media="all" /> <link rel="stylesheet" href="/file-access/default/theme/css/podcasts.css" type="text/css" media="all" /> <link rel="stylesheet" href="/file-access/default/theme/css/primates.css" type="text/css" media="all" /> <link rel="stylesheet" href="/file-access/default/theme/css/blog.css" type="text/css" media="all" /> <!-- insert the dynamically determined theme elements here, or use the 'simple-sample' theme by default --> <!-- <p:theme themeName='jboss-forge' /> --> <script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/elqNow/elqCfg.js'></script> <script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/elqNow/elqImg.js'></script> <!-- speller script --> <script type='text/javascript' language='JavaScript' src="/speller/pages/spellChecker.js"></script> <script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/speller.js'></script> <!-- end speller script --> <!-- Hide/Show Script for main marketing area --> <script type="text/javascript" language="javascript"> function hideShow(id) { var navpoint = document.getElementById(id); if (navpoint.className == 'hidden') { navpoint.className = 'shown'; } else { navpoint.className = 'hidden'; } } </script> <!-- end Hide/Show script --> </head> <body> <!-- HEADER START --> <!-- this image creates IE problems --> <!-- <img src="/jbossForge/images/svrGP.gif" border="0" height="1" width="1"> --> <!-- GWT script --> <script language="javascript" src="/tagme-servlet/www/org.jboss.labs.tagme.gwt.TagMe/gwt.js"></script> <div class="brand_FED" id="container"> <div id="TopLogo"> <img src="http://jboss.com/themes/jbosstheme/img/logo.gif" alt="JBoss - The Professional Open Source Company" /> </div> +<!DOCTYPE html +PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + +<%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %> +<html xmlns="http://www.w3.org/1999/xhtml"> +<!-- + JBoss, the OpenSource J2EE webOS + Distributable under LGPL license. + See terms of license at gnu.org. + --> +<head><title>JBoss.ORG</title> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> +<meta name="gwt:module" content="/tagme-servlet/www/org.jboss.labs.tagme.gwt.TagMe/org.jboss.labs.tagme.gwt.TagMe" /> +<link rel="stylesheet" href="/file-access/default/theme/css/print.css" type="text/css" media="print" /> +<link rel="stylesheet" href="/file-access/default/theme/css/common.css" type="text/css" media="all" /> +<link rel="stylesheet" href="/file-access/default/theme/css/jboss-forge.css" type="text/css" media="all" /> +<link rel="stylesheet" href="/file-access/default/theme/css/jboss-forge-forums.css" type="text/css" media="all" /> +<link rel="stylesheet" href="/file-access/default/theme/css/portlet.css" type="text/css" media="all" /> +<link rel="stylesheet" href="/file-access/default/theme/css/podcasts.css" type="text/css" media="all" /> +<link rel="stylesheet" href="/file-access/default/theme/css/primates.css" type="text/css" media="all" /> +<link rel="stylesheet" href="/file-access/default/theme/css/blog.css" type="text/css" media="all" /> +<!-- insert the dynamically determined theme elements here, or use the 'simple-sample' theme by default --> + <!-- <p:theme themeName='jboss-forge' /> --> + +<script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/elqNow/elqCfg.js'></script> +<script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/elqNow/elqImg.js'></script> + +<!-- speller script --> +<script type='text/javascript' language='JavaScript' src="/speller/pages/spellChecker.js"></script> + +<script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/speller.js'></script> +<!-- end speller script --> +<!-- Hide/Show Script for main marketing area --> +<script type="text/javascript" language="javascript"> +function hideShow(id) +{ +var navpoint = document.getElementById(id); +if (navpoint.className == 'hidden') { +navpoint.className = 'shown'; +} else { +navpoint.className = 'hidden'; +} +} +</script> +<!-- end Hide/Show script --> + +</head> + + +<body> +<!-- HEADER START --> +<!-- this image creates IE problems --> +<!-- <img src="/jbossForge/images/svrGP.gif" border="0" height="1" width="1"> --> + +<!-- GWT script --> +<script language="javascript" src="/tagme-servlet/www/org.jboss.labs.tagme.gwt.TagMe/gwt.js"></script> + + +<div class="brand_FED" id="container"> + +<div id="TopLogo"> + <img src="http://jboss.com/themes/jbosstheme/img/logo.gif" alt="JBoss - The Professional Open Source Company" /> +</div> + <div id="TopMenu"> <table cellpadding="0" cellspacing="0"> <tr> @@ -10,5 +74,68 @@ </tr> </table> </div> - <div id="ControlMenu"> <form id="TopSearch" action="http://www.google.com/search" onsubmit="document.forms[0].q.value = document.forms[0].q.value + ' site:jboss.org';"> <ul> <li><a href="<% String url = request.getRequestURL().append((request.getQueryString() != null && request.getQueryString().length() > 0) ? "?" + request.getQueryString() : "").toString(); if (url.contains("/authsec") || url.contains("/auth")) { out.print(url); } else { out.print(url.replace("/portal","/portal/authsec")); }%>">Login</a></li> <li><a href="http://www.jboss.com/index.html?op=checkage&module=user">Register</a></li> <li><a href="http://www.jboss.com/careers">Careers</a></li> <li><a href="http://www.jboss.com/company/contact">Contact Us</a></li> <li> <input style="border: 1px solid #6e6e6e; font: 10px Verdana, Helvetica, Arial, sans-serif; padding-left: 2px; margin-left: 10px;" name="q" onfocus="SearchFocus(this)" onblur="SearchBlur(this)" value="Search..." /> <input class="searchbutton" type="image" src="/file-access/default/theme/images/spacer.gif" value="go" align="middle" /> </li> </ul> </form> </div> <!-- HEADER END --> <!-- main page table --> <table id="BodyTable" border="0" cellpadding="0" cellspacing="0"> <tbody> <tr> <td colspan="4" class="topheader"></td> </tr> <tr> <td class="leftside" rowspan="2"><p:region regionName='left'/></td> <td class="bodycell" colspan="3"><p:region regionName='center'/></td> </tr> <tr> <td class="innerleft"><p:region regionName='innerleft'/></td> <td class="innerright"><p:region regionName='innerright'/></td> - <td class="rightside"><p:region regionName='right'/></td> </tr> </tbody> </table> <div id="jbfPageFooter"> <div id="Copyright"> JBoss is a registered trademark and servicemark of JBoss Inc. 2002-2005 JBoss Inc. All rights reserved.<br /> Theme made by <a href="http://mamut.net.pl">Szimano</a> </div> </div> </body> </html> \ No newline at end of file + +<div id="ControlMenu"> + <form id="TopSearch" action="http://www.google.com/search" onsubmit="document.forms[0].q.value = document.forms[0].q.value + ' site:jboss.org';"> + <ul> + <li><a href="<% + + String url = request.getRequestURL().append((request.getQueryString() != null && request.getQueryString().length() > 0) ? "?" + request.getQueryString() : "").toString(); + + if (url.contains("/authsec") || url.contains("/auth")) { + out.print(url); + } + else { + out.print(url.replace("/portal","/portal/authsec")); + }%>">Login</a></li> + + <li><a href="http://www.jboss.com/index.html?op=checkage&module=user">Register</a></li> + <li><a href="http://www.jboss.com/careers">Careers</a></li> + <li><a href="http://www.jboss.com/company/contact">Contact Us</a></li> + <li> + <input style="border: 1px solid #6e6e6e; font: 10px Verdana, Helvetica, Arial, sans-serif; padding-left: 2px; margin-left: 10px;" name="q" onfocus="SearchFocus(this)" onblur="SearchBlur(this)" value="Search..." /> + <input class="searchbutton" type="image" src="/file-access/default/theme/images/spacer.gif" value="go" align="middle" /> + </li> + </ul> + </form> + +</div> +<!-- HEADER END --> + +<!-- main page table --> +<table id="BodyTable" border="0" cellpadding="0" cellspacing="0"> +<tbody> + <tr> + <td colspan="4" class="topheader"></td> + </tr> + <tr> + <td class="leftside" rowspan="2"><p:region regionName='left'/></td> + <td class="bodycell" colspan="3"><p:region regionName='center'/> + <table> + <tr> + <td class="innerleft"><p:region regionName='innerleft'/></td> + <td class="innerright"><p:region regionName='innerright'/></td> + <td class="rightside"><p:region regionName='right'/></td> + </tr> + </table></td> + + </tr> +</tbody> +</table> + +<div id="jbfPageFooter"> + <div id="Copyright"> + JBoss is a registered trademark and servicemark of JBoss Inc. 2002-2005 JBoss Inc. All rights reserved.<br /> +Theme made by <a href="http://mamut.net.pl">Szimano</a> + </div> +</div> + + + +</body> +</html> + + + + + Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/maven.xml =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/maven.xml 2006-06-09 22:23:33 UTC (rev 4712) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/maven.xml 2006-06-09 22:28:00 UTC (rev 4713) @@ -157,6 +157,7 @@ 3. jbosswiki/wiki-common/src/etc/org/jboss/wiki/filedatasource.properties 4. shotoku/shotoku-base/src/etc/shotoku.properties 5. shotoku/build.properties +6. configuration/to-copy/JBLabs-ds.xml Available goals: - help - prints this info |
![http://jboss.com/themes/jbosstheme/img/logo.gif"](http://jboss.com/themes/jbosstheme/img/logo.gif"){kind=link}