continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r708765 [3/7] - in /continuum/branches/continuum-transient-state: ./ continuum-api/ continuum-api/src/main/java/org/apache/continuum/configuration/ continuum-api/src/main/java/org/apache/continuum/dao/ continuum-api/src/main/java/org/apache...
Date Wed, 29 Oct 2008 04:16:22 GMT
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 <<delete>> icon.
+    To remove a project, go to the Project Group Summary and click the <<delete>> 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 @@
         <item name="Adding Project Group" href="administrator_guides/projectgroup.html"/>
         <item name="Managing Builders" href="administrator_guides/builder.html"/>
         <item name="Managing JDKs" href="administrator_guides/jdk.html"/>
-        <item name="Managing Profiles" href="administrator_guides/profiles.html"/>
+        <item name="Managing Build Environments" href="administrator_guides/profiles.html"/>
         <item name="Managing Schedules" href="administrator_guides/schedules.html"/>
         <item name="Managing General Configuration" href="administrator_guides/configuration.html"/> <!-- (configuration and appearance) -->
+        <item name="Managing Local Repositories" href="administrator_guides/localRepository.html"/>
+        <item name="Managing Purge Configuration" href="administrator_guides/purgeConfiguration.html"/>
         <item name="External databases" href="administrator_guides/external-db.html"/>
         <item name="Monitoring Continuum" href="administrator_guides/monitoring.html"/>
         <item name="Appearance Configuration" href="administrator_guides/appearance.html"/>

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 @@
 	
 	
 <h2>Release Notes - Continuum - Version 1.2</h2>
-The Continuum team is pleased to announce Apache Continuum 1.2
+The Apache Continuum team is pleased to announce Apache Continuum 1.2
 <h3>New in Continuum 1.2</h3> 
 <h4>Using Spring</h4>
   <p>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.</p>
-
+<h4>Repository Purge</h4>
+  <p>It's now possible to add purges which will cleanup : 
+    <ul>
+      <li>m2 repositories (now it's possible to configure a local m2 repository per project group)</li>
+      <li>build output directory</li>
+    </ul>
+  </p>
+<h4>Maven plugin groupId and artifactId change</h4>
+<p>Now the maven plugin has the new groupId:artifactId org.apache.continuum:continuum-maven-plugin</p>
+<h4>New SCMs support</h4>
+<p>Now continuum two new providers : git and accurev.</p>  
 <h3>Changes in Continuum 1.2</h3>    
-<h2>Bug</h2>
+<h2>        Bug
+</h2>
 <ul>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-860'>CONTINUUM-860</a>] -         multiple email addresses delimited with commas causes AddressException
 </li>
@@ -28,10 +39,10 @@
 </li>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1371'>CONTINUUM-1371</a>] -         NullPointer when Releasing with Ant and Default Project Group
 </li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1433'>CONTINUUM-1433</a>] -         Wrong path in descripton on how to allow the file protocol.
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1433'>CONTINUUM-1433</a>] -         Wrong path in descripton on how to allow the file protocol. 
 </li>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1489'>CONTINUUM-1489</a>] -         replace use of MungedHttpsURL with apache httpclient (4.0-beta1)
-</li>	
+</li>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1515'>CONTINUUM-1515</a>] -         SCM Tag does not have a default value
 </li>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1521'>CONTINUUM-1521</a>] -         NullPointerException in StarTeam changelog command
@@ -50,6 +61,8 @@
 </li>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1593'>CONTINUUM-1593</a>] -         Requires Javamail 1.5? Should be 1.4?
 </li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1596'>CONTINUUM-1596</a>] -         The release perform doesn't work when a scm password is required
+</li>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1601'>CONTINUUM-1601</a>] -         Email address with '+' is not accepted in mail notifier
 </li>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1610'>CONTINUUM-1610</a>] -         Deployment Repository Directory does not work at all
@@ -66,7 +79,7 @@
 </li>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1647'>CONTINUUM-1647</a>] -         Incorrect alt and title text for releaseproject_disabled.gif
 </li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1649'>CONTINUUM-1649</a>] -         http://continuum.apache.org/docs/1.1/user_guides/managing_builddef/builddefTemplate.html
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1649'>CONTINUUM-1649</a>] -         Move Build Definition Template guide to Administrator's Guides
 </li>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1651'>CONTINUUM-1651</a>] -         Unable to delete user-created build definitions
 </li>
@@ -84,7 +97,7 @@
 </li>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1693'>CONTINUUM-1693</a>] -         Continuum fills our server disk with SNAPSHOTs.
 </li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1701'>CONTINUUM-1701</a>] -         No field validation when adding Ant and Shell projects
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1701'>CONTINUUM-1701</a>] -         No field validation when adding Ant and Shell projects 
 </li>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1713'>CONTINUUM-1713</a>] -         JDOFatalUserException '.-..column &quot;&quot;NAME&quot;&quot; that has maximum length of 255. Please correct your data!'
 </li>
@@ -116,12 +129,14 @@
 </li>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1760'>CONTINUUM-1760</a>] -          TextArea inside the Working Copy Section for a Project is editable
 </li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1768'>CONTINUUM-1768</a>] -         NPE on Members tab with LDAP authentication
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1768'>CONTINUUM-1768</a>] -         NPE on Members tab with LDAP authentication 
 </li>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1773'>CONTINUUM-1773</a>] -         unable to add a mail recipient address containing an ampersand (&amp;) in the local part of  the adress
 </li>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1782'>CONTINUUM-1782</a>] -         Rename 'Profiles' instances to 'Build Environments' in available roles.
 </li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1784'>CONTINUUM-1784</a>] -         URLs with Query String appears not work properly
+</li>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1785'>CONTINUUM-1785</a>] -         Broken link
 </li>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1788'>CONTINUUM-1788</a>] -         JBoss installation documentation contains a &quot;Start Jetty&quot; section
@@ -142,7 +157,7 @@
 </li>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1816'>CONTINUUM-1816</a>] -         Continuum trunk failed to start on unix os
 </li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1825'>CONTINUUM-1825</a>] -         NPE when checkout project with trunk (rev 678311)
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1825'>CONTINUUM-1825</a>] -         NPE when checkout project with trunk (rev 678311) 
 </li>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1828'>CONTINUUM-1828</a>] -         Downloaded maven files (pom and project.xml) are not deleted
 </li>
@@ -158,9 +173,24 @@
 </li>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1863'>CONTINUUM-1863</a>] -         NPE when clicking Appearance menu item
 </li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1867'>CONTINUUM-1867</a>] -         Project group admin should not be able to grant system-wide roles to himself
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1869'>CONTINUUM-1869</a>] -         Correct type of url variable in 'Connection to Continuum' section on 'Guide to use XML-RPC with Continuum' page
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1870'>CONTINUUM-1870</a>] -         changing groupId:artifactId of the maven plugin to org.apache.continuum:continuum-maven-plugin
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1871'>CONTINUUM-1871</a>] -         Continuum does not execute builds when last BUILDRESULT.END_TIME=0
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1877'>CONTINUUM-1877</a>] -         Incorrect svn urls on site &quot;source repository&quot; page
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1878'>CONTINUUM-1878</a>] -         MS SQL Server size of NVARCHAR defect
+</li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1888'>CONTINUUM-1888</a>] -         Support for 64 bit architectures has been removed
+</li>
 </ul>
-
-<h2>Improvement</h2>
+    
+<h2>        Improvement
+</h2>
 <ul>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-515'>CONTINUUM-515</a>] -         Add a wait page when adding a project
 </li>
@@ -174,6 +204,8 @@
 </li>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1344'>CONTINUUM-1344</a>] -         New Guide to Building Continuum from Source
 </li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1465'>CONTINUUM-1465</a>] -         Project groups should probably get their own local maven repo
+</li>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1490'>CONTINUUM-1490</a>] -         Include data-management-cli jar in the distribution
 </li>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1511'>CONTINUUM-1511</a>] -         Improve error handling when not able to resolv artifacts
@@ -228,15 +260,16 @@
 </li>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1822'>CONTINUUM-1822</a>] -         Upgrade to Jetty 6.1.11
 </li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1827'>CONTINUUM-1827</a>] -         XMPRPC Basic Compliance ( Call continuum XPMRPC Service from other language like Php )
+</li>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1846'>CONTINUUM-1846</a>] -         Split ContinuumStore to few dao classes
 </li>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1858'>CONTINUUM-1858</a>] -         Add rolesList page in the menu from redback
 </li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1465'>CONTINUUM-1465</a>] -         Project groups should probably get their own local maven repo
-</li>  
 </ul>
-
-<h2>New Feature</h2>
+    
+<h2>        New Feature
+</h2>
 <ul>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-782'>CONTINUUM-782</a>] -         Add a feature to allow cleaning the m2 local repo once every N days
 </li>
@@ -248,11 +281,14 @@
 </li>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1692'>CONTINUUM-1692</a>] -         Ability to delete build results via XML RPC
 </li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1830'>CONTINUUM-1830</a>] -         Ability to view release results after leaving page
+</li>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1843'>CONTINUUM-1843</a>] -         add new maven scm providers (accurev and git)
 </li>
 </ul>
-
-<h2>Task</h2>
+    
+<h2>        Task
+</h2>
 <ul>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1614'>CONTINUUM-1614</a>] -         release maven-scm 1.1
 </li>
@@ -260,13 +296,22 @@
 </li>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1821'>CONTINUUM-1821</a>] -         Remove references to Maven in continuum-docs
 </li>
+<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1885'>CONTINUUM-1885</a>] -         Clean up site documentation
+</li>
 </ul>
-
-<h2>Wish</h2>
+        
+<h2>        Wish
+</h2>
 <ul>
 <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1638'>CONTINUUM-1638</a>] -         Documentation for Release Management
 </li>
 </ul>
 
+  
+Have Fun !
+<br/><br/>
+--<br/>
+The Apache Continuum Team  
+
 </body>
 </document>
\ 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 @@
   <parent>
     <artifactId>continuum</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
   </parent>
   <artifactId>continuum-jetty</artifactId>
   <packaging>pom</packaging>
@@ -31,12 +31,12 @@
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty</artifactId>
-      <version>6.1.11</version>
+      <version>${jetty.version}</version>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>start</artifactId>
-      <version>6.1.11</version>
+      <version>${jetty.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.continuum</groupId>
@@ -47,25 +47,25 @@
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty-naming</artifactId>
-      <version>6.1.11</version>
+      <version>${jetty.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>servlet-api-2.5</artifactId>
-      <version>6.1.11</version>
+      <version>${jetty.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-api-2.0</artifactId>
-      <version>6.1.11</version>
+      <version>${jetty.version}</version>
       <scope>runtime</scope>
     </dependency>    
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty-plus</artifactId>
-      <version>6.1.11</version>
+      <version>${jetty.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -125,13 +125,13 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl104-over-slf4j</artifactId>
-      <version>1.0.1</version>
+      <version>1.5.0</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>1.0.1</version>
+      <version>1.5.0</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -152,7 +152,7 @@
        <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>appassembler-maven-plugin</artifactId>
-        <version>1.0-beta-1</version>
+        <version>1.0-beta-2</version>
         <configuration>
           <daemons>
             <daemon>
@@ -178,24 +178,24 @@
                       <value>TRUE</value>
                     </property>
                     <property>
-                      <name>set.default.APP_BASE</name>
-                      <value>%PWD%/..</value>
-                    </property>
-                    <property>
                       <name>set.default.REPO_DIR</name>
                       <value>lib</value>
                     </property>
                     <property>
                       <name>wrapper.logfile</name>
-                      <value>%APP_BASE%/logs/wrapper.log</value>
+                      <value>%CONTINUUM_BASE%/logs/wrapper.log</value>
                     </property>
                     <property>
                       <name>wrapper.app.parameter.2</name>
-                      <value>%APP_BASE%/conf/jetty.xml</value>
+                      <value>%CONTINUUM_BASE%/conf/jetty.xml</value>
                     </property>
                     <property>
                       <name>wrapper.app.parameter.3</name>
-                      <value>%APP_BASE%/conf/jetty-logging.xml</value>
+                      <value>%CONTINUUM_BASE%/conf/jetty-logging.xml</value>
+                    </property>
+                    <property>
+                      <name>app.base.envvar</name>
+                      <value>CONTINUUM_BASE</value>
                     </property>
                     <property>
                       <name>wrapper.on_exit.default</name>
@@ -210,13 +210,26 @@
                       <value>30</value>
                     </property>
                   </configuration>
+                  <includes>
+                    <include>linux-x86-32</include>
+                    <include>linux-x86-64</include>
+                    <include>macosx-x86-universal-32</include>
+                    <include>solaris-x86-32</include>
+                    <include>solaris-sparc-32</include>
+                    <include>solaris-sparc-64</include>
+                    <include>windows-x86-32</include>
+                  </includes>
                 </generatorConfiguration>
               </generatorConfigurations>
               <jvmSettings>
                 <systemProperties>
-                  <systemProperty>appserver.base=%APP_BASE%</systemProperty>
-                  <systemProperty>derby.system.home=%APP_BASE%/logs</systemProperty>
-                  <systemProperty>jetty.logs=%APP_BASE%/logs</systemProperty>
+                  <systemProperty>appserver.home=.</systemProperty>
+                  <systemProperty>appserver.base=%CONTINUUM_BASE%</systemProperty>
+                  <!-- can't set this at present, it moves the database if CONTINUUM_BASE is not set
+                  <systemProperty>derby.system.home=%CONTINUUM_BASE%/logs</systemProperty>
+                  -->
+                  <systemProperty>jetty.logs=%CONTINUUM_BASE%/logs</systemProperty>
+                  <systemProperty>java.io.tmpdir=%CONTINUUM_BASE%/tmp</systemProperty>
                 </systemProperties>
               </jvmSettings> 
             </daemon>
@@ -263,7 +276,7 @@
                 <copy todir="target/generated-resources/appassembler/jsw/continuum/conf">
                   <fileset dir="src/main/conf" />                  
                 </copy>
-                <mkdir dir="target/generated-resources/appassembler/jsw/continuum/logs"/>      
+                <mkdir dir="target/generated-resources/appassembler/jsw/continuum/logs" />      
               </tasks>
             </configuration>
             <goals>
@@ -280,4 +293,7 @@
       <url>http://snapshots.repository.codehaus.org/</url>
     </pluginRepository>
   </pluginRepositories>
+  <properties>
+    <jetty.version>6.1.11</jetty.version>
+  </properties>
 </project>

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 @@
       <outputDirectory>bin</outputDirectory>
       <includes>   
          <include>wrapper-linux-x86-32</include>
+         <include>wrapper-linux-x86-64</include>
          <include>wrapper-macosx-universal-32</include>
          <include>wrapper-solaris-x86-32</include>
+         <include>wrapper-solaris-sparc-32</include>
+         <include>wrapper-solaris-sparc-64</include>
       </includes>
       <fileMode>0755</fileMode>
     </fileSet>
@@ -86,9 +89,19 @@
       <outputDirectory>/</outputDirectory>
       <includes>
         <include>NOTICE</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/resources/</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
         <include>LICENSE</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>src/main/tmp/</directory>
+      <outputDirectory>/tmp</outputDirectory>
+    </fileSet>
   </fileSets>
   <dependencySets>
     <dependencySet>

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 @@
   <parent>
     <artifactId>continuum</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-model</artifactId>
@@ -63,7 +63,7 @@
           </execution>
         </executions>
         <configuration>
-          <version>1.1.2</version>
+          <version>1.1.3</version>
           <packageWithVersion>false</packageWithVersion>
           <model>src/main/mdo/continuum.xml</model>
         </configuration>

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 @@
         </field>
         <field>
           <name>projectScmRoots</name>
-          <version>1.1.2+</version>
+          <version>1.1.3+</version>
           <association>
             <type>ProjectScmRoot</type>
             <multiplicity>*</multiplicity>
@@ -346,7 +346,7 @@
         </field>     
         <field jpox.fetch-groups="project-all-details project-with-scm-details">
           <name>scmResult</name>
-          <version>1.1.2+</version>
+          <version>1.1.3+</version>
           <association>
             <type>ScmResult</type>
           </association>
@@ -435,7 +435,7 @@
         </field>
         <field>
           <name>sendOnScmFailure</name>
-          <version>1.1.2+</version>
+          <version>1.1.3+</version>
           <type>boolean</type>
           <defaultValue>false</defaultValue>
         </field>
@@ -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 @@
       <packageName>org.apache.maven.continuum.model.scm</packageName>
       <version>1.0.9+</version>
       <fields>
-        <field>
-          <name stash.maxSize="1024">name</name>
+        <field stash.maxSize="1024">
+          <name>name</name>
           <version>1.0.9+</version>
           <type>String</type>
         </field>
@@ -1227,6 +1238,12 @@
           <type>boolean</type>
           <defaultValue>false</defaultValue>
         </field>
+        <field>
+          <name>releaseOutputDirectory</name>
+          <version>1.1.2+</version>
+          <type>String</type>
+          <defaultValue>release-output-directory</defaultValue>
+        </field>
       </fields>
     </class>
 
@@ -1486,11 +1503,11 @@
         </field>
       </fields>
     </class>
-        
+       
     <class>
-      <name>ProjectScmRoot</name>
+      <name>ContinuumReleaseResult</name>
       <version>1.1.2+</version>
-      <packageName>org.apache.continuum.model.project</packageName>
+      <packageName>org.apache.continuum.model.release</packageName>
       <fields>
         <field>
           <name>id</name>
@@ -1499,29 +1516,76 @@
           <type>int</type>
         </field>
         <field>
-          <name>scmRootAddress</name>
+          <name>startTime</name>
+          <version>1.1.2+</version>
+          <type>long</type>
+        </field>
+        <field>
+          <name>endTime</name>
+          <version>1.1.2+</version>
+          <type>long</type>
+        </field>
+        <field>
+          <name>resultCode</name>
+          <version>1.1.2+</version>
+          <type>int</type>
+        </field>
+        <field>
+          <name>projectGroup</name>
+          <version>1.1.2+</version>
+          <association xml.reference="true" stash.part="true" jpox.dependent="false">
+            <type>ProjectGroup</type>
+          </association>
+        </field>
+        <field>
+          <name>project</name>
+          <version>1.1.2+</version>
+          <association xml.reference="true" stash.part="true" jpox.dependent="false">
+            <type>Project</type>
+          </association>
+        </field>
+        <field>
+          <name>releaseGoal</name>
           <version>1.1.2+</version>
           <type>String</type>
+        </field>
+      </fields>
+    </class> 
+    <class>
+      <name>ProjectScmRoot</name>
+      <version>1.1.3+</version>
+      <packageName>org.apache.continuum.model.project</packageName>
+      <fields>
+        <field>
+          <name>id</name>
+          <version>1.1.3+</version>
+          <identifier>true</identifier>
+          <type>int</type>
+        </field>
+        <field>
+          <name>scmRootAddress</name>
+          <version>1.1.3+</version>
+          <type>String</type>
           <required>true</required>
         </field>
         <field>
           <name>oldState</name>
-          <version>1.1.2+</version>
+          <version>1.1.3+</version>
           <type>int</type>
         </field>
         <field jpox.column="scmRootState">
           <name>state</name>
-          <version>1.1.2+</version>
+          <version>1.1.3+</version>
           <type>int</type>
         </field>
         <field stash.maxSize="8192">
           <name>error</name>
-          <version>1.1.2+</version>
+          <version>1.1.3+</version>
           <type>String</type>
         </field>
         <field>
           <name>projectGroup</name>
-          <version>1.1.2+</version>
+          <version>1.1.3+</version>
           <association xml.reference="true" stash.part="true" jpox.dependent="false">
             <type>ProjectGroup</type>
           </association>

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 @@
   <package name="org.apache.maven.continuum.model.project">
     <class name="ProjectGroup">
       <field name="description">
-        <column length="8000" jdbc-type="VARCHAR"/>
+        <column length="4000" jdbc-type="VARCHAR"/>
       </field>
     </class>
     <class name="Project">
       <field name="description">
-        <column length="8000" jdbc-type="VARCHAR"/>
+        <column length="4000" jdbc-type="VARCHAR"/>
       </field>
     </class>
     <class name="BuildResult">
       <field name="error">
-        <column length="8000" jdbc-type="VARCHAR"/>
+        <column length="4000" jdbc-type="VARCHAR"/>
       </field>
     </class>
   </package>
   <package name="org.apache.maven.continuum.model.scm">
     <class name="ScmResult">
       <field name="exception">
-        <column name="exceptionstring" length="8000" jdbc-type="VARCHAR"/>
+        <column name="exceptionstring" length="4000" jdbc-type="VARCHAR"/>
       </field>
     </class>
     <class name="ChangeSet">
       <field name="comment">
-        <column name="changecomment" length="8000" jdbc-type="VARCHAR"/>
+        <column name="changecomment" length="4000" jdbc-type="VARCHAR"/>
+      </field>
+    </class>
+  </package>
+  <package name="org.apache.continuum.model.project">
+    <class name="ProjectScmRoot">
+      <field name="error">
+        <column length="4000" jdbc-type="VARCHAR"/>
       </field>
     </class>
   </package>

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 @@
   <parent>
     <artifactId>continuum-notifiers</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-notifier-api</artifactId>

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 @@
   <parent>
     <artifactId>continuum-notifiers</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-notifier-irc</artifactId>

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 @@
   <parent>
     <artifactId>continuum-notifiers</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-notifier-jabber</artifactId>

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 @@
   <parent>
     <artifactId>continuum-notifiers</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-notifier-msn</artifactId>

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 @@
   <parent>
     <artifactId>continuum-notifiers</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-notifier-wagon</artifactId>

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 @@
   <parent>
     <artifactId>continuum</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-notifiers</artifactId>

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 @@
   <parent>
     <artifactId>continuum</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
   </parent>
   <artifactId>continuum-purge</artifactId>
   <name>Continuum :: Purge System</name>

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 @@
   <parent>
     <artifactId>continuum</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
   </parent>
   <artifactId>continuum-release</artifactId>
   <name>Continuum :: Release System</name>

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<String, String> getEnvironments( Profile profile )
+    {
+        if ( profile == null )
+        {
+            return Collections.EMPTY_MAP;
+        }
+
+        Map<String, String> envVars = new HashMap<String, String>();
+        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<Installation> 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 @@
       <requirements>
         <requirement>
           <role>org.apache.maven.shared.release.config.ReleaseDescriptorStore</role>
-          <role-hint>properties</role-hint>
+          <role-hint>continuum-release-properties</role-hint>
         </requirement>
         <requirement>
           <role>org.codehaus.plexus.taskqueue.TaskQueue</role>
@@ -46,6 +46,9 @@
         <requirement>
           <role>org.apache.maven.continuum.utils.WorkingDirectoryService</role>
         </requirement>
+        <requirement>
+          <role>org.apache.maven.continuum.installation.InstallationService</role>
+        </requirement>
       </requirements>
     </component>
 
@@ -240,7 +243,7 @@
         </requirement>
         <requirement>
           <role>org.apache.maven.shared.release.config.ReleaseDescriptorStore</role>
-          <role-hint>properties</role-hint>
+          <role-hint>continuum-release-properties</role-hint>
           <field-name>configStore</field-name>
         </requirement>
         <requirement>
@@ -260,7 +263,7 @@
           <phase>map-development-versions</phase>
           <phase>rewrite-poms-for-release</phase>
           <phase>generate-release-poms</phase>
-          <phase>run-preparation-goals</phase>
+          <phase>run-release-prepare-goals</phase>
           <phase>scm-commit-release</phase>
           <phase>scm-tag</phase>
           <phase>rewrite-poms-for-development</phase>
@@ -271,7 +274,7 @@
         <performPhases>
           <phase>verify-completed-prepare-phases</phase>
           <phase>checkout-project-from-scm</phase>
-          <phase>run-perform-goals</phase>
+          <phase>run-release-perform-goals</phase>
         </performPhases>
         <rollbackPhases>
           <phase>generate-reactor-projects</phase>
@@ -304,7 +307,27 @@
         </requirement>
       </requirements>
     </component>
-
+    <component>
+      <role>org.apache.maven.shared.release.phase.ReleasePhase</role>
+      <role-hint>run-release-prepare-goals</role-hint>
+      <implementation>org.apache.continuum.release.phase.RunPrepareGoalsPhase</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.continuum.utils.shell.ShellCommandHelper</role>
+        </requirement>
+      </requirements>
+    </component>
+    <component>
+      <role>org.apache.maven.shared.release.phase.ReleasePhase</role>
+      <role-hint>run-release-perform-goals</role-hint>
+      <implementation>org.apache.continuum.release.phase.RunPerformGoalsPhase</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.continuum.utils.shell.ShellCommandHelper</role>
+        </requirement>
+      </requirements>
+    </component>
+    
     <!-- This needs to be removed once we can upgrade maven-project to 2.1-SNAPSHOT or later. -->
     <component>
       <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
@@ -318,12 +341,16 @@
           <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
         </requirement>
         <requirement>
-          <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role
->
+          <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
         </requirement>
       </requirements>
     </component>
 
+    <component>
+      <role>org.apache.maven.shared.release.config.ReleaseDescriptorStore</role>
+      <role-hint>continuum-release-properties</role-hint>
+      <implementation>org.apache.continuum.release.config.ContinuumPropertiesReleaseDescriptorStore</implementation>
+    </component>
   </components>
 
 </component-set>

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 @@
   <parent>
     <artifactId>continuum</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
   </parent>
   <artifactId>continuum-reports</artifactId>
   <name>Continuum :: Reports</name>

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 <a href="mailto:olamy@apache.org">olamy</a>
- * @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<String> defaultIncludes;
-    
+
     private List<String> 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<ReportTestSuite> generateReports( File directory, List<String> includes, List<String> excludes )
@@ -83,7 +80,7 @@
             return Collections.EMPTY_LIST;
         }
         List<ReportTestSuite> reportTestSuites = new LinkedList<ReportTestSuite>();
-        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<ReportTestSuite> 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<ReportTestSuite> 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<ReportTestSuite> 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 <a href="mailto:olamy@apache.org">olamy</a>
- * @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<ReportTestSuite> suiteResults;
 
-    public void addReportTestSuite(ReportTestSuite reportTestSuite)
+    public void addReportTestSuite( ReportTestSuite reportTestSuite )
     {
-        if (this.suiteResults == null)
+        if ( this.suiteResults == null )
         {
             this.suiteResults = new LinkedList<ReportTestSuite>();
         }
         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<ReportTestSuite> 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 <a href="mailto:olamy@apache.org">olamy</a>
- * @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<ReportFailure> 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<ReportFailure> 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 <a href="mailto:olamy@apache.org">olamy</a>
- * @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<ReportTestSuite> 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<ReportTestSuite> 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 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" skipped="0" tests="1" time="2.016" failures="0" name="org.apache.maven.continuum.scm.ContinuumScmTest">
+<?xml version="1.0" encoding="UTF-8" ?>
+<testsuite errors="1" skipped="0" tests="2" time="2.016" failures="0" name="org.apache.maven.continuum.scm.ContinuumScmTest">
   <properties>
     <property value="sa" name="javax.jdo.option.ConnectionUserName"/>
     <property value="Java(TM) 2 Runtime Environment, Standard Edition" name="java.runtime.name"/>
@@ -21,7 +21,7 @@
     <property value="c:\jdk1.5.0_08\jre\lib\endorsed" name="java.endorsed.dirs"/>
     <property value="x86" name="os.arch"/>
     <property value="c:\DOCUME~1\olamy\LOCALS~1\Temp\" name="java.io.tmpdir"/>
-    <property value="
+    <property value="
 " name="line.separator"/>
     <property value="Sun Microsystems Inc." name="java.vm.specification.vendor"/>
     <property value="" name="user.variant"/>
@@ -67,4 +67,5 @@
     <property value="pentium_pro+mmx pentium_pro pentium+mmx pentium i486 i386 i86" name="sun.cpu.isalist"/>
   </properties>
   <testcase time="2" name="testBasic"/>
+  <testcase time="2" name="testBasic2"/>
 </testsuite>
\ 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 @@
   <parent>
     <artifactId>continuum</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-security</artifactId>

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 @@
   		          <resource>global</resource>
   		        </permission>
   		        <permission>
+  		          <id>continuum-remove-group</id>
+  		          <name>Continuum Remove Group</name>
+  		          <operation>continuum-remove-group</operation>
+  		          <resource>${resource}</resource>
+  		        </permission>
+  		        <permission>
   		          <id>continuum-group-role-grant</id>
   		          <name>Continuum Grant Group Roles</name>
   		          <operation>user-management-role-grant</operation>
   		          <resource>${resource}</resource>
   		        </permission>
-  		        <permission>
-  		          <id>continuum-manage-repositories</id>
-  		          <name>Manage Continuum Local Repositories</name>
-  		          <operation>continuum-manage-repositories</operation>
-  		          <resource>global</resource>
-  		        </permission>
-  		        <permission>
-  		          <id>continuum-manage-purging</id>
-  		          <name>Manage Continuum Purging</name>
-  		          <operation>continuum-manage-purging</operation>
-  		          <resource>global</resource>
-  		        </permission>
   		  	  </permissions>
   		  	  <childTemplates>
   		  	  	<childTemplate>project-developer</childTemplate>
@@ -440,12 +434,6 @@
   		          <resource>${resource}</resource>
   		        </permission>
   		        <permission>
-  		          <id>continuum-remove-group</id>
-  		          <name>Continuum Remove Group</name>
-  		          <operation>continuum-remove-group</operation>
-  		          <resource>${resource}</resource>
-  		        </permission>
-  		        <permission>
   		          <id>continuum-modify-group</id>
   		          <name>Continuum Modify Group</name>
   		          <operation>continuum-modify-group</operation>

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.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>continuum</artifactId>
     <groupId>org.apache.continuum</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>continuum-store</artifactId>

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<BuildResult> 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<BuildResult> 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 );



Mime
View raw message