Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 31520 invoked from network); 18 Jul 2005 02:39:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 18 Jul 2005 02:39:42 -0000 Received: (qmail 74028 invoked by uid 500); 18 Jul 2005 02:39:42 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 74003 invoked by uid 500); 18 Jul 2005 02:39:41 -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 73990 invoked by uid 99); 18 Jul 2005 02:39:41 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sun, 17 Jul 2005 19:39:30 -0700 Received: (qmail 31465 invoked by uid 65534); 18 Jul 2005 02:39:28 -0000 Message-ID: <20050718023928.31464.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r219443 - in /maven/continuum/trunk: continuum-core-it/src/test/java/org/apache/maven/continuum/it/ continuum-core/src/main/java/org/apache/maven/continuum/core/ continuum-core/src/main/java/org/apache/maven/continuum/core/action/ continuum... Date: Mon, 18 Jul 2005 02:39:25 -0000 To: continuum-commits@maven.apache.org From: trygvis@apache.org X-Mailer: svnmailer-1.0.2 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: trygvis Date: Sun Jul 17 19:39:16 2005 New Revision: 219443 URL: http://svn.apache.org/viewcvs?rev=219443&view=rev Log: o Switching to the hand made JDO store. Added: maven/continuum/trunk/continuum-model/src/main/resources/META-INF/ maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo Modified: maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStore.java maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/AbstractContinuumTest.java maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTest.java maven/continuum/trunk/continuum-model/pom.xml maven/continuum/trunk/continuum-plexus-application/pom.xml Modified: maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java?rev=219443&r1=219442&r2=219443&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java (original) +++ maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java Sun Jul 17 19:39:16 2005 @@ -35,6 +35,7 @@ import org.apache.maven.continuum.xmlrpc.XmlRpcHelper; import org.apache.maven.continuum.Continuum; +import org.apache.maven.continuum.store.ContinuumStore; import org.apache.maven.continuum.scm.ScmResult; import org.apache.maven.continuum.scm.ScmFile; import org.apache.maven.continuum.project.ContinuumProject; @@ -135,6 +136,7 @@ line(); print( "IT root: " + rootDirectory.getAbsolutePath() ); print( "Remoting method: " + remotingMethod ); + print( "Store implementation: " + lookup( ContinuumStore.ROLE ).getClass() ); line(); deleteAndCreateDirectory( rootDirectory ); Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java?rev=219443&r1=219442&r2=219443&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java Sun Jul 17 19:39:16 2005 @@ -214,6 +214,8 @@ { try { + project.setCommandLineArguments( StringUtils.clean( project.getCommandLineArguments() ) ); + store.updateProject( project ); } catch ( ContinuumStoreException ex ) Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java?rev=219443&r1=219442&r2=219443&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java Sun Jul 17 19:39:16 2005 @@ -9,6 +9,8 @@ import java.io.File; import java.util.Map; +import org.codehaus.plexus.util.StringUtils; + /** * @author Trygve Laugstøl * @version $Id$ @@ -47,6 +49,8 @@ // figure out what it is. project.setWorkingDirectory( projectWorkingDirectory.getAbsolutePath() ); + + project.setCommandLineArguments( StringUtils.clean( project.getCommandLineArguments() ) ); getStore().updateProject( project ); } Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java?rev=219443&r1=219442&r2=219443&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java Sun Jul 17 19:39:16 2005 @@ -163,19 +163,21 @@ query.declareParameters( "String name" ); - query.setFilter( "this.name = name" ); + query.setFilter( "this.name == name" ); Collection result = ( (Collection) query.execute( name ) ); - commit( tx ); - if ( result.size() == 0 ) { + commit( tx ); + return null; } Object object = pm.detachCopy( result.iterator().next() ); + commit( tx ); + return (ContinuumProject) object; } finally @@ -201,19 +203,21 @@ query.declareParameters( "String scmUrl" ); - query.setFilter( "this.scmUrl = scmUrl" ); + query.setFilter( "this.scmUrl == scmUrl" ); Collection result = ( (Collection) query.execute( scmUrl ) ); - commit( tx ); - if ( result.size() == 0 ) { + commit( tx ); + return null; } Object object = pm.detachCopy( result.iterator().next() ); + commit( tx ); + return (ContinuumProject) object; } finally @@ -254,8 +258,33 @@ public ScmResult getScmResultForProject( String projectId ) throws ContinuumStoreException { - // TODO: - throw new UnsupportedOperationException(); + PersistenceManager pm = pmf.getPersistenceManager(); + + Transaction tx = pm.currentTransaction(); + + try + { + tx.begin(); + + ContinuumProject project = getContinuumProject( pm, projectId ); + + ScmResult scmResult = project.getScmResult(); + + if ( scmResult == null ) + { + return null; + } + + scmResult = (ScmResult) pm.detachCopy( scmResult ); + + commit( tx ); + + return scmResult; + } + finally + { + rollback( tx ); + } } public String addBuild( String projectId, ContinuumBuild build ) @@ -400,22 +429,45 @@ public List getChangedFilesForBuild( String buildId ) throws ContinuumStoreException { - // TODO: - throw new UnsupportedOperationException(); + PersistenceManager pm = pmf.getPersistenceManager(); + + Transaction tx = pm.currentTransaction(); + + try + { + tx.begin(); + + ContinuumBuild build = getContinuumBuild( pm, buildId ); + + ScmResult scmResult = build.getScmResult(); + + if ( scmResult == null ) + { + return null; + } + + List files = (List) pm.detachCopyAll( scmResult.getFiles() ); + + commit( tx ); + + return files; + } + finally + { + rollback( tx ); + } } public void removeNotifier( Object notifier ) throws ContinuumStoreException { - // TODO: - throw new UnsupportedOperationException(); + attachAndDelete( notifier ); } public void storeNotifier( Object notifier ) throws ContinuumStoreException { - // TODO: - throw new UnsupportedOperationException(); + updateObject( notifier ); } // ---------------------------------------------------------------------- @@ -468,6 +520,28 @@ Object id = pm.getObjectId( object ); return pm.getObjectById( id ); + } + + private void attachAndDelete( Object object ) + { + PersistenceManager pm = pmf.getPersistenceManager(); + + Transaction tx = pm.currentTransaction(); + + try + { + tx.begin(); + + pm.attachCopy( object, true ); + + pm.deletePersistent( object ); + + commit( tx ); + } + finally + { + rollback( tx ); + } } private void deletePersistentById( Class clazz, Object identifier ) Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStore.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStore.java?rev=219443&r1=219442&r2=219443&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStore.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStore.java Sun Jul 17 19:39:16 2005 @@ -115,8 +115,6 @@ store.deleteContinuumProject( projectId ); store.commit(); - - getLogger().info( "Removed project with id '" + projectId + "'." ); } catch ( Exception e ) { @@ -131,8 +129,6 @@ { try { - project.setCommandLineArguments( StringUtils.clean( project.getCommandLineArguments() ) ); - store.storeContinuumProject( project ); project = store.getContinuumProject( project.getId(), true ); Modified: maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml?rev=219443&r1=219442&r2=219443&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml (original) +++ maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml Sun Jul 17 19:39:16 2005 @@ -117,6 +117,19 @@ org.apache.maven.continuum.store.ContinuumStore + org.apache.maven.continuum.store.JdoContinuumStore + + + org.codehaus.plexus.jdo.JdoFactory + + + + + + + ContinuumStore modello org.apache.maven.continuum.store.ModelloJPoxContinuumStore @@ -127,7 +140,7 @@ - org.apache.maven.continuum.store.ContinuumStore + ContinuumStore jdo org.apache.maven.continuum.store.JdoContinuumStore Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/AbstractContinuumTest.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/AbstractContinuumTest.java?rev=219443&r1=219442&r2=219443&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/AbstractContinuumTest.java (original) +++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/AbstractContinuumTest.java Sun Jul 17 19:39:16 2005 @@ -53,7 +53,7 @@ protected ContinuumStore getStore() throws Exception { - return (ContinuumStore) lookup( ContinuumStore.ROLE, "jdo" ); + return (ContinuumStore) lookup( ContinuumStore.ROLE ); } // ---------------------------------------------------------------------- Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTest.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTest.java?rev=219443&r1=219442&r2=219443&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTest.java (original) +++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTest.java Sun Jul 17 19:39:16 2005 @@ -63,7 +63,7 @@ { super.setUp(); - store = (ContinuumStore) lookup( ContinuumStore.ROLE, roleHint ); + store = (ContinuumStore) lookup( "ContinuumStore", roleHint ); assertEquals( implementationClass, store.getClass() ); @@ -152,7 +152,7 @@ assertNotNull( project ); - assertEquals( projectId, project ); + assertEquals( projectId, project.getId() ); // ---------------------------------------------------------------------- // @@ -162,7 +162,7 @@ assertNotNull( project ); - assertEquals( projectId, project ); + assertEquals( projectId, project.getId() ); // ---------------------------------------------------------------------- // @@ -172,7 +172,7 @@ assertNotNull( project ); - assertEquals( projectId, project ); + assertEquals( projectId, project.getId() ); // ---------------------------------------------------------------------- // Modified: maven/continuum/trunk/continuum-model/pom.xml URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-model/pom.xml?rev=219443&r1=219442&r2=219443&view=diff ============================================================================== --- maven/continuum/trunk/continuum-model/pom.xml (original) +++ maven/continuum/trunk/continuum-model/pom.xml Sun Jul 17 19:39:16 2005 @@ -43,7 +43,9 @@ foo java + jpox-store Added: maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo?rev=219443&view=auto ============================================================================== --- maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo (added) +++ maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo Sun Jul 17 19:39:16 2005 @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Modified: maven/continuum/trunk/continuum-plexus-application/pom.xml URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-plexus-application/pom.xml?rev=219443&r1=219442&r2=219443&view=diff ============================================================================== --- maven/continuum/trunk/continuum-plexus-application/pom.xml (original) +++ maven/continuum/trunk/continuum-plexus-application/pom.xml Sun Jul 17 19:39:16 2005 @@ -163,7 +163,6 @@ org.apache.maven.plugins maven-plexus-plugin - 1.0-alpha-6-SNAPSHOT src/conf/application.xml src/conf @@ -173,7 +172,6 @@ app.properties target/plexus-test-runtime - org.apache.maven.plugins