[jboss-svn-commits] JBL Code SVN: r5726 - in labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki: . management

[jboss-svn-commits at lists.jboss.org]

Author: unibrew
Date: 2006-08-10 15:14:00 -0400 (Thu, 10 Aug 2006)
New Revision: 5726

Modified:
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/management/EMailNotifier.java
Log:
svn merge -r 5616:5725 https://svn.labs.jboss.com/labs/jbosslabs/trunk/portal-extensions .
wiki slsb bug


Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java	2006-08-10 19:12:19 UTC (rev 5725)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java	2006-08-10 19:14:00 UTC (rev 5726)
@@ -81,6 +81,9 @@
 			// QueueSession sess = null;
 			// Queue queue = null;
 			EMailNotifier notifer = null;
+
+			//String emailLookupString = EMailNotifier.class.getName();
+			String emailLookupString = "wiki/EMailNotifierSLSB/local";
 			try {
 				/*
 				 * queue = (Queue) context.lookup("queue/wikiNotifications");
@@ -90,8 +93,7 @@
 				 * QueueSession.AUTO_ACKNOWLEDGE);
 				 */
 
-				notifer = (EMailNotifier) context.lookup(EMailNotifier.class
-						.getName());
+				notifer = (EMailNotifier) context.lookup(emailLookupString);
 
 				// if (sess != null) {
 				if (notifer != null) {
@@ -126,15 +128,14 @@
 						engine.refreshPage(page.getName(), page.getLangCode());
 
 						WikiPage orgPage;
-						
+
 						if (page.getLastVersion() > 1) {
-							orgPage = engine.getByName(page.getName(),
-									null, page.getLastVersion() - 1, page
+							orgPage = engine.getByName(page.getName(), null,
+									page.getLastVersion() - 1, page
 											.getLangCode());
+						} else {
+							orgPage = (WikiPage) page.clone();
 						}
-						else {
-							orgPage = (WikiPage)page.clone();
-						}
 
 						WikiPage pageHtml = engine.getWikiType("htmlClear")
 								.process(page, wikiSession);

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/management/EMailNotifier.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/management/EMailNotifier.java	2006-08-10 19:12:19 UTC (rev 5725)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/management/EMailNotifier.java	2006-08-10 19:14:00 UTC (rev 5726)
@@ -1,5 +1,8 @@
 package org.jboss.wiki.management;
 
+import javax.ejb.Local;
+
+ at Local
 public interface EMailNotifier {
 	public void sendNotification(NotificationMsg notifications);
 }