[maven-release-plugin] copy for tag maven-reporting-impl-2.0.4.2
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/tags/maven-reporting-impl-2.0.4.2@795409 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 67663a2..d4f0bfb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,14 +21,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>maven-shared-components</artifactId>
<groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-shared-components</artifactId>
<version>11</version>
</parent>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>2.0.4.2-SNAPSHOT</version>
+ <version>2.0.4.2</version>
<name>Maven Reporting Implementation</name>
<description>Abstract classes to manage report generation.</description>
@@ -46,11 +46,16 @@
</developers>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/branches/maven-reporting-impl-2.0.4.x</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/shared/branches/maven-reporting-impl-2.0.4.x</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/shared/branches/maven-reporting-impl-2.0.4.x</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-reporting-impl-2.0.4.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-reporting-impl-2.0.4.2</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/shared/tags/maven-reporting-impl-2.0.4.2</url>
</scm>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.codehaus.org/browse/MSHARED/component/13274</url>
+ </issueManagement>
+
<properties>
<mavenVersion>2.0.4</mavenVersion>
<doxiaVersion>1.0</doxiaVersion>
@@ -95,4 +100,52 @@
</dependency>
</dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-4</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <!-- Using this plugin configuration to produce a buildable project source distro,
+ per the discussion on members@ASF regarding what constitutes a valid release.
+ -->
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-project-src-distro</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/source-release.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
\ No newline at end of file
diff --git a/src/main/assembly/source-release.xml b/src/main/assembly/source-release.xml
new file mode 100644
index 0000000..5024d06
--- /dev/null
+++ b/src/main/assembly/source-release.xml
@@ -0,0 +1,46 @@
+<?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.
+-->
+
+<assembly>
+ <id>source-release</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>tar.bz2</format>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}</directory>
+ <outputDirectory>/</outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <excludes>
+ <exclude>**/*.iws</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>*.log</exclude>
+ <exclude>target/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
diff --git a/src/main/java/org/apache/maven/reporting/AbstractMavenMultiPageReport.java b/src/main/java/org/apache/maven/reporting/AbstractMavenMultiPageReport.java
index 6f36278..df77f53 100644
--- a/src/main/java/org/apache/maven/reporting/AbstractMavenMultiPageReport.java
+++ b/src/main/java/org/apache/maven/reporting/AbstractMavenMultiPageReport.java
@@ -1,112 +1,112 @@
-package org.apache.maven.reporting;
-
-/*
- * 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 org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.doxia.siterenderer.RendererException;
-import org.apache.maven.reporting.sink.MultiPageSink;
-import org.apache.maven.reporting.sink.SinkFactory;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * @author <a href="evenisse@apache.org">Emmanuel Venisse</a>
- * @version $Id: MavenReport.java 163376 2005-02-23 00:06:06Z brett $
- */
-public abstract class AbstractMavenMultiPageReport
- extends AbstractMavenReport
-{
- private SinkFactory factory;
-
- private List sinks = new ArrayList();
-
- public void setSinkFactory( SinkFactory factory )
- {
- this.factory = factory;
- }
-
- public SinkFactory getSinkFactory()
- {
- return factory;
- }
-
- public boolean useDefaultSiteDescriptor()
- {
- return true;
- }
-
- public abstract boolean usePageLinkBar();
-
- private Sink getSink( String outputName )
- throws RendererException, IOException
- {
- return factory.getSink( outputName );
- }
-
- public MultiPageSink startPage( String outputName )
- throws RendererException, IOException
- {
- return new MultiPageSink( outputName, getSink( outputName ) );
- }
-
- public void endPage( MultiPageSink sink )
- {
- if ( usePageLinkBar() )
- {
- sinks.add( sink );
- }
- else
- {
- sink.closeSink();
- }
- }
-
- protected void closeReport()
- {
- if ( !sinks.isEmpty() )
- {
- for ( Iterator i = sinks.iterator(); i.hasNext(); )
- {
- MultiPageSink currentSink = (MultiPageSink) i.next();
-
- currentSink.paragraph();
-
- for ( int counter = 1; counter <= sinks.size(); counter++ )
- {
- if ( counter > 1 )
- {
- currentSink.text( " " );
- }
- MultiPageSink sink = (MultiPageSink) sinks.get( counter - 1 );
- sink.link( sink.getOutputName() + ".html" );
- sink.text( String.valueOf( counter ) );
- sink.link_();
- }
- currentSink.paragraph_();
- currentSink.closeSink();
- }
- }
-
- super.closeReport();
- }
-}
+package org.apache.maven.reporting;
+
+/*
+ * 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 org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.siterenderer.RendererException;
+import org.apache.maven.reporting.sink.MultiPageSink;
+import org.apache.maven.reporting.sink.SinkFactory;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * @author <a href="evenisse@apache.org">Emmanuel Venisse</a>
+ * @version $Id: MavenReport.java 163376 2005-02-23 00:06:06Z brett $
+ */
+public abstract class AbstractMavenMultiPageReport
+ extends AbstractMavenReport
+{
+ private SinkFactory factory;
+
+ private List sinks = new ArrayList();
+
+ public void setSinkFactory( SinkFactory factory )
+ {
+ this.factory = factory;
+ }
+
+ public SinkFactory getSinkFactory()
+ {
+ return factory;
+ }
+
+ public boolean useDefaultSiteDescriptor()
+ {
+ return true;
+ }
+
+ public abstract boolean usePageLinkBar();
+
+ private Sink getSink( String outputName )
+ throws RendererException, IOException
+ {
+ return factory.getSink( outputName );
+ }
+
+ public MultiPageSink startPage( String outputName )
+ throws RendererException, IOException
+ {
+ return new MultiPageSink( outputName, getSink( outputName ) );
+ }
+
+ public void endPage( MultiPageSink sink )
+ {
+ if ( usePageLinkBar() )
+ {
+ sinks.add( sink );
+ }
+ else
+ {
+ sink.closeSink();
+ }
+ }
+
+ protected void closeReport()
+ {
+ if ( !sinks.isEmpty() )
+ {
+ for ( Iterator i = sinks.iterator(); i.hasNext(); )
+ {
+ MultiPageSink currentSink = (MultiPageSink) i.next();
+
+ currentSink.paragraph();
+
+ for ( int counter = 1; counter <= sinks.size(); counter++ )
+ {
+ if ( counter > 1 )
+ {
+ currentSink.text( " " );
+ }
+ MultiPageSink sink = (MultiPageSink) sinks.get( counter - 1 );
+ sink.link( sink.getOutputName() + ".html" );
+ sink.text( String.valueOf( counter ) );
+ sink.link_();
+ }
+ currentSink.paragraph_();
+ currentSink.closeSink();
+ }
+ }
+
+ super.closeReport();
+ }
+}
diff --git a/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java b/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
index 7f1b087..1c7c6f4 100644
--- a/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
+++ b/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
@@ -649,8 +649,8 @@
}
/**
- * The method parses a text an apply the given pattern <code>{text, url}</code> to create
- * a map of text/href.
+ * The method parses a text and applies the given pattern <code>{text, url}</code> to create
+ * a list of text/href.
*
* @param text a text with or without the pattern <code>{text, url}</code>
* @return a map of text/href
