Author: jdumay
Date: Fri Oct 17 23:02:55 2008
New Revision: 705847
URL: http://svn.apache.org/viewvc?rev=705847&view=rev
Log:
Proxy connector and repository group jsps work.
Modified:
archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorAction.java
archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf
archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp
Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorAction.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorAction.java?rev=705847&r1=705846&r2=705847&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorAction.java
(original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorAction.java
Fri Oct 17 23:02:55 2008
@@ -40,6 +40,7 @@
connector = new ProxyConnectorConfiguration();
}
+ @Override
public String input()
{
return INPUT;
Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf?rev=705847&r1=705846&r2=705847&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf
(original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf
Fri Oct 17 23:02:55 2008
@@ -47,10 +47,10 @@
</td>
<td>
<c:set var="value">
- <s:property id="value" value="%{#attr.connector.policies[#attr.policy.key]}"
default="%{attr.policy.value.defaultOption}" />
+ <s:property id="value" value="%{#attr.connector.policies[#attr.policy.key]}"
default="%{#attr.policy.value.defaultOption}" />
</c:set>
- <s:select name="connector.policies['#attr.policy.key']"
- list="policyMap[#attr.policy.key].options"
+ <s:select name="connector.policies['%{#attr.policy.key}']"
+ list="%{#attr.policyMap[#attr.policy.key].options}"
value="%{#attr.value}"
id="policy_%{#attr.policy.key}"
theme="simple"
@@ -93,7 +93,7 @@
theme="simple">${property.key}</s:label>
</td>
<td>
- <s:textfield name="%{#connector.properties['%{#property.key}']}"
+ <s:textfield name="connector.properties['%{#attr.property.key}']"
size="15"
id="property_%{#attr.property.key}"
theme="simple"/>
Modified: archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp?rev=705847&r1=705846&r2=705847&view=diff
==============================================================================
--- archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp
(original)
+++ archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp
Fri Oct 17 23:02:55 2008
@@ -71,7 +71,7 @@
<div style="float:right">
<s:url id="deleteRepositoryGroupUrl" action="confirmDeleteRepositoryGroup">
- <s:param name="repoGroupId" value="%{'${repositoryGroup.key}'}" />
+ <s:param name="repoGroupId" value="%{#attr.repositoryGroup.key}" />
</s:url>
<s:a href="%{deleteRepositoryGroupUrl}" cssClass="delete">
<img src="${iconDeleteUrl}"/>
@@ -85,9 +85,9 @@
<c:if test="${!empty (groupToRepositoryMap[repositoryGroup.key])}">
<div class="repos">
- <s:form name="form${i}" action="addRepositoryToGroup" namespace="/admin" validate="true">
- <s:hidden name="repoGroupId" value="%{'${repositoryGroup.key}'}"/>
- <s:select list="groupToRepositoryMap['${repositoryGroup.key}']" name="repoId" theme="simple"/>
+ <s:form name="form%{#attr.i}" action="addRepositoryToGroup" namespace="/admin" validate="true">
+ <s:hidden name="repoGroupId" value="%{#attr.repositoryGroup.key}"/>
+ <s:select list="%{#attr.groupToRepositoryMap[#attr.repositoryGroup.key]}" name="repoId"
theme="simple"/>
<s:submit value="Add Repository" theme="simple" cssClass="button"/>
</s:form>
</div>
@@ -110,16 +110,16 @@
<div class="controls">
<redback:ifAnyAuthorized permissions="archiva-manage-configuration">
<s:url id="sortDownRepositoryUrl" action="sortDownRepositoryFromGroup">
- <s:param name="repoGroupId" value="%{'${repositoryGroup.key}'}"/>
- <s:param name="targetRepo" value="managedRepositories['${repository}'].id"/>
+ <s:param name="repoGroupId" value="%{#attr.repositoryGroup.key}"/>
+ <s:param name="targetRepo" value="managedRepositories['%{#attr.repository}'].id"/>
</s:url>
<s:url id="sortUpRepositoryUrl" action="sortUpRepositoryFromGroup">
- <s:param name="repoGroupId" value="%{'${repositoryGroup.key}'}"/>
- <s:param name="targetRepo" value="managedRepositories['${repository}'].id"/>
+ <s:param name="repoGroupId" value="%{#attr.repositoryGroup.key}"/>
+ <s:param name="targetRepo" value="managedRepositories['%{#attr.repository}'].id"/>
</s:url>
<s:url id="removeRepositoryUrl" action="removeRepositoryFromGroup">
- <s:param name="repoGroupId" value="%{'${repositoryGroup.key}'}"/>
- <s:param name="repoId" value="managedRepositories['${repository}'].id"/>
+ <s:param name="repoGroupId" value="%{#attr.repositoryGroup.key}"/>
+ <s:param name="repoId" value="managedRepositories[%{#attr.repository}].id"/>
</s:url>
<c:if test="${r.count > 1}">
<s:a href="%{sortUpRepositoryUrl}" cssClass="up" title="Move Repository Up">
|