You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/09/05 17:31:28 UTC
svn commit: r1165336 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF:
applicationContext.xml jsp/admin/include/remoteRepositoryForm.jspf
Author: olamy
Date: Mon Sep 5 15:31:28 2011
New Revision: 1165336
URL: http://svn.apache.org/viewvc?rev=1165336&view=rev
Log:
[MRM-1506] api to configure RemoteRepository : use it in the webapp instead of directly archiva-configuration : fix attribute name and xmlrpc bean
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=1165336&r1=1165335&r2=1165336&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml Mon Sep 5 15:31:28 2011
@@ -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 -->
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf?rev=1165336&r1=1165335&r2=1165336&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf Mon Sep 5 15:31:28 2011
@@ -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'}"