Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 50502 invoked from network); 9 May 2005 07:37:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 9 May 2005 07:37:17 -0000 Received: (qmail 95943 invoked by uid 500); 9 May 2005 07:40:19 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 95894 invoked by uid 500); 9 May 2005 07:40:19 -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 95881 invoked by uid 99); 9 May 2005 07:40:19 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Mon, 09 May 2005 00:40:17 -0700 Received: (qmail 49863 invoked by uid 65534); 9 May 2005 07:37:06 -0000 Message-ID: <20050509073706.49862.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r169245 - /maven/continuum/trunk/continuum-core-it /maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum /maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail /maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project /maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/state /maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store /maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification /maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store /maven/continuum/trunk/continuum-model /maven/continuum/trunk/continuum-web/src/main/java/org/codehaus/continuum/web/tool Date: Mon, 09 May 2005 07:37:04 -0000 To: continuum-commits@maven.apache.org From: trygvis@apache.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: trygvis Date: Mon May 9 00:37:02 2005 New Revision: 169245 URL: http://svn.apache.org/viewcvs?rev=3D169245&view=3Drev Log: Fixing CONTINUUM-123: "Remove the "build signaled" state". Modified: maven/continuum/trunk/continuum-core-it/continuum.py maven/continuum/trunk/continuum-core-it/it.py maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/DefaultContinuum.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/TestUtils.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/notification/mail/FormatterTool.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/project/ContinuumProjectState.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/project/state/DefaultContinuumProjectStateGuard.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/store/ContinuumStore.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/store/ModelloJPoxContinuumStore.java maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/con= tinuum/notification/ContinuumNotificationDispatcherTest.java maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/con= tinuum/store/ModelloJPoxContinuumStoreTest.java maven/continuum/trunk/continuum-model/pom.xml maven/continuum/trunk/continuum-web/src/main/java/org/codehaus/continuu= m/web/tool/ContinuumStateContentGenerator.java Modified: maven/continuum/trunk/continuum-core-it/continuum.py URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core-it/= continuum.py?rev=3D169245&r1=3D169244&r2=3D169245&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core-it/continuum.py (original) +++ maven/continuum/trunk/continuum-core-it/continuum.py Mon May 9 00:37:0= 2 2005 @@ -9,7 +9,7 @@ STATE_OK =3D "ok" STATE_FAILED =3D "failed" STATE_ERROR =3D "error" -STATE_BUILD_SIGNALED =3D "build signaled" +#STATE_BUILD_SIGNALED =3D "build signaled" STATE_BUILDING =3D "building" STATE_CHECKING_OUT =3D "checking out" STATE_UPDATING =3D "updating" @@ -43,8 +43,8 @@ return STATE_FAILED elif ( state =3D=3D 4 ): return STATE_ERROR - elif ( state =3D=3D 5 ): - return STATE_BUILD_SIGNALED +# elif ( state =3D=3D 5 ): +# return STATE_BUILD_SIGNALED elif ( state =3D=3D 6 ): return STATE_BUILDING elif ( state =3D=3D 7 ): Modified: maven/continuum/trunk/continuum-core-it/it.py URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core-it/= it.py?rev=3D169245&r1=3D169244&r2=3D169245&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core-it/it.py (original) +++ maven/continuum/trunk/continuum-core-it/it.py Mon May 9 00:37:02 2005 @@ -185,8 +185,7 @@ print "waiting for build: " + buildId build =3D continuum.getBuild( buildId ) =20 - while( build.state =3D=3D continuum.STATE_BUILD_SIGNALED or=20 - build.state =3D=3D continuum.STATE_UPDATING or + while( build.state =3D=3D continuum.STATE_UPDATING or build.state =3D=3D continuum.STATE_BUILDING ): =20 if ( timeout <=3D 0 ): Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/mav= en/continuum/DefaultContinuum.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=3D169245&r1= =3D169244&r2=3D169245&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/DefaultContinuum.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/DefaultContinuum.java Mon May 9 00:37:02 2005 @@ -359,7 +359,7 @@ { ContinuumProject project =3D store.getProject( projectId ); =20 - store.setBuildSignalled( projectId ); +// store.setBuildSignalled( projectId ); =20 getLogger().info( "Enqueuing '" + project.getName() + "'." ); =20 Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/mav= en/continuum/TestUtils.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /main/java/org/apache/maven/continuum/TestUtils.java?rev=3D169245&r1=3D1692= 44&r2=3D169245&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/TestUtils.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/TestUtils.java Mon May 9 00:37:02 2005 @@ -73,10 +73,10 @@ =20 Assert.assertNotNull( result ); =20 - if ( result.getState() =3D=3D ContinuumProjectState.BUILD_SIGN= ALED ) - { - continue; - } +// if ( result.getState() =3D=3D ContinuumProjectState.BUILD_SI= GNALED ) +// { +// continue; +// } =20 if ( result.getState() !=3D ContinuumProjectState.BUILDING ) { Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/mav= en/continuum/notification/mail/FormatterTool.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java?= rev=3D169245&r1=3D169244&r2=3D169245&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/notification/mail/FormatterTool.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/notification/mail/FormatterTool.java Mon May 9 00:37:02 2005 @@ -55,10 +55,10 @@ { return "Error"; } - else if ( state =3D=3D ContinuumProjectState.BUILD_SIGNALED ) - { - return "Build signaled"; - } +// else if ( state =3D=3D ContinuumProjectState.BUILD_SIGNALED ) +// { +// return "Build signaled"; +// } else if ( state =3D=3D ContinuumProjectState.BUILDING ) { return "Building"; Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/mav= en/continuum/project/ContinuumProjectState.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /main/java/org/apache/maven/continuum/project/ContinuumProjectState.java?re= v=3D169245&r1=3D169244&r2=3D169245&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/project/ContinuumProjectState.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/project/ContinuumProjectState.java Mon May 9 00:37:02 2005 @@ -60,7 +60,7 @@ * the actual build starts to make. */ // public final static ContinuumProjectState BUILD_SIGNALED =3D new Con= tinuumProjectState( "signaled" ); - public final static int BUILD_SIGNALED =3D 5; +// public final static int BUILD_SIGNALED =3D 5; =20 /** * This state indicates that a project is currently beeing build. Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/mav= en/continuum/project/state/DefaultContinuumProjectStateGuard.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /main/java/org/apache/maven/continuum/project/state/DefaultContinuumProject= StateGuard.java?rev=3D169245&r1=3D169244&r2=3D169245&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/project/state/DefaultContinuumProjectStateGuard.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/project/state/DefaultContinuumProjectStateGuard.java Mon May 9 00:3= 7:02 2005 @@ -41,16 +41,20 @@ ContinuumProjectState.CHECKING_OUT, }; =20 - private final static int[] BUILD_SIGNALED_PREVIOUS_STATES =3D { +// private final static int[] BUILD_SIGNALED_PREVIOUS_STATES =3D { +// ContinuumProjectState.NEW, +// ContinuumProjectState.ERROR, +// ContinuumProjectState.OK, +// ContinuumProjectState.FAILED, +// ContinuumProjectState.BUILD_SIGNALED, +// }; + + private final static int[] UPDATING_PREVIOUS_STATES =3D { +// ContinuumProjectState.BUILD_SIGNALED, ContinuumProjectState.NEW, ContinuumProjectState.ERROR, ContinuumProjectState.OK, ContinuumProjectState.FAILED, - ContinuumProjectState.BUILD_SIGNALED, - }; - - private final static int[] UPDATING_PREVIOUS_STATES =3D { - ContinuumProjectState.BUILD_SIGNALED, }; =20 private final static int[] BUILDING_PREVIOUS_STATES =3D { @@ -116,10 +120,10 @@ { assertInStates( project.getState(), UPDATING_PREVIOUS_STATES, = "updating" ); } - else if ( newState =3D=3D ContinuumProjectState.BUILD_SIGNALED ) - { - assertInStates( project.getState(), BUILD_SIGNALED_PREVIOUS_ST= ATES, "build signaled" ); - } +// else if ( newState =3D=3D ContinuumProjectState.BUILD_SIGNALED ) +// { +// assertInStates( project.getState(), BUILD_SIGNALED_PREVIOUS_= STATES, "build signaled" ); +// } else if ( newState =3D=3D ContinuumProjectState.BUILDING ) { assertInStates( project.getState(), BUILDING_PREVIOUS_STATES, = "building" ); @@ -266,8 +270,8 @@ return "failed"; case ContinuumProjectState.ERROR: return "error"; - case ContinuumProjectState.BUILD_SIGNALED: - return "build signaled"; +// case ContinuumProjectState.BUILD_SIGNALED: +// return "build signaled"; case ContinuumProjectState.BUILDING: return "building"; case ContinuumProjectState.CHECKING_OUT: Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/mav= en/continuum/store/ContinuumStore.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /main/java/org/apache/maven/continuum/store/ContinuumStore.java?rev=3D16924= 5&r1=3D169244&r2=3D169245&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/store/ContinuumStore.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/store/ContinuumStore.java Mon May 9 00:37:02 2005 @@ -107,8 +107,8 @@ // Project and Build state transitions // -------------------------------------------------------------------= --- =20 - void setBuildSignalled( String projectId ) - throws ContinuumStoreException; +// void setBuildSignalled( String projectId ) +// throws ContinuumStoreException; =20 void setCheckoutDone( String projectId, CheckOutScmResult scmResult ) throws ContinuumStoreException; Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/mav= en/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=3D169245&r1=3D169244&r2=3D169245&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/store/ModelloJPoxContinuumStore.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/store/ModelloJPoxContinuumStore.java Mon May 9 00:37:02 2005 @@ -591,28 +591,28 @@ // // -------------------------------------------------------------------= --- =20 - public void setBuildSignalled( String projectId ) - throws ContinuumStoreException - { - try - { - store.begin(); - - ContinuumProject project =3D store.getContinuumProject( projec= tId, false ); - - projectStateGuard.assertTransition( project, ContinuumProjectS= tate.BUILD_SIGNALED ); - - project.setState( ContinuumProjectState.BUILD_SIGNALED ); - - store.commit(); - } - catch ( Exception e ) - { - rollback( store ); - - throw new ContinuumStoreException( "Error while setting projec= t state: '" + projectId + "'.", e ); - } - } +// public void setBuildSignalled( String projectId ) +// throws ContinuumStoreException +// { +// try +// { +// store.begin(); +// +// ContinuumProject project =3D store.getContinuumProject( proj= ectId, false ); +// +// projectStateGuard.assertTransition( project, ContinuumProjec= tState.BUILD_SIGNALED ); +// +// project.setState( ContinuumProjectState.BUILD_SIGNALED ); +// +// store.commit(); +// } +// catch ( Exception e ) +// { +// rollback( store ); +// +// throw new ContinuumStoreException( "Error while setting proj= ect state: '" + projectId + "'.", e ); +// } +// } =20 public void setCheckoutDone( String projectId, CheckOutScmResult scmRe= sult ) throws ContinuumStoreException Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/mav= en/continuum/notification/ContinuumNotificationDispatcherTest.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /test/java/org/apache/maven/continuum/notification/ContinuumNotificationDis= patcherTest.java?rev=3D169245&r1=3D169244&r2=3D169245&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/con= tinuum/notification/ContinuumNotificationDispatcherTest.java (original) +++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/con= tinuum/notification/ContinuumNotificationDispatcherTest.java Mon May 9 00:= 37:02 2005 @@ -38,7 +38,7 @@ =20 String projectId =3D ModelloJPoxContinuumStoreTest.addProject( sto= re, "Test Project" ); =20 - store.setBuildSignalled( projectId ); +// store.setBuildSignalled( projectId ); =20 store.setIsUpdating( projectId ); =20 Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/mav= en/continuum/store/ModelloJPoxContinuumStoreTest.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src= /test/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStoreTest.j= ava?rev=3D169245&r1=3D169244&r2=3D169245&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/con= tinuum/store/ModelloJPoxContinuumStoreTest.java (original) +++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/con= tinuum/store/ModelloJPoxContinuumStoreTest.java Mon May 9 00:37:02 2005 @@ -370,7 +370,7 @@ =20 String projectId =3D addProject( "Test Project" ); =20 - store.setBuildSignalled( projectId ); +// store.setBuildSignalled( projectId ); =20 store.setIsUpdating( projectId ); =20 @@ -408,7 +408,7 @@ =20 String projectId =3D addProject( "Test Project" ); =20 - store.setBuildSignalled( projectId ); +// store.setBuildSignalled( projectId ); =20 store.setIsUpdating( projectId ); =20 @@ -444,7 +444,7 @@ =20 String projectId =3D addProject( "Test Project" ); =20 - store.setBuildSignalled( projectId ); +// store.setBuildSignalled( projectId ); =20 store.setIsUpdating( projectId ); =20 @@ -452,7 +452,7 @@ =20 String projectIdFoo =3D addProject( "Foo Project" ); =20 - store.setBuildSignalled( projectIdFoo ); +// store.setBuildSignalled( projectIdFoo ); =20 store.setIsUpdating( projectIdFoo ); =20 @@ -460,7 +460,7 @@ =20 String projectIdBar =3D addProject( "Bar Project" ); =20 - store.setBuildSignalled( projectIdBar ); +// store.setBuildSignalled( projectIdBar ); =20 store.setIsUpdating( projectIdBar ); =20 @@ -519,9 +519,9 @@ =20 String projectId =3D addProject( "Test Project" ); =20 - store.setBuildSignalled( projectId ); +// store.setBuildSignalled( projectId ); =20 - assertInState( projectId, ContinuumProjectState.BUILD_SIGNALED ); +// assertInState( projectId, ContinuumProjectState.BUILD_SIGNALED ); =20 store.setIsUpdating( projectId ); =20 Modified: maven/continuum/trunk/continuum-model/pom.xml URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-model/po= m=2Exml?rev=3D169245&r1=3D169244&r2=3D169245&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-model/pom.xml (original) +++ maven/continuum/trunk/continuum-model/pom.xml Mon May 9 00:37:02 2005 @@ -17,8 +17,8 @@ jpox jpox-enhancer 1.0.4 - =20 - =20 + + @@ -33,20 +33,64 @@ 1.0.0 false src/main/resources/continuum.mdo + java + jpox-jdo-mapping target/classes + - =20 + jpox-store - =20 + + + + + Modified: maven/continuum/trunk/continuum-web/src/main/java/org/codehaus/co= ntinuum/web/tool/ContinuumStateContentGenerator.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/= main/java/org/codehaus/continuum/web/tool/ContinuumStateContentGenerator.ja= va?rev=3D169245&r1=3D169244&r2=3D169245&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-web/src/main/java/org/codehaus/continuu= m/web/tool/ContinuumStateContentGenerator.java (original) +++ maven/continuum/trunk/continuum-web/src/main/java/org/codehaus/continuu= m/web/tool/ContinuumStateContentGenerator.java Mon May 9 00:37:02 2005 @@ -44,10 +44,11 @@ { return "3D\"Error\"/"; } - else if ( state =3D=3D ContinuumProjectState.BUILD_SIGNALED ) - { - return "Build Queued"; - } + // TODO: Indicate in some way else +// else if ( state =3D=3D ContinuumProjectState.BUILD_SIGNALED ) +// { +// return "Build Queued"; +// } else if ( state =3D=3D ContinuumProjectState.BUILDING ) { return "Building";