inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Build number and alfresco version number information now added to webscriptframework project during continuous build process.

Browse Source 
Build number and alfresco server version now visible on the various webscript system pages again.
Note that the build number will only be visible in the web-tier webscript system pages if it was built via the continuous build process - otherwise it will display 'unknown'.
XHTML cleanup of webscript system pages.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2008-08-05 15:03:39 +00:00
parent 3ad973621f
commit 73d195b65e
1 changed files with 59 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
source/java/org/alfresco/repo/descriptor/DescriptorServiceImpl.java
View File

@@ -508,62 +508,73 @@ public class DescriptorServiceImpl extends AbstractLifecycleBean implements Desc
*/
public abstract class BaseDescriptor implements Descriptor
{
private VersionNumber versionNumber = null;
private String strVersion = null;
public VersionNumber getVersionNumber()
{
StringBuilder version = new StringBuilder();
version.append(getVersionMajor());
version.append(".");
version.append(getVersionMinor());
version.append(".");
version.append(getVersionRevision());
return new VersionNumber(version.toString());
if (this.versionNumber == null)
{
StringBuilder version = new StringBuilder();
version.append(getVersionMajor());
version.append(".");
version.append(getVersionMinor());
version.append(".");
version.append(getVersionRevision());
this.versionNumber = new VersionNumber(version.toString());
}
return this.versionNumber;
}
public String getVersion()
{
StringBuilder version = new StringBuilder(getVersionMajor());
version.append(".");
version.append(getVersionMinor());
version.append(".");
version.append(getVersionRevision());
String label = getVersionLabel();
String build = getVersionBuild();
boolean hasLabel = (label != null && label.length() > 0);
boolean hasBuild = (build != null && build.length() > 0);
// add opening bracket if either a label or build number is present
if (hasLabel || hasBuild)
if (this.strVersion == null)
{
version.append(" (");
StringBuilder version = new StringBuilder(getVersionMajor());
version.append(".");
version.append(getVersionMinor());
version.append(".");
version.append(getVersionRevision());
String label = getVersionLabel();
String build = getVersionBuild();
boolean hasLabel = (label != null && label.length() > 0);
boolean hasBuild = (build != null && build.length() > 0);
// add opening bracket if either a label or build number is present
if (hasLabel || hasBuild)
{
version.append(" (");
}
// add label if present
if (hasLabel)
{
version.append(label);
}
// add build number is present
if (hasBuild)
{
// if there is also a label we need a separating space
if (hasLabel)
{
version.append(" ");
}
version.append(build);
}
// add closing bracket if either a label or build number is present
if (hasLabel || hasBuild)
{
version.append(")");
}
this.strVersion = version.toString();
}
// add label if present
if (hasLabel)
{
version.append(label);
}
// add build number is present
if (hasBuild)
{
// if there is also a label we need a separating space
if (hasLabel)
{
version.append(" ");
}
version.append(build);
}
// add closing bracket if either a label or build number is present
if (hasLabel || hasBuild)
{
version.append(")");
}
return version.toString();
return this.strVersion;
}
/**