svn commit: r692619 - /maven/plugins/branches/MRESOURCES-56/
Author: olamy Date: Sat Sep 6 00:07:57 2008 New Revision: 692619 URL: http://svn.apache.org/viewvc?rev=692619&view=rev Log: delete branch merged to trunk Removed: maven/plugins/branches/MRESOURCES-56/
svn commit: r692629 - in /maven/shared/trunk/maven-doxia-tools: pom.xml src/main/resources/site-tool_pt.properties
Author: dennisl Date: Sat Sep 6 03:44:05 2008 New Revision: 692629 URL: http://svn.apache.org/viewvc?rev=692629&view=rev Log: [MSITE-351] New language - Portuguese (Portugal) Submitted by: Samuel Santos Reviewed by: Dennis Lundberg Added: maven/shared/trunk/maven-doxia-tools/src/main/resources/site-tool_pt.properties (with props) Modified: maven/shared/trunk/maven-doxia-tools/pom.xml Modified: maven/shared/trunk/maven-doxia-tools/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/pom.xml?rev=692629&r1=692628&r2=692629&view=diff == --- maven/shared/trunk/maven-doxia-tools/pom.xml (original) +++ maven/shared/trunk/maven-doxia-tools/pom.xml Sat Sep 6 03:44:05 2008 @@ -161,6 +161,7 @@ nl no pl +pt pt_BR sk sv Added: maven/shared/trunk/maven-doxia-tools/src/main/resources/site-tool_pt.properties URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/main/resources/site-tool_pt.properties?rev=692629&view=auto == --- maven/shared/trunk/maven-doxia-tools/src/main/resources/site-tool_pt.properties (added) +++ maven/shared/trunk/maven-doxia-tools/src/main/resources/site-tool_pt.properties Sat Sep 6 03:44:05 2008 @@ -0,0 +1,22 @@ +# 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. + +decorationModel.menu.parentproject = Projecto Pai +decorationModel.menu.projectdocumentation = Documenta\u00e7\u00e3o do Projeto +decorationModel.menu.projectinformation = Informa\u00e7\u00e3o do Projeto +decorationModel.menu.projectmodules = M\u00f3dulos +decorationModel.menu.projectreports = Relat\u00f3rios do Projeto Propchange: maven/shared/trunk/maven-doxia-tools/src/main/resources/site-tool_pt.properties -- svn:eol-style = native
svn commit: r692637 - /maven/plugins/trunk/maven-site-plugin/src/site/xdoc/i18n.xml
Author: dennisl Date: Sat Sep 6 04:58:49 2008 New Revision: 692637 URL: http://svn.apache.org/viewvc?rev=692637&view=rev Log: [MSITE-352] Link to L10n Status Report for Project Info Reports Plugin Modified: maven/plugins/trunk/maven-site-plugin/src/site/xdoc/i18n.xml Modified: maven/plugins/trunk/maven-site-plugin/src/site/xdoc/i18n.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/xdoc/i18n.xml?rev=692637&r1=692636&r2=692637&view=diff == --- maven/plugins/trunk/maven-site-plugin/src/site/xdoc/i18n.xml (original) +++ maven/plugins/trunk/maven-site-plugin/src/site/xdoc/i18n.xml Sat Sep 6 04:58:49 2008 @@ -294,9 +294,7 @@ at the L10n Status Report for each one of them: Site Plugin - http://maven.apache.org/shared/maven-doxia-tools/l10n-status.html";>Doxia Tools
svn commit: r692641 - in /maven/plugins/trunk/maven-project-info-reports-plugin: pom.xml src/main/resources/project-info-report_pt.properties
Author: dennisl
Date: Sat Sep 6 05:22:31 2008
New Revision: 692641
URL: http://svn.apache.org/viewvc?rev=692641&view=rev
Log:
[MSITE-351] New language - Portuguese (Portugal)
Submitted by: Samuel Santos
Reviewed by: Dennis Lundberg
Added:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt.properties
(with props)
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml?rev=692641&r1=692640&r2=692641&view=diff
==
--- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Sat Sep 6
05:22:31 2008
@@ -308,7 +308,7 @@
org.codehaus.mojo
l10n-maven-plugin
-1.0-alpha-1
+1.0-alpha-2-SNAPSHOT
cs
@@ -322,6 +322,7 @@
nl
no
pl
+pt
pt_BR
sk
sv
Added:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt.properties?rev=692641&view=auto
==
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt.properties
(added)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt.properties
Sat Sep 6 05:22:31 2008
@@ -0,0 +1,249 @@
+# 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.
+
+report.cim.access = Acesso
+report.cim.anthill.intro = Este
projecto usa o {Anthill, http://www.anthillpro.com/html/products/anthillos/}.
+report.cim.buildforge.intro= Este
projecto usa o {Build Forge,
http://www-306.ibm.com/software/awdtools/buildforge/enterprise/}.
+report.cim.continuum.intro = Este
projecto usa o {Continuum, http://maven.apache.org/continuum/}.
+report.cim.cruisecontrol.intro = Este
projecto usa o {CruiseControl, http://cruisecontrol.sourceforge.net/}.
+report.cim.description = Este
\u00e9 o endere\u00e7o para a defini\u00e7\u00e3o de todo o processo de
integra\u00e7\u00e3o cont\u00ednua que compila e testa o c\u00f3digo de forma
frequente e regularmente.
+report.cim.general.intro = Este
projecto usa um sistema de integra\u00e7\u00e3o cont\u00ednua.
+report.cim.hudson.intro= Este
projecto usa o {Hudson, https://hudson.dev.java.net/}.
+report.cim.luntbuild.intro = Este
projecto usa o {Luntbuild, http://luntbuild.javaforge.com/}.
+report.cim.name=
Integra\u00e7\u00e3o Cont\u00ednua
+report.cim.nocim = Nenhum
sistema de integra\u00e7\u00e3o cont\u00ednua foi definido. Por favor verifique
novamente numa data futura.
+report.cim.notifiers.column.address=
Endere\u00e7o
+report.cim.notifiers.column.configuration =
Configura\u00e7\u00e3o
+report.cim.notifiers.column.type = Tipo
+report.cim.notifiers.intro =
Configura\u00e7\u00e3o para a notifica\u00e7\u00e3o de
programadores/utilizadores de quando o build n\u00e3o tem sucesso, incluindo
informa\u00e7\u00f5es dos utilizadores e modo de notifica\u00e7\u00e3o.
+report.cim.notifiers.nolist= Nenhuma
notifica\u00e7\u00e3o foi definida. P
svn commit: r692642 - /maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
Author: dennisl Date: Sat Sep 6 05:25:41 2008 New Revision: 692642 URL: http://svn.apache.org/viewvc?rev=692642&view=rev Log: [MSITE-351] New language - Portuguese (Portugal) Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml?rev=692642&r1=692641&r2=692642&view=diff == --- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Sat Sep 6 05:25:41 2008 @@ -127,7 +127,7 @@ org.apache.maven.shared maven-doxia-tools - 1.0.1 + 1.0.2-SNAPSHOT org.apache.maven.shared
svn commit: r692643 - in /maven/plugins/trunk/maven-site-plugin: pom.xml src/main/resources/site-plugin_pt.properties src/site/xdoc/i18n.xml
Author: dennisl Date: Sat Sep 6 05:30:17 2008 New Revision: 692643 URL: http://svn.apache.org/viewvc?rev=692643&view=rev Log: [MSITE-351] New language - Portuguese (Portugal) Submitted by: Samuel Santos Reviewed by: Dennis Lundberg Added: maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_pt.properties (with props) Modified: maven/plugins/trunk/maven-site-plugin/pom.xml maven/plugins/trunk/maven-site-plugin/src/site/xdoc/i18n.xml Modified: maven/plugins/trunk/maven-site-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=692643&r1=692642&r2=692643&view=diff == --- maven/plugins/trunk/maven-site-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-site-plugin/pom.xml Sat Sep 6 05:30:17 2008 @@ -139,6 +139,13 @@ Danish translator + + Samuel Santos + [EMAIL PROTECTED] + +Portuguese translator + + @@ -188,7 +195,7 @@ org.codehaus.mojo l10n-maven-plugin -1.0-alpha-1 +1.0-alpha-2-SNAPSHOT ca @@ -204,6 +211,7 @@ nl no pl +pt pt_BR sk sv @@ -302,7 +310,7 @@ org.apache.maven.shared maven-doxia-tools - 1.0.1 + 1.0.2-SNAPSHOT Added: maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_pt.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_pt.properties?rev=692643&view=auto == --- maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_pt.properties (added) +++ maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_pt.properties Sat Sep 6 05:30:17 2008 @@ -0,0 +1,26 @@ +# 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. + +report.category.column.description = Descrip\u00e7\u00e3o +report.category.column.document= Documento +report.category.sectionTitle = Vis\u00e3o Geral +report.information.description1= Este documento contem uma vis\u00e3o geral de v\u00e1rios documentos e endere\u00e7os que fazem parte da informa\u00e7\u00e3o geral do projecto. Todo o conte\u00fado foi gerado automaticamente pelo +report.information.description2= em nome do projeto. +report.information.title = Informa\u00e7\u00e3o do Projecto +report.project.description1= Este documento cont\u00e9m uma vis\u00e3o geral dos v\u00e1rios relat\u00f3rios que s\u00e3o automaticamente gerados pelo +report.project.description2= Cada relat\u00f3rio est\u00e1 descrito abaixo. +report.project.title = Relat\u00f3rios Gerados Propchange: maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_pt.properties -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_pt.properties -- svn:keywords = Date Revision Author Id Modified: maven/plugins/trunk/maven-site-plugin/src/site/xdoc/i18n.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/xdoc/i18n.xml?rev=692643&r1=692642&r2=692643&view=diff == --- maven/plugins/trunk/maven-site-plugin/src/site/xdoc/i18n.xml (original) +++ maven/plugins/trunk/maven-site-plugin/src/site/xdoc/i18n.xml Sat Sep 6 05:30:17 2008 @@ -239,6 +239,18 @@ + Portuguese + +http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_pt.properties";>See + + +http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/proj
svn commit: r692645 - /maven/plugins/trunk/maven-site-plugin/src/site/xdoc/i18n.xml
Author: dennisl Date: Sat Sep 6 05:42:46 2008 New Revision: 692645 URL: http://svn.apache.org/viewvc?rev=692645&view=rev Log: [MSITE-287] Clarify/fix documentation about encoding for translated resource bundles. Modified: maven/plugins/trunk/maven-site-plugin/src/site/xdoc/i18n.xml Modified: maven/plugins/trunk/maven-site-plugin/src/site/xdoc/i18n.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/xdoc/i18n.xml?rev=692645&r1=692644&r2=692645&view=diff == --- maven/plugins/trunk/maven-site-plugin/src/site/xdoc/i18n.xml (original) +++ maven/plugins/trunk/maven-site-plugin/src/site/xdoc/i18n.xml Sat Sep 6 05:42:46 2008 @@ -327,11 +327,11 @@ translation for the Maven Site Plugin. - Translate the files contents using your preferred text editor. If - the characters of your language are included in the ISO-8859-1 - character set, then use that encoding for your files. Otherwise - either use Unicode escapes, like "\u8ff0", or save your files with - UTF-8 encoding. + Translate the files contents using your preferred text editor. + The files must use US-ASCII encoding. For characters that are not + included in US-ASCII you must use Unicode escapes, like "\u8ff0". + See the tools section below for examples of tools that can help + you to convert your texts to use Unicode escapes. To test your localization @@ -343,8 +343,8 @@ Include your files in src/main/resources for each one Run "mvn install" for each one Configure a project to produce a site in several locales -Make sure that it is using the latest SNAPSHOT versions of - the above artifacts +Make sure that it is using the latest SNAPSHOT version of + each of the above artifacts Run "mvn site" on that project to test it @@ -376,7 +376,7 @@ http://notepad-plus.sourceforge.net/";>Notepad++, ... - Tools to write a file in a given charset, like UTF-8: + Tools to write a file in a given charset: any editor like Notepad, Eclipse, IntelliJ IDEA, ...
svn commit: r692655 - in /maven/plugins/trunk/maven-site-plugin: pom.xml src/main/java/org/codehaus/
Author: dennisl Date: Sat Sep 6 07:15:00 2008 New Revision: 692655 URL: http://svn.apache.org/viewvc?rev=692655&view=rev Log: [MSITE-242] remove copy of plexus-utils sources from site plugin sources since it is a dependency o This means bumping the prerequisite to Maven 2.0.6. This has already been done in several core plugins. Removed: maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/ Modified: maven/plugins/trunk/maven-site-plugin/pom.xml Modified: maven/plugins/trunk/maven-site-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=692655&r1=692654&r2=692655&view=diff == --- maven/plugins/trunk/maven-site-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-site-plugin/pom.xml Sat Sep 6 07:15:00 2008 @@ -35,7 +35,7 @@ -2.0.2 +2.0.6 @@ -230,37 +230,37 @@ org.apache.maven maven-artifact - 2.0.2 + 2.0.6 org.apache.maven maven-artifact-manager - 2.0.2 + 2.0.6 org.apache.maven maven-model - 2.0.2 + 2.0.6 org.apache.maven maven-plugin-api - 2.0 + 2.0.6 org.apache.maven maven-project - 2.0 + 2.0.6 org.apache.maven maven-settings - 2.0 + 2.0.6 org.apache.maven.reporting maven-reporting-api - 2.0.4 + 2.0.6
svn commit: r692686 - in /maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr: AbstractJxrReport.java JxrReportUtil.java
Author: hboutemy
Date: Sat Sep 6 10:13:41 2008
New Revision: 692686
URL: http://svn.apache.org/viewvc?rev=692686&view=rev
Log:
fixed typos in javadocs
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
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=692686&r1=692685&r2=692686&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
Sat Sep 6 10:13:41 2008
@@ -112,7 +112,7 @@
/**
* Directory where Velocity templates can be found to generate overviews,
* frames and summaries.
- * Should not be used. If used, should be an absolute path, like
"${basedir}/myTemplates".
+ * Should not be used. If used, should be an absolute path, like
"${basedir}/myTemplates".
*
* @parameter default-value="templates"
*/
@@ -120,7 +120,7 @@
/**
* Style sheet used for the Xref HTML files.
- * Should not be used. If used, should be an absolute path, like
"${basedir}/myStyles.css".
+ * Should not be used. If used, should be an absolute path, like
"${basedir}/myStyles.css".
*
* @parameter default-value="stylesheet.css"
*/
@@ -210,7 +210,7 @@
* Checks whether the given directory contains Java files.
*
* @param dir the source directory
- * @return true if the folder or one of its subfolders coantins at least 1
Java file
+ * @return true if the folder or one of its subfolders contains at least 1
Java file
*/
private boolean hasSources( File dir )
{
@@ -383,7 +383,7 @@
* Returns the correct resource bundle according to the locale
*
* @param locale the locale of the user
- * @return the bundle correponding to the locale
+ * @return the bundle corresponding to the locale
*/
protected ResourceBundle getBundle( Locale locale )
{
@@ -474,7 +474,7 @@
}
/**
- * @return a String that contains the loaction of the javadocs
+ * @return a String that contains the location of the javadocs
*/
private String getJavadocLocation()
throws IOException
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=692686&r1=692685&r2=692686&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
Sat Sep 6 10:13:41 2008
@@ -147,7 +147,7 @@
}
/**
- * Generates the site structure using the project hiearchy (project and
its modules) or using the
+ * Generates the site structure using the project hierarchy (project and
its modules) or using the
* distributionManagement elements from the pom.xml.
*
* @todo come from site plugin!
svn commit: r692690 - in /maven/archetype/trunk: ./ archetype-common/ archetype-packaging/ archetype-plugin/ archetype-testing/archetype-proxy/ archetype-testing/archetype-repository/
Author: rafale Date: Sat Sep 6 10:30:36 2008 New Revision: 692690 URL: http://svn.apache.org/viewvc?rev=692690&view=rev Log: removing IDE specific files Removed: maven/archetype/trunk/archetype-common/archetype-common.iml maven/archetype/trunk/archetype-packaging/archetype-packaging.iml maven/archetype/trunk/archetype-plugin/maven-archetype-plugin.iml maven/archetype/trunk/archetype-testing/archetype-proxy/archetype-proxy.iml maven/archetype/trunk/archetype-testing/archetype-repository/archetype-repository.iml maven/archetype/trunk/maven-archetype.iml
svn commit: r692692 - in /maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr: DirectoryIndexer.java JXR.java JavaCodeTransform.java JxrException.java pacman/JavaFile.java
Author: hboutemy
Date: Sat Sep 6 10:34:46 2008
New Revision: 692692
URL: http://svn.apache.org/viewvc?rev=692692&view=rev
Log:
improved javadoc and fixed typos
Modified:
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/DirectoryIndexer.java
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JXR.java
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JxrException.java
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/JavaFile.java
Modified:
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/DirectoryIndexer.java
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/DirectoryIndexer.java?rev=692692&r1=692691&r2=692692&view=diff
==
---
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/DirectoryIndexer.java
(original)
+++
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/DirectoryIndexer.java
Sat Sep 6 10:34:46 2008
@@ -40,20 +40,22 @@
/**
* This class creates the navigational pages for jxr's cross-referenced source
- * files. The navigation is inspired by javadoc, so it should have a familiar
feel.
+ * files. The navigation is inspired by javadoc, so it should have a familiar
feel.
*
* Creates the following files:
*
- * index.htmlmain index containing the frameset
- * overview-frame.html list of the project's packages (top
left)
- * allclasses-frame.html list of all classes in the project
(bottom left)
- * overview-summary.html top-level listing of the project's packages (main
frame)
+ * index.htmlmain index containing the
frameset
+ * overview-frame.html list of the project's packages
(top left)
+ * allclasses-frame.html list of all classes in the project
(bottom left)
+ * overview-summary.html top-level listing of the project's
packages (main frame)
*
- *
+ *
* Package specific:
- * package-summary.html listing of all classes in this package(main
frame)
- * package-frame.html listing of all classes in this package(bottom
left)
+ *
+ * package-summary.html listing of all classes in this
package(main frame)
+ * package-frame.html listing of all classes in this
package(bottom left)
*
+ *
*
*
* @author mailto:[EMAIL PROTECTED]">Fabrice Bellingard
@@ -258,7 +260,7 @@
File templateDirFile = new File( getTemplateDir() );
if ( templateDirFile.isAbsolute() )
{
-// the property has been overriden: need to use a
FileResourceLoader
+// the property has been overridden: need to use a
FileResourceLoader
engine.setProperty( "resource.loader", "file" );
engine.setProperty( "file.resource.loader.class",
"org.apache.velocity.runtime.resource.loader.FileResourceLoader" );
Modified: maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JXR.java
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JXR.java?rev=692692&r1=692691&r2=692692&view=diff
==
--- maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JXR.java
(original)
+++ maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JXR.java Sat
Sep 6 10:34:46 2008
@@ -322,7 +322,7 @@
* Given a source file transform it into HTML and write it to the
* destination (dest) file.
*
- * @param source The jave source file
+ * @param source The java source file
* @param dest The directory to put the HTML into
* @throws IOException Thrown if the transform can't happen for some
reason.
*/
@@ -340,14 +340,14 @@
* Creates a relative link from one directory to another.
*
* Example:
- * given /foo/bar/baz/oink
- * and /foo/bar/schmoo
+ * given /foo/bar/baz/oink
+ * and /foo/bar/schmoo
*
- * this method will return a string of "../../schmoo/"
+ * this method will return a string of "../../schmoo/"
*
* @param fromDir The directory from which the link is relative.
* @param toDir The directory into which the link points.
- * @return a string of format "../../schmoo/"
+ * @return a String of format "../../schmoo/"
* @throws java.io.IOException If a problem is encountered while
navigating through the directories.
*/
private static String getRelativeLink( String fromDir, String toDir )
Modified:
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java?rev=692692&r1=692691&r2=692692&view=diff
=
svn commit: r692710 - /maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanMojo.java
Author: bentmann
Date: Sat Sep 6 12:10:53 2008
New Revision: 692710
URL: http://svn.apache.org/viewvc?rev=692710&view=rev
Log:
o Polished javadocs/annotations
Modified:
maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanMojo.java
Modified:
maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanMojo.java?rev=692710&r1=692709&r2=692710&view=diff
==
---
maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanMojo.java
(original)
+++
maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanMojo.java
Sat Sep 6 12:10:53 2008
@@ -54,9 +54,9 @@
extends AbstractMojo
{
/**
- * The Maven Project Object
+ * The Maven Project Object.
*
- * @parameter expression="${project}"
+ * @parameter default-value="${project}"
* @required
* @readonly
* @since 2.2
@@ -66,7 +66,7 @@
/**
* This is where build results go.
*
- * @parameter expression="${project.build.directory}"
+ * @parameter default-value="${project.build.directory}"
* @required
* @readonly
*/
@@ -75,7 +75,7 @@
/**
* This is where compiled classes go.
*
- * @parameter expression="${project.build.outputDirectory}"
+ * @parameter default-value="${project.build.outputDirectory}"
* @required
* @readonly
*/
@@ -84,7 +84,7 @@
/**
* This is where compiled test classes go.
*
- * @parameter expression="${project.build.testOutputDirectory}"
+ * @parameter default-value="${project.build.testOutputDirectory}"
* @required
* @readonly
*/
@@ -93,7 +93,7 @@
/**
* This is where the site plugin generates its pages.
*
- * @parameter expression="${project.reporting.outputDirectory}"
+ * @parameter default-value="${project.reporting.outputDirectory}"
* @required
* @readonly
* @since 2.1.1
@@ -110,7 +110,7 @@
private Boolean verbose;
/**
- * The list of fileSets to delete, in addition to the default directories.
+ * The list of file sets to delete, in addition to the default directories.
*
* @parameter
* @since 2.1
@@ -118,7 +118,7 @@
private List filesets;
/**
- * Sets whether the plugin should follow Symbolic Links to delete files.
+ * Sets whether the plugin should follow symbolic links to delete files.
*
* @parameter expression="${clean.followSymLinks}" default-value="false"
* @since 2.1
@@ -134,7 +134,7 @@
private FileSetManager fileSetManager;
/**
- * Disable the plugin execution.
+ * Disables the plugin execution.
*
* @parameter expression="${clean.skip}" default-value="false"
* @since 2.2
svn commit: r692711 - /maven/plugins/trunk/maven-clean-plugin/pom.xml
Author: bentmann Date: Sat Sep 6 12:20:02 2008 New Revision: 692711 URL: http://svn.apache.org/viewvc?rev=692711&view=rev Log: [MCLEAN-34] NPE when forcing delete of directory [MCLEAN-35] Upgrade plexus-utils to a new version o Updated to plexus-utils:1.5.6 o Bumped Maven prerequisite to 2.0.6 Modified: maven/plugins/trunk/maven-clean-plugin/pom.xml Modified: maven/plugins/trunk/maven-clean-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/pom.xml?rev=692711&r1=692710&r2=692711&view=diff == --- maven/plugins/trunk/maven-clean-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-clean-plugin/pom.xml Sat Sep 6 12:20:02 2008 @@ -44,7 +44,7 @@ -2.0 +2.0.6 @@ -61,12 +61,12 @@ org.apache.maven maven-project - 2.0 + 2.0.6 org.apache.maven maven-plugin-api - 2.0 + 2.0.6 org.apache.maven.shared @@ -76,7 +76,7 @@ org.codehaus.plexus plexus-utils - 1.1 + 1.5.6
svn commit: r692713 - in /maven/plugins/trunk/maven-clean-plugin/src: it/exclude-default-dirs/ it/exclude-default-dirs/delete-me/ it/exclude-default-dirs/target/ it/exclude-default-dirs/target/classes
Author: bentmann Date: Sat Sep 6 12:41:56 2008 New Revision: 692713 URL: http://svn.apache.org/viewvc?rev=692713&view=rev Log: [MCLEAN-33] Cannot Supress Default clean while still cleaning Added: maven/plugins/trunk/maven-clean-plugin/src/it/exclude-default-dirs/ maven/plugins/trunk/maven-clean-plugin/src/it/exclude-default-dirs/delete-me/ maven/plugins/trunk/maven-clean-plugin/src/it/exclude-default-dirs/pom.xml (with props) maven/plugins/trunk/maven-clean-plugin/src/it/exclude-default-dirs/target/ maven/plugins/trunk/maven-clean-plugin/src/it/exclude-default-dirs/target/classes/ maven/plugins/trunk/maven-clean-plugin/src/it/exclude-default-dirs/target/classes/main.properties (with props) maven/plugins/trunk/maven-clean-plugin/src/it/exclude-default-dirs/target/site/ maven/plugins/trunk/maven-clean-plugin/src/it/exclude-default-dirs/target/site/index.html (with props) maven/plugins/trunk/maven-clean-plugin/src/it/exclude-default-dirs/target/test-1.0-SNAPSHOT.jar (with props) maven/plugins/trunk/maven-clean-plugin/src/it/exclude-default-dirs/target/test-classes/ maven/plugins/trunk/maven-clean-plugin/src/it/exclude-default-dirs/target/test-classes/test.properties (with props) maven/plugins/trunk/maven-clean-plugin/src/it/exclude-default-dirs/verify.bsh (with props) Modified: maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanMojo.java Added: maven/plugins/trunk/maven-clean-plugin/src/it/exclude-default-dirs/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/it/exclude-default-dirs/pom.xml?rev=692713&view=auto == --- maven/plugins/trunk/maven-clean-plugin/src/it/exclude-default-dirs/pom.xml (added) +++ maven/plugins/trunk/maven-clean-plugin/src/it/exclude-default-dirs/pom.xml Sat Sep 6 12:41:56 2008 @@ -0,0 +1,55 @@ + + + + +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";> + 4.0.0 + + test + exclude-default-dirs + 1.0-SNAPSHOT + + Check for exclusion of default directories from cleaning if requested. + + +UTF-8 + + + + + +org.apache.maven.plugins +maven-clean-plugin +@pom.version@ + + true + + + delete-me + + + + + + + + Propchange: maven/plugins/trunk/maven-clean-plugin/src/it/exclude-default-dirs/pom.xml -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-clean-plugin/src/it/exclude-default-dirs/pom.xml -- svn:keywords = Author Date Id Revision Added: maven/plugins/trunk/maven-clean-plugin/src/it/exclude-default-dirs/target/classes/main.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/it/exclude-default-dirs/target/classes/main.properties?rev=692713&view=auto == (empty) Propchange: maven/plugins/trunk/maven-clean-plugin/src/it/exclude-default-dirs/target/classes/main.properties -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-clean-plugin/src/it/exclude-default-dirs/target/classes/main.properties -- svn:keywords = Author Date Id Revision Added: maven/plugins/trunk/maven-clean-plugin/src/it/exclude-default-dirs/target/site/index.html URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/it/exclude-default-dirs/target/site/index.html?rev=692713&view=auto == (empty) Propchange: maven/plugins/trunk/maven-clean-plugin/src/it/exclude-default-dirs/target/site/index.html -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-clean-plugin/src/it/exclude-default-dirs/target/site/index.html -- svn:keywords = Author Date Id Revision Added: maven/plugins/trunk/maven-clean-plugin/src/it/exclude-default-dirs/target/test-1.0-SNAPSHOT.jar URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/it/exclude-default-dirs/target/test-1.0-SNAPSHOT.jar?rev=692713&view=auto == Binary file - no diff available. Propchange: maven/plugins/trunk/maven-clean-plugi
svn commit: r692716 - in /maven/plugins/trunk/maven-resources-plugin/src/it/filter-test-resources: ./ pom.xml src/main/ src/test/ verify.bsh
Author: olamy
Date: Sat Sep 6 12:51:31 2008
New Revision: 692716
URL: http://svn.apache.org/viewvc?rev=692716&view=rev
Log:
adding it for test resources filtering
Added:
maven/plugins/trunk/maven-resources-plugin/src/it/filter-test-resources/
(props changed)
- copied from r692535,
maven/plugins/trunk/maven-resources-plugin/src/it/filter/
maven/plugins/trunk/maven-resources-plugin/src/it/filter-test-resources/pom.xml
- copied, changed from r692561,
maven/plugins/trunk/maven-resources-plugin/src/it/filter/pom.xml
maven/plugins/trunk/maven-resources-plugin/src/it/filter-test-resources/src/test/
(props changed)
- copied from r692535,
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/
maven/plugins/trunk/maven-resources-plugin/src/it/filter-test-resources/verify.bsh
- copied, changed from r692561,
maven/plugins/trunk/maven-resources-plugin/src/it/filter/verify.bsh
Removed:
maven/plugins/trunk/maven-resources-plugin/src/it/filter-test-resources/src/main/
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/it/filter-test-resources/
--
--- svn:ignore (added)
+++ svn:ignore Sat Sep 6 12:51:31 2008
@@ -0,0 +1 @@
+target
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/it/filter-test-resources/
--
svn:mergeinfo =
Copied:
maven/plugins/trunk/maven-resources-plugin/src/it/filter-test-resources/pom.xml
(from r692561, maven/plugins/trunk/maven-resources-plugin/src/it/filter/pom.xml)
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/filter-test-resources/pom.xml?p2=maven/plugins/trunk/maven-resources-plugin/src/it/filter-test-resources/pom.xml&p1=maven/plugins/trunk/maven-resources-plugin/src/it/filter/pom.xml&r1=692561&r2=692716&rev=692716&view=diff
==
--- maven/plugins/trunk/maven-resources-plugin/src/it/filter/pom.xml (original)
+++
maven/plugins/trunk/maven-resources-plugin/src/it/filter-test-resources/pom.xml
Sat Sep 6 12:51:31 2008
@@ -27,14 +27,14 @@
1.0-SNAPSHOT
-
-
-src/main/resources
-true
-
-
+
+
+src/test/resources
+true
+
+
- src/main/filters/my.filter
+ src/test/filters/my.filter
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/it/filter-test-resources/src/test/
--
svn:mergeinfo =
Copied:
maven/plugins/trunk/maven-resources-plugin/src/it/filter-test-resources/verify.bsh
(from r692561,
maven/plugins/trunk/maven-resources-plugin/src/it/filter/verify.bsh)
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/filter-test-resources/verify.bsh?p2=maven/plugins/trunk/maven-resources-plugin/src/it/filter-test-resources/verify.bsh&p1=maven/plugins/trunk/maven-resources-plugin/src/it/filter/verify.bsh&r1=692561&r2=692716&rev=692716&view=diff
==
--- maven/plugins/trunk/maven-resources-plugin/src/it/filter/verify.bsh
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/it/filter-test-resources/verify.bsh
Sat Sep 6 12:51:31 2008
@@ -33,7 +33,7 @@
return false;
}
-File someResource = new File( target, "/classes/SomeResource.txt" );
+File someResource = new File( target, "/test-classes/SomeResource.txt" );
if ( !someResource.exists() || someResource.isDirectory() )
{
System.err.println( "SomeResource.txt is missing or not a file." );
svn commit: r692719 - in /maven/plugins/trunk/maven-clean-plugin/src/site/apt: examples/delete_additional_files.apt examples/ignoring-errors.apt examples/skipping-clean.apt usage.apt
Author: bentmann Date: Sat Sep 6 12:56:17 2008 New Revision: 692719 URL: http://svn.apache.org/viewvc?rev=692719&view=rev Log: o Polished docs Modified: maven/plugins/trunk/maven-clean-plugin/src/site/apt/examples/delete_additional_files.apt maven/plugins/trunk/maven-clean-plugin/src/site/apt/examples/ignoring-errors.apt maven/plugins/trunk/maven-clean-plugin/src/site/apt/examples/skipping-clean.apt maven/plugins/trunk/maven-clean-plugin/src/site/apt/usage.apt Modified: maven/plugins/trunk/maven-clean-plugin/src/site/apt/examples/delete_additional_files.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/site/apt/examples/delete_additional_files.apt?rev=692719&r1=692718&r2=692719&view=diff == --- maven/plugins/trunk/maven-clean-plugin/src/site/apt/examples/delete_additional_files.apt (original) +++ maven/plugins/trunk/maven-clean-plugin/src/site/apt/examples/delete_additional_files.apt Sat Sep 6 12:56:17 2008 @@ -29,7 +29,7 @@ Delete Additional Files Not Exposed to Maven - The <<>> will delete the <<>> directory by default. You may configure + The Maven Clean Plugin will delete the <<>> directory by default. You may configure it to delete additional directories and files. The following example shows how: + @@ -37,6 +37,7 @@ [...] maven-clean-plugin +2.2 Modified: maven/plugins/trunk/maven-clean-plugin/src/site/apt/examples/ignoring-errors.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/site/apt/examples/ignoring-errors.apt?rev=692719&r1=692718&r2=692719&view=diff == --- maven/plugins/trunk/maven-clean-plugin/src/site/apt/examples/ignoring-errors.apt (original) +++ maven/plugins/trunk/maven-clean-plugin/src/site/apt/examples/ignoring-errors.apt Sat Sep 6 12:56:17 2008 @@ -28,13 +28,14 @@ Ignoring Clean Errors - To ignore errors when running the cleanup for a particular project, set the <<>> property to false. + To ignore errors when running the cleanup for a particular project, set the <<>> property to <<>>. + [...] maven-clean-plugin + 2.2 false Modified: maven/plugins/trunk/maven-clean-plugin/src/site/apt/examples/skipping-clean.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/site/apt/examples/skipping-clean.apt?rev=692719&r1=692718&r2=692719&view=diff == --- maven/plugins/trunk/maven-clean-plugin/src/site/apt/examples/skipping-clean.apt (original) +++ maven/plugins/trunk/maven-clean-plugin/src/site/apt/examples/skipping-clean.apt Sat Sep 6 12:56:17 2008 @@ -28,13 +28,14 @@ Skipping Clean - To skip running the cleanup for a particular project, set the <<>> property to true. + To skip running the cleanup for a particular project, set the <<>> property to <<>>. + [...] maven-clean-plugin + 2.2 true Modified: maven/plugins/trunk/maven-clean-plugin/src/site/apt/usage.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/site/apt/usage.apt?rev=692719&r1=692718&r2=692719&view=diff == --- maven/plugins/trunk/maven-clean-plugin/src/site/apt/usage.apt (original) +++ maven/plugins/trunk/maven-clean-plugin/src/site/apt/usage.apt Sat Sep 6 12:56:17 2008 @@ -25,27 +25,27 @@ ~~ NOTE: For help with the syntax of this file, see: ~~ http://maven.apache.org/doxia/references/apt-format.html -Introduction +Usage The Maven Clean Plugin, as the name implies, attempts to clean the files and - directories generated by maven during its build. While there are plugins - that generate additional files, the clean plugin assumes that these files are + directories generated by Maven during its build. While there are plugins + that generate additional files, the Clean Plugin assumes that these files are generated inside the <<>> directory. -* Cleaning a maven project using the command-line +* Cleaning a Maven project using the command-line - The clean plugin can be called to execute in the command-line without any - additional configurations. Like the other plugins, to run the clean plugin, + The Clean Plugin can be called to execute in the command-line without any + additional configurations. Like the other plugins, to run the Clean Plugin, you use: +- mvn clean:clean +- - where the first <> refers to the plugin's alias, and the second - <<>> refers to a plugin goal, which is clean. + where the first <<>> refers to the plugin's alias, and the second + <<>> refers to the plugin goal. - However, the clean plugin is a
svn commit: r692725 - in /maven/plugins/trunk/maven-clean-plugin/src/it/dangling-symlinks: ./ pom.xml setup.bsh target/ target/link-target.txt verify.bsh
Author: bentmann
Date: Sat Sep 6 13:21:37 2008
New Revision: 692725
URL: http://svn.apache.org/viewvc?rev=692725&view=rev
Log:
[MCLEAN-28] maven-clean-plugin doesn't delete directories with symlinks in them
o Added integration test to prove incorporation of fix from PLXUTILS-28 in
r692711
Added:
maven/plugins/trunk/maven-clean-plugin/src/it/dangling-symlinks/
maven/plugins/trunk/maven-clean-plugin/src/it/dangling-symlinks/pom.xml
(with props)
maven/plugins/trunk/maven-clean-plugin/src/it/dangling-symlinks/setup.bsh
(with props)
maven/plugins/trunk/maven-clean-plugin/src/it/dangling-symlinks/target/
maven/plugins/trunk/maven-clean-plugin/src/it/dangling-symlinks/target/link-target.txt
(with props)
maven/plugins/trunk/maven-clean-plugin/src/it/dangling-symlinks/verify.bsh
(with props)
Added: maven/plugins/trunk/maven-clean-plugin/src/it/dangling-symlinks/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/it/dangling-symlinks/pom.xml?rev=692725&view=auto
==
--- maven/plugins/trunk/maven-clean-plugin/src/it/dangling-symlinks/pom.xml
(added)
+++ maven/plugins/trunk/maven-clean-plugin/src/it/dangling-symlinks/pom.xml Sat
Sep 6 13:21:37 2008
@@ -0,0 +1,47 @@
+
+
+
+
+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";>
+ 4.0.0
+
+ test
+ dangling-symlinks
+ 1.0-SNAPSHOT
+
+ Check for proper cleaning of dangling symlinks.
+
+
+UTF-8
+
+
+
+
+
+org.apache.maven.plugins
+maven-clean-plugin
+@pom.version@
+
+
+
+
+
Propchange:
maven/plugins/trunk/maven-clean-plugin/src/it/dangling-symlinks/pom.xml
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-clean-plugin/src/it/dangling-symlinks/pom.xml
--
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-clean-plugin/src/it/dangling-symlinks/setup.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/it/dangling-symlinks/setup.bsh?rev=692725&view=auto
==
--- maven/plugins/trunk/maven-clean-plugin/src/it/dangling-symlinks/setup.bsh
(added)
+++ maven/plugins/trunk/maven-clean-plugin/src/it/dangling-symlinks/setup.bsh
Sat Sep 6 13:21:37 2008
@@ -0,0 +1,43 @@
+import java.io.*;
+import java.util.*;
+import java.util.jar.*;
+import java.util.regex.*;
+
+boolean createSymlink( File link, File target )
+{
+try
+{
+String[] args = { "ln", "-s", target.getAbsolutePath(),
link.getAbsolutePath() };
+Process process = Runtime.getRuntime().exec( args );
+process.waitFor();
+return 0 == process.exitValue();
+}
+catch ( Exception e )
+{
+// assume platform does not support "ln" command, test should be
skipped
+return false;
+}
+}
+
+try
+{
+File targetDir = new File( basedir, "target" );
+File link = new File( targetDir, "link" );
+File target = new File( targetDir, "link-target.txt" );
+
+System.out.println( "Creating symlink " + link + " -> " + target );
+if ( !createSymlink( link, target ) )
+{
+System.out.println( "FAILURE, platform does not support symlinks,
skipping test." );
+}
+
+System.out.println( "Deleting symlink target " + target );
+target.delete();
+}
+catch( Throwable t )
+{
+t.printStackTrace();
+return false;
+}
+
+return true;
Propchange:
maven/plugins/trunk/maven-clean-plugin/src/it/dangling-symlinks/setup.bsh
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-clean-plugin/src/it/dangling-symlinks/setup.bsh
--
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-clean-plugin/src/it/dangling-symlinks/target/link-target.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/it/dangling-symlinks/target/link-target.txt?rev=692725&view=auto
==
(empty)
Propchange:
maven/plugins/trunk/maven-clean-plugin/src/it/dangling-symlinks/target/link-target.txt
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-clean-plugin/src/it/dangling-symlinks/target/link-target.txt
--
svn:keywords = Author Date Id Revision
Added:
ma
svn commit: r692731 - in /maven/jxr/trunk: ./ maven-jxr-plugin/ maven-jxr/
Author: hboutemy Date: Sat Sep 6 13:42:24 2008 New Revision: 692731 URL: http://svn.apache.org/viewvc?rev=692731&view=rev Log: ignore Eclipse .settings files Modified: maven/jxr/trunk/ (props changed) maven/jxr/trunk/maven-jxr/ (props changed) maven/jxr/trunk/maven-jxr-plugin/ (props changed) Propchange: maven/jxr/trunk/ -- --- svn:ignore (original) +++ svn:ignore Sat Sep 6 13:42:24 2008 @@ -4,3 +4,5 @@ target .classpath .project +.settings + Propchange: maven/jxr/trunk/maven-jxr/ -- --- svn:ignore (original) +++ svn:ignore Sat Sep 6 13:42:24 2008 @@ -5,4 +5,5 @@ cobertura.ser .classpath .project +.settings bin Propchange: maven/jxr/trunk/maven-jxr-plugin/ -- --- svn:ignore (original) +++ svn:ignore Sat Sep 6 13:42:24 2008 @@ -4,4 +4,5 @@ *.iws .classpath .project +.settings bin
svn commit: r692732 - /maven/sandbox/trunk/jxr/maven-jxr/
Author: hboutemy Date: Sat Sep 6 13:46:27 2008 New Revision: 692732 URL: http://svn.apache.org/viewvc?rev=692732&view=rev Log: ignore Eclipse project files Modified: maven/sandbox/trunk/jxr/maven-jxr/ (props changed) Propchange: maven/sandbox/trunk/jxr/maven-jxr/ -- --- svn:ignore (original) +++ svn:ignore Sat Sep 6 13:46:27 2008 @@ -2,3 +2,6 @@ maven-jxr.ipr maven-jxr.iws target +.classpath +.project +.settings
svn commit: r692742 - in /maven/shared/trunk/maven-filtering/src: main/java/org/apache/maven/shared/filtering/ test/java/org/apache/maven/shared/filtering/ test/units-files/maven-resources-filtering/
Author: olamy
Date: Sat Sep 6 14:27:37 2008
New Revision: 692742
URL: http://svn.apache.org/viewvc?rev=692742&view=rev
Log:
[MSHARED-60] Filtering ${foo.file} evaluates to in full path to pom.xml
Modified:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenProjectValueSource.java
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
maven/shared/trunk/maven-filtering/src/test/units-files/maven-resources-filtering/maven-resources-filtering.txt
Modified:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenProjectValueSource.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenProjectValueSource.java?rev=692742&r1=692741&r2=692742&view=diff
==
---
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenProjectValueSource.java
(original)
+++
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenProjectValueSource.java
Sat Sep 6 14:27:37 2008
@@ -39,6 +39,8 @@
private MavenProject project;
private boolean escapedBackslashesInFilePath;
+
+private MavenResourcesExecution mavenResourcesExecution;
public MavenProjectValueSource( MavenProject mavenProject )
{
@@ -47,13 +49,24 @@
public MavenProjectValueSource( MavenProject mavenProject, boolean
escapedBackslashesInFilePath )
{
- super();
project = mavenProject;
this.escapedBackslashesInFilePath = escapedBackslashesInFilePath;
}
+
+public MavenProjectValueSource( MavenProject mavenProject, boolean
escapedBackslashesInFilePath,
+MavenResourcesExecution
mavenResourcesExecution )
+{
+super();
+
+project = mavenProject;
+
+this.escapedBackslashesInFilePath = escapedBackslashesInFilePath;
+
+this.mavenResourcesExecution = mavenResourcesExecution;
+}
public Object getValue( String expression )
{
@@ -65,7 +78,7 @@
Object value = null;
try
{
-value = ReflectionValueExtractor.evaluate( "" + expression,
project );
+value = ReflectionValueExtractor.evaluate( "" + expression,
project, IsProjectExpression( expression ) );
if ( escapedBackslashesInFilePath && value != null
&& "java.lang.String".equals( value.getClass().getName() ) )
@@ -87,4 +100,18 @@
}
return value;
}
+
+private boolean IsProjectExpression( String key )
+{
+if ( StringUtils.isEmpty( key ) )
+{
+return false;
+}
+if ( mavenResourcesExecution != null )
+{
+return
mavenResourcesExecution.getProjectStartExpressions().contains( key );
+}
+// we use default values here
+return ( key.startsWith( "project." ) || key.startsWith( "pom." ) );
+}
}
Modified:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java?rev=692742&r1=692741&r2=692742&view=diff
==
---
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java
(original)
+++
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java
Sat Sep 6 14:27:37 2008
@@ -62,10 +62,18 @@
private boolean useDefaultFilterWrappers = false;
+/**
+ * List of String considered as expressions which contains values in the
project/pom : pom project
+ * default value will be pom and project.
+ *
+ */
+private List projectStartExpressions = new ArrayList();
+
public MavenResourcesExecution()
{
-// nothing here just add an empty constructor for java bean convention
+projectStartExpressions.add( "pom" );
+projectStartExpressions.add( "project" );
}
/**
@@ -81,6 +89,7 @@
public MavenResourcesExecution( List resources, File outputDirectory,
MavenProject mavenProject, String encoding,
List fileFilters, List
nonFilteredFileExtensions, MavenSession mavenSession )
{
+this();
this.resources = resources;
this.outputDirectory = outputDirectory;
this.mavenProject = mavenProject;
@@ -95,6 +104,7 @@
public MavenResourcesExecution( List resource
svn commit: r692743 - in /maven/plugins/trunk/maven-war-plugin: pom.xml src/it/MWAR-133/pom.xml src/it/MWAR-133/src/main/webresources/filtered.properties src/it/MWAR-133/verify.bsh
Author: olamy
Date: Sat Sep 6 14:37:22 2008
New Revision: 692743
URL: http://svn.apache.org/viewvc?rev=692743&view=rev
Log:
[MWAR-133] Filtering issue: wrong replacement of properties by values from
MavenProject object
upgrade to last maven-filtering component.
Fix the it which didn't really test the issue :-)
Modified:
maven/plugins/trunk/maven-war-plugin/pom.xml
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/pom.xml
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/src/main/webresources/filtered.properties
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/verify.bsh
Modified: maven/plugins/trunk/maven-war-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=692743&r1=692742&r2=692743&view=diff
==
--- maven/plugins/trunk/maven-war-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/pom.xml Sat Sep 6 14:37:22 2008
@@ -110,7 +110,7 @@
org.apache.maven.shared
maven-filtering
- 1.0-beta-1
+ 1.0-beta-2-SNAPSHOT
Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/pom.xml?rev=692743&r1=692742&r2=692743&view=diff
==
--- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/pom.xml Sat Sep 6
14:37:22 2008
@@ -26,9 +26,6 @@
MWAR-133 Maven Webapp
MWAR-133 it
-
-2.0
-
Modified:
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/src/main/webresources/filtered.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/src/main/webresources/filtered.properties?rev=692743&r1=692742&r2=692743&view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/src/main/webresources/filtered.properties
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/src/main/webresources/filtered.properties
Sat Sep 6 14:37:22 2008
@@ -1,4 +1,4 @@
#
-# Replaced with the version in the pom
+# Not Replaced with the pom version
#
app.version=${node.version}
\ No newline at end of file
Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/verify.bsh?rev=692743&r1=692742&r2=692743&view=diff
==
--- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/verify.bsh (original)
+++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/verify.bsh Sat Sep 6
14:37:22 2008
@@ -50,7 +50,7 @@
String paramContent = IOUtil.toString ( fis );
-int indexOf = paramContent.indexOf( "app.version=2.0" );
+int indexOf = paramContent.indexOf( "app.version=${node.version}" );
if ( indexOf < 0)
{
System.err.println( "filtered.properties was not filtered with the
value of ${node.version}" );
svn commit: r692744 - in /maven/plugins/trunk/maven-resources-plugin: ./ src/it/MRESOURCES-20/ src/it/MRESOURCES-20/src/ src/it/MRESOURCES-20/src/main/ src/it/MRESOURCES-20/src/main/resources/
Author: olamy
Date: Sat Sep 6 14:43:59 2008
New Revision: 692744
URL: http://svn.apache.org/viewvc?rev=692744&view=rev
Log:
[MRESOURCES-20] Filtering ${foo.file} evaluates to in full path to pom.xml
Added:
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-20/
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-20/pom.xml
(with props)
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-20/src/
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-20/src/main/
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-20/src/main/resources/
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-20/src/main/resources/resource.txt
(with props)
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-20/verify.bsh
(with props)
Modified:
maven/plugins/trunk/maven-resources-plugin/pom.xml
Modified: maven/plugins/trunk/maven-resources-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/pom.xml?rev=692744&r1=692743&r2=692744&view=diff
==
--- maven/plugins/trunk/maven-resources-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-resources-plugin/pom.xml Sat Sep 6 14:43:59 2008
@@ -76,7 +76,7 @@
org.apache.maven.shared
maven-filtering
- 1.0-beta-1
+ 1.0-beta-2-SNAPSHOT
Added: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-20/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-20/pom.xml?rev=692744&view=auto
==
--- maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-20/pom.xml
(added)
+++ maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-20/pom.xml Sat
Sep 6 14:43:59 2008
@@ -0,0 +1,45 @@
+
+
+
+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";>
+ 4.0.0
+
+ org.apache.maven.plugins
+ maven-resources-plugin-it-filter
+ jar
+ 1.0-SNAPSHOT
+
+
+
+
+src/main/resources
+true
+
+
+
+
+
+ maven-resources-plugin
+ @pom.version@
+
+
+
+
+
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-20/pom.xml
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-20/pom.xml
--
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-20/src/main/resources/resource.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-20/src/main/resources/resource.txt?rev=692744&view=auto
==
---
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-20/src/main/resources/resource.txt
(added)
+++
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-20/src/main/resources/resource.txt
Sat Sep 6 14:43:59 2008
@@ -0,0 +1 @@
+fileValue=${foo.file}
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-20/src/main/resources/resource.txt
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-20/src/main/resources/resource.txt
--
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-20/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-20/verify.bsh?rev=692744&view=auto
==
--- maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-20/verify.bsh
(added)
+++ maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-20/verify.bsh
Sat Sep 6 14:43:59 2008
@@ -0,0 +1,61 @@
+
+/*
+ * 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 L
svn commit: r692749 - in /maven/shared/trunk/maven-filtering/src: main/java/org/apache/maven/shared/filtering/ test/java/org/apache/maven/shared/filtering/
Author: olamy
Date: Sat Sep 6 15:13:31 2008
New Revision: 692749
URL: http://svn.apache.org/viewvc?rev=692749&view=rev
Log:
[MSHARED-59] More debug output in maven filtering
Display :
- copying/filtering from to
- all properties collected
- if a file extension can be filtered or not
Modified:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
Modified:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java?rev=692749&r1=692748&r2=692749&view=diff
==
---
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
(original)
+++
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
Sat Sep 6 15:13:31 2008
@@ -34,6 +34,7 @@
import org.codehaus.plexus.interpolation.InterpolatorFilterReader;
import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
import org.codehaus.plexus.interpolation.ValueSource;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
@@ -45,6 +46,7 @@
* role-hint="default"
*/
public class DefaultMavenFileFilter
+extends AbstractLogEnabled
implements MavenFileFilter
{
@@ -60,17 +62,25 @@
public void copyFile( File from, File to, boolean filtering, List
filterWrappers, String encoding )
throws MavenFilteringException
{
-
+
try
{
if ( filtering )
{
+if ( getLogger().isDebugEnabled() )
+{
+getLogger().debug( "filering " + from.getPath() + " to " +
to.getPath() );
+}
FileUtils.FilterWrapper[] wrappers =
(FileUtils.FilterWrapper[]) filterWrappers
.toArray( new
FileUtils.FilterWrapper[filterWrappers.size()] );
FileUtils.copyFile( from, to, encoding, wrappers );
}
else
{
+if ( getLogger().isDebugEnabled() )
+{
+getLogger().debug( "copy " + from.getPath() + " to " +
to.getPath() );
+}
FileUtils.copyFile( from, to, encoding, new
FileUtils.FilterWrapper[0] );
}
}
@@ -124,6 +134,11 @@
List defaultFilterWrappers = new ArrayList( 3 );
+if (getLogger().isDebugEnabled())
+{
+getLogger().debug( "properties used " + filterProperties );
+}
+
final ValueSource propertiesValueSource =
new PropertiesEscapingBackSlashValueSource(
escapedBackslashesInFilePath, filterProperties );
Modified:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java?rev=692749&r1=692748&r2=692749&view=diff
==
---
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
(original)
+++
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
Sat Sep 6 15:13:31 2008
@@ -109,7 +109,15 @@
{
nonFilteredFileExtensions.addAll( userNonFilteredFileExtensions );
}
-return !nonFilteredFileExtensions.contains( StringUtils.lowerCase(
FileUtils.extension( fileName ) ) );
+boolean filteredFileExtension = !nonFilteredFileExtensions.contains(
StringUtils.lowerCase( FileUtils
+.extension( fileName ) ) );
+if ( getLogger().isDebugEnabled() )
+{
+getLogger().debug(
+ "file " + fileName + " has a" + (
filteredFileExtension ? " " : " non " )
+ + "filtered file extension" );
+}
+return filteredFileExtension;
}
public List getDefaultNonFilteredFileExtensions()
Modified:
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/D
svn commit: r692752 - in /maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java: doc/GenerateUMLDoc.java doc/XMLDoclet.java src/GenerateHTMLJavaSrc.java src/html/Abs
Author: hboutemy
Date: Sat Sep 6 15:19:08 2008
New Revision: 692752
URL: http://svn.apache.org/viewvc?rev=692752&view=rev
Log:
replace code with existing IOUtil functionalities
Modified:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/GenerateUMLDoc.java
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/XMLDoclet.java
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/GenerateHTMLJavaSrc.java
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/AbstractPass.java
Modified:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/GenerateUMLDoc.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/GenerateUMLDoc.java?rev=692752&r1=692751&r2=692752&view=diff
==
---
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/GenerateUMLDoc.java
(original)
+++
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/GenerateUMLDoc.java
Sat Sep 6 15:19:08 2008
@@ -615,17 +615,7 @@
}
finally
{
-try
-{
-if ( osw != null )
-{
-osw.close();
-}
-}
-catch ( IOException exc )
-{
-//nop
-}
+IOUtil.close( osw );
}
return true;
}
Modified:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/XMLDoclet.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/XMLDoclet.java?rev=692752&r1=692751&r2=692752&view=diff
==
---
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/XMLDoclet.java
(original)
+++
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/doc/XMLDoclet.java
Sat Sep 6 15:19:08 2008
@@ -33,6 +33,7 @@
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamResult;
+import org.codehaus.plexus.util.IOUtil;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
@@ -975,15 +976,10 @@
FileOutputStream w = new FileOutputStream( outputFile );
-final byte[] buffer = new byte[1024 * 4];
-int n = 0;
-while ( -1 != ( n = is.read( buffer ) ) )
-{
-w.write( buffer, 0, n );
-}
+IOUtil.copy( is, w );
-is.close();
+IOUtil.close( is );
-w.close();
+IOUtil.close( w );
}
}
Modified:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/GenerateHTMLJavaSrc.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/GenerateHTMLJavaSrc.java?rev=692752&r1=692751&r2=692752&view=diff
==
---
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/GenerateHTMLJavaSrc.java
(original)
+++
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/GenerateHTMLJavaSrc.java
Sat Sep 6 15:19:08 2008
@@ -464,6 +464,10 @@
{
// nop
}
+finally
+{
+IOUtil.close( is );
+}
}
return "";
Modified:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/AbstractPass.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/AbstractPass.java?rev=692752&r1=692751&r2=692752&view=diff
==
---
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/AbstractPass.java
(original)
+++
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/AbstractPass.java
Sat Sep 6 15:19:08 2008
@@ -87,7 +87,7 @@
/**
* Returns the path to the top level of the source hierarchy from the files
- * og\f a given class.
+ * of a given class.
*
* @param packageName the package to get the backup path for
* @return
svn commit: r692753 - in /maven/shared/trunk/maven-filtering: pom.xml src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
Author: olamy
Date: Sat Sep 6 15:21:39 2008
New Revision: 692753
URL: http://svn.apache.org/viewvc?rev=692753&view=rev
Log:
pattern reuse to prevent pattern recompilation
Modified:
maven/shared/trunk/maven-filtering/pom.xml
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
Modified: maven/shared/trunk/maven-filtering/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/pom.xml?rev=692753&r1=692752&r2=692753&view=diff
==
--- maven/shared/trunk/maven-filtering/pom.xml (original)
+++ maven/shared/trunk/maven-filtering/pom.xml Sat Sep 6 15:21:39 2008
@@ -101,7 +101,7 @@
org.codehaus.plexus
plexus-interpolation
- 1.2
+ 1.3
Modified:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java?rev=692753&r1=692752&r2=692753&view=diff
==
---
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
(original)
+++
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
Sat Sep 6 15:21:39 2008
@@ -147,7 +147,7 @@
{
public Reader getReader( Reader reader )
{
-Interpolator propertiesInterpolator = new
RegexBasedInterpolator();
+Interpolator propertiesInterpolator = new
RegexBasedInterpolator( true );
propertiesInterpolator.addValueSource( propertiesValueSource
);
return new InterpolatorFilterReader( reader,
propertiesInterpolator );
}
@@ -159,7 +159,8 @@
{
public Reader getReader( Reader reader )
{
-final Interpolator propertiesInterpolatorAtRegex = new
RegexBasedInterpolator( "\\@", "(.+?)\\@" );
+final RegexBasedInterpolator propertiesInterpolatorAtRegex =
new RegexBasedInterpolator( "\\@", "(.+?)\\@" );
+propertiesInterpolatorAtRegex.setReusePatterns( true );
propertiesInterpolatorAtRegex.addValueSource(
propertiesValueSource );
return new InterpolatorFilterReader( reader,
propertiesInterpolatorAtRegex, "@", "@" );
}
@@ -171,7 +172,7 @@
{
public Reader getReader( Reader reader )
{
-Interpolator mavenProjectInterpolator = new
RegexBasedInterpolator();
+Interpolator mavenProjectInterpolator = new
RegexBasedInterpolator( true );
ValueSource valueSource = new MavenProjectValueSource(
mavenProject, escapedBackslashesInFilePath );
mavenProjectInterpolator.addValueSource( valueSource );
@@ -185,8 +186,8 @@
{
public Reader getReader( Reader reader )
{
-Interpolator mavenProjectInterpolator = new
RegexBasedInterpolator( "\\@", "(.+?)\\@" );
-
+RegexBasedInterpolator mavenProjectInterpolator = new
RegexBasedInterpolator( "\\@", "(.+?)\\@" );
+mavenProjectInterpolator.setReusePatterns( true );
ValueSource valueSource = new MavenProjectValueSource(
mavenProject, escapedBackslashesInFilePath );
mavenProjectInterpolator.addValueSource( valueSource );
return new InterpolatorFilterReader( reader,
mavenProjectInterpolator, "@", "@" );
svn commit: r692758 - in /maven/plugins/trunk/maven-resources-plugin: pom.xml src/it/filter/src/main/filters/my.filter src/it/filter/src/main/resources/SomeResource.txt src/it/filter/verify.bsh
Author: olamy
Date: Sat Sep 6 15:44:17 2008
New Revision: 692758
URL: http://svn.apache.org/viewvc?rev=692758&view=rev
Log:
[MRESOURCES-39] Filtering fails for command line properties
add test in an it
Modified:
maven/plugins/trunk/maven-resources-plugin/pom.xml
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/my.filter
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/resources/SomeResource.txt
maven/plugins/trunk/maven-resources-plugin/src/it/filter/verify.bsh
Modified: maven/plugins/trunk/maven-resources-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/pom.xml?rev=692758&r1=692757&r2=692758&view=diff
==
--- maven/plugins/trunk/maven-resources-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-resources-plugin/pom.xml Sat Sep 6 15:44:17 2008
@@ -107,7 +107,10 @@
process-test-resources
src/it/settings.xml
-
${project.build.directory}/its
+
${project.build.directory}/its
+
+fromExecProps
+
Modified:
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/my.filter
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/my.filter?rev=692758&r1=692757&r2=692758&view=diff
==
---
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/my.filter
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/my.filter
Sat Sep 6 15:44:17 2008
@@ -1,4 +1,5 @@
filter.token.project.version=${project.version}
filter.token.projectProperty=${projectProperty}
-filter.token.profileProperty=${profileProperty}
\ No newline at end of file
+filter.token.profileProperty=${profileProperty}
+execProps=fromFilter
\ No newline at end of file
Modified:
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/resources/SomeResource.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/resources/SomeResource.txt?rev=692758&r1=692757&r2=692758&view=diff
==
---
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/resources/SomeResource.txt
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/resources/SomeResource.txt
Sat Sep 6 15:44:17 2008
@@ -8,3 +8,5 @@
test:filter direct profileProperty=${profileProperty}
test:filter resolution profileProperty=${filter.token.profileProperty}
+test:filter syspropsExecutionPropsWins=${execProps}
+
Modified: maven/plugins/trunk/maven-resources-plugin/src/it/filter/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/filter/verify.bsh?rev=692758&r1=692757&r2=692758&view=diff
==
--- maven/plugins/trunk/maven-resources-plugin/src/it/filter/verify.bsh
(original)
+++ maven/plugins/trunk/maven-resources-plugin/src/it/filter/verify.bsh Sat Sep
6 15:44:17 2008
@@ -91,7 +91,14 @@
System.err.println( "SomeResource.txt not contains test:filter
resolution profileProperty=foo-profileProperty-bar" );
return false;
}
-
+
+//test:filter syspropsExecutionPropsWins=fromExecProps
+indexOf = paramContent.indexOf( "test:filter
syspropsExecutionPropsWins=fromExecProps" );
+if ( indexOf < 0)
+{
+ System.err.println( "SomeResource.txt not contains test:filter
syspropsExecutionPropsWins=fromExecProps" );
+ return false;
+}
}
catch( IOException e )
{
svn commit: r692760 - in /maven/plugins/trunk/maven-resources-plugin/src/it/filter: src/main/filters/my.filter src/main/resources/SomeResource.txt verify.bsh
Author: olamy
Date: Sat Sep 6 15:58:30 2008
New Revision: 692760
URL: http://svn.apache.org/viewvc?rev=692760&view=rev
Log:
[MRESOURCES-59] filtering with @property@
complete it with a test for this token
Modified:
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/my.filter
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/resources/SomeResource.txt
maven/plugins/trunk/maven-resources-plugin/src/it/filter/verify.bsh
Modified:
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/my.filter
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/my.filter?rev=692760&r1=692759&r2=692760&view=diff
==
---
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/my.filter
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/my.filter
Sat Sep 6 15:58:30 2008
@@ -2,4 +2,5 @@
filter.token.project.version=${project.version}
filter.token.projectProperty=${projectProperty}
filter.token.profileProperty=${profileProperty}
-execProps=fromFilter
\ No newline at end of file
+execProps=fromFilter
+value=foo
\ No newline at end of file
Modified:
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/resources/SomeResource.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/resources/SomeResource.txt?rev=692760&r1=692759&r2=692760&view=diff
==
---
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/resources/SomeResource.txt
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/resources/SomeResource.txt
Sat Sep 6 15:58:30 2008
@@ -10,3 +10,4 @@
test:filter syspropsExecutionPropsWins=${execProps}
[EMAIL PROTECTED]@
Modified: maven/plugins/trunk/maven-resources-plugin/src/it/filter/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/filter/verify.bsh?rev=692760&r1=692759&r2=692760&view=diff
==
--- maven/plugins/trunk/maven-resources-plugin/src/it/filter/verify.bsh
(original)
+++ maven/plugins/trunk/maven-resources-plugin/src/it/filter/verify.bsh Sat Sep
6 15:58:30 2008
@@ -98,7 +98,15 @@
{
System.err.println( "SomeResource.txt not contains test:filter
syspropsExecutionPropsWins=fromExecProps" );
return false;
-}
+}
+
+//newToken=foo
+indexOf = paramContent.indexOf( "newToken=foo" );
+if ( indexOf < 0)
+{
+ System.err.println( "SomeResource.txt not contains newToken=foo" );
+ return false;
+}
}
catch( IOException e )
{
svn commit: r692763 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
Author: dennisl
Date: Sat Sep 6 17:06:55 2008
New Revision: 692763
URL: http://svn.apache.org/viewvc?rev=692763&view=rev
Log:
[MSITE-150] Inconsistent navigational mechanisms: If project defines its own
index page (e.g. apt/index.apt) the Project Information->About link is missing.
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?rev=692763&r1=692762&r2=692763&view=diff
==
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
Sat Sep 6 17:06:55 2008
@@ -292,6 +292,18 @@
return context;
}
+/**
+ * Go through the list of reports and process each one like this:
+ *
+ * Add the report to a map of reports keyed by filename having the
report itself as value
+ * If the report is not yet in the map of documents, add it together
with a suitable renderer
+ *
+ *
+ * @param reports A List of MavenReports
+ * @param documents A Map of documents, keyed by filename
+ * @return A map with all reports keyed by filename having the report
itself as value. The map will be used to
+ * populate a menu.
+ */
protected Map locateReports( List reports, Map documents, Locale locale )
{
Map reportsByOutputName = new HashMap();
@@ -300,19 +312,20 @@
MavenReport report = (MavenReport) i.next();
String outputName = report.getOutputName() + ".html";
+
+// Always add the report to the menu, see MSITE-150
+reportsByOutputName.put( report.getOutputName(), report );
+
if ( documents.containsKey( outputName ) )
{
String displayLanguage = locale.getDisplayLanguage(
Locale.ENGLISH );
-getLog().info(
- "Skipped \"" + report.getName( locale ) + "\"
report, file \"" + outputName
+getLog().info( "Skipped \"" + report.getName( locale ) + "\"
report, file \"" + outputName
+ "\" already exists for the " +
displayLanguage + " version." );
i.remove();
}
else
{
-reportsByOutputName.put( report.getOutputName(), report );
-
RenderingContext renderingContext = new RenderingContext(
siteDirectory, outputName );
ReportDocumentRenderer renderer = new ReportDocumentRenderer(
report, renderingContext, getLog() );
documents.put( outputName, renderer );
@@ -321,6 +334,13 @@
return reportsByOutputName;
}
+/**
+ * Go through the collection of reports and put each report into a list
for the appropriate category. The list is
+ * put into a map keyed by the name of the category.
+ *
+ * @param reports A Collection of MavenReports
+ * @return A map keyed category having the report itself as value
+ */
protected Map categoriseReports( Collection reports )
{
Map categories = new HashMap();
@@ -343,7 +363,7 @@
{
Map documents = siteRenderer.locateDocumentFiles( context );
-// TODO: temporary solution for MSITE-289. We need to upgrade doxia
sit tools
+// TODO: temporary solution for MSITE-289. We need to upgrade doxia
site tools
Map tmp = new HashMap();
for ( Iterator it = documents.keySet().iterator(); it.hasNext(); )
{
