Return-Path: 
 <commits-return-2645-apmail-archiva-commits-archive=archiva.apache.org@archiva.apache.org>
Delivered-To: apmail-archiva-commits-archive@www.apache.org
Received: (qmail 43963 invoked from network); 18 Oct 2008 06:03:17 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 18 Oct 2008 06:03:17 -0000
Received: (qmail 20584 invoked by uid 500); 18 Oct 2008 06:03:19 -0000
Delivered-To: apmail-archiva-commits-archive@archiva.apache.org
Received: (qmail 20542 invoked by uid 500); 18 Oct 2008 06:03:18 -0000
Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@archiva.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@archiva.apache.org>
List-Post: <mailto:commits@archiva.apache.org>
List-Id: <commits.archiva.apache.org>
Reply-To: dev@archiva.apache.org
Delivered-To: mailing list commits@archiva.apache.org
Received: (qmail 20533 invoked by uid 99); 18 Oct 2008 06:03:18 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Oct 2008 23:03:18 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 18 Oct 2008 06:02:18 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 880C923888A6; Fri, 17 Oct 2008 23:02:56 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r705847 - in
 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main:
 java/org/apache/maven/archiva/web/action/admin/connectors/proxy/
 webapp/WEB-INF/jsp/admin/ webapp/WEB-INF/jsp/admin/include/
Date: Sat, 18 Oct 2008 06:02:56 -0000
To: commits@archiva.apache.org
From: jdumay@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20081018060256.880C923888A6@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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">