Author: woonsan
Date: Fri Mar 26 18:16:37 2010
New Revision: 927997
URL: http://svn.apache.org/viewvc?rev=927997&view=rev
Log:
JS2-1164: Removing folder node name prefix in zip entry names.
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManagerUtil.java
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManagerUtil.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManagerUtil.java?rev=927997&r1=927996&r2=927997&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManagerUtil.java
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManagerUtil.java
Fri Mar 26 18:16:37 2010
@@ -24,6 +24,7 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.jetspeed.exception.JetspeedException;
import org.apache.jetspeed.om.folder.Folder;
import org.apache.jetspeed.om.page.DynamicPage;
@@ -47,13 +48,30 @@ public class PortalSiteManagerUtil
private static String pathSeprator = System.getProperty("file.separator");
private static String pageRoot = System.getProperty("java.io.tmpdir");
- public static String getDownloadLink(String ObjectName, String userName,
String objectType) throws Exception
+ public static String getDownloadLink(String objectName, String userName,
String objectType) throws Exception
{
+ if ("/".equals(objectName))
+ {
+ objectName = "";
+ }
+
String link = "";
+
String basePath = System.getProperty("java.io.tmpdir");
+
if (objectType.equalsIgnoreCase("folder"))
{
- String sourcePath = getUserFolder(userName, false);
+ String sourcePath = null;
+
+ if (!StringUtils.isEmpty(objectName))
+ {
+ sourcePath = getUserFolder(userName, false) + pathSeprator +
objectName;
+ }
+ else
+ {
+ sourcePath = getUserFolder(userName, false);
+ }
+
String target = sourcePath + ".zip";
boolean success = zipObject(sourcePath, target);
if (!success)
@@ -62,7 +80,7 @@ public class PortalSiteManagerUtil
}
else
{
- link = basePath + "/" + userName + "/" + ObjectName;
+ link = basePath + "/" + userName + "/" + objectName;
}
return link;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
