mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
Alfresco JLAN integration updates.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7759 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
21
.classpath
21
.classpath
@@ -1,10 +1,11 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry kind="src" path="source/java"/>
|
<classpathentry kind="src" path="source/java"/>
|
||||||
<classpathentry kind="src" path="source/generated"/>
|
<classpathentry kind="src" path="source/generated"/>
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
||||||
<classpathentry combineaccessrules="false" kind="src" path="/Repository"/>
|
<classpathentry combineaccessrules="false" kind="src" path="/Repository"/>
|
||||||
<classpathentry combineaccessrules="false" kind="src" path="/3rd Party"/>
|
<classpathentry combineaccessrules="false" kind="src" path="/3rd Party"/>
|
||||||
<classpathentry combineaccessrules="false" kind="src" path="/Core"/>
|
<classpathentry combineaccessrules="false" kind="src" path="/Core"/>
|
||||||
<classpathentry kind="output" path="build/classes"/>
|
<classpathentry combineaccessrules="false" kind="src" path="/Alfresco JLAN"/>
|
||||||
</classpath>
|
<classpathentry kind="output" path="build/classes"/>
|
||||||
|
</classpath>
|
||||||
|
@@ -31,7 +31,7 @@ import java.net.URL;
|
|||||||
|
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
import org.alfresco.filesys.util.IPAddress;
|
import org.alfresco.jlan.util.IPAddress;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Abstract base class for the hierarchical methods COPY and MOVE
|
* Abstract base class for the hierarchical methods COPY and MOVE
|
||||||
|
@@ -35,7 +35,7 @@ import javax.servlet.http.HttpServletRequest;
|
|||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
import javax.transaction.UserTransaction;
|
import javax.transaction.UserTransaction;
|
||||||
|
|
||||||
import org.alfresco.filesys.server.config.ServerConfiguration;
|
import org.alfresco.filesys.ServerConfigurationBean;
|
||||||
import org.alfresco.repo.security.authentication.AuthenticationComponent;
|
import org.alfresco.repo.security.authentication.AuthenticationComponent;
|
||||||
import org.alfresco.repo.tenant.TenantService;
|
import org.alfresco.repo.tenant.TenantService;
|
||||||
import org.alfresco.service.ServiceRegistry;
|
import org.alfresco.service.ServiceRegistry;
|
||||||
@@ -277,13 +277,13 @@ public class WebDAVServlet extends HttpServlet
|
|||||||
|
|
||||||
// Initialize the root node
|
// Initialize the root node
|
||||||
|
|
||||||
ServerConfiguration fileSrvConfig = (ServerConfiguration) context.getBean(ServerConfiguration.SERVER_CONFIGURATION);
|
ServerConfigurationBean fileSrvConfig = (ServerConfigurationBean) context.getBean(ServerConfigurationBean.SERVER_CONFIGURATION);
|
||||||
if ( fileSrvConfig == null)
|
if ( fileSrvConfig == null)
|
||||||
throw new ServletException("File server configuration not available");
|
throw new ServletException("File server configuration not available");
|
||||||
|
|
||||||
// Use the system user as the authenticated context for the filesystem initialization
|
// Use the system user as the authenticated context for the filesystem initialization
|
||||||
|
|
||||||
AuthenticationComponent authComponent = fileSrvConfig.getAuthenticationComponent();
|
AuthenticationComponent authComponent = (AuthenticationComponent) context.getBean("authenticationComponent");
|
||||||
authComponent.setCurrentUser( authComponent.getSystemUserName());
|
authComponent.setCurrentUser( authComponent.getSystemUserName());
|
||||||
|
|
||||||
// Wrap the initialization in a transaction
|
// Wrap the initialization in a transaction
|
||||||
|
@@ -50,13 +50,13 @@ import javax.servlet.http.HttpServletResponse;
|
|||||||
import javax.servlet.http.HttpSession;
|
import javax.servlet.http.HttpSession;
|
||||||
import javax.transaction.UserTransaction;
|
import javax.transaction.UserTransaction;
|
||||||
|
|
||||||
import org.alfresco.filesys.server.auth.kerberos.KerberosDetails;
|
import org.alfresco.filesys.ServerConfigurationBean;
|
||||||
import org.alfresco.filesys.server.auth.kerberos.SessionSetupPrivilegedAction;
|
import org.alfresco.jlan.server.auth.kerberos.KerberosDetails;
|
||||||
import org.alfresco.filesys.server.auth.spnego.NegTokenInit;
|
import org.alfresco.jlan.server.auth.kerberos.SessionSetupPrivilegedAction;
|
||||||
import org.alfresco.filesys.server.auth.spnego.NegTokenTarg;
|
import org.alfresco.jlan.server.auth.spnego.NegTokenInit;
|
||||||
import org.alfresco.filesys.server.auth.spnego.OID;
|
import org.alfresco.jlan.server.auth.spnego.NegTokenTarg;
|
||||||
import org.alfresco.filesys.server.auth.spnego.SPNEGO;
|
import org.alfresco.jlan.server.auth.spnego.OID;
|
||||||
import org.alfresco.filesys.server.config.ServerConfiguration;
|
import org.alfresco.jlan.server.auth.spnego.SPNEGO;
|
||||||
import org.alfresco.model.ContentModel;
|
import org.alfresco.model.ContentModel;
|
||||||
import org.alfresco.repo.security.authentication.AuthenticationComponent;
|
import org.alfresco.repo.security.authentication.AuthenticationComponent;
|
||||||
import org.alfresco.repo.security.authentication.AuthenticationException;
|
import org.alfresco.repo.security.authentication.AuthenticationException;
|
||||||
@@ -107,7 +107,7 @@ public class KerberosAuthenticationFilter implements Filter, CallbackHandler
|
|||||||
|
|
||||||
// File server configuration
|
// File server configuration
|
||||||
|
|
||||||
private ServerConfiguration m_srvConfig;
|
private ServerConfigurationBean m_srvConfig;
|
||||||
|
|
||||||
// Various services required by the Kerberos authenticator
|
// Various services required by the Kerberos authenticator
|
||||||
|
|
||||||
@@ -177,7 +177,7 @@ public class KerberosAuthenticationFilter implements Filter, CallbackHandler
|
|||||||
m_authComponent = (AuthenticationComponent) ctx.getBean("AuthenticationComponent");
|
m_authComponent = (AuthenticationComponent) ctx.getBean("AuthenticationComponent");
|
||||||
m_personService = (PersonService) ctx.getBean("personService");
|
m_personService = (PersonService) ctx.getBean("personService");
|
||||||
|
|
||||||
m_srvConfig = (ServerConfiguration) ctx.getBean(ServerConfiguration.SERVER_CONFIGURATION);
|
m_srvConfig = (ServerConfigurationBean) ctx.getBean(ServerConfigurationBean.SERVER_CONFIGURATION);
|
||||||
|
|
||||||
// Check that the authentication component supports the required mode
|
// Check that the authentication component supports the required mode
|
||||||
|
|
||||||
|
@@ -44,16 +44,16 @@ import javax.servlet.http.HttpServletResponse;
|
|||||||
import javax.servlet.http.HttpSession;
|
import javax.servlet.http.HttpSession;
|
||||||
import javax.transaction.UserTransaction;
|
import javax.transaction.UserTransaction;
|
||||||
|
|
||||||
import org.alfresco.filesys.server.auth.PasswordEncryptor;
|
import org.alfresco.filesys.ServerConfigurationBean;
|
||||||
import org.alfresco.filesys.server.auth.ntlm.NTLM;
|
import org.alfresco.jlan.server.auth.PasswordEncryptor;
|
||||||
import org.alfresco.filesys.server.auth.ntlm.NTLMLogonDetails;
|
import org.alfresco.jlan.server.auth.ntlm.NTLM;
|
||||||
import org.alfresco.filesys.server.auth.ntlm.NTLMMessage;
|
import org.alfresco.jlan.server.auth.ntlm.NTLMLogonDetails;
|
||||||
import org.alfresco.filesys.server.auth.ntlm.TargetInfo;
|
import org.alfresco.jlan.server.auth.ntlm.NTLMMessage;
|
||||||
import org.alfresco.filesys.server.auth.ntlm.Type1NTLMMessage;
|
import org.alfresco.jlan.server.auth.ntlm.TargetInfo;
|
||||||
import org.alfresco.filesys.server.auth.ntlm.Type2NTLMMessage;
|
import org.alfresco.jlan.server.auth.ntlm.Type1NTLMMessage;
|
||||||
import org.alfresco.filesys.server.auth.ntlm.Type3NTLMMessage;
|
import org.alfresco.jlan.server.auth.ntlm.Type2NTLMMessage;
|
||||||
import org.alfresco.filesys.server.config.ServerConfiguration;
|
import org.alfresco.jlan.server.auth.ntlm.Type3NTLMMessage;
|
||||||
import org.alfresco.filesys.util.DataPacker;
|
import org.alfresco.jlan.util.DataPacker;
|
||||||
import org.alfresco.model.ContentModel;
|
import org.alfresco.model.ContentModel;
|
||||||
import org.alfresco.repo.security.authentication.AuthenticationComponent;
|
import org.alfresco.repo.security.authentication.AuthenticationComponent;
|
||||||
import org.alfresco.repo.security.authentication.AuthenticationException;
|
import org.alfresco.repo.security.authentication.AuthenticationException;
|
||||||
@@ -109,7 +109,7 @@ public class NTLMAuthenticationFilter implements Filter
|
|||||||
|
|
||||||
// File server configuration
|
// File server configuration
|
||||||
|
|
||||||
private ServerConfiguration m_srvConfig;
|
private ServerConfigurationBean m_srvConfig;
|
||||||
|
|
||||||
// Various services required by NTLM authenticator
|
// Various services required by NTLM authenticator
|
||||||
|
|
||||||
@@ -163,7 +163,7 @@ public class NTLMAuthenticationFilter implements Filter
|
|||||||
m_authComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");
|
m_authComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");
|
||||||
m_personService = (PersonService) ctx.getBean("personService");
|
m_personService = (PersonService) ctx.getBean("personService");
|
||||||
|
|
||||||
m_srvConfig = (ServerConfiguration) ctx.getBean(ServerConfiguration.SERVER_CONFIGURATION);
|
m_srvConfig = (ServerConfigurationBean) ctx.getBean(ServerConfigurationBean.SERVER_CONFIGURATION);
|
||||||
|
|
||||||
// Check that the authentication component supports the required mode
|
// Check that the authentication component supports the required mode
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user