continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r447039 - in /maven/continuum/trunk: ./ continuum-core/src/main/resources/META-INF/plexus/ continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/ continuum-core/src/test/resources/org/apache/maven/continuum/notification/...
Date Sun, 17 Sep 2006 10:38:26 GMT
Author: evenisse
Date: Sun Sep 17 03:38:25 2006
New Revision: 447039

URL: http://svn.apache.org/viewvc?view=rev&rev=447039
Log:
o Fix mail generation. The velocity component descriptor must be in application.xml instead
of components.xml of continuum-core because in this case, it's the one declared in plexus-velocity
that is used.
o Bump plexus-velocity version that reduce logging

Modified:
    maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
    maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java
    maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.xml
    maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
    maven/continuum/trunk/pom.xml

Modified: maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=447039&r1=447038&r2=447039
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
(original)
+++ maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
Sun Sep 17 03:38:25 2006
@@ -556,31 +556,6 @@
           </configuration>
         </component>
     -->
-    <!--
-     |
-     | Velocity
-     |
-     |-->
-    <component>
-      <role>org.codehaus.plexus.velocity.VelocityComponent</role>
-      <implementation>org.codehaus.plexus.velocity.DefaultVelocityComponent</implementation>
-      <configuration>
-        <properties>
-          <property>
-            <name>resource.loader</name>
-            <value>threadContext</value>
-          </property>
-          <property>
-            <name>threadContext.resource.loader.class</name>
-            <value>org.codehaus.plexus.velocity.ContextClassLoaderResourceLoader</value>
-          </property>
-          <property>
-            <name>velocimacro.library</name>
-            <value>/org/apache/maven/continuum/notification/mail/templates/common.vm</value>
-          </property>
-        </properties>
-      </configuration>
-    </component>
 
     <!--
      |

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java?view=diff&rev=447039&r1=447038&r2=447039
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java
(original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java
Sun Sep 17 03:38:25 2006
@@ -81,7 +81,10 @@
 
     private void dumpContent( MailMessage mailMessage )
     {
-        if ( false )
+        assertTrue( "The template isn't loaded correctly.", mailMessage.getContent().indexOf(
"#shellBuildResult()" ) < 0 );
+        assertTrue( "The template isn't loaded correctly.", mailMessage.getContent().indexOf(
"Build statistics" ) > 0 );
+
+        if ( true )
         {
             System.err.println( mailMessage.getContent() );
         }

Modified: maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.xml?view=diff&rev=447039&r1=447038&r2=447039
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.xml
(original)
+++ maven/continuum/trunk/continuum-core/src/test/resources/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.xml
Sun Sep 17 03:38:25 2006
@@ -39,5 +39,26 @@
         <includeBuildResult>true</includeBuildResult>
       </configuration>
     </component>
+
+    <component>
+      <role>org.codehaus.plexus.velocity.VelocityComponent</role>
+      <implementation>org.codehaus.plexus.velocity.DefaultVelocityComponent</implementation>
+      <configuration>
+        <properties>
+          <property>
+            <name>resource.loader</name>
+            <value>threadContext</value>
+          </property>
+          <property>
+            <name>threadContext.resource.loader.class</name>
+            <value>org.codehaus.plexus.velocity.ContextClassLoaderResourceLoader</value>
+          </property>
+          <property>
+            <name>velocimacro.library</name>
+            <value>org/apache/maven/continuum/notification/mail/templates/common.vm</value>
+          </property>
+        </properties>
+      </configuration>
+    </component>
   </components>
 </plexus>

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml?view=diff&rev=447039&r1=447038&r2=447039
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
Sun Sep 17 03:38:25 2006
@@ -197,6 +197,30 @@
       <implementation>org.codehaus.plexus.msn.DefaultMsnClient</implementation>
     </component>
 
+    <!--
+    | Velocity component used by the mail notifier
+    |-->
+    <component>
+      <role>org.codehaus.plexus.velocity.VelocityComponent</role>
+      <implementation>org.codehaus.plexus.velocity.DefaultVelocityComponent</implementation>
+      <configuration>
+        <properties>
+          <property>
+            <name>resource.loader</name>
+            <value>threadContext</value>
+          </property>
+          <property>
+            <name>threadContext.resource.loader.class</name>
+            <value>org.codehaus.plexus.velocity.ContextClassLoaderResourceLoader</value>
+          </property>
+          <property>
+            <name>velocimacro.library</name>
+            <value>org/apache/maven/continuum/notification/mail/templates/common.vm</value>
+          </property>
+        </properties>
+      </configuration>
+    </component>
+
     <component>
       <role>org.apache.maven.continuum.web.util.WorkingCopyContentGenerator</role>
       <implementation>org.apache.maven.continuum.web.util.WorkingCopyContentGenerator</implementation>

Modified: maven/continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/pom.xml?view=diff&rev=447039&r1=447038&r2=447039
==============================================================================
--- maven/continuum/trunk/pom.xml (original)
+++ maven/continuum/trunk/pom.xml Sun Sep 17 03:38:25 2006
@@ -340,7 +340,7 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-velocity</artifactId>
-        <version>1.1.2</version>
+        <version>1.1.3</version>
         <exclusions>
           <exclusion>
             <groupId>plexus</groupId>



Mime
View raw message