maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From khmarba...@apache.org
Subject svn commit: r1575551 - in /maven/plugins/trunk/maven-assembly-plugin/src/site/apt: ./ examples/multimodule/ examples/single/
Date Sat, 08 Mar 2014 15:41:40 GMT
Author: khmarbaise
Date: Sat Mar  8 15:41:39 2014
New Revision: 1575551

URL: http://svn.apache.org/r1575551
Log:
[MASSEMBLY-687]
  - Changed all locations consistently to src/assembly
    instead of src/main/assembly and src/assemble.

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/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
    maven/plugins/trunk/maven-assembly-plugin/src/site/apt/usage.apt.vm

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=1575551&r1=1575550&r2=1575551&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
Sat Mar  8 15:41:39 2014
@@ -136,7 +136,7 @@ Including Module Binaries
           <version>${project.version}</version>
           <configuration>
             <descriptors>
-              <descriptor>src/assemble/bin.xml</descriptor>
+              <descriptor>src/assembly/bin.xml</descriptor>
             </descriptors>
           </configuration>
         </plugin>
@@ -196,7 +196,7 @@ Including Module Binaries
             </goals>
             <configuration>
               <descriptors>
-                <descriptor>src/assemble/bin.xml</descriptor>
+                <descriptor>src/assembly/bin.xml</descriptor>
               </descriptors>
             </configuration>
           </execution>

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=1575551&r1=1575550&r2=1575551&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
Sat Mar  8 15:41:39 2014
@@ -108,7 +108,7 @@ Including Module Sources
         <version>${project.version}</version>
         <configuration>
           <descriptors>
-            <descriptor>src/assemble/src.xml</descriptor>
+            <descriptor>src/assembly/src.xml</descriptor>
           </descriptors>
         </configuration>
       </plugin>

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=1575551&r1=1575550&r2=1575551&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
Sat Mar  8 15:41:39 2014
@@ -58,7 +58,7 @@ Filtering Some Distribution Files
 
   All the above files are in the root directory of the project but only the
   README and the NOTICE files should be filtered. The property file used to
-  filter these are files is found in <<<src/assemble/filter.properties>>>.
+  filter these are files is found in <<<src/assembly/filter.properties>>>.
 
   A property file is a file which contains the names of the variables and their
   corresponding string value. The format of its contents is identical to how Java
@@ -166,10 +166,10 @@ variable2=value2
         <version>${project.version}</version>
         <configuration>
           <filters>
-            <filter>src/assemble/filter.properties</filter>
+            <filter>src/assembly/filter.properties</filter>
           </filters>
           <descriptors>
-            <descriptor>src/assemble/distribution.xml</descriptor>
+            <descriptor>src/assembly/distribution.xml</descriptor>
           </descriptors>
         </configuration>
       </plugin>

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=1575551&r1=1575550&r2=1575551&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
Sat Mar  8 15:41:39 2014
@@ -96,7 +96,7 @@ Using Component Descriptors
 
   From the two descriptors shown, we can say that there are three artifacts
   common for both, thus we separate them into a common component descriptor
-  and save it as <<<src/assemble/component.xml>>>.  Its contents would
+  and save it as <<<src/assembly/component.xml>>>.  Its contents would
   be:
 
 +-----
@@ -125,7 +125,7 @@ Using Component Descriptors
     <format>zip</format>
   </formats>
   <componentDescriptors>
-    <componentDescriptor>src/assemble/component.xml</componentDescriptor>
+    <componentDescriptor>src/assembly/component.xml</componentDescriptor>
   </componentDescriptors>
   <dependencySets>
     <dependencySet>
@@ -149,7 +149,7 @@ Using Component Descriptors
     <format>zip</format>
   </formats>
   <componentDescriptors>
-    <componentDescriptor>src/assemble/component.xml</componentDescriptor>
+    <componentDescriptor>src/assembly/component.xml</componentDescriptor>
   </componentDescriptors>
   <dependencySets>
     <dependencySet>
@@ -179,8 +179,8 @@ Using Component Descriptors
         <version>${project.version}</version>
         <configuration>
           <descriptors>
-            <descriptor>src/assemble/appserverA-assembly.xml</descriptor>
-            <descriptor>src/assemble/appserverB-assembly.xml</descriptor>
+            <descriptor>src/assembly/appserverA-assembly.xml</descriptor>
+            <descriptor>src/assembly/appserverB-assembly.xml</descriptor>
           </descriptors>
         </configuration>
       </plugin>

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=1575551&r1=1575550&r2=1575551&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
Sat Mar  8 15:41:39 2014
@@ -82,7 +82,7 @@ Using Repositories
         <version>${project.version}</version>
         <configuration>
           <descriptors>
-            <descriptor>src/assemble/repository.xml</descriptor>
+            <descriptor>src/assembly/repository.xml</descriptor>
           </descriptors>
         </configuration>
       </plugin>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/apt/usage.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/usage.apt.vm?rev=1575551&r1=1575550&r2=1575551&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/site/apt/usage.apt.vm (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/site/apt/usage.apt.vm Sat Mar  8 15:41:39
2014
@@ -93,7 +93,7 @@ Usage
   single invocation.
   
   Alternatively, we've created a custom assembly descriptor called
-  <<<src.xml>>> in the <<<src/main/assembly>>> directory
(see the
+  <<<src.xml>>> in the <<<src/assembly>>> directory (see
the
   {{{Resources}Resources}} section for more information). We can tell the
   Assembly Plugin to use that instead:
   
@@ -108,7 +108,7 @@ Usage
         <version>${project.version}</version>
         <configuration>
           <descriptors>
-            <descriptor>src/main/assembly/src.xml</descriptor>
+            <descriptor>src/assembly/src.xml</descriptor>
           </descriptors>
         </configuration>
         [...]



Mime
View raw message