Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 49978 invoked from network); 25 Dec 2006 03:16:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Dec 2006 03:16:28 -0000 Received: (qmail 87631 invoked by uid 500); 25 Dec 2006 03:16:35 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 87613 invoked by uid 500); 25 Dec 2006 03:16:35 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 87600 invoked by uid 99); 25 Dec 2006 03:16:35 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 24 Dec 2006 19:16:35 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 24 Dec 2006 19:16:27 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 42CA61A981A; Sun, 24 Dec 2006 19:15:36 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r490105 - in /maven/continuum/branches/key-based-refactor/continuum-store/src: main/java/org/apache/maven/continuum/store/JdoContinuumStore.java test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java Date: Mon, 25 Dec 2006 03:15:36 -0000 To: continuum-commits@maven.apache.org From: rinku@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061225031536.42CA61A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rinku Date: Sun Dec 24 19:15:35 2006 New Revision: 490105 URL: http://svn.apache.org/viewvc?view=rev&rev=490105 Log: o clean ups Modified: maven/continuum/branches/key-based-refactor/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java maven/continuum/branches/key-based-refactor/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java Modified: maven/continuum/branches/key-based-refactor/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java URL: http://svn.apache.org/viewvc/maven/continuum/branches/key-based-refactor/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java?view=diff&rev=490105&r1=490104&r2=490105 ============================================================================== --- maven/continuum/branches/key-based-refactor/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java (original) +++ maven/continuum/branches/key-based-refactor/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java Sun Dec 24 19:15:35 2006 @@ -622,10 +622,8 @@ private BuildDefinition getDefaultBuildDefinitionForProjectGroup( String groupKey ) throws ContinuumStoreException, ContinuumObjectNotFoundException - { - GroupProjectKey key = new GroupProjectKey(); - key.setGroupKey( groupKey ); - ProjectGroup projectGroup = getProjectGroupWithBuildDetails( key ); + { + ProjectGroup projectGroup = getProjectGroupWithBuildDetails( new GroupProjectKey(groupKey, null) ); for ( Iterator i = projectGroup.getBuildDefinitions().iterator(); i.hasNext(); ) { @@ -1171,9 +1169,7 @@ ProjectGroup pg = null; try { - GroupProjectKey key = new GroupProjectKey(); - key.setGroupKey( projectGroup.getKey() ); - pg = getProjectGroupWithProjects( key ); + pg = getProjectGroupWithProjects( new GroupProjectKey(projectGroup.getKey(), null)); } catch ( Exception e ) { Modified: maven/continuum/branches/key-based-refactor/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java URL: http://svn.apache.org/viewvc/maven/continuum/branches/key-based-refactor/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java?view=diff&rev=490105&r1=490104&r2=490105 ============================================================================== --- maven/continuum/branches/key-based-refactor/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java (original) +++ maven/continuum/branches/key-based-refactor/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java Sun Dec 24 19:15:35 2006 @@ -29,6 +29,7 @@ import org.apache.maven.continuum.model.system.Installation; import javax.jdo.JDODetachedFieldAccessException; + import java.util.Arrays; import java.util.Collection; import java.util.Iterator;