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 V3.1 to HEAD

Browse Source 
12999: Fixed read-only bootstrap of SiteAVMBootstrap and removed incorrect use of 'assert'
   13000: Added log4j to Eclipse classpath (unexported)
   13001: Merged V2.1-A to V3.1
      9127: Performance improvement to folder copy
      9151: *RECORD-ONLY* Fix index back up failing with missing files
   13002: Merged V2.1-A to V3.1
      9174: Further fixes for ACT-2588 (Lucene backup read-write locks)
      9279: Fix ADB-84. PHP module is not restricted by the upper version
      10191: Fix for ADB-77: Need to have as the sender's email address the email address of the user triggering the rule
   13006: Merged V2.1-A to V3.1
      10893: Fixes for ADB-78 & ADB-98
             - Fixed service getter/setter pattern as well
      10903: Fix for ADB-115 ACT-4355
   13010: Made AVMLockingBootstrap resilient to read-only mode
   13011: Better message for InvalidStoreRefException
   13013: Merged V2.1-A to V3.1
      9189: Composite Conditions Support Part 1 of 2 (repo)
      9190: Composite Conditions Support Part 1a of 2 ( missed file from repo)
   13015: Port of Adobe CIFS/FTP configuration changes
   13017: Convert avoids folders given by '--svn-status' option
   13018: Merge V2.1A to V3.1
      7746: (record-only) Added ability to specify a custom CIFS authenticator class
      8533: (record-only) Added the <disableNativeCode/> configuration tag, disable use of JNI code on Windows
      8700: (record-only) Update to prevent any native calls via configuration code
      8705: (record-only) Filer out the '0.0.0.0' bind address
      8864: (record-only) Added the getBean() method for custom authenticators to get access to beans
      9054: (record-only) Added the 'AIX' platform type for use in the platforms="..." attribute
      8863: (record-only) Fix passthru socket connection timeout, added 'protocolOrder' and 'offlineCheckInterval' config values
      12144: (record-only) CIFS virtual circuit fixes
   13020: Merged V2.1-A to V3.1 (Composite Actions)
      9191: Composite Conditions Support Part 2 of 2 (client)
      9243: Composite Conditions Support Part 1 of 2 (client)
      9245: Composite Conditions Support Part 2 of 2 (repo)
   13021: Merged V3.0 to V3.1
      13008: Merged V2.2 to V3.0
         12824: (record only) Change admin access to the web project staging store to be read-only in the virtualization view - ETWOTWO-933
   13024: Ported CIFS configuration changes from Adobe V2.1A, missed checkin.
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V2.1-A:r9127,9151,9174,9189-9191,9243,9245,9279,10191,10893,10903
      Merged /alfresco/BRANCHES/V3.1:r12999-13002,13006,13010-13011,13013,13015,13017-13018,13020-13021,13024


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13550 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-03-11 03:22:35 +00:00
parent 6eb1963971
commit f1307fba20
37 changed files with 3498 additions and 2292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
source/java/org/alfresco/filesys/ServerConfigurationBean.java
View File

@@ -97,6 +97,7 @@ import org.alfresco.repo.tenant.TenantService;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.search.SearchService;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.AuthorityService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.transaction.TransactionService;
@@ -231,12 +232,17 @@ public class ServerConfigurationBean extends ServerConfiguration implements Appl
private TenantService m_tenantService;
private SearchService m_searchService;
private NamespaceService m_namespaceService;
private AuthorityService m_authorityService;
// Local server name and domain/workgroup name
private String m_localName;
private String m_localDomain;
// Disable use of native code on Windows, do not use any JNI calls
private boolean m_disableNativeCode = false;
/**
* Default constructor
*/
@@ -374,6 +380,16 @@ public class ServerConfigurationBean extends ServerConfiguration implements Appl
m_namespaceService = namespaceService;
}
/**
* Set the authority service
*
* @param authService AuthorityService
*/
public void setAuthorityService(AuthorityService authService)
{
m_authorityService = authService;
}
/**
* Check if the configuration has been initialized
*
@@ -473,6 +489,10 @@ public class ServerConfigurationBean extends ServerConfiguration implements Appl
{
throw new AlfrescoRuntimeException("Property 'configService' not set");
}
else if (m_authorityService == null)
{
throw new AlfrescoRuntimeException("Property 'authorityService' not set");
}
// Create the configuration context
@@ -675,6 +695,21 @@ public class ServerConfigurationBean extends ServerConfiguration implements Appl
try
{
// Check if native code calls should be disabled on Windows
elem = config.getConfigElement( "disableNativeCode");
if ( elem != null)
{
// Disable native code calls so that the JNI DLL is not required
cifsConfig.setNativeCodeDisabled( true);
m_disableNativeCode = true;
// Warning
logger.warn("CIFS server native calls disabled, JNI code will not be used");
}
// Get the network broadcast address
//
// Note: We need to set this first as the call to getLocalDomainName() may use a NetBIOS
@@ -767,7 +802,7 @@ public class ServerConfigurationBean extends ServerConfiguration implements Appl
String localDomain = getLocalDomainName();
if ( localDomain == null && getPlatformType() != Platform.Type.WINDOWS)
if ( localDomain == null && ( getPlatformType() != Platform.Type.WINDOWS || isNativeCodeDisabled()))
{
// Use a default domain/workgroup name
@@ -874,6 +909,13 @@ public class ServerConfigurationBean extends ServerConfiguration implements Appl
authClass = "org.alfresco.filesys.auth.cifs.EnterpriseCifsAuthenticator";
}
else if ( authType.equalsIgnoreCase( "custom"))
{
// Get the authenticator class
ConfigElement authClassElem = authElem.getChild("class");
authClass = authClassElem.getValue();
}
else
throw new AlfrescoRuntimeException("Invalid authenticator type, " + authType);
@@ -1348,7 +1390,8 @@ public class ServerConfigurationBean extends ServerConfiguration implements Appl
String osName = System.getProperty("os.name");
if (osName.startsWith("Windows")
&& (osName.endsWith("95") == false && osName.endsWith("98") == false && osName.endsWith("ME") == false))
&& (osName.endsWith("95") == false && osName.endsWith("98") == false && osName.endsWith("ME") == false)
&& isNativeCodeDisabled() == false)
{
// Call the Win32NetBIOS native code to make sure it is initialized
@@ -1478,7 +1521,7 @@ public class ServerConfigurationBean extends ServerConfiguration implements Appl
// Check if WINS is configured, if we are running on Windows and socket based NetBIOS is enabled
else if (cifsConfig.hasNetBIOSSMB() && getPlatformType() == Platform.Type.WINDOWS)
else if (cifsConfig.hasNetBIOSSMB() && getPlatformType() == Platform.Type.WINDOWS && isNativeCodeDisabled())
{
// Get the WINS server list
@@ -1834,8 +1877,15 @@ public class ServerConfigurationBean extends ServerConfiguration implements Appl
{
// Standard authenticator requires MD4 or passthru based authentication
if ( ntlmMode == NTLMMode.NONE)
throw new AlfrescoRuntimeException("Wrong authentication setup for alfresco authenticator");
// if ( ntlmMode == NTLMMode.NONE)
// throw new AlfrescoRuntimeException("Wrong authentication setup for alfresco authenticator");
}
else if ( authType.equalsIgnoreCase( "custom"))
{
// Get the authenticator class
ConfigElement authClassElem = authElem.getChild("class");
authClass = authClassElem.getValue();
}
else
throw new AlfrescoRuntimeException("Invalid authenticator type, " + authType);
@@ -2056,9 +2106,19 @@ public class ServerConfigurationBean extends ServerConfiguration implements Appl
{
try
{
// Default RPC authenticator class
String authClass = "org.alfresco.filesys.auth.nfs.AlfrescoRpcAuthenticator";
// Check if a custom NFS authentictor class has been specified
ConfigElement authClassElem = elem.getChild("class");
if ( authClassElem != null)
authClass = authClassElem.getValue();
// Create the RPC authenticator
nfsConfig.setRpcAuthenticator( "org.alfresco.filesys.auth.nfs.AlfrescoRpcAuthenticator", elem);
nfsConfig.setRpcAuthenticator( authClass, elem);
}
catch ( InvalidConfigurationException ex)
{
@@ -2934,7 +2994,7 @@ public class ServerConfigurationBean extends ServerConfiguration implements Appl
String srvName = null;
if (getPlatformType() == Platform.Type.WINDOWS)
if (getPlatformType() == Platform.Type.WINDOWS && isNativeCodeDisabled() == false)
{
// Get the local name via JNI
@@ -2987,7 +3047,7 @@ public class ServerConfigurationBean extends ServerConfiguration implements Appl
String domainName = null;
if (getPlatformType() == Platform.Type.WINDOWS)
if (getPlatformType() == Platform.Type.WINDOWS && isNativeCodeDisabled())
{
// Get the local domain/workgroup name via JNI
@@ -3193,4 +3253,45 @@ public class ServerConfigurationBean extends ServerConfiguration implements Appl
{
return m_namespaceService;
}
/**
* Check if native code calls are disabled
*
* @return boolean
*/
public final boolean isNativeCodeDisabled()
{
return m_disableNativeCode;
}
/**
* Return the named bean
*
* @param beanName String
* @return Object
*/
public final Object getBean( String beanName)
{
return applicationContext.getBean( beanName);
}
/**
* Return the applicatin context
*
* @return ApplicationContext
*/
public final ApplicationContext getApplicationsContext()
{
return applicationContext;
}
/**
* Return the authority service
*
* @return AuthorityService
*/
public final AuthorityService getAuthorityService()
{
return m_authorityService;
}
}