Author: hboutemy
Date: Thu Sep 15 20:35:41 2011
New Revision: 1171261
URL: http://svn.apache.org/viewvc?rev=1171261&view=rev
Log:
fixed file snippet configuration to support DOXIA-373
Added:
maven/maven-3/trunk/maven-core/src/site/apt/default-bindings.apt.vm
- copied, changed from r1171233,
maven/maven-3/trunk/maven-core/src/site/apt/default-bindings.apt
maven/maven-3/trunk/maven-core/src/site/apt/lifecycles.apt.vm
- copied, changed from r1171233,
maven/maven-3/trunk/maven-core/src/site/apt/lifecycles.apt
maven/maven-3/trunk/maven-model-builder/src/site/apt/super-pom.apt.vm
- copied, changed from r1171233,
maven/maven-3/trunk/maven-model-builder/src/site/apt/super-pom.apt
Modified:
maven/maven-3/trunk/maven-core/src/site/apt/default-bindings.apt
maven/maven-3/trunk/maven-core/src/site/apt/lifecycles.apt
maven/maven-3/trunk/maven-model-builder/src/site/apt/super-pom.apt
Copied: maven/maven-3/trunk/maven-core/src/site/apt/default-bindings.apt.vm
(from r1171233,
maven/maven-3/trunk/maven-core/src/site/apt/default-bindings.apt)
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/site/apt/default-bindings.apt.vm?p2=maven/maven-3/trunk/maven-core/src/site/apt/default-bindings.apt.vm&p1=maven/maven-3/trunk/maven-core/src/site/apt/default-bindings.apt&r1=1171233&r2=1171261&rev=1171261&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/site/apt/default-bindings.apt (original)
+++ maven/maven-3/trunk/maven-core/src/site/apt/default-bindings.apt.vm Thu Sep
15 20:35:41 2011
@@ -15,37 +15,37 @@ Bindings for <<<default>>> Lifecycle Ref
* Bindings for <<<pom>>> packaging
-%{snippet|id=pom-lifecycle|file=src/main/resources/META-INF/plexus/artifact-handlers.xml}
+%{snippet|id=pom-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/artifact-handlers.xml}
* Bindings for <<<jar>>> packaging
-%{snippet|id=jar-lifecycle|file=src/main/resources/META-INF/plexus/artifact-handlers.xml}
+%{snippet|id=jar-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/artifact-handlers.xml}
* Bindings for <<<ejb>>> packaging
-%{snippet|id=ejb-lifecycle|file=src/main/resources/META-INF/plexus/artifact-handlers.xml}
+%{snippet|id=ejb-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/artifact-handlers.xml}
* Bindings for <<<ejb3>>> packaging
-%{snippet|id=ejb3-lifecycle|file=src/main/resources/META-INF/plexus/artifact-handlers.xml}
+%{snippet|id=ejb3-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/artifact-handlers.xml}
* Bindings for <<<maven-plugin>>> packaging
-%{snippet|id=maven-plugin-lifecycle|file=src/main/resources/META-INF/plexus/artifact-handlers.xml}
+%{snippet|id=maven-plugin-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/artifact-handlers.xml}
* Bindings for <<<war>>> packaging
-%{snippet|id=war-lifecycle|file=src/main/resources/META-INF/plexus/artifact-handlers.xml}
+%{snippet|id=war-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/artifact-handlers.xml}
* Bindings for <<<ear>>> packaging
-%{snippet|id=ear-lifecycle|file=src/main/resources/META-INF/plexus/artifact-handlers.xml}
+%{snippet|id=ear-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/artifact-handlers.xml}
* Bindings for <<<rar>>> packaging
-%{snippet|id=rar-lifecycle|file=src/main/resources/META-INF/plexus/artifact-handlers.xml}
+%{snippet|id=rar-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/artifact-handlers.xml}
* Bindings for <<<par>>> packaging
-%{snippet|id=par-lifecycle|file=src/main/resources/META-INF/plexus/artifact-handlers.xml}
+%{snippet|id=par-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/artifact-handlers.xml}
\ No newline at end of file
Copied: maven/maven-3/trunk/maven-core/src/site/apt/lifecycles.apt.vm (from
r1171233, maven/maven-3/trunk/maven-core/src/site/apt/lifecycles.apt)
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/site/apt/lifecycles.apt.vm?p2=maven/maven-3/trunk/maven-core/src/site/apt/lifecycles.apt.vm&p1=maven/maven-3/trunk/maven-core/src/site/apt/lifecycles.apt&r1=1171233&r2=1171261&rev=1171261&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/site/apt/lifecycles.apt (original)
+++ maven/maven-3/trunk/maven-core/src/site/apt/lifecycles.apt.vm Thu Sep 15
20:35:41 2011
@@ -17,16 +17,16 @@ Lifecycles Reference
<<<default>>> lifecycle is defined without any associated.
Bindings are {{{./default-bindings.html}defined separately for every
packaging}}:
-%{snippet|id=lifecycle|file=src/main/resources/META-INF/plexus/components.xml}
+%{snippet|id=lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/components.xml}
* <<<clean>>> Lifecycle
<<<clean>>> lifecycle is defined directly with its bindings.
-%{snippet|id=clean|file=src/main/resources/META-INF/plexus/components.xml}
+%{snippet|id=clean|file=${project.basedir}/src/main/resources/META-INF/plexus/components.xml}
* <<<site>>> Lifecycle
<<<site>>> lifecycle is defined directly with its bindings.
-%{snippet|id=site|file=src/main/resources/META-INF/plexus/components.xml}
+%{snippet|id=site|file=${project.basedir}/src/main/resources/META-INF/plexus/components.xml}
Copied: maven/maven-3/trunk/maven-model-builder/src/site/apt/super-pom.apt.vm
(from r1171233,
maven/maven-3/trunk/maven-model-builder/src/site/apt/super-pom.apt)
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/site/apt/super-pom.apt.vm?p2=maven/maven-3/trunk/maven-model-builder/src/site/apt/super-pom.apt.vm&p1=maven/maven-3/trunk/maven-model-builder/src/site/apt/super-pom.apt&r1=1171233&r2=1171261&rev=1171261&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/src/site/apt/super-pom.apt
(original)
+++ maven/maven-3/trunk/maven-model-builder/src/site/apt/super-pom.apt.vm Thu
Sep 15 20:35:41 2011
@@ -10,4 +10,4 @@ Super POM
All models implicitly inherit from a super-POM:
-%{snippet|id=superpom|file=src/main/resources/org/apache/maven/model/pom-4.0.0.xml}
+%{snippet|id=superpom|file=${project.build.sourceDirectory}/../resources/org/apache/maven/model/pom-4.0.0.xml}
