archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sk...@apache.org
Subject svn commit: r1488654 - in /archiva/trunk: ./ archiva-docs/ archiva-modules/archiva-base/ archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/ archiva-modules/archiva-base/archiva-pr...
Date Sun, 02 Jun 2013 09:30:23 GMT
Author: skygo
Date: Sun Jun  2 09:30:22 2013
New Revision: 1488654

URL: http://svn.apache.org/r1488654
Log:
Merge archiva-MRM-1756 to trunk

Added:
    archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/PluginsService.java
      - copied unchanged from r1488653, archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/PluginsService.java
    archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPluginsServices.java
      - copied unchanged from r1488653, archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPluginsServices.java
    archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/PluginServiceTest.java
      - copied unchanged from r1488653, archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/PluginServiceTest.java
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/nbactions.xml
      - copied unchanged from r1488653, archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/nbactions.xml
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/
      - copied from r1488653, archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/cookie-information.js
      - copied unchanged from r1488653, archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/cookie-information.js
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/require.2.1.6.js
      - copied unchanged from r1488653, archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/require.2.1.6.js
Removed:
    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/archiva/network-proxies.js
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/proxy-connectors-rules.js
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/proxy-connectors.js
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/repositories.js
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/repository-groups.js
Modified:
    archiva/trunk/   (props changed)
    archiva/trunk/archiva-docs/   (props changed)
    archiva/trunk/archiva-modules/archiva-base/   (props changed)
    archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
  (props changed)
    archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/
  (props changed)
    archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/
  (props changed)
    archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/
  (props changed)
    archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
  (props changed)
    archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/
  (props changed)
    archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/
  (props changed)
    archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock/
  (props changed)
    archiva/trunk/archiva-modules/archiva-web/   (props changed)
    archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
    archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
    archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java
  (props changed)
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/archiva.css
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/index.html
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
    archiva/trunk/archiva-modules/archiva-web/archiva-webdav/   (props changed)
    archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/
  (props changed)
    archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/
  (props changed)
    archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/
  (props changed)
    archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
  (props changed)
    archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/
  (props changed)
    archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/
  (props changed)
    archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
  (props changed)
    archiva/trunk/archiva-modules/plugins/repository-statistics/   (props changed)
    archiva/trunk/archiva-modules/plugins/repository-statistics/pom.xml   (props changed)
    archiva/trunk/archiva-modules/plugins/repository-statistics/src/   (props changed)
    archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/   (props changed)
    archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/   (props changed)
    archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/   (props
changed)
    archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/
  (props changed)
    archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/
  (props changed)
    archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/
  (props changed)
    archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/
  (props changed)
    archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/
  (props changed)
    archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java
  (props changed)

Propchange: archiva/trunk/
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk:r960322
  Merged /archiva/branches/archiva-MRM-1756:r1475941-1488653

Propchange: archiva/trunk/archiva-docs/
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-docs:r960322
  Merged /archiva/branches/archiva-MRM-1756/archiva-docs:r1475941-1488653

Propchange: archiva/trunk/archiva-modules/archiva-base/
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-modules/archiva-base:r960322
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base:r1475941-1488653

Propchange: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:r960322
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:r1475941-1488653

Propchange: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva:r887040-909464*,960322
  Merged /archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva:r887040-909464
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva:r1475941-1488653

Propchange: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata:r887040-909464*,960322
  Merged /archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata:r887040-909464
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata:r1475941-1488653

Propchange: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository:r887040-909464*,960322
  Merged /archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository:r887040-909464
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository:r1475941-1488653

Propchange: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:r960322
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:r1475941-1488653

Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler:r882055-909464*,960322
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler:r1475941-1488653
  Merged /archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler:r882055-909464

Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing:r882055-909464*,960322
  Merged /archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing:r882055-909464
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing:r1475941-1488653

Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun  2 09:30:22 2013
@@ -0,0 +1,8 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock:1214301
+/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock:1066068-1091313,1098897,1102210,1103608
+/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock:1475941-1488653
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock:699795-705848
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock:825850-882054

Propchange: archiva/trunk/archiva-modules/archiva-web/
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-modules/archiva-web:r960322
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web:r1475941-1488653

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml?rev=1488654&r1=1488653&r2=1488654&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
Sun Jun  2 09:30:22 2013
@@ -68,6 +68,7 @@
       <ref bean="searchService#rest"/>
       <ref bean="commonServices#rest"/>
       <ref bean="browseService#rest"/>
+      <ref bean="pluginsService#rest"/>
       <ref bean="systemStatusService#rest"/>
       <ref bean="reportRepositoriesService#rest" />
       <ref bean="mergeRepositoriesService#rest"/>

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java?rev=1488654&r1=1488653&r2=1488654&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
Sun Jun  2 09:30:22 2013
@@ -53,6 +53,7 @@ import javax.ws.rs.core.MediaType;
 import java.io.File;
 import java.util.Collections;
 import java.util.Date;
+import org.apache.archiva.rest.api.services.PluginsService;
 
 /**
  * @author Olivier Lamy
@@ -165,6 +166,14 @@ public abstract class AbstractArchivaRes
     {
         return getService( PingService.class, null );
     }
+    
+    protected PluginsService getPluginsService()
+    {
+        PluginsService service = getService( PluginsService.class, null );
+        WebClient.client( service ).accept( MediaType.TEXT_PLAIN );
+        WebClient.client( service ).type( MediaType.TEXT_PLAIN );
+        return service;
+    }
 
     protected RemoteRepositoriesService getRemoteRepositoriesService()
     {

Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataRepository.java:r960322
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java:r1475941-1488653

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1488654&r1=1488653&r2=1488654&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Sun Jun  2 09:30:22 2013
@@ -869,6 +869,7 @@
           <artifactId>apache-rat-plugin</artifactId>
           <configuration>
             <excludes>
+              <exclude>nbactions.xml</exclude>  
               <exclude>src/main/webapp/css/*.css</exclude>
               <exclude>src/main/webapp/js/*.js</exclude>
               <exclude>src/site/resources/css/*.css</exclude>

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/archiva.css
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/archiva.css?rev=1488654&r1=1488653&r2=1488654&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/archiva.css
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/archiva.css
Sun Jun  2 09:30:22 2013
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+body {
+    background-color: #a0a0a0;
+}
 /* medium-spinner */
 #medium-spinner {
  z-index: 20001;

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/index.html?rev=1488654&r1=1488653&r2=1488654&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/index.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/index.html Sun
Jun  2 09:30:22 2013
@@ -34,7 +34,7 @@
     <script type="text/javascript" src="js/jquery-1.9.1.min.js"></script>
     <script type="text/javascript" src="js/jquery-ui-1.9.2.custom.min.js"></script>
     <script type="text/javascript" src="js/sammy.0.7.4.js"></script>
-    <script type="text/javascript" data-main="js/archiva/archiva.js" src="js/require.2.1.5.js"></script>
+    <script type="text/javascript" data-main="js/archiva/archiva.js" src="js/require.2.1.6.js"></script>
 
     <title>Apache Archiva</title>
 

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js?rev=1488654&r1=1488653&r2=1488654&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js
Sun Jun  2 09:30:22 2013
@@ -88,21 +88,25 @@ $.ajax({
               "redback.user": "redback/user",
               "redback.users": "redback/users",
               "redback.templates": "redback/redback-tmpl",
-              "archiva.general-admin":"archiva/general-admin",
+              "archiva.cookie-information":"archiva/cookie-information",
               "archiva.templates": "archiva/main-tmpl",
-              "archiva.repositories": "archiva/repositories",
-              "archiva.network-proxies": "archiva/network-proxies",
-              "archiva.proxy-connectors": "archiva/proxy-connectors",
-              "archiva.repository-groups": "archiva/repository-groups",
+             // "archiva.repositories": "archiva/repositories",
+             // "archiva.network-proxies": "archiva/network-proxies",
+             // "archiva.proxy-connectors": "archiva/proxy-connectors",
+             // "archiva.repository-groups": "archiva/repository-groups",
               "archiva.artifacts-management": "archiva/artifacts-management",
               "archiva.search": "archiva/search",
-              "archiva.proxy-connectors-rules": "archiva/proxy-connectors-rules",
+             // "archiva.proxy-connectors-rules": "archiva/proxy-connectors-rules",
               "archiva.docs": "archiva/docs",
               "archiva.main": "archiva/main"
           }
       });
-
-      requirejs(['jquery','jquery.tmpl','jquery.ui','i18n','sammy','startup','utils','domReady!','archiva.main','archiva.general-admin'],
function () {
+      
+      
+ 
+  
+  
+      requirejs(['jquery','jquery.tmpl','jquery.ui','i18n','sammy','startup','utils','domReady!','archiva.main','archiva.cookie-information'],
function () {
         loadi18n(function () {
           $.ajax({
             url: "restServices/archivaUiServices/runtimeInfoService/archivaRuntimeInfo/"+usedLang(),

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js?rev=1488654&r1=1488653&r2=1488654&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
Sun Jun  2 09:30:22 2013
@@ -18,9 +18,7 @@
  */
 define("archiva.main",["jquery","jquery.ui","sammy","jquery.tmpl",'i18n',"jquery.cookie","bootstrap","archiva.search",
          "jquery.validate","jquery.json","knockout","redback.templates","archiva.templates",
-          "redback.roles","redback","archiva.general-admin","archiva.repositories",
-          "archiva.network-proxies","archiva.proxy-connectors","archiva.repository-groups","archiva.artifacts-management",
-          "archiva.proxy-connectors-rules","archiva.docs"],
+          "redback.roles","redback","archiva.artifacts-management","archiva.docs"],
 function(jquery,ui,sammy,tmpl,i18n,jqueryCookie,bootstrap,archivaSearch,jqueryValidate,jqueryJson,ko)
{
 
   /**
@@ -224,25 +222,36 @@ function(jquery,ui,sammy,tmpl,i18n,jquer
         {  text : $.i18n.prop('menu.artifacts.upload') , id: "menu-find-upload-a", href:
"#upload" , redback: "{permissions: ['archiva-upload-repository']}", func: function(){displayUploadArtifact(true)}}
       ]);
       this.administrationMenuItems = ko.observableArray([
-        {  text : $.i18n.prop('menu.administration') , id: null},
-        {  text : $.i18n.prop('menu.repository.groups')        , id: "menu-repository-groups-list-a"
     , href: "#repositorygroup"      , redback: "{permissions: ['archiva-manage-configuration']}",
func: function(){displayRepositoryGroups()}},
-        {  text : $.i18n.prop('menu.repositories')             , id: "menu-repositories-list-a"
          , href: "#repositorylist"       , redback: "{permissions: ['archiva-manage-configuration']}",
func: function(){displayRepositoriesGrid()}},
-        {  text : $.i18n.prop('menu.proxy-connectors')         , id: "menu-proxy-connectors-list-a"
      , href: "#proxyconnectors"      , redback: "{permissions: ['archiva-manage-configuration']}",
func: function(){displayProxyConnectors()}},
-        {  text : $.i18n.prop('menu.proxy-connectors-rules')   , id: "menu.proxy-connectors-rules-list-a"
, href: "#proxyconnectorsrules" , redback: "{permissions: ['archiva-manage-configuration']}",
func: function(){displayProxyConnectorsRules()}},
-        {  text : $.i18n.prop('menu.network-proxies')          , id: "menu-network-proxies-list-a"
       , href: "#networkproxies"       , redback: "{permissions: ['archiva-manage-configuration']}",
func: function(){displayNetworkProxies()}},
-        {  text : $.i18n.prop('menu.legacy-artifact-support')  , id: "menu-legacy-support-list-a"
        , href: "#legacy"               , redback: "{permissions: ['archiva-manage-configuration']}",
func: function(){displayLegacyArtifactPathSupport()}},
-        {  text : $.i18n.prop('menu.repository-scanning')      , id: "menu-repository-scanning-list-a"
   , href: "#scanningList"         , redback: "{permissions: ['archiva-manage-configuration']}",
func: function(){displayRepositoryScanning()}},
-        {  text : $.i18n.prop('menu.runtime-configuration')    , id: "menu-runtime-configuration-list-a"
 , href: "#runtimeconfig"        , redback: "{permissions: ['archiva-manage-configuration']}",
func: function(){displayRuntimeConfiguration()}},
-        {  text : $.i18n.prop('menu.system-status')            , id: "menu-system-status-list-a"
         , href: "#status"               , redback: "{permissions: ['archiva-manage-configuration']}",
func: function(){displaySystemStatus()}},
-        {  text : $.i18n.prop('menu.ui-configuration')         , id: "menu-ui-configuration-list-a"
      , href: "#uiconfig"             , redback: "{permissions: ['archiva-manage-configuration']}",
func: function(){displayUiConfiguration()}},
-        {  text : $.i18n.prop('menu.reports')                  , id: "menu-report-list-a"
                , href: "#reports"              , redback: "{permissions: ['archiva-manage-configuration']}",
func: function(){displayReportsPage()}}
-      ]);
-      
-      this.usersMenuItems = ko.observableArray([
+        {text: $.i18n.prop('menu.administration'), id: null ,order : 1}     ]);
+        
+        var pluginsURL = "restServices/archivaServices/pluginsService/getAdminPlugins";
+        $.ajax(pluginsURL, {
+            type: "GET",
+            dataType: 'text',
+            
+            success: function(data) {
+               $.each(data.split("|"), function(key, value) {
+                    require([value], function() {
+                        showMenu(self.administrationMenuItems);
+                        // sort menu according to order field
+                        // 
+                        self.administrationMenuItems.sort(function(left, right) {
+                            return left.order == right.order ? 0 : (left.order < right.order
? -1 : 1)
+                        })
+                    });
+
+                });
+                
+            }
+
+        });
+        
+       
+        this.usersMenuItems = ko.observableArray([
         {  text : $.i18n.prop('menu.users') , id: null},
-        {  text : $.i18n.prop('menu.users.manage')          , id: "menu-users-list-a"   
              , href: "#users"         , redback: "{permissions: ['archiva-manage-users']}",
func: function(){displayUsersGrid()}},
-        {  text : $.i18n.prop('menu.users.roles')           , id: "menu-roles-list-a"   
              , href: "#roles"         , redback: "{permissions: ['archiva-manage-users']}",
func: function(){displayRolesGrid()}},
-        {  text : $.i18n.prop('menu.users-runtime-configuration') , id: "menu-redback-runtime-configuration-list-a"
 , href: "#redbackruntimeconfig" , redback: "{permissions: ['archiva-manage-configuration']}",
func: function(){displayRedbackRuntimeConfiguration()}}
+        {  text : $.i18n.prop('menu.users.manage')          , id: "menu-users-list-a"   
              , href: "#users"         , redback: "{permissions: ['archiva-manage-users']}",
func: function(){displayUsersGrid();}},
+        {  text : $.i18n.prop('menu.users.roles')           , id: "menu-roles-list-a"   
              , href: "#roles"         , redback: "{permissions: ['archiva-manage-users']}",
func: function(){displayRolesGrid();}},
+        {  text : $.i18n.prop('menu.users-runtime-configuration') , id: "menu-redback-runtime-configuration-list-a"
 , href: "#redbackruntimeconfig" , redback: "{permissions: ['archiva-manage-configuration']}",
func: function(){displayRedbackRuntimeConfiguration();}}
       ]);
 
       this.docsMenuItems = ko.observableArray([
@@ -767,7 +776,7 @@ function(jquery,ui,sammy,tmpl,i18n,jquer
       $("#main-content" ).html($("#welcome" ).tmpl({runtimeInfo: window.archivaRuntimeInfo}));
       drawQuickSearchAutocomplete("#quick-search-autocomplete-welcome");
     });
-  }
+  };
 
   userLoggedCallbackFn=function(user){
     $.log("userLoggedCallbackFn:"+ (user?user.username():null));
@@ -891,18 +900,18 @@ function(jquery,ui,sammy,tmpl,i18n,jquer
            }
         );
       },
-      select: function( event, ui ) {
-        $.log("select artifactId:"+ui.item.artifactId);
-        window.sammyArchivaApplication.setLocation("#quicksearch~"+ui.item.artifactId);
-      }
-		}).data( "autocomplete" )._renderItem = function( ul, item ) {
-							return $( "<li></li>" )
-								.data( "item.autocomplete", item )
-								.append( "<a>" + item.artifactId + "</a>" )
-								.appendTo( ul );
-						};
+            select: function(event, ui) {
+                $.log("select artifactId:" + ui.item.artifactId);
+                window.sammyArchivaApplication.setLocation("#quicksearch~" + ui.item.artifactId);
+            }
+        }).data("autocomplete")._renderItem = function(ul, item) {
+            return $("<li></li>")
+                    .data("item.autocomplete", item)
+                    .append("<a>" + item.artifactId + "</a>")
+                    .appendTo(ul);
+        };
 
-  }
+    };
 
 
 });

Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-modules/archiva-web/archiva-webdav:r960322
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webdav:r1475941-1488653

Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva:r887040-909464*,960322
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva:r1475941-1488653
  Merged /archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva:r887040-909464

Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata:r887040-909464*,960322
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata:r1475941-1488653
  Merged /archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata:r887040-909464

Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository:r887040-909464*,960322
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository:r1475941-1488653
  Merged /archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository:r887040-909464

Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:r960322
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:r1475941-1488653

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:r882384-909464*,960322
  Merged /archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:r882384-909464
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:r1475941-1488653

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:r882384-909464*,960322
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:r1475941-1488653
  Merged /archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:r882384-909464

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:r960322
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:r1475941-1488653

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-modules/plugins/repository-statistics:r887040-909464*,960322
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics:r1475941-1488653
  Merged /archiva/trunk/archiva-modules/plugins/repository-statistics:r887040-909464

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/pom.xml
------------------------------------------------------------------------------
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/pom.xml:r1475941-1488653

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-modules/plugins/repository-statistics/src:r887040-909464*,960322
  Merged /archiva/trunk/archiva-modules/plugins/repository-statistics/src:r887040-909464
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src:r1475941-1488653

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-modules/plugins/repository-statistics/src/main:r887040-909464*,960322
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main:r1475941-1488653
  Merged /archiva/trunk/archiva-modules/plugins/repository-statistics/src/main:r887040-909464

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java:r887040-909464*,960322
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/java:r1475941-1488653
  Merged /archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java:r887040-909464

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org:r887040-909464*,960322
  Merged /archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org:r887040-909464
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/java/org:r1475941-1488653

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache:r887040-909464*,960322
  Merged /archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache:r887040-909464
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/java/org/apache:r1475941-1488653

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva:r887040-909464*,960322
  Merged /archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva:r887040-909464
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva:r1475941-1488653

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata:r887040-909464*,960322
  Merged /archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata:r887040-909464
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata:r1475941-1488653

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository:r887040-909464*,960322
  Merged /archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository:r887040-909464
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository:r1475941-1488653

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats:r887040-909464*,960322
  Merged /archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats:r887040-909464
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats:r1475941-1488653

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java
------------------------------------------------------------------------------
  Reverse-merged /archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java:r960322
  Merged /archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java:r1475941-1488653



Mime
View raw message