[jboss-svn-commits] JBL Code SVN: r10996 - in labs/jbosslabs/trunk/portal-extensions: forge-portlets/src/web/WEB-INF and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Apr 16 03:23:49 EDT 2007
Author: szimano
Date: 2007-04-16 03:23:49 -0400 (Mon, 16 Apr 2007)
New Revision: 10996
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/DownloadsConstants.java
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml
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/ui/WikiEdit.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/src/java/org/jboss/wiki/WikiEngine.java
labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
Log:
wiki new page bug and downloads for multiple projects
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java 2007-04-16 07:18:19 UTC (rev 10995)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java 2007-04-16 07:23:49 UTC (rev 10996)
@@ -55,10 +55,23 @@
Projects projects = ProjectsHelper.getProjects(portalName);
// Getting the selected project
- String projectId = ProjectsHelper.getSelectedProjectId(request);
- if (projectId == null)
- throw new Exception("No project selected");
+ String projectId = null;
+ if (request.getParameter("projectId") != null) {
+ projectId = request.getParameter("projectId");
+ } else {
+ projectId = ProjectsHelper.getSelectedProjectId(request);
+ }
+ // show bar if not on project page
+ if (ProjectsHelper.getSelectedProjectId(request, false) == null) {
+ request.setAttribute(DownloadsConstants.NOPROJECT, "NOPROJECT");
+ }
+
+ if (projectId == null) {
+ // throw new Exception("No project selected");
+ projectId = "default";
+ }
+
response.setTitle(projects.getProjectName(projectId) + " "
+ "Downloads");
@@ -68,54 +81,57 @@
List<? extends File> files = null;
List<? extends Category> categories = null;
+ Set<String> buttoncat = new TreeSet<String>();
+
String desc = null;
String name = null;
org.jboss.forge.common.projects.project.Downloads d = LabsServices
.getProjectsService().getProjectDownloads(projectId);
- if (categoryId == null) {
- files = d.getFiles().getFile();
- categories = d.getCategories().getCategory();
- desc = d.getDescription();
- name = d.getName();
- } else {
- String[] cats = categoryId.split("/");
+ if (!projectId.equals("default")) {
+ if (categoryId == null) {
+ files = d.getFiles().getFile();
+ categories = d.getCategories().getCategory();
+ desc = d.getDescription();
+ name = d.getName();
+ } else {
+ String[] cats = categoryId.split("/");
- Category cat = d.getCategories().getCategory(cats[0]);
+ Category cat = d.getCategories().getCategory(cats[0]);
- if (cat == null) {
- throw new Exception("No such category: " + categoryId);
- }
-
- for (int i = 1; i < cats.length; i++) {
- cat = cat.getCategories().getCategory(cats[i]);
-
if (cat == null) {
throw new Exception("No such category: " + categoryId);
}
- }
- if (cat.getFiles() != null)
- files = cat.getFiles().getFile();
+ for (int i = 1; i < cats.length; i++) {
+ cat = cat.getCategories().getCategory(cats[i]);
- if (cat.getCategories() != null)
- categories = cat.getCategories().getCategory();
+ if (cat == null) {
+ throw new Exception("No such category: "
+ + categoryId);
+ }
+ }
- desc = cat.getDescription();
- name = cat.getName();
+ if (cat.getFiles() != null)
+ files = cat.getFiles().getFile();
- request.setAttribute(DownloadsConstants.CATEGORY, cat);
- }
+ if (cat.getCategories() != null)
+ categories = cat.getCategories().getCategory();
- Set<String> buttoncat = new TreeSet<String>();
+ desc = cat.getDescription();
+ name = cat.getName();
- for (File f : files) {
- for (Button b : f.getButton()) {
- buttoncat.add(b.getName());
+ request.setAttribute(DownloadsConstants.CATEGORY, cat);
}
+
+ for (File f : files) {
+ for (Button b : f.getButton()) {
+ buttoncat.add(b.getName());
+ }
+ }
}
-
+
request.setAttribute(DownloadsConstants.DESCRIPTION, desc);
request.setAttribute(DownloadsConstants.CATEGORYNAME, name);
request.setAttribute(DownloadsConstants.FILES, files);
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/DownloadsConstants.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/DownloadsConstants.java 2007-04-16 07:18:19 UTC (rev 10995)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/DownloadsConstants.java 2007-04-16 07:23:49 UTC (rev 10996)
@@ -35,4 +35,5 @@
public static final String CATEGORYNAME = "CATEGORYNAME";
public static final String CATEGORY = "CATEGORY";
public static final String BUTTONCAT = "BUTTONCAT";
+ public static final String NOPROJECT = "NOPROJECT";
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml 2007-04-16 07:18:19 UTC (rev 10995)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml 2007-04-16 07:23:49 UTC (rev 10996)
@@ -99,4 +99,11 @@
</preferences>
</instance>
</deployment>
+ <deployment>
+ <if-exists>overwrite</if-exists>
+ <instance>
+ <instance-id>DownloadsResourcesPageInstance</instance-id>
+ <portlet-ref>DownloadsPortlet</portlet-ref>
+ </instance>
+ </deployment>
</deployments>
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-04-16 07:18:19 UTC (rev 10995)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/helper/WikiHelper.java 2007-04-16 07:23:49 UTC (rev 10996)
@@ -23,6 +23,7 @@
package org.jboss.wiki.helper;
import java.io.File;
+import java.util.Date;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
@@ -38,6 +39,7 @@
import org.jboss.logging.Logger;
import org.jboss.wiki.WikiCommon;
import org.jboss.wiki.WikiEngine;
+import org.jboss.wiki.WikiPage;
import org.jboss.wiki.WikiSession;
import org.jboss.wiki.attributesextractor.AttributesExtractor;
import org.jboss.wiki.attributesextractor.impl.PortletAttributesExctractor;
@@ -179,4 +181,13 @@
} else
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/ui/WikiEdit.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java 2007-04-16 07:18:19 UTC (rev 10995)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java 2007-04-16 07:23:49 UTC (rev 10996)
@@ -123,23 +123,30 @@
.getCredentials(), wikiEngine.getWikiType(wikiType),
attributesExtractor.getWikiSession());
+ WikiPage wikiPage = null;
+
log.info("Page version: " + attributesExtractor.getPageVersion());
if (attributesExtractor.getPageVersion() != null) {
log.info("getting page at version: "
+ attributesExtractor.getPageVersion());
- return wikiEngine.getByName(WikiHelper.getWikiCommonSession()
+ wikiPage = wikiEngine.getByName(WikiHelper.getWikiCommonSession()
.getPageName(), getDirect ? null : wikiContext,
- attributesExtractor.getPageVersion(), WikiHelper.getWikiCommonSession()
- .getLangCode());
+ attributesExtractor.getPageVersion(), WikiHelper
+ .getWikiCommonSession().getLangCode());
} else {
- return wikiEngine.getByName(WikiHelper.getWikiCommonSession()
+ wikiPage = wikiEngine.getByName(WikiHelper.getWikiCommonSession()
.getPageName(), getDirect ? null : wikiContext, WikiHelper
.getWikiCommonSession().getLangCode());
}
+
+ if (wikiPage.getLastAuthor().equals(0)) {
+ wikiPage.setContent("");
+ }
+
+ return wikiPage;
}
public String save() {
- WikiEngine wikiEngine = WikiHelper.getWikiEngine();
try {
getWikiPage().save(attributesExtractor.getCredentials(),
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-04-16 07:18:19 UTC (rev 10995)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java 2007-04-16 07:23:49 UTC (rev 10996)
@@ -22,6 +22,7 @@
package org.jboss.wiki.ui;
+import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Vector;
@@ -54,7 +55,7 @@
private AttributesExtractor attrExtractor;
- private WikiPage currentPage;
+ private WikiPage currentPage = null;
private String searchQuery;
@@ -151,11 +152,11 @@
WikiHelper.getWikiCommonSession().getPageName(),
wikiContext,
WikiHelper.getWikiCommonSession().getLangCode());
-
}
-
}
+
+
log.info("page loaded: " + currentPage.getName());
return currentPage;
@@ -245,7 +246,8 @@
+ attrExtractor.getAppContext()
+ "/print/"
+ getCurrentPage().getName()
- + (attrExtractor.getPageVersion() != null ? ":" + getCurrentPage().getVersion() : "")
+ + (attrExtractor.getPageVersion() != null ? ":"
+ + getCurrentPage().getVersion() : "")
+ "', 'printerfriendly', 'menubar=no,toolbar=no,location=no,directories=no,status=no,scrollbars=yes,resizable=no,fullscreen=no,channelmode=no'); return false";
return print;
@@ -254,7 +256,6 @@
public String getLastAuthor() {
return getCurrentPage().getLastAuthor().getName();
}
-
public String getDate() {
return getCurrentPage().getEditDate().toString();
}
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-04-16 07:18:19 UTC (rev 10995)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiEngine.java 2007-04-16 07:23:49 UTC (rev 10996)
@@ -169,6 +169,7 @@
} else {
try {
ret = (WikiPage) noSuchPage.clone();
+ ret.setEditDate(new Date());
ret.setName(pageName);
ret.setLangCode(dataSource.getMediaDataSource().getLangCode());
} catch (CloneNotSupportedException cne) {
Modified: labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml 2007-04-16 07:18:19 UTC (rev 10995)
+++ labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml 2007-04-16 07:23:49 UTC (rev 10996)
@@ -104,6 +104,13 @@
<region>left</region>
<height>1</height>
</window>
+
+ <window>
+ <window-name>DownloadsResourcesPageWindow</window-name>
+ <instance-ref>DownloadsResourcesPageInstance</instance-ref>
+ <region>right</region>
+ <height>1</height>
+ </window>
</page>
</deployment>
More information about the jboss-svn-commits
mailing list