inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.2 to HEAD

Browse Source 
8105: Fix for AR-1828 - multiple users being created from web siteregistration
   8107: Merged V2.1 to v2.2
      8106: Fixed fallout from MetadataExtractors setting properties to thecorrect data type
   8109: Fix for AR-2016
   8119: AR-1778: putContent method in the ContentUtils class fail to upload*.java, *.txt, *.xml
   8120: AR-1895: fix to web service SDK sample
   8125: Test added to prevent regression of AR-1707
   8126: Enhanced exception message when non-marking InputStream is used.
   8131: Merged V2.1 to V2.2
      8129: Merged V1.4 to V2.1:
         8128: Fix AR-2041: NPE checking voids during index tracking
   8140: AR-1762 - correct generation of download servlet URL


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8477 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-03-10 13:35:04 +00:00
parent 115a51965a
commit 2b7b96eb45
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/repo/webdav/auth/WebDAVUser.java
View File

@@ -25,6 +25,8 @@
package org.alfresco.repo.webdav.auth; package org.alfresco.repo.webdav.auth;
import java.io.Serializable;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
/** /**
@@ -34,8 +36,10 @@ import org.alfresco.service.cmr.repository.NodeRef;
* *
* @author GKSpencer * @author GKSpencer
*/ */
public class WebDAVUser public class WebDAVUser implements Serializable
{ {
private static final long serialVersionUID = -6948146071131901345L;
// User name // User name
private String m_userName; private String m_userName;

5
source/java/org/alfresco/repo/webservice/content/ContentWebService.java
View File

@@ -34,7 +34,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.transaction.UserTransaction;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
@@ -122,10 +121,10 @@ public class ContentWebService extends AbstractWebService implements
// Work out what the server, port and context path are // Work out what the server, port and context path are
HttpServletRequest req = (HttpServletRequest)MessageContext.getCurrentContext().getProperty(HTTPConstants.MC_HTTP_SERVLETREQUEST); HttpServletRequest req = (HttpServletRequest)MessageContext.getCurrentContext().getProperty(HTTPConstants.MC_HTTP_SERVLETREQUEST);
String address = req.getLocalName(); String address = req.getServerName();
if (req.getLocalPort() != 80) if (req.getLocalPort() != 80)
{ {
address = address + ":" + req.getLocalPort(); address = address + ":" + req.getServerPort();
} }
// Get the file name // Get the file name