svn commit: r681862 - in /maven/site/trunk/src/site/apt/developers: conventions/code.apt conventions/jira.apt index.apt
Author: dennisl
Date: Fri Aug 1 15:02:13 2008
New Revision: 681862
URL: http://svn.apache.org/viewvc?rev=681862view=rev
Log:
o Fix spelling and case.
Modified:
maven/site/trunk/src/site/apt/developers/conventions/code.apt
maven/site/trunk/src/site/apt/developers/conventions/jira.apt
maven/site/trunk/src/site/apt/developers/index.apt
Modified: maven/site/trunk/src/site/apt/developers/conventions/code.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/conventions/code.apt?rev=681862r1=681861r2=681862view=diff
==
--- maven/site/trunk/src/site/apt/developers/conventions/code.apt (original)
+++ maven/site/trunk/src/site/apt/developers/conventions/code.apt Fri Aug 1
15:02:13 2008
@@ -1,5 +1,5 @@
--
- Maven Code Style And Code Convention
+ Maven Code Style And Code Conventions
--
Vincent Siveton
--
@@ -26,7 +26,7 @@
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/doxia/references/apt-format.html
-Maven Code Style And Code Convention
+Maven Code Style And Code Conventions
This document describes how developers and contributors should write code.
The reasoning of these styles and conventions is
mainly for consistency, readability and maintainability reasons.
Modified: maven/site/trunk/src/site/apt/developers/conventions/jira.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/conventions/jira.apt?rev=681862r1=681861r2=681862view=diff
==
--- maven/site/trunk/src/site/apt/developers/conventions/jira.apt (original)
+++ maven/site/trunk/src/site/apt/developers/conventions/jira.apt Fri Aug 1
15:02:13 2008
@@ -1,5 +1,5 @@
--
- Maven Jira Convention
+ Maven JIRA Convention
--
Vincent Siveton
--
@@ -26,9 +26,9 @@
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/doxia/references/apt-format.html
-Maven Jira Convention
+Maven JIRA Convention
- This document describes how Maven developers should use Jira, our issue
tracking.
+ This document describes how Maven developers should use JIRA, our issue
tracking.
* When To Create a JIRA Issue?
Modified: maven/site/trunk/src/site/apt/developers/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/index.apt?rev=681862r1=681861r2=681862view=diff
==
--- maven/site/trunk/src/site/apt/developers/index.apt (original)
+++ maven/site/trunk/src/site/apt/developers/index.apt Fri Aug 1 15:02:13 2008
@@ -63,9 +63,9 @@
There are a number of conventions used in the Maven projects, which
contributors and developers alike should follow for
consistency's sake.
- * {{{./conventions/code.html}Maven Code Style And Convention}}
+ * {{{./conventions/code.html}Maven Code Style And Conventions}}
- * {{{./conventions/jira.html}Maven Jira Convention}}
+ * {{{./conventions/jira.html}Maven JIRA Convention}}
* {{{./conventions/svn.html}Maven SVN Convention}}
svn commit: r681950 - in /maven/shared/trunk/maven-invoker/src/site/apt: index.apt usage.apt
Author: dennisl
Date: Sat Aug 2 04:15:09 2008
New Revision: 681950
URL: http://svn.apache.org/viewvc?rev=681950view=rev
Log:
o Add license headers.
o Fix error in code example.
o Fix typos and formating.
Modified:
maven/shared/trunk/maven-invoker/src/site/apt/index.apt
maven/shared/trunk/maven-invoker/src/site/apt/usage.apt
Modified: maven/shared/trunk/maven-invoker/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/site/apt/index.apt?rev=681950r1=681949r2=681950view=diff
==
--- maven/shared/trunk/maven-invoker/src/site/apt/index.apt (original)
+++ maven/shared/trunk/maven-invoker/src/site/apt/index.apt Sat Aug 2 04:15:09
2008
@@ -3,16 +3,36 @@
---
John Casey
---
- 31-May-2006
+ 2008-08-02
---
+ ~~ 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.
+
+ ~~ NOTE: For help with the syntax of this file, see:
+ ~~ http://maven.apache.org/doxia/references/apt-format.html
+
Maven Process Invoker
In many cases, tools (including Maven itself) may want to fire off a Maven
build in a clean environment. Why? Perhaps you want to avoid polluting the
current system environment with side-effects produced by Maven plugins. Maybe
you want to run the build from a different working directory than the current
- ${user.dir}. Maybe you want to retain the ability to surgically kill
one
+ $\{user.dir\}. Maybe you want to retain the ability to surgically kill
one
of many Maven builds if it hangs for some reason.
This API is concerned with firing a Maven build in a new JVM. It accomplishes
@@ -20,7 +40,7 @@
in the current request, along with those global options specified in the
invoker itself. Once it has the command line, the invoker will execute it,
and
capture the resulting exit code or any exception thrown to signal a failure
to
- execute. Input/Output control can be specified using an InputStream and
+ execute. Input/output control can be specified using an InputStream and
up to two InvocationOutputHandlers.
* Features
Modified: maven/shared/trunk/maven-invoker/src/site/apt/usage.apt
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/site/apt/usage.apt?rev=681950r1=681949r2=681950view=diff
==
--- maven/shared/trunk/maven-invoker/src/site/apt/usage.apt (original)
+++ maven/shared/trunk/maven-invoker/src/site/apt/usage.apt Sat Aug 2 04:15:09
2008
@@ -3,20 +3,40 @@
---
John Casey
---
- 31-May-2006
+ 2008-08-02
---
+ ~~ 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.
+
+ ~~ NOTE: For help with the syntax of this file, see:
+ ~~ http://maven.apache.org/doxia/references/apt-format.html
+
Usage
This page documents the basic usage of the Maven invocation API.
-
+
* Hello, World
The simplest possible way to use the invocation API is to construct the
invoker and request at the same time, and simply call
invoker.execute(request). In this example, we don't care about the
build
result:
-
+
+---+
InvocationRequest request = new DefaultInvocationRequest();
request.setPomFile( new File( /path/to/pom.xml ) );
@@ -32,11 +52,11 @@
* Configuring the Maven Home Directory
- You can use the method Invoker.setMavenHome() to specify which Maven
executable should be used to fork
svn commit: r681954 - /maven/shared/trunk/maven-invoker/pom.xml
Author: dennisl Date: Sat Aug 2 04:35:29 2008 New Revision: 681954 URL: http://svn.apache.org/viewvc?rev=681954view=rev Log: o Add component to issueManagement URL. o Use latest version of the Site Plugin. Modified: maven/shared/trunk/maven-invoker/pom.xml Modified: maven/shared/trunk/maven-invoker/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/pom.xml?rev=681954r1=681953r2=681954view=diff == --- maven/shared/trunk/maven-invoker/pom.xml (original) +++ maven/shared/trunk/maven-invoker/pom.xml Sat Aug 2 04:35:29 2008 @@ -30,7 +30,7 @@ descriptionA component to programmatically invoke Maven./description issueManagement systemjira/system -urlhttp://jira.codehaus.org/browse/MSHARED/url +urlhttp://jira.codehaus.org/browse/MSHARED/component/13271/url /issueManagement dependencies dependency @@ -46,6 +46,14 @@ /dependency /dependencies build +pluginManagement + plugins +plugin + artifactIdmaven-site-plugin/artifactId + version2.0-beta-7/version +/plugin + /plugins +/pluginManagement plugins plugin artifactIdmaven-surefire-plugin/artifactId
svn commit: r681956 - in /maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker: MavenCommandLineBuilder.java PrintStreamHandler.java
Author: dennisl
Date: Sat Aug 2 04:43:44 2008
New Revision: 681956
URL: http://svn.apache.org/viewvc?rev=681956view=rev
Log:
o Fix errors reported by Checkstyle.
Modified:
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/PrintStreamHandler.java
Modified:
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java?rev=681956r1=681955r2=681956view=diff
==
---
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
(original)
+++
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
Sat Aug 2 04:43:44 2008
@@ -322,7 +322,8 @@
}
else if ( workingDirectory.isFile() )
{
-logger.warn( Specified base directory ( + workingDirectory + )
is a file. Using its parent directory... );
+logger.warn( Specified base directory ( + workingDirectory + )
is a file.
++ Using its parent directory... );
workingDirectory = workingDirectory.getParentFile();
}
Modified:
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/PrintStreamHandler.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/PrintStreamHandler.java?rev=681956r1=681955r2=681956view=diff
==
---
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/PrintStreamHandler.java
(original)
+++
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/PrintStreamHandler.java
Sat Aug 2 04:43:44 2008
@@ -1,7 +1,5 @@
package org.apache.maven.shared.invoker;
-import java.io.PrintStream;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,6 +19,8 @@
* under the License.
*/
+import java.io.PrintStream;
+
/**
* Offers an output handler that writes to a print stream like [EMAIL
PROTECTED] System#out}.
*
svn commit: r681958 - /maven/shared/trunk/maven-invoker/src/site/apt/usage.apt
Author: dennisl
Date: Sat Aug 2 04:48:37 2008
New Revision: 681958
URL: http://svn.apache.org/viewvc?rev=681958view=rev
Log:
o Move the section about Configuring the Maven Home Directory to after the
code examples.
Modified:
maven/shared/trunk/maven-invoker/src/site/apt/usage.apt
Modified: maven/shared/trunk/maven-invoker/src/site/apt/usage.apt
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/site/apt/usage.apt?rev=681958r1=681957r2=681958view=diff
==
--- maven/shared/trunk/maven-invoker/src/site/apt/usage.apt (original)
+++ maven/shared/trunk/maven-invoker/src/site/apt/usage.apt Sat Aug 2 04:48:37
2008
@@ -50,41 +50,6 @@
for the project defined at /path/to/pom.xml. If the build fails, we
will
remain blissfully ignorant...
-* Configuring the Maven Home Directory
-
- You can use the method Invoker.setMavenHome() to specify which Maven
executable it should use.
- If you don't provide an explicit value for this setting, the Invoker
will automatically try to detect
- a Maven installation by evaluating the system property maven.home and
the environment variable M2_HOME.
-
- Note: If you use the invocation API in tests run by the
{{{../../plugins/maven-surefire-plugin}Maven Surefire Plugin}},
- you need to tell Surefire to pass the system property maven.home to
the tests in order for the automatic Maven
- detection to work:
-
-+---+
-project
- ...
- build
-plugins
- plugin
-groupIdorg.apache.maven.plugins/groupId
-artifactIdmaven-surefire-plugin/artifactId
-version2.4.3/version
-configuration
- systemProperties
-property
- namemaven.home/name
- value${maven.home}/value
-/property
- /systemProperties
-/configuration
- /plugin
-/plugins
-...
- /build
- ...
-/project
-+---+
-
* Checking the Exit Code
If we wanted to detect a build failure in the above example, we could simply
@@ -160,4 +125,39 @@
of goals per build. We can actually accommodate a fairly complex
configuration
of the Invoker without adding complexity to the publishSite method in
this manner.
+* Configuring the Maven Home Directory
+
+ You can use the method Invoker.setMavenHome() to specify which Maven
executable it should use.
+ If you don't provide an explicit value for this setting, the Invoker
will automatically try to detect
+ a Maven installation by evaluating the system property maven.home and
the environment variable M2_HOME.
+
+ Note: If you use the invocation API in tests run by the
{{{../../plugins/maven-surefire-plugin}Maven Surefire Plugin}},
+ you need to tell Surefire to pass the system property maven.home to
the tests in order for the automatic Maven
+ detection to work:
+
++---+
+project
+ ...
+ build
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-surefire-plugin/artifactId
+version2.4.3/version
+configuration
+ systemProperties
+property
+ namemaven.home/name
+ value${maven.home}/value
+/property
+ /systemProperties
+/configuration
+ /plugin
+/plugins
+...
+ /build
+ ...
+/project
++---+
+
svn commit: r681959 - /maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
Author: dennisl
Date: Sat Aug 2 04:55:36 2008
New Revision: 681959
URL: http://svn.apache.org/viewvc?rev=681959view=rev
Log:
o Fix errors reported by Checkstyle.
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java?rev=681959r1=681958r2=681959view=diff
==
---
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
Sat Aug 2 04:55:36 2008
@@ -379,7 +379,8 @@
{
if ( skipInvocation )
{
-getLog().info( Skipping invocation per configuration. If this is
incorrect, ensure the skipInvocation parameter is not set to true. );
+getLog().info( Skipping invocation per configuration.
++ If this is incorrect, ensure the skipInvocation parameter
is not set to true. );
return;
}
@@ -392,8 +393,8 @@
}
catch ( IOException e )
{
-throw new MojoExecutionException( Failed to discover
projectsDirectory from pom File parameter. Reason:
-+ e.getMessage(), e );
+throw new MojoExecutionException( Failed to discover
projectsDirectory from pom File parameter.
++ Reason: + e.getMessage(), e );
}
includedPoms = new String[]{ pom.getName() };
@@ -555,7 +556,8 @@
}
else
{
-copyDirectoryStructure( new File( projectsDirectory,
subpath ), new File( cloneProjectsTo, subpath ) );
+copyDirectoryStructure( new File( projectsDirectory,
subpath ), new File( cloneProjectsTo,
+
subpath ) );
}
clonedSubpaths.add( subpath );
@@ -1224,8 +1226,8 @@
try
{
// interpolation with token @...@
-reader = new BufferedReader( new InterpolationFilterReader(
ReaderFactory.newXmlReader( originalFile ), composite, @,
-@ )
);
+reader = new BufferedReader( new InterpolationFilterReader(
ReaderFactory.newXmlReader( originalFile ),
+
composite, @, @ ) );
writer = WriterFactory.newXmlWriter( interpolatedFile );
String line = null;
while ( ( line = reader.readLine() ) != null )
@@ -1285,7 +1287,8 @@
}
catch ( IOException e )
{
-throw new MojoExecutionException( error reading profile in file
+ projectProfilesFile + not found , e );
+throw new MojoExecutionException( error reading profile in file
+ projectProfilesFile + not found ,
+ e );
}
finally
{
svn commit: r681960 - /maven/plugins/trunk/maven-invoker-plugin/
Author: dennisl Date: Sat Aug 2 04:57:25 2008 New Revision: 681960 URL: http://svn.apache.org/viewvc?rev=681960view=rev Log: o Ignore IDEA files. Modified: maven/plugins/trunk/maven-invoker-plugin/ (props changed) Propchange: maven/plugins/trunk/maven-invoker-plugin/ -- --- svn:ignore (original) +++ svn:ignore Sat Aug 2 04:57:25 2008 @@ -3,4 +3,6 @@ .settings .project bin -maven-invoker-plugin.iml +*.iml +*.ipr +*.iws
svn commit: r681962 - in /maven/plugins/trunk/maven-invoker-plugin/src/site: ./ apt/ apt/examples/ fml/
Author: dennisl Date: Sat Aug 2 05:23:55 2008 New Revision: 681962 URL: http://svn.apache.org/viewvc?rev=681962view=rev Log: o Add and fix license headers. Modified: maven/plugins/trunk/maven-invoker-plugin/src/site/apt/advance-usage.apt maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/access-test-classes.apt maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.apt maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/fast-use.apt maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/install-artifacts.apt maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/post-build-script.apt maven/plugins/trunk/maven-invoker-plugin/src/site/apt/index.apt maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt maven/plugins/trunk/maven-invoker-plugin/src/site/fml/faq.fml maven/plugins/trunk/maven-invoker-plugin/src/site/site.xml Modified: maven/plugins/trunk/maven-invoker-plugin/src/site/apt/advance-usage.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/apt/advance-usage.apt?rev=681962r1=681961r2=681962view=diff == --- maven/plugins/trunk/maven-invoker-plugin/src/site/apt/advance-usage.apt (original) +++ maven/plugins/trunk/maven-invoker-plugin/src/site/apt/advance-usage.apt Sat Aug 2 05:23:55 2008 @@ -6,6 +6,26 @@ 24 November 2007 -- + ~~ 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. + + ~~ NOTE: For help with the syntax of this file, see: + ~~ http://maven.apache.org/doxia/references/apt-format.html + Advanced Usage * Goals File Interpolation Modified: maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/access-test-classes.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/access-test-classes.apt?rev=681962r1=681961r2=681962view=diff == --- maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/access-test-classes.apt (original) +++ maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/access-test-classes.apt Sat Aug 2 05:23:55 2008 @@ -6,6 +6,26 @@ 03 May 2008 -- + ~~ 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. + + ~~ NOTE: For help with the syntax of this file, see: + ~~ http://maven.apache.org/doxia/references/apt-format.html + Accessing Test Classes In case your pre-/post-build scripts perform complex operations that you would rather like to refactor out into some Modified: maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.apt?rev=681962r1=681961r2=681962view=diff == --- maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.apt (original) +++ maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.apt Sat Aug 2 05:23:55 2008 @@ -6,6 +6,26 @@ 18 April 2008 -- + ~~ 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
svn commit: r681963 - in /maven/plugins/trunk/maven-invoker-plugin/src/site: apt/advance-usage.apt apt/examples/access-test-classes.apt apt/examples/install-artifacts.apt apt/usage.apt site.xml
Author: dennisl
Date: Sat Aug 2 06:01:02 2008
New Revision: 681963
URL: http://svn.apache.org/viewvc?rev=681963view=rev
Log:
o Fix typos.
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/advance-usage.apt
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/access-test-classes.apt
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/install-artifacts.apt
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt
maven/plugins/trunk/maven-invoker-plugin/src/site/site.xml
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/advance-usage.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/apt/advance-usage.apt?rev=681963r1=681962r2=681963view=diff
==
--- maven/plugins/trunk/maven-invoker-plugin/src/site/apt/advance-usage.apt
(original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/site/apt/advance-usage.apt Sat
Aug 2 06:01:02 2008
@@ -3,7 +3,7 @@
--
Olivier Lamy
--
- 24 November 2007
+ 2008-08-02
--
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -34,7 +34,7 @@
* Values from the project POM (you must use $\{pom.groupId} notation
in your goals file)
- * In the plugin configuration you can add some properties in a
\interpolationsProperties\ element
+ * In the plugin configuration you can add some properties in an
\interpolationsProperties\ element
* IT POM Interpolation
@@ -42,7 +42,7 @@
* Values from the project POM (you must use @pom.groupId@ notation in
your POM file)
- * In the plugin configuration you can add some properties in a
\interpolationsProperties\ element
+ * In the plugin configuration you can add some properties in an
\interpolationsProperties\ element
* Properties from pom.properties
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/access-test-classes.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/access-test-classes.apt?rev=681963r1=681962r2=681963view=diff
==
---
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/access-test-classes.apt
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/access-test-classes.apt
Sat Aug 2 06:01:02 2008
@@ -3,7 +3,7 @@
--
Benjamin Bentmann
--
- 03 May 2008
+ 2008-08-02
--
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -48,7 +48,7 @@
addTestClassPathtrue/addTestClassPath
/configuration
/execution
- /executions
+/executions
/plugin
/plugins
/build
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/install-artifacts.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/install-artifacts.apt?rev=681963r1=681962r2=681963view=diff
==
---
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/install-artifacts.apt
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/install-artifacts.apt
Sat Aug 2 06:01:02 2008
@@ -3,7 +3,7 @@
--
Paul Gier
--
- 18 April 2008
+ 2008-08-02
--
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -29,9 +29,9 @@
Installing Artifacts Example
The following example shows a plugin configuration using the
{{{../install-mojo.html}invoker:install}}
- goal. This will cause the project artifact(s) to be installed to the local
+ goal. This will cause the project artifact(s) to be installed to a
dedicated local
repository before executing the projects. This can be helpful if you
- want to build you project and test the new artifacts artifact in a single
step instead of
+ want to build your project and test the new artifacts artifact in a single
step instead of
installing first and then running tests.
---
Modified: maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt?rev=681963r1=681962r2=681963view=diff
==
--- maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt Sat Aug 2
06:01:02 2008
@@ -3,7 +3,7 @@
--
Jason van Zyl
--
- 27 November 2006
+ 2008-08-02
--
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -37,7 +37,7 @@
* Basic Example
The following example shows basic plugin configuration for running
integration tests.
- The projects directory (src/it) is the location where
svn commit: r681965 - /maven/plugins/trunk/maven-invoker-plugin/pom.xml
Author: dennisl Date: Sat Aug 2 06:15:32 2008 New Revision: 681965 URL: http://svn.apache.org/viewvc?rev=681965view=rev Log: o Sync the version of dependencies on Maven core artifacts with the version specified as a Maven prerequisite. o Add used undeclared dependencies. Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/pom.xml?rev=681965r1=681964r2=681965view=diff == --- maven/plugins/trunk/maven-invoker-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-invoker-plugin/pom.xml Sat Aug 2 06:15:32 2008 @@ -62,22 +62,22 @@ dependency groupIdorg.apache.maven/groupId artifactIdmaven-project/artifactId - version2.0/version + version2.0.6/version /dependency dependency groupIdorg.apache.maven/groupId artifactIdmaven-plugin-api/artifactId - version2.0/version + version2.0.6/version /dependency dependency groupIdorg.apache.maven/groupId artifactIdmaven-artifact/artifactId - version2.0/version + version2.0.6/version /dependency dependency groupIdorg.apache.maven/groupId artifactIdmaven-settings/artifactId - version2.0/version + version2.0.6/version /dependency dependency groupIdorg.apache.maven.shared/groupId @@ -95,6 +95,11 @@ version1.5.1/version /dependency dependency + groupIdorg.codehaus.plexus/groupId + artifactIdplexus-container-default/artifactId + version1.0-alpha-9-stable-1/version +/dependency +dependency groupIdorg.apache.maven.plugin-testing/groupId artifactIdmaven-plugin-testing-harness/artifactId version1.2/version @@ -103,7 +108,7 @@ dependency groupIdorg.apache.maven/groupId artifactIdmaven-model/artifactId - version2.0/version + version2.0.6/version scopetest/scope /dependency /dependencies
svn commit: r681966 - in /maven/shared/trunk/maven-invoker: pom.xml src/site/apt/index.apt
Author: dennisl Date: Sat Aug 2 06:19:43 2008 New Revision: 681966 URL: http://svn.apache.org/viewvc?rev=681966view=rev Log: o Be consistent in the naming. Modified: maven/shared/trunk/maven-invoker/pom.xml maven/shared/trunk/maven-invoker/src/site/apt/index.apt Modified: maven/shared/trunk/maven-invoker/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/pom.xml?rev=681966r1=681965r2=681966view=diff == --- maven/shared/trunk/maven-invoker/pom.xml (original) +++ maven/shared/trunk/maven-invoker/pom.xml Sat Aug 2 06:19:43 2008 @@ -26,7 +26,7 @@ /parent artifactIdmaven-invoker/artifactId version2.0.9-SNAPSHOT/version - nameMaven Process Invoker/name + nameMaven Invoker/name descriptionA component to programmatically invoke Maven./description issueManagement systemjira/system Modified: maven/shared/trunk/maven-invoker/src/site/apt/index.apt URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/site/apt/index.apt?rev=681966r1=681965r2=681966view=diff == --- maven/shared/trunk/maven-invoker/src/site/apt/index.apt (original) +++ maven/shared/trunk/maven-invoker/src/site/apt/index.apt Sat Aug 2 06:19:43 2008 @@ -26,7 +26,7 @@ ~~ NOTE: For help with the syntax of this file, see: ~~ http://maven.apache.org/doxia/references/apt-format.html -Maven Process Invoker +Maven Invoker In many cases, tools (including Maven itself) may want to fire off a Maven build in a clean environment. Why? Perhaps you want to avoid polluting the
svn commit: r681978 - in /maven/plugins/trunk/maven-invoker-plugin/src/site/apt: ./ examples/
Author: dennisl
Date: Sat Aug 2 07:00:08 2008
New Revision: 681978
URL: http://svn.apache.org/viewvc?rev=681978view=rev
Log:
o Make sure that the documentation always has up-to-date version elements in
POM snippets in the documentation.
Added:
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/access-test-classes.apt.vm
(contents, props changed)
- copied, changed from r681963,
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/access-test-classes.apt
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.apt.vm
(contents, props changed)
- copied, changed from r681962,
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.apt
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/fast-use.apt.vm
(contents, props changed)
- copied, changed from r681962,
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/fast-use.apt
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/install-artifacts.apt.vm
(contents, props changed)
- copied, changed from r681963,
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/install-artifacts.apt
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/post-build-script.apt.vm
(contents, props changed)
- copied, changed from r681962,
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/post-build-script.apt
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt.vm
(contents, props changed)
- copied, changed from r681963,
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt
Removed:
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/access-test-classes.apt
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.apt
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/fast-use.apt
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/install-artifacts.apt
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/post-build-script.apt
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt
Copied:
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/access-test-classes.apt.vm
(from r681963,
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/access-test-classes.apt)
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/access-test-classes.apt.vm?p2=maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/access-test-classes.apt.vmp1=maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/access-test-classes.aptr1=681963r2=681978rev=681978view=diff
==
---
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/access-test-classes.apt
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/access-test-classes.apt.vm
Sat Aug 2 07:00:08 2008
@@ -37,7 +37,7 @@
plugins
plugin
artifactIdmaven-invoker-plugin/artifactId
-version1.2/version
+version${project.version}/version
executions
execution
idintegration-test/id
Propchange:
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/access-test-classes.apt.vm
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/access-test-classes.apt.vm
--
svn:keywords = Author Date Id Revision
Copied:
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.apt.vm
(from r681962,
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.apt)
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.apt.vm?p2=maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.apt.vmp1=maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.aptr1=681962r2=681978rev=681978view=diff
==
---
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.apt
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.apt.vm
Sat Aug 2 07:00:08 2008
@@ -3,7 +3,7 @@
--
Paul Gier
--
- 18 April 2008
+ 2008-08-02
--
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -41,7 +41,7 @@
plugins
plugin
artifactIdmaven-invoker-plugin/artifactId
-version1.2/version
+version${project.version}/version
executions
execution
idintegration-test/id
Propchange:
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples
svn commit: r681980 - in /maven/plugins/trunk/maven-invoker-plugin/src/site: apt/examples/clone-projects.apt.vm apt/examples/fast-use.apt.vm apt/examples/install-artifacts.apt.vm apt/examples/post-bui
Author: dennisl
Date: Sat Aug 2 07:05:55 2008
New Revision: 681980
URL: http://svn.apache.org/viewvc?rev=681980view=rev
Log:
o Sync titles, headings and menu options.
o Alphabetize the Examples menu options.
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.apt.vm
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/fast-use.apt.vm
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/install-artifacts.apt.vm
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/post-build-script.apt.vm
maven/plugins/trunk/maven-invoker-plugin/src/site/site.xml
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.apt.vm?rev=681980r1=681979r2=681980view=diff
==
---
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.apt.vm
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.apt.vm
Sat Aug 2 07:05:55 2008
@@ -1,5 +1,5 @@
--
- Clone Projects Example
+ Cloning Projects
--
Paul Gier
--
@@ -26,7 +26,7 @@
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/doxia/references/apt-format.html
-Clone Projects Example
+Cloning Projects
By default the projects will be executed in the same directory where they
are found.
This means that build output will be generated with the project files. It
may be
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/fast-use.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/fast-use.apt.vm?rev=681980r1=681979r2=681980view=diff
==
---
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/fast-use.apt.vm
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/fast-use.apt.vm
Sat Aug 2 07:05:55 2008
@@ -26,7 +26,7 @@
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/doxia/references/apt-format.html
-Fast Invoker Plugin Configuration
+Fast Build Configuration
If you follow the recommended approach and use a dedicated local repository
for the integration tests (e.g.
target/local-repo), you will likely encounter long build times. If the
test repository has been cleaned, the
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/install-artifacts.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/install-artifacts.apt.vm?rev=681980r1=681979r2=681980view=diff
==
---
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/install-artifacts.apt.vm
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/install-artifacts.apt.vm
Sat Aug 2 07:05:55 2008
@@ -1,5 +1,5 @@
--
- Installing Artifacts Example
+ Installing Artifacts
--
Paul Gier
--
@@ -26,7 +26,7 @@
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/doxia/references/apt-format.html
-Installing Artifacts Example
+Installing Artifacts
The following example shows a plugin configuration using the
{{{../install-mojo.html}invoker:install}}
goal. This will cause the project artifact(s) to be installed to a
dedicated local
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/post-build-script.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/post-build-script.apt.vm?rev=681980r1=681979r2=681980view=diff
==
---
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/post-build-script.apt.vm
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/post-build-script.apt.vm
Sat Aug 2 07:05:55 2008
@@ -1,5 +1,5 @@
--
- Installing Artifacts Example
+ Using a Post Build Script
--
Paul Gier
--
@@ -26,7 +26,7 @@
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/doxia/references/apt-format.html
-Example using postBuildHookScript
+Using a Post Build Script
Here is an example of how the Invoker Plugin can be used to run a set
of Maven projects and then verify their output with a BeanShell script.
Modified: maven/plugins/trunk/maven-invoker-plugin/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/site.xml?rev=681980r1=681979r2=681980view=diff
==
--- maven/plugins/trunk
svn commit: r681986 - /maven/plugins/trunk/maven-invoker-plugin/pom.xml
Author: dennisl Date: Sat Aug 2 07:23:25 2008 New Revision: 681986 URL: http://svn.apache.org/viewvc?rev=681986view=rev Log: o Use latest versions of Project Info Reports, Plugin and Site plugins. Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/pom.xml?rev=681986r1=681985r2=681986view=diff == --- maven/plugins/trunk/maven-invoker-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-invoker-plugin/pom.xml Sat Aug 2 07:23:25 2008 @@ -42,16 +42,25 @@ urlhttp://jira.codehaus.org/browse/MINVOKER/url /issueManagement build -plugins - plugin -artifactIdmaven-surefire-plugin/artifactId -version2.4.3/version - /plugin - plugin -artifactIdmaven-source-plugin/artifactId -version2.0.4/version - /plugin -/plugins +pluginManagement + plugins +plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-plugin-plugin/artifactId + version2.4.2/version +/plugin +plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-site-plugin/artifactId + version2.0-beta-7/version +/plugin +plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-surefire-plugin/artifactId + version2.4.3/version +/plugin + /plugins +/pluginManagement /build dependencies dependency @@ -112,4 +121,13 @@ scopetest/scope /dependency /dependencies + reporting +plugins + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-project-info-reports-plugin/artifactId +version2.1/version + /plugin +/plugins + /reporting /project
svn commit: r681994 - in /maven/plugins/trunk/maven-war-plugin/src/test/resources/unit: manifest/manifest-with-classpath/sample-artifacts/ sample_wars/
Author: dennisl Date: Sat Aug 2 08:20:20 2008 New Revision: 681994 URL: http://svn.apache.org/viewvc?rev=681994view=rev Log: o Set SVN mime-type to binary for archives. Modified: maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-classpath/sample-artifacts/maven-artifact1-1.0-SNAPSHOT.jar (props changed) maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-classpath/sample-artifacts/maven-artifact2-1.0-SNAPSHOT.jar (props changed) maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/sample_wars/ejbclient.jar (props changed) maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/sample_wars/sample.par (props changed) maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/sample_wars/simple-updated.war (props changed) maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/sample_wars/simple.aar (props changed) maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/sample_wars/simple.jar (props changed) maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/sample_wars/tld.jar (props changed) Propchange: maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-classpath/sample-artifacts/maven-artifact1-1.0-SNAPSHOT.jar -- svn:mime-type = application/octet-stream Propchange: maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-classpath/sample-artifacts/maven-artifact2-1.0-SNAPSHOT.jar -- svn:mime-type = application/octet-stream Propchange: maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/sample_wars/ejbclient.jar -- svn:mime-type = application/octet-stream Propchange: maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/sample_wars/sample.par -- svn:mime-type = application/octet-stream Propchange: maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/sample_wars/simple-updated.war -- svn:mime-type = application/octet-stream Propchange: maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/sample_wars/simple.aar -- svn:mime-type = application/octet-stream Propchange: maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/sample_wars/simple.jar -- svn:mime-type = application/octet-stream Propchange: maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/sample_wars/tld.jar -- svn:mime-type = application/octet-stream
svn commit: r681995 - in /maven/plugins/trunk/maven-war-plugin/src: it/MWAR-131/ it/MWAR-131/mwar131-test/ it/MWAR-131/mwar131-test/src/main/java/com/example/ it/MWAR-131/mwar131-test/src/test/java/co
Author: dennisl
Date: Sat Aug 2 08:22:48 2008
New Revision: 681995
URL: http://svn.apache.org/viewvc?rev=681995view=rev
Log:
o Set EOL style to Native.
Modified:
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/goals.txt (props
changed)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-test/pom.xml
(props changed)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-test/src/main/java/com/example/App.java
(contents, props changed)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-test/src/test/java/com/example/AppTest.java
(contents, props changed)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp/pom.xml
(props changed)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp/src/main/java/com/example/Util.java
(props changed)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp/src/main/webapp/WEB-INF/web.xml
(props changed)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp/src/main/webapp/index.jsp
(props changed)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp2/pom.xml
(props changed)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp2/src/main/webapp/WEB-INF/web.xml
(contents, props changed)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp2/src/main/webapp/index.jsp
(contents, props changed)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/pom.xml (props
changed)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/verify.bsh (props
changed)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/src/main/webapp/WEB-INF/web.xml
(props changed)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/src/main/webresources/filtered.properties
(props changed)
maven/plugins/trunk/maven-war-plugin/src/it/scoped-dependency-same-artifact/src/main/webapp/index.jsp
(props changed)
maven/plugins/trunk/maven-war-plugin/src/it/simple-war-no-webxml/src/main/webapp/index.jsp
(props changed)
maven/plugins/trunk/maven-war-plugin/src/test/resources/overlays/overlay-one/index.jsp
(props changed)
maven/plugins/trunk/maven-war-plugin/src/test/resources/overlays/overlay-one/login.jsp
(props changed)
maven/plugins/trunk/maven-war-plugin/src/test/resources/overlays/overlay-two/admin.jsp
(props changed)
maven/plugins/trunk/maven-war-plugin/src/test/resources/overlays/overlay-two/index.jsp
(props changed)
Propchange: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/goals.txt
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-test/pom.xml
--
svn:eol-style = native
Modified:
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-test/src/main/java/com/example/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-test/src/main/java/com/example/App.java?rev=681995r1=681994r2=681995view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-test/src/main/java/com/example/App.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-test/src/main/java/com/example/App.java
Sat Aug 2 08:22:48 2008
@@ -1,13 +1,13 @@
-package com.example;
-
-/**
- * Hello world!
- *
- */
-public class App
-{
-public static void main( String[] args )
-{
-System.out.println( Hello World is + Util.isPresent() );
-}
-}
+package com.example;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+public static void main( String[] args )
+{
+System.out.println( Hello World is + Util.isPresent() );
+}
+}
Propchange:
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-test/src/main/java/com/example/App.java
--
svn:eol-style = native
Modified:
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-test/src/test/java/com/example/AppTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-test/src/test/java/com/example/AppTest.java?rev=681995r1=681994r2=681995view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-test/src/test/java/com/example/AppTest.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-test/src/test/java/com/example/AppTest.java
Sat Aug 2 08:22:48 2008
@@ -1,43 +1,43 @@
-package com.example;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App
svn commit: r681998 - in /maven/release/trunk/maven-release-manager/src/test: remote-repository/external/artifactId/ remote-repository/external/artifactId/1.0-SNAPSHOT/ remote-repository/external/arti
Author: dennisl Date: Sat Aug 2 08:34:39 2008 New Revision: 681998 URL: http://svn.apache.org/viewvc?rev=681998view=rev Log: o Set EOL style to Native. o Set mime-type to text where it was set to binary. Modified: maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0-SNAPSHOT/artifactId-1.0-20060424.060453-1.jar.md5 (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0-SNAPSHOT/artifactId-1.0-20060424.060453-1.jar.sha1 (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0-SNAPSHOT/artifactId-1.0-20060424.060453-1.pom.md5 (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0-SNAPSHOT/artifactId-1.0-20060424.060453-1.pom.sha1 (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0-SNAPSHOT/maven-metadata.xml.md5 (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0-SNAPSHOT/maven-metadata.xml.sha1 (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0/artifactId-1.0.jar.md5 (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0/artifactId-1.0.jar.sha1 (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0/artifactId-1.0.pom.md5 (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0/artifactId-1.0.pom.sha1 (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/maven-metadata.xml.md5 (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/maven-metadata.xml.sha1 (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/external/parent-artifactId/1/parent-artifactId-1.pom.md5 (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/external/parent-artifactId/1/parent-artifactId-1.pom.sha1 (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/external/parent-artifactId/maven-metadata.xml.md5 (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/external/parent-artifactId/maven-metadata.xml.sha1 (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/external/plugin-artifactId/1.0/plugin-artifactId-1.0.jar.md5 (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/external/plugin-artifactId/1.0/plugin-artifactId-1.0.jar.sha1 (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/external/plugin-artifactId/1.0/plugin-artifactId-1.0.pom.md5 (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/external/plugin-artifactId/1.0/plugin-artifactId-1.0.pom.sha1 (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/external/plugin-artifactId/1.1-SNAPSHOT/maven-metadata.xml.md5 (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/external/plugin-artifactId/1.1-SNAPSHOT/maven-metadata.xml.sha1 (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/external/plugin-artifactId/1.1-SNAPSHOT/plugin-artifactId-1.1-20060424.131158-1.jar.md5 (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/external/plugin-artifactId/1.1-SNAPSHOT/plugin-artifactId-1.1-20060424.131158-1.jar.sha1 (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/external/plugin-artifactId/1.1-SNAPSHOT/plugin-artifactId-1.1-20060424.131158-1.pom.md5 (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/external/plugin-artifactId/1.1-SNAPSHOT/plugin-artifactId-1.1-20060424.131158-1.pom.sha1 (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/external/plugin-artifactId/maven-metadata.xml.md5 (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/external/plugin-artifactId/maven-metadata.xml.sha1 (props changed) maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom-with-encoding/pom.xml (props changed) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-encoding/expected-pom.xml (props changed) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-encoding/pom.xml
svn commit: r681999 - /maven/release/trunk/pom.xml
Author: dennisl Date: Sat Aug 2 08:47:28 2008 New Revision: 681999 URL: http://svn.apache.org/viewvc?rev=681999view=rev Log: o Fix SCM URL for web access. Modified: maven/release/trunk/pom.xml Modified: maven/release/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/pom.xml?rev=681999r1=681998r2=681999view=diff == --- maven/release/trunk/pom.xml (original) +++ maven/release/trunk/pom.xml Sat Aug 2 08:47:28 2008 @@ -42,7 +42,7 @@ scm connectionscm:svn:http://svn.apache.org/repos/asf/maven/release/trunk/connection developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/release/trunk/developerConnection -urlhttp://svn.apache.org/viewcvs.cgi/maven/release/trunk/url +urlhttp://svn.apache.org/viewvc/maven/release/trunk/url /scm build pluginManagement
svn commit: r682007 - /maven/pom/trunk/maven/pom.xml
Author: dennisl Date: Sat Aug 2 09:38:17 2008 New Revision: 682007 URL: http://svn.apache.org/viewvc?rev=682007view=rev Log: o Update versions for reporting plugins in pluginManagement, currently commented out. o Move clirr-maven-plugin to before the reporting plugins in pluginManagement. Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=682007r1=682006r2=682007view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Sat Aug 2 09:38:17 2008 @@ -213,6 +213,11 @@ artifactIdmaven-surefire-plugin/artifactId version2.4.3/version /plugin +plugin + groupIdorg.codehaus.mojo/groupId + artifactIdclirr-maven-plugin/artifactId + version2.2.2/version +/plugin !-- set versions of common reporting plugins for site reproducibility, ordered alphabetically -- !-- won't help until MNG-3385 is fixed plugin @@ -238,7 +243,7 @@ plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-project-info-reports-plugin/artifactId - version2.0.1/version + version2.1/version /plugin plugin groupIdorg.apache.maven.plugins/groupId @@ -248,7 +253,7 @@ plugin groupIdorg.codehaus.mojo/groupId artifactIdclirr-maven-plugin/artifactId - version2.1.1/version + version2.2.2/version /plugin plugin groupIdorg.codehaus.mojo/groupId @@ -260,11 +265,6 @@ artifactIdtaglist-maven-plugin/artifactId version2.2/version /plugin-- -plugin - groupIdorg.codehaus.mojo/groupId - artifactIdclirr-maven-plugin/artifactId - version2.2.2/version -/plugin /plugins /pluginManagement /build
svn commit: r682009 - /maven/site/trunk/src/site/resources/.htaccess
Author: dennisl Date: Sat Aug 2 09:43:55 2008 New Revision: 682009 URL: http://svn.apache.org/viewvc?rev=682009view=rev Log: o Add temporary redirect from the future location of Ant Tasks site to the current site. This can be removed when the new Ant Tasks site has been published. Modified: maven/site/trunk/src/site/resources/.htaccess Modified: maven/site/trunk/src/site/resources/.htaccess URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/resources/.htaccess?rev=682009r1=682008r2=682009view=diff == --- maven/site/trunk/src/site/resources/.htaccess (original) +++ maven/site/trunk/src/site/resources/.htaccess Sat Aug 2 09:43:55 2008 @@ -1,5 +1,7 @@ ErrorDocument 404 /errors/404.html +Redirect /ant-tasks/index.html http://maven.apache.org/ant-tasks.html + Redirect Permanent /guides/mini/guide-ibiblio-upload.html http://maven.apache.org/guides/mini/guide-central-repository-upload.html Redirect Permanent /faq.html http://maven.apache.org/general.html Redirect Permanent /developers/release/pmc-release-process.html http://maven.apache.org/developers/release/releasing.html
svn commit: r682016 - /maven/pom/trunk/maven/src/site/site.xml
Author: dennisl Date: Sat Aug 2 10:14:16 2008 New Revision: 682016 URL: http://svn.apache.org/viewvc?rev=682016view=rev Log: o Make breadcrumbs and the menu for Maven Projects inherited. Modified: maven/pom/trunk/maven/src/site/site.xml Modified: maven/pom/trunk/maven/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/src/site/site.xml?rev=682016r1=682015r2=682016view=diff == --- maven/pom/trunk/maven/src/site/site.xml (original) +++ maven/pom/trunk/maven/src/site/site.xml Sat Aug 2 10:14:16 2008 @@ -35,8 +35,8 @@ version1.0.1/version /skin - publishDate format=-MM-dd position=left / - version position=left / + publishDate format=-MM-dd position=right / + version position=right / body head @@ -47,6 +47,34 @@ urchinTracker(); /script /head + +!-- Breadcrumbs that every project will inherit -- +breadcrumbs + item name=Apache href=http://www.apache.org/; / + !-- TODO: This is not working well for maven site, + needs to be investigated further before it can be enabled + item name=Maven href=http://maven.apache.org/index.html; / + -- +/breadcrumbs + +!-- Menus that every project will inherit -- menu ref=reports inherit=bottom / + +menu name=Maven Projects inherit=bottom + item name=Ant Tasks href=http://maven.apache.org/ant-tasks/index.html; / + !-- TODO: No site available for archetype yet, + enable this when the site has been deployed + item name=Archetype href=http://maven.apache.org/archetype/index.html; / + -- + item name=Doxia href=http://maven.apache.org/doxia/index.html; / + item name=JXR href=http://maven.apache.org/jxr/index.html; / + item name=Maven 1.x href=http://maven.apache.org/maven-1.x/index.html; / + item name=Maven 2 href=http://maven.apache.org/index.html; / + item name=Plugins href=http://maven.apache.org/plugins/index.html; / + item name=SCM href=http://maven.apache.org/scm/index.html; / + item name=Shared Components href=http://maven.apache.org/shared/index.html; / + item name=Surefire href=http://maven.apache.org/surefire/index.html; / + item name=Wagon href=http://maven.apache.org/wagon/index.html; / +/menu /body /project
svn commit: r682017 - /maven/site/trunk/src/site/site.xml
Author: dennisl Date: Sat Aug 2 10:16:12 2008 New Revision: 682017 URL: http://svn.apache.org/viewvc?rev=682017view=rev Log: o Inherit breadcrumbs and the menu for Maven Projects from the parent. Modified: maven/site/trunk/src/site/site.xml Modified: maven/site/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/site.xml?rev=682017r1=682016r2=682017view=diff == --- maven/site/trunk/src/site/site.xml (original) +++ maven/site/trunk/src/site/site.xml Sat Aug 2 10:16:12 2008 @@ -18,13 +18,11 @@ under the License. -- project name=Maven - publishDate position=right / version position=none / body -!-- TODO: inherited breadcrumbs, link menu -- breadcrumbs - item name=Apache href=http://www.apache.org// - item name=Maven href=http://maven.apache.org// + !-- TODO: This breadcrumb should be removed when it has been solved in the parent -- + item name=Maven href=http://maven.apache.org/index.html/ /breadcrumbs !-- TODO: incorporate, remove, etc @@ -161,22 +159,5 @@ /menu -- -!-- TODO: Inherit Maven Projects -- -menu name=Maven Projects inherit=bottom - item name=Ant Tasks href=http://maven.apache.org/ant-tasks.html; / - !-- No site available for archetype yet - item name=Archetype href=http://maven.apache.org/archetype/index.html; / - -- - item name=Doxia href=http://maven.apache.org/doxia/index.html; / - item name=JXR href=http://maven.apache.org/jxr/index.html; / - item name=Maven 1.x href=http://maven.apache.org/maven-1.x/index.html; / - item name=Maven 2 href=http://maven.apache.org/index.html; / - item name=Plugins href=http://maven.apache.org/plugins/index.html; / - item name=SCM href=http://maven.apache.org/scm/index.html; / - item name=Shared Components href=http://maven.apache.org/shared/index.html; / - item name=Surefire href=http://maven.apache.org/surefire/index.html; / - item name=Wagon href=http://maven.apache.org/wagon/index.html; / -/menu - /body /project
svn commit: r682026 - /maven/plugins/trunk/src/site/site.xml
Author: dennisl Date: Sat Aug 2 10:37:43 2008 New Revision: 682026 URL: http://svn.apache.org/viewvc?rev=682026view=rev Log: o Inherit breadcrumbs and the menu for Maven Projects from the parent. Modified: maven/plugins/trunk/src/site/site.xml Modified: maven/plugins/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/src/site/site.xml?rev=682026r1=682025r2=682026view=diff == --- maven/plugins/trunk/src/site/site.xml (original) +++ maven/plugins/trunk/src/site/site.xml Sat Aug 2 10:37:43 2008 @@ -21,16 +21,10 @@ project body -!-- TODO: use breadcrumbs more structure, links for links, and inherit subprojects as a menu or not at all -- -links - item name=Apache href=http://www.apache.org// - item name=Maven 1.x href=http://maven.apache.org/maven-1.x/ - item name=Maven 2.x href=http://maven.apache.org// - item name=Maven 2.x Plugins href=http://maven.apache.org/plugins// - item name=SCM href=http://maven.apache.org/scm/ - item name=Wagon href=http://maven.apache.org/wagon/ - item name=JXR href=http://maven.apache.org/jxr/ - item name=Doxia href=http://maven.apache.org/doxia/ -/links +breadcrumbs + !-- TODO: This breadcrumb should be removed when it has been solved in the parent -- + item name=Maven href=http://maven.apache.org/index.html; / + item name=Plugins href=http://maven.apache.org/plugins/index.html; / +/breadcrumbs /body /project
svn commit: r682027 - /maven/release/trunk/maven-release-manager/pom.xml
Author: dennisl
Date: Sat Aug 2 10:39:14 2008
New Revision: 682027
URL: http://svn.apache.org/viewvc?rev=682027view=rev
Log:
o Fix project element and name.
Modified:
maven/release/trunk/maven-release-manager/pom.xml
Modified: maven/release/trunk/maven-release-manager/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/pom.xml?rev=682027r1=682026r2=682027view=diff
==
--- maven/release/trunk/maven-release-manager/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/pom.xml Sat Aug 2 10:39:14 2008
@@ -16,7 +16,9 @@
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
- --project xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+ --
+
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
modelVersion4.0.0/modelVersion
parent
groupIdorg.apache.maven.release/groupId
@@ -25,7 +27,7 @@
/parent
artifactIdmaven-release-manager/artifactId
version1.0-alpha-5-SNAPSHOT/version
- nameMaven Shared Release Manager/name
+ nameMaven Release Manager/name
properties
plexusOutput${project.build.directory}/generated-resources/plexus/plexusOutput
svn commit: r682029 - in /maven/shared/trunk: pom.xml src/site/site.xml
Author: dennisl Date: Sat Aug 2 10:47:02 2008 New Revision: 682029 URL: http://svn.apache.org/viewvc?rev=682029view=rev Log: o Inherit breadcrumbs and the menu for Maven Projects from the parent. Modified: maven/shared/trunk/pom.xml maven/shared/trunk/src/site/site.xml Modified: maven/shared/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=682029r1=682028r2=682029view=diff == --- maven/shared/trunk/pom.xml (original) +++ maven/shared/trunk/pom.xml Sat Aug 2 10:47:02 2008 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven-parent/artifactId -version8/version +version9-SNAPSHOT/version relativePath../pom/maven/pom.xml/relativePath /parent Modified: maven/shared/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/src/site/site.xml?rev=682029r1=682028r2=682029view=diff == --- maven/shared/trunk/src/site/site.xml (original) +++ maven/shared/trunk/src/site/site.xml Sat Aug 2 10:47:02 2008 @@ -21,16 +21,10 @@ project body -!-- TODO: use breadcrumbs more structure, links for links, and inherit subprojects as a menu or not at all -- -links - item name=Apache href=http://www.apache.org// - item name=Maven 1.x href=http://maven.apache.org/maven-1.x/ - item name=Maven 2.x href=http://maven.apache.org// - item name=Maven 2.x Plugins href=http://maven.apache.org/plugins// - item name=SCM href=http://maven.apache.org/scm/ - item name=Wagon href=http://maven.apache.org/wagon/ - item name=JXR href=http://maven.apache.org/jxr/ - item name=Doxia href=http://maven.apache.org/doxia/ -/links +breadcrumbs + !-- TODO: This breadcrumb should be removed when it has been solved in the parent -- + item name=Maven href=http://maven.apache.org/index.html; / + item name=Shared Components href=http://maven.apache.org/shared/index.html; / +/breadcrumbs /body /project
svn commit: r682031 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: dennisl Date: Sat Aug 2 10:51:56 2008 New Revision: 682031 URL: http://svn.apache.org/viewvc?rev=682031view=rev Log: o Use latest versions of Project Info Reports and Site plugins. o Remove the unused Codehaus Snapshot Repository. Modified: maven/plugins/trunk/maven-war-plugin/pom.xml Modified: maven/plugins/trunk/maven-war-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=682031r1=682030r2=682031view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Sat Aug 2 10:51:56 2008 @@ -130,15 +130,15 @@ artifactIdmaven-plugin-plugin/artifactId version2.4.2/version /plugin +plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-site-plugin/artifactId + version2.0-beta-7/version +/plugin /plugins /pluginManagement plugins plugin -groupIdorg.apache.maven.plugins/groupId -artifactIdmaven-source-plugin/artifactId -version2.0.4/version - /plugin - plugin artifactIdmaven-enforcer-plugin/artifactId version1.0-alpha-3/version executions @@ -241,18 +241,13 @@ /build /profile /profiles - !-- remove when plexus-interpolation 1.2 is released -- - repositories -repository - idsnapshots.codehaus.org/id - nameCodehaus Snapshot Development Repository/name - urlhttp://snapshots.repository.codehaus.org//url - releases -enabledfalse/enabled - /releases - snapshots -enabledtrue/enabled - /snapshots -/repository - /repositories + reporting +plugins + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-project-info-reports-plugin/artifactId +version2.1/version + /plugin +/plugins + /reporting /project
svn commit: r682048 - in /maven/release/trunk/maven-release-manager/src/test/resources/projects: generate-release-poms/basic-pom-with-encoding/ rewrite-for-development/basic-pom-with-encoding/ rewrite
Author: dennisl Date: Sat Aug 2 14:16:14 2008 New Revision: 682048 URL: http://svn.apache.org/viewvc?rev=682048view=rev Log: o Revert part of r681998, setting mime-type to binary for text files that are encoded in UTF-16. Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom-with-encoding/pom.xml (props changed) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-encoding/expected-pom.xml (props changed) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-encoding/pom.xml (props changed) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-encoding/expected-pom.xml (props changed) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-encoding/pom.xml (props changed) Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom-with-encoding/pom.xml -- svn:mime-type = application/octet-stream Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-encoding/expected-pom.xml -- svn:mime-type = application/octet-stream Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-encoding/pom.xml -- svn:mime-type = application/octet-stream Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-encoding/expected-pom.xml -- svn:mime-type = application/octet-stream Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-encoding/pom.xml -- svn:mime-type = application/octet-stream
svn commit: r682053 - in /maven/plugins/trunk/maven-war-plugin/src/site/apt: ./ examples/
Author: dennisl Date: Sat Aug 2 14:32:05 2008 New Revision: 682053 URL: http://svn.apache.org/viewvc?rev=682053view=rev Log: o Use latest license headers. Modified: maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/adding-filtering-webresources.apt maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/file-name-mapping.apt maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/rapid-testing-jetty6-plugin.apt maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/war-manifest-guide.apt maven/plugins/trunk/maven-war-plugin/src/site/apt/index.apt maven/plugins/trunk/maven-war-plugin/src/site/apt/overlays.apt maven/plugins/trunk/maven-war-plugin/src/site/apt/usage.apt Modified: maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/adding-filtering-webresources.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/adding-filtering-webresources.apt?rev=682053r1=682052r2=682053view=diff == --- maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/adding-filtering-webresources.apt (original) +++ maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/adding-filtering-webresources.apt Sat Aug 2 14:32:05 2008 @@ -5,19 +5,22 @@ -- 19 June 2006 -~~ Copyright 2006 The Apache Software Foundation. +~~ 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 ~~ -~~ Licensed 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 ~~ -~~ 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. +~~ 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. ~~ NOTE: For help with the syntax of this file, see: ~~ http://maven.apache.org/doxia/references/apt-format.html Modified: maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/file-name-mapping.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/file-name-mapping.apt?rev=682053r1=682052r2=682053view=diff == --- maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/file-name-mapping.apt (original) +++ maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/file-name-mapping.apt Sat Aug 2 14:32:05 2008 @@ -5,19 +5,22 @@ -- 31 Jan 2008 -~~ Copyright 2006 The Apache Software Foundation. +~~ 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 ~~ -~~ Licensed 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 ~~ -~~ 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. +~~ 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. ~~ NOTE
svn commit: r682065 - in /maven/release/trunk/maven-release-manager/src/test/resources/projects: generate-release-poms/basic-pom-with-encoding/ rewrite-for-development/basic-pom-with-encoding/ rewrite
Author: dennisl Date: Sat Aug 2 14:55:14 2008 New Revision: 682065 URL: http://svn.apache.org/viewvc?rev=682065view=rev Log: o Trying again to revert part of r681998, setting mime-type to binary for text files that are encoded in UTF-16, and also setting EOL style to LF to avoid problems in the future. Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom-with-encoding/pom.xml (props changed) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-encoding/expected-pom.xml (props changed) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-encoding/pom.xml (props changed) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-encoding/expected-pom.xml (props changed) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-encoding/pom.xml (props changed) Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom-with-encoding/pom.xml -- --- svn:eol-style (original) +++ svn:eol-style Sat Aug 2 14:55:14 2008 @@ -1 +1 @@ -native +LF Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-encoding/expected-pom.xml -- --- svn:eol-style (original) +++ svn:eol-style Sat Aug 2 14:55:14 2008 @@ -1 +1 @@ -native +LF Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-encoding/pom.xml -- --- svn:eol-style (original) +++ svn:eol-style Sat Aug 2 14:55:14 2008 @@ -1 +1 @@ -native +LF Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-encoding/expected-pom.xml -- --- svn:eol-style (original) +++ svn:eol-style Sat Aug 2 14:55:14 2008 @@ -1 +1 @@ -native +LF Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-encoding/pom.xml -- --- svn:eol-style (original) +++ svn:eol-style Sat Aug 2 14:55:14 2008 @@ -1 +1 @@ -native +LF
svn commit: r682073 - in /maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war: overlay/ packaging/ util/
Author: dennisl
Date: Sat Aug 2 15:32:18 2008
New Revision: 682073
URL: http://svn.apache.org/viewvc?rev=682073view=rev
Log:
o Fix errors reported by Checkstyle.
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DependencyInfo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WarUtils.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java?rev=682073r1=682072r2=682073view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java
Sat Aug 2 15:32:18 2008
@@ -136,8 +136,8 @@
it.set( overlay );
}
// default includes/excludes - only if the overlay uses the
default settings
-if ( Arrays.equals( Overlay.DEFAULT_INCLUDES,
overlay.getIncludes() )
-Arrays.equals( Overlay.DEFAULT_EXCLUDES, overlay.getExcludes()
) )
+if ( Arrays.equals( Overlay.DEFAULT_INCLUDES,
overlay.getIncludes() )
+ Arrays.equals( Overlay.DEFAULT_EXCLUDES,
overlay.getExcludes() ) )
{
overlay.setIncludes( defaultIncludes );
overlay.setExcludes( defaultExcludes );
@@ -233,10 +233,10 @@
*/
private boolean compareOverlayWithArtifact( Overlay overlay, Artifact
artifact )
{
-return ( StringUtils.equals( overlay.getGroupId(),
artifact.getGroupId() )
-StringUtils.equals( overlay.getArtifactId(),
artifact.getArtifactId() )
-StringUtils.equals( overlay.getType(), artifact.getType() )
-StringUtils.equals( overlay.getClassifier(),
artifact.getClassifier() ) );
+return ( StringUtils.equals( overlay.getGroupId(),
artifact.getGroupId() )
+ StringUtils.equals( overlay.getArtifactId(),
artifact.getArtifactId() )
+ StringUtils.equals( overlay.getType(), artifact.getType() )
+ StringUtils.equals( overlay.getClassifier(),
artifact.getClassifier() ) );
}
/**
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java?rev=682073r1=682072r2=682073view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
Sat Aug 2 15:32:18 2008
@@ -118,7 +118,8 @@
* @param sourceFilesSet the files to be copied
* @throws IOException if an error occured while copying the files
*/
-protected void copyFiles( String sourceId, WarPackagingContext context,
File sourceBaseDir, PathSet sourceFilesSet, boolean filtered )
+protected void copyFiles( String sourceId, WarPackagingContext context,
File sourceBaseDir, PathSet sourceFilesSet,
+ boolean filtered )
throws IOException, MojoExecutionException
{
copyFiles( sourceId, context, sourceBaseDir, sourceFilesSet, null,
filtered );
@@ -158,15 +159,15 @@
public void refused( String ownerId, String targetFilename, String
actualOwnerId )
throws IOException
{
-context.getLog().debug( - + targetFilename + wasn't
copied because it has
svn commit: r682075 - /maven/shared/trunk/maven-invoker/src/changes/changes.xml
Author: dennisl Date: Sat Aug 2 15:35:32 2008 New Revision: 682075 URL: http://svn.apache.org/viewvc?rev=682075view=rev Log: o Set tentative release date for next release. Modified: maven/shared/trunk/maven-invoker/src/changes/changes.xml Modified: maven/shared/trunk/maven-invoker/src/changes/changes.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/changes/changes.xml?rev=682075r1=682074r2=682075view=diff == --- maven/shared/trunk/maven-invoker/src/changes/changes.xml (original) +++ maven/shared/trunk/maven-invoker/src/changes/changes.xml Sat Aug 2 15:35:32 2008 @@ -23,7 +23,7 @@ author email=[EMAIL PROTECTED]Olivier Lamy/author /properties body -release version=2.0.9 date=2008-??-?? +release version=2.0.9 date=2008-08-06 action type=fix dev=bentmann issue=MSHARED-21Spaces are incorrectly handled on command line/action action type=add dev=bentmannAdded new classes PrintStreamLogger and PrintStreamHandler/action /release
svn commit: r682077 - /maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java
Author: dennisl
Date: Sat Aug 2 16:23:47 2008
New Revision: 682077
URL: http://svn.apache.org/viewvc?rev=682077view=rev
Log:
o Remove an unused method found by PMD/CPD. An identical method exists in
org/apache/maven/plugin/war/util/WarUtils.java if anyone needs it.
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java?rev=682077r1=682076r2=682077view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java
Sat Aug 2 16:23:47 2008
@@ -231,27 +231,4 @@
}
-private Artifact getArtifact( MavenProject project, Dependency dependency )
-{
-final Iterator it = project.getArtifacts().iterator();
-while ( it.hasNext() )
-{
-Artifact artifact = (Artifact) it.next();
-if ( artifact.getGroupId().equals( dependency.getGroupId() )
- artifact.getArtifactId().equals( dependency.getArtifactId()
)
- artifact.getType().equals( dependency.getType() ) )
-{
-if ( artifact.getClassifier() == null
dependency.getClassifier() == null )
-{
-return artifact;
-}
-else if ( dependency.getClassifier() != null
- dependency.getClassifier().equals(
artifact.getClassifier() ) )
-{
-return artifact;
-}
-}
-}
-return null;
-}
}
svn commit: r682092 - in /maven/plugins/trunk/maven-war-plugin/src/site: ./ apt/ apt/examples/ fml/
Author: dennisl
Date: Sat Aug 2 19:04:02 2008
New Revision: 682092
URL: http://svn.apache.org/viewvc?rev=682092view=rev
Log:
o Rewrite some texts to make it flow better.
o Fix errors, typos and broken links.
o Add more formating.
Modified:
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/adding-filtering-webresources.apt
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/file-name-mapping.apt
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/rapid-testing-jetty6-plugin.apt
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/war-manifest-guide.apt
maven/plugins/trunk/maven-war-plugin/src/site/apt/index.apt
maven/plugins/trunk/maven-war-plugin/src/site/apt/overlays.apt
maven/plugins/trunk/maven-war-plugin/src/site/apt/usage.apt
maven/plugins/trunk/maven-war-plugin/src/site/fml/faq.fml
maven/plugins/trunk/maven-war-plugin/src/site/site.xml
Modified:
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/adding-filtering-webresources.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/adding-filtering-webresources.apt?rev=682092r1=682091r2=682092view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/adding-filtering-webresources.apt
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/adding-filtering-webresources.apt
Sat Aug 2 19:04:02 2008
@@ -3,8 +3,9 @@
--
Pete Marvin King
--
- 19 June 2006
-
+ 2008-08-03
+ --
+
~~ 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
@@ -27,7 +28,7 @@
Adding and Filtering External Web Resources
- The default resource directory for all maven2 projects is
src/main/resources which
+ The default resource directory for all Maven 2 projects is
src/main/resources which
will end up in target/classes and in WEB-INF/classes in the war.
The directory
structure will be preserved in the process.
@@ -38,7 +39,7 @@
+---+
project
- [...]
+ ...
build
plugins
plugin
@@ -52,16 +53,16 @@
directoryresource2/directory
/resource
/webResources
- /configuration
- /plugin
+/configuration
+ /plugin
/plugins
/build
- [...]
+ ...
/project
+---+
- Using our sample project in the usage section with an added external resource
-
+ Using our sample project in the {{{../usage.html}usage section}} with an
added external resource, like this:
+
+--+
.
|-- pom.xml
@@ -88,10 +89,10 @@
`-- websource.jsp
+--+
- would end up in the war as
-
+ would end up in the war as:
+
+--+
-documentedproject-1.0-SNAPSHOT.war
+documentedproject-1.0-SNAPSHOT.war
|-- META-INF
| |-- MANIFEST.MF
| `-- maven
@@ -115,47 +116,47 @@
`-- jsp
`-- websource.jsp
+--+
-
+
external-resource2.jpg and image2 are copied to the root of the
war, preserving the
directory structure.
-
+
*Configuring webResources
-
- webResources is a list of resources. All options of resource is
supported.
-
+
+ webResources is a list of resources. All options of resource are
supported.
+
A web resource
-
- * can have inclusion/exclusion
-
- * can be filtered
-
- * is not limited to the default destination - the root of the war.
-
-**Inclusion/Exclusion for webResources
- Using our pom configuration above we can add
-
-+--+
- [..]
+ * can have includes/excludes
+
+ * can be filtered
+
+ * is not limited to the default destination - the root of the war
+
+**Includes/Excludes
+
+ To include all jpgs to the war we can add the following to our POM
configuration from above:
+
++--+
+ ...
configuration
-webResources
+webResources
resource
!-- this is relative to the pom.xml directory --
directoryresource2/directory
!-- the list has a default value of ** --
includes
- include**/*.jpg/include
-includes
+ include**/*.jpg/include
+includes
/resource
/webResources
- /configuration
- [...]
-+--+
-
- to include all jpgs to the war or
-
-+--+
- [..]
+ /configuration
+ ...
++--+
+
+ To exclude the image2 directory from the the war add this:
+
++--+
+ ...
configuration
webResources
resource
@@ -163,62 +164,68 @@
directoryresource2/directory
!-- there's no default value for this --
excludes
- exclude**/image2/exclude
svn commit: r682093 - /maven/shared/trunk/maven-invoker/pom.xml
Author: dennisl Date: Sat Aug 2 19:09:41 2008 New Revision: 682093 URL: http://svn.apache.org/viewvc?rev=682093view=rev Log: [maven-release-plugin] prepare release maven-invoker-2.0.9 Modified: maven/shared/trunk/maven-invoker/pom.xml Modified: maven/shared/trunk/maven-invoker/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/pom.xml?rev=682093r1=682092r2=682093view=diff == --- maven/shared/trunk/maven-invoker/pom.xml (original) +++ maven/shared/trunk/maven-invoker/pom.xml Sat Aug 2 19:09:41 2008 @@ -25,7 +25,7 @@ version9/version /parent artifactIdmaven-invoker/artifactId - version2.0.9-SNAPSHOT/version + version2.0.9/version nameMaven Invoker/name descriptionA component to programmatically invoke Maven./description issueManagement @@ -161,8 +161,8 @@ /plugins /reporting scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-invoker/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-invoker/developerConnection -urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-invoker-2.0.9/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-invoker-2.0.9/developerConnection + urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-invoker-2.0.9/url /scm /project
svn commit: r682094 - in /maven/shared/tags/maven-invoker-2.0.9: ./ pom.xml
Author: dennisl Date: Sat Aug 2 19:09:49 2008 New Revision: 682094 URL: http://svn.apache.org/viewvc?rev=682094view=rev Log: [maven-release-plugin] copy for tag maven-invoker-2.0.9 Added: maven/shared/tags/maven-invoker-2.0.9/ - copied from r682076, maven/shared/trunk/maven-invoker/ maven/shared/tags/maven-invoker-2.0.9/pom.xml - copied unchanged from r682093, maven/shared/trunk/maven-invoker/pom.xml
svn commit: r682095 - /maven/shared/trunk/maven-invoker/pom.xml
Author: dennisl Date: Sat Aug 2 19:09:53 2008 New Revision: 682095 URL: http://svn.apache.org/viewvc?rev=682095view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/shared/trunk/maven-invoker/pom.xml Modified: maven/shared/trunk/maven-invoker/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/pom.xml?rev=682095r1=682094r2=682095view=diff == --- maven/shared/trunk/maven-invoker/pom.xml (original) +++ maven/shared/trunk/maven-invoker/pom.xml Sat Aug 2 19:09:53 2008 @@ -25,7 +25,7 @@ version9/version /parent artifactIdmaven-invoker/artifactId - version2.0.9/version + version2.0.10-SNAPSHOT/version nameMaven Invoker/name descriptionA component to programmatically invoke Maven./description issueManagement @@ -161,8 +161,8 @@ /plugins /reporting scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-invoker-2.0.9/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-invoker-2.0.9/developerConnection - urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-invoker-2.0.9/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-invoker/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-invoker/developerConnection +urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/url /scm /project
svn commit: r682129 - in /maven: sandbox/trunk/shared/maven-filtering/ shared/trunk/maven-filtering/
Author: dennisl Date: Sun Aug 3 04:49:25 2008 New Revision: 682129 URL: http://svn.apache.org/viewvc?rev=682129view=rev Log: Promote maven-filtering out of the sandbox. Added: maven/shared/trunk/maven-filtering/ - copied from r682128, maven/sandbox/trunk/shared/maven-filtering/ Removed: maven/sandbox/trunk/shared/maven-filtering/
svn commit: r682132 - in /maven/shared/trunk/maven-filtering: ./ src/main/java/org/apache/maven/shared/filtering/ src/site/ src/site/apt/ src/test/java/org/apache/maven/shared/filtering/ src/test/reso
Author: dennisl
Date: Sun Aug 3 04:56:41 2008
New Revision: 682132
URL: http://svn.apache.org/viewvc?rev=682132view=rev
Log:
o Remove svn executable flag.
Modified:
maven/shared/trunk/maven-filtering/pom.xml (props changed)
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/CompositeMap.java
(props changed)
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
(props changed)
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
(props changed)
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java
(props changed)
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java
(props changed)
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFilteringException.java
(props changed)
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenProjectValueSource.java
(props changed)
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java
(props changed)
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java
(props changed)
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/PropertiesEscapingBackSlashValueSource.java
(props changed)
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
(props changed)
maven/shared/trunk/maven-filtering/src/site/apt/index.apt (props changed)
maven/shared/trunk/maven-filtering/src/site/apt/usage.apt (props changed)
maven/shared/trunk/maven-filtering/src/site/site.xml (props changed)
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
(props changed)
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
(props changed)
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/StubMavenProject.java
(props changed)
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/StubMavenSession.java
(props changed)
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java
(props changed)
maven/shared/trunk/maven-filtering/src/test/resources/pom.xml (props
changed)
maven/shared/trunk/maven-filtering/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt
(props changed)
maven/shared/trunk/maven-filtering/src/test/units-files/maven-resources-filtering/excludedir/bar.txt
(props changed)
maven/shared/trunk/maven-filtering/src/test/units-files/maven-resources-filtering/excludedir/foo.txt
(props changed)
maven/shared/trunk/maven-filtering/src/test/units-files/maven-resources-filtering/excludefile.txt
(props changed)
maven/shared/trunk/maven-filtering/src/test/units-files/maven-resources-filtering/happy_duke.gif
(props changed)
maven/shared/trunk/maven-filtering/src/test/units-files/maven-resources-filtering/includedir/include.txt
(props changed)
maven/shared/trunk/maven-filtering/src/test/units-files/maven-resources-filtering/includefile.txt
(props changed)
maven/shared/trunk/maven-filtering/src/test/units-files/maven-resources-filtering/maven-resources-filtering.txt
(props changed)
maven/shared/trunk/maven-filtering/src/test/units-files/propertyutils-test.properties
(props changed)
maven/shared/trunk/maven-filtering/src/test/units-files/reflection-test.properties
(props changed)
Propchange: maven/shared/trunk/maven-filtering/pom.xml
('svn:executable' removed)
Propchange:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/CompositeMap.java
('svn:executable' removed)
Propchange:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
('svn:executable' removed)
Propchange:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
('svn:executable' removed)
Propchange:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java
('svn:executable' removed)
Propchange:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java
('svn:executable' removed)
Propchange:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFilteringException.java
('svn:executable
svn commit: r682187 - /maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java
Author: dennisl Date: Sun Aug 3 09:03:28 2008 New Revision: 682187 URL: http://svn.apache.org/viewvc?rev=682187view=rev Log: o Improve Javadoc. Modified: maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java Modified: maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java?rev=682187r1=682186r2=682187view=diff == --- maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java (original) +++ maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java Sun Aug 3 09:03:28 2008 @@ -37,8 +37,9 @@ * @param outputDirectory parent destination directory * @param mavenProject the maven project * @param encoding encoding to use for writing files - * @param fileFilters [EMAIL PROTECTED] List} of String which are path to a Property file + * @param fileFilters [EMAIL PROTECTED] List} of String which are path to a Property file * @param nonFilteredFileExtensions [EMAIL PROTECTED] List} of String for non filtered file extensions + * @param mavenSession Can include executionProperties that will be used for filtering * @throws MavenFilteringException */ void filterResources( List resources, File outputDirectory, MavenProject mavenProject, String encoding, @@ -56,22 +57,22 @@ */ void filterResources( List resources, File outputDirectory, String encoding, List filterWrappers, File resourcesBaseDirectory, List nonFilteredFileExtensions ) -throws MavenFilteringException; - +throws MavenFilteringException; + /** * return the List of the non filtered extensions (jpg,jpeg,gif,bmp,png) * @return [EMAIL PROTECTED] List} of [EMAIL PROTECTED] String} */ List getDefaultNonFilteredFileExtensions(); - + /** * @param fileName the file name - * @param userNonFilteredFileExtensions an extra list of file extensions - * @return true if filtering can be apply to the file (means extensions.lowerCase is in the + * @param userNonFilteredFileExtensions an extra list of file extensions + * @return true if filtering can be apply to the file (means extensions.lowerCase is in the * default List or in the user defined extension List) */ boolean filteredFileExtension( String fileName, List userNonFilteredFileExtensions ); - + /** * @param mavenResourcesExecution * @throws MavenFilteringException
svn commit: r682188 - /maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
Author: dennisl
Date: Sun Aug 3 09:06:19 2008
New Revision: 682188
URL: http://svn.apache.org/viewvc?rev=682188view=rev
Log:
o Remove line that does the same thing that is done on the following line,
because mavenProject.getFilters() is the same thing as
mavenProject.getBuild().getFilters().
Modified:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.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=682188r1=682187r2=682188view=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
Sun Aug 3 09:06:19 2008
@@ -40,8 +40,8 @@
/**
* @author a href=mailto:[EMAIL PROTECTED]olamy/a
* @version $Id$
- *
- * @plexus.component role=org.apache.maven.shared.filtering.MavenFileFilter
+ *
+ * @plexus.component role=org.apache.maven.shared.filtering.MavenFileFilter
* role-hint=default
*/
public class DefaultMavenFileFilter
@@ -85,18 +85,18 @@
final boolean
escapedBackslashesInFilePath, MavenSession mavenSession )
throws MavenFilteringException
{
-
+
// here we build some properties which will be used to read some
properties files
// to interpolate the expression ${ } in this properties file
// Take a copy of filterProperties to ensure that evaluated
filterTokens are not propagated
// to subsequent filter files. NB this replicates current behaviour
and seems to make sense.
-
+
final Properties baseProps = new Properties();
// Project properties
baseProps.putAll( mavenProject.getProperties() == null ?
Collections.EMPTY_MAP : mavenProject
-.getProperties() );
+.getProperties() );
// TODO this is NPE free but do we consider this as normal
// or do we have to throw an MavenFilteringException with mavenSession
cannot be null
if ( mavenSession != null )
@@ -104,39 +104,36 @@
// execution properties wins
baseProps.putAll( mavenSession.getExecutionProperties() );
}
-
+
// now we build properties to use for resources interpolation
-
+
final Properties filterProperties = new Properties();
-
-loadProperties( filterProperties, filters, baseProps );
-loadProperties( filterProperties, mavenProject.getFilters(), baseProps
);
+loadProperties( filterProperties, filters, baseProps );
loadProperties( filterProperties,
mavenProject.getBuild().getFilters(), baseProps );
// Project properties
filterProperties.putAll( mavenProject.getProperties() == null ?
Collections.EMPTY_MAP : mavenProject
-.getProperties() );
+.getProperties() );
if ( mavenSession != null )
{
// execution properties wins
filterProperties.putAll( mavenSession.getExecutionProperties() );
}
-
+
List defaultFilterWrappers = new ArrayList( 3 );
-final ValueSource propertiesValueSource =
+final ValueSource propertiesValueSource =
new PropertiesEscapingBackSlashValueSource(
escapedBackslashesInFilePath, filterProperties );
-
-// support ${token}
+// support ${token}
FileUtils.FilterWrapper one = new FileUtils.FilterWrapper()
{
public Reader getReader( Reader reader )
{
Interpolator propertiesInterpolator = new
RegexBasedInterpolator();
-propertiesInterpolator.addValueSource( propertiesValueSource
);
+propertiesInterpolator.addValueSource( propertiesValueSource
);
return new InterpolatorFilterReader( reader,
propertiesInterpolator );
}
};
@@ -148,39 +145,38 @@
public Reader getReader( Reader reader )
{
final Interpolator propertiesInterpolatorAtRegex = new
RegexBasedInterpolator( \\@, (.+?)\\@ );
-propertiesInterpolatorAtRegex.addValueSource(
propertiesValueSource );
+propertiesInterpolatorAtRegex.addValueSource(
propertiesValueSource );
return new InterpolatorFilterReader( reader,
propertiesInterpolatorAtRegex, @, @ );
}
};
defaultFilterWrappers.add( second );
-
+
// support ${token
svn commit: r682189 - in /maven/shared/trunk/maven-filtering/src/site: apt/index.apt apt/usage.apt site.xml
Author: dennisl
Date: Sun Aug 3 09:07:19 2008
New Revision: 682189
URL: http://svn.apache.org/viewvc?rev=682189view=rev
Log:
o Major reworking of the documentation.
Modified:
maven/shared/trunk/maven-filtering/src/site/apt/index.apt
maven/shared/trunk/maven-filtering/src/site/apt/usage.apt
maven/shared/trunk/maven-filtering/src/site/site.xml
Modified: maven/shared/trunk/maven-filtering/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/site/apt/index.apt?rev=682189r1=682188r2=682189view=diff
==
--- maven/shared/trunk/maven-filtering/src/site/apt/index.apt (original)
+++ maven/shared/trunk/maven-filtering/src/site/apt/index.apt Sun Aug 3
09:07:19 2008
@@ -1,5 +1,5 @@
--
- Reference
+ Introduction
--
Olivier Lamy
--
@@ -23,50 +23,54 @@
~~ specific language governing permissions and limitations
~~ under the License.
-Maven Filtering Components
+Maven Filtering
- These Plexus components have been built with the filtering process/code
coming from the maven-resources-plugin.
-
- The goal is to provide a common way for all plugins which needs to filter
resources.
-
-* Component MavenResourcesFiltering
-
- This component will apply filtering on a List of
org.apache.maven.model.Resource.
-
- The method without the filterWrappers parameter will interpolate the
files using the default List of FileUtils.FilterWrapper (see
below).
-
- The component will not filter some predefined file extensions (jpg, jpeg,
gif, bmp, png). Note: you can easily add extra file extensions.
+ These Plexus components have been built from the filtering process/code in
Maven Resources Plugin.
-* Component MavenFileFilter
+ The goal is to provide a shared component for all plugins which needs to
filter resources.
+
+* MavenResourcesFiltering
+
+ This component will apply filtering on a List of
org.apache.maven.model.Resource.
+
+ If you want to use the default List of FileUtils.FilterWrapper
(see below)
+ you should use the method without the filterWrappers parameter.
+
+ The component will not filter a predefined set of file extensions (jpg,
jpeg, gif, bmp, png).
+ Note: you can easily add extra file extensions.
+
+* MavenFileFilter
This component has a method which returns the default
FileUtils.FilterWrapper.
These are:
-
-* interpolation with token $\{ \} and values from filters,
project.filters, project.build.filters, pom.properties and
mavenSession.executionProperties
-
-* interpolation with token @ @ and values from filters, project.filters,
project.build.filters, pom.properties and mavenSession.executionProperties
-
+
+* interpolation with token $\{ \} and values from properties files,
project.build.filters, project.properties
+ and mavenSession.executionProperties
+
+* interpolation with token @ @ and values from properties files,
project.build.filters, project.properties
+ and mavenSession.executionProperties
+
* interpolation with token $\{ \} and values from mavenProject
interpolation
-
+
* interpolation with token @ @ and values from mavenProject interpolation
-
+
[]
-
-The values (Properties object) used for interpolation are loaded with the
following order:
-
-* List of properties files (the method has a parameter which accept a
List of String - path properties files)
-
-* pom.filters
-
-* pom.build.filters
-
-* pom.properties
-
-* mavenSession.executionProperties
-
+
+The values used for interpolation are stored in a Properties object
+and are loaded in the following order:
+
+* A List of properties files, provided as a parameter to the method
+
+* Filters defined in the \build\/\filters\ section of the
POM
+
+* Properties defined in the \properties\ section of the POM
+
+* The executionProperties from the current MavenSession
+
[]
-
+
Note: As it's a Properties object, the last defined key/value
pair wins.
-
-Note: When building the global Properties object and reading the
properties files defined the different filters,
-interpolation with the token $\{ \} is supported for this filters with a
limited properties values coming from pom.properties and
mavenSession.executionProperties (last wins too).
+
+Note: When building the Properties object and reading the
properties files defining the different filters,
+interpolation with the token $\{ \} is supported for these filters with
limited properties values coming from
+project.properties and mavenSession.executionProperties. The last wins
here too.
Modified: maven/shared/trunk/maven-filtering/src/site/apt/usage.apt
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/site/apt/usage.apt?rev=682189r1=682188r2=682189view=diff
svn commit: r682191 - /maven/shared/trunk/maven-filtering/pom.xml
Author: dennisl Date: Sun Aug 3 09:19:17 2008 New Revision: 682191 URL: http://svn.apache.org/viewvc?rev=682191view=rev Log: o Change SCM after the promotion from sandbox. Modified: maven/shared/trunk/maven-filtering/pom.xml Modified: maven/shared/trunk/maven-filtering/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/pom.xml?rev=682191r1=682190r2=682191view=diff == --- maven/shared/trunk/maven-filtering/pom.xml (original) +++ maven/shared/trunk/maven-filtering/pom.xml Sun Aug 3 09:19:17 2008 @@ -43,9 +43,9 @@ /issueManagement scm - connectionscm:svn:https://svn.apache.org/repos/asf/maven/sandbox/trunk/shared/maven-filtering/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/sandbox/trunk/shared/maven-filtering/developerConnection - urlhttp://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-filtering/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-filtering/developerConnection +urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/url /scm build @@ -83,7 +83,7 @@ groupIdorg.apache.maven/groupId artifactIdmaven-core/artifactId version2.0.6/version -/dependency +/dependency dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-utils/artifactId
svn commit: r682200 - /maven/shared/trunk/pom.xml
Author: dennisl
Date: Sun Aug 3 12:10:34 2008
New Revision: 682200
URL: http://svn.apache.org/viewvc?rev=682200view=rev
Log:
o Add maven-filtering.
o Configure a stagingSiteURL for the Site plugin.
Modified:
maven/shared/trunk/pom.xml
Modified: maven/shared/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=682200r1=682199r2=682200view=diff
==
--- maven/shared/trunk/pom.xml (original)
+++ maven/shared/trunk/pom.xml Sun Aug 3 12:10:34 2008
@@ -57,6 +57,7 @@
modulemaven-dependency-tree/module
modulemaven-downloader/module
modulemaven-doxia-tools/module
+modulemaven-filtering/module
modulemaven-invoker/module
modulemaven-model-converter/module
modulemaven-osgi/module
@@ -86,6 +87,12 @@
tagBasehttps://svn.apache.org/repos/asf/maven/shared/tags/tagBase
/configuration
/plugin
+plugin
+ artifactIdmaven-site-plugin/artifactId
+ configuration
+
stagingSiteURLscp://people.apache.org/www/maven.apache.org/shared/${project.artifactId}-${project.version}/stagingSiteURL
+ /configuration
+/plugin
/plugins
/pluginManagement
/build
svn commit: r682204 - /maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/StubMavenSession.java
Author: dennisl
Date: Sun Aug 3 13:24:30 2008
New Revision: 682204
URL: http://svn.apache.org/viewvc?rev=682204view=rev
Log:
o Follow our code style.
Modified:
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/StubMavenSession.java
Modified:
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/StubMavenSession.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/StubMavenSession.java?rev=682204r1=682203r2=682204view=diff
==
---
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/StubMavenSession.java
(original)
+++
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/StubMavenSession.java
Sun Aug 3 13:24:30 2008
@@ -1,3 +1,5 @@
+package org.apache.maven.shared.filtering;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.shared.filtering;
import java.util.Properties;
@@ -39,5 +40,5 @@
{
return System.getProperties();
}
-
+
}
svn commit: r682205 - /maven/shared/trunk/maven-filtering/pom.xml
Author: dennisl Date: Sun Aug 3 13:25:11 2008 New Revision: 682205 URL: http://svn.apache.org/viewvc?rev=682205view=rev Log: o Add used but undeclared dependencies. Modified: maven/shared/trunk/maven-filtering/pom.xml Modified: maven/shared/trunk/maven-filtering/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/pom.xml?rev=682205r1=682204r2=682205view=diff == --- maven/shared/trunk/maven-filtering/pom.xml (original) +++ maven/shared/trunk/maven-filtering/pom.xml Sun Aug 3 13:25:11 2008 @@ -7,9 +7,9 @@ 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 @@ -18,7 +18,6 @@ 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/maven-v4_0_0.xsd; - parent groupIdorg.apache.maven.shared/groupId artifactIdmaven-shared-components/artifactId @@ -28,7 +27,7 @@ prerequisites maven2.0.6/maven /prerequisites - + modelVersion4.0.0/modelVersion groupIdorg.apache.maven.shared/groupId artifactIdmaven-filtering/artifactId @@ -85,6 +84,16 @@ version2.0.6/version /dependency dependency + groupIdorg.apache.maven/groupId + artifactIdmaven-model/artifactId + version2.0.6/version +/dependency +dependency + groupIdorg.codehaus.plexus/groupId + artifactIdplexus-container-default/artifactId + version1.0-alpha-9-stable-1/version +/dependency +dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-utils/artifactId version1.5.5/version
svn commit: r682208 - in /maven/shared/tags/maven-filtering-1.0-beta-1: ./ pom.xml
Author: dennisl Date: Sun Aug 3 13:29:56 2008 New Revision: 682208 URL: http://svn.apache.org/viewvc?rev=682208view=rev Log: [maven-release-plugin] copy for tag maven-filtering-1.0-beta-1 Added: maven/shared/tags/maven-filtering-1.0-beta-1/ - copied from r682205, maven/shared/trunk/maven-filtering/ maven/shared/tags/maven-filtering-1.0-beta-1/pom.xml - copied unchanged from r682207, maven/shared/trunk/maven-filtering/pom.xml
svn commit: r682207 - /maven/shared/trunk/maven-filtering/pom.xml
Author: dennisl Date: Sun Aug 3 13:29:42 2008 New Revision: 682207 URL: http://svn.apache.org/viewvc?rev=682207view=rev Log: [maven-release-plugin] prepare release maven-filtering-1.0-beta-1 Modified: maven/shared/trunk/maven-filtering/pom.xml Modified: maven/shared/trunk/maven-filtering/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/pom.xml?rev=682207r1=682206r2=682207view=diff == --- maven/shared/trunk/maven-filtering/pom.xml (original) +++ maven/shared/trunk/maven-filtering/pom.xml Sun Aug 3 13:29:42 2008 @@ -32,7 +32,7 @@ groupIdorg.apache.maven.shared/groupId artifactIdmaven-filtering/artifactId packagingjar/packaging - version1.0-beta-1-SNAPSHOT/version + version1.0-beta-1/version nameMaven Filtering/name @@ -42,9 +42,9 @@ /issueManagement scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-filtering/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-filtering/developerConnection -urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-filtering-1.0-beta-1/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-filtering-1.0-beta-1/developerConnection + urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-filtering-1.0-beta-1/url /scm build
svn commit: r682209 - /maven/shared/trunk/maven-filtering/pom.xml
Author: dennisl Date: Sun Aug 3 13:30:03 2008 New Revision: 682209 URL: http://svn.apache.org/viewvc?rev=682209view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/shared/trunk/maven-filtering/pom.xml Modified: maven/shared/trunk/maven-filtering/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/pom.xml?rev=682209r1=682208r2=682209view=diff == --- maven/shared/trunk/maven-filtering/pom.xml (original) +++ maven/shared/trunk/maven-filtering/pom.xml Sun Aug 3 13:30:03 2008 @@ -32,7 +32,7 @@ groupIdorg.apache.maven.shared/groupId artifactIdmaven-filtering/artifactId packagingjar/packaging - version1.0-beta-1/version + version1.0-beta-2-SNAPSHOT/version nameMaven Filtering/name @@ -42,9 +42,9 @@ /issueManagement scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-filtering-1.0-beta-1/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-filtering-1.0-beta-1/developerConnection - urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-filtering-1.0-beta-1/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-filtering/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-filtering/developerConnection +urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/url /scm build
svn commit: r682212 - /maven/plugins/trunk/maven-idea-plugin/pom.xml
Author: dennisl Date: Sun Aug 3 13:53:11 2008 New Revision: 682212 URL: http://svn.apache.org/viewvc?rev=682212view=rev Log: Rolling back the release. Modified: maven/plugins/trunk/maven-idea-plugin/pom.xml Modified: maven/plugins/trunk/maven-idea-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-idea-plugin/pom.xml?rev=682212r1=682211r2=682212view=diff == --- maven/plugins/trunk/maven-idea-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-idea-plugin/pom.xml Sun Aug 3 13:53:11 2008 @@ -28,7 +28,7 @@ artifactIdmaven-idea-plugin/artifactId packagingmaven-plugin/packaging nameMaven IDEA Plugin/name - version2.3-SNAPSHOT/version + version2.2-SNAPSHOT/version prerequisites maven2.0.1/maven
svn commit: r682213 - /maven/plugins/trunk/maven-idea-plugin/pom.xml
Author: dennisl Date: Sun Aug 3 14:02:36 2008 New Revision: 682213 URL: http://svn.apache.org/viewvc?rev=682213view=rev Log: o Moved MPIR out of the reporting profile into the reporting section again, because it is used even if the reporting profile is not activated. Modified: maven/plugins/trunk/maven-idea-plugin/pom.xml Modified: maven/plugins/trunk/maven-idea-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-idea-plugin/pom.xml?rev=682213r1=682212r2=682213view=diff == --- maven/plugins/trunk/maven-idea-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-idea-plugin/pom.xml Sun Aug 3 14:02:36 2008 @@ -126,10 +126,6 @@ reporting plugins plugin -artifactIdmaven-project-info-reports-plugin/artifactId -version2.1/version - /plugin - plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-changes-plugin/artifactId version2.0/version @@ -323,4 +319,13 @@ /reporting /profile /profiles + + reporting +plugins + plugin +artifactIdmaven-project-info-reports-plugin/artifactId +version2.1/version + /plugin +/plugins + /reporting /project \ No newline at end of file
svn commit: r682215 - /maven/plugins/trunk/maven-idea-plugin/pom.xml
Author: dennisl Date: Sun Aug 3 14:07:53 2008 New Revision: 682215 URL: http://svn.apache.org/viewvc?rev=682215view=rev Log: [maven-release-plugin] prepare release maven-idea-plugin-2.2 Modified: maven/plugins/trunk/maven-idea-plugin/pom.xml Modified: maven/plugins/trunk/maven-idea-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-idea-plugin/pom.xml?rev=682215r1=682214r2=682215view=diff == --- maven/plugins/trunk/maven-idea-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-idea-plugin/pom.xml Sun Aug 3 14:07:53 2008 @@ -28,7 +28,7 @@ artifactIdmaven-idea-plugin/artifactId packagingmaven-plugin/packaging nameMaven IDEA Plugin/name - version2.2-SNAPSHOT/version + version2.2/version prerequisites maven2.0.1/maven @@ -40,9 +40,9 @@ /issueManagement scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-idea-plugin//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-idea-plugin//developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-idea-plugin//url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-idea-plugin-2.2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-idea-plugin-2.2/developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-idea-plugin-2.2/url /scm build
svn commit: r682216 - /maven/plugins/tags/maven-idea-plugin-2.2/
Author: dennisl Date: Sun Aug 3 14:09:51 2008 New Revision: 682216 URL: http://svn.apache.org/viewvc?rev=682216view=rev Log: Revert release. Removed: maven/plugins/tags/maven-idea-plugin-2.2/
svn commit: r682217 - in /maven/plugins/tags/maven-idea-plugin-2.2: ./ pom.xml
Author: dennisl Date: Sun Aug 3 14:10:55 2008 New Revision: 682217 URL: http://svn.apache.org/viewvc?rev=682217view=rev Log: [maven-release-plugin] copy for tag maven-idea-plugin-2.2 Added: maven/plugins/tags/maven-idea-plugin-2.2/ - copied from r682211, maven/plugins/trunk/maven-idea-plugin/ maven/plugins/tags/maven-idea-plugin-2.2/pom.xml - copied unchanged from r682215, maven/plugins/trunk/maven-idea-plugin/pom.xml
svn commit: r682218 - /maven/plugins/trunk/maven-idea-plugin/pom.xml
Author: dennisl Date: Sun Aug 3 14:11:00 2008 New Revision: 682218 URL: http://svn.apache.org/viewvc?rev=682218view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-idea-plugin/pom.xml Modified: maven/plugins/trunk/maven-idea-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-idea-plugin/pom.xml?rev=682218r1=682217r2=682218view=diff == --- maven/plugins/trunk/maven-idea-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-idea-plugin/pom.xml Sun Aug 3 14:11:00 2008 @@ -28,7 +28,7 @@ artifactIdmaven-idea-plugin/artifactId packagingmaven-plugin/packaging nameMaven IDEA Plugin/name - version2.2/version + version2.3-SNAPSHOT/version prerequisites maven2.0.1/maven @@ -40,9 +40,9 @@ /issueManagement scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-idea-plugin-2.2/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-idea-plugin-2.2/developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-idea-plugin-2.2/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-idea-plugin//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-idea-plugin//developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-idea-plugin//url /scm build
svn commit: r682675 - /maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/
Author: dennisl Date: Tue Aug 5 04:27:25 2008 New Revision: 682675 URL: http://svn.apache.org/viewvc?rev=682675view=rev Log: o Adjust indentation. Modified: maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-artifacts.apt maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-project-dependencies.apt maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/preparing-dependencies.apt maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/unpacking-artifacts.apt maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/unpacking-project-dependencies.apt maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/using-dependencies-sources.apt Modified: maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-artifacts.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-artifacts.apt?rev=682675r1=682674r2=682675view=diff == --- maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-artifacts.apt (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-artifacts.apt Tue Aug 5 04:27:25 2008 @@ -34,8 +34,8 @@ project [...] build - plugins - plugin +plugins + plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-dependency-plugin/artifactId executions @@ -127,8 +127,8 @@ project [...] build - plugins - plugin +plugins + plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-dependency-plugin/artifactId configuration Modified: maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-project-dependencies.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-project-dependencies.apt?rev=682675r1=682674r2=682675view=diff == --- maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-project-dependencies.apt (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/copying-project-dependencies.apt Tue Aug 5 04:27:25 2008 @@ -34,8 +34,8 @@ project [...] build - plugins - plugin +plugins + plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-dependency-plugin/artifactId executions @@ -70,8 +70,8 @@ project [...] build - plugins - plugin +plugins + plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-dependency-plugin/artifactId executions Modified: maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/preparing-dependencies.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/preparing-dependencies.apt?rev=682675r1=682674r2=682675view=diff == --- maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/preparing-dependencies.apt (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/preparing-dependencies.apt Tue Aug 5 04:27:25 2008 @@ -34,8 +34,7 @@ [INFO] Used declared dependencies: [INFO]org.codehaus.plexus:plexus-archiver:jar:1.0-alpha-7:compile [INFO]junit:junit:jar:3.8.1:test -[INFO] -org.codehaus.plexus:plexus-container-default:jar:1.0-alpha-9:compile +[INFO]org.codehaus.plexus:plexus-container-default:jar:1.0-alpha-9:compile [INFO]org.apache.maven:maven-model:jar:2.0.5:compile [INFO]org.apache.maven:maven-project:jar:2.0.5:compile [INFO]org.apache.maven.shared:file-management:jar:1.1:compile Modified: maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/unpacking-artifacts.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/unpacking-artifacts.apt?rev=682675r1=682674r2=682675view=diff == --- maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/unpacking-artifacts.apt (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/unpacking-artifacts.apt Tue Aug 5 04:27:25 2008 @@ -35,8 +35,8 @@ project [...] build -plugins - plugin + plugins + plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-dependency-plugin/artifactId executions @@ -92,8 +92,8 @@ project [...] build - plugins - plugin +plugins + plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-dependency-plugin/artifactId configuration Modified: maven/plugins/trunk/maven-dependency-plugin/src/site/apt
svn commit: r682681 - /maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt
Author: dennisl
Date: Tue Aug 5 04:44:22 2008
New Revision: 682681
URL: http://svn.apache.org/viewvc?rev=682681view=rev
Log:
o Adjust indentation.
o Remove tab characters.
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt
Modified: maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt?rev=682681r1=682680r2=682681view=diff
==
--- maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt
(original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt Tue Aug
5 04:44:22 2008
@@ -60,8 +60,8 @@
project
[...]
build
- plugins
- plugin
+plugins
+ plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-dependency-plugin/artifactId
executions
@@ -78,7 +78,7 @@
artifactId[ artifactId ]/artifactId
version[ version ]/version
type[ packaging ]/type
- classifier [classifier - optional]
/classifier
+ classifier [classifier - optional] /classifier
overWrite[ true or false ]/overWrite
outputDirectory[ output directory ]/outputDirectory
destFileName[ filename ]/destFileName
@@ -95,20 +95,20 @@
/project
+---+
- If you intend to configure this mojo for execution on the command line
using:
+ If you intend to configure this mojo for execution on the command line using:
+---+
mvn dependency:copy
+---+
- you must not put the configuration inside the executions tag. Your
configuration should look like this:
-
+ you must not put the configuration inside the executions tag. Your
configuration should look like this:
+
+---+
project
[...]
build
- plugins
- plugin
+plugins
+ plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-dependency-plugin/artifactId
configuration
@@ -118,7 +118,7 @@
artifactId[ artifactId ]/artifactId
version[ version ]/version
type[ packaging ]/type
- classifier [classifier - optional] /classifier
+ classifier [classifier - optional] /classifier
overWrite[ true or false ]/overWrite
outputDirectory[ output directory ]/outputDirectory
destFileName[ filename ]/destFileName
@@ -131,7 +131,7 @@
/build
[...]
/project
-+---+
++---+
* The dependency:copy-dependencies mojo
@@ -159,9 +159,9 @@
mvn dependency:copy-dependencies -Dclassifer=sources will try to find
the sources for all dependencies and copy them.
- Also included is the ability to include or exclude by type (war, jar
etc), scope (runtime, test, etc), classifier (jdk14, sources, etc), groupId,
artifactId, or a combination of them.
-
- NOTE: As of 2.0-alpha-5, you may mix includes and excludes of the same
category (ie scope). Includes are processed before excludes.
+ Also included is the ability to include or exclude by type (war, jar etc),
scope (runtime, test, etc), classifier (jdk14, sources, etc), groupId,
artifactId, or a combination of them.
+
+ Note: As of 2.0-alpha-5, you may mix includes and excludes of the same
category (ie scope). Includes are processed before excludes.
See the {{#Overwrite Rules}} section for rules about how overwriting is
handled.
@@ -173,8 +173,8 @@
project
[...]
build
- plugins
- plugin
+plugins
+ plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-dependency-plugin/artifactId
executions
@@ -185,7 +185,7 @@
goalcopy-dependencies/goal
/goals
configuration
-!-- configure the plugin here --
+ !-- configure the plugin here --
/configuration
/execution
/executions
@@ -219,8 +219,8 @@
project
[...]
build
- plugins
- plugin
+plugins
+ plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-dependency-plugin/artifactId
executions
@@ -231,7 +231,7 @@
goalunpack/goal
/goals
configuration
-!-- configure the plugin here --
+ !-- configure the plugin here --
/configuration
/execution
/executions
@@ -242,20 +242,20 @@
/project
+---+
- If you intend to configure this mojo for execution on the command line
using:
+ If you intend to configure this mojo for execution on the command line using:
+---+
mvn dependency:unpack
+---+
- you must not put the configuration inside the executions tag. Your
configuration should look like this:
-
+ you must
svn commit: r682987 - /maven/plugins/trunk/maven-changes-plugin/src/main/mdo/changes.mdo
Author: dennisl Date: Tue Aug 5 15:05:56 2008 New Revision: 682987 URL: http://svn.apache.org/viewvc?rev=682987view=rev Log: o Fix typos. Modified: maven/plugins/trunk/maven-changes-plugin/src/main/mdo/changes.mdo Modified: maven/plugins/trunk/maven-changes-plugin/src/main/mdo/changes.mdo URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/mdo/changes.mdo?rev=682987r1=682986r2=682987view=diff == --- maven/plugins/trunk/maven-changes-plugin/src/main/mdo/changes.mdo (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/mdo/changes.mdo Tue Aug 5 15:05:56 2008 @@ -48,7 +48,7 @@ description Contains the properties of this document. /description -/field +/field field namebody/name version1.0.0/version @@ -81,7 +81,7 @@ association typeAuthor/type multiplicity1/multiplicity - /association + /association /field /fields /class @@ -159,7 +159,7 @@ description The page author name. /description -/field +/field field xml.attribute=true xml.tagName=email nameauthorEmail/name version1.0.0/version @@ -169,7 +169,7 @@ /description /field /fields -/class +/class class xsd.compositor=sequence nameAction/name version1.0.0/version @@ -184,7 +184,7 @@ description A short description of the action taken. /description -/field +/field field xml.attribute=true namedev/name version1.0.0/version @@ -212,7 +212,7 @@ description Email of the person to be credited for this change. /description -/field +/field field xml.attribute=true nameissue/name version1.0.0/version @@ -225,7 +225,7 @@ pSee the a href=changes-report.htmlchanges-report mojo/a for more details./p ]] /description -/field +/field field xml.attribute=true nametype/name version1.0.0/version @@ -254,13 +254,13 @@ pSee the a href=changes-report.htmlchanges-report mojo/a for more details./p ]] /description -/field +/field field xml.attribute=true namedate/name version1.0.0/version typeString/type descriptionfix date/description -/field +/field field xml.listStyle=flat xml.tagName=fixes xml.associationTagName=fixes namefixedIssues/name version1.0.0/version @@ -278,28 +278,28 @@ multiplicity*/multiplicity /association descriptionA list of contibutors for this issue./description -/field +/field /fields codeSegments codeSegment version1.0.9+/version code![CDATA[ public static final String ADD_ACTION = add; - + public static final String FIX_ACTION = fix; - + public static final String UPDATE_ACTION = update; - + public static final String REMOVE_ACTION = remove; ]]/code /codeSegment - /codeSegments + /codeSegments /class class xsd.compositor=sequence nameDueTo/name version1.0.0/version description -Extras Name and Email of the person to be credited for this change. This can be used when a patch is submitted by a non-committer. +Name and Email of the person to be credited for this change. This can be used when a patch is submitted by a non-committer. /description fields field xml.attribute=true @@ -312,8 +312,8 @@ nameemail/name version1.0.0/version typeString/type - descriptionName of the person to be credited for this change./description -/field + descriptionEmail of the person to be credited for this change./description +/field /fields /class class xsd.compositor=sequence @@ -333,10 +333,10 @@ pThe Changes plugin will generate a URL out of this id. The URL is constructed using the value of the issueLinkTemplate parameter./p pSee the a href=changes-report.htmlchanges-report mojo/a for more details./p ]] - /description + /description /field /fields -/class +/class /classes /model
svn commit: r682988 - in /maven/plugins/trunk/maven-changes-plugin/src: it/report-changes-generation/src/changes/changes.xml it/report-changes-generation/verify.bsh main/java/org/apache/maven/plugin/c
Author: dennisl
Date: Tue Aug 5 15:09:44 2008
New Revision: 682988
URL: http://svn.apache.org/viewvc?rev=682988view=rev
Log:
o Produce proper output for all combinations of attributes and elements,
regarding fixes and dueTo for issues.
Modified:
maven/plugins/trunk/maven-changes-plugin/src/it/report-changes-generation/src/changes/changes.xml
maven/plugins/trunk/maven-changes-plugin/src/it/report-changes-generation/verify.bsh
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
Modified:
maven/plugins/trunk/maven-changes-plugin/src/it/report-changes-generation/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/it/report-changes-generation/src/changes/changes.xml?rev=682988r1=682987r2=682988view=diff
==
---
maven/plugins/trunk/maven-changes-plugin/src/it/report-changes-generation/src/changes/changes.xml
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/it/report-changes-generation/src/changes/changes.xml
Tue Aug 5 15:09:44 2008
@@ -37,7 +37,17 @@
fixes issue=MCHANGES-1/
fixes issue=JIRA-12/
dueto name=John Doe email=[EMAIL PROTECTED]/
-dueto name=Jane Doe/
+dueto name=Jane Doe/
+ /action
+ action dev=you type=update system=bugzilla
+Handle different issue systems.
+fixes issue=bug-12345/
+dueto name=John Doe email=[EMAIL PROTECTED]/
+ /action
+ action dev=him type=update
+Updated dependencies.
+dueto name=John Doe email=[EMAIL PROTECTED]/
+dueto name=Jane Doe/
/action
/release
Modified:
maven/plugins/trunk/maven-changes-plugin/src/it/report-changes-generation/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/it/report-changes-generation/verify.bsh?rev=682988r1=682987r2=682988view=diff
==
---
maven/plugins/trunk/maven-changes-plugin/src/it/report-changes-generation/verify.bsh
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/it/report-changes-generation/verify.bsh
Tue Aug 5 15:09:44 2008
@@ -34,22 +34,44 @@
return false;
}
FileInputStream fis = new FileInputStream ( report );
-String reportContent = IOUtil.toString ( fis );
-
+String reportContent = IOUtil.toString ( fis );
+
int indexOf = reportContent.indexOf( Changes Report );
if ( indexOf 0)
{
System.err.println( changes-report.html doesn't contains Changes Report
title );
return false;
-}
-
+}
+
indexOf = reportContent.indexOf(
href=\http://myjira/browse/MCHANGES-88\; );
if ( indexOf 0)
{
System.err.println( changes-report.html doesn't contains jira issue
link );
return false;
}
-
+
+// Test for output problem caused by only using dueTo elements
+indexOf = reportContent.indexOf( Thanks to , );
+if ( indexOf != -1)
+{
+ System.err.println( changes-report.html has too many dueTos in the Map
);
+ return false;
+}
+
+// Tests output problems caused by only using fixes element
+indexOf = reportContent.indexOf( bug-12345 );
+if ( indexOf 0)
+{
+ System.err.println( changes-report.html doesn't contains issue text for
issue specified with fixes element );
+ return false;
+}
+indexOf = reportContent.indexOf( Fixes . );
+if ( indexOf != -1)
+{
+ System.err.println( changes-report.html doesn't handle empty fixes
attribute properly );
+ return false;
+}
+
}
catch( Throwable e )
{
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java?rev=682988r1=682987r2=682988view=diff
==
---
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
Tue Aug 5 15:09:44 2008
@@ -53,15 +53,15 @@
* The token in [EMAIL PROTECTED] #issueLink} denoting the issue ID.
*/
private static final String ISSUE_TOKEN = %ISSUE%;
-
+
private static final String DEFAULT_ISSUE_SYSTEM_KEY = default;
private ChangesXML report;
private String url;
-
+
private Map issueLinksPerSystem;
-
+
private boolean addActionDate;
public ChangesReportGenerator()
@@ -89,7 +89,7 @@
/**
* @deprecated
- */
+ */
public String getIssueLink
svn commit: r682996 - /maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt.vm
Author: dennisl
Date: Tue Aug 5 15:25:35 2008
New Revision: 682996
URL: http://svn.apache.org/viewvc?rev=682996view=rev
Log:
o Fix typos.
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt.vm
Modified: maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt.vm?rev=682996r1=682995r2=682996view=diff
==
--- maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt.vm
(original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt.vm Tue Aug
5 15:25:35 2008
@@ -27,7 +27,7 @@
~~ http://maven.apache.org/doxia/references/apt-format.html
Usage
-
+
This page provides general usage information along with a basic example.
The plugin
is commonly used to run and verify integration tests for a project, say a
Maven plugin. This is done using
the {{{run-mojo.html} invoker:run }} goal. And as a preparation for
the integration tests, one usually wants to
@@ -107,9 +107,9 @@
Next up, the invoker:run goal will execute during the phase
integration-test and will use the configured
include/exclude patterns to search the directory src/it for IT POMs.
Every directory where an IT POM is found
will be copied over to target/it. Additionally, the IT POMs will be
filtered, i.e. expressions like
- @pom.version@ will be replaced with the corresponding values from the
POM. This is especially handy to make
- sure your IT POMs always reference the currently build version of the
project artifact. You can also define other
- properties via the plugin configuration that you which to use for filtering.
+ @pom.version@ will be replaced with the corresponding values from the
project's POM. This is especially handy to make
+ sure your IT POMs always reference the currently built version of the
project artifact. You can also define other
+ properties via the plugin configuration that you wish to use for filtering.
Once the IT POMs have been filtered, a Maven build will be started on them.
By default, the Invoker Plugin will execute the
phase package on the IT POMs but that can be changed globally in the
plugin configuration or for an individual
@@ -119,7 +119,7 @@
tests use your local repository as a remote repository, avoiding
time-consuming downloads from central in order
to fill up the initially empty staging repository. Please see the example
{{{examples/fast-use.html}Fast Invoker Plugin Configuration}}
for more details on this technique. The output of the IT builds is written
to a log file named build.log (e.g.
- target/it/first-it/build.log) and allows diagnostics in case an
integration test failed.
+ target/it/first-it/build.log) and allows diagnostics in case an
integration test fails.
When an integration test has finished, the plugin will invoke an optional
post build hook script. In the example,
this is the case for second-it where verify.bsh will be run. The
purpose of this script is usally to
svn commit: r683019 - /maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt.vm
Author: dennisl
Date: Tue Aug 5 15:48:27 2008
New Revision: 683019
URL: http://svn.apache.org/viewvc?rev=683019view=rev
Log:
o Be consistent in naming.
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt.vm
Modified: maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt.vm?rev=683019r1=683018r2=683019view=diff
==
--- maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt.vm
(original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt.vm Tue Aug
5 15:48:27 2008
@@ -70,7 +70,7 @@
version${project.version}/version
configuration
projectsDirectorysrc/it/projectsDirectory
- cloneProjectsTo\${project.build.directory}/it/cloneProjectsTo
+ cloneProjectsTotarget/it/cloneProjectsTo
pomIncludes
pomInclude*/pom.xml/pomInclude
/pomIncludes
svn commit: r683123 - /maven/site/trunk/src/site/apt/shared/index.apt
Author: dennisl
Date: Tue Aug 5 23:05:47 2008
New Revision: 683123
URL: http://svn.apache.org/viewvc?rev=683123view=rev
Log:
o Release maven-invoker 2.0.9.
Modified:
maven/site/trunk/src/site/apt/shared/index.apt
Modified: maven/site/trunk/src/site/apt/shared/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/shared/index.apt?rev=683123r1=683122r2=683123view=diff
==
--- maven/site/trunk/src/site/apt/shared/index.apt (original)
+++ maven/site/trunk/src/site/apt/shared/index.apt Tue Aug 5 23:05:47 2008
@@ -18,7 +18,7 @@
*+--+--++
| {{{/shared/maven-doxia-tools/} maven-doxia-tools}} |
1.0.1| Assists in using {{{http://maven.apache.org/doxia/}Doxia}} for
site generation and report creation. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-doxia-tools/}SVN}}
*+--+--++
-| {{{/shared/maven-invoker/} maven-invoker}} |
2.0.8| Fires up a Maven build in a new JVM. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-invoker/}SVN}}
+| {{{/shared/maven-invoker/} maven-invoker}} |
2.0.9| Fires up a Maven build in a new JVM. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-invoker/}SVN}}
*+--+--++
| {{{/shared/maven-model-converter/} maven-model-converter}} |
2.2 | Converts between version 3.0.0 and version 4.0.0 models. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-model-converter/}SVN}}
*+--+--++
svn commit: r683404 - /maven/plugins/trunk/maven-invoker-plugin/pom.xml
Author: dennisl Date: Wed Aug 6 13:57:09 2008 New Revision: 683404 URL: http://svn.apache.org/viewvc?rev=683404view=rev Log: [maven-release-plugin] prepare release maven-invoker-plugin-1.2.1 Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/pom.xml?rev=683404r1=683403r2=683404view=diff == --- maven/plugins/trunk/maven-invoker-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-invoker-plugin/pom.xml Wed Aug 6 13:57:09 2008 @@ -27,7 +27,7 @@ /parent artifactIdmaven-invoker-plugin/artifactId - version1.2.1-SNAPSHOT/version + version1.2.1/version packagingmaven-plugin/packaging nameMaven Invoker Plugin/name @@ -41,9 +41,9 @@ /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-invoker-plugin//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-invoker-plugin//developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin//url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-invoker-plugin-1.2.1/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-invoker-plugin-1.2.1/developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-invoker-plugin-1.2.1/url /scm issueManagement systemjira/system
svn commit: r683405 - in /maven/plugins/tags/maven-invoker-plugin-1.2.1: ./ pom.xml
Author: dennisl Date: Wed Aug 6 13:57:18 2008 New Revision: 683405 URL: http://svn.apache.org/viewvc?rev=683405view=rev Log: [maven-release-plugin] copy for tag maven-invoker-plugin-1.2.1 Added: maven/plugins/tags/maven-invoker-plugin-1.2.1/ - copied from r683401, maven/plugins/trunk/maven-invoker-plugin/ maven/plugins/tags/maven-invoker-plugin-1.2.1/pom.xml - copied unchanged from r683404, maven/plugins/trunk/maven-invoker-plugin/pom.xml
svn commit: r683417 - /maven/site/trunk/src/site/apt/shared/index.apt
Author: dennisl
Date: Wed Aug 6 14:21:22 2008
New Revision: 683417
URL: http://svn.apache.org/viewvc?rev=683417view=rev
Log:
o Add a column for release date.
Modified:
maven/site/trunk/src/site/apt/shared/index.apt
Modified: maven/site/trunk/src/site/apt/shared/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/shared/index.apt?rev=683417r1=683416r2=683417view=diff
==
--- maven/site/trunk/src/site/apt/shared/index.apt (original)
+++ maven/site/trunk/src/site/apt/shared/index.apt Wed Aug 6 14:21:22 2008
@@ -3,26 +3,26 @@
-
Dennis Lundberg
-
- March 2008
+ 2008-08-06
-
Shared Components
-*+--+--++
-|| Shared Component
|| Version || Description || Source Repository
-*+--+--++
-| {{{/shared/file-management/} file-management}} |
1.2 | API to collect files from a given directory using several
include/exclude rules. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/file-management/}SVN}}
-*+--+--++
-| {{{/shared/maven-archiver/} maven-archiver}} |
2.3 | Is mainly used by plugins to handle packaging. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-archiver/}SVN}}
-*+--+--++
-| {{{/shared/maven-doxia-tools/} maven-doxia-tools}} |
1.0.1| Assists in using {{{http://maven.apache.org/doxia/}Doxia}} for
site generation and report creation. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-doxia-tools/}SVN}}
-*+--+--++
-| {{{/shared/maven-invoker/} maven-invoker}} |
2.0.9| Fires up a Maven build in a new JVM. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-invoker/}SVN}}
-*+--+--++
-| {{{/shared/maven-model-converter/} maven-model-converter}} |
2.2 | Converts between version 3.0.0 and version 4.0.0 models. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-model-converter/}SVN}}
-*+--+--++
-| {{{/shared/maven-runtime/} maven-runtime}} |
1.0-alpha-1 | Maven Runtime allows introspection of Maven project metadata at
runtime. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-runtime/}SVN}}
-*+--+--++
-| {{{/shared/maven-shared-jar/} maven-shared-jar}} |
1.0 | Utilities that help identify the contents of a JAR, including
Java class analysis and Maven metadata analysis. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-jar/}SVN}}
-*+--+--++
+*+--+---+++
+|| Shared Component
|| Version || Release Date |Description || Source Repository
+*+--+---+++
+| {{{/shared/file-management/} file-management}} |
1.2 | | API to collect files from a given directory
using several include/exclude rules. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/file-management/}SVN}}
+*+--+---+++
+| {{{/shared/maven-archiver/} maven-archiver}} |
2.3 | | Is mainly used by plugins to handle
packaging. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-archiver/}SVN
svn commit: r683419 - /maven/site/trunk/src/site/apt/shared/index.apt
Author: dennisl
Date: Wed Aug 6 14:23:34 2008
New Revision: 683419
URL: http://svn.apache.org/viewvc?rev=683419view=rev
Log:
o Release maven-filtering 1.0-beta-1.
Modified:
maven/site/trunk/src/site/apt/shared/index.apt
Modified: maven/site/trunk/src/site/apt/shared/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/shared/index.apt?rev=683419r1=683418r2=683419view=diff
==
--- maven/site/trunk/src/site/apt/shared/index.apt (original)
+++ maven/site/trunk/src/site/apt/shared/index.apt Wed Aug 6 14:23:34 2008
@@ -18,6 +18,8 @@
*+--+---+++
| {{{/shared/maven-doxia-tools/} maven-doxia-tools}} |
1.0.1| | Assists in using
{{{http://maven.apache.org/doxia/}Doxia}} for site generation and report
creation. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-doxia-tools/}SVN}}
*+--+---+++
+| {{{/shared/maven-filtering/} maven-filtering}} |
1.0-beta-1 | 2008-08-06| Components for filtering resources. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-filtering/}SVN}}
+*+--+---+++
| {{{/shared/maven-invoker/} maven-invoker}} |
2.0.9| 2008-08-06| Fires up a Maven build in a new JVM. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-invoker/}SVN}}
*+--+---+++
| {{{/shared/maven-model-converter/} maven-model-converter}} |
2.2 | | Converts between version 3.0.0 and version
4.0.0 models. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-model-converter/}SVN}}
svn commit: r683421 - /maven/site/trunk/src/site/apt/shared/index.apt
Author: dennisl
Date: Wed Aug 6 14:40:58 2008
New Revision: 683421
URL: http://svn.apache.org/viewvc?rev=683421view=rev
Log:
o Add missing release dates.
Modified:
maven/site/trunk/src/site/apt/shared/index.apt
Modified: maven/site/trunk/src/site/apt/shared/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/shared/index.apt?rev=683421r1=683420r2=683421view=diff
==
--- maven/site/trunk/src/site/apt/shared/index.apt (original)
+++ maven/site/trunk/src/site/apt/shared/index.apt Wed Aug 6 14:40:58 2008
@@ -12,19 +12,19 @@
*+--+---+++
|| Shared Component
|| Version || Release Date |Description || Source Repository
*+--+---+++
-| {{{/shared/file-management/} file-management}} |
1.2 | | API to collect files from a given directory
using several include/exclude rules. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/file-management/}SVN}}
+| {{{/shared/file-management/} file-management}} |
1.2 | 2007-11-28| API to collect files from a given directory
using several include/exclude rules. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/file-management/}SVN}}
*+--+---+++
-| {{{/shared/maven-archiver/} maven-archiver}} |
2.3 | | Is mainly used by plugins to handle
packaging. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-archiver/}SVN}}
+| {{{/shared/maven-archiver/} maven-archiver}} |
2.3 | 2008-01-07| Is mainly used by plugins to handle
packaging. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-archiver/}SVN}}
*+--+---+++
-| {{{/shared/maven-doxia-tools/} maven-doxia-tools}} |
1.0.1| | Assists in using
{{{http://maven.apache.org/doxia/}Doxia}} for site generation and report
creation. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-doxia-tools/}SVN}}
+| {{{/shared/maven-doxia-tools/} maven-doxia-tools}} |
1.0.1| 2008-06-14| Assists in using
{{{http://maven.apache.org/doxia/}Doxia}} for site generation and report
creation. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-doxia-tools/}SVN}}
*+--+---+++
| {{{/shared/maven-filtering/} maven-filtering}} |
1.0-beta-1 | 2008-08-06| Components for filtering resources. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-filtering/}SVN}}
*+--+---+++
| {{{/shared/maven-invoker/} maven-invoker}} |
2.0.9| 2008-08-06| Fires up a Maven build in a new JVM. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-invoker/}SVN}}
*+--+---+++
-| {{{/shared/maven-model-converter/} maven-model-converter}} |
2.2 | | Converts between version 3.0.0 and version
4.0.0 models. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-model-converter/}SVN}}
+| {{{/shared/maven-model-converter/} maven-model-converter}} |
2.2 | 2007-08-22| Converts between version 3.0.0 and version
4.0.0 models. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-model-converter/}SVN}}
*+--+---+++
-| {{{/shared/maven-runtime/} maven-runtime}} |
1.0-alpha-1 | | Maven Runtime allows introspection of Maven
project metadata at runtime. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-runtime/}SVN}}
+| {{{/shared/maven-runtime/} maven-runtime}} |
1.0-alpha-1 | 2008-06-02| Maven Runtime allows
svn commit: r684347 - /maven/site/trunk/src/site/apt/plugins/index.apt
Author: dennisl
Date: Sat Aug 9 14:19:07 2008
New Revision: 684347
URL: http://svn.apache.org/viewvc?rev=684347view=rev
Log:
o Release maven-invoker-plugin 1.2.1.
Modified:
maven/site/trunk/src/site/apt/plugins/index.apt
Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=684347r1=684346r2=684347view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Sat Aug 9 14:19:07 2008
@@ -4,7 +4,7 @@
Brett Porter
Jason van Zyl
-
- 2008-08-08
+ 2008-08-09
-
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -124,7 +124,7 @@
*---+--++--+++
| {{{/plugins/maven-help-plugin/} help}} | 2.0.2|
2007-11-27 | Get information about the working environment for the project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-help-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MPH}JIRA}}
*---+--++--+++
-| {{{/plugins/maven-invoker-plugin/} invoker}}| 1.2 |
2008-05-30 | Run a set of Maven projects and verify the output. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-invoker-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MINVOKER}JIRA}}
+| {{{/plugins/maven-invoker-plugin/} invoker}}| 1.2.1|
2008-08-09 | Run a set of Maven projects and verify the output. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-invoker-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MINVOKER}JIRA}}
*---+--++--+++
| {{{/plugins/maven-one-plugin/} one}}| 1.2 |
2007-09-12 | A plugin for interacting with legacy Maven 1.x repositories and
builds. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-one-plugin}SVN}} |
{{{http://jira.codehaus.org/browse/MONE}JIRA}}
*---+--++--+++
svn commit: r685666 - /maven/pom/trunk/maven/pom.xml
Author: dennisl Date: Wed Aug 13 13:20:14 2008 New Revision: 685666 URL: http://svn.apache.org/viewvc?rev=685666view=rev Log: o Remove BOM. Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=685666r1=685665r2=685666view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Wed Aug 13 13:20:14 2008 @@ -1,4 +1,4 @@ -?xml version=1.0 encoding=UTF-8? +?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
svn commit: r690672 - /maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
Author: dennisl
Date: Sun Aug 31 03:03:12 2008
New Revision: 690672
URL: http://svn.apache.org/viewvc?rev=690672view=rev
Log:
o Adjust Javadoc to the new parameter names.
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java?rev=690672r1=690671r2=690672view=diff
==
---
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
(original)
+++
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
Sun Aug 31 03:03:12 2008
@@ -214,7 +214,7 @@
/**
* The goal name of a Mojo to describe within the specified Maven Plugin.
- * If this parameter is specified, only the corresponding Mojo (goal) will
be described,
+ * If this parameter is specified, only the corresponding goal (Mojo) will
be described,
* rather than the whole Plugin.
*
* @parameter expression=${goal} alias=mojo
@@ -223,7 +223,7 @@
private String goal;
/**
- * This flag specifies that a full (verbose) list of Mojo informations
should be given.
+ * This flag specifies that a detailed (verbose) list of Mojo information
should be given.
*
* @parameter expression=${detail} default-value=false alias=full
* @since 2.1, was codefull/code in 2.0.x
@@ -231,7 +231,7 @@
private boolean detail;
/**
- * This flag specifies that a medium list of Mojo informations should be
given.
+ * This flag specifies that a medium list of Mojo information should be
given.
*
* @parameter expression=${medium} default-value=true
* @since 2.0.2
@@ -239,7 +239,7 @@
private boolean medium;
/**
- * This flag specifies that a minimal list of Mojo informations should be
given.
+ * This flag specifies that a minimal list of Mojo information should be
given.
*
* @parameter expression=${minimal} default-value=false
* @since 2.1
@@ -415,7 +415,7 @@
msg.append( # mvn help:describe
-Dplugin=org.apache.maven.plugins:maven-help-plugin\n );
msg.append( or\n );
msg.append( # mvn help:describe
-DgroupId=org.apache.maven.plugins -DartifactId=maven-help-plugin\n\n );
-msg.append( Try 'mvn help:help -Ddetail=true' for more
informations. );
+msg.append( Try 'mvn help:help -Ddetail=true' for more
information. );
throw new MojoFailureException( msg.toString() );
}
svn commit: r692510 - /maven/plugins/branches/MRESOURCES-56/pom.xml
Author: dennisl Date: Fri Sep 5 12:15:47 2008 New Revision: 692510 URL: http://svn.apache.org/viewvc?rev=692510view=rev Log: o Use released version of maven-filtering. Modified: maven/plugins/branches/MRESOURCES-56/pom.xml Modified: maven/plugins/branches/MRESOURCES-56/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/branches/MRESOURCES-56/pom.xml?rev=692510r1=692509r2=692510view=diff == --- maven/plugins/branches/MRESOURCES-56/pom.xml (original) +++ maven/plugins/branches/MRESOURCES-56/pom.xml Fri Sep 5 12:15:47 2008 @@ -76,7 +76,7 @@ dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-filtering/artifactId - version1.0-beta-1-SNAPSHOT/version + version1.0-beta-1/version /dependency dependency
svn commit: r692511 - /maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/my.filter
Author: dennisl
Date: Fri Sep 5 12:20:36 2008
New Revision: 692511
URL: http://svn.apache.org/viewvc?rev=692511view=rev
Log:
o Set EOL style to Native.
Modified:
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/my.filter
(contents, props changed)
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=692511r1=692510r2=692511view=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
Fri Sep 5 12:20:36 2008
@@ -1,4 +1,4 @@
-
-filter.token.project.version=${project.version}
-filter.token.projectProperty=${projectProperty}
+
+filter.token.project.version=${project.version}
+filter.token.projectProperty=${projectProperty}
filter.token.profileProperty=${profileProperty}
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/my.filter
--
svn:eol-style = native
svn commit: r692515 - /maven/plugins/trunk/maven-resources-plugin/src/site/site.xml
Author: dennisl Date: Fri Sep 5 12:40:41 2008 New Revision: 692515 URL: http://svn.apache.org/viewvc?rev=692515view=rev Log: o Adjust indentation for readability. Modified: maven/plugins/trunk/maven-resources-plugin/src/site/site.xml Modified: maven/plugins/trunk/maven-resources-plugin/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/site/site.xml?rev=692515r1=692514r2=692515view=diff == --- maven/plugins/trunk/maven-resources-plugin/src/site/site.xml (original) +++ maven/plugins/trunk/maven-resources-plugin/src/site/site.xml Fri Sep 5 12:40:41 2008 @@ -29,13 +29,13 @@ /menu menu name=Examples item name=Specifying a character encoding scheme -href=/examples/encoding.html/ - item name=Specifying resource directories -href=/examples/resource-directory.html/ +href=/examples/encoding.html/ + item name=Specifying resource directories +href=/examples/resource-directory.html/ item name=Filtering -href=/examples/filter.html/ +href=/examples/filter.html/ item name=Including and excluding files and directories -href=/examples/include-exclude.html/ +href=/examples/include-exclude.html/ /menu /body /project
svn commit: r692530 - in /maven/plugins/trunk/maven-resources-plugin/src/site: apt/examples/encoding.apt apt/examples/filter.apt apt/examples/include-exclude.apt apt/examples/resource-directory.apt ap
Author: dennisl
Date: Fri Sep 5 13:25:20 2008
New Revision: 692530
URL: http://svn.apache.org/viewvc?rev=692530view=rev
Log:
o Fix typos and improve the presentation.
Modified:
maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/encoding.apt
maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/filter.apt
maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/include-exclude.apt
maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/resource-directory.apt
maven/plugins/trunk/maven-resources-plugin/src/site/apt/index.apt
maven/plugins/trunk/maven-resources-plugin/src/site/apt/usage.apt
maven/plugins/trunk/maven-resources-plugin/src/site/fml/faq.fml
Modified:
maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/encoding.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/encoding.apt?rev=692530r1=692529r2=692530view=diff
==
---
maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/encoding.apt
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/encoding.apt
Fri Sep 5 13:25:20 2008
@@ -3,7 +3,7 @@
--
Franz Allan See
--
- July 2006
+ 2008-09-05
--
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -28,11 +28,11 @@
Specifying a character encoding scheme
- A character encoding scheme such as ASCII, UTF-8, or UTF-16 can be chosen to
be
+ A character encoding scheme such as ASCII, UTF-8 or UTF-16
can be chosen to be
used for the reading and writing of files.
- For example, if we want to specify that the character encoding scheme be
UTF-8,
- we would simply have to modify the pom.
+ For example, if we want to specify that the character encoding scheme be
UTF-8,
+ we would simply have to modify the POM.
+-+
project
@@ -49,7 +49,7 @@
/configuration
/plugin
/plugins
- ...
+...
/build
...
/project
Modified:
maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/filter.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/filter.apt?rev=692530r1=692529r2=692530view=diff
==
--- maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/filter.apt
(original)
+++ maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/filter.apt
Fri Sep 5 13:25:20 2008
@@ -3,7 +3,7 @@
--
Franz Allan See
--
- July 2006
+ 2008-09-05
--
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -30,7 +30,7 @@
Variables can be included in your resources. These variables, denoted by the
$\{...\} delimiters, can come from the system properties, your project
- properties, from your filter resources and from the command lines.
+ properties, from your filter resources and from the command line.
For example, if we have a resource src/main/resources/hello.txt
containing
@@ -42,21 +42,20 @@
+-+
project
- [...]
+ ...
nameMy Resources Plugin Practice Project/name
- [...]
+ ...
build
-[...]
+...
resources
- [...]
resource
directorysrc/main/resources/directory
/resource
- [...]
+ ...
/resources
- [...]
+...
/build
- [...]
+ ...
/project
+-+
@@ -67,21 +66,21 @@
+-+
This will create a resource output in target/classes/hello.txt which
contains
- exactly the same.
+ exactly the same text.
+-+
Hello ${name}
+-+
- However, if we add a \filtering\ tag to our POM and set it to
true such as this
+ However, if we add a \filtering\ tag to our POM and set it to
true like this:
+-+
- [...]
+ ...
resource
directorysrc/main/resources/directory
filteringtrue/filtering
/resource
- [...]
+ ...
+-+
Our target/classes/hello.txt after calling
@@ -100,8 +99,8 @@
name (which was specified in the POM).
Moreover, we can also assign values through the command line using the -D
- tag. For example, to change the value for the variable name to world, we can
- simply invoke this command
+ option. For example, to change the value for the variable name to
world, we can
+ simply invoke this command:
+-+
mvn resources:resources -Dname=world
@@ -114,44 +113,43 @@
+-+
Furthermore, we are not limited to use pre-defined project variables. We can
- specify our own variables and their values under the properties tag. For
+ specify our own variables and their values in the \properties\
element. For
example, if we want to change the variable from name to your.name, we can
- do so by adding a \your.name\ tag under the \properties\ tag.
+ do so by adding a \your.name\ element within the \properties\
element.
+-+
project
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=692629view=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=692629r1=692628r2=692629view=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 @@ localenl/locale localeno/locale localepl/locale +localept/locale localept_BR/locale localesk/locale localesv/locale 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=692629view=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=692637view=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=692637r1=692636r2=692637view=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: ul lia href=l10n-status.htmlSite Plugin/a/li -!-- TODO: This one has not bee published yet. Remove this comment when that has been done. lia href=http://maven.apache.org/plugins/maven-project-info-reports-plugin/l10n-status.html;Project Info Reports Plugin/a/li --- lia href=http://maven.apache.org/shared/maven-doxia-tools/l10n-status.html;Doxia Tools/a/li /ul /p
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=692641view=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=692641r1=692640r2=692641view=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 @@
plugin
groupIdorg.codehaus.mojo/groupId
artifactIdl10n-maven-plugin/artifactId
-version1.0-alpha-1/version
+version1.0-alpha-2-SNAPSHOT/version
configuration
locales
localecs/locale
@@ -322,6 +322,7 @@
localenl/locale
localeno/locale
localepl/locale
+localept/locale
localept_BR/locale
localesk/locale
localesv/locale
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=692641view=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
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=692642view=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=692642r1=692641r2=692642view=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 @@ dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-doxia-tools/artifactId - version1.0.1/version + version1.0.2-SNAPSHOT/version /dependency dependency groupIdorg.apache.maven.shared/groupId
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=692643view=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=692643r1=692642r2=692643view=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 @@ roleDanish translator/role /roles /contributor +contributor + nameSamuel Santos/name + email[EMAIL PROTECTED]/email + roles +rolePortuguese translator/role + /roles +/contributor /contributors scm @@ -188,7 +195,7 @@ plugin groupIdorg.codehaus.mojo/groupId artifactIdl10n-maven-plugin/artifactId -version1.0-alpha-1/version +version1.0-alpha-2-SNAPSHOT/version configuration locales localeca/locale @@ -204,6 +211,7 @@ localenl/locale localeno/locale localepl/locale +localept/locale localept_BR/locale localesk/locale localesv/locale @@ -302,7 +310,7 @@ dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-doxia-tools/artifactId - version1.0.1/version + version1.0.2-SNAPSHOT/version /dependency !-- Wagon -- 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=692643view=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=692643r1=692642r2=692643view=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
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=692645view=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=692645r1=692644r2=692645view=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. /li li - 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. /li li To test your localization @@ -343,8 +343,8 @@ liInclude your files in codesrc/main/resources/code for each one/li liRun codemvn install/code for each one/li liConfigure a project to produce a site in several locales/li -liMake sure that it is using the latest SNAPSHOT versions of - the above artifacts/li +liMake sure that it is using the latest SNAPSHOT version of + each of the above artifacts/li liRun codemvn site/code on that project to test it/li /ul /li @@ -376,7 +376,7 @@ a href=http://notepad-plus.sourceforge.net/;Notepad++/a, ... /li li - bTools to write a file in a given charset, like UTF-8/b: + bTools to write a file in a given charset/b: any editor like Notepad, Eclipse, IntelliJ IDEA, ... /li li
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=692655view=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=692655r1=692654r2=692655view=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 @@ /description prerequisites -maven2.0.2/maven +maven2.0.6/maven /prerequisites issueManagement @@ -230,37 +230,37 @@ dependency groupIdorg.apache.maven/groupId artifactIdmaven-artifact/artifactId - version2.0.2/version + version2.0.6/version /dependency dependency groupIdorg.apache.maven/groupId artifactIdmaven-artifact-manager/artifactId - version2.0.2/version + version2.0.6/version /dependency dependency groupIdorg.apache.maven/groupId artifactIdmaven-model/artifactId - version2.0.2/version + version2.0.6/version /dependency dependency groupIdorg.apache.maven/groupId artifactIdmaven-plugin-api/artifactId - version2.0/version + version2.0.6/version /dependency dependency groupIdorg.apache.maven/groupId artifactIdmaven-project/artifactId - version2.0/version + version2.0.6/version /dependency dependency groupIdorg.apache.maven/groupId artifactIdmaven-settings/artifactId - version2.0/version + version2.0.6/version /dependency dependency groupIdorg.apache.maven.reporting/groupId artifactIdmaven-reporting-api/artifactId - version2.0.4/version + version2.0.6/version /dependency !-- Doxia --
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=692763view=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=692763r1=692762r2=692763view=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:
+ * ul
+ * liAdd the report to a map of reports keyed by filename having the
report itself as value
+ * liIf the report is not yet in the map of documents, add it together
with a suitable renderer
+ * /ul
+ *
+ * @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(); )
{
svn commit: r692883 - /maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
Author: dennisl Date: Sun Sep 7 08:50:08 2008 New Revision: 692883 URL: http://svn.apache.org/viewvc?rev=692883view=rev Log: [MSITE-349] Update this plugin's site documentation page: Configuring the Site Descriptor to include the version element Modified: maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt Modified: maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt?rev=692883r1=692882r2=692883view=diff == --- maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt (original) +++ maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt Sun Sep 7 08:50:08 2008 @@ -5,7 +5,7 @@ [EMAIL PROTECTED] Maria Odea Ching -- - November 2006 + 2008-09-07 -- ~~ Licensed to the Apache Software Foundation (ASF) under one @@ -86,6 +86,32 @@ /project +-+ +* Version + + You can show the Version of your project on the site, by addding a \version\ element to your + site.xml like this: + ++-+ +project + ... + version position=right/ + ... +/project ++-+ + + The position attribute can have the same values as the publishDate attribute, see above. + If the position attribute is omitted, the default value is left. + + If you want hide the version, you can use this in your site.xml: + ++-+ +project + ... + version position=none/ + ... +/project ++-+ + * Powered by Logo You can add your own Powered by logo to your site.
svn commit: r692885 - /maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
Author: dennisl Date: Sun Sep 7 08:59:24 2008 New Revision: 692885 URL: http://svn.apache.org/viewvc?rev=692885view=rev Log: o Promote our selected values for format and position of the publishDate. Modified: maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt Modified: maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt?rev=692885r1=692884r2=692885view=diff == --- maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt (original) +++ maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt Sun Sep 7 08:59:24 2008 @@ -68,7 +68,7 @@ +-+ project ... - publishDate position=navigation-bottom format=MM-dd-yy/ + publishDate format=-MM-dd position=right/ ... /project +-+
svn commit: r692886 - /maven/plugins/trunk/maven-resources-plugin/pom.xml
Author: dennisl Date: Sun Sep 7 09:04:06 2008 New Revision: 692886 URL: http://svn.apache.org/viewvc?rev=692886view=rev Log: o Update the description. 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=692886r1=692885r2=692886view=diff == --- maven/plugins/trunk/maven-resources-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-resources-plugin/pom.xml Sun Sep 7 09:04:06 2008 @@ -32,12 +32,13 @@ packagingmaven-plugin/packaging nameMaven Resources Plugin/name description -The Resources Plugin handles the copying or transfering of project resources to the output directory. Resources -are categorized into two: main resources and test resources. The difference is that the main resources are the -resources associated to the main code while teh test resources are that of the test code. +The Resources Plugin handles the copying of project resources to the output +directory. There are two different kinds of resources: main resources and test resources. The +difference is that the main resources are the resources associated to the main +source code while the test resources are associated to the test source code. -This, thus, allows the separation of resources of the main code (what your plugin actually does) and its unit -tests. +Thus, this allows the separation of resources for the main source code and its +unit tests. /description inceptionYear2001/inceptionYear
svn commit: r692888 - /maven/plugins/trunk/maven-resources-plugin/pom.xml
Author: dennisl
Date: Sun Sep 7 09:12:17 2008
New Revision: 692888
URL: http://svn.apache.org/viewvc?rev=692888view=rev
Log:
o Sync the versions of Maven dependencies with the prerequisite Maven version.
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=692888r1=692887r2=692888view=diff
==
--- maven/plugins/trunk/maven-resources-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-resources-plugin/pom.xml Sun Sep 7 09:12:17 2008
@@ -61,19 +61,19 @@
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-plugin-api/artifactId
- version2.0/version
+ version2.0.6/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-project/artifactId
- version2.0/version
+ version2.0.6/version
/dependency
dependency
groupIdorg.codehaus.plexus/groupId
artifactIdplexus-utils/artifactId
version1.5.5/version
/dependency
-
+
dependency
groupIdorg.apache.maven.shared/groupId
artifactIdmaven-filtering/artifactId
@@ -107,11 +107,11 @@
goalclean/goal
goalprocess-test-resources/goal
/goals
- settingsFilesrc/it/settings.xml/settingsFile
-
cloneProjectsTo${project.build.directory}/its/cloneProjectsTo
+ settingsFilesrc/it/settings.xml/settingsFile
+ cloneProjectsTo${project.build.directory}/its/cloneProjectsTo
properties
execPropsfromExecProps/execProps
- /properties
+ /properties
/configuration
executions
execution
svn commit: r692889 - /maven/plugins/trunk/maven-resources-plugin/src/site/apt/index.apt
Author: dennisl
Date: Sun Sep 7 09:13:00 2008
New Revision: 692889
URL: http://svn.apache.org/viewvc?rev=692889view=rev
Log:
o Note that Maven Filtering is used.
Modified:
maven/plugins/trunk/maven-resources-plugin/src/site/apt/index.apt
Modified: maven/plugins/trunk/maven-resources-plugin/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/site/apt/index.apt?rev=692889r1=692888r2=692889view=diff
==
--- maven/plugins/trunk/maven-resources-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/site/apt/index.apt Sun Sep
7 09:13:00 2008
@@ -36,6 +36,9 @@
Thus, this allows the separation of resources for the main source code and its
unit tests.
+ Starting with version 2.3 this plugin uses the
{{{http://maven.apache.org/shared/maven-filtering/}Maven Filtering}}
+ shared component for filtering resources.
+
* Goals Overview
The Resources Plugin has two goals:
svn commit: r692900 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
Author: dennisl
Date: Sun Sep 7 10:07:40 2008
New Revision: 692900
URL: http://svn.apache.org/viewvc?rev=692900view=rev
Log:
o Use the non-deprecated API for getting the wagon.
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java?rev=692900r1=692899r2=692900view=diff
==
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
Sun Sep 7 10:07:40 2008
@@ -147,8 +147,7 @@
try
{
-// @todo Use WagonManager#getWagon(Repository) when available.
It's available in Maven 2.0.5.
-wagon = wagonManager.getWagon( repository.getProtocol() );
+wagon = wagonManager.getWagon( repository );
configureWagon( wagon, repository.getId(), settings, container,
getLog() );
}
catch ( UnsupportedProtocolException e )
@@ -234,17 +233,17 @@
/**
* p
* Get the codeProxyInfo/code of the proxy associated with the
codehost/code
- * and the codeprotocol/code of the given coderepository/code
+ * and the codeprotocol/code of the given coderepository/code.
* /p
* p
* Extract from a
href=http://java.sun.com/j2se/1.5.0/docs/guide/net/properties.html;
- * J2SE Doc : Networking Properties - nonProxyHosts/a : The value can
be a list of hosts,
+ * J2SE Doc : Networking Properties - nonProxyHosts/a : The value can
be a list of hosts,
* each separated by a |, and in addition a wildcard character (*) can be
used for matching
* /p
* p
* Defensively support for comma (,) and semi colon (;) in addition to
pipe (|) as separator.
* /p
- *
+ *
* @return a ProxyInfo object instantiated or codenull/code if no
matching proxy is found
*/
public static ProxyInfo getProxyInfo( Repository repository, WagonManager
wagonManager )
@@ -296,7 +295,7 @@
/**
* Configure the Wagon with the information from serverConfigurationMap (
which comes from settings.xml )
- *
+ *
* @todo Remove when [EMAIL PROTECTED] WagonManager#getWagon(Repository)
is available}. It's available in Maven 2.0.5.
* @param wagon
* @param repositoryId
@@ -329,7 +328,7 @@
}
catch ( final ComponentLookupException e )
{
-throw new WagonConfigurationException( repositoryId,
Unable to lookup wagon configurator.
+throw new WagonConfigurationException( repositoryId,
Unable to lookup wagon configurator.
+ Wagon configuration cannot be applied., e );
}
catch ( ComponentConfigurationException e )
svn commit: r692901 - /maven/plugins/trunk/maven-site-plugin/pom.xml
Author: dennisl Date: Sun Sep 7 10:10:48 2008 New Revision: 692901 URL: http://svn.apache.org/viewvc?rev=692901view=rev Log: [MSITE-355] Upgrade to Wagon 1.0-beta-4 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=692901r1=692900r2=692901view=diff == --- maven/plugins/trunk/maven-site-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-site-plugin/pom.xml Sun Sep 7 10:10:48 2008 @@ -366,6 +366,6 @@ properties doxiaVersion1.0-alpha-11/doxiaVersion doxiaSitetoolsVersion1.0-alpha-11/doxiaSitetoolsVersion -wagonVersion1.0-beta-3/wagonVersion +wagonVersion1.0-beta-4/wagonVersion /properties /project
svn commit: r694953 - /maven/site/trunk/src/site/apt/guides/getting-started/index.apt
Author: dennisl
Date: Sat Sep 13 07:26:14 2008
New Revision: 694953
URL: http://svn.apache.org/viewvc?rev=694953view=rev
Log:
[MNGSITE-67] Dead link in the getting started guide (Intro to dependency
management)
Modified:
maven/site/trunk/src/site/apt/guides/getting-started/index.apt
Modified: maven/site/trunk/src/site/apt/guides/getting-started/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/getting-started/index.apt?rev=694953r1=694952r2=694953view=diff
==
--- maven/site/trunk/src/site/apt/guides/getting-started/index.apt (original)
+++ maven/site/trunk/src/site/apt/guides/getting-started/index.apt Sat Sep 13
07:26:14 2008
@@ -868,7 +868,7 @@
You've probably already noticed a dependencies element in the POM we've
been using as an example.
You have, in fact, been using an external dependency all this time, but here
we'll talk about how this
works in a bit more detail. For a more thorough introduction, please refer to
our
- {{{../introduction/introduction-to-dependency-management.html}Introduction to
Dependency Management}}.
+ {{{../introduction/introduction-to-dependency-mechanism.html}Introduction to
Dependency Mechanism}}.
The dependencies section of the pom.xml lists all of the external
dependencies that our project needs
in order to build (whether it needs that dependency at compile time, test
time, run time, or whatever). Right
@@ -904,7 +904,7 @@
For more information on everything you can specify for a dependency, see the
{{{../../../maven-model/maven.html}Project Descriptor Reference}}.
~~DJ: Does this link work? I can't find the document.
For more information about the dependency mechanism as a whole, see
- {{{../introduction/introduction-to-dependency-management.html}Introduction to
Dependency Management}}.
+ {{{../introduction/introduction-to-dependency-mechanism.html}Introduction to
Dependency Mechanism}}.
With this information about a dependency, Maven will be able to reference the
dependency when it builds the project. Where does
Maven reference the dependency from? Maven looks in your local repository
(~/.m2/repository is the default location) to find
svn commit: r694959 - in /maven/sandbox/trunk/shared/reports: all-plugin-versions.sh mng-votes-per-version.sh
Author: dennisl Date: Sat Sep 13 07:51:49 2008 New Revision: 694959 URL: http://svn.apache.org/viewvc?rev=694959view=rev Log: o Add a couple of Unix shell scripts that can be hooked up in Hudson. Added: maven/sandbox/trunk/shared/reports/all-plugin-versions.sh (with props) maven/sandbox/trunk/shared/reports/mng-votes-per-version.sh (with props) Added: maven/sandbox/trunk/shared/reports/all-plugin-versions.sh URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/reports/all-plugin-versions.sh?rev=694959view=auto == --- maven/sandbox/trunk/shared/reports/all-plugin-versions.sh (added) +++ maven/sandbox/trunk/shared/reports/all-plugin-versions.sh Sat Sep 13 07:51:49 2008 @@ -0,0 +1,8 @@ +#!/bin/sh + +export JAVA_HOME=/opt/java/sdk/current +export JAVA_CMD=$JAVA_HOME/bin/java +export JAVA_OPTS=-ms32m -mx256m +export JAVA=$JAVA_CMD $JAVA_OPTS + +$JAVA -jar swizzle-jirareport-1.2.1-SNAPSHOT-dep.jar all-plugin-versions.vm all-plugin-versions.txt Propchange: maven/sandbox/trunk/shared/reports/all-plugin-versions.sh -- svn:eol-style = LF Propchange: maven/sandbox/trunk/shared/reports/all-plugin-versions.sh -- svn:keywords = Date Id Added: maven/sandbox/trunk/shared/reports/mng-votes-per-version.sh URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/reports/mng-votes-per-version.sh?rev=694959view=auto == --- maven/sandbox/trunk/shared/reports/mng-votes-per-version.sh (added) +++ maven/sandbox/trunk/shared/reports/mng-votes-per-version.sh Sat Sep 13 07:51:49 2008 @@ -0,0 +1,8 @@ +#!/bin/sh + +export JAVA_HOME=/opt/java/sdk/current +export JAVA_CMD=$JAVA_HOME/bin/java +export JAVA_OPTS=-ms32m -mx256m +export JAVA=$JAVA_CMD $JAVA_OPTS + +$JAVA -jar swizzle-jirareport-1.2.1-SNAPSHOT-dep.jar mng-votes-per-version.vm mng-votes-per-version.txt Propchange: maven/sandbox/trunk/shared/reports/mng-votes-per-version.sh -- svn:eol-style = LF Propchange: maven/sandbox/trunk/shared/reports/mng-votes-per-version.sh -- svn:keywords = Date Id
svn commit: r694966 - in /maven/sandbox/trunk/reports: maven-plugins-fixed.vm maven-plugins.vm maven.vm
Author: dennisl Date: Sat Sep 13 08:08:54 2008 New Revision: 694966 URL: http://svn.apache.org/viewvc?rev=694966view=rev Log: o Set EOL style to Native. Modified: maven/sandbox/trunk/reports/maven-plugins-fixed.vm (props changed) maven/sandbox/trunk/reports/maven-plugins.vm (props changed) maven/sandbox/trunk/reports/maven.vm (props changed) Propchange: maven/sandbox/trunk/reports/maven-plugins-fixed.vm -- svn:eol-style = native Propchange: maven/sandbox/trunk/reports/maven-plugins.vm -- svn:eol-style = native Propchange: maven/sandbox/trunk/reports/maven.vm -- svn:eol-style = native
svn commit: r694971 - /maven/sandbox/trunk/reports/maven.vm
Author: dennisl
Date: Sat Sep 13 09:00:25 2008
New Revision: 694971
URL: http://svn.apache.org/viewvc?rev=694971view=rev
Log:
o Get the rss feed instead of the html page.
o Use a dynamic pid in the URL.
Modified:
maven/sandbox/trunk/reports/maven.vm
Modified: maven/sandbox/trunk/reports/maven.vm
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/reports/maven.vm?rev=694971r1=694970r2=694971view=diff
==
--- maven/sandbox/trunk/reports/maven.vm (original)
+++ maven/sandbox/trunk/reports/maven.vm Sat Sep 13 09:00:25 2008
@@ -2,7 +2,7 @@
#set( $project = $jira.getProject( MNG ) )
-#set( $url =
http://jira.codehaus.org/secure/IssueNavigator.jspa?reset=truemode=hidepid=10500resolution=-1sorter/field=updatedsorter/order=DESC;
)
+#set( $url =
http://jira.codehaus.org/secure/IssueNavigator.jspa?view=rssreset=truemode=hidepid=${project.id}resolution=-1sorter/field=updatedsorter/order=DESC;
)
#set( $jirarss = $rss.fetch( $url ) )
#set( $issues = $jirarss.issues )
svn commit: r694973 - /maven/sandbox/trunk/reports/maven.sh
Author: dennisl Date: Sat Sep 13 09:03:02 2008 New Revision: 694973 URL: http://svn.apache.org/viewvc?rev=694973view=rev Log: o Add a system property for entityExpansionLimit go get around the SAX parser's built in max limit of 64000 entities. Modified: maven/sandbox/trunk/reports/maven.sh Modified: maven/sandbox/trunk/reports/maven.sh URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/reports/maven.sh?rev=694973r1=694972r2=694973view=diff == --- maven/sandbox/trunk/reports/maven.sh (original) +++ maven/sandbox/trunk/reports/maven.sh Sat Sep 13 09:03:02 2008 @@ -1,8 +1,8 @@ #!/bin/sh -export JAVA_HOME=/opt/java/sdk/current -export JAVA_CMD=$JAVA_HOME/bin/java -export JAVA_OPTS=-ms32m -mx256m -export JAVA=$JAVA_CMD $JAVA_OPTS +export JAVA_HOME=/opt/java/sdk/current +export JAVA_CMD=$JAVA_HOME/bin/java +export JAVA_OPTS=-ms32m -mx256m +export JAVA=$JAVA_CMD $JAVA_OPTS -$JAVA -jar swizzle-jirareport-1.2.1-SNAPSHOT-dep.jar maven.vm /home/j2ee-hudson/public_html/reports/maven-votes.txt +$JAVA -jar swizzle-jirareport-1.2.1-SNAPSHOT-dep.jar maven.vm -DentityExpansionLimit=50 /home/j2ee-hudson/public_html/reports/maven-votes.txt
svn commit: r694975 - /maven/sandbox/trunk/reports/maven-plugins-fixed.sh
Author: dennisl Date: Sat Sep 13 09:08:36 2008 New Revision: 694975 URL: http://svn.apache.org/viewvc?rev=694975view=rev Log: o Add a Unix shell script that can be hooked up to Hudson. Added: maven/sandbox/trunk/reports/maven-plugins-fixed.sh (with props) Added: maven/sandbox/trunk/reports/maven-plugins-fixed.sh URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/reports/maven-plugins-fixed.sh?rev=694975view=auto == --- maven/sandbox/trunk/reports/maven-plugins-fixed.sh (added) +++ maven/sandbox/trunk/reports/maven-plugins-fixed.sh Sat Sep 13 09:08:36 2008 @@ -0,0 +1,8 @@ +#!/bin/sh + +export JAVA_HOME=/opt/java/sdk/current +export JAVA_CMD=$JAVA_HOME/bin/java +export JAVA_OPTS=-ms32m -mx256m +export JAVA=$JAVA_CMD $JAVA_OPTS + +$JAVA -jar swizzle-jirareport-1.2.1-SNAPSHOT-dep.jar maven-plugins-fixed.vm /home/j2ee-hudson/public_html/reports/maven-plugins-fixed.txt Propchange: maven/sandbox/trunk/reports/maven-plugins-fixed.sh -- svn:eol-style = LF Propchange: maven/sandbox/trunk/reports/maven-plugins-fixed.sh -- svn:keywords = Date Id
svn commit: r695154 - /maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml
Author: dennisl Date: Sun Sep 14 02:17:39 2008 New Revision: 695154 URL: http://svn.apache.org/viewvc?rev=695154view=rev Log: o Use the correct language code for the Chinese localization. Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml?rev=695154r1=695153r2=695154view=diff == --- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml (original) +++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml Sun Sep 14 02:17:39 2008 @@ -36,7 +36,7 @@ artifactIdmaven-site-plugin/artifactId version@pom.version@/version configuration - localesen,ca,cs,da,de,es,fr,hu,it,ja,ko,nl,no,pl,pt,pt_BR,sk,sv,tr,zh/locales + localesen,ca,cs,da,de,es,fr,hu,it,ja,ko,nl,no,pl,pt,pt_BR,sk,sv,tr,zh_CN/locales /configuration /plugin /plugins
svn commit: r695163 - in /maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/main: ./ java/ java/foo/ java/foo/App.java
Author: dennisl
Date: Sun Sep 14 02:38:18 2008
New Revision: 695163
URL: http://svn.apache.org/viewvc?rev=695163view=rev
Log:
o The Taglist Plugin does not generate a report unless there is a non-empty
source directory. That's why the IT failed.
Added:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/main/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/main/java/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/main/java/foo/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/main/java/foo/App.java
(with props)
Added:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/main/java/foo/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/main/java/foo/App.java?rev=695163view=auto
==
---
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/main/java/foo/App.java
(added)
+++
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/main/java/foo/App.java
Sun Sep 14 02:38:18 2008
@@ -0,0 +1,32 @@
+package foo;
+
+/*
+ * 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
+{
+public static void main( String[] args )
+{
+System.out.println( Hello World! );
+}
+}
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/main/java/foo/App.java
--
svn:eol-style = native
svn commit: r695177 - /maven/plugins/trunk/maven-site-plugin/pom.xml
Author: dennisl
Date: Sun Sep 14 03:10:10 2008
New Revision: 695177
URL: http://svn.apache.org/viewvc?rev=695177view=rev
Log:
o Do not run POMs recursively, so we can have multi module ITs.
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=695177r1=695176r2=695177view=diff
==
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Sun Sep 14 03:10:10 2008
@@ -165,7 +165,7 @@
configuration
projectsDirectorysrc/it/projectsDirectory
pomIncludes
-pomInclude**/**/pom.xml/pomInclude
+pomInclude*/pom.xml/pomInclude
/pomIncludes
postBuildHookScriptverify.bsh/postBuildHookScript
localRepositoryPath${basedir}/target/local-repo/localRepositoryPath
svn commit: r695178 - in /maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304: ./ child/ child/goals.txt child/pom.xml goals.txt pom.xml src/ src/site/ src/site/site.xml verify.bsh
Author: dennisl Date: Sun Sep 14 03:11:24 2008 New Revision: 695178 URL: http://svn.apache.org/viewvc?rev=695178view=rev Log: [MSITE-304] site:stage-deploy creates different directory structure than site:site o Add an IT Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/ (with props) maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/ (with props) maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/goals.txt (with props) maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/pom.xml (with props) maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/goals.txt (with props) maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml (with props) maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/src/ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/src/site/ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/src/site/site.xml (with props) maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh (with props) Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/ -- --- svn:ignore (added) +++ svn:ignore Sun Sep 14 03:11:24 2008 @@ -0,0 +1,2 @@ +build.log +target Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/ -- --- svn:ignore (added) +++ svn:ignore Sun Sep 14 03:11:24 2008 @@ -0,0 +1,2 @@ +build.log +target Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/goals.txt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/goals.txt?rev=695178view=auto == --- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/goals.txt (added) +++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/goals.txt Sun Sep 14 03:11:24 2008 @@ -0,0 +1 @@ +site:stage-deploy \ No newline at end of file Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/goals.txt -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/goals.txt -- svn:keywords = Date Revision Author Id Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/pom.xml?rev=695178view=auto == --- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/pom.xml (added) +++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/pom.xml Sun Sep 14 03:11:24 2008 @@ -0,0 +1,31 @@ +!-- +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/maven-v4_0_0.xsd; + parent +groupIdtest/groupId +artifactIdparent/artifactId +version1.0-SNAPSHOT/version + /parent + modelVersion4.0.0/modelVersion + artifactIdchild/artifactId + packagingpom/packaging + version1.0-SNAPSHOT/version + nameMSITE-304 IT child/name + urlhttp://www.example.com/parent/child//url +/project Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/pom.xml -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/pom.xml -- svn:keywords = Date Revision Author Id Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/goals.txt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/goals.txt?rev=695178view=auto == --- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/goals.txt (added
svn commit: r695198 - in /maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304: pom.xml verify.bsh
Author: dennisl
Date: Sun Sep 14 04:39:32 2008
New Revision: 695198
URL: http://svn.apache.org/viewvc?rev=695198view=rev
Log:
o Use a directory for the stage deploy that is writable on a Unix system.
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml?rev=695198r1=695197r2=695198view=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml Sun Sep 14
04:39:32 2008
@@ -28,7 +28,7 @@
site
idmsite-304/id
nameExample company web server/name
- urlfile:///www.example.com/parent/url
+ urlfile:///tmp/www.example.com/parent/url
/site
/distributionManagement
modules
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh?rev=695198r1=695197r2=695198view=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh Sun Sep
14 04:39:32 2008
@@ -38,14 +38,14 @@
return false;
}
-File parentDirectory = new File ( stagingDirectory,
localhost/www.example.com/parent );
+File parentDirectory = new File ( stagingDirectory,
localhost/tmp/www.example.com/parent );
if ( !parentDirectory.exists() || !parentDirectory.isDirectory() )
{
System.err.println( Staging directory for parent is missing or not a
directory. );
return false;
}
-File childDirectory = new File ( stagingDirectory,
localhost/www.example.com/parent/child );
+File childDirectory = new File ( stagingDirectory,
localhost/tmp/www.example.com/parent/child );
if ( !childDirectory.exists() || !childDirectory.isDirectory() )
{
System.err.println( Staging directory for child is missing or not a
directory. );
svn commit: r695217 - /maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh
Author: dennisl
Date: Sun Sep 14 06:36:30 2008
New Revision: 695217
URL: http://svn.apache.org/viewvc?rev=695217view=rev
Log:
o Verify that the site:stage-deploy directory structure is correct.
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh?rev=695217r1=695216r2=695217view=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh Sun Sep
14 06:36:30 2008
@@ -51,6 +51,27 @@
System.err.println( Staging directory for child is missing or not a
directory. );
return false;
}
+
+File stageDeployDirectory = new File ( /tmp/www.example.com/parent );
+if ( !stageDeployDirectory.exists() || !stageDeployDirectory.isDirectory()
)
+{
+System.err.println( Stage deploy directory is missing or not a
directory. );
+return false;
+}
+
+File validChildStageDeployDirectory = new File ( stageDeployDirectory,
staging/child );
+if ( !validChildStageDeployDirectory.exists() ||
!validChildStageDeployDirectory.isDirectory() )
+{
+System.err.println( Valid stage deploy directory for child is missing
or not a directory. );
+return false;
+}
+
+File invalidChildStageDeployDirectory = new File ( stageDeployDirectory,
child/staging );
+if ( invalidChildStageDeployDirectory.exists()
invalidChildStageDeployDirectory.isDirectory() )
+{
+System.err.println( Invalid stage deploy directory for child is
present. );
+return false;
+}
}
catch( IOException e )
{
