From e7d0caa3c80fa110895b3999a1883b5bf0ab3bc6 Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Thu, 23 Feb 2006 16:40:53 +0000 Subject: [PATCH] Fixed AR-451: Display both current version of repo and installed version of repo git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2485 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../common/component/debug/UIRepositoryProperties.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/web/ui/common/component/debug/UIRepositoryProperties.java b/source/java/org/alfresco/web/ui/common/component/debug/UIRepositoryProperties.java index 13cca8c24a..86f550269e 100644 --- a/source/java/org/alfresco/web/ui/common/component/debug/UIRepositoryProperties.java +++ b/source/java/org/alfresco/web/ui/common/component/debug/UIRepositoryProperties.java @@ -25,6 +25,7 @@ import javax.faces.context.FacesContext; import org.alfresco.repo.admin.patch.PatchInfo; import org.alfresco.repo.admin.patch.PatchService; import org.alfresco.service.ServiceRegistry; +import org.alfresco.service.descriptor.Descriptor; import org.alfresco.service.descriptor.DescriptorService; import org.alfresco.web.app.Application; import org.alfresco.web.bean.repository.Repository; @@ -59,8 +60,13 @@ public class UIRepositoryProperties extends BaseDebugComponent ServiceRegistry services = Repository.getServiceRegistry(fc); DescriptorService descriptorService = services.getDescriptorService(); - properties.put("version", descriptorService.getRepositoryDescriptor().getVersion()); - properties.put("schema", descriptorService.getRepositoryDescriptor().getSchema()); + Descriptor installedRepoDescriptor = descriptorService.getInstalledRepositoryDescriptor(); + properties.put("Installed Version", installedRepoDescriptor.getVersion()); + properties.put("Installed Schema", installedRepoDescriptor.getSchema()); + + Descriptor systemDescriptor = descriptorService.getServerDescriptor(); + properties.put("Server Version", systemDescriptor.getVersion()); + properties.put("Server Schema", systemDescriptor.getSchema()); WebApplicationContext cx = FacesContextUtils.getRequiredWebApplicationContext(fc); PatchService patchService = (PatchService)cx.getBean("PatchService");