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 HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
78414: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75784: ACE-2149: EOL AVM / WCM
       - Get 'web-client' project to compile
       - For further work, all bits that required commenting or changing were tagged with '// WCM'
         i.e. a search for 'WCM' will highlight all the code changes made
       - TODO: Visit jsp files and other config to do a proper job


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82546 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 12:08:20 +00:00
parent 5cf4251421
commit 34d911b025
35 changed files with 1176 additions and 3862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
source/java/org/alfresco/web/config/ClientConfigElement.java
View File

@@ -21,13 +21,8 @@ package org.alfresco.web.config;
import java.util.ArrayList;
import java.util.List;
import javax.faces.context.FacesContext;
import org.alfresco.config.JNDIConstants;
import org.alfresco.mbeans.VirtServerRegistry;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.ExpiringValueCache;
import org.alfresco.web.bean.repository.Repository;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.extensions.config.ConfigElement;
@@ -669,55 +664,56 @@ public class ClientConfigElement extends ConfigElementAdapter
this.initialLocation = initialLocation;
}
/**
* @return Returns the WCM Domain obtained from the Virtualisation Server registry.
*/
public String getWCMDomain()
{
String value = this.wcmDomain.get();
if (value == null)
{
VirtServerRegistry vServerRegistry = Repository.getServiceRegistry(
FacesContext.getCurrentInstance()).getVirtServerRegistry();
value = vServerRegistry.getVirtServerFQDN();
if (value == null)
{
value = JNDIConstants.DEFAULT_VSERVER_IP;
if (logger.isDebugEnabled())
{
logger.debug("Virtualisation Server not started - reverting to default IP: " + value);
}
}
this.wcmDomain.put(value);
}
return value;
}
/**
* @return Returns the WCM Port obtained from the Virtualisation Server registry.
*/
public String getWCMPort()
{
String value = this.wcmPort.get();
if (value == null)
{
VirtServerRegistry vServerRegistry = Repository.getServiceRegistry(
FacesContext.getCurrentInstance()).getVirtServerRegistry();
Integer iValue = vServerRegistry.getVirtServerHttpPort();
if (iValue == null)
{
iValue = JNDIConstants.DEFAULT_VSERVER_PORT;
if (logger.isDebugEnabled())
{
logger.debug("Virtualisation Server not started - reverting to default port: " + iValue);
}
}
value = iValue.toString();
this.wcmPort.put(value);
}
return value;
}
// // WCM
// /**
// * @return Returns the WCM Domain obtained from the Virtualisation Server registry.
// */
// public String getWCMDomain()
// {
// String value = this.wcmDomain.get();
// if (value == null)
// {
// VirtServerRegistry vServerRegistry = Repository.getServiceRegistry(
// FacesContext.getCurrentInstance()).getVirtServerRegistry();
// value = vServerRegistry.getVirtServerFQDN();
// if (value == null)
// {
// value = JNDIConstants.DEFAULT_VSERVER_IP;
// if (logger.isDebugEnabled())
// {
// logger.debug("Virtualisation Server not started - reverting to default IP: " + value);
// }
// }
// this.wcmDomain.put(value);
// }
// return value;
// }
//
// /**
// * @return Returns the WCM Port obtained from the Virtualisation Server registry.
// */
// public String getWCMPort()
// {
// String value = this.wcmPort.get();
// if (value == null)
// {
// VirtServerRegistry vServerRegistry = Repository.getServiceRegistry(
// FacesContext.getCurrentInstance()).getVirtServerRegistry();
// Integer iValue = vServerRegistry.getVirtServerHttpPort();
// if (iValue == null)
// {
// iValue = JNDIConstants.DEFAULT_VSERVER_PORT;
// if (logger.isDebugEnabled())
// {
// logger.debug("Virtualisation Server not started - reverting to default port: " + iValue);
// }
// }
// value = iValue.toString();
// this.wcmPort.put(value);
// }
// return value;
// }
//
/*package*/ void setAllowGuestConfig(boolean allow)
{
this.allowGuestConfig = allow;