Author: dennisl
Date: Sun Feb 6 08:47:53 2011
New Revision: 1067614
URL: http://svn.apache.org/viewvc?rev=1067614&view=rev
Log:
[MASSEMBLY-540] Web site uses the 1.1.0.xsd but 1.1.2 recommended
o I converted the necessary files to .apt.vm and injected the "mdoVersion"
property that is defined in the POM, to get automatic updates to the latest
schema version.
Added:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm
(contents, props changed)
- copied, changed from r1067414,
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm
(contents, props changed)
- copied, changed from r1067414,
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt
Removed:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/sharing-descriptors.apt.vm
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-components.apt.vm
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-repositories.apt.vm
Copied:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm
(from r1067414,
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt)
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm?p2=maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm&p1=maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt&r1=1067414&r2=1067614&rev=1067614&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm
Sun Feb 6 08:47:53 2011
@@ -158,9 +158,9 @@ Advanced Assembly-Descriptor Topics
those <<<war>>> dependencies.
---
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}
http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd";>
[...]
<dependencySets>
<dependencySet>
@@ -193,9 +193,9 @@ Advanced Assembly-Descriptor Topics
classifier) from the binary jars.
---
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}
http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd";>
[...]
<dependencySets>
<dependencySet>
@@ -238,9 +238,9 @@ Advanced Assembly-Descriptor Topics
expand it, then simply type <<<svn up>>>.
---
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}
http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd";>
[...]
<fileSets>
<fileSet>
@@ -328,9 +328,9 @@ Advanced Assembly-Descriptor Topics
software foundation's policies.
---
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}
http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd";>
[...]
<fileSets>
<fileSet>
@@ -376,9 +376,9 @@ Advanced Assembly-Descriptor Topics
part of the assembly root directory.
---
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}
http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd";>
[...]
<baseDirectory>maven</baseDirectory>
[...]
@@ -390,9 +390,9 @@ Advanced Assembly-Descriptor Topics
should, just to minimize the maintenance of these files.
---
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}
http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd";>
[...]
<baseDirectory>${artifactId}</baseDirectory>
[...]
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Copied:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm
(from r1067414,
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt)
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm?p2=maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm&p1=maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt&r1=1067414&r2=1067614&rev=1067614&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm
Sun Feb 6 08:47:53 2011
@@ -75,9 +75,9 @@ Advanced Module-Set Topics
We can select <<just>> the child1 module using the following <<<moduleSet>>>:
---
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}
http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd";>
[...]
<moduleSets>
[...]
@@ -159,9 +159,9 @@ ${module.groupId}-${module.artifactId}-$
reference for your project to users.
---
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}
http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd";>
[...]
<moduleSets>
[...]
@@ -187,9 +187,9 @@ ${module.groupId}-${module.artifactId}-$
own.
---
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}
http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd";>
[...]
<moduleSets>
[...]
@@ -231,9 +231,9 @@ ${module.groupId}-${module.artifactId}-$
multimodule hierarchy.
---
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}
http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd";>
[...]
<moduleSets>
[...]
@@ -336,9 +336,9 @@ ${module.groupId}-${module.artifactId}-$
<<<excludeSubModuleDirectories>>> flag, as follows:
---
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}
http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd";>
[...]
<moduleSets>
[...]
@@ -418,9 +418,9 @@ ${module.groupId}-${module.artifactId}-$
of the main project artifact.
---
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}
http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd";>
[...]
<moduleSets>
<moduleSet>
@@ -473,9 +473,9 @@ ${module.groupId}-${module.artifactId}-$
module's dependencies in the current assembly.
---
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}
http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd";>
[...]
<moduleSets>
<moduleSet>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm?rev=1067614&r1=1067613&r2=1067614&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm
Sun Feb 6 08:47:53 2011
@@ -58,9 +58,9 @@ Including Module Binaries
demonstrating the features described by this example.
+---+
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}
http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd";>
<id>bin</id>
<formats>
<format>dir</format>
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm?rev=1067614&r1=1067613&r2=1067614&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm
Sun Feb 6 08:47:53 2011
@@ -44,9 +44,9 @@ Including Module Sources
demonstrating the features described by this example.
+---+
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}
http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd";>
<id>src</id>
<formats>
<format>dir</format>
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/sharing-descriptors.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/sharing-descriptors.apt.vm?rev=1067614&r1=1067613&r2=1067614&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/sharing-descriptors.apt.vm
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/sharing-descriptors.apt.vm
Sun Feb 6 08:47:53 2011
@@ -74,9 +74,9 @@ my-assembly-descriptor
Replace it with the assembly descriptor you want to share.
+---+
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}
http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd";>
<id>my-assembly-descriptor-id</id>
<formats>
<format>jar</format>
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm?rev=1067614&r1=1067613&r2=1067614&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm
Sun Feb 6 08:47:53 2011
@@ -78,9 +78,9 @@ variable2=value2
our assembly descriptor will be:
+-----
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}
http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd";>
<id>distribution</id>
<formats>
<format>jar</format>
@@ -111,9 +111,9 @@ variable2=value2
setup both \<fileSets\> and \<files\> like so:
+-----
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}
http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd";>
<id>distribution</id>
<formats>
<format>jar</format>
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-components.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-components.apt.vm?rev=1067614&r1=1067613&r2=1067614&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-components.apt.vm
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-components.apt.vm
Sun Feb 6 08:47:53 2011
@@ -49,9 +49,9 @@ Using Component Descriptors
should like this:
+-----
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}
http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd";>
<id>appserverA</id>
<formats>
<format>zip</format>
@@ -73,9 +73,9 @@ Using Component Descriptors
The assembly descriptor for appserver B distribution would then be similar:
+-----
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}
http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd";>
<id>appserverB</id>
<formats>
<format>zip</format>
@@ -117,9 +117,9 @@ Using Component Descriptors
Then the final assembly descriptor for the appserver A would be:
+-----
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}
http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd";>
<id>appserverA</id>
<formats>
<format>zip</format>
@@ -141,9 +141,9 @@ Using Component Descriptors
And the corresponding assembly descriptor for the appserver B then would be:
+-----
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}
http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd";>
<id>appserverB</id>
<formats>
<format>zip</format>
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-repositories.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-repositories.apt.vm?rev=1067614&r1=1067613&r2=1067614&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-repositories.apt.vm
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-repositories.apt.vm
Sun Feb 6 08:47:53 2011
@@ -44,9 +44,9 @@ Using Repositories
A functional repository archive for your project can be created with:
+-----
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${mdoVersion}
http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd";>
<id>repository</id>
<formats>
<format>jar</format>
