continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r729481 - in /continuum/trunk/continuum-reports: ./ src/main/java/org/apache/maven/continuum/reports/surefire/ src/main/resources/ src/main/resources/META-INF/ src/test/resources/
Date Fri, 26 Dec 2008 11:13:13 GMT
Author: olamy
Date: Fri Dec 26 03:13:12 2008
New Revision: 729481

URL: http://svn.apache.org/viewvc?rev=729481&view=rev
Log:
[CONTINUUM-2026] Use annotations instead of plexus-maven-plugin


Added:
    continuum/trunk/continuum-reports/src/main/resources/
    continuum/trunk/continuum-reports/src/main/resources/META-INF/
    continuum/trunk/continuum-reports/src/main/resources/META-INF/spring-context.xml   (with
props)
    continuum/trunk/continuum-reports/src/test/resources/log4j.xml   (with props)
Modified:
    continuum/trunk/continuum-reports/pom.xml
    continuum/trunk/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGenerator.java

Modified: continuum/trunk/continuum-reports/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-reports/pom.xml?rev=729481&r1=729480&r2=729481&view=diff
==============================================================================
--- continuum/trunk/continuum-reports/pom.xml (original)
+++ continuum/trunk/continuum-reports/pom.xml Fri Dec 26 03:13:12 2008
@@ -31,6 +31,14 @@
       <groupId>org.apache.continuum</groupId>
       <artifactId>continuum-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+    </dependency>     
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>jsr250-api</artifactId>
+    </dependency>       
     <!-- Not needed for the moment
     <dependency>
       <groupId>org.apache.continuum</groupId>
@@ -43,20 +51,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>generate</id>
-            <goals>
-              <goal>descriptor</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
 </project>

Modified: continuum/trunk/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGenerator.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGenerator.java?rev=729481&r1=729480&r2=729481&view=diff
==============================================================================
--- continuum/trunk/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGenerator.java
(original)
+++ continuum/trunk/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGenerator.java
Fri Dec 26 03:13:12 2008
@@ -23,8 +23,10 @@
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 import org.codehaus.plexus.util.DirectoryScanner;
+import org.springframework.stereotype.Service;
 import org.xml.sax.SAXException;
 
+import javax.annotation.Resource;
 import javax.xml.parsers.ParserConfigurationException;
 import java.io.File;
 import java.io.IOException;
@@ -36,16 +38,14 @@
 /**
  * @author <a href="mailto:olamy@apache.org">olamy</a>
  * @version $Id$
- * @plexus.component role="org.apache.maven.continuum.reports.surefire.ReportTestSuiteGenerator"
role-hint="default"
  * @since 12 nov. 07
  */
+@Service("reportTestSuiteGenerator")
 public class DefaultReportTestSuiteGenerator
     implements ReportTestSuiteGenerator, Initializable
 {
 
-    /**
-     * @plexus.requirement
-     */
+    @Resource
     private ConfigurationService configurationService;
 
     private List<String> defaultIncludes;

Added: continuum/trunk/continuum-reports/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-reports/src/main/resources/META-INF/spring-context.xml?rev=729481&view=auto
==============================================================================
--- continuum/trunk/continuum-reports/src/main/resources/META-INF/spring-context.xml (added)
+++ continuum/trunk/continuum-reports/src/main/resources/META-INF/spring-context.xml Fri Dec
26 03:13:12 2008
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/context 
+           http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+
+  <context:annotation-config />
+  <context:component-scan 
+    base-package="org.apache.maven.continuum.reports.surefire"/>  
+</beans>
\ No newline at end of file

Propchange: continuum/trunk/continuum-reports/src/main/resources/META-INF/spring-context.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: continuum/trunk/continuum-reports/src/main/resources/META-INF/spring-context.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: continuum/trunk/continuum-reports/src/test/resources/log4j.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-reports/src/test/resources/log4j.xml?rev=729481&view=auto
==============================================================================
--- continuum/trunk/continuum-reports/src/test/resources/log4j.xml (added)
+++ continuum/trunk/continuum-reports/src/test/resources/log4j.xml Fri Dec 26 03:13:12 2008
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!-- ===================================================================== -->
+<!-- Log4j Configuration -->
+<!-- ===================================================================== -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
+  debug="false">
+
+  <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+    <param name="Target" value="System.out"/>
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%d %-5p [%c{1}.%M](%L) %m%n"/>
+    </layout>
+  </appender>
+
+  <!-- quiet spring loading :-) -->
+  <category name="org.springframework">
+    <priority value="INFO"/>
+  </category>
+  <category name="org.codehaus.plexus">
+    <priority value="ERROR"/>
+  </category>
+  <category name="org.apache.continuum.configuration">
+    <priority value="DEBUG"/>
+  </category>
+
+  <category name="org.apache.commons.configuration">
+    <priority value="ERROR"/>
+  </category>
+
+  <!-- JPOX -->
+  <category name="JPOX">
+    <priority value="WARN"/>
+  </category>
+  <category name="JPOX.RDBMS">
+    <priority value="ERROR"/>
+  </category>
+
+  <root>
+    <priority value="INFO"/>
+    <appender-ref ref="CONSOLE"/>
+  </root>
+
+</log4j:configuration>

Propchange: continuum/trunk/continuum-reports/src/test/resources/log4j.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: continuum/trunk/continuum-reports/src/test/resources/log4j.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision



Mime
View raw message