You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by sk...@apache.org on 2013/06/01 16:40:44 UTC
svn commit: r1488531 [2/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...
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java Sat Jun 1 14:40:42 2013
@@ -52,7 +52,8 @@ public class DefaultRepositoryGroupServi
for ( org.apache.archiva.admin.model.beans.RepositoryGroup repoGroup : repositoryGroupAdmin.getRepositoriesGroups() )
{
repositoriesGroups.add( new RepositoryGroup( repoGroup.getId(), new ArrayList<String>(
- repoGroup.getRepositories() ) ).mergedIndexPath( repoGroup.getMergedIndexPath() ) );
+ repoGroup.getRepositories() ) ).mergedIndexPath( repoGroup.getMergedIndexPath() )
+ .mergedIndexTtl( repoGroup.getMergedIndexTtl() ) );
}
return repositoriesGroups;
}
@@ -82,8 +83,8 @@ public class DefaultRepositoryGroupServi
{
return repositoryGroupAdmin.addRepositoryGroup(
new org.apache.archiva.admin.model.beans.RepositoryGroup( repoGroup.getId(), new ArrayList<String>(
- repoGroup.getRepositories() ) ).mergedIndexPath( repoGroup.getMergedIndexPath() ),
- getAuditInformation() );
+ repoGroup.getRepositories() ) ).mergedIndexPath( repoGroup.getMergedIndexPath() )
+ .mergedIndexTtl( repoGroup.getMergedIndexTtl() ), getAuditInformation() );
}
catch ( RepositoryAdminException e )
{
@@ -98,8 +99,8 @@ public class DefaultRepositoryGroupServi
{
return repositoryGroupAdmin.updateRepositoryGroup(
new org.apache.archiva.admin.model.beans.RepositoryGroup( repoGroup.getId(), new ArrayList<String>(
- repoGroup.getRepositories() ) ).mergedIndexPath( repoGroup.getMergedIndexPath() ),
- getAuditInformation() );
+ repoGroup.getRepositories() ) ).mergedIndexPath( repoGroup.getMergedIndexPath() )
+ .mergedIndexTtl( repoGroup.getMergedIndexTtl() ), getAuditInformation() );
}
catch ( RepositoryAdminException e )
{
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoryGroupServiceTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoryGroupServiceTest.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoryGroupServiceTest.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoryGroupServiceTest.java Sat Jun 1 14:40:42 2013
@@ -51,11 +51,13 @@ public class RepositoryGroupServiceTest
managedRepositoriesService.addManagedRepository( managedRepository );
- RepositoryGroup repositoryGroup = new RepositoryGroup( "one", Arrays.asList( managedRepository.getId() ) );
+ RepositoryGroup repositoryGroup = new RepositoryGroup( "one", Arrays.asList( managedRepository.getId() ) )
+ .mergedIndexTtl( 40 );
service.addRepositoryGroup( repositoryGroup );
assertFalse( service.getRepositoriesGroups().isEmpty() );
assertEquals( 1, service.getRepositoriesGroups().size() );
+ assertEquals( 40, service.getRepositoriesGroups().get(0).getMergedIndexTtl() );
service.deleteRepositoryGroup( "one" );
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/pom.xml Sat Jun 1 14:40:42 2013
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-web</artifactId>
- <version>1.4-M4-SNAPSHOT</version>
+ <version>1.4-M5-SNAPSHOT</version>
</parent>
<artifactId>archiva-rest</artifactId>
<name>Archiva Web :: REST support</name>
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rss/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rss/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rss/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rss/pom.xml Sat Jun 1 14:40:42 2013
@@ -22,7 +22,7 @@
<parent>
<artifactId>archiva-web</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-rss</artifactId>
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java Sat Jun 1 14:40:42 2013
@@ -250,7 +250,7 @@ public class NewArtifactsRssFeedProcesso
return false;
}
- public Object obtainAccess( Class<?> aClass )
+ public <T>T obtainAccess( Class<T> aClass )
{
throw new UnsupportedOperationException();
}
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-security/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-security/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-security/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-security/pom.xml Sat Jun 1 14:40:42 2013
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-web</artifactId>
- <version>1.4-M4-SNAPSHOT</version>
+ <version>1.4-M5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>archiva-security</artifactId>
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-test-mocks/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-test-mocks/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-test-mocks/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-test-mocks/pom.xml Sat Jun 1 14:40:42 2013
@@ -22,11 +22,10 @@
<parent>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-web</artifactId>
- <version>1.4-M4-SNAPSHOT</version>
+ <version>1.4-M5-SNAPSHOT</version>
</parent>
<artifactId>archiva-test-mocks</artifactId>
- <version>1.4-M4-SNAPSHOT</version>
<name>Archiva Web :: Tests Mocks</name>
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-web-common/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-web-common/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-web-common/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-web-common/pom.xml Sat Jun 1 14:40:42 2013
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-web</artifactId>
- <version>1.4-M4-SNAPSHOT</version>
+ <version>1.4-M5-SNAPSHOT</version>
</parent>
<artifactId>archiva-web-common</artifactId>
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties Sat Jun 1 14:40:42 2013
@@ -312,6 +312,7 @@ repository.groups.list=Repository Groups
repository-groups.grid.tab.title=Repository Groups
repository.group.delete.confirm=Are you sure to delete Repository Group {0} ?
repository.group.mergedIndexPath=Merged Index Path
+repository.group.mergedIndexTtl=Merged Index Time to Live (in Minutes)
#roles
roles.bulk.save.confirm=Are you sure to update {0} Role(s)
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java Sat Jun 1 14:40:42 2013
@@ -220,7 +220,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-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java
------------------------------------------------------------------------------
Merged /archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java:r1475941-1488530
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp-test/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp-test/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp-test/pom.xml Sat Jun 1 14:40:42 2013
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-web</artifactId>
- <version>1.4-M4-SNAPSHOT</version>
+ <version>1.4-M5-SNAPSHOT</version>
</parent>
<artifactId>archiva-webapp-test</artifactId>
<packaging>pom</packaging>
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/pom.xml Sat Jun 1 14:40:42 2013
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-web</artifactId>
- <version>1.4-M4-SNAPSHOT</version>
+ <version>1.4-M5-SNAPSHOT</version>
</parent>
<artifactId>archiva-webapp</artifactId>
<packaging>war</packaging>
@@ -1014,7 +1014,6 @@
<archiva.devMode>${archiva.devMode}</archiva.devMode>
<archiva.javascriptLog>${archiva.javascriptLog}</archiva.javascriptLog>
<archiva.logMissingI18n>${archiva.logMissingI18n}</archiva.logMissingI18n>
- <archiva.tmp.group.index.ttl>${archiva.groupIndexTtl}</archiva.tmp.group.index.ttl>
<!--
not needed as we use asyncLogger in configuration
<Log4jContextSelector>org.apache.logging.log4j.core.async.AsyncLoggerContextSelector</Log4jContextSelector>
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/jqueryFileTree.css
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/jqueryFileTree.css?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/jqueryFileTree.css (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/jqueryFileTree.css Sat Jun 1 14:40:42 2013
@@ -1,91 +1,91 @@
-UL.jqueryFileTree {
- font-family: Verdana, sans-serif;
- font-size: 11px;
- line-height: 18px;
- padding: 0px;
- margin: 0px;
-}
-
-UL.jqueryFileTree LI {
- list-style: none;
- padding: 0px;
- padding-left: 20px;
- margin: 0px;
- white-space: nowrap;
-}
-
-UL.jqueryFileTree A {
- color: #333;
- text-decoration: none;
- display: block;
- padding: 0px 2px;
-}
-
-UL.jqueryFileTree A:hover {
- background: #BDF;
-}
-
-/* Core Styles */
-.jqueryFileTree LI.directory { background: url(images/folder-closed.gif) left top no-repeat; }
-.jqueryFileTree LI.expanded { background: url(images/folder.gif) left top no-repeat; }
-.jqueryFileTree LI.file { background: url(images/file.png) left top no-repeat; }
-.jqueryFileTree LI.wait { background: url(images/spinner.gif) left top no-repeat; }
-/* File Extensions*/
-.jqueryFileTree LI.ext_3gp { background: url(images/film.png) left top no-repeat; }
-.jqueryFileTree LI.ext_afp { background: url(images/code.png) left top no-repeat; }
-.jqueryFileTree LI.ext_afpa { background: url(images/code.png) left top no-repeat; }
-.jqueryFileTree LI.ext_asp { background: url(images/code.png) left top no-repeat; }
-.jqueryFileTree LI.ext_aspx { background: url(images/code.png) left top no-repeat; }
-.jqueryFileTree LI.ext_avi { background: url(images/film.png) left top no-repeat; }
-.jqueryFileTree LI.ext_bat { background: url(images/application.png) left top no-repeat; }
-.jqueryFileTree LI.ext_bmp { background: url(images/picture.png) left top no-repeat; }
-.jqueryFileTree LI.ext_c { background: url(images/code.png) left top no-repeat; }
-.jqueryFileTree LI.ext_cfm { background: url(images/code.png) left top no-repeat; }
-.jqueryFileTree LI.ext_cgi { background: url(images/code.png) left top no-repeat; }
-.jqueryFileTree LI.ext_com { background: url(images/application.png) left top no-repeat; }
-.jqueryFileTree LI.ext_cpp { background: url(images/code.png) left top no-repeat; }
-.jqueryFileTree LI.ext_css { background: url(images/css.png) left top no-repeat; }
-.jqueryFileTree LI.ext_doc { background: url(images/doc.png) left top no-repeat; }
-.jqueryFileTree LI.ext_exe { background: url(images/application.png) left top no-repeat; }
-.jqueryFileTree LI.ext_gif { background: url(images/picture.png) left top no-repeat; }
-.jqueryFileTree LI.ext_fla { background: url(images/flash.png) left top no-repeat; }
-.jqueryFileTree LI.ext_h { background: url(images/code.png) left top no-repeat; }
-.jqueryFileTree LI.ext_htm { background: url(images/html.png) left top no-repeat; }
-.jqueryFileTree LI.ext_html { background: url(images/html.png) left top no-repeat; }
-.jqueryFileTree LI.ext_jar { background: url(images/java.png) left top no-repeat; }
-.jqueryFileTree LI.ext_jpg { background: url(images/picture.png) left top no-repeat; }
-.jqueryFileTree LI.ext_jpeg { background: url(images/picture.png) left top no-repeat; }
-.jqueryFileTree LI.ext_js { background: url(images/script.png) left top no-repeat; }
-.jqueryFileTree LI.ext_lasso { background: url(images/code.png) left top no-repeat; }
-.jqueryFileTree LI.ext_log { background: url(images/txt.png) left top no-repeat; }
-.jqueryFileTree LI.ext_m4p { background: url(images/music.png) left top no-repeat; }
-.jqueryFileTree LI.ext_mov { background: url(images/film.png) left top no-repeat; }
-.jqueryFileTree LI.ext_mp3 { background: url(images/music.png) left top no-repeat; }
-.jqueryFileTree LI.ext_mp4 { background: url(images/film.png) left top no-repeat; }
-.jqueryFileTree LI.ext_mpg { background: url(images/film.png) left top no-repeat; }
-.jqueryFileTree LI.ext_mpeg { background: url(images/film.png) left top no-repeat; }
-.jqueryFileTree LI.ext_ogg { background: url(images/music.png) left top no-repeat; }
-.jqueryFileTree LI.ext_pcx { background: url(images/picture.png) left top no-repeat; }
-.jqueryFileTree LI.ext_pdf { background: url(images/pdf.png) left top no-repeat; }
-.jqueryFileTree LI.ext_php { background: url(images/php.png) left top no-repeat; }
-.jqueryFileTree LI.ext_png { background: url(images/picture.png) left top no-repeat; }
-.jqueryFileTree LI.ext_ppt { background: url(images/ppt.png) left top no-repeat; }
-.jqueryFileTree LI.ext_psd { background: url(images/psd.png) left top no-repeat; }
-.jqueryFileTree LI.ext_pl { background: url(images/script.png) left top no-repeat; }
-.jqueryFileTree LI.ext_py { background: url(images/script.png) left top no-repeat; }
-.jqueryFileTree LI.ext_rb { background: url(images/ruby.png) left top no-repeat; }
-.jqueryFileTree LI.ext_rbx { background: url(images/ruby.png) left top no-repeat; }
-.jqueryFileTree LI.ext_rhtml { background: url(images/ruby.png) left top no-repeat; }
-.jqueryFileTree LI.ext_rpm { background: url(images/linux.png) left top no-repeat; }
-.jqueryFileTree LI.ext_ruby { background: url(images/ruby.png) left top no-repeat; }
-.jqueryFileTree LI.ext_sql { background: url(images/db.png) left top no-repeat; }
-.jqueryFileTree LI.ext_swf { background: url(images/flash.png) left top no-repeat; }
-.jqueryFileTree LI.ext_tif { background: url(images/picture.png) left top no-repeat; }
-.jqueryFileTree LI.ext_tiff { background: url(images/picture.png) left top no-repeat; }
-.jqueryFileTree LI.ext_txt { background: url(images/txt.png) left top no-repeat; }
-.jqueryFileTree LI.ext_vb { background: url(images/code.png) left top no-repeat; }
-.jqueryFileTree LI.ext_wav { background: url(images/music.png) left top no-repeat; }
-.jqueryFileTree LI.ext_wmv { background: url(images/film.png) left top no-repeat; }
-.jqueryFileTree LI.ext_xls { background: url(images/xls.png) left top no-repeat; }
-.jqueryFileTree LI.ext_xml { background: url(images/code.png) left top no-repeat; }
+UL.jqueryFileTree {
+ font-family: Verdana, sans-serif;
+ font-size: 11px;
+ line-height: 18px;
+ padding: 0px;
+ margin: 0px;
+}
+
+UL.jqueryFileTree LI {
+ list-style: none;
+ padding: 0px;
+ padding-left: 20px;
+ margin: 0px;
+ white-space: nowrap;
+}
+
+UL.jqueryFileTree A {
+ color: #333;
+ text-decoration: none;
+ display: block;
+ padding: 0px 2px;
+}
+
+UL.jqueryFileTree A:hover {
+ background: #BDF;
+}
+
+/* Core Styles */
+.jqueryFileTree LI.directory { background: url(images/folder-closed.gif) left top no-repeat; }
+.jqueryFileTree LI.expanded { background: url(images/folder.gif) left top no-repeat; }
+.jqueryFileTree LI.file { background: url(images/file.png) left top no-repeat; }
+.jqueryFileTree LI.wait { background: url(images/spinner.gif) left top no-repeat; }
+/* File Extensions*/
+.jqueryFileTree LI.ext_3gp { background: url(images/film.png) left top no-repeat; }
+.jqueryFileTree LI.ext_afp { background: url(images/code.png) left top no-repeat; }
+.jqueryFileTree LI.ext_afpa { background: url(images/code.png) left top no-repeat; }
+.jqueryFileTree LI.ext_asp { background: url(images/code.png) left top no-repeat; }
+.jqueryFileTree LI.ext_aspx { background: url(images/code.png) left top no-repeat; }
+.jqueryFileTree LI.ext_avi { background: url(images/film.png) left top no-repeat; }
+.jqueryFileTree LI.ext_bat { background: url(images/application.png) left top no-repeat; }
+.jqueryFileTree LI.ext_bmp { background: url(images/picture.png) left top no-repeat; }
+.jqueryFileTree LI.ext_c { background: url(images/code.png) left top no-repeat; }
+.jqueryFileTree LI.ext_cfm { background: url(images/code.png) left top no-repeat; }
+.jqueryFileTree LI.ext_cgi { background: url(images/code.png) left top no-repeat; }
+.jqueryFileTree LI.ext_com { background: url(images/application.png) left top no-repeat; }
+.jqueryFileTree LI.ext_cpp { background: url(images/code.png) left top no-repeat; }
+.jqueryFileTree LI.ext_css { background: url(images/css.png) left top no-repeat; }
+.jqueryFileTree LI.ext_doc { background: url(images/doc.png) left top no-repeat; }
+.jqueryFileTree LI.ext_exe { background: url(images/application.png) left top no-repeat; }
+.jqueryFileTree LI.ext_gif { background: url(images/picture.png) left top no-repeat; }
+.jqueryFileTree LI.ext_fla { background: url(images/flash.png) left top no-repeat; }
+.jqueryFileTree LI.ext_h { background: url(images/code.png) left top no-repeat; }
+.jqueryFileTree LI.ext_htm { background: url(images/html.png) left top no-repeat; }
+.jqueryFileTree LI.ext_html { background: url(images/html.png) left top no-repeat; }
+.jqueryFileTree LI.ext_jar { background: url(images/java.png) left top no-repeat; }
+.jqueryFileTree LI.ext_jpg { background: url(images/picture.png) left top no-repeat; }
+.jqueryFileTree LI.ext_jpeg { background: url(images/picture.png) left top no-repeat; }
+.jqueryFileTree LI.ext_js { background: url(images/script.png) left top no-repeat; }
+.jqueryFileTree LI.ext_lasso { background: url(images/code.png) left top no-repeat; }
+.jqueryFileTree LI.ext_log { background: url(images/txt.png) left top no-repeat; }
+.jqueryFileTree LI.ext_m4p { background: url(images/music.png) left top no-repeat; }
+.jqueryFileTree LI.ext_mov { background: url(images/film.png) left top no-repeat; }
+.jqueryFileTree LI.ext_mp3 { background: url(images/music.png) left top no-repeat; }
+.jqueryFileTree LI.ext_mp4 { background: url(images/film.png) left top no-repeat; }
+.jqueryFileTree LI.ext_mpg { background: url(images/film.png) left top no-repeat; }
+.jqueryFileTree LI.ext_mpeg { background: url(images/film.png) left top no-repeat; }
+.jqueryFileTree LI.ext_ogg { background: url(images/music.png) left top no-repeat; }
+.jqueryFileTree LI.ext_pcx { background: url(images/picture.png) left top no-repeat; }
+.jqueryFileTree LI.ext_pdf { background: url(images/pdf.png) left top no-repeat; }
+.jqueryFileTree LI.ext_php { background: url(images/php.png) left top no-repeat; }
+.jqueryFileTree LI.ext_png { background: url(images/picture.png) left top no-repeat; }
+.jqueryFileTree LI.ext_ppt { background: url(images/ppt.png) left top no-repeat; }
+.jqueryFileTree LI.ext_psd { background: url(images/psd.png) left top no-repeat; }
+.jqueryFileTree LI.ext_pl { background: url(images/script.png) left top no-repeat; }
+.jqueryFileTree LI.ext_py { background: url(images/script.png) left top no-repeat; }
+.jqueryFileTree LI.ext_rb { background: url(images/ruby.png) left top no-repeat; }
+.jqueryFileTree LI.ext_rbx { background: url(images/ruby.png) left top no-repeat; }
+.jqueryFileTree LI.ext_rhtml { background: url(images/ruby.png) left top no-repeat; }
+.jqueryFileTree LI.ext_rpm { background: url(images/linux.png) left top no-repeat; }
+.jqueryFileTree LI.ext_ruby { background: url(images/ruby.png) left top no-repeat; }
+.jqueryFileTree LI.ext_sql { background: url(images/db.png) left top no-repeat; }
+.jqueryFileTree LI.ext_swf { background: url(images/flash.png) left top no-repeat; }
+.jqueryFileTree LI.ext_tif { background: url(images/picture.png) left top no-repeat; }
+.jqueryFileTree LI.ext_tiff { background: url(images/picture.png) left top no-repeat; }
+.jqueryFileTree LI.ext_txt { background: url(images/txt.png) left top no-repeat; }
+.jqueryFileTree LI.ext_vb { background: url(images/code.png) left top no-repeat; }
+.jqueryFileTree LI.ext_wav { background: url(images/music.png) left top no-repeat; }
+.jqueryFileTree LI.ext_wmv { background: url(images/film.png) left top no-repeat; }
+.jqueryFileTree LI.ext_xls { background: url(images/xls.png) left top no-repeat; }
+.jqueryFileTree LI.ext_xml { background: url(images/code.png) left top no-repeat; }
.jqueryFileTree LI.ext_zip { background: url(images/zip.png) left top no-repeat; }
\ No newline at end of file
Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/jqueryFileTree.css
('svn:executable' removed)
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/repositories.html
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/repositories.html?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/repositories.html (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/repositories.html Sat Jun 1 14:40:42 2013
@@ -1442,6 +1442,13 @@
data-bind="value: repositoryGroup.mergedIndexPath"/>
</div>
</div>
+ <div class="control-group">
+ <label class="control-label" for="mergedIndexPath">${$.i18n.prop('repository.group.mergedIndexTtl')}</label>
+ <div class="controls">
+ <input type="text" class="input-large required" id="mergedIndexTtl" name="mergedIndexTtl"
+ data-bind="value: repositoryGroup.mergedIndexTtl"/>
+ </div>
+ </div>
<div>
<a href="${window.archivaRuntimeInfo.baseUrl}/repository/${repositoryGroup.id()}" target="_blank">
{{if repositoryGroup.id()}}
Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webdav/
------------------------------------------------------------------------------
Merged /archiva/trunk/archiva-modules/archiva-web/archiva-webdav:r1475941-1488530
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webdav/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webdav/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webdav/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webdav/pom.xml Sat Jun 1 14:40:42 2013
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-web</artifactId>
- <version>1.4-M4-SNAPSHOT</version>
+ <version>1.4-M5-SNAPSHOT</version>
</parent>
<artifactId>archiva-webdav</artifactId>
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java Sat Jun 1 14:40:42 2013
@@ -1202,8 +1202,7 @@ public class ArchivaDavResourceFactory
if ( tmp != null && tmp.getDirectory() != null && tmp.getDirectory().exists() )
{
- if ( System.currentTimeMillis() - tmp.getCreationTime() > ( indexMerger.getGroupMergedIndexTtl() * 60
- * 1000 ) )
+ if ( System.currentTimeMillis() - tmp.getCreationTime() > ( repositoryGroupConfiguration.getMergedIndexTtl() * 60 * 1000 ) )
{
log.debug( MarkerFactory.getMarker( "group.merged.index" ),
"tmp group index '{}' is too old so delete it", repositoryGroupConfiguration.getId() );
@@ -1241,11 +1240,11 @@ public class ArchivaDavResourceFactory
repositoryGroupConfiguration.getId(), authzRepos );
IndexingContext indexingContext = indexMerger.buildMergedIndex(
new IndexMergerRequest( authzRepos, true, repositoryGroupConfiguration.getId(),
- repositoryGroupConfiguration.getMergedIndexPath() ) );
+ repositoryGroupConfiguration.getMergedIndexPath(), repositoryGroupConfiguration.getMergedIndexTtl() ) );
File mergedRepoDir = indexingContext.getIndexDirectoryFile();
TemporaryGroupIndex temporaryGroupIndex = new TemporaryGroupIndex( mergedRepoDir, indexingContext.getId(),
- repositoryGroupConfiguration.getId() ).setCreationTime(
- new Date().getTime() );
+ repositoryGroupConfiguration.getId(),repositoryGroupConfiguration.getMergedIndexTtl() )
+ .setCreationTime(new Date().getTime() );
temporaryGroupIndexMap.put( repositoryGroupConfiguration.getId(), temporaryGroupIndex );
session.setAttribute( TemporaryGroupIndexSessionCleaner.TEMPORARY_INDEX_SESSION_KEY,
temporaryGroupIndexMap );
Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/
------------------------------------------------------------------------------
Merged /archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva:r1475941-1488530
Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
Merged /archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata:r1475941-1488530
Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
Merged /archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository:r1475941-1488530
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webdav/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-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java Sat Jun 1 14:40:42 2013
@@ -174,7 +174,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-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
------------------------------------------------------------------------------
Merged /archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:r1475941-1488530
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/pom.xml Sat Jun 1 14:40:42 2013
@@ -19,7 +19,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-web</artifactId>
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model-maven2/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model-maven2/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model-maven2/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model-maven2/pom.xml Sat Jun 1 14:40:42 2013
@@ -22,7 +22,7 @@
<parent>
<artifactId>metadata</artifactId>
<groupId>org.apache.archiva</groupId>
- <version>1.4-M4-SNAPSHOT</version>
+ <version>1.4-M5-SNAPSHOT</version>
</parent>
<artifactId>metadata-model-maven2</artifactId>
<packaging>bundle</packaging>
@@ -53,7 +53,8 @@
</Export-Package>
<Import-Package>
javax.xml.bind.annotation,
- org.apache.commons.lang
+ org.apache.commons.lang,
+ javax.persistence
</Import-Package>
</instructions>
</configuration>
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/pom.xml Sat Jun 1 14:40:42 2013
@@ -22,12 +22,19 @@
<parent>
<artifactId>metadata</artifactId>
<groupId>org.apache.archiva</groupId>
- <version>1.4-M4-SNAPSHOT</version>
+ <version>1.4-M5-SNAPSHOT</version>
</parent>
<artifactId>metadata-model</artifactId>
<packaging>bundle</packaging>
<name>Archiva Metadata :: Model</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -41,7 +48,7 @@
org.apache.archiva.metadata.model;version=${project.version};-split-package:=merge-first
</Export-Package>
<Import-Package>
- javax.xml.bind.annotation
+ javax.xml.bind.annotation,javax.persistence
</Import-Package>
</instructions>
</configuration>
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/CiManagement.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/CiManagement.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/CiManagement.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/CiManagement.java Sat Jun 1 14:40:42 2013
@@ -19,15 +19,19 @@ package org.apache.archiva.metadata.mode
* under the License.
*/
+import javax.persistence.Entity;
import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
/**
* Information about the CI system used by the project.
*
* @todo considering moving this to a facet - avoid referring to it externally
*/
-@XmlRootElement( name = "ciManagement" )
+@XmlRootElement(name = "ciManagement")
+@Entity
public class CiManagement
+ implements Serializable
{
/**
* A simple identifier for the type of CI server used, eg <tt>continuum</tt>, <tt>bamboo</tt>, <tt>hudson</tt>, etc.
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Dependency.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Dependency.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Dependency.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Dependency.java Sat Jun 1 14:40:42 2013
@@ -20,14 +20,16 @@ package org.apache.archiva.metadata.mode
*/
import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
/**
* Information about a dependency that this project has on another project or artifact.
*
* @todo will be reviewing what is appropriate for the base here - rest should be in a maven dependency facet - avoid details on it externally
*/
-@XmlRootElement( name = "dependency" )
+@XmlRootElement(name = "dependency")
public class Dependency
+ implements Serializable
{
/**
* The Maven classifier of the dependency.
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/IssueManagement.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/IssueManagement.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/IssueManagement.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/IssueManagement.java Sat Jun 1 14:40:42 2013
@@ -19,15 +19,19 @@ package org.apache.archiva.metadata.mode
* under the License.
*/
+import javax.persistence.Entity;
import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
/**
* Information about the issue management system used by the project.
*
* @todo considering moving this to a facet - avoid referring to it externally
*/
-@XmlRootElement( name = "issueManagement" )
+@XmlRootElement(name = "issueManagement")
+@Entity
public class IssueManagement
+ implements Serializable
{
/**
* A simple identifier for the type of issue management server used, eg <tt>jira</tt>, <tt>bugzilla</tt>, etc.
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/License.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/License.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/License.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/License.java Sat Jun 1 14:40:42 2013
@@ -20,12 +20,14 @@ package org.apache.archiva.metadata.mode
*/
import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
/**
* A description of a particular license used by a project.
*/
-@XmlRootElement( name = "license" )
+@XmlRootElement(name = "license")
public class License
+ implements Serializable
{
/**
* The name of the license.
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/MailingList.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/MailingList.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/MailingList.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/MailingList.java Sat Jun 1 14:40:42 2013
@@ -1,6 +1,7 @@
package org.apache.archiva.metadata.model;
import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
import java.util.List;
/*
@@ -27,8 +28,9 @@ import java.util.List;
*
* @todo considering moving this to a facet - avoid referring to it externally
*/
-@XmlRootElement( name = "mailingList" )
+@XmlRootElement(name = "mailingList")
public class MailingList
+ implements Serializable
{
/**
* The primary archive URL for this mailing list.
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Organization.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Organization.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Organization.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Organization.java Sat Jun 1 14:40:42 2013
@@ -19,10 +19,14 @@ package org.apache.archiva.metadata.mode
* under the License.
*/
+import javax.persistence.Entity;
import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
-@XmlRootElement( name = "organization" )
+@XmlRootElement(name = "organization")
+@Entity
public class Organization
+ implements Serializable
{
private String name;
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectMetadata.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectMetadata.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectMetadata.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectMetadata.java Sat Jun 1 14:40:42 2013
@@ -44,4 +44,14 @@ public class ProjectMetadata
{
this.namespace = namespace;
}
+
+ @Override
+ public String toString()
+ {
+ final StringBuilder sb = new StringBuilder( "ProjectMetadata{" );
+ sb.append( "namespace='" ).append( namespace ).append( '\'' );
+ sb.append( ", id='" ).append( id ).append( '\'' );
+ sb.append( '}' );
+ return sb.toString();
+ }
}
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectVersionMetadata.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectVersionMetadata.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectVersionMetadata.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectVersionMetadata.java Sat Jun 1 14:40:42 2013
@@ -27,6 +27,9 @@ import java.util.List;
public class ProjectVersionMetadata
extends FacetedMetadata
{
+ /**
+ * id is the version
+ */
private String id;
private String url;
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Scm.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Scm.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Scm.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Scm.java Sat Jun 1 14:40:42 2013
@@ -19,10 +19,14 @@ package org.apache.archiva.metadata.mode
* under the License.
*/
+import javax.persistence.Entity;
import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
-@XmlRootElement( name = "scm" )
+@XmlRootElement(name = "scm")
+@Entity
public class Scm
+ implements Serializable
{
private String connection;
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-repository-api/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-repository-api/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-repository-api/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-repository-api/pom.xml Sat Jun 1 14:40:42 2013
@@ -22,7 +22,7 @@
<parent>
<artifactId>metadata</artifactId>
<groupId>org.apache.archiva</groupId>
- <version>1.4-M4-SNAPSHOT</version>
+ <version>1.4-M5-SNAPSHOT</version>
</parent>
<artifactId>metadata-repository-api</artifactId>
<packaging>bundle</packaging>
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java Sat Jun 1 14:40:42 2013
@@ -48,6 +48,12 @@ public interface MetadataRepository
ProjectVersionMetadata versionMetadata )
throws MetadataRepositoryException;
+ /**
+ * create the namespace in the repository. (if not exist)
+ * @param repositoryId
+ * @param namespace
+ * @throws MetadataRepositoryException
+ */
void updateNamespace( String repositoryId, String namespace )
throws MetadataRepositoryException;
@@ -77,6 +83,14 @@ public interface MetadataRepository
void removeMetadataFacet( String repositoryId, String facetId, String name )
throws MetadataRepositoryException;
+ /**
+ * if startTime or endTime are <code>null</code> they are not used for search
+ * @param repositoryId
+ * @param startTime can be <code>null</code>
+ * @param endTime can be <code>null</code>
+ * @return
+ * @throws MetadataRepositoryException
+ */
List<ArtifactMetadata> getArtifactsByDateRange( String repositoryId, Date startTime, Date endTime )
throws MetadataRepositoryException;
@@ -102,11 +116,12 @@ public interface MetadataRepository
throws MetadataRepositoryException;
/**
+ * Only remove {@link MetadataFacet} for the artifact
* @param repositoryId
* @param namespace
* @param project
* @param version
- * @param metadataFacet will remove artifacts which have this {@link MetadataFacet} using equals
+ * @param metadataFacet
* @throws MetadataRepositoryException
* @since 1.4-M3
*/
@@ -134,6 +149,14 @@ public interface MetadataRepository
List<ArtifactMetadata> getArtifacts( String repositoryId )
throws MetadataRepositoryException;
+ /**
+ * basically just checking it exists not complete data returned
+ * @param repoId
+ * @param namespace
+ * @param projectId
+ * @return
+ * @throws MetadataResolutionException
+ */
ProjectMetadata getProject( String repoId, String namespace, String projectId )
throws MetadataResolutionException;
@@ -213,6 +236,6 @@ public interface MetadataRepository
boolean canObtainAccess( Class<?> aClass );
- Object obtainAccess( Class<?> aClass )
+ <T>T obtainAccess( Class<T> aClass )
throws MetadataRepositoryException;
}
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java Sat Jun 1 14:40:42 2013
@@ -164,8 +164,9 @@ public abstract class AbstractMetadataRe
// test that namespace is also constructed
- Assertions.assertThat( repository.getRootNamespaces( TEST_REPO_ID ) ).isNotNull().isNotEmpty().contains(
- TEST_NAMESPACE ).hasSize( 1 );
+ Collection<String> namespaces = repository.getRootNamespaces( TEST_REPO_ID );
+
+ Assertions.assertThat( namespaces ).isNotNull().isNotEmpty().contains( TEST_NAMESPACE ).hasSize( 1 );
}
@Test
@@ -187,6 +188,7 @@ public abstract class AbstractMetadataRe
// test that namespace and project is also constructed
assertEquals( Collections.singletonList( TEST_NAMESPACE ), repository.getRootNamespaces( TEST_REPO_ID ) );
ProjectMetadata projectMetadata = repository.getProject( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT );
+ assertNotNull( projectMetadata );
assertEquals( TEST_PROJECT, projectMetadata.getId() );
assertEquals( TEST_NAMESPACE, projectMetadata.getNamespace() );
}
@@ -348,9 +350,10 @@ public abstract class AbstractMetadataRe
repository.updateNamespace( TEST_REPO_ID, "namespace" );
repository.updateNamespace( OTHER_REPO_ID, "namespace" );
- assertEquals( "repository.getRepositories() -> " + repository.getRepositories(),
- Arrays.asList( TEST_REPO_ID, OTHER_REPO_ID ),
- new ArrayList<String>( repository.getRepositories() ) );
+ Collection<String> repositories = repository.getRepositories();
+
+ assertEquals( "repository.getRepositories() -> " + repositories, Arrays.asList( TEST_REPO_ID, OTHER_REPO_ID ),
+ new ArrayList<String>( repositories ) );
}
@Test
@@ -573,8 +576,10 @@ public abstract class AbstractMetadataRe
{
repository.addMetadataFacet( TEST_REPO_ID, new TestMetadataFacet( TEST_VALUE ) );
- assertEquals( new TestMetadataFacet( TEST_VALUE ),
- repository.getMetadataFacet( TEST_REPO_ID, TEST_FACET_ID, TEST_NAME ) );
+ TestMetadataFacet test =
+ (TestMetadataFacet) repository.getMetadataFacet( TEST_REPO_ID, TEST_FACET_ID, TEST_NAME );
+
+ assertEquals( new TestMetadataFacet( TEST_VALUE ), test );
}
@Test
@@ -806,9 +811,10 @@ public abstract class AbstractMetadataRe
repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact1 );
repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact2 );
- assertEquals( Collections.singleton( TEST_PROJECT_VERSION ),
- repository.getArtifactVersions( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT,
- TEST_PROJECT_VERSION ) );
+ Collection<String> versions =
+ repository.getArtifactVersions( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
+
+ assertEquals( Collections.singleton( TEST_PROJECT_VERSION ), versions );
}
@Test
@@ -819,8 +825,9 @@ public abstract class AbstractMetadataRe
repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
repository.save();
- assertEquals( Collections.singletonList( artifact ),
- repository.getArtifactsByDateRange( TEST_REPO_ID, null, null ) );
+ List<ArtifactMetadata> artifacts = repository.getArtifactsByDateRange( TEST_REPO_ID, null, null );
+
+ assertEquals( Collections.singletonList( artifact ), artifacts );
}
@Test
@@ -833,8 +840,9 @@ public abstract class AbstractMetadataRe
repository.updateArtifact( TEST_REPO_ID, namespace, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
repository.save();
- assertEquals( Collections.singletonList( artifact ),
- repository.getArtifactsByDateRange( TEST_REPO_ID, null, null ) );
+ List<ArtifactMetadata> artifacts = repository.getArtifactsByDateRange( TEST_REPO_ID, null, null );
+
+ assertEquals( Collections.singletonList( artifact ), artifacts );
}
@Test
@@ -846,8 +854,10 @@ public abstract class AbstractMetadataRe
repository.save();
Date date = new Date( artifact.getWhenGathered().getTime() - 10000 );
- assertEquals( Collections.singletonList( artifact ),
- repository.getArtifactsByDateRange( TEST_REPO_ID, date, null ) );
+
+ List<ArtifactMetadata> artifacts = repository.getArtifactsByDateRange( TEST_REPO_ID, date, null );
+
+ assertEquals( Collections.singletonList( artifact ), artifacts );
}
@Test
@@ -858,7 +868,10 @@ public abstract class AbstractMetadataRe
repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
Date date = new Date( artifact.getWhenGathered().getTime() + 10000 );
- assertTrue( repository.getArtifactsByDateRange( TEST_REPO_ID, date, null ).isEmpty() );
+
+ List<ArtifactMetadata> artifacts = repository.getArtifactsByDateRange( TEST_REPO_ID, date, null );
+
+ Assertions.assertThat( artifacts ).isNotNull().isEmpty();
}
@Test
@@ -871,8 +884,10 @@ public abstract class AbstractMetadataRe
Date lower = new Date( artifact.getWhenGathered().getTime() - 10000 );
Date upper = new Date( artifact.getWhenGathered().getTime() + 10000 );
- assertEquals( Collections.singletonList( artifact ),
- repository.getArtifactsByDateRange( TEST_REPO_ID, lower, upper ) );
+
+ List<ArtifactMetadata> artifacts = repository.getArtifactsByDateRange( TEST_REPO_ID, lower, upper );
+
+ assertEquals( Collections.singletonList( artifact ), artifacts );
}
@Test
@@ -884,8 +899,10 @@ public abstract class AbstractMetadataRe
repository.save();
Date upper = new Date( artifact.getWhenGathered().getTime() + 10000 );
- assertEquals( Collections.singletonList( artifact ),
- repository.getArtifactsByDateRange( TEST_REPO_ID, null, upper ) );
+
+ List<ArtifactMetadata> artifacts = repository.getArtifactsByDateRange( TEST_REPO_ID, null, upper );
+
+ assertEquals( Collections.singletonList( artifact ), artifacts );
}
@Test
@@ -897,7 +914,12 @@ public abstract class AbstractMetadataRe
repository.save();
Date upper = new Date( artifact.getWhenGathered().getTime() - 10000 );
- assertTrue( repository.getArtifactsByDateRange( TEST_REPO_ID, null, upper ).isEmpty() );
+
+ List<ArtifactMetadata> artifacts = repository.getArtifactsByDateRange( TEST_REPO_ID, null, upper );
+
+ //assertTrue( .isEmpty() );
+
+ Assertions.assertThat( artifacts ).isNotNull().isEmpty();
}
@Test
@@ -908,7 +930,9 @@ public abstract class AbstractMetadataRe
repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
repository.save();
- assertEquals( Collections.singletonList( artifact ), repository.getArtifacts( TEST_REPO_ID ) );
+ List<ArtifactMetadata> artifacts = repository.getArtifacts( TEST_REPO_ID );
+
+ assertEquals( Collections.singletonList( artifact ), artifacts );
}
@Test
@@ -1191,13 +1215,17 @@ public abstract class AbstractMetadataRe
repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
- assertEquals( Collections.singletonList( artifact ), new ArrayList<ArtifactMetadata>(
- repository.getArtifacts( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION ) ) );
+ Collection<ArtifactMetadata> artifacts =
+ repository.getArtifacts( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
+
+ assertEquals( Collections.singletonList( artifact ), new ArrayList<ArtifactMetadata>( artifacts ) );
repository.removeArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact.getId() );
- assertTrue(
- repository.getArtifacts( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION ).isEmpty() );
+ artifacts =
+ repository.getArtifacts( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
+
+ Assertions.assertThat( artifacts ).isNotNull().isEmpty();
}
@Test
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/metadata/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/metadata/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/metadata/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/metadata/pom.xml Sat Jun 1 14:40:42 2013
@@ -22,7 +22,7 @@
<parent>
<artifactId>archiva-modules</artifactId>
<groupId>org.apache.archiva</groupId>
- <version>1.4-M4-SNAPSHOT</version>
+ <version>1.4-M5-SNAPSHOT</version>
</parent>
<artifactId>metadata</artifactId>
<name>Archiva :: Metadata</name>
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/metadata/test-repository/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/metadata/test-repository/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/metadata/test-repository/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/metadata/test-repository/pom.xml Sat Jun 1 14:40:42 2013
@@ -22,7 +22,7 @@
<parent>
<artifactId>metadata</artifactId>
<groupId>org.apache.archiva</groupId>
- <version>1.4-M4-SNAPSHOT</version>
+ <version>1.4-M5-SNAPSHOT</version>
</parent>
<artifactId>test-repository</artifactId>
<name>Archiva Metadata :: Repository for Testing</name>
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/audit/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/plugins/audit/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/plugins/audit/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/plugins/audit/pom.xml Sat Jun 1 14:40:42 2013
@@ -22,7 +22,7 @@
<parent>
<artifactId>plugins</artifactId>
<groupId>org.apache.archiva</groupId>
- <version>1.4-M4-SNAPSHOT</version>
+ <version>1.4-M5-SNAPSHOT</version>
</parent>
<artifactId>audit</artifactId>
<packaging>bundle</packaging>
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/generic-metadata-support/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/plugins/generic-metadata-support/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/plugins/generic-metadata-support/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/plugins/generic-metadata-support/pom.xml Sat Jun 1 14:40:42 2013
@@ -22,7 +22,7 @@
<parent>
<artifactId>plugins</artifactId>
<groupId>org.apache.archiva</groupId>
- <version>1.4-M4-SNAPSHOT</version>
+ <version>1.4-M5-SNAPSHOT</version>
</parent>
<artifactId>generic-metadata-support</artifactId>
<packaging>bundle</packaging>
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/maven1-repository/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/plugins/maven1-repository/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/plugins/maven1-repository/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/plugins/maven1-repository/pom.xml Sat Jun 1 14:40:42 2013
@@ -23,7 +23,7 @@
<parent>
<artifactId>plugins</artifactId>
<groupId>org.apache.archiva</groupId>
- <version>1.4-M4-SNAPSHOT</version>
+ <version>1.4-M5-SNAPSHOT</version>
</parent>
<artifactId>maven1-repository</artifactId>
<name>Archiva Core Plugins :: Maven 1.x Repository Support</name>
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/maven2-repository/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/plugins/maven2-repository/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/plugins/maven2-repository/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/plugins/maven2-repository/pom.xml Sat Jun 1 14:40:42 2013
@@ -22,7 +22,7 @@
<parent>
<artifactId>plugins</artifactId>
<groupId>org.apache.archiva</groupId>
- <version>1.4-M4-SNAPSHOT</version>
+ <version>1.4-M5-SNAPSHOT</version>
</parent>
<artifactId>maven2-repository</artifactId>
<packaging>bundle</packaging>
Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
Merged /archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:r1475941-1488530
Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
Merged /archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:r1475941-1488530
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/plugins/maven2-repository/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/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java Sat Jun 1 14:40:42 2013
@@ -176,27 +176,27 @@ public class TestMetadataRepository
public void save()
{
- //To change body of implemented methods use File | Settings | File Templates.
+ //
}
public void close()
{
- //To change body of implemented methods use File | Settings | File Templates.
+ //
}
public void revert()
{
- //To change body of implemented methods use File | Settings | File Templates.
+ //
}
public boolean canObtainAccess( Class<?> aClass )
{
- return false; //To change body of implemented methods use File | Settings | File Templates.
+ 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.
+ return null;
}
public void removeArtifact( String repositoryId, String namespace, String project, String version,
Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
------------------------------------------------------------------------------
Merged /archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:r1475941-1488530
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/metadata-store-file/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/plugins/metadata-store-file/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/plugins/metadata-store-file/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/plugins/metadata-store-file/pom.xml Sat Jun 1 14:40:42 2013
@@ -22,7 +22,7 @@
<parent>
<artifactId>plugins</artifactId>
<groupId>org.apache.archiva</groupId>
- <version>1.4-M4-SNAPSHOT</version>
+ <version>1.4-M5-SNAPSHOT</version>
</parent>
<artifactId>metadata-store-file</artifactId>
<packaging>bundle</packaging>
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java Sat Jun 1 14:40:42 2013
@@ -559,7 +559,7 @@ public class FileMetadataRepository
return false;
}
- public Object obtainAccess( Class<?> aClass )
+ public <T>T obtainAccess( Class<T> aClass )
{
throw new IllegalArgumentException(
"Access using " + aClass + " is not supported on the file metadata storage" );
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/metadata-store-jcr/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/plugins/metadata-store-jcr/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/plugins/metadata-store-jcr/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/plugins/metadata-store-jcr/pom.xml Sat Jun 1 14:40:42 2013
@@ -23,7 +23,7 @@
<parent>
<artifactId>plugins</artifactId>
<groupId>org.apache.archiva</groupId>
- <version>1.4-M4-SNAPSHOT</version>
+ <version>1.4-M5-SNAPSHOT</version>
</parent>
<artifactId>metadata-store-jcr</artifactId>
<packaging>bundle</packaging>
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java Sat Jun 1 14:40:42 2013
@@ -1256,14 +1256,14 @@ public class JcrMetadataRepository
return aClass == Session.class;
}
- public Object obtainAccess( Class<?> aClass )
+ public <T>T obtainAccess( Class<T> aClass )
throws MetadataRepositoryException
{
if ( aClass == Session.class )
{
try
{
- return getJcrSession();
+ return (T) getJcrSession();
}
catch ( RepositoryException e )
{
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/npanday-support/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/plugins/npanday-support/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/plugins/npanday-support/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/plugins/npanday-support/pom.xml Sat Jun 1 14:40:42 2013
@@ -23,7 +23,7 @@
<parent>
<artifactId>plugins</artifactId>
<groupId>org.apache.archiva</groupId>
- <version>1.4-M4-SNAPSHOT</version>
+ <version>1.4-M5-SNAPSHOT</version>
</parent>
<artifactId>npanday-support</artifactId>
<packaging>bundle</packaging>
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/plugins/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/plugins/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/plugins/pom.xml Sat Jun 1 14:40:42 2013
@@ -22,7 +22,7 @@
<parent>
<artifactId>archiva-modules</artifactId>
<groupId>org.apache.archiva</groupId>
- <version>1.4-M4-SNAPSHOT</version>
+ <version>1.4-M5-SNAPSHOT</version>
</parent>
<artifactId>plugins</artifactId>
<name>Archiva :: Core Plugins</name>
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/problem-reports/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/plugins/problem-reports/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/plugins/problem-reports/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/plugins/problem-reports/pom.xml Sat Jun 1 14:40:42 2013
@@ -22,7 +22,7 @@
<parent>
<artifactId>plugins</artifactId>
<groupId>org.apache.archiva</groupId>
- <version>1.4-M4-SNAPSHOT</version>
+ <version>1.4-M5-SNAPSHOT</version>
</parent>
<artifactId>problem-reports</artifactId>
<packaging>bundle</packaging>
Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/
------------------------------------------------------------------------------
Merged /archiva/trunk/archiva-modules/plugins/repository-statistics:r1475941-1488530
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/pom.xml Sat Jun 1 14:40:42 2013
@@ -22,7 +22,7 @@
<parent>
<artifactId>plugins</artifactId>
<groupId>org.apache.archiva</groupId>
- <version>1.4-M4-SNAPSHOT</version>
+ <version>1.4-M5-SNAPSHOT</version>
</parent>
<artifactId>repository-statistics</artifactId>
<packaging>bundle</packaging>
Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/pom.xml
------------------------------------------------------------------------------
Merged /archiva/trunk/archiva-modules/plugins/repository-statistics/pom.xml:r1475941-1488530
Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/
------------------------------------------------------------------------------
Merged /archiva/trunk/archiva-modules/plugins/repository-statistics/src:r1475941-1488530
Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/
------------------------------------------------------------------------------
Merged /archiva/trunk/archiva-modules/plugins/repository-statistics/src/main:r1475941-1488530
Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/java/
------------------------------------------------------------------------------
Merged /archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java:r1475941-1488530
Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/java/org/
------------------------------------------------------------------------------
Merged /archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org:r1475941-1488530
Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/
------------------------------------------------------------------------------
Merged /archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache:r1475941-1488530
Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/
------------------------------------------------------------------------------
Merged /archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva:r1475941-1488530
Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
Merged /archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata:r1475941-1488530
Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
Merged /archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository:r1475941-1488530
Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/
------------------------------------------------------------------------------
Merged /archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats:r1475941-1488530
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java Sat Jun 1 14:40:42 2013
@@ -151,6 +151,8 @@ public class DefaultRepositoryStatistics
long startGather = System.currentTimeMillis();
+ // FIXME what about other implementations ?
+
if ( metadataRepository.canObtainAccess( Session.class ) )
{
// TODO: this is currently very raw and susceptible to changes in content structure. Should we instead
@@ -168,7 +170,7 @@ public class DefaultRepositoryStatistics
populateStatisticsFromRepositoryWalk( metadataRepository, repositoryId, repositoryStatistics );
}
- log.info( "Gathering statistics executed in " + ( System.currentTimeMillis() - startGather ) + "ms" );
+ log.info( "Gathering statistics executed in {} ms", ( System.currentTimeMillis() - startGather ) );
metadataRepository.addMetadataFacet( repositoryId, repositoryStatistics );
}
Propchange: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java
------------------------------------------------------------------------------
Merged /archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java:r1475941-1488530
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/plugins/stage-repository-merge/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/plugins/stage-repository-merge/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/plugins/stage-repository-merge/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/plugins/stage-repository-merge/pom.xml Sat Jun 1 14:40:42 2013
@@ -22,7 +22,7 @@
<parent>
<artifactId>plugins</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>stage-repository-merge</artifactId>
Modified: archiva/branches/archiva-MRM-1756/archiva-modules/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/pom.xml?rev=1488531&r1=1488530&r2=1488531&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-1756/archiva-modules/pom.xml (original)
+++ archiva/branches/archiva-MRM-1756/archiva-modules/pom.xml Sat Jun 1 14:40:42 2013
@@ -21,7 +21,7 @@
<parent>
<artifactId>archiva</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-modules</artifactId>