- Submit All action added for submitting an entire user sandbox (tasty!)
 - Submit action added for deleted files/folders
 - Submit action now working correctly for modified files/folders
 - Status message output on successful/fail submit
 - WCM Domain and Port added to web-client-config.xml
   - For the virtualisation server URL generation

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3898 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2006-09-22 19:57:37 +00:00
parent a17d39ed22
commit abe2da765f
9 changed files with 183 additions and 21 deletions

View File

@@ -41,6 +41,8 @@ public class ClientConfigElement extends ConfigElementAdapter
private String homeSpacePermission = null;
private boolean ajaxEnabled = false;
private String initialLocation = "myalfresco";
private String wcmDomain = null;
private String wcmPort = null;
/**
* Default Constructor
@@ -157,6 +159,24 @@ public class ClientConfigElement extends ConfigElementAdapter
combinedElement.setInitialLocation(newElement.getInitialLocation());
}
if (newElement.getWCMDomain() == null)
{
combinedElement.setWCMDomain(this.wcmDomain);
}
else
{
combinedElement.setWCMDomain(newElement.wcmDomain);
}
if (newElement.getWCMPort() == null)
{
combinedElement.setWCMPort(this.wcmPort);
}
else
{
combinedElement.setWCMPort(newElement.wcmPort);
}
return combinedElement;
}
@@ -376,4 +396,36 @@ public class ClientConfigElement extends ConfigElementAdapter
{
this.initialLocation = initialLocation;
}
/**
* @return Returns the WCM Domain.
*/
public String getWCMDomain()
{
return this.wcmDomain;
}
/**
* @param wcmDomain The WCM Domain to set.
*/
/*package*/ void setWCMDomain(String wcmDomain)
{
this.wcmDomain = wcmDomain;
}
/**
* @return Returns the WCM Port.
*/
public String getWCMPort()
{
return this.wcmPort;
}
/**
* @param wcmPort The WCM Port to set.
*/
/*package*/ void setWCMPort(String wcmPort)
{
this.wcmPort = wcmPort;
}
}