Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r1083 - in trunk/forge/portal-extensions/jbosswiki: . forge-wiki forge-wiki/src/java/org/jboss/wiki forge-wiki/src/java/org/jboss/wiki/fileaccess forge-wiki/src/web/WEB-INF forge-wiki/src/web/WEB-INF/jsp wiki-common/src/etc
|
From: <jbo...@li...> - 2005-09-12 16:56:43
|
Author: szimano
Date: 2005-09-12 12:56:18 -0400 (Mon, 12 Sep 2005)
New Revision: 1083
Added:
trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/JBossWikiLogoMedium.png
trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/attachButton.png
trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/editButton.png
trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/historyButton.png
trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/permaLinkButton.png
Removed:
trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/tld/
Modified:
trunk/forge/portal-extensions/jbosswiki/forge-wiki/maven.xml
trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Edit.jsp
trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/PageInfo.jsp
trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp
trunk/forge/portal-extensions/jbosswiki/maven.xml
Log:
more accurate version... with some forge-independent things
Modified: trunk/forge/portal-extensions/jbosswiki/forge-wiki/maven.xml
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/forge-wiki/maven.xml 2005-09-12 15:19:35 UTC (rev 1082)
+++ trunk/forge/portal-extensions/jbosswiki/forge-wiki/maven.xml 2005-09-12 16:56:18 UTC (rev 1083)
@@ -5,7 +5,6 @@
-->
<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util" >
<goal name="build">
- <attainGoal name="copy-tld" />
<attainGoal name="war" />
Modified: trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-09-12 15:19:35 UTC (rev 1082)
+++ trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-09-12 16:56:18 UTC (rev 1083)
@@ -18,7 +18,7 @@
import javax.portlet.*;
import org.jboss.portlet.*;
-import org.jboss.wiki.management.WikiServiceMenagement;
+import org.jboss.wiki.fileaccess.WikiFileAccessFilter;
import org.apache.commons.fileupload.PortletDiskFileUpload;
import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.fileupload.FileItem;
@@ -41,19 +41,13 @@
private WikiEngine wikiEngine;
public void init() {
- // set wikiEngine
+ wikiEngine = new WikiEngine();
- /*WikiCommon wikiCommon = new WikiCommon();
-
- WikiServiceMenagement wikiServiceMenagement = wikiCommon
- .getWikiManagement();
-
- wikiEngine = wikiServiceMenagement.getWikiEngine();
+ //WikiCommon wikiCommon = new WikiCommon();
- if (wikiEngine == null) {*/
- wikiEngine = new WikiEngine();
- /*wikiServiceMenagement.setWikiEngine(wikiEngine);
- }*/
+ //WikiServiceMenagement wikiServiceMenagement = wikiCommon.getWikiManagement();
+
+ //wikiServiceMenagement.setWikiEngine(wikiEngine);
}
public void processAction(JBossActionRequest rReq, JBossActionResponse rResp) {
@@ -355,9 +349,11 @@
rReq
.setAttribute(
"wikiName",
- "<img src=\"/file-access/default/members/jbosswiki/images/JBossWikiLogoMedium.png\" width=\"100\" border=\"0\" style=\"vertical-align: middle\"/>");
+ "<img src=\""+hostURL+"/wiki/"+WikiFileAccessFilter.specialPage+"/JBossWikiLogoMedium.png\" width=\"100\" border=\"0\" style=\"vertical-align: middle\"/>");
rReq.setAttribute("wikiContent", pageToShow.getContent());
+
+ rReq.setAttribute("wikiImagesUrl", hostURL+"/wiki/"+WikiFileAccessFilter.specialPage+"/");
rReq.setAttribute("wikiPage", wikiPage);
Modified: trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2005-09-12 15:19:35 UTC (rev 1082)
+++ trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2005-09-12 16:56:18 UTC (rev 1083)
@@ -11,6 +11,7 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.util.Properties;
import javax.activation.MimetypesFileTypeMap;
@@ -42,13 +43,13 @@
* <code>BUF_SIZE</code> - size of a buffer, which is used while reading a
* file and sending it to the client.
*/
+
+ public static final String specialPage = "!WikiButtons";
private final int BUF_SIZE = 32768;
private String attachementsPath;
private String wikiHome;
-
- private String[] replaces;
/*
* private ForgeHelper forgeHelper; private ContentManager contentManager;
@@ -100,7 +101,30 @@
//System.out.println("length " + tokens.length);
- if (tokens.length == 3) {
+ if (tokens[tokens.length - 2].equals(specialPage)) {
+ // show apropriate buttons
+ InputStream imageIS = WikiFileAccessFilter.class.getResourceAsStream("/"+tokens[tokens.length - 1]);
+
+ ServletOutputStream os = response.getOutputStream();
+
+ response.setContentType("image/png");
+
+ // Transferring the bytes
+ try {
+ byte[] buffer = new byte[BUF_SIZE];
+ int read;
+ while ((read = imageIS.read(buffer)) != -1)
+ os.write(buffer, 0, read);
+ } catch (Exception e2) {
+ // Nothing that we can really do. Just send an incomplete
+ // file.
+ } finally {
+ os.close();
+ imageIS.close();
+ }
+
+ }
+ else if (tokens.length == 3) {
String hostURL = ((request.isSecure()) ? "https" : "http") + "://"+request.getServerName()+((request.getServerPort() == 80) ? "" : ":"+ request.getServerPort());
httpResponse.sendRedirect(hostURL+wikiHome + "&page="
Modified: trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Edit.jsp
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Edit.jsp 2005-09-12 15:19:35 UTC (rev 1082)
+++ trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Edit.jsp 2005-09-12 16:56:18 UTC (rev 1083)
@@ -5,9 +5,6 @@
-->
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
-<%@ taglib uri="/WEB-INF/tld/portlet.tld" prefix="n" %>
-<%@ taglib uri="/WEB-INF/tld/forge.tld" prefix="forge" %>
-<!--<%@ taglib uri="/WEB-INF/tld/wiki.tld" prefix="wiki" %>-->
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
<%@ page isELIgnored ="false" %>
<portlet:defineObjects/>
@@ -19,6 +16,7 @@
String wikiPage = (String)request.getAttribute("wikiPage");
String lockMsg = (String)request.getAttribute("lockMsg");
String defaultPage = (String)request.getAttribute("defaultPage");
+ String wikiImagesUrl = (String)request.getAttribute("wikiImagesUrl");
if (lockMsg == null)
lockMsg = "";
Modified: trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/PageInfo.jsp
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/PageInfo.jsp 2005-09-12 15:19:35 UTC (rev 1082)
+++ trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/PageInfo.jsp 2005-09-12 16:56:18 UTC (rev 1083)
@@ -5,9 +5,6 @@
-->
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
-<%@ taglib uri="/WEB-INF/tld/portlet.tld" prefix="n" %>
-<%@ taglib uri="/WEB-INF/tld/forge.tld" prefix="forge" %>
-<!--<%@ taglib uri="/WEB-INF/tld/wiki.tld" prefix="wiki" %>-->
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
<%@ page isELIgnored ="false" %>
<portlet:defineObjects/>
@@ -18,6 +15,7 @@
//String wikiContent = (String)request.getAttribute("wikiContent");
String wikiPage = (String)request.getAttribute("wikiPage");
String defaultPage = (String)request.getAttribute("defaultPage");
+ String wikiImagesUrl = (String)request.getAttribute("wikiImagesUrl");
//java.util.Date editDate = (java.util.Date)request.getAttribute("editDate");
//org.jboss.wiki.Credentials author = (org.jboss.wiki.Credentials)request.getAttribute("author");
%>
Modified: trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2005-09-12 15:19:35 UTC (rev 1082)
+++ trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2005-09-12 16:56:18 UTC (rev 1083)
@@ -1,7 +1,10 @@
+<!--
+ JBoss, the OpenSource J2EE webOS
+ Distributable under LGPL license.
+ See terms of license at gnu.org.
+ -->
+
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
-<%@ taglib uri="/WEB-INF/tld/portlet.tld" prefix="n" %>
-<%@ taglib uri="/WEB-INF/tld/forge.tld" prefix="forge" %>
-<!--<%@ taglib uri="/WEB-INF/tld/wiki.tld" prefix="wiki" %>-->
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
<%@ page isELIgnored ="false" %>
<portlet:defineObjects/>
@@ -16,6 +19,7 @@
String type = (String)request.getParameter("type");
java.util.Date editDate = (java.util.Date)request.getAttribute("editDate");
org.jboss.wiki.Credentials author = (org.jboss.wiki.Credentials)request.getAttribute("author");
+ String wikiImagesUrl = (String)request.getAttribute("wikiImagesUrl");
%>
<table style="width: 100%" border="0">
@@ -34,7 +38,7 @@
<table style="width: 100%" border="0">
<tr style="vertical-align: bottom;">
<td style="vertical-align: bottom; align-bottom: 0px;">
-<div><a href="<%=friendlyLink%>"><img style="vertical-align: middle" alt="PERM LINK" src="/file-access/default/members/jbosswiki/images/permaLinkButton.png" border="0"/></a> <a href="<%=friendlyLink%>"><%=friendlyLink%></a></div>
+<div><a href="<%=friendlyLink%>"><img style="vertical-align: middle" alt="PERM LINK" src="<%=wikiImagesUrl%>permaLinkButton.png" border="0"/></a> <a href="<%=friendlyLink%>"><%=friendlyLink%></a></div>
</td>
<td style="text-align: right;vertical-align: bottom; align-bottom: 0px;">
@@ -45,8 +49,8 @@
if ((type == null)||(type.equals("HTML"))) {
if (logedIn.equals("true")) {
- out.print("<a href=\""+actionURL+"&action=Edit&page="+wikiPage+"\"><img alt=\"EDIT\" src=\"/file-access/default/members/jbosswiki/images/editButton.png\" border=\"0\" /></a>\n"+
- "<a href=\""+actionURL+"&action=Attach&page="+wikiPage+"\"><img alt=\"ATTACH\" src=\"/file-access/default/members/jbosswiki/images/attachButton.png\" border=\"0\" /></a>");
+ out.print("<a href=\""+actionURL+"&action=Edit&page="+wikiPage+"\"><img alt=\"EDIT\" src=\""+wikiImagesUrl+"editButton.png\" border=\"0\" /></a>\n"+
+ "<a href=\""+actionURL+"&action=Attach&page="+wikiPage+"\"><img alt=\"ATTACH\" src=\""+wikiImagesUrl+"attachButton.png\" border=\"0\" /></a>");
}
else {
@@ -58,7 +62,7 @@
<%
if ((type == null)||(type.equals("HTML"))) {
- out.println("<a href=\""+actionURL+"&action=Info&page="+wikiPage+"\"><img alt=\"HISTORY\" src=\"/file-access/default/members/jbosswiki/images/historyButton.png\" border=\"0\" /></a><br />");
+ out.println("<a href=\""+actionURL+"&action=Info&page="+wikiPage+"\"><img alt=\"HISTORY\" src=\""+wikiImagesUrl+"historyButton.png\" border=\"0\" /></a><br />");
}
%>
<input type="text" name="searchQuery" />
Modified: trunk/forge/portal-extensions/jbosswiki/maven.xml
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/maven.xml 2005-09-12 15:19:35 UTC (rev 1082)
+++ trunk/forge/portal-extensions/jbosswiki/maven.xml 2005-09-12 16:56:18 UTC (rev 1083)
@@ -11,6 +11,9 @@
<goal name="build">
<!--<attainGoal name="wiki:build" />-->
</goal>
+
+ <goal name="prj-install">
+ </goal>
<goal name="deploy">
<!--<attainGoal name="wiki:deploy" />-->
@@ -32,10 +35,6 @@
<attainGoal name="ear" />
</goal>
- <goal name="copy-tld">
- <ant:copy todir="src/web/WEB-INF/tld" file="../../forge-common/src/web/WEB-INF/tld/forge.tld" />
- </goal>
-
<goal name="prepare-ear">
<ant:delete dir="target/ear" />
Added: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/JBossWikiLogoMedium.png
===================================================================
(Binary files differ)
Property changes on: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/JBossWikiLogoMedium.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/attachButton.png
===================================================================
(Binary files differ)
Property changes on: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/attachButton.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/editButton.png
===================================================================
(Binary files differ)
Property changes on: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/editButton.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/historyButton.png
===================================================================
(Binary files differ)
Property changes on: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/historyButton.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/permaLinkButton.png
===================================================================
(Binary files differ)
Property changes on: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/permaLinkButton.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
|
