Author: olamy
Date: Thu Sep 27 22:59:24 2012
New Revision: 1391259
URL: http://svn.apache.org/viewvc?rev=1391259&view=rev
Log:
larger fields for url/directories
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
archiva/trunk/pom.xml
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java?rev=1391259&r1=1391258&r2=1391259&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
Thu Sep 27 22:59:24 2012
@@ -89,7 +89,7 @@ import java.util.Set;
* before reading it from the registry.
* </p>
*/
-@Service( "archivaConfiguration#default" )
+@Service ( "archivaConfiguration#default" )
public class DefaultArchivaConfiguration
implements ArchivaConfiguration, RegistryListener
{
@@ -99,7 +99,7 @@ public class DefaultArchivaConfiguration
* Plexus registry to read the configuration from.
*/
@Inject
- @Named( value = "commons-configuration" )
+ @Named ( value = "commons-configuration" )
private Registry registry;
@Inject
@@ -182,7 +182,7 @@ public class DefaultArchivaConfiguration
return configuration;
}
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings ( "unchecked" )
private Configuration load()
{
// TODO: should this be the same as section? make sure unnamed
sections still work (eg, sys properties)
@@ -440,7 +440,7 @@ public class DefaultArchivaConfiguration
return registry.getSubset( KEY );
}
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings ( "unchecked" )
public synchronized void save( Configuration configuration )
throws IndeterminateConfigurationException, RegistryException
{
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html?rev=1391259&r1=1391258&r2=1391259&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
Thu Sep 27 22:59:24 2012
@@ -216,7 +216,7 @@
{{if update}}
<span
class="uneditable-input">${$data.managedRepository.id}</span>
{{else}}
- <input type="text" class="xlarge required" id="id" name="id"
size="50"
+ <input type="text" class="input-xlarge required" id="id"
name="id" size="50"
data-bind="value:
managedRepository.id,css:{'uneditable-input': update},readonly:update"/>
{{/if}}
</div>
@@ -224,20 +224,20 @@
<div class="control-group">
<label class="control-label"
for="name">${$.i18n.prop('name')}</label>
<div class="controls">
- <input type="text" class="xlarge required" id="name" name="name"
size="50"
+ <input type="text" class="input-xlarge required" id="name"
name="name" size="50"
data-bind="value: managedRepository.name"/>
</div>
</div>
<div class="control-group">
<label class="control-label"
for="location">${$.i18n.prop('directory')}</label>
<div class="controls">
- <input type="text" class="xlarge required" id="location"
name="location" size="50" data-bind="value: managedRepository.location"/>
+ <input type="text" class="input-xxlarge required" id="location"
name="location" size="50" data-bind="value: managedRepository.location"/>
</div>
</div>
<div class="control-group">
<label class="control-label"
for="indexDirectory">${$.i18n.prop('index.directory')}</label>
<div class="controls">
- <input type="text" class="xlarge" id="indexDirectory"
name="indexDirectory" size="50" data-bind="value:
managedRepository.indexDirectory"/>
+ <input type="text" class="input-xxlarge" id="indexDirectory"
name="indexDirectory" size="50" data-bind="value:
managedRepository.indexDirectory"/>
</div>
</div>
<div class="control-group">
@@ -458,7 +458,7 @@
{{if update}}
<span
class="uneditable-input">${$data.remoteRepository.id}</span>
{{else}}
- <input type="text" class="xlarge required" id="id" name="id"
size="50"
+ <input type="text" class="input-xlarge required" id="id"
name="id" size="50"
data-bind="value:
remoteRepository.id,css:{'uneditable-input': update},readonly:update"/>
{{/if}}
</div>
@@ -466,26 +466,26 @@
<div class="control-group">
<label class="control-label"
for="name">${$.i18n.prop('name')}</label>
<div class="controls">
- <input type="text" class="xlarge required" id="name" name="name"
size="50"
+ <input type="text" class="input-xlarge required" id="name"
name="name" size="50"
data-bind="value: remoteRepository.name"/>
</div>
</div>
<div class="control-group">
<label class="control-label" for="url">${$.i18n.prop('url')}</label>
<div class="controls">
- <input type="text" class="xlarge required" id="url"
name="location" size="50" data-bind="value: remoteRepository.url"/>
+ <input type="text" class="input-xxlarge required" id="url"
name="location" size="50" data-bind="value: remoteRepository.url"/>
</div>
</div>
<div class="control-group">
<label class="control-label"
for="userName">${$.i18n.prop('username')}</label>
<div class="controls">
- <input type="text" class="xlarge" id="userName" name="userName"
size="50" data-bind="value: remoteRepository.indexDirectory"/>
+ <input type="text" class="input-xlarge" id="userName"
name="userName" size="50" data-bind="value: remoteRepository.indexDirectory"/>
</div>
</div>
<div class="control-group">
<label class="control-label"
for="password">${$.i18n.prop('password')}</label>
<div class="controls">
- <input type="password" class="xlarge" id="password"
name="password" size="50" data-bind="value: remoteRepository.password"/>
+ <input type="password" class="input-xlarge" id="password"
name="password" size="50" data-bind="value: remoteRepository.password"/>
</div>
</div>
<div class="control-group">
@@ -511,7 +511,7 @@
<div class="control-group">
<label class="control-label"
for="remoteIndexUrl">${$.i18n.prop('remoteIndexUrl')}</label>
<div class="controls">
- <input type="text" id="remoteIndexUrl" name="remoteIndexUrl"
size="5" data-bind="value: remoteRepository.remoteIndexUrl"/>
+ <input type="text" class="input-xxlarge" id="remoteIndexUrl"
name="remoteIndexUrl" size="5" data-bind="value:
remoteRepository.remoteIndexUrl"/>
</div>
</div>
<div class="control-group">
@@ -528,7 +528,7 @@
<div class="control-group">
<label class="control-label"
for="indexDirectory">${$.i18n.prop('index.directory')}</label>
<div class="controls">
- <input type="text" class="xlarge" id="indexDirectory"
name="indexDirectory" size="50" data-bind="value:
remoteRepository.indexDirectory"/>
+ <input type="text" class="input-xlarge" id="indexDirectory"
name="indexDirectory" size="50" data-bind="value:
remoteRepository.indexDirectory"/>
</div>
</div>
<div class="control-group">
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1391259&r1=1391258&r2=1391259&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Thu Sep 27 22:59:24 2012
@@ -556,7 +556,7 @@
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
- <version>1.7</version>
+ <version>1.9</version>
<exclusions>
<exclusion>
<groupId>commons-beanutils</groupId>
