svn commit: r1445274 - in /archiva/trunk/archiva-modules: archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ archiva-base/archiva-configuration/src/main/mdo/ archiva-web/archiva-webapp/src/main/webapp/js/archiva/ archiva...

[ol...@apache.org]

Author: olamy
Date: Tue Feb 12 17:13:23 2013
New Revision: 1445274

URL: http://svn.apache.org/r1445274
Log:
ensure correct default values for archiva model

Modified:
    archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
    archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html

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=1445274&r1=1445273&r2=1445274&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 Tue Feb 12 17:13:23 2013
@@ -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() );
 

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo?rev=1445274&r1=1445273&r2=1445274&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo Tue Feb 12 17:13:23 2013
@@ -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>

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js?rev=1445274&r1=1445273&r2=1445274&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js Tue Feb 12 17:13:23 2013
@@ -1637,7 +1637,7 @@ define("archiva.general-admin",["jquery"
           $.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){

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html?rev=1445274&r1=1445273&r2=1445274&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html Tue Feb 12 17:13:23 2013
@@ -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>