You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ol...@apache.org on 2008/09/27 01:17:32 UTC
svn commit: r699530 - in /continuum/trunk: ./
continuum-core/src/test/resources/org/apache/maven/continuum/notification/
continuum-docs/src/site/xdoc/
continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/
Author: olamy
Date: Fri Sep 26 16:17:32 2008
New Revision: 699530
URL: http://svn.apache.org/viewvc?rev=699530&view=rev
Log:
merge -r 699528:699529 from 1.2.x branch fix junit
Modified:
continuum/trunk/ (props changed)
continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.xml
continuum/trunk/continuum-docs/src/site/xdoc/ (props changed)
continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java
Propchange: continuum/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 26 16:17:32 2008
@@ -1 +1 @@
-/continuum/branches/continuum-1.2.x:690684,690689-690799,698449-698533,698817-698819
+/continuum/branches/continuum-1.2.x:690684,690689-690799,698449-698533,698817-698819,699529
Modified: continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.xml?rev=699530&r1=699529&r2=699530&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.xml (original)
+++ continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.xml Fri Sep 26 16:17:32 2008
@@ -19,10 +19,12 @@
<plexus>
<components>
+
<component>
- <role>org.codehaus.plexus.mailsender.MailSender</role>
- <implementation>org.codehaus.plexus.mailsender.test.MockMailSender</implementation>
- </component>
+ <role>org.springframework.mail.javamail.JavaMailSender</role>
+ <implementation>org.apache.continuum.notification.mail.MockJavaMailSender</implementation>
+ <role-hint>continuum</role-hint>
+ </component>
<component>
<role>org.apache.maven.continuum.notification.Notifier</role>
@@ -39,7 +41,9 @@
<role>org.apache.continuum.dao.BuildResultDao</role>
</requirement>
<requirement>
- <role>org.codehaus.plexus.mailsender.MailSender</role>
+ <field-name>javaMailSender</field-name>
+ <role>javaMailSender</role>
+ <role-hint>continuum</role-hint>
</requirement>
<requirement>
<role>org.apache.maven.continuum.configuration.ConfigurationService</role>
Propchange: continuum/trunk/continuum-docs/src/site/xdoc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 26 16:17:32 2008
@@ -1,2 +1,2 @@
-/continuum/branches/continuum-1.2.x/continuum-docs/src/site/xdoc:698449-698533,698817-698819
+/continuum/branches/continuum-1.2.x/continuum-docs/src/site/xdoc:698449-698533,698817-698819,699529
/continuum/trunk/continuum-docs/src/site/xdoc:690494-690520
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java?rev=699530&r1=699529&r2=699530&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java Fri Sep 26 16:17:32 2008
@@ -27,6 +27,8 @@
import java.util.Iterator;
import java.util.List;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.builddefinition.BuildDefinitionServiceException;
import org.apache.maven.continuum.model.project.BuildDefinitionTemplate;
@@ -138,6 +140,8 @@
{
pom = pomFile.toURL().toString();
checkProtocol = false;
+ // CONTINUUM-1897
+ // File.c copyFile to tmp one
}
catch ( MalformedURLException e )
{