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 2013/05/13 11:47:49 UTC

svn commit: r1481760 [2/5] - in /archiva/site-content/docs/1.4-M4-SNAPSHOT: ./ adminguide/ adminguide/webservices/ customising/ rest-docs-archiva-rest-api/ rest-docs-redback-rest-api/ tour/ userguide/

Modified: archiva/site-content/docs/1.4-M4-SNAPSHOT/release-notes.html
URL: http://svn.apache.org/viewvc/archiva/site-content/docs/1.4-M4-SNAPSHOT/release-notes.html?rev=1481760&r1=1481759&r2=1481760&view=diff
==============================================================================
--- archiva/site-content/docs/1.4-M4-SNAPSHOT/release-notes.html (original)
+++ archiva/site-content/docs/1.4-M4-SNAPSHOT/release-notes.html Mon May 13 09:47:47 2013
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Apr 15, 2013
+ | Generated by Apache Maven Doxia at May 13, 2013
  | Rendered using Apache Maven Fluido Skin 1.3.0
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20130415" />
+    <meta name="Date-Revision-yyyymmdd" content="20130513" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Archiva Documentation - Release Notes for Archiva 1.4-M4-SNAPSHOT</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" />
@@ -75,7 +75,7 @@
         
                 
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2013-04-15</li> <li class="divider pull-right">|</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2013-05-13</li> <li class="divider pull-right">|</li>
               <li id="projectVersion" class="pull-right">Version: 1.4-M4-SNAPSHOT</li>
             
                             </ul>

Modified: archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_archivaRuntimeConfiguration.html
URL: http://svn.apache.org/viewvc/archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_archivaRuntimeConfiguration.html?rev=1481760&r1=1481759&r2=1481760&view=diff
==============================================================================
--- archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_archivaRuntimeConfiguration.html (original)
+++ archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_archivaRuntimeConfiguration.html Mon May 13 09:47:47 2013
@@ -130,19 +130,19 @@
       <code class="prettyprint lang-xml">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;archivaRuntimeConfiguration&gt;
   &lt;urlFailureCacheConfiguration&gt;
-    &lt;timeToLiveSeconds&gt;...&lt;/timeToLiveSeconds&gt;
+    &lt;maxElementsInMemory&gt;...&lt;/maxElementsInMemory&gt;
     &lt;timeToIdleSeconds&gt;...&lt;/timeToIdleSeconds&gt;
+    &lt;timeToLiveSeconds&gt;...&lt;/timeToLiveSeconds&gt;
     &lt;maxElementsOnDisk&gt;...&lt;/maxElementsOnDisk&gt;
-    &lt;maxElementsInMemory&gt;...&lt;/maxElementsInMemory&gt;
   &lt;/urlFailureCacheConfiguration&gt;
 &lt;/archivaRuntimeConfiguration&gt;</code>
       <h2>Example JSON</h2>
       <code class="prettyprint lang-js">{
   &quot;urlFailureCacheConfiguration&quot; : {
-    &quot;timeToLiveSeconds&quot; : ...,
+    &quot;maxElementsInMemory&quot; : ...,
     &quot;timeToIdleSeconds&quot; : ...,
-    &quot;maxElementsOnDisk&quot; : ...,
-    &quot;maxElementsInMemory&quot; : ...
+    &quot;timeToLiveSeconds&quot; : ...,
+    &quot;maxElementsOnDisk&quot; : ...
   }
 }</code>
 

Modified: archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_artifact.html
URL: http://svn.apache.org/viewvc/archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_artifact.html?rev=1481760&r1=1481759&r2=1481760&view=diff
==============================================================================
--- archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_artifact.html (original)
+++ archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_artifact.html Mon May 13 09:47:47 2013
@@ -129,63 +129,63 @@
       <h2>Example XML</h2>
       <code class="prettyprint lang-xml">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;artifact&gt;
-  &lt;bundleName&gt;...&lt;/bundleName&gt;
-  &lt;url&gt;...&lt;/url&gt;
-  &lt;classifier&gt;...&lt;/classifier&gt;
-  &lt;bundleExportService&gt;...&lt;/bundleExportService&gt;
-  &lt;type&gt;...&lt;/type&gt;
-  &lt;prefix&gt;...&lt;/prefix&gt;
-  &lt;bundleExportPackage&gt;...&lt;/bundleExportPackage&gt;
   &lt;bundleLicense&gt;...&lt;/bundleLicense&gt;
+  &lt;prefix&gt;...&lt;/prefix&gt;
   &lt;goals&gt;...&lt;/goals&gt;
   &lt;goals&gt;...&lt;/goals&gt;
   &lt;!--...more &quot;goals&quot; elements...--&gt;
+  &lt;packaging&gt;...&lt;/packaging&gt;
   &lt;version&gt;...&lt;/version&gt;
-  &lt;scope&gt;...&lt;/scope&gt;
+  &lt;path&gt;...&lt;/path&gt;
+  &lt;groupId&gt;...&lt;/groupId&gt;
+  &lt;bundleVersion&gt;...&lt;/bundleVersion&gt;
   &lt;artifactId&gt;...&lt;/artifactId&gt;
-  &lt;context&gt;...&lt;/context&gt;
-  &lt;size&gt;...&lt;/size&gt;
   &lt;id&gt;...&lt;/id&gt;
+  &lt;size&gt;...&lt;/size&gt;
   &lt;bundleRequireBundle&gt;...&lt;/bundleRequireBundle&gt;
-  &lt;bundleSymbolicName&gt;...&lt;/bundleSymbolicName&gt;
-  &lt;repositoryId&gt;...&lt;/repositoryId&gt;
-  &lt;groupId&gt;...&lt;/groupId&gt;
+  &lt;classifier&gt;...&lt;/classifier&gt;
   &lt;bundleImportPackage&gt;...&lt;/bundleImportPackage&gt;
-  &lt;bundleVersion&gt;...&lt;/bundleVersion&gt;
-  &lt;packaging&gt;...&lt;/packaging&gt;
-  &lt;path&gt;...&lt;/path&gt;
+  &lt;context&gt;...&lt;/context&gt;
+  &lt;type&gt;...&lt;/type&gt;
   &lt;fileExtension&gt;...&lt;/fileExtension&gt;
-  &lt;bundleDocUrl&gt;...&lt;/bundleDocUrl&gt;
+  &lt;bundleExportService&gt;...&lt;/bundleExportService&gt;
+  &lt;bundleExportPackage&gt;...&lt;/bundleExportPackage&gt;
+  &lt;bundleSymbolicName&gt;...&lt;/bundleSymbolicName&gt;
+  &lt;scope&gt;...&lt;/scope&gt;
   &lt;bundleDescription&gt;...&lt;/bundleDescription&gt;
+  &lt;bundleDocUrl&gt;...&lt;/bundleDocUrl&gt;
+  &lt;url&gt;...&lt;/url&gt;
+  &lt;repositoryId&gt;...&lt;/repositoryId&gt;
+  &lt;bundleName&gt;...&lt;/bundleName&gt;
 &lt;/artifact&gt;</code>
       <h2>Example JSON</h2>
       <code class="prettyprint lang-js">{
-  &quot;bundleName&quot; : &quot;...&quot;,
-  &quot;url&quot; : &quot;...&quot;,
-  &quot;classifier&quot; : &quot;...&quot;,
-  &quot;bundleExportService&quot; : &quot;...&quot;,
-  &quot;type&quot; : &quot;...&quot;,
-  &quot;prefix&quot; : &quot;...&quot;,
-  &quot;bundleExportPackage&quot; : &quot;...&quot;,
   &quot;bundleLicense&quot; : &quot;...&quot;,
+  &quot;prefix&quot; : &quot;...&quot;,
   &quot;goals&quot; : [ &quot;...&quot;, ... ],
+  &quot;packaging&quot; : &quot;...&quot;,
   &quot;version&quot; : &quot;...&quot;,
-  &quot;scope&quot; : &quot;...&quot;,
+  &quot;path&quot; : &quot;...&quot;,
+  &quot;groupId&quot; : &quot;...&quot;,
+  &quot;bundleVersion&quot; : &quot;...&quot;,
   &quot;artifactId&quot; : &quot;...&quot;,
-  &quot;context&quot; : &quot;...&quot;,
-  &quot;size&quot; : &quot;...&quot;,
   &quot;id&quot; : &quot;...&quot;,
+  &quot;size&quot; : &quot;...&quot;,
   &quot;bundleRequireBundle&quot; : &quot;...&quot;,
-  &quot;bundleSymbolicName&quot; : &quot;...&quot;,
-  &quot;repositoryId&quot; : &quot;...&quot;,
-  &quot;groupId&quot; : &quot;...&quot;,
+  &quot;classifier&quot; : &quot;...&quot;,
   &quot;bundleImportPackage&quot; : &quot;...&quot;,
-  &quot;bundleVersion&quot; : &quot;...&quot;,
-  &quot;packaging&quot; : &quot;...&quot;,
-  &quot;path&quot; : &quot;...&quot;,
+  &quot;context&quot; : &quot;...&quot;,
+  &quot;type&quot; : &quot;...&quot;,
   &quot;fileExtension&quot; : &quot;...&quot;,
+  &quot;bundleExportService&quot; : &quot;...&quot;,
+  &quot;bundleExportPackage&quot; : &quot;...&quot;,
+  &quot;bundleSymbolicName&quot; : &quot;...&quot;,
+  &quot;scope&quot; : &quot;...&quot;,
+  &quot;bundleDescription&quot; : &quot;...&quot;,
   &quot;bundleDocUrl&quot; : &quot;...&quot;,
-  &quot;bundleDescription&quot; : &quot;...&quot;
+  &quot;url&quot; : &quot;...&quot;,
+  &quot;repositoryId&quot; : &quot;...&quot;,
+  &quot;bundleName&quot; : &quot;...&quot;
 }</code>
 
       <div class="clear" />

Modified: archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_artifactTransferRequest.html
URL: http://svn.apache.org/viewvc/archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_artifactTransferRequest.html?rev=1481760&r1=1481759&r2=1481760&view=diff
==============================================================================
--- archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_artifactTransferRequest.html (original)
+++ archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_artifactTransferRequest.html Mon May 13 09:47:47 2013
@@ -130,64 +130,64 @@
       <code class="prettyprint lang-xml">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;artifactTransferRequest&gt;
   &lt;targetRepositoryId&gt;...&lt;/targetRepositoryId&gt;
-  &lt;bundleName&gt;...&lt;/bundleName&gt;
-  &lt;url&gt;...&lt;/url&gt;
-  &lt;classifier&gt;...&lt;/classifier&gt;
-  &lt;bundleExportService&gt;...&lt;/bundleExportService&gt;
-  &lt;type&gt;...&lt;/type&gt;
-  &lt;prefix&gt;...&lt;/prefix&gt;
-  &lt;bundleExportPackage&gt;...&lt;/bundleExportPackage&gt;
   &lt;bundleLicense&gt;...&lt;/bundleLicense&gt;
+  &lt;prefix&gt;...&lt;/prefix&gt;
   &lt;goals&gt;...&lt;/goals&gt;
   &lt;goals&gt;...&lt;/goals&gt;
   &lt;!--...more &quot;goals&quot; elements...--&gt;
+  &lt;packaging&gt;...&lt;/packaging&gt;
   &lt;version&gt;...&lt;/version&gt;
-  &lt;scope&gt;...&lt;/scope&gt;
+  &lt;path&gt;...&lt;/path&gt;
+  &lt;groupId&gt;...&lt;/groupId&gt;
+  &lt;bundleVersion&gt;...&lt;/bundleVersion&gt;
   &lt;artifactId&gt;...&lt;/artifactId&gt;
-  &lt;context&gt;...&lt;/context&gt;
-  &lt;size&gt;...&lt;/size&gt;
   &lt;id&gt;...&lt;/id&gt;
+  &lt;size&gt;...&lt;/size&gt;
   &lt;bundleRequireBundle&gt;...&lt;/bundleRequireBundle&gt;
-  &lt;bundleSymbolicName&gt;...&lt;/bundleSymbolicName&gt;
-  &lt;repositoryId&gt;...&lt;/repositoryId&gt;
-  &lt;groupId&gt;...&lt;/groupId&gt;
+  &lt;classifier&gt;...&lt;/classifier&gt;
   &lt;bundleImportPackage&gt;...&lt;/bundleImportPackage&gt;
-  &lt;bundleVersion&gt;...&lt;/bundleVersion&gt;
-  &lt;packaging&gt;...&lt;/packaging&gt;
-  &lt;path&gt;...&lt;/path&gt;
+  &lt;context&gt;...&lt;/context&gt;
+  &lt;type&gt;...&lt;/type&gt;
   &lt;fileExtension&gt;...&lt;/fileExtension&gt;
-  &lt;bundleDocUrl&gt;...&lt;/bundleDocUrl&gt;
+  &lt;bundleExportService&gt;...&lt;/bundleExportService&gt;
+  &lt;bundleExportPackage&gt;...&lt;/bundleExportPackage&gt;
+  &lt;bundleSymbolicName&gt;...&lt;/bundleSymbolicName&gt;
+  &lt;scope&gt;...&lt;/scope&gt;
   &lt;bundleDescription&gt;...&lt;/bundleDescription&gt;
+  &lt;bundleDocUrl&gt;...&lt;/bundleDocUrl&gt;
+  &lt;url&gt;...&lt;/url&gt;
+  &lt;repositoryId&gt;...&lt;/repositoryId&gt;
+  &lt;bundleName&gt;...&lt;/bundleName&gt;
 &lt;/artifactTransferRequest&gt;</code>
       <h2>Example JSON</h2>
       <code class="prettyprint lang-js">{
   &quot;targetRepositoryId&quot; : &quot;...&quot;,
-  &quot;bundleName&quot; : &quot;...&quot;,
-  &quot;url&quot; : &quot;...&quot;,
-  &quot;classifier&quot; : &quot;...&quot;,
-  &quot;bundleExportService&quot; : &quot;...&quot;,
-  &quot;type&quot; : &quot;...&quot;,
-  &quot;prefix&quot; : &quot;...&quot;,
-  &quot;bundleExportPackage&quot; : &quot;...&quot;,
   &quot;bundleLicense&quot; : &quot;...&quot;,
+  &quot;prefix&quot; : &quot;...&quot;,
   &quot;goals&quot; : [ &quot;...&quot;, ... ],
+  &quot;packaging&quot; : &quot;...&quot;,
   &quot;version&quot; : &quot;...&quot;,
-  &quot;scope&quot; : &quot;...&quot;,
+  &quot;path&quot; : &quot;...&quot;,
+  &quot;groupId&quot; : &quot;...&quot;,
+  &quot;bundleVersion&quot; : &quot;...&quot;,
   &quot;artifactId&quot; : &quot;...&quot;,
-  &quot;context&quot; : &quot;...&quot;,
-  &quot;size&quot; : &quot;...&quot;,
   &quot;id&quot; : &quot;...&quot;,
+  &quot;size&quot; : &quot;...&quot;,
   &quot;bundleRequireBundle&quot; : &quot;...&quot;,
-  &quot;bundleSymbolicName&quot; : &quot;...&quot;,
-  &quot;repositoryId&quot; : &quot;...&quot;,
-  &quot;groupId&quot; : &quot;...&quot;,
+  &quot;classifier&quot; : &quot;...&quot;,
   &quot;bundleImportPackage&quot; : &quot;...&quot;,
-  &quot;bundleVersion&quot; : &quot;...&quot;,
-  &quot;packaging&quot; : &quot;...&quot;,
-  &quot;path&quot; : &quot;...&quot;,
+  &quot;context&quot; : &quot;...&quot;,
+  &quot;type&quot; : &quot;...&quot;,
   &quot;fileExtension&quot; : &quot;...&quot;,
+  &quot;bundleExportService&quot; : &quot;...&quot;,
+  &quot;bundleExportPackage&quot; : &quot;...&quot;,
+  &quot;bundleSymbolicName&quot; : &quot;...&quot;,
+  &quot;scope&quot; : &quot;...&quot;,
+  &quot;bundleDescription&quot; : &quot;...&quot;,
   &quot;bundleDocUrl&quot; : &quot;...&quot;,
-  &quot;bundleDescription&quot; : &quot;...&quot;
+  &quot;url&quot; : &quot;...&quot;,
+  &quot;repositoryId&quot; : &quot;...&quot;,
+  &quot;bundleName&quot; : &quot;...&quot;
 }</code>
 
       <div class="clear" />

Modified: archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_cacheConfiguration.html
URL: http://svn.apache.org/viewvc/archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_cacheConfiguration.html?rev=1481760&r1=1481759&r2=1481760&view=diff
==============================================================================
--- archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_cacheConfiguration.html (original)
+++ archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_cacheConfiguration.html Mon May 13 09:47:47 2013
@@ -129,17 +129,17 @@
       <h2>Example XML</h2>
       <code class="prettyprint lang-xml">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;cacheConfiguration&gt;
-  &lt;timeToLiveSeconds&gt;...&lt;/timeToLiveSeconds&gt;
+  &lt;maxElementsInMemory&gt;...&lt;/maxElementsInMemory&gt;
   &lt;timeToIdleSeconds&gt;...&lt;/timeToIdleSeconds&gt;
+  &lt;timeToLiveSeconds&gt;...&lt;/timeToLiveSeconds&gt;
   &lt;maxElementsOnDisk&gt;...&lt;/maxElementsOnDisk&gt;
-  &lt;maxElementsInMemory&gt;...&lt;/maxElementsInMemory&gt;
 &lt;/cacheConfiguration&gt;</code>
       <h2>Example JSON</h2>
       <code class="prettyprint lang-js">{
-  &quot;timeToLiveSeconds&quot; : ...,
+  &quot;maxElementsInMemory&quot; : ...,
   &quot;timeToIdleSeconds&quot; : ...,
-  &quot;maxElementsOnDisk&quot; : ...,
-  &quot;maxElementsInMemory&quot; : ...
+  &quot;timeToLiveSeconds&quot; : ...,
+  &quot;maxElementsOnDisk&quot; : ...
 }</code>
 
       <div class="clear" />

Modified: archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_issueManagement.html
URL: http://svn.apache.org/viewvc/archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_issueManagement.html?rev=1481760&r1=1481759&r2=1481760&view=diff
==============================================================================
--- archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_issueManagement.html (original)
+++ archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_issueManagement.html Mon May 13 09:47:47 2013
@@ -129,13 +129,13 @@
       <h2>Example XML</h2>
       <code class="prettyprint lang-xml">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;issueManagement&gt;
-  &lt;url&gt;...&lt;/url&gt;
   &lt;system&gt;...&lt;/system&gt;
+  &lt;url&gt;...&lt;/url&gt;
 &lt;/issueManagement&gt;</code>
       <h2>Example JSON</h2>
       <code class="prettyprint lang-js">{
-  &quot;url&quot; : &quot;...&quot;,
-  &quot;system&quot; : &quot;...&quot;
+  &quot;system&quot; : &quot;...&quot;,
+  &quot;url&quot; : &quot;...&quot;
 }</code>
 
       <div class="clear" />

Modified: archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_ldapConfiguration.html
URL: http://svn.apache.org/viewvc/archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_ldapConfiguration.html?rev=1481760&r1=1481759&r2=1481760&view=diff
==============================================================================
--- archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_ldapConfiguration.html (original)
+++ archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_ldapConfiguration.html Mon May 13 09:47:47 2013
@@ -129,12 +129,21 @@
       <h2>Example XML</h2>
       <code class="prettyprint lang-xml">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;ldapConfiguration&gt;
+  &lt;port&gt;...&lt;/port&gt;
   &lt;baseDn&gt;...&lt;/baseDn&gt;
+  &lt;useRoleNameAsGroup&gt;...&lt;/useRoleNameAsGroup&gt;
   &lt;bindDn&gt;...&lt;/bindDn&gt;
+  &lt;hostName&gt;...&lt;/hostName&gt;
   &lt;bindAuthenticatorEnabled&gt;...&lt;/bindAuthenticatorEnabled&gt;
-  &lt;ssl&gt;...&lt;/ssl&gt;
   &lt;writable&gt;...&lt;/writable&gt;
-  &lt;authenticationMethod&gt;...&lt;/authenticationMethod&gt;
+  &lt;extraPropertiesEntries&gt;
+    &lt;key&gt;...&lt;/key&gt;
+    &lt;value&gt;...&lt;/value&gt;
+  &lt;/extraPropertiesEntries&gt;
+  &lt;extraPropertiesEntries&gt;
+    &lt;!--...--&gt;
+  &lt;/extraPropertiesEntries&gt;
+  &lt;!--...more &quot;extraPropertiesEntries&quot; elements...--&gt;
   &lt;extraProperties&gt;
     &lt;entry&gt;
       &lt;key&gt;...&lt;/key&gt;
@@ -150,43 +159,34 @@
     &lt;/entry&gt;
     &lt;!--...more entries...--&gt;
   &lt;/extraProperties&gt;
-  &lt;useRoleNameAsGroup&gt;...&lt;/useRoleNameAsGroup&gt;
-  &lt;port&gt;...&lt;/port&gt;
+  &lt;password&gt;...&lt;/password&gt;
+  &lt;authenticationMethod&gt;...&lt;/authenticationMethod&gt;
   &lt;contextFactory&gt;...&lt;/contextFactory&gt;
-  &lt;extraPropertiesEntries&gt;
-    &lt;key&gt;...&lt;/key&gt;
-    &lt;value&gt;...&lt;/value&gt;
-  &lt;/extraPropertiesEntries&gt;
-  &lt;extraPropertiesEntries&gt;
-    &lt;!--...--&gt;
-  &lt;/extraPropertiesEntries&gt;
-  &lt;!--...more &quot;extraPropertiesEntries&quot; elements...--&gt;
+  &lt;ssl&gt;...&lt;/ssl&gt;
   &lt;baseGroupsDn&gt;...&lt;/baseGroupsDn&gt;
-  &lt;password&gt;...&lt;/password&gt;
-  &lt;hostName&gt;...&lt;/hostName&gt;
 &lt;/ldapConfiguration&gt;</code>
       <h2>Example JSON</h2>
       <code class="prettyprint lang-js">{
+  &quot;port&quot; : ...,
   &quot;baseDn&quot; : &quot;...&quot;,
+  &quot;useRoleNameAsGroup&quot; : false,
   &quot;bindDn&quot; : &quot;...&quot;,
+  &quot;hostName&quot; : &quot;...&quot;,
   &quot;bindAuthenticatorEnabled&quot; : false,
-  &quot;ssl&quot; : false,
   &quot;writable&quot; : false,
-  &quot;authenticationMethod&quot; : &quot;...&quot;,
-  &quot;extraProperties&quot; : [ {
-    &quot;...&quot; : ...
-  }, {
-  } ],
-  &quot;useRoleNameAsGroup&quot; : false,
-  &quot;port&quot; : ...,
-  &quot;contextFactory&quot; : &quot;...&quot;,
   &quot;extraPropertiesEntries&quot; : [ {
     &quot;key&quot; : &quot;...&quot;,
     &quot;value&quot; : &quot;...&quot;
   }, ... ],
-  &quot;baseGroupsDn&quot; : &quot;...&quot;,
+  &quot;extraProperties&quot; : [ {
+    &quot;...&quot; : ...
+  }, {
+  } ],
   &quot;password&quot; : &quot;...&quot;,
-  &quot;hostName&quot; : &quot;...&quot;
+  &quot;authenticationMethod&quot; : &quot;...&quot;,
+  &quot;contextFactory&quot; : &quot;...&quot;,
+  &quot;ssl&quot; : false,
+  &quot;baseGroupsDn&quot; : &quot;...&quot;
 }</code>
 
       <div class="clear" />

Modified: archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_legacyArtifactPath.html
URL: http://svn.apache.org/viewvc/archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_legacyArtifactPath.html?rev=1481760&r1=1481759&r2=1481760&view=diff
==============================================================================
--- archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_legacyArtifactPath.html (original)
+++ archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_legacyArtifactPath.html Mon May 13 09:47:47 2013
@@ -131,15 +131,15 @@
 &lt;legacyArtifactPath&gt;
   &lt;artifact&gt;...&lt;/artifact&gt;
   &lt;artifactId&gt;...&lt;/artifactId&gt;
-  &lt;groupId&gt;...&lt;/groupId&gt;
   &lt;path&gt;...&lt;/path&gt;
+  &lt;groupId&gt;...&lt;/groupId&gt;
 &lt;/legacyArtifactPath&gt;</code>
       <h2>Example JSON</h2>
       <code class="prettyprint lang-js">{
   &quot;artifact&quot; : &quot;...&quot;,
   &quot;artifactId&quot; : &quot;...&quot;,
-  &quot;groupId&quot; : &quot;...&quot;,
-  &quot;path&quot; : &quot;...&quot;
+  &quot;path&quot; : &quot;...&quot;,
+  &quot;groupId&quot; : &quot;...&quot;
 }</code>
 
       <div class="clear" />

Modified: archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_mailingList.html
URL: http://svn.apache.org/viewvc/archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_mailingList.html?rev=1481760&r1=1481759&r2=1481760&view=diff
==============================================================================
--- archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_mailingList.html (original)
+++ archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_mailingList.html Mon May 13 09:47:47 2013
@@ -130,22 +130,22 @@
       <code class="prettyprint lang-xml">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;mailingList&gt;
   &lt;subscribeAddress&gt;...&lt;/subscribeAddress&gt;
-  &lt;postAddress&gt;...&lt;/postAddress&gt;
   &lt;unsubscribeAddress&gt;...&lt;/unsubscribeAddress&gt;
   &lt;name&gt;...&lt;/name&gt;
-  &lt;mainArchiveUrl&gt;...&lt;/mainArchiveUrl&gt;
+  &lt;postAddress&gt;...&lt;/postAddress&gt;
   &lt;otherArchives&gt;...&lt;/otherArchives&gt;
   &lt;otherArchives&gt;...&lt;/otherArchives&gt;
   &lt;!--...more &quot;otherArchives&quot; elements...--&gt;
+  &lt;mainArchiveUrl&gt;...&lt;/mainArchiveUrl&gt;
 &lt;/mailingList&gt;</code>
       <h2>Example JSON</h2>
       <code class="prettyprint lang-js">{
   &quot;subscribeAddress&quot; : &quot;...&quot;,
-  &quot;postAddress&quot; : &quot;...&quot;,
   &quot;unsubscribeAddress&quot; : &quot;...&quot;,
   &quot;name&quot; : &quot;...&quot;,
-  &quot;mainArchiveUrl&quot; : &quot;...&quot;,
-  &quot;otherArchives&quot; : [ &quot;...&quot;, ... ]
+  &quot;postAddress&quot; : &quot;...&quot;,
+  &quot;otherArchives&quot; : [ &quot;...&quot;, ... ],
+  &quot;mainArchiveUrl&quot; : &quot;...&quot;
 }</code>
 
       <div class="clear" />

Modified: archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_managedRepository.html
URL: http://svn.apache.org/viewvc/archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_managedRepository.html?rev=1481760&r1=1481759&r2=1481760&view=diff
==============================================================================
--- archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_managedRepository.html (original)
+++ archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_managedRepository.html Mon May 13 09:47:47 2013
@@ -129,59 +129,59 @@
       <h2>Example XML</h2>
       <code class="prettyprint lang-xml">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;managedRepository&gt;
-  &lt;cronExpression&gt;...&lt;/cronExpression&gt;
-  &lt;location&gt;...&lt;/location&gt;
-  &lt;releases&gt;...&lt;/releases&gt;
-  &lt;daysOlder&gt;...&lt;/daysOlder&gt;
-  &lt;resetStats&gt;...&lt;/resetStats&gt;
-  &lt;stageRepoNeeded&gt;...&lt;/stageRepoNeeded&gt;
-  &lt;snapshots&gt;...&lt;/snapshots&gt;
-  &lt;retentionCount&gt;...&lt;/retentionCount&gt;
   &lt;stagingRepository&gt;
     &lt;!--...--&gt;
     &lt;description&gt;...&lt;/description&gt;
     &lt;indexDirectory&gt;...&lt;/indexDirectory&gt;
     &lt;id&gt;...&lt;/id&gt;
-    &lt;name&gt;...&lt;/name&gt;
     &lt;layout&gt;...&lt;/layout&gt;
+    &lt;name&gt;...&lt;/name&gt;
   &lt;/stagingRepository&gt;
-  &lt;deleteReleasedSnapshots&gt;...&lt;/deleteReleasedSnapshots&gt;
+  &lt;daysOlder&gt;...&lt;/daysOlder&gt;
+  &lt;location&gt;...&lt;/location&gt;
+  &lt;stageRepoNeeded&gt;...&lt;/stageRepoNeeded&gt;
+  &lt;scanned&gt;...&lt;/scanned&gt;
   &lt;blockRedeployments&gt;...&lt;/blockRedeployments&gt;
+  &lt;deleteReleasedSnapshots&gt;...&lt;/deleteReleasedSnapshots&gt;
+  &lt;snapshots&gt;...&lt;/snapshots&gt;
   &lt;skipPackedIndexCreation&gt;...&lt;/skipPackedIndexCreation&gt;
-  &lt;scanned&gt;...&lt;/scanned&gt;
+  &lt;cronExpression&gt;...&lt;/cronExpression&gt;
+  &lt;resetStats&gt;...&lt;/resetStats&gt;
+  &lt;releases&gt;...&lt;/releases&gt;
+  &lt;retentionCount&gt;...&lt;/retentionCount&gt;
   &lt;description&gt;...&lt;/description&gt;
   &lt;indexDirectory&gt;...&lt;/indexDirectory&gt;
   &lt;id&gt;...&lt;/id&gt;
-  &lt;name&gt;...&lt;/name&gt;
   &lt;layout&gt;...&lt;/layout&gt;
+  &lt;name&gt;...&lt;/name&gt;
 &lt;/managedRepository&gt;</code>
       <h2>Example JSON</h2>
       <code class="prettyprint lang-js">{
-  &quot;cronExpression&quot; : &quot;...&quot;,
-  &quot;location&quot; : &quot;...&quot;,
-  &quot;releases&quot; : false,
-  &quot;daysOlder&quot; : ...,
-  &quot;resetStats&quot; : false,
-  &quot;stageRepoNeeded&quot; : false,
-  &quot;snapshots&quot; : false,
-  &quot;retentionCount&quot; : ...,
   &quot;stagingRepository&quot; : {
     &quot;...&quot; : ...,
     &quot;description&quot; : &quot;...&quot;,
     &quot;indexDirectory&quot; : &quot;...&quot;,
     &quot;id&quot; : &quot;...&quot;,
-    &quot;name&quot; : &quot;...&quot;,
-    &quot;layout&quot; : &quot;...&quot;
+    &quot;layout&quot; : &quot;...&quot;,
+    &quot;name&quot; : &quot;...&quot;
   },
-  &quot;deleteReleasedSnapshots&quot; : false,
+  &quot;daysOlder&quot; : ...,
+  &quot;location&quot; : &quot;...&quot;,
+  &quot;stageRepoNeeded&quot; : false,
+  &quot;scanned&quot; : false,
   &quot;blockRedeployments&quot; : false,
+  &quot;deleteReleasedSnapshots&quot; : false,
+  &quot;snapshots&quot; : false,
   &quot;skipPackedIndexCreation&quot; : false,
-  &quot;scanned&quot; : false,
+  &quot;cronExpression&quot; : &quot;...&quot;,
+  &quot;resetStats&quot; : false,
+  &quot;releases&quot; : false,
+  &quot;retentionCount&quot; : ...,
   &quot;description&quot; : &quot;...&quot;,
   &quot;indexDirectory&quot; : &quot;...&quot;,
   &quot;id&quot; : &quot;...&quot;,
-  &quot;name&quot; : &quot;...&quot;,
-  &quot;layout&quot; : &quot;...&quot;
+  &quot;layout&quot; : &quot;...&quot;,
+  &quot;name&quot; : &quot;...&quot;
 }</code>
 
       <div class="clear" />

Modified: archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_networkConfiguration.html
URL: http://svn.apache.org/viewvc/archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_networkConfiguration.html?rev=1481760&r1=1481759&r2=1481760&view=diff
==============================================================================
--- archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_networkConfiguration.html (original)
+++ archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_networkConfiguration.html Mon May 13 09:47:47 2013
@@ -130,14 +130,14 @@
       <code class="prettyprint lang-xml">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;networkConfiguration&gt;
   &lt;maxTotal&gt;...&lt;/maxTotal&gt;
-  &lt;maxTotalPerHost&gt;...&lt;/maxTotalPerHost&gt;
   &lt;usePooling&gt;...&lt;/usePooling&gt;
+  &lt;maxTotalPerHost&gt;...&lt;/maxTotalPerHost&gt;
 &lt;/networkConfiguration&gt;</code>
       <h2>Example JSON</h2>
       <code class="prettyprint lang-js">{
   &quot;maxTotal&quot; : ...,
-  &quot;maxTotalPerHost&quot; : ...,
-  &quot;usePooling&quot; : false
+  &quot;usePooling&quot; : false,
+  &quot;maxTotalPerHost&quot; : ...
 }</code>
 
       <div class="clear" />

Modified: archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_networkProxy.html
URL: http://svn.apache.org/viewvc/archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_networkProxy.html?rev=1481760&r1=1481759&r2=1481760&view=diff
==============================================================================
--- archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_networkProxy.html (original)
+++ archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_networkProxy.html Mon May 13 09:47:47 2013
@@ -129,23 +129,23 @@
       <h2>Example XML</h2>
       <code class="prettyprint lang-xml">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;networkProxy&gt;
-  &lt;useNtlm&gt;...&lt;/useNtlm&gt;
+  &lt;protocol&gt;...&lt;/protocol&gt;
   &lt;port&gt;...&lt;/port&gt;
-  &lt;password&gt;...&lt;/password&gt;
+  &lt;useNtlm&gt;...&lt;/useNtlm&gt;
+  &lt;id&gt;...&lt;/id&gt;
   &lt;username&gt;...&lt;/username&gt;
   &lt;host&gt;...&lt;/host&gt;
-  &lt;protocol&gt;...&lt;/protocol&gt;
-  &lt;id&gt;...&lt;/id&gt;
+  &lt;password&gt;...&lt;/password&gt;
 &lt;/networkProxy&gt;</code>
       <h2>Example JSON</h2>
       <code class="prettyprint lang-js">{
-  &quot;useNtlm&quot; : false,
+  &quot;protocol&quot; : &quot;...&quot;,
   &quot;port&quot; : ...,
-  &quot;password&quot; : &quot;...&quot;,
+  &quot;useNtlm&quot; : false,
+  &quot;id&quot; : &quot;...&quot;,
   &quot;username&quot; : &quot;...&quot;,
   &quot;host&quot; : &quot;...&quot;,
-  &quot;protocol&quot; : &quot;...&quot;,
-  &quot;id&quot; : &quot;...&quot;
+  &quot;password&quot; : &quot;...&quot;
 }</code>
 
       <div class="clear" />

Modified: archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_organisationInformation.html
URL: http://svn.apache.org/viewvc/archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_organisationInformation.html?rev=1481760&r1=1481759&r2=1481760&view=diff
==============================================================================
--- archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_organisationInformation.html (original)
+++ archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_organisationInformation.html Mon May 13 09:47:47 2013
@@ -129,15 +129,15 @@
       <h2>Example XML</h2>
       <code class="prettyprint lang-xml">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;organisationInformation&gt;
+  &lt;logoLocation&gt;...&lt;/logoLocation&gt;
   &lt;name&gt;...&lt;/name&gt;
   &lt;url&gt;...&lt;/url&gt;
-  &lt;logoLocation&gt;...&lt;/logoLocation&gt;
 &lt;/organisationInformation&gt;</code>
       <h2>Example JSON</h2>
       <code class="prettyprint lang-js">{
+  &quot;logoLocation&quot; : &quot;...&quot;,
   &quot;name&quot; : &quot;...&quot;,
-  &quot;url&quot; : &quot;...&quot;,
-  &quot;logoLocation&quot; : &quot;...&quot;
+  &quot;url&quot; : &quot;...&quot;
 }</code>
 
       <div class="clear" />

Modified: archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_projectVersionMetadata.html
URL: http://svn.apache.org/viewvc/archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_projectVersionMetadata.html?rev=1481760&r1=1481759&r2=1481760&view=diff
==============================================================================
--- archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_projectVersionMetadata.html (original)
+++ archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_projectVersionMetadata.html Mon May 13 09:47:47 2013
@@ -129,11 +129,33 @@
       <h2>Example XML</h2>
       <code class="prettyprint lang-xml">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;projectVersionMetadata&gt;
-  &lt;organization&gt;
-    &lt;name&gt;...&lt;/name&gt;
+  &lt;incomplete&gt;...&lt;/incomplete&gt;
+  &lt;scm&gt;
+    &lt;developerConnection&gt;...&lt;/developerConnection&gt;
     &lt;url&gt;...&lt;/url&gt;
-  &lt;/organization&gt;
+    &lt;connection&gt;...&lt;/connection&gt;
+  &lt;/scm&gt;
   &lt;name&gt;...&lt;/name&gt;
+  &lt;id&gt;...&lt;/id&gt;
+  &lt;dependencies&gt;
+    &lt;optional&gt;...&lt;/optional&gt;
+    &lt;groupId&gt;...&lt;/groupId&gt;
+    &lt;scope&gt;...&lt;/scope&gt;
+    &lt;artifactId&gt;...&lt;/artifactId&gt;
+    &lt;systemPath&gt;...&lt;/systemPath&gt;
+    &lt;version&gt;...&lt;/version&gt;
+    &lt;classifier&gt;...&lt;/classifier&gt;
+    &lt;type&gt;...&lt;/type&gt;
+  &lt;/dependencies&gt;
+  &lt;dependencies&gt;
+    &lt;!--...--&gt;
+  &lt;/dependencies&gt;
+  &lt;!--...more &quot;dependencies&quot; elements...--&gt;
+  &lt;url&gt;...&lt;/url&gt;
+  &lt;issueManagement&gt;
+    &lt;system&gt;...&lt;/system&gt;
+    &lt;url&gt;...&lt;/url&gt;
+  &lt;/issueManagement&gt;
   &lt;licenses&gt;
     &lt;name&gt;...&lt;/name&gt;
     &lt;url&gt;...&lt;/url&gt;
@@ -142,98 +164,76 @@
     &lt;!--...--&gt;
   &lt;/licenses&gt;
   &lt;!--...more &quot;licenses&quot; elements...--&gt;
-  &lt;id&gt;...&lt;/id&gt;
-  &lt;url&gt;...&lt;/url&gt;
-  &lt;scm&gt;
-    &lt;url&gt;...&lt;/url&gt;
-    &lt;developerConnection&gt;...&lt;/developerConnection&gt;
-    &lt;connection&gt;...&lt;/connection&gt;
-  &lt;/scm&gt;
-  &lt;incomplete&gt;...&lt;/incomplete&gt;
-  &lt;issueManagement&gt;
+  &lt;organization&gt;
+    &lt;name&gt;...&lt;/name&gt;
     &lt;url&gt;...&lt;/url&gt;
-    &lt;system&gt;...&lt;/system&gt;
-  &lt;/issueManagement&gt;
+  &lt;/organization&gt;
+  &lt;description&gt;...&lt;/description&gt;
   &lt;ciManagement&gt;
     &lt;url&gt;...&lt;/url&gt;
     &lt;system&gt;...&lt;/system&gt;
   &lt;/ciManagement&gt;
   &lt;mailingLists&gt;
     &lt;subscribeAddress&gt;...&lt;/subscribeAddress&gt;
-    &lt;postAddress&gt;...&lt;/postAddress&gt;
     &lt;unsubscribeAddress&gt;...&lt;/unsubscribeAddress&gt;
     &lt;name&gt;...&lt;/name&gt;
-    &lt;mainArchiveUrl&gt;...&lt;/mainArchiveUrl&gt;
+    &lt;postAddress&gt;...&lt;/postAddress&gt;
     &lt;otherArchives&gt;...&lt;/otherArchives&gt;
     &lt;otherArchives&gt;...&lt;/otherArchives&gt;
     &lt;!--...more &quot;otherArchives&quot; elements...--&gt;
+    &lt;mainArchiveUrl&gt;...&lt;/mainArchiveUrl&gt;
   &lt;/mailingLists&gt;
   &lt;mailingLists&gt;
     &lt;!--...--&gt;
   &lt;/mailingLists&gt;
   &lt;!--...more &quot;mailingLists&quot; elements...--&gt;
-  &lt;dependencies&gt;
-    &lt;optional&gt;...&lt;/optional&gt;
-    &lt;groupId&gt;...&lt;/groupId&gt;
-    &lt;version&gt;...&lt;/version&gt;
-    &lt;scope&gt;...&lt;/scope&gt;
-    &lt;systemPath&gt;...&lt;/systemPath&gt;
-    &lt;artifactId&gt;...&lt;/artifactId&gt;
-    &lt;classifier&gt;...&lt;/classifier&gt;
-    &lt;type&gt;...&lt;/type&gt;
-  &lt;/dependencies&gt;
-  &lt;dependencies&gt;
-    &lt;!--...--&gt;
-  &lt;/dependencies&gt;
-  &lt;!--...more &quot;dependencies&quot; elements...--&gt;
-  &lt;description&gt;...&lt;/description&gt;
 &lt;/projectVersionMetadata&gt;</code>
       <h2>Example JSON</h2>
       <code class="prettyprint lang-js">{
-  &quot;organization&quot; : {
-    &quot;name&quot; : &quot;...&quot;,
-    &quot;url&quot; : &quot;...&quot;
+  &quot;incomplete&quot; : false,
+  &quot;scm&quot; : {
+    &quot;developerConnection&quot; : &quot;...&quot;,
+    &quot;url&quot; : &quot;...&quot;,
+    &quot;connection&quot; : &quot;...&quot;
   },
   &quot;name&quot; : &quot;...&quot;,
+  &quot;id&quot; : &quot;...&quot;,
+  &quot;dependencies&quot; : [ {
+    &quot;optional&quot; : false,
+    &quot;groupId&quot; : &quot;...&quot;,
+    &quot;scope&quot; : &quot;...&quot;,
+    &quot;artifactId&quot; : &quot;...&quot;,
+    &quot;systemPath&quot; : &quot;...&quot;,
+    &quot;version&quot; : &quot;...&quot;,
+    &quot;classifier&quot; : &quot;...&quot;,
+    &quot;type&quot; : &quot;...&quot;
+  }, ... ],
+  &quot;url&quot; : &quot;...&quot;,
+  &quot;issueManagement&quot; : {
+    &quot;system&quot; : &quot;...&quot;,
+    &quot;url&quot; : &quot;...&quot;
+  },
   &quot;licenses&quot; : [ {
     &quot;name&quot; : &quot;...&quot;,
     &quot;url&quot; : &quot;...&quot;
   }, ... ],
-  &quot;id&quot; : &quot;...&quot;,
-  &quot;url&quot; : &quot;...&quot;,
-  &quot;scm&quot; : {
-    &quot;url&quot; : &quot;...&quot;,
-    &quot;developerConnection&quot; : &quot;...&quot;,
-    &quot;connection&quot; : &quot;...&quot;
-  },
-  &quot;incomplete&quot; : false,
-  &quot;issueManagement&quot; : {
-    &quot;url&quot; : &quot;...&quot;,
-    &quot;system&quot; : &quot;...&quot;
+  &quot;organization&quot; : {
+    &quot;name&quot; : &quot;...&quot;,
+    &quot;url&quot; : &quot;...&quot;
   },
+  &quot;description&quot; : &quot;...&quot;,
   &quot;ciManagement&quot; : {
     &quot;url&quot; : &quot;...&quot;,
     &quot;system&quot; : &quot;...&quot;
   },
   &quot;mailingLists&quot; : [ {
     &quot;subscribeAddress&quot; : &quot;...&quot;,
-    &quot;postAddress&quot; : &quot;...&quot;,
     &quot;unsubscribeAddress&quot; : &quot;...&quot;,
     &quot;name&quot; : &quot;...&quot;,
-    &quot;mainArchiveUrl&quot; : &quot;...&quot;,
-    &quot;otherArchives&quot; : [ &quot;...&quot;, ... ]
-  }, ... ],
-  &quot;dependencies&quot; : [ {
-    &quot;optional&quot; : false,
-    &quot;groupId&quot; : &quot;...&quot;,
-    &quot;version&quot; : &quot;...&quot;,
-    &quot;scope&quot; : &quot;...&quot;,
-    &quot;systemPath&quot; : &quot;...&quot;,
-    &quot;artifactId&quot; : &quot;...&quot;,
-    &quot;classifier&quot; : &quot;...&quot;,
-    &quot;type&quot; : &quot;...&quot;
-  }, ... ],
-  &quot;description&quot; : &quot;...&quot;
+    &quot;postAddress&quot; : &quot;...&quot;,
+    &quot;otherArchives&quot; : [ &quot;...&quot;, ... ],
+    &quot;mainArchiveUrl&quot; : &quot;...&quot;
+  }, ... ]
 }</code>
 
       <div class="clear" />

Modified: archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_proxyConnector.html
URL: http://svn.apache.org/viewvc/archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_proxyConnector.html?rev=1481760&r1=1481759&r2=1481760&view=diff
==============================================================================
--- archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_proxyConnector.html (original)
+++ archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_proxyConnector.html Mon May 13 09:47:47 2013
@@ -130,22 +130,6 @@
       <code class="prettyprint lang-xml">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;proxyConnector&gt;
   &lt;order&gt;...&lt;/order&gt;
-  &lt;propertiesEntries&gt;
-    &lt;key&gt;...&lt;/key&gt;
-    &lt;value&gt;...&lt;/value&gt;
-  &lt;/propertiesEntries&gt;
-  &lt;propertiesEntries&gt;
-    &lt;!--...--&gt;
-  &lt;/propertiesEntries&gt;
-  &lt;!--...more &quot;propertiesEntries&quot; elements...--&gt;
-  &lt;policiesEntries&gt;
-    &lt;key&gt;...&lt;/key&gt;
-    &lt;value&gt;...&lt;/value&gt;
-  &lt;/policiesEntries&gt;
-  &lt;policiesEntries&gt;
-    &lt;!--...--&gt;
-  &lt;/policiesEntries&gt;
-  &lt;!--...more &quot;policiesEntries&quot; elements...--&gt;
   &lt;properties&gt;
     &lt;entry&gt;
       &lt;key&gt;...&lt;/key&gt;
@@ -161,16 +145,29 @@
     &lt;/entry&gt;
     &lt;!--...more entries...--&gt;
   &lt;/properties&gt;
+  &lt;sourceRepoId&gt;...&lt;/sourceRepoId&gt;
   &lt;whiteListPatterns&gt;...&lt;/whiteListPatterns&gt;
   &lt;whiteListPatterns&gt;...&lt;/whiteListPatterns&gt;
   &lt;!--...more &quot;whiteListPatterns&quot; elements...--&gt;
+  &lt;propertiesEntries&gt;
+    &lt;key&gt;...&lt;/key&gt;
+    &lt;value&gt;...&lt;/value&gt;
+  &lt;/propertiesEntries&gt;
+  &lt;propertiesEntries&gt;
+    &lt;!--...--&gt;
+  &lt;/propertiesEntries&gt;
+  &lt;!--...more &quot;propertiesEntries&quot; elements...--&gt;
+  &lt;policiesEntries&gt;
+    &lt;key&gt;...&lt;/key&gt;
+    &lt;value&gt;...&lt;/value&gt;
+  &lt;/policiesEntries&gt;
+  &lt;policiesEntries&gt;
+    &lt;!--...--&gt;
+  &lt;/policiesEntries&gt;
+  &lt;!--...more &quot;policiesEntries&quot; elements...--&gt;
   &lt;targetRepoId&gt;...&lt;/targetRepoId&gt;
-  &lt;sourceRepoId&gt;...&lt;/sourceRepoId&gt;
-  &lt;blackListPatterns&gt;...&lt;/blackListPatterns&gt;
-  &lt;blackListPatterns&gt;...&lt;/blackListPatterns&gt;
-  &lt;!--...more &quot;blackListPatterns&quot; elements...--&gt;
-  &lt;disabled&gt;...&lt;/disabled&gt;
   &lt;proxyId&gt;...&lt;/proxyId&gt;
+  &lt;disabled&gt;...&lt;/disabled&gt;
   &lt;policies&gt;
     &lt;entry&gt;
       &lt;key&gt;...&lt;/key&gt;
@@ -186,10 +183,19 @@
     &lt;/entry&gt;
     &lt;!--...more entries...--&gt;
   &lt;/policies&gt;
+  &lt;blackListPatterns&gt;...&lt;/blackListPatterns&gt;
+  &lt;blackListPatterns&gt;...&lt;/blackListPatterns&gt;
+  &lt;!--...more &quot;blackListPatterns&quot; elements...--&gt;
 &lt;/proxyConnector&gt;</code>
       <h2>Example JSON</h2>
       <code class="prettyprint lang-js">{
   &quot;order&quot; : ...,
+  &quot;properties&quot; : [ {
+    &quot;...&quot; : ...
+  }, {
+  } ],
+  &quot;sourceRepoId&quot; : &quot;...&quot;,
+  &quot;whiteListPatterns&quot; : [ &quot;...&quot;, ... ],
   &quot;propertiesEntries&quot; : [ {
     &quot;key&quot; : &quot;...&quot;,
     &quot;value&quot; : &quot;...&quot;
@@ -198,20 +204,14 @@
     &quot;key&quot; : &quot;...&quot;,
     &quot;value&quot; : &quot;...&quot;
   }, ... ],
-  &quot;properties&quot; : [ {
-    &quot;...&quot; : ...
-  }, {
-  } ],
-  &quot;whiteListPatterns&quot; : [ &quot;...&quot;, ... ],
   &quot;targetRepoId&quot; : &quot;...&quot;,
-  &quot;sourceRepoId&quot; : &quot;...&quot;,
-  &quot;blackListPatterns&quot; : [ &quot;...&quot;, ... ],
-  &quot;disabled&quot; : false,
   &quot;proxyId&quot; : &quot;...&quot;,
+  &quot;disabled&quot; : false,
   &quot;policies&quot; : [ {
     &quot;...&quot; : ...
   }, {
-  } ]
+  } ],
+  &quot;blackListPatterns&quot; : [ &quot;...&quot;, ... ]
 }</code>
 
       <div class="clear" />

Modified: archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_proxyConnectorRule.html
URL: http://svn.apache.org/viewvc/archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_proxyConnectorRule.html?rev=1481760&r1=1481759&r2=1481760&view=diff
==============================================================================
--- archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_proxyConnectorRule.html (original)
+++ archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_proxyConnectorRule.html Mon May 13 09:47:47 2013
@@ -129,24 +129,9 @@
       <h2>Example XML</h2>
       <code class="prettyprint lang-xml">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;proxyConnectorRule&gt;
+  &lt;pattern&gt;...&lt;/pattern&gt;
   &lt;proxyConnectors&gt;
     &lt;order&gt;...&lt;/order&gt;
-    &lt;propertiesEntries&gt;
-      &lt;key&gt;...&lt;/key&gt;
-      &lt;value&gt;...&lt;/value&gt;
-    &lt;/propertiesEntries&gt;
-    &lt;propertiesEntries&gt;
-      &lt;!--...--&gt;
-    &lt;/propertiesEntries&gt;
-    &lt;!--...more &quot;propertiesEntries&quot; elements...--&gt;
-    &lt;policiesEntries&gt;
-      &lt;key&gt;...&lt;/key&gt;
-      &lt;value&gt;...&lt;/value&gt;
-    &lt;/policiesEntries&gt;
-    &lt;policiesEntries&gt;
-      &lt;!--...--&gt;
-    &lt;/policiesEntries&gt;
-    &lt;!--...more &quot;policiesEntries&quot; elements...--&gt;
     &lt;properties&gt;
       &lt;entry&gt;
         &lt;key&gt;...&lt;/key&gt;
@@ -162,16 +147,29 @@
       &lt;/entry&gt;
       &lt;!--...more entries...--&gt;
     &lt;/properties&gt;
+    &lt;sourceRepoId&gt;...&lt;/sourceRepoId&gt;
     &lt;whiteListPatterns&gt;...&lt;/whiteListPatterns&gt;
     &lt;whiteListPatterns&gt;...&lt;/whiteListPatterns&gt;
     &lt;!--...more &quot;whiteListPatterns&quot; elements...--&gt;
+    &lt;propertiesEntries&gt;
+      &lt;key&gt;...&lt;/key&gt;
+      &lt;value&gt;...&lt;/value&gt;
+    &lt;/propertiesEntries&gt;
+    &lt;propertiesEntries&gt;
+      &lt;!--...--&gt;
+    &lt;/propertiesEntries&gt;
+    &lt;!--...more &quot;propertiesEntries&quot; elements...--&gt;
+    &lt;policiesEntries&gt;
+      &lt;key&gt;...&lt;/key&gt;
+      &lt;value&gt;...&lt;/value&gt;
+    &lt;/policiesEntries&gt;
+    &lt;policiesEntries&gt;
+      &lt;!--...--&gt;
+    &lt;/policiesEntries&gt;
+    &lt;!--...more &quot;policiesEntries&quot; elements...--&gt;
     &lt;targetRepoId&gt;...&lt;/targetRepoId&gt;
-    &lt;sourceRepoId&gt;...&lt;/sourceRepoId&gt;
-    &lt;blackListPatterns&gt;...&lt;/blackListPatterns&gt;
-    &lt;blackListPatterns&gt;...&lt;/blackListPatterns&gt;
-    &lt;!--...more &quot;blackListPatterns&quot; elements...--&gt;
-    &lt;disabled&gt;...&lt;/disabled&gt;
     &lt;proxyId&gt;...&lt;/proxyId&gt;
+    &lt;disabled&gt;...&lt;/disabled&gt;
     &lt;policies&gt;
       &lt;entry&gt;
         &lt;key&gt;...&lt;/key&gt;
@@ -187,18 +185,27 @@
       &lt;/entry&gt;
       &lt;!--...more entries...--&gt;
     &lt;/policies&gt;
+    &lt;blackListPatterns&gt;...&lt;/blackListPatterns&gt;
+    &lt;blackListPatterns&gt;...&lt;/blackListPatterns&gt;
+    &lt;!--...more &quot;blackListPatterns&quot; elements...--&gt;
   &lt;/proxyConnectors&gt;
   &lt;proxyConnectors&gt;
     &lt;!--...--&gt;
   &lt;/proxyConnectors&gt;
   &lt;!--...more &quot;proxyConnectors&quot; elements...--&gt;
-  &lt;pattern&gt;...&lt;/pattern&gt;
   &lt;proxyConnectorRuleType&gt;...&lt;/proxyConnectorRuleType&gt;
 &lt;/proxyConnectorRule&gt;</code>
       <h2>Example JSON</h2>
       <code class="prettyprint lang-js">{
+  &quot;pattern&quot; : &quot;...&quot;,
   &quot;proxyConnectors&quot; : [ {
     &quot;order&quot; : ...,
+    &quot;properties&quot; : [ {
+      &quot;...&quot; : ...
+    }, {
+    } ],
+    &quot;sourceRepoId&quot; : &quot;...&quot;,
+    &quot;whiteListPatterns&quot; : [ &quot;...&quot;, ... ],
     &quot;propertiesEntries&quot; : [ {
       &quot;key&quot; : &quot;...&quot;,
       &quot;value&quot; : &quot;...&quot;
@@ -207,22 +214,15 @@
       &quot;key&quot; : &quot;...&quot;,
       &quot;value&quot; : &quot;...&quot;
     }, ... ],
-    &quot;properties&quot; : [ {
-      &quot;...&quot; : ...
-    }, {
-    } ],
-    &quot;whiteListPatterns&quot; : [ &quot;...&quot;, ... ],
     &quot;targetRepoId&quot; : &quot;...&quot;,
-    &quot;sourceRepoId&quot; : &quot;...&quot;,
-    &quot;blackListPatterns&quot; : [ &quot;...&quot;, ... ],
-    &quot;disabled&quot; : false,
     &quot;proxyId&quot; : &quot;...&quot;,
+    &quot;disabled&quot; : false,
     &quot;policies&quot; : [ {
       &quot;...&quot; : ...
     }, {
-    } ]
+    } ],
+    &quot;blackListPatterns&quot; : [ &quot;...&quot;, ... ]
   }, ... ],
-  &quot;pattern&quot; : &quot;...&quot;,
   &quot;proxyConnectorRuleType&quot; : &quot;WHITE_LIST&quot;
 }</code>
 

Modified: archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_redbackRuntimeConfiguration.html
URL: http://svn.apache.org/viewvc/archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_redbackRuntimeConfiguration.html?rev=1481760&r1=1481759&r2=1481760&view=diff
==============================================================================
--- archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_redbackRuntimeConfiguration.html (original)
+++ archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_redbackRuntimeConfiguration.html Mon May 13 09:47:47 2013
@@ -129,32 +129,26 @@
       <h2>Example XML</h2>
       <code class="prettyprint lang-xml">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;redbackRuntimeConfiguration&gt;
+  &lt;useUsersCache&gt;...&lt;/useUsersCache&gt;
   &lt;rbacManagerImpls&gt;...&lt;/rbacManagerImpls&gt;
   &lt;rbacManagerImpls&gt;...&lt;/rbacManagerImpls&gt;
   &lt;!--...more &quot;rbacManagerImpls&quot; elements...--&gt;
-  &lt;userManagerImpls&gt;...&lt;/userManagerImpls&gt;
-  &lt;userManagerImpls&gt;...&lt;/userManagerImpls&gt;
-  &lt;!--...more &quot;userManagerImpls&quot; elements...--&gt;
-  &lt;migratedFromRedbackConfiguration&gt;...&lt;/migratedFromRedbackConfiguration&gt;
-  &lt;configurationPropertiesEntries&gt;
-    &lt;key&gt;...&lt;/key&gt;
-    &lt;value&gt;...&lt;/value&gt;
-  &lt;/configurationPropertiesEntries&gt;
-  &lt;configurationPropertiesEntries&gt;
-    &lt;!--...--&gt;
-  &lt;/configurationPropertiesEntries&gt;
-  &lt;!--...more &quot;configurationPropertiesEntries&quot; elements...--&gt;
-  &lt;useUsersCache&gt;...&lt;/useUsersCache&gt;
   &lt;ldapGroupMappings&gt;
+    &lt;group&gt;...&lt;/group&gt;
     &lt;roleNames&gt;...&lt;/roleNames&gt;
     &lt;roleNames&gt;...&lt;/roleNames&gt;
     &lt;!--...more &quot;roleNames&quot; elements...--&gt;
-    &lt;group&gt;...&lt;/group&gt;
   &lt;/ldapGroupMappings&gt;
   &lt;ldapGroupMappings&gt;
     &lt;!--...--&gt;
   &lt;/ldapGroupMappings&gt;
   &lt;!--...more &quot;ldapGroupMappings&quot; elements...--&gt;
+  &lt;usersCacheConfiguration&gt;
+    &lt;maxElementsInMemory&gt;...&lt;/maxElementsInMemory&gt;
+    &lt;timeToIdleSeconds&gt;...&lt;/timeToIdleSeconds&gt;
+    &lt;timeToLiveSeconds&gt;...&lt;/timeToLiveSeconds&gt;
+    &lt;maxElementsOnDisk&gt;...&lt;/maxElementsOnDisk&gt;
+  &lt;/usersCacheConfiguration&gt;
   &lt;configurationProperties&gt;
     &lt;entry&gt;
       &lt;key&gt;...&lt;/key&gt;
@@ -170,19 +164,25 @@
     &lt;/entry&gt;
     &lt;!--...more entries...--&gt;
   &lt;/configurationProperties&gt;
-  &lt;usersCacheConfiguration&gt;
-    &lt;timeToLiveSeconds&gt;...&lt;/timeToLiveSeconds&gt;
-    &lt;timeToIdleSeconds&gt;...&lt;/timeToIdleSeconds&gt;
-    &lt;maxElementsOnDisk&gt;...&lt;/maxElementsOnDisk&gt;
-    &lt;maxElementsInMemory&gt;...&lt;/maxElementsInMemory&gt;
-  &lt;/usersCacheConfiguration&gt;
+  &lt;userManagerImpls&gt;...&lt;/userManagerImpls&gt;
+  &lt;userManagerImpls&gt;...&lt;/userManagerImpls&gt;
+  &lt;!--...more &quot;userManagerImpls&quot; elements...--&gt;
   &lt;ldapConfiguration&gt;
+    &lt;port&gt;...&lt;/port&gt;
     &lt;baseDn&gt;...&lt;/baseDn&gt;
+    &lt;useRoleNameAsGroup&gt;...&lt;/useRoleNameAsGroup&gt;
     &lt;bindDn&gt;...&lt;/bindDn&gt;
+    &lt;hostName&gt;...&lt;/hostName&gt;
     &lt;bindAuthenticatorEnabled&gt;...&lt;/bindAuthenticatorEnabled&gt;
-    &lt;ssl&gt;...&lt;/ssl&gt;
     &lt;writable&gt;...&lt;/writable&gt;
-    &lt;authenticationMethod&gt;...&lt;/authenticationMethod&gt;
+    &lt;extraPropertiesEntries&gt;
+      &lt;key&gt;...&lt;/key&gt;
+      &lt;value&gt;...&lt;/value&gt;
+    &lt;/extraPropertiesEntries&gt;
+    &lt;extraPropertiesEntries&gt;
+      &lt;!--...--&gt;
+    &lt;/extraPropertiesEntries&gt;
+    &lt;!--...more &quot;extraPropertiesEntries&quot; elements...--&gt;
     &lt;extraProperties&gt;
       &lt;entry&gt;
         &lt;key&gt;...&lt;/key&gt;
@@ -198,68 +198,68 @@
       &lt;/entry&gt;
       &lt;!--...more entries...--&gt;
     &lt;/extraProperties&gt;
-    &lt;useRoleNameAsGroup&gt;...&lt;/useRoleNameAsGroup&gt;
-    &lt;port&gt;...&lt;/port&gt;
+    &lt;password&gt;...&lt;/password&gt;
+    &lt;authenticationMethod&gt;...&lt;/authenticationMethod&gt;
     &lt;contextFactory&gt;...&lt;/contextFactory&gt;
-    &lt;extraPropertiesEntries&gt;
-      &lt;key&gt;...&lt;/key&gt;
-      &lt;value&gt;...&lt;/value&gt;
-    &lt;/extraPropertiesEntries&gt;
-    &lt;extraPropertiesEntries&gt;
-      &lt;!--...--&gt;
-    &lt;/extraPropertiesEntries&gt;
-    &lt;!--...more &quot;extraPropertiesEntries&quot; elements...--&gt;
+    &lt;ssl&gt;...&lt;/ssl&gt;
     &lt;baseGroupsDn&gt;...&lt;/baseGroupsDn&gt;
-    &lt;password&gt;...&lt;/password&gt;
-    &lt;hostName&gt;...&lt;/hostName&gt;
   &lt;/ldapConfiguration&gt;
+  &lt;migratedFromRedbackConfiguration&gt;...&lt;/migratedFromRedbackConfiguration&gt;
+  &lt;configurationPropertiesEntries&gt;
+    &lt;key&gt;...&lt;/key&gt;
+    &lt;value&gt;...&lt;/value&gt;
+  &lt;/configurationPropertiesEntries&gt;
+  &lt;configurationPropertiesEntries&gt;
+    &lt;!--...--&gt;
+  &lt;/configurationPropertiesEntries&gt;
+  &lt;!--...more &quot;configurationPropertiesEntries&quot; elements...--&gt;
 &lt;/redbackRuntimeConfiguration&gt;</code>
       <h2>Example JSON</h2>
       <code class="prettyprint lang-js">{
-  &quot;rbacManagerImpls&quot; : [ &quot;...&quot;, ... ],
-  &quot;userManagerImpls&quot; : [ &quot;...&quot;, ... ],
-  &quot;migratedFromRedbackConfiguration&quot; : false,
-  &quot;configurationPropertiesEntries&quot; : [ {
-    &quot;key&quot; : &quot;...&quot;,
-    &quot;value&quot; : &quot;...&quot;
-  }, ... ],
   &quot;useUsersCache&quot; : false,
+  &quot;rbacManagerImpls&quot; : [ &quot;...&quot;, ... ],
   &quot;ldapGroupMappings&quot; : [ {
-    &quot;roleNames&quot; : [ &quot;...&quot;, ... ],
-    &quot;group&quot; : &quot;...&quot;
+    &quot;group&quot; : &quot;...&quot;,
+    &quot;roleNames&quot; : [ &quot;...&quot;, ... ]
   }, ... ],
+  &quot;usersCacheConfiguration&quot; : {
+    &quot;maxElementsInMemory&quot; : ...,
+    &quot;timeToIdleSeconds&quot; : ...,
+    &quot;timeToLiveSeconds&quot; : ...,
+    &quot;maxElementsOnDisk&quot; : ...
+  },
   &quot;configurationProperties&quot; : [ {
     &quot;...&quot; : ...
   }, {
   } ],
-  &quot;usersCacheConfiguration&quot; : {
-    &quot;timeToLiveSeconds&quot; : ...,
-    &quot;timeToIdleSeconds&quot; : ...,
-    &quot;maxElementsOnDisk&quot; : ...,
-    &quot;maxElementsInMemory&quot; : ...
-  },
+  &quot;userManagerImpls&quot; : [ &quot;...&quot;, ... ],
   &quot;ldapConfiguration&quot; : {
+    &quot;port&quot; : ...,
     &quot;baseDn&quot; : &quot;...&quot;,
+    &quot;useRoleNameAsGroup&quot; : false,
     &quot;bindDn&quot; : &quot;...&quot;,
+    &quot;hostName&quot; : &quot;...&quot;,
     &quot;bindAuthenticatorEnabled&quot; : false,
-    &quot;ssl&quot; : false,
     &quot;writable&quot; : false,
-    &quot;authenticationMethod&quot; : &quot;...&quot;,
-    &quot;extraProperties&quot; : [ {
-      &quot;...&quot; : ...
-    }, {
-    } ],
-    &quot;useRoleNameAsGroup&quot; : false,
-    &quot;port&quot; : ...,
-    &quot;contextFactory&quot; : &quot;...&quot;,
     &quot;extraPropertiesEntries&quot; : [ {
       &quot;key&quot; : &quot;...&quot;,
       &quot;value&quot; : &quot;...&quot;
     }, ... ],
-    &quot;baseGroupsDn&quot; : &quot;...&quot;,
+    &quot;extraProperties&quot; : [ {
+      &quot;...&quot; : ...
+    }, {
+    } ],
     &quot;password&quot; : &quot;...&quot;,
-    &quot;hostName&quot; : &quot;...&quot;
-  }
+    &quot;authenticationMethod&quot; : &quot;...&quot;,
+    &quot;contextFactory&quot; : &quot;...&quot;,
+    &quot;ssl&quot; : false,
+    &quot;baseGroupsDn&quot; : &quot;...&quot;
+  },
+  &quot;migratedFromRedbackConfiguration&quot; : false,
+  &quot;configurationPropertiesEntries&quot; : [ {
+    &quot;key&quot; : &quot;...&quot;,
+    &quot;value&quot; : &quot;...&quot;
+  }, ... ]
 }</code>
 
       <div class="clear" />

Modified: archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_remoteRepository.html
URL: http://svn.apache.org/viewvc/archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_remoteRepository.html?rev=1481760&r1=1481759&r2=1481760&view=diff
==============================================================================
--- archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_remoteRepository.html (original)
+++ archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_remoteRepository.html Mon May 13 09:47:47 2013
@@ -130,27 +130,6 @@
       <code class="prettyprint lang-xml">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;remoteRepository&gt;
   &lt;downloadRemoteIndex&gt;...&lt;/downloadRemoteIndex&gt;
-  &lt;timeout&gt;...&lt;/timeout&gt;
-  &lt;remoteDownloadTimeout&gt;...&lt;/remoteDownloadTimeout&gt;
-  &lt;remoteIndexUrl&gt;...&lt;/remoteIndexUrl&gt;
-  &lt;extraHeaders&gt;
-    &lt;entry&gt;
-      &lt;key&gt;...&lt;/key&gt;
-      &lt;value&gt;...&lt;/value&gt;
-    &lt;/entry&gt;
-    &lt;entry&gt;
-      &lt;key&gt;
-        &lt;!--(another &#39;string&#39; type)--&gt;
-      &lt;/key&gt;
-      &lt;value&gt;
-        &lt;!--(another &#39;string&#39; type)--&gt;
-      &lt;/value&gt;
-    &lt;/entry&gt;
-    &lt;!--...more entries...--&gt;
-  &lt;/extraHeaders&gt;
-  &lt;password&gt;...&lt;/password&gt;
-  &lt;url&gt;...&lt;/url&gt;
-  &lt;remoteDownloadNetworkProxyId&gt;...&lt;/remoteDownloadNetworkProxyId&gt;
   &lt;extraHeadersEntries&gt;
     &lt;key&gt;...&lt;/key&gt;
     &lt;value&gt;...&lt;/value&gt;
@@ -174,9 +153,13 @@
     &lt;/entry&gt;
     &lt;!--...more entries...--&gt;
   &lt;/extraParameters&gt;
+  &lt;userName&gt;...&lt;/userName&gt;
+  &lt;remoteDownloadNetworkProxyId&gt;...&lt;/remoteDownloadNetworkProxyId&gt;
+  &lt;timeout&gt;...&lt;/timeout&gt;
   &lt;downloadRemoteIndexOnStartup&gt;...&lt;/downloadRemoteIndexOnStartup&gt;
+  &lt;password&gt;...&lt;/password&gt;
   &lt;cronExpression&gt;...&lt;/cronExpression&gt;
-  &lt;userName&gt;...&lt;/userName&gt;
+  &lt;remoteIndexUrl&gt;...&lt;/remoteIndexUrl&gt;
   &lt;extraParametersEntries&gt;
     &lt;key&gt;...&lt;/key&gt;
     &lt;value&gt;...&lt;/value&gt;
@@ -185,25 +168,32 @@
     &lt;!--...--&gt;
   &lt;/extraParametersEntries&gt;
   &lt;!--...more &quot;extraParametersEntries&quot; elements...--&gt;
+  &lt;url&gt;...&lt;/url&gt;
+  &lt;remoteDownloadTimeout&gt;...&lt;/remoteDownloadTimeout&gt;
+  &lt;extraHeaders&gt;
+    &lt;entry&gt;
+      &lt;key&gt;...&lt;/key&gt;
+      &lt;value&gt;...&lt;/value&gt;
+    &lt;/entry&gt;
+    &lt;entry&gt;
+      &lt;key&gt;
+        &lt;!--(another &#39;string&#39; type)--&gt;
+      &lt;/key&gt;
+      &lt;value&gt;
+        &lt;!--(another &#39;string&#39; type)--&gt;
+      &lt;/value&gt;
+    &lt;/entry&gt;
+    &lt;!--...more entries...--&gt;
+  &lt;/extraHeaders&gt;
   &lt;description&gt;...&lt;/description&gt;
   &lt;indexDirectory&gt;...&lt;/indexDirectory&gt;
   &lt;id&gt;...&lt;/id&gt;
-  &lt;name&gt;...&lt;/name&gt;
   &lt;layout&gt;...&lt;/layout&gt;
+  &lt;name&gt;...&lt;/name&gt;
 &lt;/remoteRepository&gt;</code>
       <h2>Example JSON</h2>
       <code class="prettyprint lang-js">{
   &quot;downloadRemoteIndex&quot; : false,
-  &quot;timeout&quot; : ...,
-  &quot;remoteDownloadTimeout&quot; : ...,
-  &quot;remoteIndexUrl&quot; : &quot;...&quot;,
-  &quot;extraHeaders&quot; : [ {
-    &quot;...&quot; : ...
-  }, {
-  } ],
-  &quot;password&quot; : &quot;...&quot;,
-  &quot;url&quot; : &quot;...&quot;,
-  &quot;remoteDownloadNetworkProxyId&quot; : &quot;...&quot;,
   &quot;extraHeadersEntries&quot; : [ {
     &quot;key&quot; : &quot;...&quot;,
     &quot;value&quot; : &quot;...&quot;
@@ -212,18 +202,28 @@
     &quot;...&quot; : ...
   }, {
   } ],
+  &quot;userName&quot; : &quot;...&quot;,
+  &quot;remoteDownloadNetworkProxyId&quot; : &quot;...&quot;,
+  &quot;timeout&quot; : ...,
   &quot;downloadRemoteIndexOnStartup&quot; : false,
+  &quot;password&quot; : &quot;...&quot;,
   &quot;cronExpression&quot; : &quot;...&quot;,
-  &quot;userName&quot; : &quot;...&quot;,
+  &quot;remoteIndexUrl&quot; : &quot;...&quot;,
   &quot;extraParametersEntries&quot; : [ {
     &quot;key&quot; : &quot;...&quot;,
     &quot;value&quot; : &quot;...&quot;
   }, ... ],
+  &quot;url&quot; : &quot;...&quot;,
+  &quot;remoteDownloadTimeout&quot; : ...,
+  &quot;extraHeaders&quot; : [ {
+    &quot;...&quot; : ...
+  }, {
+  } ],
   &quot;description&quot; : &quot;...&quot;,
   &quot;indexDirectory&quot; : &quot;...&quot;,
   &quot;id&quot; : &quot;...&quot;,
-  &quot;name&quot; : &quot;...&quot;,
-  &quot;layout&quot; : &quot;...&quot;
+  &quot;layout&quot; : &quot;...&quot;,
+  &quot;name&quot; : &quot;...&quot;
 }</code>
 
       <div class="clear" />

Modified: archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_repositoryGroup.html
URL: http://svn.apache.org/viewvc/archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_repositoryGroup.html?rev=1481760&r1=1481759&r2=1481760&view=diff
==============================================================================
--- archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_repositoryGroup.html (original)
+++ archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_repositoryGroup.html Mon May 13 09:47:47 2013
@@ -129,6 +129,7 @@
       <h2>Example XML</h2>
       <code class="prettyprint lang-xml">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;repositoryGroup&gt;
+  &lt;mergedIndexPath&gt;...&lt;/mergedIndexPath&gt;
   &lt;repositories&gt;...&lt;/repositories&gt;
   &lt;repositories&gt;...&lt;/repositories&gt;
   &lt;!--...more &quot;repositories&quot; elements...--&gt;
@@ -136,6 +137,7 @@
 &lt;/repositoryGroup&gt;</code>
       <h2>Example JSON</h2>
       <code class="prettyprint lang-js">{
+  &quot;mergedIndexPath&quot; : &quot;...&quot;,
   &quot;repositories&quot; : [ &quot;...&quot;, ... ],
   &quot;id&quot; : &quot;...&quot;
 }</code>

Modified: archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_repositoryScannerStatistics.html
URL: http://svn.apache.org/viewvc/archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_repositoryScannerStatistics.html?rev=1481760&r1=1481759&r2=1481760&view=diff
==============================================================================
--- archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_repositoryScannerStatistics.html (original)
+++ archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_repositoryScannerStatistics.html Mon May 13 09:47:47 2013
@@ -130,31 +130,31 @@
       <code class="prettyprint lang-xml">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;repositoryScannerStatistics&gt;
   &lt;managedRepository&gt;
-    &lt;cronExpression&gt;...&lt;/cronExpression&gt;
-    &lt;location&gt;...&lt;/location&gt;
-    &lt;releases&gt;...&lt;/releases&gt;
-    &lt;daysOlder&gt;...&lt;/daysOlder&gt;
-    &lt;resetStats&gt;...&lt;/resetStats&gt;
-    &lt;stageRepoNeeded&gt;...&lt;/stageRepoNeeded&gt;
-    &lt;snapshots&gt;...&lt;/snapshots&gt;
-    &lt;retentionCount&gt;...&lt;/retentionCount&gt;
     &lt;stagingRepository&gt;
       &lt;!--...--&gt;
       &lt;description&gt;...&lt;/description&gt;
       &lt;indexDirectory&gt;...&lt;/indexDirectory&gt;
       &lt;id&gt;...&lt;/id&gt;
-      &lt;name&gt;...&lt;/name&gt;
       &lt;layout&gt;...&lt;/layout&gt;
+      &lt;name&gt;...&lt;/name&gt;
     &lt;/stagingRepository&gt;
-    &lt;deleteReleasedSnapshots&gt;...&lt;/deleteReleasedSnapshots&gt;
+    &lt;daysOlder&gt;...&lt;/daysOlder&gt;
+    &lt;location&gt;...&lt;/location&gt;
+    &lt;stageRepoNeeded&gt;...&lt;/stageRepoNeeded&gt;
+    &lt;scanned&gt;...&lt;/scanned&gt;
     &lt;blockRedeployments&gt;...&lt;/blockRedeployments&gt;
+    &lt;deleteReleasedSnapshots&gt;...&lt;/deleteReleasedSnapshots&gt;
+    &lt;snapshots&gt;...&lt;/snapshots&gt;
     &lt;skipPackedIndexCreation&gt;...&lt;/skipPackedIndexCreation&gt;
-    &lt;scanned&gt;...&lt;/scanned&gt;
+    &lt;cronExpression&gt;...&lt;/cronExpression&gt;
+    &lt;resetStats&gt;...&lt;/resetStats&gt;
+    &lt;releases&gt;...&lt;/releases&gt;
+    &lt;retentionCount&gt;...&lt;/retentionCount&gt;
     &lt;description&gt;...&lt;/description&gt;
     &lt;indexDirectory&gt;...&lt;/indexDirectory&gt;
     &lt;id&gt;...&lt;/id&gt;
-    &lt;name&gt;...&lt;/name&gt;
     &lt;layout&gt;...&lt;/layout&gt;
+    &lt;name&gt;...&lt;/name&gt;
   &lt;/managedRepository&gt;
   &lt;consumerScanningStatistics&gt;
     &lt;consumerKey&gt;...&lt;/consumerKey&gt;
@@ -172,31 +172,31 @@
       <h2>Example JSON</h2>
       <code class="prettyprint lang-js">{
   &quot;managedRepository&quot; : {
-    &quot;cronExpression&quot; : &quot;...&quot;,
-    &quot;location&quot; : &quot;...&quot;,
-    &quot;releases&quot; : false,
-    &quot;daysOlder&quot; : ...,
-    &quot;resetStats&quot; : false,
-    &quot;stageRepoNeeded&quot; : false,
-    &quot;snapshots&quot; : false,
-    &quot;retentionCount&quot; : ...,
     &quot;stagingRepository&quot; : {
       &quot;...&quot; : ...,
       &quot;description&quot; : &quot;...&quot;,
       &quot;indexDirectory&quot; : &quot;...&quot;,
       &quot;id&quot; : &quot;...&quot;,
-      &quot;name&quot; : &quot;...&quot;,
-      &quot;layout&quot; : &quot;...&quot;
+      &quot;layout&quot; : &quot;...&quot;,
+      &quot;name&quot; : &quot;...&quot;
     },
-    &quot;deleteReleasedSnapshots&quot; : false,
+    &quot;daysOlder&quot; : ...,
+    &quot;location&quot; : &quot;...&quot;,
+    &quot;stageRepoNeeded&quot; : false,
+    &quot;scanned&quot; : false,
     &quot;blockRedeployments&quot; : false,
+    &quot;deleteReleasedSnapshots&quot; : false,
+    &quot;snapshots&quot; : false,
     &quot;skipPackedIndexCreation&quot; : false,
-    &quot;scanned&quot; : false,
+    &quot;cronExpression&quot; : &quot;...&quot;,
+    &quot;resetStats&quot; : false,
+    &quot;releases&quot; : false,
+    &quot;retentionCount&quot; : ...,
     &quot;description&quot; : &quot;...&quot;,
     &quot;indexDirectory&quot; : &quot;...&quot;,
     &quot;id&quot; : &quot;...&quot;,
-    &quot;name&quot; : &quot;...&quot;,
-    &quot;layout&quot; : &quot;...&quot;
+    &quot;layout&quot; : &quot;...&quot;,
+    &quot;name&quot; : &quot;...&quot;
   },
   &quot;consumerScanningStatistics&quot; : [ {
     &quot;consumerKey&quot; : &quot;...&quot;,

Modified: archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_scm.html
URL: http://svn.apache.org/viewvc/archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_scm.html?rev=1481760&r1=1481759&r2=1481760&view=diff
==============================================================================
--- archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_scm.html (original)
+++ archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_scm.html Mon May 13 09:47:47 2013
@@ -129,14 +129,14 @@
       <h2>Example XML</h2>
       <code class="prettyprint lang-xml">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;scm&gt;
-  &lt;url&gt;...&lt;/url&gt;
   &lt;developerConnection&gt;...&lt;/developerConnection&gt;
+  &lt;url&gt;...&lt;/url&gt;
   &lt;connection&gt;...&lt;/connection&gt;
 &lt;/scm&gt;</code>
       <h2>Example JSON</h2>
       <code class="prettyprint lang-js">{
-  &quot;url&quot; : &quot;...&quot;,
   &quot;developerConnection&quot; : &quot;...&quot;,
+  &quot;url&quot; : &quot;...&quot;,
   &quot;connection&quot; : &quot;...&quot;
 }</code>
 

Modified: archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_uiConfiguration.html
URL: http://svn.apache.org/viewvc/archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_uiConfiguration.html?rev=1481760&r1=1481759&r2=1481760&view=diff
==============================================================================
--- archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_uiConfiguration.html (original)
+++ archiva/site-content/docs/1.4-M4-SNAPSHOT/rest-docs-archiva-rest-api/el_ns0_uiConfiguration.html Mon May 13 09:47:47 2013
@@ -129,16 +129,16 @@
       <h2>Example XML</h2>
       <code class="prettyprint lang-xml">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;uiConfiguration&gt;
-  &lt;showFindArtifacts&gt;...&lt;/showFindArtifacts&gt;
   &lt;disableRegistration&gt;...&lt;/disableRegistration&gt;
+  &lt;showFindArtifacts&gt;...&lt;/showFindArtifacts&gt;
   &lt;appletFindEnabled&gt;...&lt;/appletFindEnabled&gt;
   &lt;applicationUrl&gt;...&lt;/applicationUrl&gt;
   &lt;disableEasterEggs&gt;...&lt;/disableEasterEggs&gt;
 &lt;/uiConfiguration&gt;</code>
       <h2>Example JSON</h2>
       <code class="prettyprint lang-js">{
-  &quot;showFindArtifacts&quot; : false,
   &quot;disableRegistration&quot; : false,
+  &quot;showFindArtifacts&quot; : false,
   &quot;appletFindEnabled&quot; : false,
   &quot;applicationUrl&quot; : &quot;...&quot;,
   &quot;disableEasterEggs&quot; : false