Proxy connector and repository group jsps work.

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches@705847 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorAction.java b/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorAction.java
index 5ee458a518fdfd6e2e17a5b68a94de184a5dae87..233a44609b536ba9aec3f20c3d17b11cdc74ee77 100644 (file)
--- a/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorAction.java
+++ b/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorAction.java
@@ -40,6 +40,7 @@ public class AddProxyConnectorAction
         connector = new ProxyConnectorConfiguration();
     }
     
+    @Override
     public String input()
     {
         return INPUT;

diff --git a/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf b/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf
index 4b586e4e1fbdf7540c8a3c043394a31b69c81fbd..d0cc04c7a465cdcb555b9605e851833da58761c9 100644 (file)
--- a/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf
+++ b/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf
@@ -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"/>

diff --git a/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp b/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp
index d45b7e48571e7be8364490fb2a266401bdb4ad12..746c82242be462e1f446d94d2f8deadcb1ee5693 100644 (file)
--- a/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp
+++ b/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp
@@ -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">