[jboss-svn-commits] JBL Code SVN: r15603 - in labs/jbosslabs/trunk/portal-extensions/jbosswiki: forge-wiki and 20 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Oct 5 11:49:27 EDT 2007
Author: szimano
Date: 2007-10-05 11:49:27 -0400 (Fri, 05 Oct 2007)
New Revision: 15603
Added:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/Messages.properties
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/Messages_en.properties
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/log4j.properties
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/liferay-display.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/liferay-portlet.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/lib/liferay-portal-client.jar
labs/jbosslabs/trunk/portal-extensions/jbosswiki/lib/liferay-portal-impl.jar
labs/jbosslabs/trunk/portal-extensions/jbosswiki/lib/liferay-portal-kernel.jar
labs/jbosslabs/trunk/portal-extensions/jbosswiki/lib/liferay-portal-service.jar
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/AdminSimpleCredentials.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/Credentials.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/JBossPortalCredentials.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/JBossPortalCredentials24.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/LiferayCredentials.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/SimpleCredentials.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/management/EmailNotifierImpl.java
Removed:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/AdminSimpleCredentials.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/Credentials.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/JBossPortalCredentials.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/JBossPortalCredentials24.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/SimpleCredentials.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/management/WikiServiceLocal.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/management/WikiServiceManagement.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/management/WikiServiceMenagement.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/management/WikiServiceRemote.java
Modified:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/common.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/project.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/AttributesExtractor.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/PortletAttributesExctractor.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/ServletAttributesExtractor.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/helper/WikiHelper.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletOld.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiDiff.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiPrefs.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/project.properties
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/project.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/JBossWiki.properties
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/org/jboss/wiki/wikiPlugins.properties
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/EditSessionWatcher.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileAttachmentDataSource.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDSCommons.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDirWikiPageDictionary.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileWikiPageDictionary.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/InsidePluginExcecutor.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/RenamePageWatcher.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuAttachmentDataSource.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuMediaDataSource.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuWikiPageDictionary.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiContext.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiEngine.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPage.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPlugin.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiType.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiTypeLoader.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/configuration/ConfigurationParser.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminConsolePlugin.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminRenamingPlugin.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AttachementInfoPlugin.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/LinkPagePlugin.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/OtherLangsPlugin.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RefsManipulatingInsidePlugin.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/WatchListPlugin.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-test/.classpath
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-test/src/java/org/jboss/wiki/test/TestCredentials.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-test/src/java/org/jboss/wiki/test/WikiTest.java
Log:
code cleanup and liferay support
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/common.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/common.xml 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/common.xml 2007-10-05 15:49:27 UTC (rev 15603)
@@ -4,6 +4,15 @@
<dependencies>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.9</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
<id>portlet-api</id>
<version>1.0</version>
</dependency>
@@ -59,6 +68,9 @@
<groupId>guice</groupId>
<artifactId>guice</artifactId>
<version>1.0</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
</dependency>
</dependencies>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/project.xml 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/project.xml 2007-10-05 15:49:27 UTC (rev 15603)
@@ -63,6 +63,9 @@
<artifactId>wiki-common</artifactId>
<version>1.0</version>
<jar>wiki-common.jar</jar>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
</dependency>
<dependency>
@@ -88,6 +91,60 @@
<war.bundle>true</war.bundle>
</properties>
</dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.8</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.3</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
<dependency>
<groupId>dom4j</groupId>
@@ -224,5 +281,6 @@
<war.bundle>true</war.bundle>
</properties>
</dependency>
+
</dependencies>
</project>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/AttributesExtractor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/AttributesExtractor.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/AttributesExtractor.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -22,8 +22,8 @@
package org.jboss.wiki.attributesextractor;
-import org.jboss.wiki.Credentials;
import org.jboss.wiki.WikiSession;
+import org.jboss.wiki.credentials.Credentials;
import org.jboss.wiki.exception.WikiUserPreferenceException;
/**
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/PortletAttributesExctractor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/PortletAttributesExctractor.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/PortletAttributesExctractor.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -31,17 +31,16 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
+import org.apache.log4j.Logger;
import org.apache.myfaces.portlet.MyFacesGenericPortlet;
-import org.jboss.logging.Logger;
-import org.jboss.wiki.Credentials;
import org.jboss.wiki.WikiEngine;
import org.jboss.wiki.WikiSession;
import org.jboss.wiki.attributesextractor.AttributesExtractor;
import org.jboss.wiki.configuration.ConfigurationParser;
+import org.jboss.wiki.credentials.Credentials;
import org.jboss.wiki.exception.WikiUserPreferenceException;
import org.jboss.wiki.portlet.PortletWikiSession;
-import com.google.inject.Inject;
/**
* PortletAttributesExctractor.java
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/ServletAttributesExtractor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/ServletAttributesExtractor.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/ServletAttributesExtractor.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -2,13 +2,13 @@
import javax.servlet.http.HttpServletRequest;
-import org.jboss.logging.Logger;
-import org.jboss.wiki.Credentials;
+import org.apache.log4j.Logger;
import org.jboss.wiki.ServletWikiSession;
-import org.jboss.wiki.SimpleCredentials;
import org.jboss.wiki.WikiSession;
import org.jboss.wiki.attributesextractor.AttributesExtractor;
import org.jboss.wiki.configuration.ConfigurationParser;
+import org.jboss.wiki.credentials.Credentials;
+import org.jboss.wiki.credentials.SimpleCredentials;
import org.jboss.wiki.exception.WikiUserPreferenceException;
public class ServletAttributesExtractor implements AttributesExtractor {
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -43,10 +43,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.jboss.logging.Logger;
+import org.apache.log4j.Logger;
import org.jboss.wiki.FileMediaDataSource;
import org.jboss.wiki.ServletWikiSession;
-import org.jboss.wiki.SimpleCredentials;
import org.jboss.wiki.WikiAttachment;
import org.jboss.wiki.WikiCommon;
import org.jboss.wiki.WikiContext;
@@ -54,12 +53,9 @@
import org.jboss.wiki.WikiPage;
import org.jboss.wiki.WikiPlugin;
import org.jboss.wiki.WikiSession;
-import org.jboss.wiki.attributesextractor.AttributesExtractor;
import org.jboss.wiki.configuration.ConfigurationParser;
-import org.jboss.wiki.exceptions.WikiManagementNotFoundException;
-import org.jboss.wiki.management.WikiServiceManagement;
+import org.jboss.wiki.credentials.SimpleCredentials;
-import com.google.inject.Inject;
import com.google.inject.Injector;
/**
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/helper/WikiHelper.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/helper/WikiHelper.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/helper/WikiHelper.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -38,7 +38,7 @@
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
-import org.jboss.logging.Logger;
+import org.apache.log4j.Logger;
import org.jboss.wiki.WikiCommon;
import org.jboss.wiki.WikiEngine;
import org.jboss.wiki.WikiPage;
@@ -48,7 +48,6 @@
import org.jboss.wiki.attributesextractor.impl.ServletAttributesExtractor;
import org.jboss.wiki.configuration.ConfigurationParser;
import org.jboss.wiki.exceptions.WikiManagementNotFoundException;
-import org.jboss.wiki.management.WikiServiceManagement;
import org.jboss.wiki.ui.WikiCommonSession;
import com.google.inject.Inject;
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -24,8 +24,6 @@
import java.io.File;
import java.io.IOException;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Proxy;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -38,19 +36,16 @@
import javax.portlet.PortletException;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
-import javax.portlet.UnavailableException;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.portlet.PortletFileUpload;
+import org.apache.log4j.Logger;
import org.apache.myfaces.portlet.MyFacesGenericPortlet;
-import org.jboss.logging.Logger;
import org.jboss.wiki.attributesextractor.AttributesExtractor;
-import org.jboss.wiki.guice.WikiModule;
import org.jboss.wiki.helper.WikiHelper;
-import com.google.inject.Guice;
import com.google.inject.Injector;
/**
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletOld.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletOld.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletOld.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -33,7 +33,6 @@
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
import javax.portlet.GenericPortlet;
-import javax.portlet.PortletConfig;
import javax.portlet.PortletException;
import javax.portlet.PortletSession;
import javax.portlet.RenderRequest;
@@ -43,19 +42,17 @@
import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.portlet.PortletFileUpload;
-import org.jboss.logging.Logger;
-import org.jboss.wiki.Credentials;
+import org.apache.log4j.Logger;
import org.jboss.wiki.WikiCommon;
import org.jboss.wiki.WikiContext;
import org.jboss.wiki.WikiEngine;
import org.jboss.wiki.WikiPage;
import org.jboss.wiki.WikiSession;
import org.jboss.wiki.configuration.ConfigurationParser;
+import org.jboss.wiki.credentials.Credentials;
import org.jboss.wiki.exceptions.EditSessionExpired;
import org.jboss.wiki.exceptions.EditingNotAllowedException;
-import org.jboss.wiki.exceptions.WikiManagementNotFoundException;
import org.jboss.wiki.exceptions.WikiSaveException;
-import org.jboss.wiki.management.WikiServiceManagement;
import com.google.inject.Inject;
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -23,13 +23,10 @@
package org.jboss.wiki.ui;
import java.util.Map;
-import java.util.Set;
-import org.jboss.logging.Logger;
-import org.jboss.wiki.WikiEngine;
+import org.apache.log4j.Logger;
import org.jboss.wiki.attributesextractor.AttributesExtractor;
import org.jboss.wiki.configuration.ConfigurationParser;
-import org.jboss.wiki.helper.WikiHelper;
import com.google.inject.Inject;
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiDiff.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiDiff.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiDiff.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -24,7 +24,7 @@
import javax.faces.component.UIData;
-import org.jboss.logging.Logger;
+import org.apache.log4j.Logger;
import org.jboss.wiki.WikiContext;
import org.jboss.wiki.WikiEngine;
import org.jboss.wiki.WikiPage;
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -33,7 +33,7 @@
import javax.faces.model.SelectItem;
-import org.jboss.logging.Logger;
+import org.apache.log4j.Logger;
import org.jboss.wiki.WikiContext;
import org.jboss.wiki.WikiEngine;
import org.jboss.wiki.WikiPage;
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiPrefs.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiPrefs.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiPrefs.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -31,7 +31,7 @@
import javax.faces.event.ValueChangeEvent;
import javax.faces.model.SelectItem;
-import org.jboss.logging.Logger;
+import org.apache.log4j.Logger;
import org.jboss.wiki.WikiEngine;
import org.jboss.wiki.attributesextractor.AttributesExtractor;
import org.jboss.wiki.exception.WikiUserPreferenceException;
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -22,15 +22,14 @@
package org.jboss.wiki.ui;
-import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Vector;
import javax.faces.context.FacesContext;
-import org.apache.myfaces.config.impl.digester.elements.FacesConfig;
-import org.jboss.logging.Logger;
+import org.apache.log4j.Logger;
+
import org.jboss.wiki.WikiCommon;
import org.jboss.wiki.WikiContext;
import org.jboss.wiki.WikiEngine;
@@ -69,7 +68,7 @@
@Inject
public void setWikiEngine(WikiEngine wikiEngine) {
this.wikiEngine = wikiEngine;
-
+
if (attrExtractor != null && currentPage == null) {
getCurrentPage();
}
@@ -78,16 +77,16 @@
@Inject
public void setAttrExtractor(AttributesExtractor attrExtractor) {
this.attrExtractor = attrExtractor;
-
+
WikiHelper.getWikiCommonSession().update(attrExtractor);
-
+
if (wikiEngine != null && currentPage == null) {
getCurrentPage();
}
}
-
+
public WikiView() {
-
+
}
public String getWikiImagesURL() {
@@ -163,14 +162,13 @@
.getCredentials(), wikiType, attrExtractor.getWikiSession());
if (attrExtractor.getPageVersion() != null) {
- currentPage = wikiEngine.getByName(
- WikiHelper.getWikiCommonSession().getPageName(),
- wikiContext, attrExtractor.getPageVersion(),
- WikiHelper.getWikiCommonSession().getLangCode());
+ currentPage = wikiEngine.getByName(WikiHelper
+ .getWikiCommonSession().getPageName(), wikiContext,
+ attrExtractor.getPageVersion(), WikiHelper
+ .getWikiCommonSession().getLangCode());
} else {
- currentPage = wikiEngine.getByName(
- WikiHelper.getWikiCommonSession().getPageName(),
- wikiContext,
+ currentPage = wikiEngine.getByName(WikiHelper
+ .getWikiCommonSession().getPageName(), wikiContext,
WikiHelper.getWikiCommonSession().getLangCode());
}
}
@@ -204,8 +202,8 @@
WikiPage currentPage = getCurrentPage();
for (int i = currentPage.getLastVersion(); i > 0; i--) {
- WikiPage histPage = wikiEngine.getPageAtVersion(currentPage, true,
- i, currentPage.getLangCode());
+ WikiPage histPage = wikiEngine.getPageAtVersion(currentPage,
+ true, i, currentPage.getLangCode());
hisList.add(new HistoryElement(i, histPage.getEditDate(),
histPage.getLastAuthor().getName(), histPage
@@ -239,8 +237,8 @@
public String search() {
- Map<String, Integer> pages = wikiEngine.findPages(
- searchQuery, WikiHelper.getWikiCommonSession().getLangCode());
+ Map<String, Integer> pages = wikiEngine.findPages(searchQuery,
+ WikiHelper.getWikiCommonSession().getLangCode());
WikiHelper.getWikiCommonSession().setSearchResults(pages);
Deleted: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties 2007-10-05 15:49:27 UTC (rev 15603)
@@ -1,60 +0,0 @@
-edit_instruction=Here's a short reminder on what elements you have at your disposal\:\n\n\n---- Horizontal ruler\n\\\\ Forced line break\n\\\\\\\\ Page break (printing)\n[link] Create hyperlink to "link", where "link" can be either an internal \n WikiName or an external link (http\://)\n[text|link] Create a hyperlink where the link text is different from the actual \n hyperlink link.\n[text|wiki\:link] Create a hyperlink where the link text is different from the \n actual hyperlink link, and the hyperlink points to a named Wiki. \n This supports interWiki linking.\n\n* Make a bulleted list (must be in first column). Use more (**) \n for deeper indentations.\n\# Make a numbered list (must be in first column). Use more (\#\#, \#\#\#) \n for deeper indentations.\n\n\!, \!\!, \!\!\! Start a line !
with an exclamation mark (\!) to make a heading. \n More exclamation marks mean bigger headings.\n\n__text__ Makes text bold.\n''text'' Makes text in italics (notice that these are single quotes ('))\n{{text}} Makes text in monospaced font.\n;term\:def Defines 'term' with 'def'. Use this with empty 'term' to make short comments.\n\n|text|more text| Makes a table. Double bars for a table heading.\n\nDon't try to use HTML, since it just won't work.\n\nTo embed images just put them available on the web using one of the approved formats, and they will get inlined automatically.\nTo make a code block, use triple {'s to open, and triple }'s to close.
-edit_cancel=Cancel
-edit_save=Save
-edit_spellcheck=Check Spelling
-permaLinkButton=permaLinkButton.png
-
-editButton=editButton.png
-recentButton=recentChanges.gif
-historyButton=historyButton.png
-attachButton=attachButton.png
-
-rssButton=RSSButton.gif
-rdfButton=RDFButton.gif
-atomButton=ATOMButton.gif
-
-pageLastChanged=The page last changed on
-by=by
-
-historytitle=History of page \:
-version=Version
-date=Date
-author=Author
-size=Size
-changesFromPrev=Changes from previous
-goback=Go back
-thisIsVer=This is version
-ofPage=of page
-toRollback=For rolling back this page just press EDIT.
-changesBetween=Changes between versions
-andChng=and
-
-addFile=Add file
-upload_error=File couldn't have been uploaded
-search=Search
-
-new_att=/Add new attachment/
-selectAtt=Select attachment
-selectFile=Select a file to attach:
-attachFile=Attach a file
-close=Close
-
-print=Print
-
-save=Save
-prefsSaved=Preferences saved
-
-page_edited_by=I'm sorry, but this page is currently edited by\:
-lock_started=Lock started\:
-edit_session_invalidated=It will be invalidated on\:
-stop_you_edit=I won't stop you from editing this page but consider that your changes might be lost
-
-wikiHome=Wiki Home
-permalink=Permalink
-recentChanges=Recent Changes
-attach=Attach
-edit=Edit
-history=History
-rss=RSS Feed
-rdf=RDF Feed
-atom=Atom Feed
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties 2007-10-05 15:49:27 UTC (rev 15603)
@@ -0,0 +1,60 @@
+edit_instruction=Here's a short reminder on what elements you have at your disposal\:\n\n\n---- Horizontal ruler\n\\\\ Forced line break\n\\\\\\\\ Page break (printing)\n[link] Create hyperlink to "link", where "link" can be either an internal \n WikiName or an external link (http\://)\n[text|link] Create a hyperlink where the link text is different from the actual \n hyperlink link.\n[text|wiki\:link] Create a hyperlink where the link text is different from the \n actual hyperlink link, and the hyperlink points to a named Wiki. \n This supports interWiki linking.\n\n* Make a bulleted list (must be in first column). Use more (**) \n for deeper indentations.\n\# Make a numbered list (must be in first column). Use more (\#\#, \#\#\#) \n for deeper indentations.\n\n\!, \!\!, \!\!\! Start a line !
with an exclamation mark (\!) to make a heading. \n More exclamation marks mean bigger headings.\n\n__text__ Makes text bold.\n''text'' Makes text in italics (notice that these are single quotes ('))\n{{text}} Makes text in monospaced font.\n;term\:def Defines 'term' with 'def'. Use this with empty 'term' to make short comments.\n\n|text|more text| Makes a table. Double bars for a table heading.\n\nDon't try to use HTML, since it just won't work.\n\nTo embed images just put them available on the web using one of the approved formats, and they will get inlined automatically.\nTo make a code block, use triple {'s to open, and triple }'s to close.
+edit_cancel=Cancel
+edit_save=Save
+edit_spellcheck=Check Spelling
+permaLinkButton=permaLinkButton.png
+
+editButton=editButton.png
+recentButton=recentChanges.gif
+historyButton=historyButton.png
+attachButton=attachButton.png
+
+rssButton=RSSButton.gif
+rdfButton=RDFButton.gif
+atomButton=ATOMButton.gif
+
+pageLastChanged=The page last changed on
+by=by
+
+historytitle=History of page \:
+version=Version
+date=Date
+author=Author
+size=Size
+changesFromPrev=Changes from previous
+goback=Go back
+thisIsVer=This is version
+ofPage=of page
+toRollback=For rolling back this page just press EDIT.
+changesBetween=Changes between versions
+andChng=and
+
+addFile=Add file
+upload_error=File couldn't have been uploaded
+search=Search
+
+new_att=/Add new attachment/
+selectAtt=Select attachment
+selectFile=Select a file to attach:
+attachFile=Attach a file
+close=Close
+
+print=Print
+
+save=Save
+prefsSaved=Preferences saved
+
+page_edited_by=I'm sorry, but this page is currently edited by\:
+lock_started=Lock started\:
+edit_session_invalidated=It will be invalidated on\:
+stop_you_edit=I won't stop you from editing this page but consider that your changes might be lost
+
+wikiHome=Wiki Home
+permalink=Permalink
+recentChanges=Recent Changes
+attach=Attach
+edit=Edit
+history=History
+rss=RSS Feed
+rdf=RDF Feed
+atom=Atom Feed
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/Messages.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/Messages.properties (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/Messages.properties 2007-10-05 15:49:27 UTC (rev 15603)
@@ -0,0 +1,60 @@
+edit_instruction=Here's a short reminder on what elements you have at your disposal\:\n\n\n---- Horizontal ruler\n\\\\ Forced line break\n\\\\\\\\ Page break (printing)\n[link] Create hyperlink to "link", where "link" can be either an internal \n WikiName or an external link (http\://)\n[text|link] Create a hyperlink where the link text is different from the actual \n hyperlink link.\n[text|wiki\:link] Create a hyperlink where the link text is different from the \n actual hyperlink link, and the hyperlink points to a named Wiki. \n This supports interWiki linking.\n\n* Make a bulleted list (must be in first column). Use more (**) \n for deeper indentations.\n\# Make a numbered list (must be in first column). Use more (\#\#, \#\#\#) \n for deeper indentations.\n\n\!, \!\!, \!\!\! Start a line !
with an exclamation mark (\!) to make a heading. \n More exclamation marks mean bigger headings.\n\n__text__ Makes text bold.\n''text'' Makes text in italics (notice that these are single quotes ('))\n{{text}} Makes text in monospaced font.\n;term\:def Defines 'term' with 'def'. Use this with empty 'term' to make short comments.\n\n|text|more text| Makes a table. Double bars for a table heading.\n\nDon't try to use HTML, since it just won't work.\n\nTo embed images just put them available on the web using one of the approved formats, and they will get inlined automatically.\nTo make a code block, use triple {'s to open, and triple }'s to close.
+edit_cancel=Cancel
+edit_save=Save
+edit_spellcheck=Check Spelling
+permaLinkButton=permaLinkButton.png
+
+editButton=editButton.png
+recentButton=recentChanges.gif
+historyButton=historyButton.png
+attachButton=attachButton.png
+
+rssButton=RSSButton.gif
+rdfButton=RDFButton.gif
+atomButton=ATOMButton.gif
+
+pageLastChanged=The page last changed on
+by=by
+
+historytitle=History of page \:
+version=Version
+date=Date
+author=Author
+size=Size
+changesFromPrev=Changes from previous
+goback=Go back
+thisIsVer=This is version
+ofPage=of page
+toRollback=For rolling back this page just press EDIT.
+changesBetween=Changes between versions
+andChng=and
+
+addFile=Add file
+upload_error=File couldn't have been uploaded
+search=Search
+
+new_att=/Add new attachment/
+selectAtt=Select attachment
+selectFile=Select a file to attach:
+attachFile=Attach a file
+close=Close
+
+print=Print
+
+save=Save
+prefsSaved=Preferences saved
+
+page_edited_by=I'm sorry, but this page is currently edited by\:
+lock_started=Lock started\:
+edit_session_invalidated=It will be invalidated on\:
+stop_you_edit=I won't stop you from editing this page but consider that your changes might be lost
+
+wikiHome=Wiki Home
+permalink=Permalink
+recentChanges=Recent Changes
+attach=Attach
+edit=Edit
+history=History
+rss=RSS Feed
+rdf=RDF Feed
+atom=Atom Feed
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/Messages_en.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/Messages_en.properties (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/Messages_en.properties 2007-10-05 15:49:27 UTC (rev 15603)
@@ -0,0 +1,60 @@
+edit_instruction=Here's a short reminder on what elements you have at your disposal\:\n\n\n---- Horizontal ruler\n\\\\ Forced line break\n\\\\\\\\ Page break (printing)\n[link] Create hyperlink to "link", where "link" can be either an internal \n WikiName or an external link (http\://)\n[text|link] Create a hyperlink where the link text is different from the actual \n hyperlink link.\n[text|wiki\:link] Create a hyperlink where the link text is different from the \n actual hyperlink link, and the hyperlink points to a named Wiki. \n This supports interWiki linking.\n\n* Make a bulleted list (must be in first column). Use more (**) \n for deeper indentations.\n\# Make a numbered list (must be in first column). Use more (\#\#, \#\#\#) \n for deeper indentations.\n\n\!, \!\!, \!\!\! Start a line !
with an exclamation mark (\!) to make a heading. \n More exclamation marks mean bigger headings.\n\n__text__ Makes text bold.\n''text'' Makes text in italics (notice that these are single quotes ('))\n{{text}} Makes text in monospaced font.\n;term\:def Defines 'term' with 'def'. Use this with empty 'term' to make short comments.\n\n|text|more text| Makes a table. Double bars for a table heading.\n\nDon't try to use HTML, since it just won't work.\n\nTo embed images just put them available on the web using one of the approved formats, and they will get inlined automatically.\nTo make a code block, use triple {'s to open, and triple }'s to close.
+edit_cancel=Cancel
+edit_save=Save
+edit_spellcheck=Check Spelling
+permaLinkButton=permaLinkButton.png
+
+editButton=editButton.png
+recentButton=recentChanges.gif
+historyButton=historyButton.png
+attachButton=attachButton.png
+
+rssButton=RSSButton.gif
+rdfButton=RDFButton.gif
+atomButton=ATOMButton.gif
+
+pageLastChanged=The page last changed on
+by=by
+
+historytitle=History of page \:
+version=Version
+date=Date
+author=Author
+size=Size
+changesFromPrev=Changes from previous
+goback=Go back
+thisIsVer=This is version
+ofPage=of page
+toRollback=For rolling back this page just press EDIT.
+changesBetween=Changes between versions
+andChng=and
+
+addFile=Add file
+upload_error=File couldn't have been uploaded
+search=Search
+
+new_att=/Add new attachment/
+selectAtt=Select attachment
+selectFile=Select a file to attach:
+attachFile=Attach a file
+close=Close
+
+print=Print
+
+save=Save
+prefsSaved=Preferences saved
+
+page_edited_by=I'm sorry, but this page is currently edited by\:
+lock_started=Lock started\:
+edit_session_invalidated=It will be invalidated on\:
+stop_you_edit=I won't stop you from editing this page but consider that your changes might be lost
+
+wikiHome=Wiki Home
+permalink=Permalink
+recentChanges=Recent Changes
+attach=Attach
+edit=Edit
+history=History
+rss=RSS Feed
+rdf=RDF Feed
+atom=Atom Feed
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/log4j.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/log4j.properties (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/log4j.properties 2007-10-05 15:49:27 UTC (rev 15603)
@@ -0,0 +1,9 @@
+# Set root logger level to DEBUG and its only appender to A1.
+log4j.rootLogger=INFO, A1
+
+# A1 is set to be a ConsoleAppender.
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+
+# A1 uses PatternLayout.
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/liferay-display.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/liferay-display.xml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/liferay-display.xml 2007-10-05 15:49:27 UTC (rev 15603)
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE display PUBLIC "-//Liferay//DTD Display 4.0.0//EN" "http://www.liferay.com/dtd/liferay-display_4_0_0.dtd">
+
+<display>
+ <category name="category.wiki">
+ <portlet id="WikiPortlet" />
+ </category>
+</display>
\ No newline at end of file
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/liferay-portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/liferay-portlet.xml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/liferay-portlet.xml 2007-10-05 15:49:27 UTC (rev 15603)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.1.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_1_0.dtd">
+
+<liferay-portlet-app>
+ <portlet>
+ <portlet-name>WikiPortlet</portlet-name>
+ <instanceable>true</instanceable>
+ </portlet>
+ <role-mapper>
+ <role-name>administrator</role-name>
+ <role-link>Administrator</role-link>
+ </role-mapper>
+</liferay-portlet-app>
\ No newline at end of file
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/lib/liferay-portal-client.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/jbosswiki/lib/liferay-portal-client.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/lib/liferay-portal-impl.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/jbosswiki/lib/liferay-portal-impl.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/lib/liferay-portal-kernel.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/jbosswiki/lib/liferay-portal-kernel.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/lib/liferay-portal-service.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/jbosswiki/lib/liferay-portal-service.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/project.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/project.properties 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/project.properties 2007-10-05 15:49:27 UTC (rev 15603)
@@ -6,3 +6,6 @@
maven.jar.shotoku-base=${ext.root.dir}/shotoku/shotoku-base/target/shotoku-base.jar
maven.jar.shotoku-aop=${ext.root.dir}/shotoku/shotoku-aop/target/shotoku-aop.jar
+maven.jar.liferay=${ext.root.dir}/jbosswiki/lib/liferay-portal-impl.jar
+maven.jar.liferay-service=${ext.root.dir}/jbosswiki/lib/liferay-portal-service.jar
+maven.jar.liferay-kernel=${ext.root.dir}/jbosswiki/lib/liferay-portal-kernel.jar
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/project.xml 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/project.xml 2007-10-05 15:49:27 UTC (rev 15603)
@@ -1,189 +1,206 @@
<?xml version='1.0' encoding='ISO-8859-1'?>
<!--
- JBoss, the OpenSource J2EE webOS
- Distributable under LGPL license.
- See terms of license at gnu.org.
- -->
+ JBoss, the OpenSource J2EE webOS
+ Distributable under LGPL license.
+ See terms of license at gnu.org.
+-->
<project>
- <pomVersion>3</pomVersion>
- <extend>../common.xml</extend>
- <id>wiki-common</id>
- <name>Wiki common</name>
+ <pomVersion>3</pomVersion>
+ <extend>../common.xml</extend>
+ <id>wiki-common</id>
+ <name>Wiki common</name>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>1.0</currentVersion>
<build>
- <!-- <unitTestSourceDirectory>./src/test/java</unitTestSourceDirectory>
- <unitTest>
- <includes>
- <include>**/*Test.java</include>
- <include>**/Test*.java</include>
- </includes>
- </unitTest>-->
- <sourceDirectory>src/java</sourceDirectory>
- <resources>
- <resource>
- <directory>src/etc/</directory>
- <include>**/*.properties</include>
- </resource>
- <resource>
- <directory>src/etc/</directory>
- <include>**/*.xml</include>
- </resource>
- <resource>
- <directory>src/etc/</directory>
- <include>**/*.types</include>
- </resource>
- </resources>
- </build>
- <organization>
- <name>Tomasz Szymanski</name>
- <url>http://mamut.net.pl</url>
- </organization>
+ <!-- <unitTestSourceDirectory>./src/test/java</unitTestSourceDirectory>
+ <unitTest>
+ <includes>
+ <include>**/*Test.java</include>
+ <include>**/Test*.java</include>
+ </includes>
+ </unitTest>-->
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/etc/</directory>
+ <include>**/*.properties</include>
+ </resource>
+ <resource>
+ <directory>src/etc/</directory>
+ <include>**/*.xml</include>
+ </resource>
+ <resource>
+ <directory>src/etc/</directory>
+ <include>**/*.types</include>
+ </resource>
+ </resources>
+ </build>
+ <organization>
+ <name>Tomasz Szymanski</name>
+ <url>http://mamut.net.pl</url>
+ </organization>
<dependencies>
-
+
<dependency>
- <groupId>jboss</groupId>
- <artifactId>javax.servlet</artifactId>
- <version>1.0</version>
- <jar>javax.servlet.jar</jar>
- </dependency>
-
+ <groupId>jboss</groupId>
+ <artifactId>javax.servlet</artifactId>
+ <version>1.0</version>
+ <jar>javax.servlet.jar</jar>
+ </dependency>
+
<dependency>
- <groupId>jboss</groupId>
- <artifactId>javax.servlet.jsp</artifactId>
- <version>1.0</version>
- <jar>javax.servlet.jsp.jar</jar>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
-
+ <groupId>jboss</groupId>
+ <artifactId>javax.servlet.jsp</artifactId>
+ <version>1.0</version>
+ <jar>javax.servlet.jsp.jar</jar>
+ </dependency>
+
<dependency>
- <groupId>jboss</groupId>
- <artifactId>activation</artifactId>
- <version>1.0</version>
- <jar>activation.jar</jar>
- </dependency>
-
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload.jar</artifactId>
- <version>1.0</version>
- <jar>commons-fileupload-1.0.jar</jar>
- </dependency>
-
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.6</version>
- </dependency>
-
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-ejb3x</artifactId>
- <version>1.0</version>
- <jar>jboss-ejb3x.jar</jar>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-ejb3</artifactId>
- <version>1.0</version>
- <jar>jboss-ejb3.jar</jar>
- </dependency>
-
- <dependency>
- <id>portlet-api</id>
- <version>1.0</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
</dependency>
-
+
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-jmx</artifactId>
- <version>1.0</version>
- <jar>jboss-jmx.jar</jar>
- </dependency>
-
+ <groupId>jboss</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.0</version>
+ <jar>activation.jar</jar>
+ </dependency>
+
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common</artifactId>
- <version>1.0</version>
- <jar>jboss-common.jar</jar>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload.jar</artifactId>
+ <version>1.0</version>
+ <jar>commons-fileupload-1.0.jar</jar>
</dependency>
-
+
<dependency>
- <groupId>jboss</groupId>
- <artifactId>portal-common-lib</artifactId>
- <version>1.0</version>
- <jar>portal-common-lib.jar</jar>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6</version>
</dependency>
-
+
<dependency>
- <groupId>jboss</groupId>
- <artifactId>portal-core-lib</artifactId>
- <version>1.0</version>
- <jar>portal-core-lib.jar</jar>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.0</version>
</dependency>
-
+
<dependency>
- <groupId>jboss</groupId>
- <artifactId>portal-portlet-lib</artifactId>
- <version>1.0</version>
- <jar>portal-portlet-lib.jar</jar>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-ejb3x</artifactId>
+ <version>1.0</version>
+ <jar>jboss-ejb3x.jar</jar>
</dependency>
-
+
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-portlet-api-lib</artifactId>
- <version>1.0</version>
- <jar>jboss-portlet-api-lib.jar</jar>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-ejb3</artifactId>
+ <version>1.0</version>
+ <jar>jboss-ejb3.jar</jar>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>portal-identity-lib</artifactId>
- <version>1.0</version>
- <jar>portal-identity-lib.jar</jar>
- </dependency>
+ <id>portlet-api</id>
+ <version>1.0</version>
+ </dependency>
-
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jbossall-client</artifactId>
- <version>3.2.3</version>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-jmx</artifactId>
+ <version>1.0</version>
+ <jar>jboss-jmx.jar</jar>
</dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common</artifactId>
+ <version>1.0</version>
+ <jar>jboss-common.jar</jar>
+ </dependency>
-
- <dependency>
- <groupId>shotoku-cache</groupId>
- <artifactId>shotoku-cache</artifactId>
- <jar>shotoku-cache.jar</jar>
- </dependency>
-
- <dependency>
- <groupId>jboss-cache</groupId>
- <artifactId>jboss-cache</artifactId>
- <jar>jboss-cache.jar</jar>
- </dependency>
-
- <dependency>
- <groupId>jgroups</groupId>
- <artifactId>jgroups</artifactId>
- <jar>jgroups.jar</jar>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>portal-common-lib</artifactId>
+ <version>1.0</version>
+ <jar>portal-common-lib.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>portal-core-lib</artifactId>
+ <version>1.0</version>
+ <jar>portal-core-lib.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>portal-portlet-lib</artifactId>
+ <version>1.0</version>
+ <jar>portal-portlet-lib.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-portlet-api-lib</artifactId>
+ <version>1.0</version>
+ <jar>jboss-portlet-api-lib.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>portal-identity-lib</artifactId>
+ <version>1.0</version>
+ <jar>portal-identity-lib.jar</jar>
+ </dependency>
+
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jbossall-client</artifactId>
+ <version>3.2.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>shotoku-cache</groupId>
+ <artifactId>shotoku-cache</artifactId>
+ <jar>shotoku-cache.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss-cache</groupId>
+ <artifactId>jboss-cache</artifactId>
+ <jar>jboss-cache.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <jar>jgroups.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>liferay</groupId>
+ <artifactId>liferay</artifactId>
+ <jar>liferay-portal-impl.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>liferay-service</groupId>
+ <artifactId>liferay-service</artifactId>
+ <jar>liferay-portal-service.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>liferay-kernel</groupId>
+ <artifactId>liferay-kernel</artifactId>
+ <jar>liferay-portal-kernel.jar</jar>
+ </dependency>
+
+ </dependencies>
</project>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/JBossWiki.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/JBossWiki.properties 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/JBossWiki.properties 2007-10-05 15:49:27 UTC (rev 15603)
@@ -9,7 +9,8 @@
defaultPage=Main
#credentialsClass - class to use for portlet credentials
-credentialsClass=org.jboss.wiki.JBossPortalCredentials
+credentialsClass=org.jboss.wiki.credentials.JBossPortalCredentials
+#credentialsClass=org.jboss.wiki.credentials.LiferayCredentials
#mediaDataSourceClass class to use for mediaDataSource
mediaDataSourceClass=org.jboss.wiki.FileMediaDataSource
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/org/jboss/wiki/wikiPlugins.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/org/jboss/wiki/wikiPlugins.properties 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/org/jboss/wiki/wikiPlugins.properties 2007-10-05 15:49:27 UTC (rev 15603)
@@ -8,6 +8,7 @@
#wikiHome = /portal/index.html?ctrl:cmd=action&ctrl:window=default.wiki.WikiPortletWindow
#wikiHome = /portal/portal/default/wiki/WikiPortletWindow?action=1
wikiHome = /portal/default/wiki/WikiPortletWindow?action=1&org.apache.myfaces.portlet.MyFacesGenericPortlet.VIEW_ID=%2Fviews%2Fwiki_view.xhtml
+#wikiHome = /web/guest/171?p_p_id=WikiPortlet_WAR_wiki_INSTANCE_cs2L&p_p_action=1&p_p_state=normal&p_p_mode=view&p_p_col_id=column-1&p_p_col_count=1&&org.apache.myfaces.portlet.MyFacesGenericPortlet.VIEW_ID=%2Fviews%2Fwiki_view.xhtml
#number of days that should be included in recent changes plugin
recentDays = 30
notification.fromEmail = do-not-reply at jboss.org
Deleted: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/AdminSimpleCredentials.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/AdminSimpleCredentials.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/AdminSimpleCredentials.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -1,71 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wiki;
-
-import java.util.Set;
-import java.util.TreeSet;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.RenderRequest;
-
-/**Super user Credentials to be used in plugins for accesing ALL pages etc.
- * @author tomek
- *
- */
-public class AdminSimpleCredentials extends Credentials {
-
- @Override
- public String getName() {
- return "admin";
- }
-
- @Override
- public boolean isLoggedIn() {
- return true;
- }
-
- @Override
- public boolean isAdmin() {
- return true;
- }
-
- @Override
- public void setParam(Object param) {
-
- }
-
- @Override
- public boolean isUserInRole(String role) {
- return true;
- }
-
- @Override
- public Set<String> getAllRoles() {
- return new TreeSet<String>();
- }
-
- @Override
- public String getEmail() {
- return null;
- }
-
-}
Deleted: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/Credentials.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/Credentials.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/Credentials.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -1,97 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wiki;
-
-import java.util.Set;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.RenderRequest;
-
-/**
- * @author <a href="mailto:tomasz.szymanski at jboss.com">Tomasz Szymanski</a><br />
- * <p>
- * </p>
- *
- */
-public abstract class Credentials {
-
- /**
- * Gets userName
- *
- * @return userName of current user.
- */
- public abstract String getName();
-
- /**
- * Checks if any user is logged in.
- *
- * @return true if anyone is logged in, false othwerwise.
- */
- public abstract boolean isLoggedIn();
-
- /**
- * Checks if logged in user is Admin.
- *
- * @return true if user is admin, false othwerwise.
- */
- public abstract boolean isAdmin();
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return getName();
- }
-
- /**
- * Sets ActionRequest for current credentials.
- *
- * @param rReq
- * ActionRequest to set.
- */
- public abstract void setParam(Object param);
-
- /**
- * Checks if user is in given role.
- *
- * @param role
- * to check
- * @return True if is in role, false otherwise.
- */
- public abstract boolean isUserInRole(String role);
-
- /**
- * Get Set of ALL role names.
- *
- * @return Set of role names or empty Set if there are no roles
- */
- public abstract Set<String> getAllRoles();
-
- /**
- * Get email address of this user
- *
- * @return Email or null if email is not available
- */
- public abstract String getEmail();
-}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/EditSessionWatcher.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/EditSessionWatcher.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/EditSessionWatcher.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -24,7 +24,7 @@
import java.util.Calendar;
import java.util.Date;
-import org.jboss.logging.Logger;
+import org.apache.log4j.Logger;
import org.jboss.wiki.exceptions.PageNotEditedException;
public class EditSessionWatcher extends Thread {
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileAttachmentDataSource.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileAttachmentDataSource.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileAttachmentDataSource.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -32,7 +32,7 @@
import java.util.Properties;
import java.util.Set;
-import org.jboss.logging.Logger;
+import org.apache.log4j.Logger;
import org.jboss.wiki.configuration.ConfigurationParser;
public class FileAttachmentDataSource implements AttachmentDataSource{
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDSCommons.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDSCommons.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDSCommons.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -25,8 +25,9 @@
import java.net.URLDecoder;
import java.net.URLEncoder;
-import org.jboss.logging.Logger;
+import org.apache.log4j.Logger;
+
public class FileDSCommons {
private static final String SLASH = "/";
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDirWikiPageDictionary.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDirWikiPageDictionary.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDirWikiPageDictionary.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -36,9 +36,7 @@
import java.util.Queue;
import java.util.TreeMap;
-import javax.crypto.NoSuchPaddingException;
-
-import org.jboss.logging.Logger;
+import org.apache.log4j.Logger;
import org.jboss.wiki.exceptions.PageRenamingException;
/**
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -37,8 +37,10 @@
import java.util.TreeMap;
import java.util.TreeSet;
-import org.jboss.logging.Logger;
+import org.apache.log4j.Logger;
import org.jboss.wiki.configuration.ConfigurationParser;
+import org.jboss.wiki.credentials.Credentials;
+import org.jboss.wiki.credentials.SimpleCredentials;
import org.jboss.wiki.exceptions.DataSourceException;
import org.jboss.wiki.exceptions.WikiSaveException;
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileWikiPageDictionary.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileWikiPageDictionary.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileWikiPageDictionary.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -31,7 +31,7 @@
import java.util.Properties;
import java.util.Set;
-import org.jboss.logging.Logger;
+import org.apache.log4j.Logger;
import org.jboss.wiki.configuration.ConfigurationParser;
import org.jboss.wiki.exceptions.PageRenamingException;
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/InsidePluginExcecutor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/InsidePluginExcecutor.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/InsidePluginExcecutor.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -8,7 +8,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.jboss.logging.Logger;
+import org.apache.log4j.Logger;
import org.jboss.wiki.plugins.HTMLTranslatorParts;
public class InsidePluginExcecutor {
Deleted: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/JBossPortalCredentials.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/JBossPortalCredentials.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/JBossPortalCredentials.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -1,167 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.wiki;
-
-import java.util.Set;
-import java.util.TreeSet;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.jboss.logging.Logger;
-import org.jboss.portal.identity.IdentityException;
-import org.jboss.portal.identity.MembershipModule;
-import org.jboss.portal.identity.Role;
-import org.jboss.portal.identity.RoleModule;
-import org.jboss.portal.identity.User;
-import org.jboss.portal.identity.UserModule;
-import org.jboss.portal.identity.UserProfileModule;
-import org.jboss.portlet.JBossActionRequest;
-import org.jboss.portlet.JBossRenderRequest;
-import org.jboss.wiki.portlet.MultipartRequestWrapper;
-
-/**
- * JBossPortalCredentials.java
- *
- * @author <a href="mailto:tomasz.szymanski at jboss.com">Tomasz Szymanski</a>
- */
-
-public class JBossPortalCredentials extends Credentials {
-
- private UserModule userModule;
- private RoleModule roleModule;
- private MembershipModule membershipModule;
- private UserProfileModule userProfileModule;
- private User user;
-
- private final static Logger log = Logger.getLogger(JBossPortalCredentials.class);
-
- private static final String ADMIN_ROLE_NAME = "Admin";
-
- public JBossPortalCredentials () throws NamingException {
- userModule = (UserModule)new InitialContext().lookup("java:portal/UserModule");
- roleModule = (RoleModule)new InitialContext().lookup("java:portal/RoleModule");
- membershipModule = (MembershipModule)new InitialContext().lookup("java:portal/MembershipModule");
- userProfileModule = (UserProfileModule)new InitialContext().lookup("java:portal/UserProfileModule");
- }
-
- @Override
- public Set<String> getAllRoles() {
- Set<String> roles = new TreeSet<String>();
-
- try {
- for (Object role : roleModule.findRoles()) {
- roles.add(((Role)role).getName());
- }
- } catch (IdentityException e) {
- log.error(e);
- return null;
- }
-
- return roles;
- }
-
- @Override
- public String getEmail() {
- if (user == null) {
- return null;
- }
-
- try {
- return userProfileModule.getProperty(user, User.INFO_USER_EMAIL_REAL).toString();
- } catch (IdentityException e) {
- log.error(e);
- return null;
- }
- }
-
- @Override
- public String getName() {
- if (user == null) {
- return null;
- }
-
- return user.getUserName();
- }
-
- @Override
- public boolean isAdmin() {
- if (user == null) {
- return false;
- }
-
- try {
- return membershipModule.getUsers(roleModule.findRoleByName(ADMIN_ROLE_NAME)).contains(user);
- } catch (IdentityException e) {
- log.error(e);
- return false;
- }
- }
-
- @Override
- public boolean isLoggedIn() {
- return (user != null);
- }
-
- @Override
- public boolean isUserInRole(String role) {
- if (user == null) {
- return false;
- }
-
- try {
- return membershipModule.findRoleMembers(role, 0, 1, user.getUserName()).size() == 1;
- } catch (IdentityException e) {
- log.error(e);
- return false;
- }
- }
-
- @Override
- public void setParam(Object param) {
-
- if (param instanceof MultipartRequestWrapper) {
- param = ((MultipartRequestWrapper)param).getRequest();
- }
-
- if (param instanceof JBossActionRequest) {
- JBossActionRequest jrReq = (JBossActionRequest) param;
-
- if (jrReq.getUser() != null) {
- user = jrReq.getUser();
- }
-
- } else if (param instanceof JBossRenderRequest) {
- JBossRenderRequest jrReq = (JBossRenderRequest) param;
-
- if (jrReq.getUser() != null) {
- user = jrReq.getUser();
- }
-
- } else {
- log.error("You are not running JBoss Portal");
- }
-
- }
-
-}
Deleted: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/JBossPortalCredentials24.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/JBossPortalCredentials24.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/JBossPortalCredentials24.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -1,222 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wiki;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.portlet.ActionRequest;
-import javax.portlet.RenderRequest;
-import javax.transaction.TransactionManager;
-
-import org.jboss.logging.Logger;
-import org.jboss.portal.common.transaction.TransactionException;
-import org.jboss.portal.common.transaction.TransactionManagerProvider;
-import org.jboss.portal.common.transaction.Transactions;
-import org.jboss.portal.core.modules.ModuleException;
-import org.jboss.portal.identity.IdentityContext;
-import org.jboss.portal.identity.IdentityException;
-import org.jboss.portal.identity.IdentityServiceController;
-import org.jboss.portal.identity.MembershipModule;
-import org.jboss.portal.identity.Role;
-import org.jboss.portal.identity.RoleModule;
-import org.jboss.portal.identity.User;
-import org.jboss.portal.identity.UserProfileModule;
-import org.jboss.portlet.JBossActionRequest;
-import org.jboss.portlet.JBossRenderRequest;
-
-public class JBossPortalCredentials24 extends Credentials {
-
- private final String adminRoleName = "Admin";
-
- private String name = null;
-
- private boolean logedIn = false;
-
- private boolean isAdmin = false;
-
- private Set<String> roles;
-
- private Set<Role> allRoles;
-
- private TransactionManager tm;
-
- private String email;
-
- private static final String roleModulesCtx = "java:portal/RoleModule";
-
- private Logger log = Logger.getLogger(this.getClass());
-
- private static IdentityServiceController isc;
-
- public JBossPortalCredentials24() throws NamingException {
- InitialContext initialContext = new InitialContext();
- isc = (IdentityServiceController) initialContext
- .lookup("service=Module,type=IdentityServiceController");
- }
-
- private Set<String> getRoleNames(User user) {
- Set<String> ret = new TreeSet<String>();
- try {
- for (Object roleObj : getMembershipModule().getRoles(user)) {
- ret.add(((Role) roleObj).getName());
- }
- } catch (IdentityException e) {
- return ret;
- }
-
- return ret;
- }
-
- private MembershipModule getMembershipModule() {
- try {
- return (MembershipModule) isc.getIdentityContext().getObject(
- IdentityContext.TYPE_MEMBERSHIP_MODULE);
- } catch (IdentityException e) {
- log.error(e);
- return null;
- }
- }
-
- private UserProfileModule getUserProfileModule() {
- try {
- return (UserProfileModule) isc.getIdentityContext().getObject(
- IdentityContext.TYPE_USER_PROFILE_MODULE);
- } catch (IdentityException e) {
- log.error(e);
- return null;
- }
- }
-
-
- public void setParam(Object param) {
-
- InitialContext initialContext;
- RoleModule roleModule = null;
-
- try {
- initialContext = new InitialContext();
- roleModule = (RoleModule) initialContext
- .lookup(roleModulesCtx);
-
- } catch (NamingException e) {
- log.error(e);
-
- // should throw an exception here
- return;
- }
-
-
- if (param instanceof JBossActionRequest) {
- JBossActionRequest jrReq = (JBossActionRequest) param;
-
- if (jrReq.getUser() != null) {
- name = jrReq.getUser().getUserName();
- logedIn = true;
- isAdmin = getRoleNames(jrReq.getUser())
- .contains(adminRoleName);
- roles = getRoleNames(jrReq.getUser());
- try {
- email = getUserProfileModule().getProperty(jrReq.getUser(), User.INFO_USER_EMAIL_REAL).toString();
- } catch (IllegalArgumentException e) {
- log.error(e);
- } catch (IdentityException e) {
- log.error(e);
- }
-
- }
-
- } else if (param instanceof JBossRenderRequest) {
- JBossRenderRequest jrReq = (JBossRenderRequest) param;
-
- if (jrReq.getUser() != null) {
- name = jrReq.getUser().getUserName();
- logedIn = true;
- isAdmin = getRoleNames(jrReq.getUser())
- .contains(adminRoleName);
- roles = getRoleNames(jrReq.getUser());
- try {
- email = getUserProfileModule().getProperty(jrReq.getUser(), User.INFO_USER_EMAIL_REAL).toString();
- } catch (IllegalArgumentException e) {
- log.error(e);
- } catch (IdentityException e) {
- log.error(e);
- }
- } else {
- name = "Unknown";
- }
-
- } else {
- log.error("You are not running JBoss Portal");
- }
-
- try {
- allRoles = roleModule.findRoles();
- } catch (IdentityException e) {
- log.error("Couldn't get roles from portal", e);
- }
- }
-
- public String getName() {
- return name;
- }
-
- public boolean isAdmin() {
- return isAdmin;
- }
- private static final String userModuleCtx = "java:portal/UserModule";
-
-
- public boolean isLoggedIn() {
- return logedIn;
- }
-
- @Override
- public boolean isUserInRole(String role) {
- if (roles != null)
- return roles.contains(role);
- else
- return false;
- }
-
- @Override
- public Set<String> getAllRoles() {
- Set<String> roleNames = new TreeSet<String>();
-
- for (Role role : allRoles) {
- roleNames.add(role.getName());
- }
-
- return roleNames;
- }
-
- @Override
- public String getEmail() {
- return email;
- }
-
-}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/RenamePageWatcher.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/RenamePageWatcher.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/RenamePageWatcher.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -26,7 +26,7 @@
import java.util.Set;
import java.util.Vector;
-import org.jboss.logging.Logger;
+import org.apache.log4j.Logger;
import org.jboss.wiki.exceptions.PageRenamingException;
public class RenamePageWatcher extends Thread {
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuAttachmentDataSource.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuAttachmentDataSource.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuAttachmentDataSource.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -30,7 +30,7 @@
import java.util.Set;
import java.util.TreeSet;
-import org.jboss.logging.Logger;
+import org.apache.log4j.Logger;
import org.jboss.shotoku.ContentManager;
import org.jboss.shotoku.Node;
import org.jboss.shotoku.Resource;
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuMediaDataSource.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuMediaDataSource.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuMediaDataSource.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -32,7 +32,7 @@
import java.util.TreeMap;
import java.util.TreeSet;
-import org.jboss.logging.Logger;
+import org.apache.log4j.Logger;
import org.jboss.shotoku.ContentManager;
import org.jboss.shotoku.Directory;
import org.jboss.shotoku.Node;
@@ -49,6 +49,7 @@
import org.jboss.shotoku.exceptions.ResourceDoesNotExist;
import org.jboss.shotoku.exceptions.SaveException;
import org.jboss.wiki.configuration.ConfigurationParser;
+import org.jboss.wiki.credentials.SimpleCredentials;
import org.jboss.wiki.exceptions.DataSourceException;
import org.jboss.wiki.exceptions.WikiSaveException;
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuWikiPageDictionary.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuWikiPageDictionary.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuWikiPageDictionary.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -27,10 +27,9 @@
import java.util.Map;
import java.util.Properties;
-import org.jboss.logging.Logger;
+import org.apache.log4j.Logger;
import org.jboss.shotoku.ContentManager;
import org.jboss.shotoku.Directory;
-import org.jboss.shotoku.cache.ShotokuResourceWatcher;
import org.jboss.shotoku.exceptions.NameFormatException;
import org.jboss.shotoku.exceptions.ResourceAlreadyExists;
import org.jboss.shotoku.exceptions.ResourceDoesNotExist;
Deleted: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/SimpleCredentials.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/SimpleCredentials.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/SimpleCredentials.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -1,77 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wiki;
-
-import java.util.Set;
-import java.util.TreeSet;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.RenderRequest;
-
-import org.jboss.wiki.Credentials;
-
-public class SimpleCredentials extends Credentials {
-
- private String name;
-
- public SimpleCredentials(String name) {
- this.name = name;
- }
-
- public SimpleCredentials() {
- this("default_user");
- }
-
- public String getName() {
- return name;
- }
-
- public boolean isLoggedIn() {
- return false;
- }
-
- public boolean isAdmin() {
- return false;
- }
-
- @Override
- public void setParam(Object param) {
- // Do nothing
- }
-
- @Override
- public boolean isUserInRole(String role) {
- return false;
- }
-
- @Override
- public Set<String> getAllRoles() {
- return new TreeSet<String>();
- }
-
- @Override
- public String getEmail() {
- return null;
- }
-
-
-}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -25,21 +25,13 @@
import java.util.Set;
import java.util.TreeSet;
-import javax.jms.JMSException;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSession;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.jboss.logging.Logger;
-import org.jboss.mx.util.MBeanProxyExt;
-import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.wiki.exceptions.WikiManagementNotFoundException;
+import org.apache.log4j.Logger;
import org.jboss.wiki.management.EMailNotifier;
+import org.jboss.wiki.management.EmailNotifierImpl;
import org.jboss.wiki.management.NotificationMsg;
-import org.jboss.wiki.management.WikiServiceManagement;
import org.jboss.wiki.plugins.DifferenceEngine;
import org.jboss.wiki.plugins.WatchListPlugin;
@@ -59,22 +51,6 @@
private static Logger log = Logger.getLogger(WikiCommon.class);
- private static WikiServiceManagement wikiServiceMenagement;
-
- /*public static WikiServiceManagement getWikiManagement()
- throws WikiManagementNotFoundException {
- try {
- if (wikiServiceMenagement == null)
- wikiServiceMenagement = (WikiServiceManagement) MBeanProxyExt
- .create(WikiServiceManagement.class, WIKI_SERVICE_NAME,
- MBeanServerLocator.locate());
-
- return wikiServiceMenagement;
- } catch (Exception e) {
- throw new WikiManagementNotFoundException(e);
- }
- }*/
-
public static void sendNotificationMail(WikiPage page,
WikiSession wikiSession, WikiEngine engine, String fromEmail) {
try {
@@ -82,7 +58,7 @@
// QueueSession sess = null;
// Queue queue = null;
- EMailNotifier notifer = null;
+ EMailNotifier notifer = new EmailNotifierImpl();
//String emailLookupString = EMailNotifier.class.getName();
String emailLookupString = "wiki/EMailNotifierSLSB/local";
@@ -95,7 +71,7 @@
* QueueSession.AUTO_ACKNOWLEDGE);
*/
- notifer = (EMailNotifier) context.lookup(emailLookupString);
+ //notifer = (EMailNotifier) context.lookup(emailLookupString);
// if (sess != null) {
if (notifer != null) {
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiContext.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiContext.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiContext.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -21,6 +21,10 @@
*/
package org.jboss.wiki;
+import org.jboss.wiki.credentials.Credentials;
+
+
+
/**
*
* @author <a href="mailto:dsicore at jboss.org">Damon Sicore</a>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiEngine.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiEngine.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiEngine.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -39,14 +39,16 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+import org.apache.log4j.Logger;
import org.jboss.wiki.configuration.ConfigurationParser;
+import org.jboss.wiki.credentials.Credentials;
+import org.jboss.wiki.credentials.SimpleCredentials;
import org.jboss.wiki.exceptions.DataSourceException;
import org.jboss.wiki.exceptions.EditingNotAllowedException;
import org.jboss.wiki.exceptions.PageNotEditedException;
import org.jboss.wiki.exceptions.PageRenamingException;
import org.jboss.wiki.exceptions.WikiSaveException;
-import org.jboss.logging.Logger;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPage.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPage.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPage.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -30,9 +30,9 @@
import java.util.Set;
import java.util.TreeSet;
-import org.jboss.logging.Logger;
-
+import org.apache.log4j.Logger;
import org.jboss.wiki.configuration.ConfigurationParser;
+import org.jboss.wiki.credentials.Credentials;
import org.jboss.wiki.exceptions.DataSourceException;
import org.jboss.wiki.exceptions.EditSessionExpired;
import org.jboss.wiki.exceptions.EditingNotAllowedException;
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPlugin.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPlugin.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -24,8 +24,9 @@
import java.io.InputStream;
import java.util.Properties;
-import org.jboss.logging.Logger;
+import org.apache.log4j.Logger;
+
/**
*
* @author <a href="mailto:dsicore at jboss.org">Damon Sicore</a><br />
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiType.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiType.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiType.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -23,10 +23,8 @@
import java.util.Vector;
-import org.jboss.logging.Logger;
+import org.apache.log4j.Logger;
-import com.google.inject.Inject;
-
/**
* <p>
* </p>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiTypeLoader.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiTypeLoader.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiTypeLoader.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -7,8 +7,7 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import org.jboss.logging.Logger;
-import org.jboss.wiki.exceptions.WikiException;
+import org.apache.log4j.Logger;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/configuration/ConfigurationParser.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/configuration/ConfigurationParser.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/configuration/ConfigurationParser.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -25,9 +25,9 @@
import java.io.IOException;
import java.util.Properties;
-import org.jboss.logging.Logger;
-import org.jboss.wiki.SimpleCredentials;
+import org.apache.log4j.Logger;
import org.jboss.wiki.WikiEngine;
+import org.jboss.wiki.credentials.SimpleCredentials;
/**
* ConfigurationParser.java
Copied: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/AdminSimpleCredentials.java (from rev 15537, labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/AdminSimpleCredentials.java)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/AdminSimpleCredentials.java (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/AdminSimpleCredentials.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wiki.credentials;
+
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.RenderRequest;
+
+
+
+
+
+/**Super user Credentials to be used in plugins for accesing ALL pages etc.
+ * @author tomek
+ *
+ */
+public class AdminSimpleCredentials extends Credentials {
+
+ @Override
+ public String getName() {
+ return "admin";
+ }
+
+ @Override
+ public boolean isLoggedIn() {
+ return true;
+ }
+
+ @Override
+ public boolean isAdmin() {
+ return true;
+ }
+
+ @Override
+ public void setParam(Object param) {
+
+ }
+
+ @Override
+ public boolean isUserInRole(String role) {
+ return true;
+ }
+
+ @Override
+ public Set<String> getAllRoles() {
+ return new TreeSet<String>();
+ }
+
+ @Override
+ public String getEmail() {
+ return null;
+ }
+
+}
Copied: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/Credentials.java (from rev 15537, labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/Credentials.java)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/Credentials.java (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/Credentials.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -0,0 +1,97 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wiki.credentials;
+
+import java.util.Set;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.RenderRequest;
+
+/**
+ * @author <a href="mailto:tomasz.szymanski at jboss.com">Tomasz Szymanski</a><br />
+ * <p>
+ * </p>
+ *
+ */
+public abstract class Credentials {
+
+ /**
+ * Gets userName
+ *
+ * @return userName of current user.
+ */
+ public abstract String getName();
+
+ /**
+ * Checks if any user is logged in.
+ *
+ * @return true if anyone is logged in, false othwerwise.
+ */
+ public abstract boolean isLoggedIn();
+
+ /**
+ * Checks if logged in user is Admin.
+ *
+ * @return true if user is admin, false othwerwise.
+ */
+ public abstract boolean isAdmin();
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#toString()
+ */
+ public String toString() {
+ return getName();
+ }
+
+ /**
+ * Sets ActionRequest for current credentials.
+ *
+ * @param rReq
+ * ActionRequest to set.
+ */
+ public abstract void setParam(Object param);
+
+ /**
+ * Checks if user is in given role.
+ *
+ * @param role
+ * to check
+ * @return True if is in role, false otherwise.
+ */
+ public abstract boolean isUserInRole(String role);
+
+ /**
+ * Get Set of ALL role names.
+ *
+ * @return Set of role names or empty Set if there are no roles
+ */
+ public abstract Set<String> getAllRoles();
+
+ /**
+ * Get email address of this user
+ *
+ * @return Email or null if email is not available
+ */
+ public abstract String getEmail();
+}
Copied: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/JBossPortalCredentials.java (from rev 15537, labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/JBossPortalCredentials.java)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/JBossPortalCredentials.java (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/JBossPortalCredentials.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -0,0 +1,167 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.wiki.credentials;
+
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.apache.log4j.Logger;
+import org.jboss.portal.identity.IdentityException;
+import org.jboss.portal.identity.MembershipModule;
+import org.jboss.portal.identity.Role;
+import org.jboss.portal.identity.RoleModule;
+import org.jboss.portal.identity.User;
+import org.jboss.portal.identity.UserModule;
+import org.jboss.portal.identity.UserProfileModule;
+import org.jboss.portlet.JBossActionRequest;
+import org.jboss.portlet.JBossRenderRequest;
+import org.jboss.wiki.portlet.MultipartRequestWrapper;
+
+/**
+ * JBossPortalCredentials.java
+ *
+ * @author <a href="mailto:tomasz.szymanski at jboss.com">Tomasz Szymanski</a>
+ */
+
+public class JBossPortalCredentials extends Credentials {
+
+ private UserModule userModule;
+ private RoleModule roleModule;
+ private MembershipModule membershipModule;
+ private UserProfileModule userProfileModule;
+ private User user;
+
+ private final static Logger log = Logger.getLogger(JBossPortalCredentials.class);
+
+ private static final String ADMIN_ROLE_NAME = "Admin";
+
+ public JBossPortalCredentials () throws NamingException {
+ userModule = (UserModule)new InitialContext().lookup("java:portal/UserModule");
+ roleModule = (RoleModule)new InitialContext().lookup("java:portal/RoleModule");
+ membershipModule = (MembershipModule)new InitialContext().lookup("java:portal/MembershipModule");
+ userProfileModule = (UserProfileModule)new InitialContext().lookup("java:portal/UserProfileModule");
+ }
+
+ @Override
+ public Set<String> getAllRoles() {
+ Set<String> roles = new TreeSet<String>();
+
+ try {
+ for (Object role : roleModule.findRoles()) {
+ roles.add(((Role)role).getName());
+ }
+ } catch (IdentityException e) {
+ log.error(e);
+ return null;
+ }
+
+ return roles;
+ }
+
+ @Override
+ public String getEmail() {
+ if (user == null) {
+ return null;
+ }
+
+ try {
+ return userProfileModule.getProperty(user, User.INFO_USER_EMAIL_REAL).toString();
+ } catch (IdentityException e) {
+ log.error(e);
+ return null;
+ }
+ }
+
+ @Override
+ public String getName() {
+ if (user == null) {
+ return null;
+ }
+
+ return user.getUserName();
+ }
+
+ @Override
+ public boolean isAdmin() {
+ if (user == null) {
+ return false;
+ }
+
+ try {
+ return membershipModule.getUsers(roleModule.findRoleByName(ADMIN_ROLE_NAME)).contains(user);
+ } catch (IdentityException e) {
+ log.error(e);
+ return false;
+ }
+ }
+
+ @Override
+ public boolean isLoggedIn() {
+ return (user != null);
+ }
+
+ @Override
+ public boolean isUserInRole(String role) {
+ if (user == null) {
+ return false;
+ }
+
+ try {
+ return membershipModule.findRoleMembers(role, 0, 1, user.getUserName()).size() == 1;
+ } catch (IdentityException e) {
+ log.error(e);
+ return false;
+ }
+ }
+
+ @Override
+ public void setParam(Object param) {
+
+ if (param instanceof MultipartRequestWrapper) {
+ param = ((MultipartRequestWrapper)param).getRequest();
+ }
+
+ if (param instanceof JBossActionRequest) {
+ JBossActionRequest jrReq = (JBossActionRequest) param;
+
+ if (jrReq.getUser() != null) {
+ user = jrReq.getUser();
+ }
+
+ } else if (param instanceof JBossRenderRequest) {
+ JBossRenderRequest jrReq = (JBossRenderRequest) param;
+
+ if (jrReq.getUser() != null) {
+ user = jrReq.getUser();
+ }
+
+ } else {
+ log.error("You are not running JBoss Portal");
+ }
+
+ }
+
+}
Copied: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/JBossPortalCredentials24.java (from rev 15537, labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/JBossPortalCredentials24.java)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/JBossPortalCredentials24.java (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/JBossPortalCredentials24.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -0,0 +1,222 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wiki.credentials;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.portlet.ActionRequest;
+import javax.portlet.RenderRequest;
+import javax.transaction.TransactionManager;
+
+import org.apache.log4j.Logger;
+import org.jboss.portal.common.transaction.TransactionException;
+import org.jboss.portal.common.transaction.TransactionManagerProvider;
+import org.jboss.portal.common.transaction.Transactions;
+import org.jboss.portal.core.modules.ModuleException;
+import org.jboss.portal.identity.IdentityContext;
+import org.jboss.portal.identity.IdentityException;
+import org.jboss.portal.identity.IdentityServiceController;
+import org.jboss.portal.identity.MembershipModule;
+import org.jboss.portal.identity.Role;
+import org.jboss.portal.identity.RoleModule;
+import org.jboss.portal.identity.User;
+import org.jboss.portal.identity.UserProfileModule;
+import org.jboss.portlet.JBossActionRequest;
+import org.jboss.portlet.JBossRenderRequest;
+
+public class JBossPortalCredentials24 extends Credentials {
+
+ private final String adminRoleName = "Admin";
+
+ private String name = null;
+
+ private boolean logedIn = false;
+
+ private boolean isAdmin = false;
+
+ private Set<String> roles;
+
+ private Set<Role> allRoles;
+
+ private TransactionManager tm;
+
+ private String email;
+
+ private static final String roleModulesCtx = "java:portal/RoleModule";
+
+ private Logger log = Logger.getLogger(this.getClass());
+
+ private static IdentityServiceController isc;
+
+ public JBossPortalCredentials24() throws NamingException {
+ InitialContext initialContext = new InitialContext();
+ isc = (IdentityServiceController) initialContext
+ .lookup("service=Module,type=IdentityServiceController");
+ }
+
+ private Set<String> getRoleNames(User user) {
+ Set<String> ret = new TreeSet<String>();
+ try {
+ for (Object roleObj : getMembershipModule().getRoles(user)) {
+ ret.add(((Role) roleObj).getName());
+ }
+ } catch (IdentityException e) {
+ return ret;
+ }
+
+ return ret;
+ }
+
+ private MembershipModule getMembershipModule() {
+ try {
+ return (MembershipModule) isc.getIdentityContext().getObject(
+ IdentityContext.TYPE_MEMBERSHIP_MODULE);
+ } catch (IdentityException e) {
+ log.error(e);
+ return null;
+ }
+ }
+
+ private UserProfileModule getUserProfileModule() {
+ try {
+ return (UserProfileModule) isc.getIdentityContext().getObject(
+ IdentityContext.TYPE_USER_PROFILE_MODULE);
+ } catch (IdentityException e) {
+ log.error(e);
+ return null;
+ }
+ }
+
+
+ public void setParam(Object param) {
+
+ InitialContext initialContext;
+ RoleModule roleModule = null;
+
+ try {
+ initialContext = new InitialContext();
+ roleModule = (RoleModule) initialContext
+ .lookup(roleModulesCtx);
+
+ } catch (NamingException e) {
+ log.error(e);
+
+ // should throw an exception here
+ return;
+ }
+
+
+ if (param instanceof JBossActionRequest) {
+ JBossActionRequest jrReq = (JBossActionRequest) param;
+
+ if (jrReq.getUser() != null) {
+ name = jrReq.getUser().getUserName();
+ logedIn = true;
+ isAdmin = getRoleNames(jrReq.getUser())
+ .contains(adminRoleName);
+ roles = getRoleNames(jrReq.getUser());
+ try {
+ email = getUserProfileModule().getProperty(jrReq.getUser(), User.INFO_USER_EMAIL_REAL).toString();
+ } catch (IllegalArgumentException e) {
+ log.error(e);
+ } catch (IdentityException e) {
+ log.error(e);
+ }
+
+ }
+
+ } else if (param instanceof JBossRenderRequest) {
+ JBossRenderRequest jrReq = (JBossRenderRequest) param;
+
+ if (jrReq.getUser() != null) {
+ name = jrReq.getUser().getUserName();
+ logedIn = true;
+ isAdmin = getRoleNames(jrReq.getUser())
+ .contains(adminRoleName);
+ roles = getRoleNames(jrReq.getUser());
+ try {
+ email = getUserProfileModule().getProperty(jrReq.getUser(), User.INFO_USER_EMAIL_REAL).toString();
+ } catch (IllegalArgumentException e) {
+ log.error(e);
+ } catch (IdentityException e) {
+ log.error(e);
+ }
+ } else {
+ name = "Unknown";
+ }
+
+ } else {
+ log.error("You are not running JBoss Portal");
+ }
+
+ try {
+ allRoles = roleModule.findRoles();
+ } catch (IdentityException e) {
+ log.error("Couldn't get roles from portal", e);
+ }
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public boolean isAdmin() {
+ return isAdmin;
+ }
+ private static final String userModuleCtx = "java:portal/UserModule";
+
+
+ public boolean isLoggedIn() {
+ return logedIn;
+ }
+
+ @Override
+ public boolean isUserInRole(String role) {
+ if (roles != null)
+ return roles.contains(role);
+ else
+ return false;
+ }
+
+ @Override
+ public Set<String> getAllRoles() {
+ Set<String> roleNames = new TreeSet<String>();
+
+ for (Role role : allRoles) {
+ roleNames.add(role.getName());
+ }
+
+ return roleNames;
+ }
+
+ @Override
+ public String getEmail() {
+ return email;
+ }
+
+}
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/LiferayCredentials.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/LiferayCredentials.java (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/LiferayCredentials.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -0,0 +1,128 @@
+package org.jboss.wiki.credentials;
+
+import java.rmi.RemoteException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.portlet.RenderRequest;
+
+import org.apache.log4j.Logger;
+
+import com.liferay.portal.PortalException;
+import com.liferay.portal.SystemException;
+import com.liferay.portal.model.EmailAddress;
+import com.liferay.portal.model.Role;
+import com.liferay.portal.service.EmailAddressServiceUtil;
+import com.liferay.portal.service.RoleLocalServiceUtil;
+
+public class LiferayCredentials extends Credentials {
+
+ private boolean isLogged = false;
+
+ private boolean isAdmin = false;
+
+ private String name = null;
+
+ private String email = null;
+
+ private RenderRequest rreq = null;
+
+ private final static Logger log = Logger
+ .getLogger(LiferayCredentials.class);
+
+ private static final String LIFERAY_ADMIN = "Administrator";
+
+ private static final String LIFERAY_EMAIL = "emailAddressId";
+
+ @Override
+ public Set<String> getAllRoles() {
+ // List results = RoleLocalServiceUtil
+ // .search(0, null, null, null, null, 0);
+ //
+ // Set<String> allRoles = new TreeSet<String>();
+ //
+ // for (Object o : results) {
+ // allRoles.add(((Role) o).getName());
+ // }
+ // return allRoles;
+ return Collections.singleton(LIFERAY_ADMIN);
+ }
+
+ @Override
+ public String getEmail() {
+ return email;
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public boolean isAdmin() {
+ return isAdmin;
+ }
+
+ @Override
+ public boolean isLoggedIn() {
+ return isLogged;
+ }
+
+ @Override
+ public boolean isUserInRole(String role) {
+ if (rreq != null) {
+ return rreq.isUserInRole(role);
+ } else {
+ return false;
+ }
+ }
+
+ @Override
+ public void setParam(Object param) {
+ if (param instanceof RenderRequest) {
+ RenderRequest req = (RenderRequest) param;
+
+ if (req.getUserPrincipal() != null) {
+ isLogged = true;
+ name = req.getUserPrincipal().getName();
+ rreq = req;
+ email = getEmailLiferay(req);
+ isAdmin = req.isUserInRole(LIFERAY_ADMIN);
+ }
+ }
+ }
+
+ private String getEmailLiferay(RenderRequest req) {
+
+ if (req.getParameter(LIFERAY_EMAIL) != null) {
+ Long emailAddressId = Long.parseLong(req
+ .getParameter(LIFERAY_EMAIL));
+
+ EmailAddress emailAddress = null;
+
+ if (emailAddressId > 0) {
+ try {
+
+ emailAddress = EmailAddressServiceUtil
+ .getEmailAddress(emailAddressId);
+ } catch (PortalException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (SystemException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (RemoteException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ return emailAddress.getAddress();
+ }
+
+ return null;
+ }
+
+}
Copied: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/SimpleCredentials.java (from rev 15537, labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/SimpleCredentials.java)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/SimpleCredentials.java (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/SimpleCredentials.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -0,0 +1,79 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wiki.credentials;
+
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.RenderRequest;
+
+
+
+
+
+public class SimpleCredentials extends Credentials {
+
+ private String name;
+
+ public SimpleCredentials(String name) {
+ this.name = name;
+ }
+
+ public SimpleCredentials() {
+ this("default_user");
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public boolean isLoggedIn() {
+ return false;
+ }
+
+ public boolean isAdmin() {
+ return false;
+ }
+
+ @Override
+ public void setParam(Object param) {
+ // Do nothing
+ }
+
+ @Override
+ public boolean isUserInRole(String role) {
+ return false;
+ }
+
+ @Override
+ public Set<String> getAllRoles() {
+ return new TreeSet<String>();
+ }
+
+ @Override
+ public String getEmail() {
+ return null;
+ }
+
+
+}
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/management/EmailNotifierImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/management/EmailNotifierImpl.java (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/management/EmailNotifierImpl.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -0,0 +1,58 @@
+package org.jboss.wiki.management;
+
+public class EmailNotifierImpl implements EMailNotifier {
+
+ public synchronized void sendNotification(NotificationMsg notifications) {
+
+// try {
+// Session session = (Session) PortableRemoteObject.narrow(
+// new InitialContext().lookup("java:Mail"), Session.class);
+//
+// log.debug("Got email notification msg");
+//
+// for (String email : notifications.getEmails()) {
+// log.debug("MDB for: " + email);
+//
+// StringBuffer buffer = null;
+// Address[] to = null;
+// MimeMessage m = new MimeMessage(session);
+//
+// if (email != null) {
+// m
+// .setFrom(new InternetAddress(notifications
+// .getFromEmail()));
+// to = new InternetAddress[] { new InternetAddress(email) };
+// m.setRecipients(RecipientType.TO, to);
+// m.setSubject("[JBossWiki] Page change notification: "
+// + notifications.getPageName());
+//
+// m.setSentDate(new Date());
+// buffer = new StringBuffer();
+//
+// buffer
+// .append(
+// "This message is generated automatically. Please do not reply. To remove yourself from the watch list please go to ")
+// .append(notifications.getPageLink()).append(
+// "<br />\n");
+// buffer.append(notifications.getPageContent());
+//
+// m.setContent(buffer.toString(),
+// "text/html; charset=\"UTF-8\"");
+// Transport.send(m);
+// log.debug("Notification send to: "+email);
+// }
+// }
+// } catch (ClassCastException e) {
+// log.error(e);
+// } catch (NamingException e) {
+// log.error(e);
+// } catch (AddressException e) {
+// log.error(e);
+// } catch (MessagingException e) {
+// log.error(e);
+// }
+
+ }
+
+
+}
Deleted: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/management/WikiServiceLocal.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/management/WikiServiceLocal.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/management/WikiServiceLocal.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -1,27 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wiki.management;
-
-
-public interface WikiServiceLocal {
-
-}
Deleted: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/management/WikiServiceManagement.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/management/WikiServiceManagement.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/management/WikiServiceManagement.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wiki.management;
-
-import org.jboss.wiki.WikiEngine;
-
-public interface WikiServiceManagement {
-
- public WikiEngine getWikiEngine();
-
- void create() throws Exception;
-
- void start() throws Exception;
-
- void stop();
-
- void destroy();
-
-}
Deleted: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/management/WikiServiceMenagement.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/management/WikiServiceMenagement.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/management/WikiServiceMenagement.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wiki.management;
-
-import org.jboss.wiki.WikiEngine;
-
-public interface WikiServiceMenagement {
-
- public WikiEngine getWikiEngine();
-
- void create() throws Exception;
-
- void start() throws Exception;
-
- void stop();
-
- void destroy();
-
-}
Deleted: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/management/WikiServiceRemote.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/management/WikiServiceRemote.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/management/WikiServiceRemote.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wiki.management;
-
-public interface WikiServiceRemote {
-
-}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminConsolePlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminConsolePlugin.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminConsolePlugin.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -23,12 +23,12 @@
import java.util.Set;
-import org.jboss.wiki.Credentials;
import org.jboss.wiki.WikiEngine;
import org.jboss.wiki.WikiPage;
import org.jboss.wiki.WikiPlugin;
import org.jboss.wiki.WikiSession;
import org.jboss.wiki.configuration.ConfigurationParser;
+import org.jboss.wiki.credentials.Credentials;
public class AdminConsolePlugin extends WikiPlugin {
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminRenamingPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminRenamingPlugin.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminRenamingPlugin.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -26,11 +26,11 @@
import java.util.Map;
import java.util.Set;
-import org.jboss.wiki.Credentials;
import org.jboss.wiki.WikiPage;
import org.jboss.wiki.WikiPlugin;
import org.jboss.wiki.WikiSession;
import org.jboss.wiki.configuration.ConfigurationParser;
+import org.jboss.wiki.credentials.Credentials;
import org.jboss.wiki.exceptions.WikiException;
public class AdminRenamingPlugin extends WikiPlugin {
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AttachementInfoPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AttachementInfoPlugin.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AttachementInfoPlugin.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -21,11 +21,11 @@
*/
package org.jboss.wiki.plugins;
-import org.jboss.wiki.Credentials;
import org.jboss.wiki.WikiAttachment;
import org.jboss.wiki.WikiPage;
import org.jboss.wiki.WikiPlugin;
import org.jboss.wiki.WikiSession;
+import org.jboss.wiki.credentials.Credentials;
public class AttachementInfoPlugin extends WikiPlugin {
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -59,7 +59,7 @@
import java.util.Collection;
import java.util.StringTokenizer;
-import org.jboss.logging.Logger;
+import org.apache.log4j.Logger;
import org.jboss.wiki.WikiCommon;
import org.jboss.wiki.WikiPage;
import org.jboss.wiki.WikiPlugin;
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/LinkPagePlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/LinkPagePlugin.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/LinkPagePlugin.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -24,10 +24,10 @@
import java.util.Map;
import java.util.Set;
-import org.jboss.wiki.Credentials;
import org.jboss.wiki.WikiPage;
import org.jboss.wiki.WikiPlugin;
import org.jboss.wiki.WikiSession;
+import org.jboss.wiki.credentials.Credentials;
public class LinkPagePlugin extends WikiPlugin {
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/OtherLangsPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/OtherLangsPlugin.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/OtherLangsPlugin.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -21,10 +21,10 @@
*/
package org.jboss.wiki.plugins;
-import org.jboss.wiki.Credentials;
import org.jboss.wiki.WikiPage;
import org.jboss.wiki.WikiPlugin;
import org.jboss.wiki.WikiSession;
+import org.jboss.wiki.credentials.Credentials;
public class OtherLangsPlugin extends WikiPlugin {
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RefsManipulatingInsidePlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RefsManipulatingInsidePlugin.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RefsManipulatingInsidePlugin.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -3,12 +3,12 @@
import java.util.Set;
import java.util.TreeSet;
-import org.jboss.logging.Logger;
-import org.jboss.wiki.AdminSimpleCredentials;
+import org.apache.log4j.Logger;
import org.jboss.wiki.WikiContext;
import org.jboss.wiki.WikiInsidePlugin;
import org.jboss.wiki.WikiPage;
import org.jboss.wiki.WikiSession;
+import org.jboss.wiki.credentials.AdminSimpleCredentials;
/**Abstract class for inside plugins that work on references.
* @author tomek
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/WatchListPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/WatchListPlugin.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/WatchListPlugin.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -21,10 +21,10 @@
*/
package org.jboss.wiki.plugins;
-import org.jboss.wiki.Credentials;
import org.jboss.wiki.WikiPage;
import org.jboss.wiki.WikiPlugin;
import org.jboss.wiki.WikiSession;
+import org.jboss.wiki.credentials.Credentials;
/**
* Plugin that adds user to watch list (for sending on-change notifications)
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-test/.classpath
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-test/.classpath 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-test/.classpath 2007-10-05 15:49:27 UTC (rev 15603)
@@ -3,7 +3,6 @@
<classpathentry kind="src" path="src/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="MAVEN_REPO/log4j/jars/log4j-1.2.9.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/wiki-common/jars/wiki-common.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/jboss/jars/javax.servlet.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/jboss/jars/javax.servlet.jsp.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"/>
@@ -25,5 +24,6 @@
<classpathentry kind="lib" path="/Users/tomek/java/sandbox/portal-extensions/shotoku/shotoku-base/target/shotoku-base.jar"/>
<classpathentry kind="lib" path="/Users/tomek/java/sandbox/portal-extensions/shotoku/shotoku-aop/target/shotoku-aop.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/guice/jars/guice-1.0.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/wiki-common"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-test/src/java/org/jboss/wiki/test/TestCredentials.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-test/src/java/org/jboss/wiki/test/TestCredentials.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-test/src/java/org/jboss/wiki/test/TestCredentials.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -23,7 +23,7 @@
import java.util.Set;
-import org.jboss.wiki.Credentials;
+import org.jboss.wiki.credentials.Credentials;
public class TestCredentials extends Credentials {
private boolean logedIn = false;
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-test/src/java/org/jboss/wiki/test/WikiTest.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-test/src/java/org/jboss/wiki/test/WikiTest.java 2007-10-05 15:18:51 UTC (rev 15602)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-test/src/java/org/jboss/wiki/test/WikiTest.java 2007-10-05 15:49:27 UTC (rev 15603)
@@ -32,13 +32,13 @@
import junit.framework.TestCase;
import org.apache.log4j.Logger;
-import org.jboss.wiki.Credentials;
import org.jboss.wiki.WikiCommon;
import org.jboss.wiki.WikiContext;
import org.jboss.wiki.WikiEngine;
import org.jboss.wiki.WikiPage;
import org.jboss.wiki.WikiSession;
import org.jboss.wiki.configuration.ConfigurationParser;
+import org.jboss.wiki.credentials.Credentials;
import org.jboss.wiki.exceptions.PageRenamingException;
import org.jboss.wiki.exceptions.WikiException;
import org.jboss.wiki.test.guice.TestWikiModule;
More information about the jboss-svn-commits
mailing list