[jboss-svn-commits] JBL Code SVN: r15547 - in labs/jbosslabs/trunk/portal-extensions/jbosswiki: forge-wiki/src/java and 17 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Oct 3 12:43:59 EDT 2007
Author: szimano
Date: 2007-10-03 12:43:59 -0400 (Wed, 03 Oct 2007)
New Revision: 15547
Added:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/com/
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/com/thoughtworks/
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/com/thoughtworks/guice/
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/com/thoughtworks/guice/GuiceServletContextListener.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/com/thoughtworks/guice/GuiceVariableResolver.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/AttributesExtractorProvider.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/guice/
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/guice/WikiModule.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/lib/guice-1.0.jar
Modified:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/common.xml
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/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/forge-wiki/src/web/WEB-INF/faces-config.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/web.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/maven.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/src/application/META-INF/application.xml
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/WikiEngine.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiType.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-test/.classpath
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-test/src/java/org/jboss/wiki/test/WikiTest.java
Log:
wiki is guicy
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/common.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/common.xml 2007-10-03 16:41:17 UTC (rev 15546)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/common.xml 2007-10-03 16:43:59 UTC (rev 15547)
@@ -55,6 +55,11 @@
<jar>shotoku-aop.jar</jar>
</dependency>
+ <dependency>
+ <groupId>guice</groupId>
+ <artifactId>guice</artifactId>
+ <version>1.0</version>
+ </dependency>
</dependencies>
<build>
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/com/thoughtworks/guice/GuiceServletContextListener.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/com/thoughtworks/guice/GuiceServletContextListener.java (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/com/thoughtworks/guice/GuiceServletContextListener.java 2007-10-03 16:43:59 UTC (rev 15547)
@@ -0,0 +1,24 @@
+package com.thoughtworks.guice;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import org.jboss.wiki.guice.WikiModule;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+public class GuiceServletContextListener implements ServletContextListener {
+
+ public void contextInitialized(ServletContextEvent event) {
+ ServletContext ctx = event.getServletContext();
+ Injector inject = Guice.createInjector(new WikiModule());
+ ctx.setAttribute(Injector.class.getName(), inject);
+ }
+
+ public void contextDestroyed(ServletContextEvent event) {
+ ServletContext ctx = event.getServletContext();
+ ctx.removeAttribute(Injector.class.getName());
+ }
+}
\ No newline at end of file
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/com/thoughtworks/guice/GuiceVariableResolver.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/com/thoughtworks/guice/GuiceVariableResolver.java (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/com/thoughtworks/guice/GuiceVariableResolver.java 2007-10-03 16:43:59 UTC (rev 15547)
@@ -0,0 +1,36 @@
+package com.thoughtworks.guice;
+
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.faces.el.EvaluationException;
+import javax.faces.el.VariableResolver;
+
+import com.google.inject.Injector;
+
+public class GuiceVariableResolver extends VariableResolver {
+ private final VariableResolver wrapped;
+
+ public GuiceVariableResolver(VariableResolver wrapped) {
+ if (wrapped == null)
+ throw new NullPointerException("wrapped "
+ + VariableResolver.class.getName());
+ this.wrapped = wrapped;
+ }
+
+ @Override
+ public Object resolveVariable(FacesContext fctx, String name)
+ throws EvaluationException {
+ Object resolved = wrapped.resolveVariable(fctx, name);
+ if (resolved != null) {
+ Map map = fctx.getExternalContext().getApplicationMap();
+ Injector injector = (Injector) map.get(Injector.class.getName());
+ if (injector == null)
+ throw new NullPointerException("Could not locate "
+ + "Guice Injector in application scope using"
+ + " key '" + Injector.class.getName() + "'");
+ injector.injectMembers(resolved);
+ }
+ return resolved;
+ }
+}
\ No newline at end of file
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/AttributesExtractorProvider.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/AttributesExtractorProvider.java (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/AttributesExtractorProvider.java 2007-10-03 16:43:59 UTC (rev 15547)
@@ -0,0 +1,24 @@
+package org.jboss.wiki.attributesextractor;
+
+import org.jboss.wiki.WikiEngine;
+import org.jboss.wiki.helper.WikiHelper;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+
+public class AttributesExtractorProvider implements
+ Provider<AttributesExtractor> {
+
+ private WikiEngine wikiEngine;
+
+ @Inject
+ public AttributesExtractorProvider(WikiEngine wikiEngine) {
+ this.wikiEngine = wikiEngine;
+ }
+
+ public AttributesExtractor get() {
+ return WikiHelper.getAttributesExtractor(WikiHelper.getRequest(),
+ WikiHelper.getResponse(), wikiEngine);
+ }
+
+}
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-03 16:41:17 UTC (rev 15546)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/PortletAttributesExctractor.java 2007-10-03 16:43:59 UTC (rev 15547)
@@ -28,20 +28,21 @@
import javax.faces.context.FacesContext;
import javax.portlet.PortletRequest;
import javax.portlet.PortletURL;
-import javax.portlet.ReadOnlyException;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
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.exception.WikiUserPreferenceException;
-import org.jboss.wiki.helper.WikiHelper;
import org.jboss.wiki.portlet.PortletWikiSession;
+import com.google.inject.Inject;
+
/**
* PortletAttributesExctractor.java
*
@@ -78,8 +79,11 @@
private String userDefaultLang;
private String userDefaultPage;
+
- public PortletAttributesExctractor(Object request) {
+ public PortletAttributesExctractor(Object request, WikiEngine wikiEngine) {
+
+
if (request instanceof PortletRequest) {
PortletRequest rReq = (PortletRequest) request;
@@ -98,7 +102,7 @@
wikiSession = new PortletWikiSession(rReq.getPortletSession());
- credentials = WikiHelper.getWikiEngine().getCredentialsInstance(
+ credentials = wikiEngine.getCredentialsInstance(
request);
secure = rReq.isSecure();
Added: 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 (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/ServletAttributesExtractor.java 2007-10-03 16:43:59 UTC (rev 15547)
@@ -0,0 +1,165 @@
+package org.jboss.wiki.attributesextractor.impl;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.jboss.logging.Logger;
+import org.jboss.wiki.Credentials;
+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.exception.WikiUserPreferenceException;
+
+public class ServletAttributesExtractor implements AttributesExtractor {
+
+ private final static Logger log = Logger
+ .getLogger(ServletAttributesExtractor.class);
+
+ private static final String USER_LANG = "JBWiki:Default:Language";
+
+ private static final String USER_PAGE = "JBWiki:Default:Page";
+
+ private String appContext;
+
+ private String hostURL;
+
+ private WikiSession wikiSession;
+
+ private Credentials credentials;
+
+ private String page;
+
+ private boolean secure;
+
+ private String language;
+
+ private Integer pageVersion;
+
+ private String type;
+
+ private String userDefaultLang;
+
+ private String userDefaultPage;
+
+ public ServletAttributesExtractor(Object request) {
+ if (request instanceof HttpServletRequest) {
+ HttpServletRequest rReq = (HttpServletRequest) request;
+
+ // get all needed attributes
+ hostURL = ((rReq.isSecure()) ? "https" : "http")
+ + "://"
+ + rReq.getServerName()
+ + ((rReq.getServerPort() == 80) ? "" : ":"
+ + rReq.getServerPort());
+
+ appContext = ConfigurationParser.getWikiContext();
+
+ if (appContext == null) {
+ appContext = rReq.getContextPath();
+ }
+
+ wikiSession = new ServletWikiSession(rReq.getSession());
+
+ credentials = //WikiHelper.getWikiEngine().getCredentialsInstance(
+ //request);
+ new SimpleCredentials();
+
+ secure = rReq.isSecure();
+
+ page = rReq.getParameter("page");
+
+ language = rReq.getParameter("language");
+
+ log.debug("Version = " + rReq.getParameter("version"));
+
+ pageVersion = (rReq.getParameter("version") != null) ? Integer
+ .valueOf(rReq.getParameter("version")) : null;
+
+ type = rReq.getParameter("type");
+
+ //TODO parametry
+
+ userDefaultLang = ConfigurationParser.getDefaultLangugeCode();
+
+ userDefaultPage = ConfigurationParser.getDefaultPage();
+ } else {
+ throw new IllegalArgumentException("Unknow type request: "
+ + request);
+ }
+ }
+
+ public String getAppContext() {
+ return appContext;
+ }
+
+ public Credentials getCredentials() {
+ return credentials;
+ }
+
+ public String getHostURL() {
+ return hostURL;
+ }
+
+ public String getOutputLink(Object request, Object response,
+ boolean isAction) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Integer getPageVersion() {
+ return pageVersion;
+ }
+
+ public String getParameter(Object request, String key) {
+ if (request instanceof HttpServletRequest) {
+ HttpServletRequest rReq = (HttpServletRequest) request;
+
+ return rReq.getParameter(key);
+ } else {
+ throw new IllegalArgumentException("Unknow type request: "
+ + request);
+ }
+ }
+
+ public String getRequestedLanguage() {
+ return language;
+ }
+
+ public String getRequestedPageName() {
+ return page;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public String getUserDefaultLang() {
+ return userDefaultLang;
+ }
+
+ public String getUserDefaultPage() {
+ return userDefaultPage;
+ }
+
+ public WikiSession getWikiSession() {
+ return wikiSession;
+ }
+
+ public boolean isSecure() {
+ return secure;
+ }
+
+ public void setUserDefaultLang(String lang, Object request)
+ throws WikiUserPreferenceException {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void setUserDefaultPage(String page, Object request)
+ throws WikiUserPreferenceException {
+ // TODO Auto-generated method stub
+
+ }
+
+}
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-03 16:41:17 UTC (rev 15546)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2007-10-03 16:43:59 UTC (rev 15547)
@@ -27,9 +27,11 @@
import java.io.PrintWriter;
import java.net.URLDecoder;
import java.net.URLEncoder;
+import java.util.Map;
import java.util.Properties;
import javax.activation.MimetypesFileTypeMap;
+import javax.faces.context.FacesContext;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
@@ -52,10 +54,14 @@
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 com.google.inject.Inject;
+import com.google.inject.Injector;
+
/**
* A filter that enables to download files form the jspwiki structure +
* redirects to pages by typing http://domain/wiki/Page
@@ -88,18 +94,18 @@
// get wikiEnigne form wikiMenagement
log = Logger.getLogger(WikiFileAccessFilter.class);
+
+ Injector injector = (Injector) conf.getServletContext().getAttribute(Injector.class.getName());
+ wikiEngine = injector.getInstance(WikiEngine.class);
+ /*
+ * try { WikiServiceManagement wikiServiceMenagement = WikiCommon
+ * .getWikiManagement(); wikiEngine =
+ * wikiServiceMenagement.getWikiEngine(); } catch
+ * (WikiManagementNotFoundException e1) { log.error("Couldn't find
+ * WikiManagement", e1); wikiEngine = new WikiEngine(); }
+ */
- try {
- WikiServiceManagement wikiServiceMenagement = WikiCommon
- .getWikiManagement();
- wikiEngine = wikiServiceMenagement.getWikiEngine();
- } catch (WikiManagementNotFoundException e1) {
- log.error("Couldn't find WikiManagement", e1);
- wikiEngine = new WikiEngine();
- }
-
// load mime types map
-
mimeTypes = new MimetypesFileTypeMap(WikiFileAccessFilter.class
.getResourceAsStream("mime.types"));
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/guice/WikiModule.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/guice/WikiModule.java (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/guice/WikiModule.java 2007-10-03 16:43:59 UTC (rev 15547)
@@ -0,0 +1,20 @@
+package org.jboss.wiki.guice;
+
+import org.jboss.wiki.WikiEngine;
+import org.jboss.wiki.attributesextractor.AttributesExtractor;
+import org.jboss.wiki.attributesextractor.AttributesExtractorProvider;
+
+import com.google.inject.Binder;
+import com.google.inject.Module;
+
+public class WikiModule implements Module {
+
+ public void configure(Binder binder) {
+ WikiEngine wikiEngine = new WikiEngine();
+ binder.bind(WikiEngine.class).toInstance(wikiEngine);
+
+ binder.bind(AttributesExtractor.class).toProvider(
+ AttributesExtractorProvider.class);
+ }
+
+}
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-03 16:41:17 UTC (rev 15546)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/helper/WikiHelper.java 2007-10-03 16:43:59 UTC (rev 15547)
@@ -35,6 +35,8 @@
import javax.portlet.PortletRequest;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
import org.jboss.logging.Logger;
import org.jboss.wiki.WikiCommon;
@@ -43,11 +45,14 @@
import org.jboss.wiki.WikiSession;
import org.jboss.wiki.attributesextractor.AttributesExtractor;
import org.jboss.wiki.attributesextractor.impl.PortletAttributesExctractor;
+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;
+
/**
* WikiHelper.java
*
@@ -55,9 +60,7 @@
*/
public class WikiHelper {
-
- private static WikiEngine wikiEngine;
-
+
private static final Logger log = Logger.getLogger(WikiHelper.class);
private static final String WIKI_COMMON_SESSION = "#{wikiCommon}";
@@ -68,26 +71,15 @@
private static ThreadLocal<String> fileName = new ThreadLocal<String>();
- public static WikiEngine getWikiEngine() {
- if (wikiEngine == null) {
- try {
- WikiServiceManagement wikiServiceMenagement = WikiCommon
- .getWikiManagement();
- wikiEngine = wikiServiceMenagement.getWikiEngine();
- } catch (WikiManagementNotFoundException e1) {
- log.error("Couldn't find WikiManagement", e1);
- wikiEngine = new WikiEngine();
- }
- }
- return wikiEngine;
- }
-
public static AttributesExtractor getAttributesExtractor(Object request,
- Object response) {
+ Object response, WikiEngine wikiEngine) {
AttributesExtractor extractor;
if (request instanceof PortletRequest) {
- extractor = new PortletAttributesExctractor(request);
+ extractor = new PortletAttributesExctractor(request, wikiEngine);
+ }
+ else if (request instanceof HttpServletRequest) {
+ extractor = new ServletAttributesExtractor(request);
} else {
throw new IllegalArgumentException("Unknow type request: "
+ request);
@@ -182,12 +174,4 @@
return "";
}
- public static WikiPage getNoSuchPage(String content) {
- return new WikiPage(WikiHelper.getWikiCommonSession()
- .getPageName(), null,
- content,
- 0, 0, new Date(), WikiHelper.getWikiEngine(), true,
- true, null, null, 0, WikiHelper.getWikiCommonSession()
- .getLangCode());
- }
}
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-03 16:41:17 UTC (rev 15546)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java 2007-10-03 16:43:59 UTC (rev 15547)
@@ -38,6 +38,7 @@
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;
@@ -45,8 +46,13 @@
import org.apache.commons.fileupload.portlet.PortletFileUpload;
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;
+
/**
* WikiPortletMyFaces.java
*
@@ -95,7 +101,12 @@
for (String key : (Set<String>) paramMap.keySet()) {
if (key.matches("var[123456789]\\d*")) {
- WikiHelper.getAttributesExtractor(request, response)
+
+ Map map = FacesContext.getCurrentInstance()
+ .getExternalContext().getApplicationMap();
+ Injector injector = (Injector) map
+ .get(Injector.class.getName());
+ injector.getInstance(AttributesExtractor.class)
.getWikiSession().setAttribute(key,
((String[]) paramMap.get(key))[0]);
log.debug("Wiki Param: " + key + " = "
@@ -168,11 +179,9 @@
} catch (Throwable e) {
facesContext.release();
handleExceptionFromLifecycle(e);
+ } finally {
+ saveRequestAttributes(request);
}
- finally
- {
- saveRequestAttributes(request);
- }
}
private void processAttachments(ActionRequest request,
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-03 16:41:17 UTC (rev 15546)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletOld.java 2007-10-03 16:43:59 UTC (rev 15547)
@@ -57,6 +57,8 @@
import org.jboss.wiki.exceptions.WikiSaveException;
import org.jboss.wiki.management.WikiServiceManagement;
+import com.google.inject.Inject;
+
/**
* The WikiPortlet.
* <p>
@@ -77,20 +79,25 @@
private WikiEngine wikiEngine;
private Logger log;
+
+ @Inject
+ public void setWikiEngine(WikiEngine wikiEngine) {
+ this.wikiEngine = wikiEngine;
+ }
public void init() {
log = Logger.getLogger(WikiPortletOld.class);
WikiCommon wikiCommon = new WikiCommon();
- try {
+ /*try {
WikiServiceManagement wikiServiceMenagement = WikiCommon
.getWikiManagement();
wikiEngine = wikiServiceMenagement.getWikiEngine();
} catch (WikiManagementNotFoundException e1) {
log.error("Couldn't find WikiManagement", e1);
wikiEngine = new WikiEngine();
- }
+ }*/
}
private Map<String, String> convertParameters(ActionRequest rReq) {
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-03 16:41:17 UTC (rev 15546)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java 2007-10-03 16:43:59 UTC (rev 15547)
@@ -31,6 +31,8 @@
import org.jboss.wiki.configuration.ConfigurationParser;
import org.jboss.wiki.helper.WikiHelper;
+import com.google.inject.Inject;
+
/**
* WikiCommonSession.java
*
@@ -50,15 +52,20 @@
private Map<String, Integer> searchResults;
- public WikiCommonSession() {
- attrExtractor = WikiHelper.getAttributesExtractor(WikiHelper
- .getRequest(), WikiHelper.getResponse());
-
+ @Inject
+ public void setAttrExtractor(AttributesExtractor attrExtractor) {
+ this.attrExtractor = attrExtractor;
+
update(attrExtractor);
}
+
+ public WikiCommonSession() {
+
+ }
public void update(AttributesExtractor attrExtractor) {
- if (attrExtractor.getRequestedPageName() != null && attrExtractor.getRequestedPageName().length() > 0) {
+ if (attrExtractor.getRequestedPageName() != null
+ && attrExtractor.getRequestedPageName().length() > 0) {
pageName = attrExtractor.getRequestedPageName();
log.debug("Page name: " + pageName);
} else {
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-03 16:41:17 UTC (rev 15546)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiDiff.java 2007-10-03 16:43:59 UTC (rev 15547)
@@ -32,6 +32,8 @@
import org.jboss.wiki.attributesextractor.AttributesExtractor;
import org.jboss.wiki.helper.WikiHelper;
+import com.google.inject.Inject;
+
/**
* WikiDiff.java
*
@@ -44,17 +46,28 @@
private int thisVer;
+ @Inject
private AttributesExtractor attrExtractor;
-
+
private final static Logger log = Logger.getLogger(WikiDiff.class);
- public WikiDiff() {
- attrExtractor = WikiHelper.getAttributesExtractor(WikiHelper
- .getRequest(), WikiHelper.getResponse());
+ private WikiEngine wikiEngine;
+ @Inject
+ public void setWikiEngine(WikiEngine wikiEngine) {
+ this.wikiEngine = wikiEngine;
+ }
+
+ @Inject
+ public void setAttrExtractor(AttributesExtractor attrExtractor) {
+ this.attrExtractor = attrExtractor;
+
WikiHelper.getWikiCommonSession().update(attrExtractor);
}
+ public WikiDiff() {
+ }
+
public UIData getHistoryTable() {
return historyTable;
}
@@ -72,14 +85,14 @@
}
public String getDiff() {
- WikiEngine engine = WikiHelper.getWikiEngine();
- WikiType wikiType = WikiHelper.getWikiEngine().getWikiType("diff");
+ WikiType wikiType = wikiEngine.getWikiType("diff");
WikiContext wikiContext = new WikiContext(attrExtractor
.getCredentials(), wikiType, attrExtractor.getWikiSession());
- WikiPage page = engine.getByName(WikiHelper.getWikiCommonSession()
- .getPageName(), wikiContext, WikiHelper.getWikiCommonSession().getPageToDiff(), WikiHelper
- .getWikiCommonSession().getLangCode());
+ WikiPage page = wikiEngine.getByName(WikiHelper.getWikiCommonSession()
+ .getPageName(), wikiContext, WikiHelper.getWikiCommonSession()
+ .getPageToDiff(), WikiHelper.getWikiCommonSession()
+ .getLangCode());
return page.getContent();
}
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-03 16:41:17 UTC (rev 15546)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java 2007-10-03 16:43:59 UTC (rev 15547)
@@ -44,6 +44,8 @@
import org.jboss.wiki.exceptions.WikiSaveException;
import org.jboss.wiki.helper.WikiHelper;
+import com.google.inject.Inject;
+
/**
* WikiEdit.java
*
@@ -56,6 +58,7 @@
private static final String EDIT_DEFAULT = "edit";
+ @Inject
private AttributesExtractor attributesExtractor;
private Integer editSessionId;
@@ -68,14 +71,31 @@
private String lockMsg;
- public WikiEdit() {
- attributesExtractor = WikiHelper.getAttributesExtractor(WikiHelper
- .getRequest(), WikiHelper.getResponse());
+ private WikiEngine wikiEngine;
- WikiHelper.getWikiCommonSession().update(attributesExtractor);
+ @Inject
+ public void setWikiEngine(WikiEngine wikiEngine) {
+ this.wikiEngine = wikiEngine;
+
+ if (attributesExtractor != null && editSessionId == null) {
+ init();
+ }
+ }
+
+ @Inject
+ public void setAttrExtractor(AttributesExtractor attrExtractor) {
+ this.attributesExtractor = attrExtractor;
+
+ WikiHelper.getWikiCommonSession().update(attrExtractor);
+
+ if (wikiEngine != null && editSessionId == null) {
+ init();
+ }
+ }
+
+ private void init() {
+ editSessionId = wikiEngine.getEditSessionId();
- editSessionId = WikiHelper.getWikiEngine().getEditSessionId();
-
WikiPage pageToEdit = getWikiPage(true);
Date lock = pageToEdit.lock(attributesExtractor.getCredentials(),
@@ -101,6 +121,10 @@
}
}
+ public WikiEdit() {
+
+ }
+
public String getPageContent() {
return getWikiPage().getContent();
}
@@ -118,7 +142,7 @@
}
private WikiPage getWikiPage(boolean getDirect, String wikiType) {
- WikiEngine wikiEngine = WikiHelper.getWikiEngine();
+
WikiContext wikiContext = new WikiContext(attributesExtractor
.getCredentials(), wikiEngine.getWikiType(wikiType),
attributesExtractor.getWikiSession());
@@ -138,7 +162,7 @@
.getPageName(), getDirect ? null : wikiContext, WikiHelper
.getWikiCommonSession().getLangCode());
}
-
+
if (wikiPage.getLastAuthor().equals(0)) {
wikiPage.setContent("");
}
@@ -188,7 +212,6 @@
}
public String addFile() {
- WikiEngine wikiEngine = WikiHelper.getWikiEngine();
String fileName = null;
@@ -224,10 +247,9 @@
}
public List<SelectItem> getFileNames() {
- WikiEngine engine = WikiHelper.getWikiEngine();
WikiPage page = getWikiPage();
- Set<String> attSet = engine.getAttachmentsSet(page, page.getLangCode());
+ Set<String> attSet = wikiEngine.getAttachmentsSet(page, page.getLangCode());
List<SelectItem> attNames = new Vector<SelectItem>();
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-03 16:41:17 UTC (rev 15546)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiPrefs.java 2007-10-03 16:43:59 UTC (rev 15547)
@@ -32,10 +32,13 @@
import javax.faces.model.SelectItem;
import org.jboss.logging.Logger;
+import org.jboss.wiki.WikiEngine;
import org.jboss.wiki.attributesextractor.AttributesExtractor;
import org.jboss.wiki.exception.WikiUserPreferenceException;
import org.jboss.wiki.helper.WikiHelper;
+import com.google.inject.Inject;
+
/**
* WikiPrefs.java
*
@@ -51,17 +54,29 @@
private Set<SelectItem> allPages;
+ @Inject
private AttributesExtractor attrExtractor;
private final static Logger log = Logger.getLogger(WikiPrefs.class);
- public WikiPrefs() {
- attrExtractor = WikiHelper.getAttributesExtractor(WikiHelper
- .getRequest(), WikiHelper.getResponse());
+ private WikiEngine wikiEngine;
+ @Inject
+ public void setWikiEngine(WikiEngine wikiEngine) {
+ this.wikiEngine = wikiEngine;
+ }
+
+ @Inject
+ public void setAttrExtractor(AttributesExtractor attrExtractor) {
+ this.attrExtractor = attrExtractor;
+
WikiHelper.getWikiCommonSession().update(attrExtractor);
}
+ public WikiPrefs() {
+
+ }
+
public Set<SelectItem> getAllLangs() {
if (allLangs == null) {
allLangs = new TreeSet<SelectItem>(new Comparator<SelectItem>() {
@@ -72,7 +87,7 @@
});
- Map<String, String> langMap = WikiHelper.getWikiEngine()
+ Map<String, String> langMap = wikiEngine
.getUsedLanguageCodes();
for (String lang : langMap.keySet()) {
@@ -96,7 +111,7 @@
});
- Set<String> pages = WikiHelper.getWikiEngine().getAllPageNames(
+ Set<String> pages = wikiEngine.getAllPageNames(
getLang());
for (String page : pages) {
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-03 16:41:17 UTC (rev 15546)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java 2007-10-03 16:43:59 UTC (rev 15547)
@@ -40,6 +40,8 @@
import org.jboss.wiki.configuration.ConfigurationParser;
import org.jboss.wiki.helper.WikiHelper;
+import com.google.inject.Inject;
+
/**
* WikiView.java
*
@@ -53,6 +55,7 @@
private static final String FIND_ATTRIBUTE = "findResult";
+ @Inject
private AttributesExtractor attrExtractor;
private WikiPage currentPage = null;
@@ -61,14 +64,31 @@
private List<HistoryElement> hisList;
- public WikiView() {
- attrExtractor = WikiHelper.getAttributesExtractor(WikiHelper
- .getRequest(), WikiHelper.getResponse());
+ private WikiEngine wikiEngine;
+ @Inject
+ public void setWikiEngine(WikiEngine wikiEngine) {
+ this.wikiEngine = wikiEngine;
+
+ if (attrExtractor != null && currentPage == null) {
+ getCurrentPage();
+ }
+ }
+
+ @Inject
+ public void setAttrExtractor(AttributesExtractor attrExtractor) {
+ this.attrExtractor = attrExtractor;
+
WikiHelper.getWikiCommonSession().update(attrExtractor);
-
- getCurrentPage();
+
+ if (wikiEngine != null && currentPage == null) {
+ getCurrentPage();
+ }
}
+
+ public WikiView() {
+
+ }
public String getWikiImagesURL() {
return attrExtractor.getHostURL() + attrExtractor.getAppContext() + "/"
@@ -138,25 +158,23 @@
+ type);
if (currentPage == null) {
- WikiType wikiType = WikiHelper.getWikiEngine().getWikiType(type);
+ WikiType wikiType = wikiEngine.getWikiType(type);
WikiContext wikiContext = new WikiContext(attrExtractor
.getCredentials(), wikiType, attrExtractor.getWikiSession());
if (attrExtractor.getPageVersion() != null) {
- currentPage = WikiHelper.getWikiEngine().getByName(
+ currentPage = wikiEngine.getByName(
WikiHelper.getWikiCommonSession().getPageName(),
wikiContext, attrExtractor.getPageVersion(),
WikiHelper.getWikiCommonSession().getLangCode());
} else {
- currentPage = WikiHelper.getWikiEngine().getByName(
+ currentPage = wikiEngine.getByName(
WikiHelper.getWikiCommonSession().getPageName(),
wikiContext,
WikiHelper.getWikiCommonSession().getLangCode());
}
}
-
-
log.debug("page loaded: " + currentPage.getName());
return currentPage;
@@ -183,11 +201,10 @@
if (hisList == null) {
hisList = new Vector<HistoryElement>();
- WikiEngine engine = WikiHelper.getWikiEngine();
WikiPage currentPage = getCurrentPage();
for (int i = currentPage.getLastVersion(); i > 0; i--) {
- WikiPage histPage = engine.getPageAtVersion(currentPage, true,
+ WikiPage histPage = wikiEngine.getPageAtVersion(currentPage, true,
i, currentPage.getLangCode());
hisList.add(new HistoryElement(i, histPage.getEditDate(),
@@ -222,7 +239,7 @@
public String search() {
- Map<String, Integer> pages = WikiHelper.getWikiEngine().findPages(
+ Map<String, Integer> pages = wikiEngine.findPages(
searchQuery, WikiHelper.getWikiCommonSession().getLangCode());
WikiHelper.getWikiCommonSession().setSearchResults(pages);
@@ -256,6 +273,7 @@
public String getLastAuthor() {
return getCurrentPage().getLastAuthor().getName();
}
+
public String getDate() {
return getCurrentPage().getEditDate().toString();
}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/faces-config.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/faces-config.xml 2007-10-03 16:41:17 UTC (rev 15546)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/faces-config.xml 2007-10-03 16:43:59 UTC (rev 15547)
@@ -14,8 +14,12 @@
<locale-config>
<default-locale>en</default-locale>
</locale-config>
+ <variable-resolver>
+ com.thoughtworks.guice.GuiceVariableResolver
+ </variable-resolver>
+
</application>
-
+
<managed-bean>
<managed-bean-name>wikiView</managed-bean-name>
<managed-bean-class>org.jboss.wiki.ui.WikiView</managed-bean-class>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/web.xml 2007-10-03 16:41:17 UTC (rev 15546)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/web.xml 2007-10-03 16:43:59 UTC (rev 15547)
@@ -81,6 +81,12 @@
<listener>
<listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
</listener>
+
+ <listener>
+ <listener-class>
+ com.thoughtworks.guice.GuiceServletContextListener
+ </listener-class>
+ </listener>
<servlet>
<servlet-name>Faces Servlet</servlet-name>
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/lib/guice-1.0.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/jbosswiki/lib/guice-1.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/maven.xml 2007-10-03 16:41:17 UTC (rev 15546)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/maven.xml 2007-10-03 16:43:59 UTC (rev 15547)
@@ -22,7 +22,6 @@
<goal name="clean">
<ant:delete dir="target" />
<ant:delete dir="wiki-common/target" />
- <ant:delete dir="wiki-management/target" />
<ant:delete dir="forge-wiki/target" />
<ant:delete dir="wiki-test/target" />
</goal>
@@ -31,9 +30,6 @@
<maven:reactor includes="jbosswiki/wiki-common/project.xml" excludes="" basedir="."
banner="Making wiki-common for the repo"
goals="clean,build" ignoreFailures="false" />
- <maven:reactor includes="jbosswiki/wiki-management/project.xml" excludes="" basedir="."
- banner="Building and deploying EJB3 service for wiki"
- goals="clean,build" ignoreFailures="false" />
<maven:reactor includes="jbosswiki/forge-wiki/project.xml" excludes="" basedir="."
banner="Building and deploying wiki portlet/servlet"
goals="clean,build" ignoreFailures="false" />
@@ -50,9 +46,6 @@
<maven:reactor includes="wiki-common/project.xml" excludes="" basedir="."
banner="Making wiki-common for the repo"
goals="clean,build" ignoreFailures="false" />
- <maven:reactor includes="wiki-management/project.xml" excludes="" basedir="."
- banner="Building and deploying EJB3 service for wiki"
- goals="clean,build" ignoreFailures="false" />
<maven:reactor includes="forge-wiki/project.xml" excludes="" basedir="."
banner="Building and deploying wiki portlet/servlet"
goals="clean,build" ignoreFailures="false" />
@@ -69,7 +62,6 @@
<ant:delete dir="target/ear" />
<ant:copy tofile="target/ear/wiki-common.jar" file="wiki-common/target/wiki-common-1.0.jar" />
- <ant:copy tofile="target/ear/wiki.ejb3" file="wiki-management/target/wiki-management-1.0.jar" />
<ant:copy tofile="target/ear/wiki.war" file="forge-wiki/target/wiki.war" />
<ant:copy tofile="target/ear/wiki-test.war" file="wiki-test/target/wiki-test.war" />
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/src/application/META-INF/application.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/src/application/META-INF/application.xml 2007-10-03 16:41:17 UTC (rev 15546)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/src/application/META-INF/application.xml 2007-10-03 16:43:59 UTC (rev 15547)
@@ -1,8 +1,8 @@
<application>
<display-name>JBoss Labs - forge infrastructure</display-name>
- <module>
+ <!--<module>
<ejb>wiki.ejb3</ejb>
- </module>
+ </module>-->
<module>
<web>
<web-uri>wiki.war</web-uri>
@@ -14,4 +14,10 @@
<web-uri>wiki-test.war</web-uri>
</web>
</module>
+ <module>
+ <java>wiki-common.jar</java>
+ </module>
+ <module>
+ <java>guice-1.0.jar</java>
+ </module>
</application>
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-03 16:41:17 UTC (rev 15546)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java 2007-10-03 16:43:59 UTC (rev 15547)
@@ -61,7 +61,7 @@
private static WikiServiceManagement wikiServiceMenagement;
- public static WikiServiceManagement getWikiManagement()
+ /*public static WikiServiceManagement getWikiManagement()
throws WikiManagementNotFoundException {
try {
if (wikiServiceMenagement == null)
@@ -73,7 +73,7 @@
} catch (Exception e) {
throw new WikiManagementNotFoundException(e);
}
- }
+ }*/
public static void sendNotificationMail(WikiPage page,
WikiSession wikiSession, WikiEngine engine, String fromEmail) {
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-03 16:41:17 UTC (rev 15546)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiEngine.java 2007-10-03 16:43:59 UTC (rev 15547)
@@ -35,7 +35,6 @@
import java.util.TreeMap;
import java.util.TreeSet;
import java.util.Map.Entry;
-import java.util.concurrent.Semaphore;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -46,7 +45,6 @@
import org.jboss.wiki.exceptions.PageNotEditedException;
import org.jboss.wiki.exceptions.PageRenamingException;
import org.jboss.wiki.exceptions.WikiSaveException;
-import org.jboss.wiki.plugins.WatchListPlugin;
import org.jboss.logging.Logger;
import org.w3c.dom.Document;
@@ -54,12 +52,16 @@
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
+import com.google.inject.Singleton;
+
/**
*
* @author <a href="mailto:dsicore at jboss.org">Damon Sicore</a>
* @author <a href="mailto:tomasz.szymanski at jboss.com">Tomasz Szymanski</a>
* @version $Id$
*/
+
+ at Singleton
public class WikiEngine {
private HashMap<String, WikiType> wikiTypes;
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-03 16:41:17 UTC (rev 15546)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiType.java 2007-10-03 16:43:59 UTC (rev 15547)
@@ -25,6 +25,8 @@
import org.jboss.logging.Logger;
+import com.google.inject.Inject;
+
/**
* <p>
* </p>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-test/.classpath
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-test/.classpath 2007-10-03 16:41:17 UTC (rev 15546)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-test/.classpath 2007-10-03 16:43:59 UTC (rev 15547)
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <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/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"/>
- <classpathentry kind="var" path="MAVEN_REPO/jboss/jars/activation.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/commons-fileupload/jars/commons-fileupload-1.0.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/commons-configuration/jars/commons-configuration-1.1.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/commons-lang/jars/commons-lang-2.1.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/commons-collections/jars/commons-collections-3.1.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/dom4j/jars/dom4j-1.6.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/jdom/jars/jdom-1.0.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/jboss/jars/jboss-ejb3x.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/jboss/jars/jboss-ejb3.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/portlet-api/jars/portlet-api-1.0.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/jboss/jars/jboss-jmx.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/jboss/jars/jboss-common.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/jboss/jars/portal-common-lib.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/jboss/jars/portal-core-lib.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/jboss/jars/portal-portlet-lib.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/jboss/jars/jbossall-client-3.2.3.jar"/>
- <classpathentry kind="lib" path="/home/tomek/java/sandbox/portal-extensions/shotoku/shotoku-base/target/shotoku-base.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/shotoku/jars/shotoku-aop.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/WikiTest.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-test/src/java/org/jboss/wiki/test/WikiTest.java 2007-10-03 16:41:17 UTC (rev 15546)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-test/src/java/org/jboss/wiki/test/WikiTest.java 2007-10-03 16:43:59 UTC (rev 15547)
@@ -45,6 +45,8 @@
import org.jboss.wiki.exceptions.WikiManagementNotFoundException;
import org.jboss.wiki.management.WikiServiceManagement;
+import com.google.inject.Inject;
+
public class WikiTest extends TestCase {
protected WikiEngine wikiEngine;
@@ -84,20 +86,26 @@
protected Logger log;
+
+ @Inject
+ public void setWikiEngine(WikiEngine wikiEngine) {
+ this.wikiEngine = wikiEngine;
+ }
+
@Override
protected void setUp() throws Exception {
log = Logger.getLogger(WikiTest.class);
WikiCommon wikiCommon = new WikiCommon();
- try {
+ /*try {
WikiServiceManagement wikiServiceMenagement = wikiCommon
.getWikiManagement();
wikiEngine = wikiServiceMenagement.getWikiEngine();
} catch (WikiManagementNotFoundException e1) {
log.info("Couldn't find WikiManagement - probably u're executing tests outside AS");
wikiEngine = new WikiEngine();
- }
+ }*/
testWikiSession = new TestWikiSession();
pagesToDelete = new HashSet<String>();
More information about the jboss-svn-commits
mailing list