Menu
▾
▴
[Jboss-svn-commits] Mail delivery failed: returning message to sender
|
From: Mail D. S. <Mai...@li...> - 2006-06-06 16:47:53
|
This message was created automatically by mail delivery software.
A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:
jbo...@li...
SMTP error from remote mailer after RCPT TO:<jbo...@li...>:
host sc8-sf-list1-new-b.sourceforge.net [10.3.1.93]:
550 relay not permitted
------ This is a copy of the message, including all the headers. ------
Return-path: <jbo...@li...>
Received: from fw01.ext.inap.atl.jboss.com ([64.74.196.247])
by mail.sourceforge.net with esmtps (TLSv1:AES256-SHA:256)
(Exim 4.44)
id 1FmCh0-0001Uw-Q7
for jbo...@li...; Fri, 02 Jun 2006 09:40:12 -0700
Received: from committer01.frg.pub.inap.atl.jboss.com (committer01.frg.pub.inap.atl.jboss.com [64.74.196.144])
by fw01.ext.inap.atl.jboss.com (8.13.3/8.13.3) with ESMTP id k52Ge9ep004521
for <jbo...@li...>; Fri, 2 Jun 2006 12:40:09 -0400 (EDT)
Received: from www-data by committer01.frg.pub.inap.atl.jboss.com with local (Exim 4.50)
id 1FmCgz-0001zi-O2
for jbo...@li...; Fri, 02 Jun 2006 12:40:09 -0400
To: jbo...@li...
From: jbo...@li...
Subject: JBL Code SVN: r4568 - in labs/jbosslabs/trunk/portal-extensions: 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-theme/jbossForgeLayout.war/layouts jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins
Reply-to: jbo...@li...
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <E1F...@co...>
Date: Fri, 02 Jun 2006 12:40:09 -0400
X-Spam-Score: 0.2 (/)
X-Spam-Report: Spam Filtering performed by sourceforge.net.
See http://spamassassin.org/tag/ for more details.
Report problems to http://sf.net/tracker/?func=add&group_id=1&atid=200001
0.2 NO_REAL_NAME From: does not include a real name
Author: szimano
Date: 2006-06-02 12:40:02 -0400 (Fri, 02 Jun 2006)
New Revision: 4568
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/gwt/client/TagMeShowPopupListener.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java
labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RDFPlugin.java
Log:
rdf issue JBLAB-677
tagme window JBLAB-674
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-06-02 15:16:59 UTC (rev 4567)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java 2006-06-02 16:40:02 UTC (rev 4568)
@@ -21,7 +21,6 @@
*/
package org.jboss.labs.tagme;
-import java.util.Collections;
import java.util.Vector;
import org.jboss.labs.tagme.gwt.client.TagMeClickListener;
@@ -42,16 +41,10 @@
public Vector getTags(String path, String clas) {
Vector vect = null;
- /*vect.add("piwo"); vect.add("wodka"); vect.add("kefir");
- vect.add("sÅoÅ"); vect.add("kulfon"); vect.add("kret");
- vect.add("polska"); vect.add("europa"); vect.add("Åwiat");*/
-
try {
TagMeTagger tagger = (TagMeTagger)Class.forName(clas).newInstance();
vect = tagger.getTags(path);
-
- Collections.sort(vect);
} catch (InstantiationException e) {
// TODO Auto-generated catch block
e.printStackTrace();
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-06-02 15:16:59 UTC (rev 4567)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java 2006-06-02 16:40:02 UTC (rev 4568)
@@ -21,6 +21,7 @@
*/
package org.jboss.labs.tagme.gwt.client;
+import java.util.HashMap;
import java.util.Vector;
import com.google.gwt.core.client.GWT;
@@ -29,9 +30,10 @@
import com.google.gwt.user.client.rpc.ServiceDefTarget;
import com.google.gwt.user.client.ui.Button;
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.HorizontalPanel;
import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.PopupPanel;
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
@@ -43,11 +45,11 @@
private String path;
private String user;
-
+
private String clas;
-
+
private Label info;
-
+
private FlexTable table;
public TagMeShowPopupListener(String path, String user, String clas) {
@@ -55,14 +57,16 @@
this.user = user;
this.clas = clas;
}
-
+
public void refreshTags() {
-
- table.clear();
-
+
+ for (int i = 0; i < table.getRowCount(); i++) {
+ table.removeRow(i);
+ }
+
TaggingServiceAsync tagging = (TaggingServiceAsync) GWT
- .create(TaggingService.class);
-
+ .create(TaggingService.class);
+
ServiceDefTarget endpoint = (ServiceDefTarget) tagging;
endpoint.setServiceEntryPoint("/tagme-servlet/tag/");
@@ -70,15 +74,32 @@
public void onSuccess(Object result) {
Vector vect = (Vector) result;
- int cols = (int) Math.sqrt(vect.size());
+ HashMap rows = new HashMap();
+ int rowsNum = 0;
+
for (int i = 0; i < vect.size(); i++) {
- table.setText(i / cols, i % cols, (String) vect.get(i));
+
+ String[] to = ((String) vect.get(i)).split(TagMeClickListener.TAG_SEP);
+
+ String tag = to[0];
+ String user = to[1];
+ String fullName = to[2];
+
+ if (!rows.keySet().contains(user)) {
+ rows.put(user, new Integer(rowsNum));
+ table.setHTML(rowsNum++, 0, "<b>"+fullName+"</b>");
+ }
+
+ int curRow = ((Integer) rows.get(user)).intValue();
+
+ table.setText(curRow, table.getCellCount(curRow), tag);
+
}
}
public void onFailure(Throwable caught) {
- Window.alert("Error ! " + caught.getMessage());
+ Window.alert("Error ! " + caught.getMessage() + " Throwable: " + caught);
}
};
@@ -90,15 +111,15 @@
VerticalPanel panel = new VerticalPanel();
info = new Label();
-
+
panel.add(info);
-
+
table = new FlexTable();
panel.add(table);
Vector textBoxes = new Vector();
-
+
for (int i = 0; i < 3; i++) {
TextBox box = new TextBox();
textBoxes.add(box);
@@ -107,18 +128,43 @@
refreshTags();
- panel.add(new Button("Save", new TagMeClickListener(path, user, clas,
- textBoxes, info, this)));
+ final DialogBox dialog = new DialogBox();
- PopupPanel popUp = new PopupPanel(true);
+ HorizontalPanel btnPanel = new HorizontalPanel();
+ btnPanel.add(new Button("Save", new TagMeClickListener(path, user,
+ clas, textBoxes, info, this)));
+ btnPanel.add(new Button("Close", new ClickListener() {
- popUp.setStyleName(TAGME_STYLE);
-
- popUp.add(panel);
-
- popUp.setPopupPosition(sender.getAbsoluteLeft(), sender.getAbsoluteTop());
-
- popUp.show();
+ public void onClick(Widget sender) {
+ dialog.hide();
+ }
+
+ }));
+
+ panel.add(btnPanel);
+
+ // PopupPanel popUp = new PopupPanel(true);
+
+ // popUp.setStyleName(TAGME_STYLE);
+
+ // popUp.add(panel);
+
+ // popUp.setPopupPosition(sender.getAbsoluteLeft(),
+ // sender.getAbsoluteTop());
+
+ // popUp.show();
+
+ dialog.add(panel);
+
+ dialog.setStyleName(TAGME_STYLE);
+
+ dialog.setText("TagMe!");
+
+ dialog.setPopupPosition(sender.getAbsoluteLeft(), sender
+ .getAbsoluteTop());
+
+ dialog.show();
+
}
}
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-02 15:16:59 UTC (rev 4567)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java 2006-06-02 16:40:02 UTC (rev 4568)
@@ -21,10 +21,10 @@
*/
package org.jboss.labs.tagme.services;
-import java.util.Iterator;
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;
@@ -35,11 +35,12 @@
public class ShotokuTaggingService implements TagMeTagger {
private static final String SHOTOKU_TAG = "tag";
-
- private static final Logger log = Logger.getLogger(ShotokuTaggingService.class);
+ private static final Logger log = Logger
+ .getLogger(ShotokuTaggingService.class);
+
public Vector getTags(String path) {
- log.info("Getting tags for: "+path);
+ log.info("Getting tags for: " + path);
ContentManager manager = ContentManager.getContentManager();
Vector<String> tags = new Vector<String>();
@@ -53,7 +54,11 @@
for (String key : map.keySet()) {
log.info(key);
if (key.startsWith(SHOTOKU_TAG)) {
- tags.add(map.get(key));
+ 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) {
@@ -68,7 +73,7 @@
}
public void addTag(String user, String path, String tag) {
- log.info("Adding tag: "+tag+" for node: "+path);
+ log.info("Adding tag: " + tag + " for node: " + path);
ContentManager manager = ContentManager.getContentManager();
Node node;
@@ -81,11 +86,11 @@
while (node.getProperty(SHOTOKU_TAG + ":" + user + ":" + i) != null) {
i++;
}
-
+
node.setProperty(SHOTOKU_TAG + ":" + user + ":" + i, tag);
-
+
try {
- node.save("Saving tag: "+tag+" by: "+user);
+ node.save("Saving tag: " + tag + " by: " + user);
} catch (SaveException e) {
// TODO Auto-generated catch block
e.printStackTrace();
Modified: labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2006-06-02 15:16:59 UTC (rev 4567)
+++ labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2006-06-02 16:40:02 UTC (rev 4568)
@@ -70,7 +70,7 @@
</tbody></table>
</div>
<div id="ControlMenu">
- <form id="TopSearch" action="http://www.jboss.com/search.jsp">
+ <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="<%
@@ -87,7 +87,7 @@
<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="query" onfocus="SearchFocus(this)" onblur="SearchBlur(this)" value="Search..." />
+ <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>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RDFPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RDFPlugin.java 2006-06-02 15:16:59 UTC (rev 4567)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RDFPlugin.java 2006-06-02 16:40:02 UTC (rev 4568)
@@ -48,7 +48,7 @@
public WikiPage process(WikiPage wikiPage, WikiSession wikiSession) {
StringBuilder rdfFeed = new StringBuilder(
"<!-- name=\"generator\" content=\"JBoss Wiki RDFPlugin\" -->\n");
- rdfFeed.append("<rdf:RDF>\n");
+ rdfFeed.append("<rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" xmlns=\"http://purl.org/rss/1.0/\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:sy=\"http://purl.org/rss/1.0/modules/syndication/\">\n");
rdfFeed.append("<channel rdf:about=\"").append(
(String) wikiSession.getAttribute("hostURL")).append("/wiki/")
.append(
|
