| author | Radoslav Ivanov | 2011-05-17 07:42:34 (EDT) |
|---|---|---|
| committer | Christopher Frost | 2011-05-17 07:42:34 (EDT) |
| commit | 36738175ccd15c11eee1a23987de61a7aec0e885 (patch) (side-by-side diff) | |
| tree | 5959659af7aec5fa40f78d2c95c956734a4ef5d7 | |
| parent | de840a868cd028efcd0fad3712feaeee1dd30769 (diff) | |
| download | org.eclipse.virgo.apps-36738175ccd15c11eee1a23987de61a7aec0e885.zip org.eclipse.virgo.apps-36738175ccd15c11eee1a23987de61a7aec0e885.tar.gz org.eclipse.virgo.apps-36738175ccd15c11eee1a23987de61a7aec0e885.tar.bz2 | |
346066 Patch to remove th euse of reserved names so it works with new version of EL
| -rw-r--r-- | org.eclipse.virgo.apps.admin.web/src/main/webapp/WEB-INF/jsp/state-bundle.jsp | 16 | ||||
| -rw-r--r-- | org.eclipse.virgo.apps.admin.web/src/main/webapp/WEB-INF/jsp/state-packages.jsp | 14 |
2 files changed, 15 insertions, 15 deletions
diff --git a/org.eclipse.virgo.apps.admin.web/src/main/webapp/WEB-INF/jsp/state-bundle.jsp b/org.eclipse.virgo.apps.admin.web/src/main/webapp/WEB-INF/jsp/state-bundle.jsp index 24d04d9..2201c82 100644 --- a/org.eclipse.virgo.apps.admin.web/src/main/webapp/WEB-INF/jsp/state-bundle.jsp +++ b/org.eclipse.virgo.apps.admin.web/src/main/webapp/WEB-INF/jsp/state-bundle.jsp @@ -97,14 +97,14 @@ <th>Import Directives</th> <th>Import Attributes</th> </tr> - <c:forEach var="import" items="${imports}" varStatus="loopStatus"> + <c:forEach var="_import" items="${imports}" varStatus="loopStatus"> <!-- CREATE THE PROVIDER STRING --> <c:choose> - <c:when test="${import.provider eq null}"> + <c:when test="${_import.provider eq null}"> <c:set var="provider" value=""/> </c:when> <c:otherwise> - <c:set var="provider" value="${import.provider.exportingBundle.bundleId} (${import.provider.exportingBundle.symbolicName} - ${import.provider.exportingBundle.version})"/> + <c:set var="provider" value="${_import.provider.exportingBundle.bundleId} (${_import.provider.exportingBundle.symbolicName} - ${_import.provider.exportingBundle.version})"/> </c:otherwise> </c:choose> <!-- ROW COLOURING --> @@ -114,16 +114,16 @@ </c:if> <!-- DISPLAY THE NEXT ROW --> <tr class="sublevel1-${rowStyle}"> - <td><a href="<c:url value="packages.htm?name=${import.packageName}&state=${state}" />">${import.packageName}</a></td> - <td>${import.versionConstraint}</td> - <td><a href="<c:url value="bundle.htm?id=${import.provider.exportingBundle.bundleId}&state=${state}" />">${provider}</a></td> + <td><a href="<c:url value="packages.htm?name=${_import.packageName}&state=${state}" />">${_import.packageName}</a></td> + <td>${_import.versionConstraint}</td> + <td><a href="<c:url value="bundle.htm?id=${_import.provider.exportingBundle.bundleId}&state=${state}" />">${provider}</a></td> <td> - <c:forEach var="directive" items="${import.directives}"> + <c:forEach var="directive" items="${_import.directives}"> ${directive.key}:=${directive.value}<br/> </c:forEach> </td> <td> - <c:forEach var="attribute" items="${import.attributes}"> + <c:forEach var="attribute" items="${_import.attributes}"> ${attribute.key}=${attribute.value}<br/> </c:forEach> </td> diff --git a/org.eclipse.virgo.apps.admin.web/src/main/webapp/WEB-INF/jsp/state-packages.jsp b/org.eclipse.virgo.apps.admin.web/src/main/webapp/WEB-INF/jsp/state-packages.jsp index baccd33..2f458c8 100644 --- a/org.eclipse.virgo.apps.admin.web/src/main/webapp/WEB-INF/jsp/state-packages.jsp +++ b/org.eclipse.virgo.apps.admin.web/src/main/webapp/WEB-INF/jsp/state-packages.jsp @@ -61,7 +61,7 @@ <th>Import Directives</th> <th>Import Attributes</th> </tr> - <c:forEach var="import" items="${importers}" varStatus="loopStatus"> + <c:forEach var="_import" items="${importers}" varStatus="loopStatus"> <!-- ROW COLOURING --> <c:set var="rowStyle" value="odd" scope="page" /> <c:if test="${(loopStatus.index % 2) eq 0}"> @@ -69,17 +69,17 @@ </c:if> <!-- DISPLAY THE NEXT ROW --> <tr class="sublevel1-${rowStyle}"> - <td><a href="<c:url value="bundle.htm?id=${import.importingBundle.bundleId}&state=${state}" />">${import.importingBundle.bundleId}</a></td> - <td>${import.importingBundle.symbolicName}</td> - <td>${import.importingBundle.version}</td> - <td>${import.versionConstraint}</td> + <td><a href="<c:url value="bundle.htm?id=${_import.importingBundle.bundleId}&state=${state}" />">${_import.importingBundle.bundleId}</a></td> + <td>${_import.importingBundle.symbolicName}</td> + <td>${_import.importingBundle.version}</td> + <td>${_import.versionConstraint}</td> <td> - <c:forEach var="directive" items="${import.directives}"> + <c:forEach var="directive" items="${_import.directives}"> ${directive.key}:=${directive.value}<br/> </c:forEach> </td> <td> - <c:forEach var="attribute" items="${import.attributes}"> + <c:forEach var="attribute" items="${_import.attributes}"> ${attribute.key}=${attribute.value}<br/> </c:forEach> </td> |