Skip to content
Snippets Groups Projects
Commit 8d551887 authored by Marius Dumitru Florea's avatar Marius Dumitru Florea
Browse files

XCOMMONS-275: Add support for custom properties in repository descriptor

* Replace deprecated calls to ExtensionRepository#getId()
parent fe0a9902
No related branches found
No related tags found
No related merge requests found
......@@ -195,10 +195,10 @@
#if ($foreach.hasNext), #end
#end
</li>
#if ($extension.repository.id.URI && $extension.repository.id.URI.scheme != 'file')
#if ($extension.repository.descriptor.URI && $extension.repository.descriptor.URI.scheme != 'file')
<li>
$msg.get('extensions.info.repository')
<a href="$extension.repository.id.URI">$escapetool.xml($extension.repository.id.id)</a>
<a href="$extension.repository.descriptor.URI">$escapetool.xml($extension.repository.descriptor.id)</a>
</li>
#end
#if ($extension.dependency)
......@@ -854,7 +854,7 @@ Caused by: #printThrowable($throwable.cause true)
#if ($jobStatus && $jobStatus.state != 'FINISHED')
#set ($status = 'loading')
#else
#set ($status = $extension.repository.id.id)
#set ($status = $extension.repository.descriptor.id)
#if ($status == 'installed')
## Determine if the extension is still valid.
#if ("$!extension.isValid($extensionNamespace)" == 'false')
......@@ -868,7 +868,7 @@ Caused by: #printThrowable($throwable.cause true)
#set ($currentVersion = $extensionManager.getInstalledExtension($extension.id.id, $extensionNamespace))
#end
#if ($currentVersion)
#set ($repoId = $currentVersion.repository.id.id)
#set ($repoId = $currentVersion.repository.descriptor.id)
#set ($options = ["remote-$repoId", $repoId, "remote-${repoId}-incompatible", "remote-${repoId}-invalid"])
#set ($status = "#determineVersionCompatibility($extension $currentVersion $versionConstraint $options)")
#else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment