Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r977 - in qa/forge/portal-extensions: . forge-jspwiki forge-prj-docs/src/java/org/jboss/forge/projects/docs forge-prj-freezone/src/java/org/jboss/forge/projects/freezone forge-theme/jbossForgeLayout.war forge-wiki forge-wiki/src/etc/org/jboss/wiki forge-wiki/src/java/org/jboss/wiki forge-wiki/src/java/org/jboss/wiki/fileaccess forge-wiki/src/java/org/jboss/wiki/plugins forge-wiki/src/web/WEB-INF/jsp jspwiki
Author: dam...@jb... Date: 2005-08-26 13:03:45 -0400 (Fri, 26 Aug 2005) New Revision: 977 Added: qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties Removed: qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties.sample qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/SecureLinksPlugin.java Modified: qa/forge/portal-extensions/forge-jspwiki/maven.xml qa/forge/portal-extensions/forge-prj-docs/src/java/org/jboss/forge/projects/docs/Docs.java qa/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/common.css qa/forge/portal-extensions/forge-wiki/project.xml qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java qa/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp qa/forge/portal-extensions/jspwiki/maven.xml qa/forge/portal-extensions/maven.xml Log: MERGED: -r 964:976 https://svn.labs.jboss.com/trunk/forge/portal-extensions into qa portal-extensions. Beginning QA tests and waiting on Rali. Modified: qa/forge/portal-extensions/forge-jspwiki/maven.xml =================================================================== --- qa/forge/portal-extensions/forge-jspwiki/maven.xml 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/forge-jspwiki/maven.xml 2005-08-26 17:03:45 UTC (rev 977) @@ -9,15 +9,15 @@ </goal> <goal name="build"> - <attainGoal name="copy-tld" /> - <attainGoal name="war" /> + <!--<attainGoal name="copy-tld" /> + <attainGoal name="war" />--> </goal> <goal name="deploy"> - <ant:copy todir="${local.deploy.dir}" flatten="true"> + <!--<ant:copy todir="${local.deploy.dir}" flatten="true"> <ant:fileset dir="."> <ant:filename name="target/*.war" /> </ant:fileset> - </ant:copy> + </ant:copy>--> </goal> </project> Modified: qa/forge/portal-extensions/forge-prj-docs/src/java/org/jboss/forge/projects/docs/Docs.java =================================================================== --- qa/forge/portal-extensions/forge-prj-docs/src/java/org/jboss/forge/projects/docs/Docs.java 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/forge-prj-docs/src/java/org/jboss/forge/projects/docs/Docs.java 2005-08-26 17:03:45 UTC (rev 977) @@ -43,7 +43,7 @@ /** * In the given content, finds a first string of the form: - * ${refName:some-text}, and returns the text inside the reference. + * <link ... href=, and returns the text inside the reference. * * @param content * String in which to look for the reference. @@ -78,6 +78,20 @@ else return null; } + + /** + * Figures out if a link is an off-site link. This recognizes the most + * common protocols by checking how it starts. (clears all white space in + * case the link starts with '\n' or [space] + * + * @author Janne Jalkanen + */ + private boolean isExternalLink(String link) { + link = link.trim(); + return link.startsWith("http:") || link.startsWith("ftp:") + || link.startsWith("https:") || link.startsWith("mailto:") + || link.startsWith("news:") || link.startsWith("file:"); + } public void doView(JBossRenderRequest request, JBossRenderResponse response) throws IOException { @@ -114,7 +128,8 @@ // Replacing links while ((nextRef = findNextReference(pageContent, "link")) != null) { - if (nextRef.indexOf("http://") == -1) + if(!isExternalLink(nextRef)) + //if (nextRef.indexOf("http://") == -1) //it would be relative not outside link pageContent = forgeHelper.replace(pageContent, "href=" + '"' + nextRef + '"', @@ -141,7 +156,12 @@ //fix back external links - while (pageContent.indexOf("$http:") != -1 ) + while (pageContent.indexOf("$http:") != -1 + || pageContent.indexOf("$ftp:") != -1 + || pageContent.indexOf("$https:") != -1 + || pageContent.indexOf("$file:") != -1 + || pageContent.indexOf("$mailto:") != -1 + || pageContent.indexOf("$news:") != -1) {pageContent = forgeHelper.replace(pageContent, "$", " href=" + '"');} //fix back image links Modified: qa/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java =================================================================== --- qa/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2005-08-26 17:03:45 UTC (rev 977) @@ -41,7 +41,7 @@ /** * In the given content, finds a first string of the form: - * ${refName:some-text}, and returns the text inside the reference. + * <link ... href=, and returns the text inside the reference. * * @param content * String in which to look for the reference. @@ -50,17 +50,98 @@ * @return Text contained in the reference or null if no reference is found. */ private String findNextReference(String content, String refName) { - int start = content.indexOf("${" + refName + ":"); - if (start == -1) + int h, ch; + int start; + if (refName.equals("link")) { + h = content.indexOf(" href="); //search for one of the link types + if (h == -1) + { + return null; + } + else start = h; + int begin = content.substring(start).indexOf('"'); + int end = content.substring(start + begin + 1).indexOf('"'); + begin += start; + end += begin; + return content.substring(begin + 1, end + 1); + } + else if(refName.equals("image")) + { + start=content.indexOf("<img src="); + if (start == -1) + return null; + int begin = content.substring(start).indexOf('"'); + int end=content.substring(start+begin+1).indexOf('"'); + begin+=start; end+=begin; + return content.substring(begin+1, end+1);} + else return null; - - int stop = content.substring(start).indexOf('}'); - if (stop == -1) - return null; + } + + /** + * Figures out if a link is an off-site link. This recognizes the most + * common protocols by checking how it starts. (clears all white space in + * case the link starts with '\n' or [space] + * + * @author Janne Jalkanen + */ + private boolean isExternalLink(String link) { + link = link.trim(); + return link.startsWith("http:") || link.startsWith("ftp:") + || link.startsWith("https:") || link.startsWith("mailto:") + || link.startsWith("news:") || link.startsWith("file:"); + } + +// modifies path to page/resource so folder structure can be supported + private String modifyPath(String path, String element) { + System.out.println("element is: "+ element); + System.out.println("path is: "+ path); + int start, end; + String mainPath = ""; - stop += start; + int pre = path.lastIndexOf('/'); + if(pre== -1)//we are in root dir + { + return element; + } + else { + mainPath = path.substring(0, pre); + System.out.println("main path is: " + mainPath); + }//main path to page + + + if (element.startsWith("/")) + return element.substring(1); //base path, start with WEB-root - return content.substring(start + 2 + refName.length() + 1, stop); + if (element.startsWith("./")) + element = element.substring(1);//ignore ./ only clutters the code + if (element.indexOf('/') != -1) { + if (element.indexOf("../") != -1)//need to go up a few levels + { + while (element.indexOf("../") != -1) //do we need to go more + { + if (mainPath.equals("")) + return DEFAULT_PAGE; //trying to go too far up + else { + start = element.lastIndexOf("../");//go one level up + end = mainPath.lastIndexOf("/");//find last level + element = element.substring(0, start) + //+ mainPath + // .substring(end, mainPath.length()) + + element + .substring(start + 3, element.length()); + // System.out.println("element is: " + element); + mainPath = mainPath.substring(0, end); + // System.out.println("mainPath is: " + mainPath); + }//else + + }//while + + }//if ../ + + } + + return mainPath + '/' + element; } public void doView(JBossRenderRequest request, JBossRenderResponse response) @@ -95,24 +176,62 @@ throw new Exception(); String nextRef; + String nextRef2; + while(pageContent.indexOf("HREF=")!= -1) + { + pageContent = forgeHelper.replace(pageContent,"HREF=", "href="); + } - // Replacing links - while ((nextRef = findNextReference(pageContent, "link")) != null) - pageContent = forgeHelper.replace(pageContent, "${link:" - + nextRef + "}", projectsHelper.createFreezonePageLink( - portalName, projectId, nextRef)); +// Replacing links + while ((nextRef = findNextReference(pageContent, "link")) != null) { + if(!isExternalLink(nextRef)) + { + //it would be relative not outside link + nextRef2 = modifyPath(pagePath, nextRef); + pageContent = forgeHelper.replace(pageContent, "href=" + + '"' + nextRef + '"', + projectsHelper.createFreezonePageLink(portalName, + projectId, nextRef2) + '"'); + } + else { + pageContent = forgeHelper.replace(pageContent, "href=" + + '"' + nextRef, "$"+nextRef+'"'); + } + } // Replacing images String imagePrepend = "/file-access/" + portalName + "/" - + ProjectsHelper.MEMBERS_DIR + "/" + projectId + "/"; + + ProjectsHelper.MEMBERS_DIR + "/" + projectId + "/"+ProjectsHelper.FREEZONE_DIR+"/"; while ((nextRef = findNextReference(pageContent, "image")) != null) - pageContent = forgeHelper.replace(pageContent, "${image:" - + nextRef + "}", imagePrepend + nextRef); + pageContent = forgeHelper.replace(pageContent, "<img src="+'"' + + nextRef+'"', "*img src="+'"'+imagePrepend + nextRef+'"'); + + //fix back internal links + while (pageContent.indexOf(" /portal/index.html?ctrl:id") != -1) + pageContent = forgeHelper.replace(pageContent, + " /portal/index.html?ctrl:id", " href=" + '"' + + "/portal/index.html?ctrl:id"); + //fix back external links + + while (pageContent.indexOf("$http:") != -1 + || pageContent.indexOf("$ftp:") != -1 + || pageContent.indexOf("$https:") != -1 + || pageContent.indexOf("$file:") != -1 + || pageContent.indexOf("$mailto:") != -1 + || pageContent.indexOf("$news:") != -1) + {pageContent = forgeHelper.replace(pageContent, "$", + " href=" + '"');} + //fix back image links + while (pageContent.indexOf("*img src=") != -1 ) + {pageContent = forgeHelper.replace(pageContent, "*img src=", + "<img src=");} + response.getWriter().write(pageContent); } catch (Exception e) { response.getWriter().write( - "The page you requested cannot be accessed"); + "The page you requested cannot be accessed due to " + + e.toString()); } } } Modified: qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/common.css =================================================================== --- qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/common.css 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/common.css 2005-08-26 17:03:45 UTC (rev 977) @@ -16,8 +16,8 @@ p { line-height: 150%; } pre { font-family: Andale Mono, Courier New, Courier, monospace; } -code { font: 11px Andale Mono, Courier New, Courier, monospace; line-height: 110%; white-space: pre; padding: 5px; margin: 5px; background-color: #efefef; width: 550px; overflow: visible; } + hr { color: #6e6e6e; } Modified: qa/forge/portal-extensions/forge-wiki/project.xml =================================================================== --- qa/forge/portal-extensions/forge-wiki/project.xml 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/forge-wiki/project.xml 2005-08-26 17:03:45 UTC (rev 977) @@ -10,15 +10,30 @@ <id>wiki</id> <name>Wiki portlet</name> <currentVersion>1.0</currentVersion> - <!--<build> - <unitTestSourceDirectory>./src/test/java</unitTestSourceDirectory> - <unitTest> - <includes> - <include>**/*Test.java</include> - <include>**/Test*.java</include> - </includes> - </unitTest> - </build>--> + <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> @@ -69,22 +84,4 @@ </dependency> </dependencies> - - <build> - <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> </project> Modified: qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml 2005-08-26 17:03:45 UTC (rev 977) @@ -24,10 +24,6 @@ <name>friendlyLinks</name> <class>org.jboss.wiki.plugins.FriendlyLinkPlugin</class> </plugin> - <plugin> - <name>secureLinks</name> - <class>org.jboss.wiki.plugins.SecureLinksPlugin</class> - </plugin> </wikiType> <wikiType> <name>DIFF</name> @@ -45,6 +41,10 @@ <class>org.jboss.wiki.plugins.FindResultPlugin</class> </plugin> <plugin> + <name>trail</name> + <class>org.jboss.wiki.plugins.TrailPlugin</class> + </plugin> + <plugin> <name>wikiToHtmlTranslator</name> <class>org.jboss.wiki.plugins.HTMLTranslator</class> </plugin> Copied: qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties (from rev 976, trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties) Deleted: qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties.sample =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties.sample 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties.sample 2005-08-26 17:03:45 UTC (rev 977) @@ -1,8 +0,0 @@ -# WikiPlugin properties. Use it wise. -#specifies base URL for the portal -htmlTranslatorURL = http://forge.sicore.org:8080/ -#htmlTranslatorURL = http://localhost:8080/ -#extensions for images to be inlined, coma-separated -imagePatterns = .png , .jpeg , .gif , .bmp -#wikiHome part of url. Leave it you use default portlet conifguration -wikiHome = index.html?ctrl:id=window.default.WikiPortletWindow&ctrl:type=action Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-08-26 17:03:45 UTC (rev 977) @@ -44,7 +44,7 @@ } public void processAction(JBossActionRequest rReq, JBossActionResponse rResp) { - + // wikiContext is null - to get refernece to actual page WikiContext wikiContext = null; @@ -73,8 +73,8 @@ // write the uploaded file to a new location String fieldName = item.getFieldName(); String fileName = item.getName(); - //String contentType = item.getContentType(); - //long size = item.getSize(); + // String contentType = item.getContentType(); + // long size = item.getSize(); /* * rResp .setRenderParameter("size", * Long.toString(size)); @@ -116,17 +116,18 @@ rResp.setRenderParameter("page", rReq.getParameter("page")); } - + if (rReq.getParameter("searchQuery") != null) { - //TODO do it man ! - Set<String> pages = wikiEngine.findPages(rReq.getParameter("searchQuery")); + // TODO do it man ! + Set<String> pages = wikiEngine.findPages(rReq + .getParameter("searchQuery")); rReq.getPortletSession().setAttribute("findResult", pages); - + // show the results rResp.setRenderParameter("page", "FindResult"); } - + if (rReq.getParameter("action") != null) { rResp.setRenderParameter("action", rReq.getParameter("action")); } @@ -196,8 +197,19 @@ public void doView(JBossRenderRequest rReq, JBossRenderResponse rRes) throws PortletException, java.io.IOException { - rReq.getPortletSession().setAttribute("isSecure", new Boolean(rReq.isSecure())); + PortletURL wikiURL = rRes.createActionURL(); + + rReq.setAttribute("actionURL", wikiURL.toString()); + + // Create server host and put it into session for plugins + String hostURL = ((rReq.isSecure()) ? "https" : "http") + "://"+rReq.getServerName()+((rReq.getServerPort() == 80) ? "" : ":"+ rReq.getServerPort()); + rReq.getPortletSession().setAttribute("hostURL", hostURL); + rReq.getPortletSession().setAttribute("actionURL", wikiURL.toString()); + + rReq.getPortletSession().setAttribute("isSecure", + new Boolean(rReq.isSecure())); + WikiPage noSuchPage = new WikiPage("", new Credentials(""), "There is no such page. Click on EDIT to start it.", 0, 0, null, wikiEngine.getMediaDataSource()); @@ -218,7 +230,7 @@ && (rReq.getParameter("action").equals("Attach"))) { rReq.setAttribute("fileAttach", "true"); } - + if ((rReq.getParameter("action") != null) && (rReq.getParameter("action").equals("Edit")) && (rReq.getUser() != null)) { @@ -228,15 +240,15 @@ if (rReq.getParameter("version") != null) { // show previous version of page - + System.out.println("Getting page " + wikiPage + " at version " + rReq.getParameter("version")); pageToShow = wikiEngine.getByName(wikiPage, null, Integer .valueOf(rReq.getParameter("version"))); - + if (pageToShow.getLastVersion() != pageToShow.getVersion()) { rReq.setAttribute("showedVersion", Integer.valueOf(rReq - .getParameter("version"))); + .getParameter("version"))); } } else { pageToShow = wikiEngine.getByName(wikiPage, null); @@ -305,10 +317,10 @@ + rReq.getParameter("version")); pageToShow = wikiEngine.getByName(wikiPage, wikiContext, Integer.valueOf(rReq.getParameter("version"))); - + if (pageToShow.getLastVersion() != pageToShow.getVersion()) { rReq.setAttribute("showedVersion", Integer.valueOf(rReq - .getParameter("version"))); + .getParameter("version"))); } } else { pageToShow = wikiEngine.getByName(wikiPage, wikiContext); @@ -326,15 +338,11 @@ } } - - PortletURL wikiURL = rRes.createActionURL(); - - rReq.setAttribute("actionURL", wikiURL.toString()); rReq .setAttribute( "wikiName", - "<img src=\"/file-access/default/members/jbosswiki/images/JBossWikiLogoMedium.png\" width=\"100\" border=\"0\" />"); + "<img src=\"/file-access/default/members/jbosswiki/images/JBossWikiLogoMedium.png\" width=\"100\" border=\"0\" style=\"vertical-align: middle\"/>"); rReq.setAttribute("wikiContent", pageToShow.getContent()); @@ -346,22 +354,26 @@ rReq.setAttribute("logedIn", (rReq.getUser() != null) ? "true" : "false"); - + rReq.setAttribute("defaultPage", defaultPage); // FIXME make this more elegant (ie. plugin) // pass friendly link - Properties props = new Properties(); - props.load(WikiPlugin.class.getResourceAsStream("wikiPlugins.properties")); - String href = props.getProperty("htmlTranslatorURL")+"wiki/"+pageToShow.getName(); - - if (rReq.isSecure()) { - //change http to https - href = href.replaceFirst("http", "https"); - } - - rReq.setAttribute("friendlyLink", href); - + /*Properties props = new Properties(); + props.load(WikiPlugin.class + .getResourceAsStream("wikiPlugins.properties")); + String href = props.getProperty("htmlTranslatorURL") + "wiki/" + + pageToShow.getName(); + String[] replaces = props.getProperty("sslRedirectReplaces").split(","); + + if (rReq.isSecure() && (replaces.length % 2 == 0)) { + // chage normal url to secure + for (int i = 0; i < replaces.length; i += 2) + href = href.replaceAll(replaces[i], replaces[i + 1]); + }*/ + + rReq.setAttribute("friendlyLink", hostURL+"/wiki/"+pageToShow.getName()); + rRes.setTitle("Wiki"); if (javax.portlet.WindowState.NORMAL.equals(rReq.getWindowState()) || javax.portlet.WindowState.MAXIMIZED.equals(rReq Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2005-08-26 17:03:45 UTC (rev 977) @@ -46,7 +46,9 @@ private String attachementsPath; - private String host; + private String wikiHome; + + private String[] replaces; /* * private ForgeHelper forgeHelper; private ContentManager contentManager; @@ -74,9 +76,8 @@ .getResourceAsStream("wikiPlugins.properties")); // get the host - host = props.getProperty("htmlTranslatorURL") + "portal/" - + props.getProperty("wikiHome"); - + wikiHome = props.getProperty("wikiHome"); + } catch (IOException e) { System.err.println(e); } @@ -100,12 +101,10 @@ System.out.println("length " + tokens.length); if (tokens.length == 3) { - // show page - System.out.println("redirecting: " + host + "&page=" + String hostURL = ((request.isSecure()) ? "https" : "http") + "://"+request.getServerName()+((request.getServerPort() == 80) ? "" : ":"+ request.getServerPort()); + + httpResponse.sendRedirect(hostURL+wikiHome + "&page=" + tokens[tokens.length - 1]); - - httpResponse.sendRedirect(host + "&page=" - + tokens[tokens.length - 1]); } else { // get fileName of attachement and page which is connected to String fileName = tokens[tokens.length - 1]; @@ -124,7 +123,7 @@ System.err.println(e); } - // looking for the newst version + // looking for the newest version int version = 1; while (props.getProperty((version + 1) + ".author") != null) { Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java 2005-08-26 17:03:45 UTC (rev 977) @@ -21,8 +21,10 @@ @Override public WikiPage process(WikiPage wikiPage, WikiSession wikiSession) { + host = (String)wikiSession.getAttribute("hostURL")+"/wiki/"; + WikiPage newPage = null; - + try { newPage = (WikiPage) wikiPage.clone(); } catch (CloneNotSupportedException cl) { @@ -38,7 +40,7 @@ for (String s : attachements) { String href = host+newPage.getName() + "/" + s; - newContent += "<a href='"+href+"'>"+href + "</a><br>\n"; + newContent += "<a href=\""+href+"\">"+href + "</a><br>\n"; } newPage.setPageContent(newContent); @@ -50,7 +52,7 @@ @Override public void init() { - host = getProperty("htmlTranslatorURL")+"wiki/"; + } } Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java 2005-08-26 17:03:45 UTC (rev 977) @@ -37,6 +37,12 @@ @Override public WikiPage process(WikiPage wikiPage, WikiSession wikiSession) { + url = (String)wikiSession.getAttribute("hostURL")+"/wiki/"; + + pattern = "<a href=\""+(((String)wikiSession.getAttribute("hostURL")+(String)wikiSession.getAttribute("actionURL")).replaceAll("\\.","\\\\.").replaceAll("\\?", "\\\\?"))+"&page=\\w+\">"; + + System.out.println(pattern); + WikiPage newPage = null; try { @@ -52,11 +58,7 @@ @Override public void init() { - url = getProperty("htmlTranslatorURL")+"wiki/"; - pattern = "<a href=\""+((getProperty("htmlTranslatorURL")+"portal/"+getProperty("wikiHome")).replaceAll("\\.","\\\\.").replaceAll("\\?", "\\\\?"))+"&page=\\w+\">"; - - System.out.println(pattern); } } Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java 2005-08-26 17:03:45 UTC (rev 977) @@ -928,6 +928,11 @@ public WikiPage process(final WikiPage wikiPage, WikiSession wikiSession) { WikiPage newPage = null; + + portalHome = (String)wikiSession.getAttribute("hostURL")+(String)wikiSession.getAttribute("actionURL"); + wikiHome = ""; + imagePath = (String)wikiSession.getAttribute("hostURL") + "/wiki"; + try { newPage = (WikiPage) wikiPage.clone(); } catch (CloneNotSupportedException cnse) { @@ -950,10 +955,10 @@ @Override public void init() { - portalHome = getProperty("htmlTranslatorURL") + "portal/"; + //portalHome = getProperty("htmlTranslatorURL") + "portal/"; mediaPatterns = getProperty("imagePatterns"); - imagePath = getProperty("htmlTranslatorURL") + "wiki"; - wikiHome = getProperty("wikiHome"); + //imagePath = getProperty("htmlTranslatorURL") + "wiki"; + //wikiHome = getProperty("wikiHome"); } } \ No newline at end of file Deleted: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/SecureLinksPlugin.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/SecureLinksPlugin.java 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/SecureLinksPlugin.java 2005-08-26 17:03:45 UTC (rev 977) @@ -1,32 +0,0 @@ -package org.jboss.wiki.plugins; - -import org.jboss.wiki.WikiPage; -import org.jboss.wiki.WikiPlugin; -import org.jboss.wiki.WikiSession; - -public class SecureLinksPlugin extends WikiPlugin { - - @Override - public WikiPage process(WikiPage wikiPage, WikiSession wikiSession) { - WikiPage newPage = null; - - try { - newPage = (WikiPage) wikiPage.clone(); - } catch (CloneNotSupportedException cl) { - System.err.println(cl); - } - - if (((Boolean)wikiSession.getAttribute("isSecure")) == true) { - newPage.setPageContent(newPage.getPageContent().replaceAll( - "<a href=\"http", "<a href=\"https")); - } - return newPage; - } - - @Override - public void init() { - // TODO Auto-generated method stub - - } - -} Modified: qa/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2005-08-26 17:03:45 UTC (rev 977) @@ -18,7 +18,15 @@ org.jboss.wiki.Credentials author = (org.jboss.wiki.Credentials)request.getAttribute("author"); %> -<h2><a href="<%=actionURL%>&page=<%=defaultPage%>"><%=wikiName%></a>/ <%=wikiPage%> </h2> +<table style="width: 100%" border="0"> +<tr> +<td style="font-size: large"> +<a href="<%=actionURL%>&page=<%=defaultPage%>"><%=wikiName%></a> : <%=wikiPage%> +</td> +<td style="text-align: right;"> +[<a href="<%=actionURL%>&page=<%=defaultPage%>"><%=defaultPage%></a>] +</td> +</table> <!--<a href="<%=actionURL%>&page=<%=defaultPage%>"><%=defaultPage%></a><br />--> @@ -37,8 +45,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\"</img></a>\n"+ - "<a href=\""+actionURL+"&action=Attach\"><img alt=\"ATTACH\" src=\"/file-access/default/members/jbosswiki/images/attachButton.png\"</img></a>"); + out.print("<a href=\""+actionURL+"&action=Edit&page="+wikiPage+"\"><img alt=\"EDIT\" src=\"/file-access/default/members/jbosswiki/images/editButton.png\" /></a>\n"+ + "<a href=\""+actionURL+"&action=Attach&page="+wikiPage+"\"><img alt=\"ATTACH\" src=\"/file-access/default/members/jbosswiki/images/attachButton.png\" /></a>"); } else { @@ -50,7 +58,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\"</img></a><br />"); + out.println("<a href=\""+actionURL+"&action=Info&page="+wikiPage+"\"><img alt=\"HISTORY\" src=\"/file-access/default/members/jbosswiki/images/historyButton.png\" /></a><br />"); } %> <input type="text" name="searchQuery" /> Modified: qa/forge/portal-extensions/jspwiki/maven.xml =================================================================== --- qa/forge/portal-extensions/jspwiki/maven.xml 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/jspwiki/maven.xml 2005-08-26 17:03:45 UTC (rev 977) @@ -5,20 +5,20 @@ --> <project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util"> <goal name="build"> - <ant:ant dir="${basedir}" antfile="build.xml" target="war" /> + <!--<ant:ant dir="${basedir}" antfile="build.xml" target="war" />--> </goal> <goal name="deploy"> - <ant:copy todir="${local.deploy.dir}" flatten="true"> + <!--<ant:copy todir="${local.deploy.dir}" flatten="true"> <ant:fileset dir="."> <ant:filename name="releases/*.war" /> </ant:fileset> - </ant:copy> + </ant:copy>--> </goal> <goal name="prj-install"> - <ant:copy todir="${local.deploy.dir}/../.." overwrite="no"> + <!--<ant:copy todir="${local.deploy.dir}/../.." overwrite="no"> <ant:fileset dir="to-copy" /> - </ant:copy> + </ant:copy>--> </goal> </project> Modified: qa/forge/portal-extensions/maven.xml =================================================================== --- qa/forge/portal-extensions/maven.xml 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/maven.xml 2005-08-26 17:03:45 UTC (rev 977) @@ -116,7 +116,6 @@ 3. blojsom/to-copy/blojsom.war/WEB-INF/blojsom.properties 4. forge-login/to-copy/portal-login-ds.xml 5. federation-register/src/web/WEB-INF/faces-config (only for the JOSF portal). -6. forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties.sample (change htmlTranslatorURL to your url) Available goals: - help - prints this info |
