submitted by Fabrice Daugan -replace EL exepressions containing "empty(" with "empty (", and "not(" with "not (" as EL expression requires git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@686665 13f79535-47bb-0310-9956-ffa450edef68tags/archiva-1.2-M1
@@ -64,7 +64,7 @@ | |||
<h2>Database - Unprocessed Artifacts Scanning</h2> | |||
<c:choose> | |||
<c:when test="${empty(unprocessedConsumers)}"> | |||
<c:when test="${empty (unprocessedConsumers)}"> | |||
<%-- No Consumers. Eeek! --%> | |||
<strong>There are no consumers for unprocessed artifacts.</strong> | |||
</c:when> | |||
@@ -119,7 +119,7 @@ | |||
<h2>Database - Artifact Cleanup Scanning</h2> | |||
<c:choose> | |||
<c:when test="${empty(cleanupConsumers)}"> | |||
<c:when test="${empty (cleanupConsumers)}"> | |||
<%-- No Consumers. Eeek! --%> | |||
<strong>There are no consumers for artifact cleanup.</strong> | |||
</c:when> |
@@ -81,7 +81,7 @@ | |||
</td> | |||
<td> | |||
<c:choose> | |||
<c:when test="${empty(connector.properties)}"> | |||
<c:when test="${empty (connector.properties)}"> | |||
<i>No properties have been set.</i> | |||
</c:when> | |||
<c:otherwise> | |||
@@ -128,7 +128,7 @@ | |||
</td> | |||
<td> | |||
<c:choose> | |||
<c:when test="${empty(connector.blackListPatterns)}"> | |||
<c:when test="${empty (connector.blackListPatterns)}"> | |||
<i>No black list patterns have been set.</i> | |||
</c:when> | |||
<c:otherwise> | |||
@@ -167,7 +167,7 @@ | |||
</td> | |||
<td> | |||
<c:choose> | |||
<c:when test="${empty(connector.whiteListPatterns)}"> | |||
<c:when test="${empty (connector.whiteListPatterns)}"> | |||
<i>No white list patterns have been set.</i> | |||
</c:when> | |||
<c:otherwise> |
@@ -50,7 +50,7 @@ | |||
<h2>Path Mappings</h2> | |||
<c:choose> | |||
<c:when test="${empty(legacyArtifactPaths)}"> | |||
<c:when test="${empty (legacyArtifactPaths)}"> | |||
<%-- No paths. --%> | |||
<p><strong>There are no legacy artifact paths configured yet.</strong></p> | |||
</c:when> |
@@ -48,7 +48,7 @@ | |||
<h2>Network Proxies</h2> | |||
<c:choose> | |||
<c:when test="${empty(networkProxies)}"> | |||
<c:when test="${empty (networkProxies)}"> | |||
<%-- No Local Repositories. --%> | |||
<strong>There are no network proxies configured yet.</strong> | |||
</c:when> | |||
@@ -101,12 +101,12 @@ | |||
<th>Port</th> | |||
<td>${proxy.port}</td> | |||
</tr> | |||
<c:if test="${not empty(proxy.username)}"> | |||
<c:if test="${not empty (proxy.username)}"> | |||
<tr> | |||
<th>Username</th> | |||
<td>${proxy.username}</td> | |||
</tr> | |||
<c:if test="${not empty(proxy.password)}"> | |||
<c:if test="${not empty (proxy.password)}"> | |||
<tr> | |||
<th>Password</th> | |||
<td>••••••••</td> |
@@ -57,7 +57,7 @@ | |||
<h2>Repository Proxy Connectors</h2> | |||
<c:choose> | |||
<c:when test="${empty(proxyConnectorMap)}"> | |||
<c:when test="${empty (proxyConnectorMap)}"> | |||
<strong>No Repository Proxy Connectors Defined.</strong> | |||
</c:when> | |||
<c:otherwise> | |||
@@ -139,7 +139,7 @@ | |||
<th nowrap="nowrap">Network Proxy:</th> | |||
<td> | |||
<c:choose> | |||
<c:when test="${empty(connector.proxyId)}"> | |||
<c:when test="${empty (connector.proxyId)}"> | |||
<span class="directConnection">(Direct Connection)</span> | |||
</c:when> | |||
<c:otherwise> | |||
@@ -168,7 +168,7 @@ | |||
</td> | |||
</tr> | |||
<c:if test="${not(empty(connector.whiteListPatterns))}"> | |||
<c:if test="${not (empty (connector.whiteListPatterns))}"> | |||
<tr> | |||
<th nowrap="nowrap">White List:</th> | |||
<td nowrap="nowrap"> | |||
@@ -179,7 +179,7 @@ | |||
</tr> | |||
</c:if> | |||
<c:if test="${not(empty(connector.blackListPatterns))}"> | |||
<c:if test="${not (empty (connector.blackListPatterns))}"> | |||
<tr> | |||
<th nowrap="nowrap">Black List:</th> | |||
<td> | |||
@@ -190,7 +190,7 @@ | |||
</tr> | |||
</c:if> | |||
<c:if test="${not(empty(connector.properties))}"> | |||
<c:if test="${not (empty (connector.properties))}"> | |||
<tr> | |||
<th>Properties:</th> | |||
<td> |
@@ -50,7 +50,7 @@ | |||
<h2>Managed Repositories</h2> | |||
<c:choose> | |||
<c:when test="${empty(managedRepositories)}"> | |||
<c:when test="${empty (managedRepositories)}"> | |||
<%-- No Managed Repositories. --%> | |||
<strong>There are no managed repositories configured yet.</strong> | |||
</c:when> | |||
@@ -116,7 +116,7 @@ | |||
<th>Directory</th> | |||
<td>${repository.location}</td> | |||
</tr> | |||
<c:if test="${!empty(repository.indexDir)}"> | |||
<c:if test="${!empty (repository.indexDir)}"> | |||
<tr> | |||
<th>Index Directory</th> | |||
<td>${repository.indexDir}</td> | |||
@@ -140,7 +140,7 @@ | |||
</c:choose> | |||
</td> | |||
</tr> | |||
<c:if test="${!empty(repositoryToGroupMap[repository.id])}"> | |||
<c:if test="${!empty (repositoryToGroupMap[repository.id])}"> | |||
<tr> | |||
<th>Groups</th> | |||
<td> | |||
@@ -205,7 +205,7 @@ | |||
<td> | |||
<c:set var="stats" value="${repositoryStatistics[repository.id]}"/> | |||
<c:choose> | |||
<c:when test="${empty(stats)}"> | |||
<c:when test="${empty (stats)}"> | |||
No Statistics Available. | |||
</c:when> | |||
<c:otherwise> | |||
@@ -258,7 +258,7 @@ | |||
<h2>Remote Repositories</h2> | |||
<c:choose> | |||
<c:when test="${empty(remoteRepositories)}"> | |||
<c:when test="${empty (remoteRepositories)}"> | |||
<%-- No Remote Repositories. --%> | |||
<strong>There are no remote repositories configured yet.</strong> | |||
</c:when> |
@@ -57,7 +57,7 @@ | |||
<h2>Repository Groups</h2> | |||
<c:choose> | |||
<c:when test="${empty(repositoryGroups)}"> | |||
<c:when test="${empty (repositoryGroups)}"> | |||
<strong>No Repository Groups Defined.</strong> | |||
</c:when> | |||
<c:otherwise> | |||
@@ -83,7 +83,7 @@ | |||
<p><a href="${baseUrl}/${repositoryGroup.key}/">${baseUrl}/${repositoryGroup.key}/</a></p> | |||
</div> | |||
<c:if test="${!empty(groupToRepositoryMap[repositoryGroup.key])}"> | |||
<c:if test="${!empty (groupToRepositoryMap[repositoryGroup.key])}"> | |||
<div class="repos"> | |||
<ww:form name="form${i}" action="addRepositoryToGroup" namespace="/admin" validate="true"> | |||
<ww:hidden name="repoGroupId" value="%{'${repositoryGroup.key}'}"/> |
@@ -71,7 +71,7 @@ | |||
<h2>Repository Scanning - File Types</h2> | |||
<c:choose> | |||
<c:when test="${empty(fileTypeMap)}"> | |||
<c:when test="${empty (fileTypeMap)}"> | |||
<%-- No File Types. Eeek! --%> | |||
<strong>There are no file types configured.</strong> | |||
</c:when> | |||
@@ -147,7 +147,7 @@ | |||
<h2>Repository Scanning - Consumers of Known Content</h2> | |||
<c:choose> | |||
<c:when test="${empty(knownContentConsumers)}"> | |||
<c:when test="${empty (knownContentConsumers)}"> | |||
<%-- No Good Consumers. Eeek! --%> | |||
<strong>There are no consumers of known content available.</strong> | |||
</c:when> | |||
@@ -203,7 +203,7 @@ | |||
<h2>Repository Scanning - Consumers of Invalid Content</h2> | |||
<c:choose> | |||
<c:when test="${empty(invalidContentConsumers)}"> | |||
<c:when test="${empty (invalidContentConsumers)}"> | |||
<%-- No Consumers. Eeek! --%> | |||
<strong>There are no consumers of invalid content available.</strong> | |||
</c:when> |
@@ -19,10 +19,10 @@ | |||
<%@ taglib uri="/webwork" prefix="ww" %> | |||
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> | |||
<c:if test="${!empty(organisationLogo)}"> | |||
<c:if test="${!empty (organisationLogo)}"> | |||
<ww:set name="organisationUrl" value="organisationUrl"/> | |||
<c:choose> | |||
<c:when test="${!empty(organisationUrl)}"> | |||
<c:when test="${!empty (organisationUrl)}"> | |||
<a href="${companyUrl}"> | |||
<img src="${organisationLogo}" title="${organisationName}" border="0" alt=""/> | |||
</a> |
@@ -68,7 +68,7 @@ | |||
<h1> | |||
<c:choose> | |||
<c:when test="${empty(model.name)}"> | |||
<c:when test="${empty (model.name)}"> | |||
${model.artifactId} | |||
</c:when> | |||
<c:otherwise> |
@@ -35,6 +35,6 @@ | |||
classifier="${dependency.classifier}"/> | |||
</p> | |||
</c:forEach> | |||
<c:if test="${empty(dependencies)}"> | |||
<c:if test="${empty (dependencies)}"> | |||
<strong>No results</strong> | |||
</c:if> |
@@ -39,7 +39,7 @@ | |||
--%> | |||
</p> | |||
<c:if test="${!empty(model.description)}"> | |||
<c:if test="${!empty (model.description)}"> | |||
<blockquote>${model.description}</blockquote> | |||
</c:if> | |||
@@ -120,12 +120,12 @@ | |||
</pre> | |||
</c:if> | |||
<c:if test="${!empty(model.url) || model.organization != null || !empty(model.licenses) | |||
<c:if test="${!empty (model.url) || model.organization != null || !empty (model.licenses) | |||
|| model.issueManagement != null || model.ciManagement != null}"> | |||
<h2>Other Details</h2> | |||
<table class="infoTable"> | |||
<c:if test="${!empty(model.url)}"> | |||
<c:if test="${!empty (model.url)}"> | |||
<tr> | |||
<th>URL</th> | |||
<td> | |||
@@ -148,13 +148,13 @@ | |||
</td> | |||
</tr> | |||
</c:if> | |||
<c:if test="${!empty(model.licenses)}"> | |||
<c:if test="${!empty (model.licenses)}"> | |||
<c:forEach items="${model.licenses}" var="license"> | |||
<tr> | |||
<th>License</th> | |||
<td> | |||
<c:choose> | |||
<c:when test="${!empty(license.url)}"> | |||
<c:when test="${!empty (license.url)}"> | |||
<a href="${license.url}">${license.name}</a> | |||
</c:when> | |||
<c:otherwise> | |||
@@ -170,7 +170,7 @@ | |||
<th>Issue Tracker</th> | |||
<td> | |||
<c:choose> | |||
<c:when test="${!empty(model.issueManagement.url)}"> | |||
<c:when test="${!empty (model.issueManagement.url)}"> | |||
<a href="${model.issueManagement.url}">${model.issueManagement.system}</a> | |||
</c:when> | |||
<c:otherwise> | |||
@@ -185,7 +185,7 @@ | |||
<th>Continuous Integration</th> | |||
<td> | |||
<c:choose> | |||
<c:when test="${!empty(model.ciManagement.url)}"> | |||
<c:when test="${!empty (model.ciManagement.url)}"> | |||
<a href="${model.ciManagement.url}">${model.ciManagement.system}</a> | |||
</c:when> | |||
<c:otherwise> | |||
@@ -201,7 +201,7 @@ | |||
<c:if test="${model.scm != null}"> | |||
<h2>SCM</h2> | |||
<table class="infoTable"> | |||
<c:if test="${!empty(model.scm.connection)}"> | |||
<c:if test="${!empty (model.scm.connection)}"> | |||
<tr> | |||
<th>Connection</th> | |||
<td> | |||
@@ -209,7 +209,7 @@ | |||
</td> | |||
</tr> | |||
</c:if> | |||
<c:if test="${!empty(model.scm.developerConnection)}"> | |||
<c:if test="${!empty (model.scm.developerConnection)}"> | |||
<tr> | |||
<th>Dev. Connection</th> | |||
<td> | |||
@@ -217,7 +217,7 @@ | |||
</td> | |||
</tr> | |||
</c:if> | |||
<c:if test="${!empty(model.scm.url)}"> | |||
<c:if test="${!empty (model.scm.url)}"> | |||
<tr> | |||
<th>Viewer</th> | |||
<td> |
@@ -33,6 +33,6 @@ | |||
</c:forEach> | |||
</ul> | |||
</c:forEach> | |||
<c:if test="${empty(reports)}"> | |||
<c:if test="${empty (reports)}"> | |||
<strong>No reports for this artifact.</strong> | |||
</c:if> |
@@ -31,19 +31,19 @@ | |||
</p> | |||
--%> | |||
<ul> | |||
<c:if test="${!empty(mailingList.subscribeAddress)}"> | |||
<c:if test="${!empty (mailingList.subscribeAddress)}"> | |||
<li> | |||
<b>Subscribe:</b> | |||
<a href="mailto:${mailingList.subscribeAddress}">${mailingList.subscribeAddress}</a> | |||
</li> | |||
</c:if> | |||
<c:if test="${!empty(mailingList.postAddress)}"> | |||
<c:if test="${!empty (mailingList.postAddress)}"> | |||
<li> | |||
<b>Post:</b> | |||
<a href="mailto:${mailingList.postAddress}">${mailingList.postAddress}</a> | |||
</li> | |||
</c:if> | |||
<c:if test="${!empty(mailingList.unsubscribeAddress)}"> | |||
<c:if test="${!empty (mailingList.unsubscribeAddress)}"> | |||
<li> | |||
<b>Unsubscribe:</b> | |||
<a href="mailto:${mailingList.unsubscribeAddress}">${mailingList.unsubscribeAddress}</a> | |||
@@ -55,7 +55,7 @@ | |||
<a href="mailto:${mailingList.owner}">${mailingList.owner}</a> | |||
</li> | |||
--%> | |||
<c:if test="${!empty(mailingList.mainArchiveUrl)}"> | |||
<c:if test="${!empty (mailingList.mainArchiveUrl)}"> | |||
<li> | |||
<b>Archive:</b> | |||
<ul> | |||
@@ -65,7 +65,7 @@ | |||
</ul> | |||
</li> | |||
</c:if> | |||
<%-- <c:if test="${!empty(mailingList.otherArchives)}"> | |||
<%-- <c:if test="${!empty (mailingList.otherArchives)}"> | |||
<li> | |||
<b>Other Archives:</b> | |||
<ul> | |||
@@ -79,6 +79,6 @@ | |||
</c:if> --%> | |||
</ul> | |||
</c:forEach> | |||
<c:if test="${empty(mailingLists)}"> | |||
<c:if test="${empty (mailingLists)}"> | |||
<strong>No mailing lists</strong> | |||
</c:if> |
@@ -34,6 +34,6 @@ | |||
version="${project.version}"/> | |||
</p> | |||
</c:forEach> | |||
<c:if test="${empty(dependees)}"> | |||
<c:if test="${empty (dependees)}"> | |||
<strong>No results</strong> | |||
</c:if> |
@@ -64,7 +64,7 @@ | |||
<h1> | |||
<c:choose> | |||
<c:when test="${empty(model.name)}"> | |||
<c:when test="${empty (model.name)}"> | |||
${model.artifactId} | |||
</c:when> | |||
<c:otherwise> |
@@ -26,7 +26,7 @@ | |||
<c:set var="currentUrl"> | |||
<ww:url/> | |||
</c:set> | |||
<c:if test="${!empty(action) && !empty(namespace)}"> | |||
<c:if test="${!empty (action) && !empty (namespace)}"> | |||
<c:set var="url"> | |||
<ww:url action="${action}" namespace="${namespace}"/> | |||
</c:set> |
@@ -34,7 +34,7 @@ | |||
<strong> : </strong> | |||
<archiva:groupIdLink var="${groupId}" includeTop="false" /> | |||
<c:if test="${!empty(artifactId)}"> | |||
<c:if test="${!empty (artifactId)}"> | |||
<c:set var="url"> | |||
<ww:url action="browseArtifact" namespace="/"> | |||
<ww:param name="groupId" value="%{'${groupId}'}"/> | |||
@@ -45,12 +45,12 @@ | |||
</c:if> | |||
| <strong>Version(s):</strong> | |||
<c:choose> | |||
<c:when test="${!empty(version)}"> | |||
<c:when test="${!empty (version)}"> | |||
<c:set var="url"> | |||
<ww:url action="showArtifact" namespace="/"> | |||
<ww:param name="groupId" value="%{'${groupId}'}"/> | |||
<ww:param name="artifactId" value="%{'${artifactId}'}"/> | |||
<c:if test="${!empty(version)}"> | |||
<c:if test="${!empty (version)}"> | |||
<ww:param name="version" value="%{'${version}'}"/> | |||
</c:if> | |||
</ww:url> | |||
@@ -71,10 +71,10 @@ | |||
</c:forEach> | |||
</c:otherwise> | |||
</c:choose> | |||
<c:if test="${!empty(scope)}"> | |||
<c:if test="${!empty (scope)}"> | |||
| <strong>Scope:</strong> ${scope} | |||
</c:if> | |||
<c:if test="${!empty(classifier)}"> | |||
<c:if test="${!empty (classifier)}"> | |||
| <strong>Classifier:</strong> ${classifier} | |||
</c:if> | |||
</span> |
@@ -26,7 +26,7 @@ | |||
<span class="artifact-title"> | |||
<c:set var="url"> | |||
<c:choose> | |||
<c:when test="${!empty(version)}"> | |||
<c:when test="${!empty (version)}"> | |||
<ww:url action="showArtifact" namespace="/"> | |||
<ww:param name="groupId" value="%{'${groupId}'}"/> | |||
<ww:param name="artifactId" value="%{'${artifactId}'}"/> |