Return-Path: X-Original-To: apmail-archiva-commits-archive@www.apache.org Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CB1DCC723 for ; Mon, 3 Jun 2013 12:23:37 +0000 (UTC) Received: (qmail 62581 invoked by uid 500); 3 Jun 2013 12:23:37 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 62528 invoked by uid 500); 3 Jun 2013 12:23:36 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 62521 invoked by uid 99); 3 Jun 2013 12:23:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Jun 2013 12:23:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Jun 2013 12:23:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DD70A2388900; Mon, 3 Jun 2013 12:23:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1488973 - in /archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra: CassandraMetadataRepository.java model/ProjectVersionMetadataModel.java Date: Mon, 03 Jun 2013 12:23:14 -0000 To: commits@archiva.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130603122314.DD70A2388900@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olamy Date: Mon Jun 3 12:23:14 2013 New Revision: 1488973 URL: http://svn.apache.org/r1488973 Log: fix getProjectVersions Modified: archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ProjectVersionMetadataModel.java Modified: archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java?rev=1488973&r1=1488972&r2=1488973&view=diff ============================================================================== --- archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java (original) +++ archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java Mon Jun 3 12:23:14 2013 @@ -683,7 +683,24 @@ public class CassandraMetadataRepository throws MetadataResolutionException { final Set versions = new HashSet(); - + projectVersionMetadataModelEntityManager.visitAll( new Function() + { + @Override + public Boolean apply( ProjectVersionMetadataModel projectVersionMetadataModel ) + { + if ( projectVersionMetadataModel != null ) + { + if ( StringUtils.equals( repoId, + projectVersionMetadataModel.getNamespace().getRepository().getName() ) + && StringUtils.equals( namespace, projectVersionMetadataModel.getNamespace().getName() ) + && StringUtils.equals( projectId, projectVersionMetadataModel.getProjectId() ) ) + { + versions.add( projectVersionMetadataModel.getId() ); + } + } + return Boolean.TRUE; + } + } ); // FIXME use cql query artifactMetadataModelEntityManager.visitAll( new Function() { Modified: archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ProjectVersionMetadataModel.java URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ProjectVersionMetadataModel.java?rev=1488973&r1=1488972&r2=1488973&view=diff ============================================================================== --- archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ProjectVersionMetadataModel.java (original) +++ archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ProjectVersionMetadataModel.java Mon Jun 3 12:23:14 2013 @@ -101,6 +101,7 @@ public class ProjectVersionMetadataModel this.rowId = rowId; } + // FIXME must be renamed getVersion !!! public String getId() { return id;