Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r984 - in qa/forge/portal-extensions: forge-file-access/src/java/org/jboss/forge/fileaccess forge-prj-freezone/src/java/org/jboss/forge/projects/freezone portal-binaries/to-copy/jboss-portal.sar/conf/cache
Author: dam...@jb... Date: 2005-08-26 16:38:24 -0400 (Fri, 26 Aug 2005) New Revision: 984 Modified: qa/forge/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/FileAccessFilter.java qa/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java qa/forge/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/cache/replicated.xml Log: MERGED: -r 976:982 https://svn.labs.jboss.com/trunk/forge/portal-extensions into qa portal-extensions. Modified: qa/forge/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/FileAccessFilter.java =================================================================== --- qa/forge/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/FileAccessFilter.java 2005-08-26 20:36:38 UTC (rev 983) +++ qa/forge/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/FileAccessFilter.java 2005-08-26 20:38:24 UTC (rev 984) @@ -51,6 +51,11 @@ */ private final static String DOCS_ACCESS = "/docs/"; /** + * <code>FREEZONE_ACCESS</code> - another directory from which files are + * enabled to download. + */ + private final static String FREEZONE_ACCESS = "/freezone/"; + /** * <code>BUF_SIZE</code> - size of a buffer, which is used while reading a * file and sending it to the client. */ @@ -82,7 +87,8 @@ if ((toCheck.indexOf(IMAGES_ACCESS) != -1) || (toCheck.indexOf(DOWNLOADS_ACCESS) != -1) - || (toCheck.indexOf(DOCS_ACCESS) != -1)) { + || (toCheck.indexOf(DOCS_ACCESS) != -1) + || (toCheck.indexOf(FREEZONE_ACCESS) != -1)) { // Allowing access to images, downloads and docs } else // Not images, nor downloads - wrong request. 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 20:36:38 UTC (rev 983) +++ qa/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2005-08-26 20:38:24 UTC (rev 984) @@ -94,10 +94,15 @@ // 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); + // System.out.println("element is: "+ element); + // System.out.println("path is: "+ path); int start, end; String mainPath = ""; + if (element.startsWith("#")) + { + return path+element; + + } int pre = path.lastIndexOf('/'); if(pre== -1)//we are in root dir @@ -106,10 +111,9 @@ } else { mainPath = path.substring(0, pre); - System.out.println("main path is: " + mainPath); - }//main path to page + }//main path to page - + if (element.startsWith("/")) return element.substring(1); //base path, start with WEB-root @@ -126,13 +130,10 @@ 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); + + element + .substring(start + 3, element.length()); mainPath = mainPath.substring(0, end); - // System.out.println("mainPath is: " + mainPath); + }//else }//while @@ -181,6 +182,11 @@ { pageContent = forgeHelper.replace(pageContent,"HREF=", "href="); } + + while(pageContent.indexOf("<IMG SRC=")!= -1) + { + pageContent = forgeHelper.replace(pageContent,"<IMG SRC=", "<img src="); + } // Replacing links while ((nextRef = findNextReference(pageContent, "link")) != null) { @@ -203,8 +209,10 @@ String imagePrepend = "/file-access/" + portalName + "/" + ProjectsHelper.MEMBERS_DIR + "/" + projectId + "/"+ProjectsHelper.FREEZONE_DIR+"/"; while ((nextRef = findNextReference(pageContent, "image")) != null) + { + nextRef2 = modifyPath(pagePath, nextRef); pageContent = forgeHelper.replace(pageContent, "<img src="+'"' - + nextRef+'"', "*img src="+'"'+imagePrepend + nextRef+'"'); + + nextRef+'"', "*img src="+'"'+imagePrepend + nextRef2+'"');} //fix back internal links while (pageContent.indexOf(" /portal/index.html?ctrl:id") != -1) Modified: qa/forge/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/cache/replicated.xml =================================================================== --- qa/forge/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/cache/replicated.xml 2005-08-26 20:36:38 UTC (rev 983) +++ qa/forge/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/cache/replicated.xml 2005-08-26 20:38:24 UTC (rev 984) @@ -19,8 +19,8 @@ being broken with multicast (even after disabling media sense) set the loopback attribute to true --> <UDP - mcast_addr="228.1.2.3" mcast_port="48866" - ip_ttl="64" ip_mcast="true" + mcast_addr="${jboss.partition.udpGroup:228.1.2.3}" mcast_port="48866" + ip_ttl="64" ip_mcast="true"bind_addr="${jboss.bind.address}" mcast_send_buf_size="150000" mcast_recv_buf_size="80000" ucast_send_buf_size="150000" ucast_recv_buf_size="80000" loopback="false"/> |
