archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sk...@apache.org
Subject svn commit: r1488531 [1/2] - in /archiva/branches/archiva-MRM-1756/archiva-modules: ./ archiva-base/ archiva-base/archiva-artifact-converter/ archiva-base/archiva-checksum/ archiva-base/archiva-common/ archiva-base/archiva-configuration/ archiva-base/a...
Date Sat, 01 Jun 2013 14:40:44 GMT
Author: skygo
Date: Sat Jun  1 14:40:42 2013
New Revision: 1488531

URL: http://svn.apache.org/r1488531
Log: (empty)

Added:
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/log4j.xml
      - copied unchanged from r1488530, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/log4j.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/logging/log4j.xml
      - copied unchanged from r1488530, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/logging/log4j.xml
Modified:
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/   (props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-checksum/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-common/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-configuration/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java   (contents, props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-converter/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultIndexMerger.java
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMerger.java
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMergerRequest.java
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/TemporaryGroupIndex.java
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/TemporaryGroupIndexCleaner.java
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/mock/MockRepositorySessionFactory.java
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-maven2-model/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-model/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-policies/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy-api/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy-common/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/   (props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/   (props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/   (props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java   (contents, props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositorySessionFactory.java
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/group/RepositoryGroupAdminTest.java
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-security-common/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-test-utils/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-transaction/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-xml-tools/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-karaf/archiva-features/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-karaf/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/   (props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/   (props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock/MockRepositorySessionFactory.java
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/   (props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoryGroupServiceTest.java
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rss/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-security/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-test-mocks/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-web-common/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java   (contents, props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/jqueryFileTree.css   (contents, props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/repositories.html
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webdav/   (props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webdav/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/   (props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/   (props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/   (props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java   (contents, props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model-maven2/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/CiManagement.java
    archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Dependency.java
    archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/IssueManagement.java
    archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/License.java
    archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/MailingList.java
    archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Organization.java
    archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectMetadata.java
    archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectVersionMetadata.java
    archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Scm.java
    archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-repository-api/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java
    archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
    archiva/branches/archiva-MRM-1756/archiva-modules/metadata/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/metadata/test-repository/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/plugins/audit/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/plugins/generic-metadata-support/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/plugins/maven1-repository/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/plugins/maven2-repository/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/   (props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/   (props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java   (contents, props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/plugins/metadata-store-file/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
    archiva/branches/archiva-MRM-1756/archiva-modules/plugins/metadata-store-jcr/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
    archiva/branches/archiva-MRM-1756/archiva-modules/plugins/npanday-support/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/plugins/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/plugins/problem-reports/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/   (props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/pom.xml   (contents, props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/   (props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/   (props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/java/   (props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/java/org/   (props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/   (props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/   (props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/   (props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/   (props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/   (props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java   (contents, props changed)
    archiva/branches/archiva-MRM-1756/archiva-modules/plugins/stage-repository-merge/pom.xml
    archiva/branches/archiva-MRM-1756/archiva-modules/pom.xml

Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/
------------------------------------------------------------------------------
  Merged /archiva/trunk/archiva-modules/archiva-base:r1475941-1488530

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml Sat Jun  1 14:40:42 2013
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-artifact-converter</artifactId>
   <packaging>bundle</packaging>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-checksum/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-checksum/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-checksum/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-checksum/pom.xml Sat Jun  1 14:40:42 2013
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-checksum</artifactId>
   <packaging>bundle</packaging>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-common/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-common/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-common/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-common/pom.xml Sat Jun  1 14:40:42 2013
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-common</artifactId>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-configuration/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-configuration/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-configuration/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-configuration/pom.xml Sat Jun  1 14:40:42 2013
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-configuration</artifactId>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo Sat Jun  1 14:40:42 2013
@@ -849,6 +849,14 @@
           <description>The path of the merged index.</description>
         </field>
         <field>
+          <name>mergedIndexTtl</name>
+          <version>1.4.0+</version>
+          <type>int</type>
+          <required>false</required>
+          <defaultValue>30</defaultValue>
+          <description>The time to live of the merged index of the repository group.</description>
+        </field>
+        <field>
           <name>repositories</name>
           <version>1.2.0+</version>
           <association>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml Sat Jun  1 14:40:42 2013
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-consumer-api</artifactId>
   <packaging>bundle</packaging>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml Sat Jun  1 14:40:42 2013
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-consumer-archetype</artifactId>
   <packaging>maven-archetype</packaging>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml Sat Jun  1 14:40:42 2013
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-core-consumers</artifactId>
   <packaging>bundle</packaging>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java Sat Jun  1 14:40:42 2013
@@ -173,7 +173,7 @@ public class TestMetadataRepository
         return false;
     }
 
-    public Object obtainAccess( Class<?> aClass )
+    public <T>T obtainAccess( Class<T> aClass )
     {
         return null;
     }

Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
------------------------------------------------------------------------------
  Merged /archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:r1475941-1488530

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml Sat Jun  1 14:40:42 2013
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-lucene-consumers</artifactId>
   <packaging>bundle</packaging>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml Sat Jun  1 14:40:42 2013
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>archiva-consumers</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-metadata-consumer</artifactId>
   <packaging>bundle</packaging>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml Sat Jun  1 14:40:42 2013
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
 
   <artifactId>archiva-signature-consumers</artifactId>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-consumers/pom.xml Sat Jun  1 14:40:42 2013
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
 
   <artifactId>archiva-consumers</artifactId>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-converter/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-converter/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-converter/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-converter/pom.xml Sat Jun  1 14:40:42 2013
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-converter</artifactId>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/pom.xml Sat Jun  1 14:40:42 2013
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-indexer</artifactId>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultIndexMerger.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultIndexMerger.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultIndexMerger.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultIndexMerger.java Sat Jun  1 14:40:42 2013
@@ -19,6 +19,7 @@ package org.apache.archiva.indexer.merge
  */
 
 import com.google.common.io.Files;
+
 import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
 import org.apache.archiva.common.plexusbridge.MavenIndexerUtils;
 import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
@@ -35,7 +36,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import java.io.File;
 import java.io.IOException;
@@ -70,8 +70,6 @@ public class DefaultIndexMerger
 
     private List<TemporaryGroupIndex> temporaryGroupIndexes = new CopyOnWriteArrayList<TemporaryGroupIndex>();
 
-    private int groupMergedIndexTtl;
-
     @Inject
     public DefaultIndexMerger( PlexusSisuBridge plexusSisuBridge, MavenIndexerUtils mavenIndexerUtils )
         throws PlexusSisuBridgeException
@@ -81,12 +79,6 @@ public class DefaultIndexMerger
         indexPacker = plexusSisuBridge.lookup( IndexPacker.class, "default" );
     }
 
-    @PostConstruct
-    public void intialize()
-    {
-        this.groupMergedIndexTtl = Integer.getInteger( IndexMerger.TMP_GROUP_INDEX_SYS_KEY, DEFAULT_GROUP_INDEX_TTL );
-    }
-
     public IndexingContext buildMergedIndex( IndexMergerRequest indexMergerRequest )
         throws IndexMergerException
     {
@@ -122,7 +114,7 @@ public class DefaultIndexMerger
                 indexPacker.packIndex( request );
             }
             temporaryGroupIndexes.add(
-                new TemporaryGroupIndex( tempRepoFile, tempRepoId, indexMergerRequest.getGroupId() ) );
+                new TemporaryGroupIndex( tempRepoFile, tempRepoId, indexMergerRequest.getGroupId(), indexMergerRequest.getMergedIndexTtl() ) );
             stopWatch.stop();
             log.info( "merged index for repos {} in {} s", indexMergerRequest.getRepositoriesIds(),
                       stopWatch.getTime() );
@@ -170,9 +162,4 @@ public class DefaultIndexMerger
     {
         return this.temporaryGroupIndexes;
     }
-
-    public int getGroupMergedIndexTtl()
-    {
-        return this.groupMergedIndexTtl;
-    }
 }

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMerger.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMerger.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMerger.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMerger.java Sat Jun  1 14:40:42 2013
@@ -28,12 +28,6 @@ import java.util.Collection;
  */
 public interface IndexMerger
 {
-
-    /**
-     * system property which contains the value in s for ttl of temporary index groups
-     */
-    String TMP_GROUP_INDEX_SYS_KEY = "archiva.tmp.group.index.ttl";
-
     /**
      * @param indexMergerRequest
      * @return a temporary directory with a merge index (directory marked deleteOnExit)
@@ -45,10 +39,4 @@ public interface IndexMerger
     void cleanTemporaryGroupIndex( TemporaryGroupIndex temporaryGroupIndex );
 
     Collection<TemporaryGroupIndex> getTemporaryGroupIndexes();
-
-    /**
-     * @return ttl of temporay group index
-     */
-    int getGroupMergedIndexTtl();
-
 }

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMergerRequest.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMergerRequest.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMergerRequest.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMergerRequest.java Sat Jun  1 14:40:42 2013
@@ -42,6 +42,8 @@ public class IndexMergerRequest
 
     private String mergedIndexPath = "/.indexer";
 
+    private int mergedIndexTtl;
+
     public IndexMergerRequest( Collection<String> repositoriesIds, boolean packIndex, String groupId )
     {
         this.repositoriesIds = repositoriesIds;
@@ -52,13 +54,14 @@ public class IndexMergerRequest
     /**
      * @since 1.4-M4
      */
-    public IndexMergerRequest( Collection<String> repositoriesIds, boolean packIndex, String groupId,
-                               String mergedIndexPath )
+    public IndexMergerRequest(Collection<String> repositoriesIds, boolean packIndex, String groupId,
+                              String mergedIndexPath, int mergedIndexTtl)
     {
         this.repositoriesIds = repositoriesIds;
         this.packIndex = packIndex;
         this.groupId = groupId;
         this.mergedIndexPath = mergedIndexPath;
+        this.mergedIndexTtl = mergedIndexTtl;
     }
 
     public Collection<String> getRepositoriesIds()
@@ -101,6 +104,14 @@ public class IndexMergerRequest
         this.mergedIndexPath = mergedIndexPath;
     }
 
+    public int getMergedIndexTtl() {
+        return mergedIndexTtl;
+    }
+
+    public void setMergedIndexTtl(int mergedIndexTtl) {
+        this.mergedIndexTtl = mergedIndexTtl;
+    }
+
     @Override
     public String toString()
     {
@@ -109,6 +120,7 @@ public class IndexMergerRequest
         sb.append( ", packIndex=" ).append( packIndex );
         sb.append( ", groupId='" ).append( groupId ).append( '\'' );
         sb.append( ", mergedIndexPath='" ).append( mergedIndexPath ).append( '\'' );
+        sb.append( ", mergedIndexTtl='" ).append( mergedIndexTtl ).append( '\'' );
         sb.append( '}' );
         return sb.toString();
     }

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/TemporaryGroupIndex.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/TemporaryGroupIndex.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/TemporaryGroupIndex.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/TemporaryGroupIndex.java Sat Jun  1 14:40:42 2013
@@ -36,11 +36,14 @@ public class TemporaryGroupIndex
 
     private String groupId;
 
-    public TemporaryGroupIndex( File directory, String indexId, String groupId )
+    private int mergedIndexTtl;
+
+    public TemporaryGroupIndex(File directory, String indexId, String groupId, int mergedIndexTtl)
     {
         this.directory = directory;
         this.indexId = indexId;
         this.groupId = groupId;
+        this.mergedIndexTtl = mergedIndexTtl;
     }
 
     public long getCreationTime()
@@ -86,6 +89,14 @@ public class TemporaryGroupIndex
         this.groupId = groupId;
     }
 
+    public int getMergedIndexTtl() {
+        return mergedIndexTtl;
+    }
+
+    public void setMergedIndexTtl(int mergedIndexTtl) {
+        this.mergedIndexTtl = mergedIndexTtl;
+    }
+
     @Override
     public int hashCode()
     {

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/TemporaryGroupIndexCleaner.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/TemporaryGroupIndexCleaner.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/TemporaryGroupIndexCleaner.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/TemporaryGroupIndexCleaner.java Sat Jun  1 14:40:42 2013
@@ -58,7 +58,7 @@ public class TemporaryGroupIndexCleaner
         for ( TemporaryGroupIndex temporaryGroupIndex : indexMerger.getTemporaryGroupIndexes() )
         {
             // cleanup files older than the ttl
-            if ( new Date().getTime() - temporaryGroupIndex.getCreationTime() > indexMerger.getGroupMergedIndexTtl() )
+            if ( new Date().getTime() - temporaryGroupIndex.getCreationTime() > temporaryGroupIndex.getMergedIndexTtl() )
             {
                 log.info( "cleanTemporaryIndex for groupId {}", temporaryGroupIndex.getGroupId() );
                 indexMerger.cleanTemporaryGroupIndex( temporaryGroupIndex );

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/mock/MockRepositorySessionFactory.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/mock/MockRepositorySessionFactory.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/mock/MockRepositorySessionFactory.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/mock/MockRepositorySessionFactory.java Sat Jun  1 14:40:42 2013
@@ -256,7 +256,7 @@ public class MockRepositorySessionFactor
                         return false;  //To change body of implemented methods use File | Settings | File Templates.
                     }
 
-                    public Object obtainAccess( Class<?> aClass )
+                    public <T>T obtainAccess( Class<T> aClass )
                     {
                         return null;  //To change body of implemented methods use File | Settings | File Templates.
                     }

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml Sat Jun  1 14:40:42 2013
@@ -22,11 +22,10 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
 
   <artifactId>archiva-maven2-metadata</artifactId>
-  <version>1.4-M4-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>Archiva Base :: Maven 2 Metadata</name>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-maven2-model/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-maven2-model/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-maven2-model/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-maven2-model/pom.xml Sat Jun  1 14:40:42 2013
@@ -22,11 +22,10 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
 
   <artifactId>archiva-maven2-model</artifactId>
-  <version>1.4-M4-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>Archiva Base :: Maven 2 Model</name>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-model/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-model/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-model/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-model/pom.xml Sat Jun  1 14:40:42 2013
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-model</artifactId>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml Sat Jun  1 14:40:42 2013
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-plexus-bridge</artifactId>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-policies/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-policies/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-policies/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-policies/pom.xml Sat Jun  1 14:40:42 2013
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-policies</artifactId>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy-api/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy-api/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy-api/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy-api/pom.xml Sat Jun  1 14:40:42 2013
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>archiva-base</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-proxy-api</artifactId>
   <packaging>bundle</packaging>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy-common/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy-common/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy-common/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy-common/pom.xml Sat Jun  1 14:40:42 2013
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>archiva-base</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-proxy-common</artifactId>
   <packaging>bundle</packaging>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy/pom.xml Sat Jun  1 14:40:42 2013
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-proxy</artifactId>

Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/
------------------------------------------------------------------------------
  Merged /archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva:r1475941-1488530

Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
  Merged /archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata:r1475941-1488530

Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
  Merged /archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository:r1475941-1488530

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java Sat Jun  1 14:40:42 2013
@@ -178,7 +178,7 @@ public class TestMetadataRepository
         return false;
     }
 
-    public Object obtainAccess( Class<?> aClass )
+    public <T>T obtainAccess( Class<T> aClass )
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }

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

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml Sat Jun  1 14:40:42 2013
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-repository-admin</artifactId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-repository-admin-api</artifactId>
   <packaging>bundle</packaging>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java Sat Jun  1 14:40:42 2013
@@ -46,6 +46,11 @@ public class RepositoryGroup
      */
     private String mergedIndexPath = "/.indexer";
 
+    /**
+     * The TTL (time to live) of the repo group's merged index.
+     */
+    private int mergedIndexTtl = 30;
+
     public RepositoryGroup()
     {
         // no op
@@ -132,12 +137,29 @@ public class RepositoryGroup
         this.mergedIndexPath = mergedIndexPath;
     }
 
-    public RepositoryGroup mergedIndexPath( String mergedIndexPath )
-    {
+    public int getMergedIndexTtl() {
+        return mergedIndexTtl;
+    }
+
+    /**
+     * Set the TTL of the repo group's merged index.
+     *
+     * @param mergedIndexTtl
+     */
+    public void setMergedIndexTtl(int mergedIndexTtl) {
+        this.mergedIndexTtl = mergedIndexTtl;
+    }
+
+    public RepositoryGroup mergedIndexPath( String mergedIndexPath ) {
         this.mergedIndexPath = mergedIndexPath;
         return this;
     }
 
+    public RepositoryGroup mergedIndexTtl( int mergedIndexTtl ) {
+        this.mergedIndexTtl = mergedIndexTtl;
+        return this;
+    }
+
     public boolean equals( Object other )
     {
         if ( this == other )

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml Sat Jun  1 14:40:42 2013
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-repository-admin</artifactId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-repository-admin-default</artifactId>
   <packaging>bundle</packaging>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java Sat Jun  1 14:40:42 2013
@@ -68,7 +68,7 @@ public class DefaultRepositoryGroupAdmin
         {
             repositoriesGroups.add( new RepositoryGroup( repositoryGroupConfiguration.getId(), new ArrayList<String>(
                 repositoryGroupConfiguration.getRepositories() ) ).mergedIndexPath(
-                repositoryGroupConfiguration.getMergedIndexPath() ) );
+                repositoryGroupConfiguration.getMergedIndexPath() ).mergedIndexTtl( repositoryGroupConfiguration.getMergedIndexTtl() ) );
         }
 
         return repositoriesGroups;
@@ -93,10 +93,12 @@ public class DefaultRepositoryGroupAdmin
     {
         validateRepositoryGroup( repositoryGroup, false );
         validateManagedRepositoriesExists( repositoryGroup.getRepositories() );
+
         RepositoryGroupConfiguration repositoryGroupConfiguration = new RepositoryGroupConfiguration();
         repositoryGroupConfiguration.setId( repositoryGroup.getId() );
         repositoryGroupConfiguration.setRepositories( repositoryGroup.getRepositories() );
         repositoryGroupConfiguration.setMergedIndexPath( repositoryGroup.getMergedIndexPath() );
+        repositoryGroupConfiguration.setMergedIndexTtl( repositoryGroup.getMergedIndexTtl() );
         Configuration configuration = getArchivaConfiguration().getConfiguration();
         configuration.addRepositoryGroup( repositoryGroupConfiguration );
         saveConfiguration( configuration );
@@ -141,6 +143,7 @@ public class DefaultRepositoryGroupAdmin
 
         repositoryGroupConfiguration.setRepositories( repositoryGroup.getRepositories() );
         repositoryGroupConfiguration.setMergedIndexPath( repositoryGroup.getMergedIndexPath() );
+        repositoryGroupConfiguration.setMergedIndexTtl( repositoryGroup.getMergedIndexTtl() );
         configuration.addRepositoryGroup( repositoryGroupConfiguration );
 
         saveConfiguration( configuration );
@@ -282,6 +285,11 @@ public class DefaultRepositoryGroupAdmin
                 "Invalid character(s) found in identifier. Only the following characters are allowed: alphanumeric, '.', '-' and '_'" );
         }
 
+        if ( repositoryGroup.getMergedIndexTtl() <= 0)
+        {
+            throw new RepositoryAdminException( "Merged Index TTL must be greater than 0." );
+        }
+
         Configuration configuration = getArchivaConfiguration().getConfiguration();
 
         if ( configuration.getRepositoryGroupsAsMap().containsKey( repoGroupId ) )

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositorySessionFactory.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositorySessionFactory.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositorySessionFactory.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositorySessionFactory.java Sat Jun  1 14:40:42 2013
@@ -256,7 +256,7 @@ public class MockRepositorySessionFactor
                         return false;  //To change body of implemented methods use File | Settings | File Templates.
                     }
 
-                    public Object obtainAccess( Class<?> aClass )
+                    public <T>T obtainAccess( Class<T> aClass )
                     {
                         return null;  //To change body of implemented methods use File | Settings | File Templates.
                     }

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/group/RepositoryGroupAdminTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/group/RepositoryGroupAdminTest.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/group/RepositoryGroupAdminTest.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/group/RepositoryGroupAdminTest.java Sat Jun  1 14:40:42 2013
@@ -18,6 +18,7 @@ package org.apache.archiva.admin.reposit
  * under the License.
  */
 
+import org.apache.archiva.admin.model.RepositoryAdminException;
 import org.apache.archiva.admin.model.beans.ManagedRepository;
 import org.apache.archiva.admin.model.beans.RepositoryGroup;
 import org.apache.archiva.admin.model.group.RepositoryGroupAdmin;
@@ -67,6 +68,10 @@ public class RepositoryGroupAdminTest
             assertEquals( Arrays.asList( "test-new-one", "test-new-two" ),
                           repositoryGroupAdmin.getRepositoriesGroups().get( 0 ).getRepositories() );
 
+            // verify if default values were saved
+            assertEquals(30, repositoryGroupAdmin.getRepositoriesGroups().get( 0 ).getMergedIndexTtl() );
+            assertEquals("/.indexer", repositoryGroupAdmin.getRepositoriesGroups().get( 0 ).getMergedIndexPath() );
+
             repositoryGroupAdmin.deleteRepositoryGroup( "repo-group-one", getFakeAuditInformation() );
 
             assertEquals( 0, repositoryGroupAdmin.getRepositoriesGroups().size() );
@@ -100,7 +105,8 @@ public class RepositoryGroupAdminTest
 
             managedRepositoryAdmin.addManagedRepository( managedRepositoryTwo, false, getFakeAuditInformation() );
 
-            RepositoryGroup repositoryGroup = new RepositoryGroup( "repo-group-one", Arrays.asList( "test-new-one" ) );
+            RepositoryGroup repositoryGroup = new RepositoryGroup( "repo-group-one", Arrays.asList( "test-new-one" ) )
+                    .mergedIndexTtl( 20 ).mergedIndexPath( "/.nonDefaultPath" );
 
             mockAuditListener.clearEvents();
 
@@ -111,6 +117,8 @@ public class RepositoryGroupAdminTest
             assertEquals( 1, repositoryGroupAdmin.getRepositoriesGroups().get( 0 ).getRepositories().size() );
             assertEquals( Arrays.asList( "test-new-one" ),
                           repositoryGroupAdmin.getRepositoriesGroups().get( 0 ).getRepositories() );
+            assertEquals( 20, repositoryGroupAdmin.getRepositoriesGroups().get( 0 ).getMergedIndexTtl() );
+            assertEquals( "/.nonDefaultPath", repositoryGroupAdmin.getRepositoriesGroups().get( 0 ).getMergedIndexPath() );
 
             repositoryGroup = repositoryGroupAdmin.getRepositoryGroup( "repo-group-one" );
             assertNotNull( repositoryGroup );
@@ -143,9 +151,8 @@ public class RepositoryGroupAdminTest
         }
     }
 
-
     @Test
-    public void addAndDeleteGroupWithRemowingManagedRepo()
+    public void addAndDeleteGroupWithRemovedManagedRepo()
         throws Exception
     {
         try
@@ -199,4 +206,78 @@ public class RepositoryGroupAdminTest
             managedRepositoryAdmin.deleteManagedRepository( "test-new-two", getFakeAuditInformation(), true );
         }
     }
+
+    @Test( expected = RepositoryAdminException.class )
+    public void testAddGroupWithInvalidMergedIndexTtl() throws Exception {
+        try {
+            ManagedRepository managedRepositoryOne =
+                    getTestManagedRepository( "test-new-one", APPSERVER_BASE_PATH + File.separator + "test-new-one" );
+
+            ManagedRepository managedRepositoryTwo =
+                    getTestManagedRepository( "test-new-two", APPSERVER_BASE_PATH + File.separator + "test-new-two" );
+
+            managedRepositoryAdmin.addManagedRepository( managedRepositoryOne, false, getFakeAuditInformation() );
+
+            managedRepositoryAdmin.addManagedRepository( managedRepositoryTwo, false, getFakeAuditInformation() );
+
+            RepositoryGroup repositoryGroup =
+                    new RepositoryGroup( "repo-group-one", Arrays.asList( "test-new-one", "test-new-two" ) )
+                    .mergedIndexTtl( -1 );
+
+            mockAuditListener.clearEvents();
+
+            repositoryGroupAdmin.addRepositoryGroup( repositoryGroup, getFakeAuditInformation() );
+        }
+        finally
+        {
+            mockAuditListener.clearEvents();
+            managedRepositoryAdmin.deleteManagedRepository( "test-new-one", getFakeAuditInformation(), true );
+            managedRepositoryAdmin.deleteManagedRepository( "test-new-two", getFakeAuditInformation(), true );
+        }
+    }
+
+    @Test( expected = RepositoryAdminException.class )
+    public void testAddAndUpdateGroupWithInvalidMergedIndexTtl() throws Exception {
+        try {
+            ManagedRepository managedRepositoryOne =
+                    getTestManagedRepository( "test-new-one", APPSERVER_BASE_PATH + File.separator + "test-new-one" );
+
+            ManagedRepository managedRepositoryTwo =
+                    getTestManagedRepository( "test-new-two", APPSERVER_BASE_PATH + File.separator + "test-new-two" );
+
+            managedRepositoryAdmin.addManagedRepository( managedRepositoryOne, false, getFakeAuditInformation() );
+
+            managedRepositoryAdmin.addManagedRepository( managedRepositoryTwo, false, getFakeAuditInformation() );
+
+            RepositoryGroup repositoryGroup =
+                    new RepositoryGroup( "repo-group-one", Arrays.asList( "test-new-one", "test-new-two" ) );
+
+            mockAuditListener.clearEvents();
+
+            repositoryGroupAdmin.addRepositoryGroup( repositoryGroup, getFakeAuditInformation() );
+
+            assertEquals( 1, repositoryGroupAdmin.getRepositoriesGroups().size() );
+            assertEquals( "repo-group-one", repositoryGroupAdmin.getRepositoriesGroups().get( 0 ).getId() );
+            assertEquals( 2, repositoryGroupAdmin.getRepositoriesGroups().get( 0 ).getRepositories().size() );
+            assertEquals( Arrays.asList( "test-new-one", "test-new-two" ),
+                    repositoryGroupAdmin.getRepositoriesGroups().get( 0 ).getRepositories() );
+
+            // verify if default values were saved
+            assertEquals(30, repositoryGroupAdmin.getRepositoriesGroups().get( 0 ).getMergedIndexTtl() );
+            assertEquals("/.indexer", repositoryGroupAdmin.getRepositoriesGroups().get( 0 ).getMergedIndexPath() );
+
+            repositoryGroup = repositoryGroupAdmin.getRepositoryGroup( "repo-group-one" );
+            assertNotNull( repositoryGroup );
+
+            repositoryGroup.mergedIndexTtl( -1 );
+
+            repositoryGroupAdmin.updateRepositoryGroup( repositoryGroup, getFakeAuditInformation() );
+        }
+        finally
+        {
+            mockAuditListener.clearEvents();
+            managedRepositoryAdmin.deleteManagedRepository( "test-new-one", getFakeAuditInformation(), true );
+            managedRepositoryAdmin.deleteManagedRepository( "test-new-two", getFakeAuditInformation(), true );
+        }
+    }
 }

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-admin/pom.xml Sat Jun  1 14:40:42 2013
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-repository-admin</artifactId>
   <name>Archiva Base :: Repository Admin</name>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-layer/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-layer/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-layer/pom.xml Sat Jun  1 14:40:42 2013
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-repository-layer</artifactId>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml Sat Jun  1 14:40:42 2013
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>archiva-base</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-repository-scanner</artifactId>
   <packaging>bundle</packaging>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-security-common/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-security-common/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-security-common/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-security-common/pom.xml Sat Jun  1 14:40:42 2013
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>archiva-base</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <groupId>org.apache.archiva</groupId>
   <artifactId>archiva-security-common</artifactId>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-test-utils/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-test-utils/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-test-utils/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-test-utils/pom.xml Sat Jun  1 14:40:42 2013
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>archiva-base</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-test-utils</artifactId>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-transaction/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-transaction/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-transaction/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-transaction/pom.xml Sat Jun  1 14:40:42 2013
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-transaction</artifactId>
   <packaging>bundle</packaging>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-xml-tools/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-xml-tools/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-xml-tools/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/archiva-xml-tools/pom.xml Sat Jun  1 14:40:42 2013
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-xml-tools</artifactId>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-base/pom.xml Sat Jun  1 14:40:42 2013
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-modules</artifactId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
 
   <artifactId>archiva-base</artifactId>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-karaf/archiva-features/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-karaf/archiva-features/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-karaf/archiva-features/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-karaf/archiva-features/pom.xml Sat Jun  1 14:40:42 2013
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-karaf</artifactId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.archiva.karaf</groupId>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-karaf/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-karaf/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-karaf/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-karaf/pom.xml Sat Jun  1 14:40:42 2013
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-modules</artifactId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-karaf</artifactId>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml Sat Jun  1 14:40:42 2013
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>archiva-scheduler</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-scheduler-api</artifactId>
   <packaging>bundle</packaging>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml Sat Jun  1 14:40:42 2013
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>archiva-scheduler</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-scheduler-indexing</artifactId>
   <packaging>bundle</packaging>

Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
  Merged /archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler:r1475941-1488530

Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/
------------------------------------------------------------------------------
  Merged /archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing:r1475941-1488530

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock/MockRepositorySessionFactory.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock/MockRepositorySessionFactory.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock/MockRepositorySessionFactory.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock/MockRepositorySessionFactory.java Sat Jun  1 14:40:42 2013
@@ -256,7 +256,7 @@ public class MockRepositorySessionFactor
                         return false;  //To change body of implemented methods use File | Settings | File Templates.
                     }
 
-                    public Object obtainAccess( Class<?> aClass )
+                    public <T>T obtainAccess( Class<T> aClass )
                     {
                         return null;  //To change body of implemented methods use File | Settings | File Templates.
                     }

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml Sat Jun  1 14:40:42 2013
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>archiva-scheduler</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-scheduler-repository-api</artifactId>
   <packaging>bundle</packaging>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml Sat Jun  1 14:40:42 2013
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>archiva-scheduler</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-scheduler-repository</artifactId>
   <packaging>bundle</packaging>

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-scheduler/pom.xml Sat Jun  1 14:40:42 2013
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-modules</artifactId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-scheduler</artifactId>

Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/
------------------------------------------------------------------------------
  Merged /archiva/trunk/archiva-modules/archiva-web:r1479095-1488530

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml Sat Jun  1 14:40:42 2013
@@ -17,13 +17,12 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>archiva-rest</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-rest-api</artifactId>
   <!-- DO NOT USE bundle packaging generated documentation is not included in the jar !!! -->

Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml Sat Jun  1 14:40:42 2013
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-rest</artifactId>
-    <version>1.4-M4-SNAPSHOT</version>
+    <version>1.4-M5-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-rest-services</artifactId>
   <packaging>bundle</packaging>



Mime
View raw message