Modified: continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/managing_project/removeProject.apt URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/managing_project/removeProject.apt?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/managing_project/removeProject.apt (original) +++ continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/managing_project/removeProject.apt Tue Oct 28 21:16:12 2008 @@ -8,8 +8,8 @@ Remove a Project - To remove a project, go to the project group summary and use the <> icon. + To remove a project, go to the Project Group Summary and click the <> icon. [../../images/delete.gif] Delete icon - You can also use the <<<'Delete group'>>> button in the project group summary to remove the whole project group. + You can also use the <<<'Delete group'>>> button in the Project Group Summary to remove the whole project group. Modified: continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/notification/index.apt URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/notification/index.apt?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/notification/index.apt (original) +++ continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/notification/index.apt Tue Oct 28 21:16:12 2008 @@ -6,9 +6,9 @@ Oct 3 2007 ------ -Notification +Managing Notification - Notifiers can be attached to a project with adding them in a pom in the {{{http://maven.apache.org/pom.html#Continuous_Integration_Management}ciManagement section}}. + Notifiers can be attached to a Maven project by adding them to the pom in the {{{http://maven.apache.org/pom.html#Continuous_Integration_Management}ciManagement section}}. +-------------------------------+ @@ -31,23 +31,23 @@ +-------------------------------+ - Or they can be added to a projectGroup with the Notifiers link : + Or they can be added to a Project Group with the Notifiers link: [../../images/notifiers-link-project-group.png] Notifiers Link - Or to a project with the add button in the edit project page : + Or to a project with the Add button on the Edit Project page: [../../images/notifiers-button-project.png] Notifier Button - Here you will the choice between notifiers implementation provided with continuum + Here you select between Notifier implementations provided with Continuum: [../../images/notifiers-type-choice.png] Notifier Type Choice - You have the following choices : + You have the following choices: * {{{mail.html}Mail}} - * {{{irc.html}Irc}} + * {{{irc.html}IRC}} * {{{jabber.html}Jabber}} Modified: continuum/branches/continuum-transient-state/continuum-docs/src/site/site.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-docs/src/site/site.xml?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-docs/src/site/site.xml (original) +++ continuum/branches/continuum-transient-state/continuum-docs/src/site/site.xml Tue Oct 28 21:16:12 2008 @@ -74,9 +74,11 @@ - + + + Propchange: continuum/branches/continuum-transient-state/continuum-docs/src/site/xdoc/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Oct 28 21:16:12 2008 @@ -1 +1,2 @@ +/continuum/branches/continuum-1.2.x/continuum-docs/src/site/xdoc:698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339 /continuum/trunk/continuum-docs/src/site/xdoc:690494-690520 Modified: continuum/branches/continuum-transient-state/continuum-docs/src/site/xdoc/release-notes.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-docs/src/site/xdoc/release-notes.xml?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-docs/src/site/xdoc/release-notes.xml (original) +++ continuum/branches/continuum-transient-state/continuum-docs/src/site/xdoc/release-notes.xml Tue Oct 28 21:16:12 2008 @@ -6,13 +6,24 @@

Release Notes - Continuum - Version 1.2

-The Continuum team is pleased to announce Apache Continuum 1.2 +The Apache Continuum team is pleased to announce Apache Continuum 1.2

New in Continuum 1.2

Using Spring

Continuum now uses the Spring Framework as it's underlying container instead of Plexus. This results in a boost in performance and stability for the web application in particular.

- +

Repository Purge

It's now possible to add purges which will cleanup : +

m2 repositories (now it's possible to configure a local m2 repository per project group)
build output directory

Maven plugin groupId and artifactId change

Now the maven plugin has the new groupId:artifactId org.apache.continuum:continuum-maven-plugin

New SCMs support

Now continuum two new providers : git and accurev.

Changes in Continuum 1.2

Bug

Bug +

[CONTINUUM-860] - multiple email addresses delimited with commas causes AddressException
[CONTINUUM-1371] - NullPointer when Releasing with Ant and Default Project Group
[CONTINUUM-1433] - Wrong path in descripton on how to allow the file protocol. +
[CONTINUUM-1433] - Wrong path in descripton on how to allow the file protocol.
[CONTINUUM-1489] - replace use of MungedHttpsURL with apache httpclient (4.0-beta1) -
[CONTINUUM-1515] - SCM Tag does not have a default value
[CONTINUUM-1521] - NullPointerException in StarTeam changelog command @@ -50,6 +61,8 @@
[CONTINUUM-1593] - Requires Javamail 1.5? Should be 1.4?
[CONTINUUM-1596] - The release perform doesn't work when a scm password is required +
[CONTINUUM-1601] - Email address with '+' is not accepted in mail notifier
[CONTINUUM-1610] - Deployment Repository Directory does not work at all @@ -66,7 +79,7 @@
[CONTINUUM-1647] - Incorrect alt and title text for releaseproject_disabled.gif
[CONTINUUM-1649] - http://continuum.apache.org/docs/1.1/user_guides/managing_builddef/builddefTemplate.html +
[CONTINUUM-1649] - Move Build Definition Template guide to Administrator's Guides
[CONTINUUM-1651] - Unable to delete user-created build definitions
[CONTINUUM-1693] - Continuum fills our server disk with SNAPSHOTs.
[CONTINUUM-1701] - No field validation when adding Ant and Shell projects +
[CONTINUUM-1701] - No field validation when adding Ant and Shell projects
[CONTINUUM-1713] - JDOFatalUserException '.-..column ""NAME"" that has maximum length of 255. Please correct your data!'
[CONTINUUM-1760] - TextArea inside the Working Copy Section for a Project is editable
[CONTINUUM-1768] - NPE on Members tab with LDAP authentication +
[CONTINUUM-1768] - NPE on Members tab with LDAP authentication
[CONTINUUM-1773] - unable to add a mail recipient address containing an ampersand (&) in the local part of the adress
[CONTINUUM-1782] - Rename 'Profiles' instances to 'Build Environments' in available roles.
[CONTINUUM-1784] - URLs with Query String appears not work properly +
[CONTINUUM-1785] - Broken link
[CONTINUUM-1788] - JBoss installation documentation contains a "Start Jetty" section @@ -142,7 +157,7 @@
[CONTINUUM-1816] - Continuum trunk failed to start on unix os
[CONTINUUM-1825] - NPE when checkout project with trunk (rev 678311) +
[CONTINUUM-1825] - NPE when checkout project with trunk (rev 678311)
[CONTINUUM-1828] - Downloaded maven files (pom and project.xml) are not deleted
[CONTINUUM-1863] - NPE when clicking Appearance menu item
[CONTINUUM-1867] - Project group admin should not be able to grant system-wide roles to himself +
[CONTINUUM-1869] - Correct type of url variable in 'Connection to Continuum' section on 'Guide to use XML-RPC with Continuum' page +
[CONTINUUM-1870] - changing groupId:artifactId of the maven plugin to org.apache.continuum:continuum-maven-plugin +
[CONTINUUM-1871] - Continuum does not execute builds when last BUILDRESULT.END_TIME=0 +
[CONTINUUM-1877] - Incorrect svn urls on site "source repository" page +
[CONTINUUM-1878] - MS SQL Server size of NVARCHAR defect +
[CONTINUUM-1888] - Support for 64 bit architectures has been removed +

- -

Improvement

+ +

Improvement +

[CONTINUUM-515] - Add a wait page when adding a project
[CONTINUUM-1344] - New Guide to Building Continuum from Source
[CONTINUUM-1465] - Project groups should probably get their own local maven repo +
[CONTINUUM-1490] - Include data-management-cli jar in the distribution
[CONTINUUM-1511] - Improve error handling when not able to resolv artifacts @@ -228,15 +260,16 @@
[CONTINUUM-1822] - Upgrade to Jetty 6.1.11
[CONTINUUM-1827] - XMPRPC Basic Compliance ( Call continuum XPMRPC Service from other language like Php ) +
[CONTINUUM-1846] - Split ContinuumStore to few dao classes
[CONTINUUM-1858] - Add rolesList page in the menu from redback
[CONTINUUM-1465] - Project groups should probably get their own local maven repo -

- -

New Feature

+ +

New Feature +

[CONTINUUM-782] - Add a feature to allow cleaning the m2 local repo once every N days
[CONTINUUM-1692] - Ability to delete build results via XML RPC
[CONTINUUM-1830] - Ability to view release results after leaving page +
[CONTINUUM-1843] - add new maven scm providers (accurev and git)

- -

Task

+ +

Task +

[CONTINUUM-1614] - release maven-scm 1.1
[CONTINUUM-1821] - Remove references to Maven in continuum-docs
[CONTINUUM-1885] - Clean up site documentation +

- -

Wish

+ +

Wish +

[CONTINUUM-1638] - Documentation for Release Management

+ +Have Fun ! +

+--
+The Apache Continuum Team + \ No newline at end of file Modified: continuum/branches/continuum-transient-state/continuum-jetty/pom.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-jetty/pom.xml?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-jetty/pom.xml (original) +++ continuum/branches/continuum-transient-state/continuum-jetty/pom.xml Tue Oct 28 21:16:12 2008 @@ -22,7 +22,7 @@ continuum org.apache.continuum - 1.2-SNAPSHOT + 1.3-SNAPSHOT continuum-jetty pom @@ -31,12 +31,12 @@ org.mortbay.jetty jetty - 6.1.11 + ${jetty.version} org.mortbay.jetty start - 6.1.11 + ${jetty.version} org.apache.continuum @@ -47,25 +47,25 @@ org.mortbay.jetty jetty-naming - 6.1.11 + ${jetty.version} runtime org.mortbay.jetty servlet-api-2.5 - 6.1.11 + ${jetty.version} runtime org.mortbay.jetty jsp-api-2.0 - 6.1.11 + ${jetty.version} runtime org.mortbay.jetty jetty-plus - 6.1.11 + ${jetty.version} runtime @@ -125,13 +125,13 @@ org.slf4j jcl104-over-slf4j - 1.0.1 + 1.5.0 runtime org.slf4j slf4j-simple - 1.0.1 + 1.5.0 runtime @@ -152,7 +152,7 @@ org.codehaus.mojo appassembler-maven-plugin - 1.0-beta-1 + 1.0-beta-2 @@ -178,24 +178,24 @@ TRUE - set.default.APP_BASE - %PWD%/.. - - set.default.REPO_DIR lib wrapper.logfile - %APP_BASE%/logs/wrapper.log + %CONTINUUM_BASE%/logs/wrapper.log wrapper.app.parameter.2 - %APP_BASE%/conf/jetty.xml + %CONTINUUM_BASE%/conf/jetty.xml wrapper.app.parameter.3 - %APP_BASE%/conf/jetty-logging.xml + %CONTINUUM_BASE%/conf/jetty-logging.xml + + + app.base.envvar + CONTINUUM_BASE wrapper.on_exit.default @@ -210,13 +210,26 @@ 30 + + linux-x86-32 + linux-x86-64 + macosx-x86-universal-32 + solaris-x86-32 + solaris-sparc-32 + solaris-sparc-64 + windows-x86-32 + - appserver.base=%APP_BASE% - derby.system.home=%APP_BASE%/logs - jetty.logs=%APP_BASE%/logs + appserver.home=. + appserver.base=%CONTINUUM_BASE% + + jetty.logs=%CONTINUUM_BASE%/logs + java.io.tmpdir=%CONTINUUM_BASE%/tmp @@ -263,7 +276,7 @@ - + @@ -280,4 +293,7 @@ http://snapshots.repository.codehaus.org/ + + 6.1.11 + Modified: continuum/branches/continuum-transient-state/continuum-jetty/src/main/assembly/bin.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-jetty/src/main/assembly/bin.xml?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-jetty/src/main/assembly/bin.xml (original) +++ continuum/branches/continuum-transient-state/continuum-jetty/src/main/assembly/bin.xml Tue Oct 28 21:16:12 2008 @@ -59,8 +59,11 @@ bin wrapper-linux-x86-32 + wrapper-linux-x86-64 wrapper-macosx-universal-32 wrapper-solaris-x86-32 + wrapper-solaris-sparc-32 + wrapper-solaris-sparc-64 0755 @@ -86,9 +89,19 @@ / NOTICE + + + + src/main/resources/ + / + LICENSE + + src/main/tmp/ + /tmp + Modified: continuum/branches/continuum-transient-state/continuum-model/pom.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-model/pom.xml?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-model/pom.xml (original) +++ continuum/branches/continuum-transient-state/continuum-model/pom.xml Tue Oct 28 21:16:12 2008 @@ -21,7 +21,7 @@ continuum org.apache.continuum - 1.2-SNAPSHOT + 1.3-SNAPSHOT 4.0.0 continuum-model @@ -63,7 +63,7 @@ - 1.1.2 + 1.1.3 false src/main/mdo/continuum.xml Modified: continuum/branches/continuum-transient-state/continuum-model/src/main/mdo/continuum.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-model/src/main/mdo/continuum.xml?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-model/src/main/mdo/continuum.xml (original) +++ continuum/branches/continuum-transient-state/continuum-model/src/main/mdo/continuum.xml Tue Oct 28 21:16:12 2008 @@ -101,7 +101,7 @@ projectScmRoots - 1.1.2+ + 1.1.3+ ProjectScmRoot * @@ -346,7 +346,7 @@ scmResult - 1.1.2+ + 1.1.3+ ScmResult @@ -435,7 +435,7 @@ sendOnScmFailure - 1.1.2+ + 1.1.3+ boolean false @@ -788,21 +788,32 @@ */ public String toString() { - String result = author + "\n" + date + "\n"; + StringBuilder result = new StringBuilder(); + if ( author != null ) + { + result.append( author ).append( "\n" ); + } + result.append( date ).append( "\n" ); if ( files != null ) { for ( java.util.Iterator i = files.iterator(); i.hasNext(); ) { ChangeFile file = (ChangeFile) i.next(); - - result += file + "\n"; + + if (file != null) + { + result.append( file ).append( "\n" ); + } } } - result += comment; + if ( comment != null ) + { + result.append( comment ); + } - return result; + return result.toString(); } /** @@ -842,8 +853,8 @@ org.apache.maven.continuum.model.scm 1.0.9+ - - name + + name 1.0.9+ String @@ -1227,6 +1238,12 @@ boolean false + + releaseOutputDirectory + 1.1.2+ + String + release-output-directory + @@ -1486,11 +1503,11 @@ - + - ProjectScmRoot + ContinuumReleaseResult 1.1.2+ - org.apache.continuum.model.project + org.apache.continuum.model.release id @@ -1499,29 +1516,76 @@ int - scmRootAddress + startTime + 1.1.2+ + long + + + endTime + 1.1.2+ + long + + + resultCode + 1.1.2+ + int + + + projectGroup + 1.1.2+ + + ProjectGroup + + + + project + 1.1.2+ + + Project + + + + releaseGoal 1.1.2+ String + + + + + ProjectScmRoot + 1.1.3+ + org.apache.continuum.model.project + + + id + 1.1.3+ + true + int + + + scmRootAddress + 1.1.3+ + String true oldState - 1.1.2+ + 1.1.3+ int state - 1.1.2+ + 1.1.3+ int error - 1.1.2+ + 1.1.3+ String projectGroup - 1.1.2+ + 1.1.3+ ProjectGroup Modified: continuum/branches/continuum-transient-state/continuum-model/src/main/resources/package-mssql.orm URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-model/src/main/resources/package-mssql.orm?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-model/src/main/resources/package-mssql.orm (original) +++ continuum/branches/continuum-transient-state/continuum-model/src/main/resources/package-mssql.orm Tue Oct 28 21:16:12 2008 @@ -6,29 +6,36 @@ - + - + - + - + - + + + + + + + + Modified: continuum/branches/continuum-transient-state/continuum-notifiers/continuum-notifier-api/pom.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-notifiers/continuum-notifier-api/pom.xml?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-notifiers/continuum-notifier-api/pom.xml (original) +++ continuum/branches/continuum-transient-state/continuum-notifiers/continuum-notifier-api/pom.xml Tue Oct 28 21:16:12 2008 @@ -21,7 +21,7 @@ continuum-notifiers org.apache.continuum - 1.2-SNAPSHOT + 1.3-SNAPSHOT 4.0.0 continuum-notifier-api Modified: continuum/branches/continuum-transient-state/continuum-notifiers/continuum-notifier-irc/pom.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-notifiers/continuum-notifier-irc/pom.xml?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-notifiers/continuum-notifier-irc/pom.xml (original) +++ continuum/branches/continuum-transient-state/continuum-notifiers/continuum-notifier-irc/pom.xml Tue Oct 28 21:16:12 2008 @@ -21,7 +21,7 @@ continuum-notifiers org.apache.continuum - 1.2-SNAPSHOT + 1.3-SNAPSHOT 4.0.0 continuum-notifier-irc Modified: continuum/branches/continuum-transient-state/continuum-notifiers/continuum-notifier-jabber/pom.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-notifiers/continuum-notifier-jabber/pom.xml?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-notifiers/continuum-notifier-jabber/pom.xml (original) +++ continuum/branches/continuum-transient-state/continuum-notifiers/continuum-notifier-jabber/pom.xml Tue Oct 28 21:16:12 2008 @@ -21,7 +21,7 @@ continuum-notifiers org.apache.continuum - 1.2-SNAPSHOT + 1.3-SNAPSHOT 4.0.0 continuum-notifier-jabber Modified: continuum/branches/continuum-transient-state/continuum-notifiers/continuum-notifier-msn/pom.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-notifiers/continuum-notifier-msn/pom.xml?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-notifiers/continuum-notifier-msn/pom.xml (original) +++ continuum/branches/continuum-transient-state/continuum-notifiers/continuum-notifier-msn/pom.xml Tue Oct 28 21:16:12 2008 @@ -21,7 +21,7 @@ continuum-notifiers org.apache.continuum - 1.2-SNAPSHOT + 1.3-SNAPSHOT 4.0.0 continuum-notifier-msn Modified: continuum/branches/continuum-transient-state/continuum-notifiers/continuum-notifier-wagon/pom.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-notifiers/continuum-notifier-wagon/pom.xml?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-notifiers/continuum-notifier-wagon/pom.xml (original) +++ continuum/branches/continuum-transient-state/continuum-notifiers/continuum-notifier-wagon/pom.xml Tue Oct 28 21:16:12 2008 @@ -21,7 +21,7 @@ continuum-notifiers org.apache.continuum - 1.2-SNAPSHOT + 1.3-SNAPSHOT 4.0.0 continuum-notifier-wagon Modified: continuum/branches/continuum-transient-state/continuum-notifiers/pom.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-notifiers/pom.xml?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-notifiers/pom.xml (original) +++ continuum/branches/continuum-transient-state/continuum-notifiers/pom.xml Tue Oct 28 21:16:12 2008 @@ -21,7 +21,7 @@ continuum org.apache.continuum - 1.2-SNAPSHOT + 1.3-SNAPSHOT 4.0.0 continuum-notifiers Propchange: continuum/branches/continuum-transient-state/continuum-purge/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Tue Oct 28 21:16:12 2008 @@ -1,4 +1,5 @@ .classpath .settings .project +continuum-purge.iml target Modified: continuum/branches/continuum-transient-state/continuum-purge/pom.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-purge/pom.xml?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-purge/pom.xml (original) +++ continuum/branches/continuum-transient-state/continuum-purge/pom.xml Tue Oct 28 21:16:12 2008 @@ -22,7 +22,7 @@ continuum org.apache.continuum - 1.2-SNAPSHOT + 1.3-SNAPSHOT continuum-purge Continuum :: Purge System Modified: continuum/branches/continuum-transient-state/continuum-release/pom.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-release/pom.xml?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-release/pom.xml (original) +++ continuum/branches/continuum-transient-state/continuum-release/pom.xml Tue Oct 28 21:16:12 2008 @@ -22,7 +22,7 @@ continuum org.apache.continuum - 1.2-SNAPSHOT + 1.3-SNAPSHOT continuum-release Continuum :: Release System Modified: continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java (original) +++ continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java Tue Oct 28 21:16:12 2008 @@ -20,7 +20,11 @@ */ import org.apache.continuum.model.repository.LocalRepository; +import org.apache.continuum.release.config.ContinuumReleaseDescriptor; +import org.apache.maven.continuum.installation.InstallationService; import org.apache.maven.continuum.model.project.Project; +import org.apache.maven.continuum.model.system.Installation; +import org.apache.maven.continuum.model.system.Profile; import org.apache.maven.continuum.release.tasks.PerformReleaseProjectTask; import org.apache.maven.continuum.release.tasks.PrepareReleaseProjectTask; import org.apache.maven.continuum.release.tasks.RollbackReleaseProjectTask; @@ -32,9 +36,13 @@ import org.codehaus.plexus.taskqueue.Task; import org.codehaus.plexus.taskqueue.TaskQueue; import org.codehaus.plexus.taskqueue.TaskQueueException; +import org.codehaus.plexus.util.StringUtils; import java.io.File; +import java.util.Collections; +import java.util.HashMap; import java.util.Hashtable; +import java.util.List; import java.util.Map; import java.util.Properties; @@ -69,6 +77,11 @@ * @plexus.requirement */ private WorkingDirectoryService workingDirectoryService; + + /** + * @plexus.requirement + */ + private InstallationService installationService; private Map listeners; @@ -90,16 +103,23 @@ ContinuumReleaseManagerListener listener ) throws ContinuumReleaseException { + return prepare( project, releaseProperties, relVersions, devVersions, listener, null ); + } + + public String prepare( Project project, Properties releaseProperties, Map relVersions, Map devVersions, + ContinuumReleaseManagerListener listener, Profile profile ) + throws ContinuumReleaseException + { String releaseId = project.getGroupId() + ":" + project.getArtifactId(); - ReleaseDescriptor descriptor = getReleaseDescriptor( project, releaseProperties, relVersions, devVersions ); + ReleaseDescriptor descriptor = getReleaseDescriptor( project, releaseProperties, relVersions, devVersions, profile ); getListeners().put( releaseId, listener ); try { prepareReleaseQueue.put( - new PrepareReleaseProjectTask( releaseId, descriptor, (ReleaseManagerListener) listener ) ); + new PrepareReleaseProjectTask( releaseId, descriptor, (ReleaseManagerListener) listener, profile ) ); } catch ( TaskQueueException e ) @@ -199,10 +219,43 @@ return releaseResults; } + public Map getEnvironments( Profile profile ) + { + if ( profile == null ) + { + return Collections.EMPTY_MAP; + } + + Map envVars = new HashMap(); + if ( profile == null ) + { + return envVars; + } + + String javaHome = getJavaHomeValue( profile ); + if ( !StringUtils.isEmpty( javaHome ) ) + { + envVars.put( installationService.getEnvVar( InstallationService.JDK_TYPE ), javaHome ); + } + + Installation builder = profile.getBuilder(); + if ( builder != null ) + { + envVars.put( installationService.getEnvVar( InstallationService.MAVEN2_TYPE ), builder.getVarValue() ); + } + + List installations = profile.getEnvironmentVariables(); + for ( Installation installation : installations ) + { + envVars.put( installation.getVarName(), installation.getVarValue() ); + } + return envVars; + } + private ReleaseDescriptor getReleaseDescriptor( Project project, Properties releaseProperties, Map relVersions, - Map devVersions ) + Map devVersions, Profile profile ) { - ReleaseDescriptor descriptor = new ReleaseDescriptor(); + ContinuumReleaseDescriptor descriptor = new ContinuumReleaseDescriptor(); String workingDirectory = workingDirectoryService.getWorkingDirectory( project ).getPath(); //release properties from the project @@ -235,14 +288,17 @@ //forced properties descriptor.setInteractive( false ); - + + //set environments + descriptor.setEnvironments( getEnvironments( profile ) ); + return descriptor; } private ReleaseDescriptor readReleaseDescriptor( String workingDirectory ) throws ContinuumReleaseException { - ReleaseDescriptor descriptor = new ReleaseDescriptor(); + ReleaseDescriptor descriptor = new ContinuumReleaseDescriptor(); descriptor.setWorkingDirectory( workingDirectory ); try @@ -266,4 +322,14 @@ return listeners; } + + private String getJavaHomeValue( Profile profile ) + { + Installation jdk = profile.getJdk(); + if ( jdk == null ) + { + return null; + } + return jdk.getVarValue(); + } } Modified: continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java (original) +++ continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java Tue Oct 28 21:16:12 2008 @@ -19,6 +19,7 @@ * under the License. */ +import org.apache.maven.continuum.model.system.Profile; import org.apache.maven.shared.release.ReleaseManagerListener; import org.apache.maven.shared.release.config.ReleaseDescriptor; import org.codehaus.plexus.taskqueue.Task; @@ -37,11 +38,15 @@ private long maxExecutionTime; - public AbstractReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor, ReleaseManagerListener listener ) + private Profile profile; + + public AbstractReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor, ReleaseManagerListener listener, + Profile profile ) { this.releaseId = releaseId; this.descriptor = descriptor; this.listener = listener; + this.profile = profile; } public ReleaseDescriptor getDescriptor() @@ -83,4 +88,14 @@ { this.maxExecutionTime = maxTime; } + + public Profile getProfile() + { + return profile; + } + + public void setProfile( Profile profile ) + { + this.profile = profile; + } } Modified: continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java (original) +++ continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java Tue Oct 28 21:16:12 2008 @@ -20,6 +20,7 @@ */ import org.apache.continuum.model.repository.LocalRepository; +import org.apache.maven.continuum.model.system.Profile; import org.apache.maven.shared.release.ReleaseManagerListener; import org.apache.maven.shared.release.config.ReleaseDescriptor; @@ -42,13 +43,20 @@ public PerformReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor, File buildDirectory, String goals, boolean useReleaseProfile, ReleaseManagerListener listener ) { - this( releaseId, descriptor, buildDirectory, goals, useReleaseProfile, listener, null ); + this( releaseId, descriptor, buildDirectory, goals, useReleaseProfile, listener, null, null ); } public PerformReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor, File buildDirectory, String goals, boolean useReleaseProfile, ReleaseManagerListener listener, LocalRepository repository ) { - super( releaseId, descriptor, listener ); + this( releaseId, descriptor, buildDirectory, goals, useReleaseProfile, listener, repository, null ); + } + + public PerformReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor, File buildDirectory, String goals, + boolean useReleaseProfile, ReleaseManagerListener listener, LocalRepository repository, + Profile profile ) + { + super( releaseId, descriptor, listener, profile ); setBuildDirectory( buildDirectory ); setGoals( goals ); setUseReleaseProfile( useReleaseProfile ); Modified: continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PrepareReleaseProjectTask.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PrepareReleaseProjectTask.java?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PrepareReleaseProjectTask.java (original) +++ continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PrepareReleaseProjectTask.java Tue Oct 28 21:16:12 2008 @@ -19,6 +19,7 @@ * under the License. */ +import org.apache.maven.continuum.model.system.Profile; import org.apache.maven.shared.release.ReleaseManagerListener; import org.apache.maven.shared.release.config.ReleaseDescriptor; @@ -30,6 +31,11 @@ { public PrepareReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor, ReleaseManagerListener listener ) { - super( releaseId, descriptor, listener ); + this( releaseId, descriptor, listener, null ); + } + + public PrepareReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor, ReleaseManagerListener listener, Profile profile ) + { + super( releaseId, descriptor, listener, profile ); } } Modified: continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/RollbackReleaseProjectTask.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/RollbackReleaseProjectTask.java?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/RollbackReleaseProjectTask.java (original) +++ continuum/branches/continuum-transient-state/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/RollbackReleaseProjectTask.java Tue Oct 28 21:16:12 2008 @@ -1,5 +1,6 @@ package org.apache.maven.continuum.release.tasks; +import org.apache.maven.continuum.model.system.Profile; import org.apache.maven.shared.release.ReleaseManagerListener; import org.apache.maven.shared.release.config.ReleaseDescriptor; @@ -30,6 +31,11 @@ { public RollbackReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor, ReleaseManagerListener listener ) { - super( releaseId, descriptor, listener ); + this( releaseId, descriptor, listener, null ); + } + + public RollbackReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor, ReleaseManagerListener listener, Profile profile ) + { + super( releaseId, descriptor, listener, profile ); } } Modified: continuum/branches/continuum-transient-state/continuum-release/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-release/src/main/resources/META-INF/plexus/components.xml?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-release/src/main/resources/META-INF/plexus/components.xml (original) +++ continuum/branches/continuum-transient-state/continuum-release/src/main/resources/META-INF/plexus/components.xml Tue Oct 28 21:16:12 2008 @@ -26,7 +26,7 @@ org.apache.maven.shared.release.config.ReleaseDescriptorStore - properties + continuum-release-properties org.codehaus.plexus.taskqueue.TaskQueue @@ -46,6 +46,9 @@ org.apache.maven.continuum.utils.WorkingDirectoryService + + org.apache.maven.continuum.installation.InstallationService + @@ -240,7 +243,7 @@ org.apache.maven.shared.release.config.ReleaseDescriptorStore - properties + continuum-release-properties

configStore

@@ -260,7 +263,7 @@ map-development-versions rewrite-poms-for-release generate-release-poms - run-preparation-goals + run-release-prepare-goals scm-commit-release scm-tag rewrite-poms-for-development @@ -271,7 +274,7 @@ verify-completed-prepare-phases checkout-project-from-scm - run-perform-goals + run-release-perform-goals generate-reactor-projects @@ -304,7 +307,27 @@ - + + org.apache.maven.shared.release.phase.ReleasePhase + run-release-prepare-goals + org.apache.continuum.release.phase.RunPrepareGoalsPhase + + + org.apache.continuum.utils.shell.ShellCommandHelper + + + + + org.apache.maven.shared.release.phase.ReleasePhase + run-release-perform-goals + org.apache.continuum.release.phase.RunPerformGoalsPhase + + + org.apache.continuum.utils.shell.ShellCommandHelper + + + + org.apache.maven.artifact.metadata.ArtifactMetadataSource @@ -318,12 +341,16 @@ org.apache.maven.artifact.factory.ArtifactFactory - org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager + org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager + + org.apache.maven.shared.release.config.ReleaseDescriptorStore + continuum-release-properties + org.apache.continuum.release.config.ContinuumPropertiesReleaseDescriptorStore + Modified: continuum/branches/continuum-transient-state/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java (original) +++ continuum/branches/continuum-transient-state/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java Tue Oct 28 21:16:12 2008 @@ -21,6 +21,7 @@ import java.io.File; +import org.apache.continuum.release.config.ContinuumReleaseDescriptor; import org.apache.maven.continuum.release.ContinuumReleaseManager; import org.apache.maven.continuum.release.tasks.PerformReleaseProjectTask; import org.apache.maven.continuum.release.tasks.PrepareReleaseProjectTask; @@ -98,7 +99,7 @@ File testDir = new File( getBasedir(), "target/test-classes/test-dir" ); FileUtils.deleteDirectory( testDir ); - ReleaseDescriptor descriptor = new ReleaseDescriptor(); + ContinuumReleaseDescriptor descriptor = new ContinuumReleaseDescriptor(); descriptor.setInteractive( false ); descriptor.setScmSourceUrl( "scm:svn:file://localhost/" + scmPath + "/trunk" ); descriptor.setWorkingDirectory( workDir.getAbsolutePath() ); @@ -140,7 +141,7 @@ File testDir = new File( getBasedir(), "target/test-classes/test-dir" ); FileUtils.deleteDirectory( testDir ); - ReleaseDescriptor descriptor = new ReleaseDescriptor(); + ContinuumReleaseDescriptor descriptor = new ContinuumReleaseDescriptor(); descriptor.setInteractive( false ); descriptor.setScmSourceUrl( "scm:svn:file://localhost/" + scmPath + "/trunk" ); descriptor.setWorkingDirectory( workDir.getAbsolutePath() ); @@ -185,7 +186,7 @@ File testDir = new File( getBasedir(), "target/test-classes/test-dir" ); FileUtils.deleteDirectory( testDir ); - ReleaseDescriptor descriptor = new ReleaseDescriptor(); + ContinuumReleaseDescriptor descriptor = new ContinuumReleaseDescriptor(); descriptor.setInteractive( false ); descriptor.setScmSourceUrl( "scm:svn:file://localhost/" + scmPath + "/trunk" ); descriptor.setWorkingDirectory( workDir.getAbsolutePath() ); Modified: continuum/branches/continuum-transient-state/continuum-reports/pom.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-reports/pom.xml?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-reports/pom.xml (original) +++ continuum/branches/continuum-transient-state/continuum-reports/pom.xml Tue Oct 28 21:16:12 2008 @@ -22,7 +22,7 @@ continuum org.apache.continuum - 1.2-SNAPSHOT + 1.3-SNAPSHOT continuum-reports Continuum :: Reports Modified: continuum/branches/continuum-transient-state/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGenerator.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGenerator.java?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGenerator.java (original) +++ continuum/branches/continuum-transient-state/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGenerator.java Tue Oct 28 21:16:12 2008 @@ -18,15 +18,6 @@ */ package org.apache.maven.continuum.reports.surefire; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; - -import javax.xml.parsers.ParserConfigurationException; - import org.apache.maven.continuum.configuration.ConfigurationException; import org.apache.maven.continuum.configuration.ConfigurationService; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; @@ -34,31 +25,37 @@ import org.codehaus.plexus.util.DirectoryScanner; import org.xml.sax.SAXException; +import javax.xml.parsers.ParserConfigurationException; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; + /** * @author olamy - * @since 12 nov. 07 * @version $Id$ - * - * @plexus.component - * role="org.apache.maven.continuum.reports.surefire.ReportTestSuiteGenerator" role-hint="default" + * @plexus.component role="org.apache.maven.continuum.reports.surefire.ReportTestSuiteGenerator" role-hint="default" + * @since 12 nov. 07 */ public class DefaultReportTestSuiteGenerator implements ReportTestSuiteGenerator, Initializable { - + /** * @plexus.requirement */ private ConfigurationService configurationService; private List defaultIncludes; - + private List defaultexcludes; // ----------------------------- // Plexus Lifecycle // ----------------------------- - + public void initialize() throws InitializationException { @@ -68,7 +65,7 @@ defaultexcludes.add( "*.txt" ); } - /** + /** * @see org.apache.maven.continuum.reports.surefire.ReportTestSuiteGenerator#generateReports(java.io.File, java.util.List, java.util.List) */ public List generateReports( File directory, List includes, List excludes ) @@ -83,7 +80,7 @@ return Collections.EMPTY_LIST; } List reportTestSuites = new LinkedList(); - String[] includesArray = null; + String[] includesArray; if ( includes == null ) { includesArray = new String[0]; @@ -92,7 +89,7 @@ { includesArray = includes.toArray( new String[includes.size()] ); } - String[] excludesArray = null; + String[] excludesArray; if ( excludes == null ) { excludesArray = new String[0]; @@ -103,20 +100,18 @@ } String[] xmlReportFiles = getIncludedFiles( directory, includesArray, excludesArray ); - if (xmlReportFiles == null ) + if ( xmlReportFiles == null ) { return Collections.EMPTY_LIST; } - if (xmlReportFiles.length == 0) + if ( xmlReportFiles.length == 0 ) { return Collections.EMPTY_LIST; } - for ( int index = 0; index < xmlReportFiles.length; index++ ) + for ( String currentReport : xmlReportFiles ) { ReportTestSuite testSuite = new ReportTestSuite(); - String currentReport = xmlReportFiles[index]; - try { testSuite.parse( directory + File.separator + currentReport ); @@ -139,7 +134,7 @@ return reportTestSuites; } - /** + /** * @see org.apache.maven.continuum.reports.surefire.ReportTestSuiteGenerator#generateReports(java.io.File) */ public List generateReports( File directory ) @@ -147,10 +142,8 @@ { return generateReports( directory, defaultIncludes, defaultexcludes ); } - - - /** + /** * @see org.apache.maven.continuum.reports.surefire.ReportTestSuiteGenerator#generateReports(int, int) */ public List generateReports( int buildId, int projectId ) @@ -166,16 +159,16 @@ throw new ReportTestSuiteGeneratorException( e.getMessage(), e ); } } - - /** - * @see org.apache.maven.continuum.reports.surefire.ReportTestSuiteGenerator#generateTestResult(int, int) + + /** + * @see org.apache.maven.continuum.reports.surefire.ReportTestSuiteGenerator#generateReportTestResult(int, int) */ public ReportTestResult generateReportTestResult( int buildId, int projectId ) throws ReportTestSuiteGeneratorException { List reportTestSuites = generateReports( buildId, projectId ); ReportTestResult reportTestResult = new ReportTestResult(); - for (ReportTestSuite reportTestSuite : reportTestSuites) + for ( ReportTestSuite reportTestSuite : reportTestSuites ) { reportTestResult.addReportTestSuite( reportTestSuite ); } @@ -196,5 +189,5 @@ return scanner.getIncludedFiles(); } - + } Modified: continuum/branches/continuum-transient-state/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestResult.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestResult.java?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestResult.java (original) +++ continuum/branches/continuum-transient-state/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestResult.java Tue Oct 28 21:16:12 2008 @@ -23,32 +23,35 @@ /** * @author olamy - * @since 13 nov. 07 * @version $Id$ + * @since 13 nov. 07 */ public class ReportTestResult { private int testCount = 0; - + private int failureCount = 0; - + + private int errorCount = 0; + private float totalTime = 0; - + private List suiteResults; - public void addReportTestSuite(ReportTestSuite reportTestSuite) + public void addReportTestSuite( ReportTestSuite reportTestSuite ) { - if (this.suiteResults == null) + if ( this.suiteResults == null ) { this.suiteResults = new LinkedList(); } this.suiteResults.add( reportTestSuite ); - this.testCount = this.testCount + reportTestSuite.getNumberOfTests(); - this.failureCount = this.failureCount + reportTestSuite.getNumberOfFailures(); - this.totalTime = this.totalTime + reportTestSuite.getTimeElapsed(); + this.testCount += reportTestSuite.getNumberOfTests(); + this.failureCount += reportTestSuite.getNumberOfFailures(); + this.errorCount += reportTestSuite.getNumberOfErrors(); + this.totalTime += reportTestSuite.getTimeElapsed(); } - + public int getTestCount() { @@ -70,6 +73,16 @@ this.failureCount = failureCount; } + public int getErrorCount() + { + return errorCount; + } + + public void setErrorCount( int errorCount ) + { + this.errorCount = errorCount; + } + public List getSuiteResults() { return suiteResults; @@ -79,7 +92,7 @@ { this.suiteResults = suiteResults; } - + public float getTotalTime() { return totalTime; @@ -88,6 +101,6 @@ public void setTotalTime( float totalTime ) { this.totalTime = totalTime; - } - + } + } Modified: continuum/branches/continuum-transient-state/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestSuite.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestSuite.java?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestSuite.java (original) +++ continuum/branches/continuum-transient-state/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestSuite.java Tue Oct 28 21:16:12 2008 @@ -18,6 +18,13 @@ */ package org.apache.maven.continuum.reports.surefire; +import org.xml.sax.Attributes; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.DefaultHandler; + +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; import java.io.File; import java.io.IOException; import java.text.NumberFormat; @@ -26,18 +33,10 @@ import java.util.LinkedList; import java.util.List; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; - -import org.xml.sax.Attributes; -import org.xml.sax.SAXException; -import org.xml.sax.helpers.DefaultHandler; - /** * @author olamy - * @since 12 nov. 07 * @version $Id$ + * @since 12 nov. 07 */ public class ReportTestSuite extends DefaultHandler @@ -66,7 +65,7 @@ private StringBuffer currentElement; private ReportTestCase testCase; - + private List reportFailures; @@ -178,12 +177,14 @@ else if ( "failure".equals( qName ) ) { testCase.setFailureDetails( currentElement.toString() ); - this.addReportFailure( new ReportFailure( testCase.getFailureType(), testCase.getFailureDetails(), testCase.getName() ) ); + this.addReportFailure( + new ReportFailure( testCase.getFailureType(), testCase.getFailureDetails(), testCase.getName() ) ); } else if ( "error".equals( qName ) ) { - this.addReportFailure( new ReportFailure( testCase.getFailureType(), testCase.getFailureDetails(), testCase.getName() ) ); testCase.setFailureDetails( currentElement.toString() ); + this.addReportFailure( + new ReportFailure( testCase.getFailureType(), testCase.getFailureDetails(), testCase.getName() ) ); } } @@ -305,8 +306,8 @@ { this.testCases = Collections.unmodifiableList( testCases ); } - - @SuppressWarnings ("unchecked") + + @SuppressWarnings("unchecked") public List getReportFailures() { return reportFailures == null ? Collections.EMPTY_LIST : reportFailures; Modified: continuum/branches/continuum-transient-state/continuum-reports/src/test/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGeneratorTest.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-reports/src/test/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGeneratorTest.java?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-reports/src/test/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGeneratorTest.java (original) +++ continuum/branches/continuum-transient-state/continuum-reports/src/test/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGeneratorTest.java Tue Oct 28 21:16:12 2008 @@ -18,15 +18,15 @@ */ package org.apache.maven.continuum.reports.surefire; +import org.codehaus.plexus.spring.PlexusInSpringTestCase; + import java.io.File; import java.util.List; -import org.codehaus.plexus.spring.PlexusInSpringTestCase; - /** * @author olamy - * @since 12 nov. 07 * @version $Id$ + * @since 12 nov. 07 */ public class DefaultReportTestSuiteGeneratorTest extends PlexusInSpringTestCase @@ -34,8 +34,8 @@ private File getReportsDirectory( String pathDir ) { - return new File( getBasedir() + File.separatorChar + "src" + File.separatorChar + "test" + File.separatorChar - + "resources" + File.separatorChar + pathDir ); + return new File( getBasedir() + File.separatorChar + "src" + File.separatorChar + "test" + File.separatorChar + + "resources" + File.separatorChar + pathDir ); } public void testSimpleFile() @@ -43,8 +43,8 @@ { File testDirectory = getReportsDirectory( "simplereport" ); - ReportTestSuiteGenerator generator = (ReportTestSuiteGenerator) lookup( ReportTestSuiteGenerator.class, - "default" ); + ReportTestSuiteGenerator generator = + (ReportTestSuiteGenerator) lookup( ReportTestSuiteGenerator.class, "default" ); List reports = generator.generateReports( testDirectory ); assertEquals( 1, reports.size() ); @@ -59,16 +59,16 @@ public void testContinuumCore() throws Exception { - ReportTestSuiteGenerator generator = (ReportTestSuiteGenerator) lookup( ReportTestSuiteGenerator.class, - "default" ); + ReportTestSuiteGenerator generator = + (ReportTestSuiteGenerator) lookup( ReportTestSuiteGenerator.class, "default" ); List reports = generator.generateReports( 1, 1 ); assertEquals( 18, reports.size() ); for ( ReportTestSuite report : reports ) { - if ( report.getName().equals( "MailContinuumNotifierTest" ) - && report.getPackageName().equals( "org.apache.maven.continuum.notification.mail" ) ) + if ( report.getName().equals( "MailContinuumNotifierTest" ) && + report.getPackageName().equals( "org.apache.maven.continuum.notification.mail" ) ) { assertEquals( 1, report.getNumberOfFailures() ); // don't test this because can plate forme dependant @@ -88,15 +88,16 @@ } } - + public void testgenerateReportTestResult() - throws Exception + throws Exception { - ReportTestSuiteGenerator generator = (ReportTestSuiteGenerator) lookup( ReportTestSuiteGenerator.class, - "default" ); + ReportTestSuiteGenerator generator = + (ReportTestSuiteGenerator) lookup( ReportTestSuiteGenerator.class, "default" ); ReportTestResult reportTestResult = generator.generateReportTestResult( 1, 1 ); assertEquals( 18, reportTestResult.getSuiteResults().size() ); assertEquals( 1, reportTestResult.getFailureCount() ); - assertEquals( 61, reportTestResult.getTestCount() ); + assertEquals( 62, reportTestResult.getTestCount() ); + assertEquals( 1, reportTestResult.getErrorCount() ); } } Modified: continuum/branches/continuum-transient-state/continuum-reports/src/test/resources/continuum-core/TEST-org.apache.maven.continuum.scm.ContinuumScmTest.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-reports/src/test/resources/continuum-core/TEST-org.apache.maven.continuum.scm.ContinuumScmTest.xml?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-reports/src/test/resources/continuum-core/TEST-org.apache.maven.continuum.scm.ContinuumScmTest.xml (original) +++ continuum/branches/continuum-transient-state/continuum-reports/src/test/resources/continuum-core/TEST-org.apache.maven.continuum.scm.ContinuumScmTest.xml Tue Oct 28 21:16:12 2008 @@ -1,5 +1,5 @@ - - + + @@ -21,7 +21,7 @@ - @@ -67,4 +67,5 @@ + \ No newline at end of file Modified: continuum/branches/continuum-transient-state/continuum-security/pom.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-security/pom.xml?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-security/pom.xml (original) +++ continuum/branches/continuum-transient-state/continuum-security/pom.xml Tue Oct 28 21:16:12 2008 @@ -21,7 +21,7 @@ continuum org.apache.continuum - 1.2-SNAPSHOT + 1.3-SNAPSHOT 4.0.0 continuum-security Modified: continuum/branches/continuum-transient-state/continuum-security/src/main/resources/META-INF/redback/redback.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-security/src/main/resources/META-INF/redback/redback.xml?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-security/src/main/resources/META-INF/redback/redback.xml (original) +++ continuum/branches/continuum-transient-state/continuum-security/src/main/resources/META-INF/redback/redback.xml Tue Oct 28 21:16:12 2008 @@ -403,23 +403,17 @@ global + continuum-remove-group + Continuum Remove Group + continuum-remove-group + ${resource} + + continuum-group-role-grant Continuum Grant Group Roles user-management-role-grant ${resource} - - continuum-manage-repositories - Manage Continuum Local Repositories - continuum-manage-repositories - global - - - continuum-manage-purging - Manage Continuum Purging - continuum-manage-purging - global - project-developer @@ -440,12 +434,6 @@ ${resource} - continuum-remove-group - Continuum Remove Group - continuum-remove-group - ${resource} - - continuum-modify-group Continuum Modify Group continuum-modify-group Modified: continuum/branches/continuum-transient-state/continuum-store/pom.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-store/pom.xml?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-store/pom.xml (original) +++ continuum/branches/continuum-transient-state/continuum-store/pom.xml Tue Oct 28 21:16:12 2008 @@ -17,12 +17,11 @@ specific language governing permissions and limitations under the License. --> - + continuum org.apache.continuum - 1.2-SNAPSHOT + 1.3-SNAPSHOT 4.0.0 continuum-store Modified: continuum/branches/continuum-transient-state/continuum-store/src/main/java/org/apache/continuum/dao/BuildResultDaoImpl.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-store/src/main/java/org/apache/continuum/dao/BuildResultDaoImpl.java?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-store/src/main/java/org/apache/continuum/dao/BuildResultDaoImpl.java (original) +++ continuum/branches/continuum-transient-state/continuum-store/src/main/java/org/apache/continuum/dao/BuildResultDaoImpl.java Tue Oct 28 21:16:12 2008 @@ -444,6 +444,47 @@ rollback( tx ); } } + + public List getBuildResultsForProjectFromId( int projectId, long startId ) + throws ContinuumStoreException + { + PersistenceManager pm = getPersistenceManager(); + + Transaction tx = pm.currentTransaction(); + + pm.getFetchPlan().addGroup( BUILD_RESULT_WITH_DETAILS_FETCH_GROUP ); + + try + { + tx.begin(); + + Extent extent = pm.getExtent( BuildResult.class, true ); + + Query query = pm.newQuery( extent ); + + query.declareParameters( "int projectId, int buildNumber" ); + + query.setFilter( "this.project.id == projectId && this.buildNumber >= buildNumber" ); + + query.setOrdering( "this.startTime descending" ); + + List result = (List) query.execute( projectId, startId ); + + result = (List) pm.detachCopyAll( result ); + + tx.commit(); + + return result; + } + catch ( Exception e ) + { + throw new ContinuumStoreException( e.getMessage(), e ); + } + finally + { + rollback( tx ); + } + } public List getBuildResultsForProject( int projectId, long fromDate ) { Modified: continuum/branches/continuum-transient-state/continuum-store/src/main/java/org/apache/continuum/dao/DaoUtilsImpl.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-store/src/main/java/org/apache/continuum/dao/DaoUtilsImpl.java?rev=708765&r1=708764&r2=708765&view=diff ============================================================================== --- continuum/branches/continuum-transient-state/continuum-store/src/main/java/org/apache/continuum/dao/DaoUtilsImpl.java (original) +++ continuum/branches/continuum-transient-state/continuum-store/src/main/java/org/apache/continuum/dao/DaoUtilsImpl.java Tue Oct 28 21:16:12 2008 @@ -20,6 +20,7 @@ */ import org.apache.continuum.model.project.ProjectScmRoot; +import org.apache.continuum.model.release.ContinuumReleaseResult; import org.apache.continuum.model.repository.DirectoryPurgeConfiguration; import org.apache.continuum.model.repository.LocalRepository; import org.apache.continuum.model.repository.RepositoryPurgeConfiguration; @@ -76,6 +77,7 @@ { PlexusJdoUtils.removeAll( getPersistenceManager(), BuildDefinitionTemplate.class ); PlexusJdoUtils.removeAll( getPersistenceManager(), BuildResult.class ); + PlexusJdoUtils.removeAll( getPersistenceManager(), ContinuumReleaseResult.class ); PlexusJdoUtils.removeAll( getPersistenceManager(), ProjectScmRoot.class ); PlexusJdoUtils.removeAll( getPersistenceManager(), ProjectGroup.class ); PlexusJdoUtils.removeAll( getPersistenceManager(), Project.class );