[MRM-1506] api to configure RemoteRepository : use it in the webapp instead of direct...

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

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
index d565374fe565cb3032b0b8bd6634f4963dcbf316..fb20302306b46a590747f5ba994daa27de86fa76 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -86,6 +86,7 @@
     <constructor-arg ref="repositoryMerger#maven2"/>
     <constructor-arg ref="auditListener#logging"/>
     <constructor-arg ref="managedRepositoryAdmin#default"/>
+    <constructor-arg ref="remoteRepositoryAdmin#default"/>
   </bean>
 
   <!-- Redback Web Services -->

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf
index 2379bcdbc423ade191821a8bca20da2682bd71ac..f00f9ea64acb03164829c848a8b819693c1cfa1a 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf
@@ -22,7 +22,7 @@
 
 <s:textfield name="repository.name" label="Name" size="50" required="true"/>
 <s:textfield name="repository.url" label="URL" size="50" required="true"/>
-<s:textfield name="repository.username" label="Username" size="25" required="false"/>
+<s:textfield name="repository.userName" label="Username" size="25" required="false"/>
 <s:password name="repository.password" label="Password" size="25" required="false"/>
 <s:textfield name="repository.timeout" label="Timeout in seconds" size="3" required="false"/>
 <s:select list="#@java.util.LinkedHashMap@{'default' : 'Maven 2.x Repository', 'legacy' : 'Maven 1.x Repository'}"