Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Raluca Munteanu
2016-04-26 13:03:25 +00:00
parent d6f9f50c39
commit dead3c3825
265 changed files with 44099 additions and 44099 deletions

View File

@@ -1,88 +1,88 @@
package org.alfresco.web.bean;
import javax.faces.context.FacesContext;
import org.alfresco.service.descriptor.DescriptorService;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.dialog.BaseDialogBean;
import org.alfresco.web.bean.repository.Repository;
/**
* Simple backing bean used by the about page to display the version.
*
* @author gavinc
*/
public class AboutBean extends BaseDialogBean
{
private static final long serialVersionUID = -3777479360531145878L;
private final static String MSG_VERSION = "version";
private final static String MSG_CLOSE = "close";
transient private DescriptorService descriptorService;
/**
* Retrieves the version of the repository.
*
* @return The version string
*/
public String getVersion()
{
return this.getDescriptorService().getServerDescriptor().getVersion();
}
/**
* Retrieves the edition of the repository.
*
* @return The edition
*/
public String getEdition()
{
return this.getDescriptorService().getServerDescriptor().getEdition();
}
/**
* Sets the DescriptorService.
*
* @param descriptorService The DescriptorService
*/
public void setDescriptorService(DescriptorService descriptorService)
{
this.descriptorService = descriptorService;
}
@Override
protected String finishImpl(FacesContext context, String outcome) throws Exception
{
return null;
}
@Override
public String getContainerDescription()
{
return Application.getMessage(FacesContext.getCurrentInstance(), MSG_VERSION) + " :" + getEdition() + " - v" + getVersion();
}
DescriptorService getDescriptorService()
{
//check for null in cluster environment
if (descriptorService == null)
{
descriptorService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getDescriptorService();
}
return descriptorService;
}
@Override
public String getCancelButtonLabel()
{
return Application.getMessage(FacesContext.getCurrentInstance(), MSG_CLOSE);
}
@Override
protected String getDefaultCancelOutcome()
{
return "dialog:close:browse";
}
}
package org.alfresco.web.bean;
import javax.faces.context.FacesContext;
import org.alfresco.service.descriptor.DescriptorService;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.dialog.BaseDialogBean;
import org.alfresco.web.bean.repository.Repository;
/**
* Simple backing bean used by the about page to display the version.
*
* @author gavinc
*/
public class AboutBean extends BaseDialogBean
{
private static final long serialVersionUID = -3777479360531145878L;
private final static String MSG_VERSION = "version";
private final static String MSG_CLOSE = "close";
transient private DescriptorService descriptorService;
/**
* Retrieves the version of the repository.
*
* @return The version string
*/
public String getVersion()
{
return this.getDescriptorService().getServerDescriptor().getVersion();
}
/**
* Retrieves the edition of the repository.
*
* @return The edition
*/
public String getEdition()
{
return this.getDescriptorService().getServerDescriptor().getEdition();
}
/**
* Sets the DescriptorService.
*
* @param descriptorService The DescriptorService
*/
public void setDescriptorService(DescriptorService descriptorService)
{
this.descriptorService = descriptorService;
}
@Override
protected String finishImpl(FacesContext context, String outcome) throws Exception
{
return null;
}
@Override
public String getContainerDescription()
{
return Application.getMessage(FacesContext.getCurrentInstance(), MSG_VERSION) + " :" + getEdition() + " - v" + getVersion();
}
DescriptorService getDescriptorService()
{
//check for null in cluster environment
if (descriptorService == null)
{
descriptorService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getDescriptorService();
}
return descriptorService;
}
@Override
public String getCancelButtonLabel()
{
return Application.getMessage(FacesContext.getCurrentInstance(), MSG_CLOSE);
}
@Override
protected String getDefaultCancelOutcome()
{
return "dialog:close:browse";
}
}