You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by bi...@apache.org on 2011/07/11 03:14:31 UTC
svn commit: r1145003 - in /maven/jxr/trunk/maven-jxr-plugin/src:
it/aggregate/ it/aggregate/p1/ it/aggregate/p1/src/
it/aggregate/p1/src/main/ it/aggregate/p1/src/main/java/
it/aggregate/p1/src/main/java/org/
it/aggregate/p1/src/main/java/org/apache/ i...
Author: bimargulies
Date: Mon Jul 11 01:14:29 2011
New Revision: 1145003
URL: http://svn.apache.org/viewvc?rev=1145003&view=rev
Log:
JXR-88: create jxr:aggregate and jxr:test-aggregate
o initial attempt at adding aggregate goal, but not working yet.
Added:
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/pom.xml (with props)
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/java/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/java/org/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/java/org/apache/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/java/org/apache/maven/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/java/org/apache/maven/jxr/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/java/org/apache/maven/jxr/it/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/java/org/apache/maven/jxr/it/App.java (with props)
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/java/org/apache/maven/jxr/it/App2.java (with props)
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/test/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/test/java/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/test/java/org/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/test/java/org/apache/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/test/java/org/apache/maven/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/test/java/org/apache/maven/jxr/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/test/java/org/apache/maven/jxr/it/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/test/java/org/apache/maven/jxr/it/AppTest.java (with props)
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/pom.xml (with props)
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App.java (with props)
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App2.java (with props)
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/test/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/test/java/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/test/java/org/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/test/java/org/apache/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/test/java/org/apache/maven/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/test/java/org/apache/maven/jxr/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/test/java/org/apache/maven/jxr/it/
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/test/java/org/apache/maven/jxr/it/AppTest.java (with props)
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/pom.xml (with props)
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AggregatorJxrReport.java (with props)
Modified:
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReportUtil.java
Added: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/pom.xml
URL: http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/pom.xml?rev=1145003&view=auto
==============================================================================
--- maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/pom.xml (added)
+++ maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/pom.xml Mon Jul 11 01:14:29 2011
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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.
+-->
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.jxr.it</groupId>
+ <artifactId>agg-p1</artifactId>
+
+ <parent>
+ <groupId>org.apache.maven.jxr.it</groupId>
+ <artifactId>aggregate</artifactId>
+ <version>1-SNAPSHOT</version>
+ </parent>
+
+ <name>one aggregate module</name>
+ <url>http://maven.apache.org</url>
+</project>
Propchange: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/java/org/apache/maven/jxr/it/App.java
URL: http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/java/org/apache/maven/jxr/it/App.java?rev=1145003&view=auto
==============================================================================
--- maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/java/org/apache/maven/jxr/it/App.java (added)
+++ maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/java/org/apache/maven/jxr/it/App.java Mon Jul 11 01:14:29 2011
@@ -0,0 +1,33 @@
+package org.apache.maven.jxr.it;
+
+/*
+ * 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.
+ */
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+ extends App2
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/java/org/apache/maven/jxr/it/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/java/org/apache/maven/jxr/it/App.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/java/org/apache/maven/jxr/it/App2.java
URL: http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/java/org/apache/maven/jxr/it/App2.java?rev=1145003&view=auto
==============================================================================
--- maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/java/org/apache/maven/jxr/it/App2.java (added)
+++ maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/java/org/apache/maven/jxr/it/App2.java Mon Jul 11 01:14:29 2011
@@ -0,0 +1,32 @@
+package org.apache.maven.jxr.it;
+
+/*
+ * 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.
+ */
+
+/**
+ * Hello world!
+ *
+ */
+public class App2
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/java/org/apache/maven/jxr/it/App2.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/main/java/org/apache/maven/jxr/it/App2.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/test/java/org/apache/maven/jxr/it/AppTest.java
URL: http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/test/java/org/apache/maven/jxr/it/AppTest.java?rev=1145003&view=auto
==============================================================================
--- maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/test/java/org/apache/maven/jxr/it/AppTest.java (added)
+++ maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/test/java/org/apache/maven/jxr/it/AppTest.java Mon Jul 11 01:14:29 2011
@@ -0,0 +1,57 @@
+package org.apache.maven.jxr.it;
+
+/*
+ * 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.
+ */
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/test/java/org/apache/maven/jxr/it/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p1/src/test/java/org/apache/maven/jxr/it/AppTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/pom.xml
URL: http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/pom.xml?rev=1145003&view=auto
==============================================================================
--- maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/pom.xml (added)
+++ maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/pom.xml Mon Jul 11 01:14:29 2011
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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.
+-->
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.jxr.it</groupId>
+ <artifactId>agg-p2</artifactId>
+ <parent>
+ <groupId>org.apache.maven.jxr.it</groupId>
+ <artifactId>aggregate</artifactId>
+ <version>1-SNAPSHOT</version>
+ </parent>
+
+ <name>agg-p2</name>
+ <url>http://maven.apache.org</url>
+
+</project>
Propchange: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App.java
URL: http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App.java?rev=1145003&view=auto
==============================================================================
--- maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App.java (added)
+++ maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App.java Mon Jul 11 01:14:29 2011
@@ -0,0 +1,33 @@
+package org.apache.maven.jxr.it;
+
+/*
+ * 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.
+ */
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+ extends App2
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App2.java
URL: http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App2.java?rev=1145003&view=auto
==============================================================================
--- maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App2.java (added)
+++ maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App2.java Mon Jul 11 01:14:29 2011
@@ -0,0 +1,32 @@
+package org.apache.maven.jxr.it;
+
+/*
+ * 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.
+ */
+
+/**
+ * Hello world!
+ *
+ */
+public class App2
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App2.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App2.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/test/java/org/apache/maven/jxr/it/AppTest.java
URL: http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/test/java/org/apache/maven/jxr/it/AppTest.java?rev=1145003&view=auto
==============================================================================
--- maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/test/java/org/apache/maven/jxr/it/AppTest.java (added)
+++ maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/test/java/org/apache/maven/jxr/it/AppTest.java Mon Jul 11 01:14:29 2011
@@ -0,0 +1,57 @@
+package org.apache.maven.jxr.it;
+
+/*
+ * 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.
+ */
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/test/java/org/apache/maven/jxr/it/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/test/java/org/apache/maven/jxr/it/AppTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/pom.xml
URL: http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/pom.xml?rev=1145003&view=auto
==============================================================================
--- maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/pom.xml (added)
+++ maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/pom.xml Mon Jul 11 01:14:29 2011
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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.
+-->
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.jxr.it</groupId>
+ <artifactId>aggregate</artifactId>
+ <version>1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>aggregate</name>
+ <url>http://maven.apache.org</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>@pom.version@</version>
+ <executions>
+ <execution>
+ <id>jxr</id>
+ <goals><goal>aggregate</goal></goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>@sitePluginVersion@</version>
+ </plugin>
+ </plugins>
+ </build>
+
+ <modules>
+ <module>p1</module>
+ <module>p2</module>
+ </modules>
+
+ <reporting>
+ <excludeDefaults>true</excludeDefaults>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>@pom.version@</version>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Propchange: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
URL: http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java?rev=1145003&r1=1145002&r2=1145003&view=diff
==============================================================================
--- maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java (original)
+++ maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java Mon Jul 11 01:14:29 2011
@@ -155,6 +155,7 @@ public abstract class AbstractJxrReport
* Whether to build an aggregated report at the root, or build individual reports.
*
* @parameter expression="${aggregate}" default-value="false"
+ * @deprecated
*/
protected boolean aggregate;
@@ -412,7 +413,7 @@ public abstract class AbstractJxrReport
{
boolean canGenerate = !sourceDirs.isEmpty();
- if ( aggregate && !project.isExecutionRoot() )
+ if ( isAggregate() && !project.isExecutionRoot() )
{
canGenerate = false;
}
@@ -454,7 +455,7 @@ public abstract class AbstractJxrReport
protected List constructSourceDirs()
{
List sourceDirs = new ArrayList( getSourceRoots() );
- if ( aggregate )
+ if ( isAggregate() )
{
for ( Iterator i = reactorProjects.iterator(); i.hasNext(); )
{
@@ -513,18 +514,15 @@ public abstract class AbstractJxrReport
if ( StringUtils.isNotEmpty( stagingDirectory ) )
{
String javadocDestDir = getJavadocDir().getName();
- boolean javadocAggregate = Boolean
- .valueOf( JxrReportUtil.getMavenJavadocPluginBasicOption( project, "aggregate", "false" ) )
- .booleanValue();
-
+ boolean javadocAggregate = JxrReportUtil.isJavadocAggregated( project );
String structureProject = JxrReportUtil.getStructure( project, false );
- if ( aggregate && javadocAggregate )
+ if ( isAggregate() && javadocAggregate )
{
File outputDirectory = new File( stagingDirectory, structureProject );
location = outputDirectory + "/" + javadocDestDir;
}
- if ( !aggregate && javadocAggregate )
+ if ( !isAggregate() && javadocAggregate )
{
location = stagingDirectory + "/" + javadocDestDir;
@@ -539,13 +537,13 @@ public abstract class AbstractJxrReport
File outputDirectory = new File( stagingDirectory, hierarchy );
location = outputDirectory + "/" + javadocDestDir;
}
- if ( aggregate && !javadocAggregate )
+ if ( isAggregate() && !javadocAggregate )
{
getLog().warn(
"The JXR plugin is configured to build an aggregated report at the root, "
+ "not the Javadoc plugin." );
}
- if ( !aggregate && !javadocAggregate )
+ if ( !isAggregate() && !javadocAggregate )
{
location = stagingDirectory + "/" + structureProject + "/" + javadocDestDir;
}
@@ -594,4 +592,13 @@ public abstract class AbstractJxrReport
* @return a File for the directory of the javadocs
*/
protected abstract File getJavadocDir();
+
+ /**
+ * Is the current report aggregated?
+ * @return
+ */
+ protected boolean isAggregate()
+ {
+ return aggregate;
+ }
}
Added: maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AggregatorJxrReport.java
URL: http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AggregatorJxrReport.java?rev=1145003&view=auto
==============================================================================
--- maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AggregatorJxrReport.java (added)
+++ maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AggregatorJxrReport.java Mon Jul 11 01:14:29 2011
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+package org.apache.maven.plugin.jxr;
+
+/**
+ * Generates a combined JXR report in an aggregating project.
+ *
+ * @goal aggregate
+ * @aggregator
+ * @since 2.3
+ *
+ */
+public class AggregatorJxrReport
+ extends JxrReport
+{
+
+ protected boolean isAggregate()
+ {
+ return true;
+ }
+
+}
Propchange: maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AggregatorJxrReport.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AggregatorJxrReport.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReportUtil.java
URL: http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReportUtil.java?rev=1145003&r1=1145002&r2=1145003&view=diff
==============================================================================
--- maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReportUtil.java (original)
+++ maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReportUtil.java Mon Jul 11 01:14:29 2011
@@ -30,6 +30,7 @@ import javax.xml.parsers.ParserConfigura
import javax.xml.transform.TransformerException;
import org.apache.maven.model.Plugin;
+import org.apache.maven.model.PluginExecution;
import org.apache.maven.model.ReportPlugin;
import org.apache.maven.model.Site;
import org.apache.maven.project.MavenProject;
@@ -50,6 +51,58 @@ import org.xml.sax.SAXException;
*/
public class JxrReportUtil
{
+
+ private static final String MAVEN_JAVADOC_PLUGIN_GROUP_ID = "org.apache.maven.plugins";
+ private static final String MAVEN_JAVADOC_PLUGIN_ARTIFACT_ID = "maven-javadoc-plugin";
+
+ /**
+ * Determine if javadoc is aggregated in this project, paying attention to both
+ * the old parameter and the new mojo.
+ * @param project
+ * @return
+ * @throws IOException
+ */
+ protected static boolean isJavadocAggregated( MavenProject project )
+ throws IOException
+ {
+ // first check conf for obsolete aggregate param.
+ boolean javadocAggregate = Boolean
+ .valueOf( JxrReportUtil.getMavenJavadocPluginBasicOption( project, "aggregate", "false" ) )
+ .booleanValue();
+ if ( javadocAggregate )
+ {
+ return true;
+ }
+ List plugins = getMavenJavadocPlugins ( project );
+ Iterator pi = plugins.iterator();
+ while ( pi.hasNext() )
+ {
+ Object pluginObject = pi.next();
+
+ if ( pluginObject instanceof Plugin )
+ {
+ Plugin plugin = (Plugin)pluginObject;
+ List executions = plugin.getExecutions();
+ Iterator ei = executions.iterator();
+ while ( ei.hasNext() )
+ {
+ PluginExecution pe = (PluginExecution) ei.next();
+ List goals = pe.getGoals();
+ Iterator gi = goals.iterator();
+ while ( gi.hasNext() )
+ {
+ String goal = (String) gi.next();
+ if ( "aggregate".equals(goal) )
+ {
+ return true;
+ }
+ }
+ }
+ }
+ }
+ return false;
+ }
+
/**
* Return the <code>optionName</code> value defined in a project for the "maven-javadoc-plugin" plugin.
*
@@ -73,7 +126,7 @@ public class JxrReportUtil
plugins.add( it.next() );
}
- String pluginArtifactId = "maven-javadoc-plugin";
+ String pluginArtifactId = MAVEN_JAVADOC_PLUGIN_ARTIFACT_ID;
for ( Iterator it = plugins.iterator(); it.hasNext(); )
{
Object next = it.next();
@@ -85,7 +138,7 @@ public class JxrReportUtil
Plugin plugin = (Plugin) next;
// using out-of-box Maven plugins
- if ( !( ( plugin.getGroupId().equals( "org.apache.maven.plugins" ) ) && ( plugin.getArtifactId()
+ if ( !( ( plugin.getGroupId().equals( MAVEN_JAVADOC_PLUGIN_GROUP_ID ) ) && ( plugin.getArtifactId()
.equals( pluginArtifactId ) ) ) )
{
continue;
@@ -99,7 +152,7 @@ public class JxrReportUtil
ReportPlugin reportPlugin = (ReportPlugin) next;
// using out-of-box Maven plugins
- if ( !( ( reportPlugin.getGroupId().equals( "org.apache.maven.plugins" ) ) && ( reportPlugin
+ if ( !( ( reportPlugin.getGroupId().equals( MAVEN_JAVADOC_PLUGIN_GROUP_ID ) ) && ( reportPlugin
.getArtifactId().equals( pluginArtifactId ) ) ) )
{
continue;
@@ -145,6 +198,62 @@ public class JxrReportUtil
return defaultValue;
}
+
+ /**
+ * Return the plugin references for the javadoc plugin in a project.
+ *
+ * @param project not null
+ * @throws IOException if any
+ */
+ protected static List getMavenJavadocPlugins( MavenProject project )
+ throws IOException
+ {
+ List plugins = new ArrayList();
+ for ( Iterator it = project.getModel().getReporting().getPlugins().iterator(); it.hasNext(); )
+ {
+ plugins.add( it.next() );
+ }
+ for ( Iterator it = project.getModel().getBuild().getPlugins().iterator(); it.hasNext(); )
+ {
+ plugins.add( it.next() );
+ }
+
+ List result = new ArrayList();
+
+ String pluginArtifactId = MAVEN_JAVADOC_PLUGIN_ARTIFACT_ID;
+ for ( Iterator it = plugins.iterator(); it.hasNext(); )
+ {
+ Object next = it.next();
+
+ if ( next instanceof Plugin )
+ {
+ Plugin plugin = (Plugin) next;
+
+ // using out-of-box Maven plugins
+ if ( !( ( plugin.getGroupId().equals( MAVEN_JAVADOC_PLUGIN_GROUP_ID ) ) && ( plugin.getArtifactId()
+ .equals( pluginArtifactId ) ) ) )
+ {
+ continue;
+ }
+
+ result.add( plugin );
+ }
+
+ if ( next instanceof ReportPlugin )
+ {
+ ReportPlugin reportPlugin = (ReportPlugin) next;
+
+ // using out-of-box Maven plugins
+ if ( !( ( reportPlugin.getGroupId().equals( MAVEN_JAVADOC_PLUGIN_GROUP_ID ) ) && ( reportPlugin
+ .getArtifactId().equals( pluginArtifactId ) ) ) )
+ {
+ continue;
+ }
+ result.add( reportPlugin );
+ }
+ }
+ return result;
+ }
/**
* Generates the site structure using the project hierarchy (project and its modules) or using the