You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2009/09/26 18:54:40 UTC
svn commit: r819172 - in /maven/plugins/branches/maven-site-plugin-3.x/src:
it/emma-plugin-it/ it/emma-plugin-it/a/ it/emma-plugin-it/a/src/
it/emma-plugin-it/a/src/main/ it/emma-plugin-it/a/src/main/java/
it/emma-plugin-it/a/src/main/java/hello/ it/em...
Author: olamy
Date: Sat Sep 26 16:54:38 2009
New Revision: 819172
URL: http://svn.apache.org/viewvc?rev=819172&view=rev
Log:
fix for emma plugin (it added).
Added:
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/src/
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/src/main/
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/src/main/java/
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/src/main/java/hello/
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/src/main/java/hello/Hello.java (with props)
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/src/test/
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/src/test/java/
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/src/test/java/hello/
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/src/test/java/hello/HelloTest.java (with props)
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/src/
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/src/main/
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/src/main/java/
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/src/main/java/byebye/
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/src/main/java/byebye/ByeBye.java (with props)
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/src/test/
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/src/test/java/
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/src/test/java/byebye/
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/src/test/java/byebye/ByeByeTest.java (with props)
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/invoker.properties (with props)
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/verify.bsh (with props)
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java
Added: maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/pom.xml?rev=819172&view=auto
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/pom.xml (added)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/pom.xml Sat Sep 26 16:54:38 2009
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <groupId>org.apache.maven.plugins.site.its</groupId>
+ <artifactId>it03</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>it03-a</artifactId>
+ <name>EMMA plugin :: Integration test 03 :: A</name>
+</project>
Added: maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/src/main/java/hello/Hello.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/src/main/java/hello/Hello.java?rev=819172&view=auto
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/src/main/java/hello/Hello.java (added)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/src/main/java/hello/Hello.java Sat Sep 26 16:54:38 2009
@@ -0,0 +1,10 @@
+package hello;
+
+public class Hello
+{
+ public String hello( String name )
+ {
+ final String myName = name == null ? "world" : name;
+ return "Hello " + myName + "!";
+ }
+}
Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/src/main/java/hello/Hello.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/src/main/java/hello/Hello.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/src/test/java/hello/HelloTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/src/test/java/hello/HelloTest.java?rev=819172&view=auto
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/src/test/java/hello/HelloTest.java (added)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/src/test/java/hello/HelloTest.java Sat Sep 26 16:54:38 2009
@@ -0,0 +1,13 @@
+package hello;
+
+import junit.framework.TestCase;
+
+public class HelloTest extends TestCase
+{
+ public void testHello()
+ {
+ final Hello hello = new Hello();
+ assertEquals( "Hello world!", hello.hello( null ) );
+ assertEquals( "Hello EMMA!", hello.hello( "EMMA" ) );
+ }
+}
Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/src/test/java/hello/HelloTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/a/src/test/java/hello/HelloTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/pom.xml?rev=819172&view=auto
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/pom.xml (added)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/pom.xml Sat Sep 26 16:54:38 2009
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <groupId>org.apache.maven.plugins.site.its</groupId>
+ <artifactId>it03</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>it03-b</artifactId>
+ <name>EMMA plugin :: Integration test 03 :: B</name>
+</project>
Added: maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/src/main/java/byebye/ByeBye.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/src/main/java/byebye/ByeBye.java?rev=819172&view=auto
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/src/main/java/byebye/ByeBye.java (added)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/src/main/java/byebye/ByeBye.java Sat Sep 26 16:54:38 2009
@@ -0,0 +1,10 @@
+package byebye;
+
+public class ByeBye
+{
+ public String byebye( String name )
+ {
+ final String myName = name == null ? "world" : name;
+ return "Bye bye " + myName + "!";
+ }
+}
Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/src/main/java/byebye/ByeBye.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/src/main/java/byebye/ByeBye.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/src/test/java/byebye/ByeByeTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/src/test/java/byebye/ByeByeTest.java?rev=819172&view=auto
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/src/test/java/byebye/ByeByeTest.java (added)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/src/test/java/byebye/ByeByeTest.java Sat Sep 26 16:54:38 2009
@@ -0,0 +1,14 @@
+package byebye;
+
+import byebye.ByeBye;
+import junit.framework.TestCase;
+
+public class ByeByeTest extends TestCase
+{
+ public void testByeBye()
+ {
+ final ByeBye byeBye = new ByeBye();
+ assertEquals( "Bye bye world!", byeBye.byebye( null ) );
+ assertEquals( "Bye bye EMMA!", byeBye.byebye( "EMMA" ) );
+ }
+}
Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/src/test/java/byebye/ByeByeTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/b/src/test/java/byebye/ByeByeTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/invoker.properties?rev=819172&view=auto
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/invoker.properties (added)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/invoker.properties Sat Sep 26 16:54:38 2009
@@ -0,0 +1 @@
+invoker.goals=clean site
\ No newline at end of file
Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/invoker.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/invoker.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/pom.xml?rev=819172&view=auto
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/pom.xml (added)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/pom.xml Sat Sep 26 16:54:38 2009
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.site.its</groupId>
+ <artifactId>it03</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>EMMA plugin :: Integration test 03</name>
+ <packaging>pom</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>@project.version@</version>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <excludeDefaults>true</excludeDefaults>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>emma-maven-plugin</artifactId>
+ <version>1.0-alpha-2</version>
+ <configuration>
+ <filters>
+ <filter>+hello.*</filter>
+ <filter>+byebye.*</filter>
+ </filters>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+ <modules>
+ <module>a</module>
+ <module>b</module>
+ </modules>
+</project>
Added: maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/verify.bsh?rev=819172&view=auto
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/verify.bsh (added)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/verify.bsh Sat Sep 26 16:54:38 2009
@@ -0,0 +1,25 @@
+File aEmmaIndex = new File(basedir, "a/target/site/emma/index.html");
+if(!aEmmaIndex.exists() || aEmmaIndex.length() == 0) {
+ System.out.println("Missing 'index.html' for A");
+ return false;
+}
+
+File aEmmaFiles = new File(basedir, "a/target/site/emma/_files");
+if(!aEmmaFiles.exists() || aEmmaFiles.list().length == 0) {
+ System.out.println("Missing or empty directory '_files' for A");
+ return false;
+}
+
+File bEmmaIndex = new File(basedir, "b/target/site/emma/index.html");
+if(!bEmmaIndex.exists() || bEmmaIndex.length() == 0) {
+ System.out.println("Missing 'index.html' for B");
+ return false;
+}
+
+File bEmmaFiles = new File(basedir, "b/target/site/emma/_files");
+if(!bEmmaFiles.exists() || bEmmaFiles.list().length == 0) {
+ System.out.println("Missing or empty directory '_files' for B");
+ return false;
+}
+
+return true;
Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/verify.bsh
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java?rev=819172&r1=819171&r2=819172&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java Sat Sep 26 16:54:38 2009
@@ -200,19 +200,18 @@
throws PluginContainerException, PluginConfigurationException
{
- if ( !isMavenReport( mojoExecution, pluginDescriptor ) )
- {
- return null;
- }
+
MavenReport mavenReport = null;
try
{
- // FIXME here we need something to prevent MJAVADOC-251 config injection order can be different from mvn <
- // 3.x
- mavenReport =
- (MavenReport) mavenPluginManager.getConfiguredMojo( Mojo.class,
- mavenReportExecutorRequest.getMavenSession(),
- mojoExecution );
+ Mojo mojo = mavenPluginManager.getConfiguredMojo( Mojo.class,
+ mavenReportExecutorRequest.getMavenSession(),
+ mojoExecution );
+ if ( !isMavenReport( mojoExecution, pluginDescriptor, mojo ) )
+ {
+ return null;
+ }
+ mavenReport = (MavenReport) mojo;
return mavenReport;
}
@@ -224,25 +223,30 @@
}
- private boolean isMavenReport( MojoExecution mojoExecution, PluginDescriptor pluginDescriptor )
+ private boolean isMavenReport( MojoExecution mojoExecution, PluginDescriptor pluginDescriptor, Mojo mojo )
{
ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
try
{
MojoDescriptor mojoDescriptor = pluginDescriptor.getMojo( mojoExecution.getGoal() );
Thread.currentThread().setContextClassLoader( mojoDescriptor.getRealm() );
- boolean isMavenReport = MavenReport.class.isAssignableFrom( mojoDescriptor.getImplementationClass() );
+
+ boolean isMavenReport = MavenReport.class.isAssignableFrom( mojo.getClass() );
+ if (getLog().isInfoEnabled())
+ {
+ getLog().info( "class " + mojoDescriptor.getImplementationClass().getName() + " isMavenReport " + isMavenReport );
+ }
if ( !isMavenReport )
{
- getLog().debug( " skip non MavenReport " + mojoExecution.getMojoDescriptor().getId() );
+ getLog().info( " skip non MavenReport " + mojoExecution.getMojoDescriptor().getId() );
}
return isMavenReport;
}
catch ( LinkageError e )
{
- getLog().warn( "skip LinkageError mojoExecution.goal : " + mojoExecution.getGoal() + " : " + e.getMessage(),
+ getLog().warn(
+ "skip LinkageError mojoExecution.goal : " + mojoExecution.getGoal() + " : " + e.getMessage(),
e );
- // pluginRealm.display();
return false;
}
finally