ensure correct default values for archiva model

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

diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
index 000386126a192754d4c16ae3f515e0c0afb9207f..2f5f439fcd77ac6ac76c3df631d124243ea05a7d 100644 (file)
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
@@ -719,7 +719,7 @@ public class DefaultArchivaConfiguration
 
         List<String> dbConsumers = Arrays.asList( "update-db-artifact", "update-db-repository-metadata" );
 
-        // remove database consumers  if here
+        // remove database consumers if here
         List<String> intersec =
             ListUtils.intersection( dbConsumers, configuration.getRepositoryScanning().getKnownContentConsumers() );
 

diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo b/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
index b1257abb11625f2ab43d6d07ff58c7fb3a94c135..cabb59331baef3f1005b98d05142d1d2ed43aa93 100644 (file)
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
@@ -1564,6 +1564,7 @@
           <description>ssl LDAP connection.</description>
           <version>1.4.0+</version>
           <type>boolean</type>
+          <defaultValue>false</defaultValue>
         </field>
         <field>
           <name>baseDn</name>
@@ -1606,12 +1607,14 @@
           <description>The LDAP authenticator enabled.</description>
           <version>1.4.0+</version>
           <type>boolean</type>
+          <defaultValue>false</defaultValue>
         </field>
         <field>
           <name>writable</name>
           <description>LDAP writable.</description>
           <version>1.4.0+</version>
           <type>boolean</type>
+          <defaultValue>false</defaultValue>
         </field>
         <field>
           <name>extraProperties</name>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
index b2e59166edb9284a29b6cdff24dfa47330873105..153f737df0ede46887604e89a4b38e74bb708a89 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
@@ -1637,7 +1637,7 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout"
           $.ajax("restServices/redbackServices/ldapGroupMappingService/ldapGroups", {
             type: "GET",
             dataType: 'json',
-            success: function(data) {
+            complete: function(data) {
               var groups = [];
               if(data&&data.strings){
                 groups = $.isArray(data.strings)? $.map(data.strings,function(item){

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html
index af6d25d8814509a063c8bdedde852efcc03f6138..99abc49b7b4cbf341d2be300a981803b573dc6e3 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html
@@ -1029,7 +1029,7 @@
                 ${$.i18n.prop('redback.runtime.ldap.writable.label')}
               </label>
               <div class="controls">
-                <input type="checkbox" id="ldap-writable" name="ldap-ssl"
+                <input type="checkbox" id="ldap-writable" name="ldap-writable"
                        data-bind="checked: redbackRuntimeConfiguration().ldapConfiguration().writable"/>
               </div>
             </div>