henning 2004/07/04 10:32:15
Modified: extensions/maven-plugin/src/plugin Tag: TURBINE_2_3_BRANCH
plugin.jelly plugin.properties
extensions/maven-plugin/xdocs Tag: TURBINE_2_3_BRANCH
properties.xml
Added: extensions/maven-plugin/src/plugin-resources/demo/images
Tag: TURBINE_2_3_BRANCH jakarta-logo-blue.gif
powered-by-logo.gif
extensions/maven-plugin/src/plugin-resources/demo/pages Tag:
TURBINE_2_3_BRANCH index.html
extensions/maven-plugin/src/plugin-resources/demo/templates/layouts
Tag: TURBINE_2_3_BRANCH Default.vm
extensions/maven-plugin/src/plugin-resources/demo/templates/screens
Tag: TURBINE_2_3_BRANCH Index.vm
Removed: extensions/maven-plugin/src/plugin-resources/flavor/common/images
Tag: TURBINE_2_3_BRANCH jakarta-logo-blue.gif
powered-by-logo.gif
extensions/maven-plugin/src/plugin-resources/flavor/common/pages
Tag: TURBINE_2_3_BRANCH index.html
extensions/maven-plugin/src/plugin-resources/flavor/common/templates/layouts
Tag: TURBINE_2_3_BRANCH Default.vm
extensions/maven-plugin/src/plugin-resources/flavor/common/templates/screens
Tag: TURBINE_2_3_BRANCH Index.vm
Log:
Move the installation of the example files out of the regular turbine:setup
goal and make it configurable by a property.
Revision Changes Path
No revision
No revision
1.1.2.24 +56 -0
jakarta-turbine-2/extensions/maven-plugin/src/plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin/plugin.jelly,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -u -r1.1.2.23 -r1.1.2.24
--- plugin.jelly 4 Jul 2004 16:49:44 -0000 1.1.2.23
+++ plugin.jelly 4 Jul 2004 17:32:14 -0000 1.1.2.24
@@ -236,6 +236,9 @@
frompath="pages"
include="**/*" />
+ <j:if test="${context.getVariable('turbine.setup.demo') != null &&
context.getVariable('turbine.setup.demo') == 'true'}">
+ <attainGoal name="turbine:install-demo"/>
+ </j:if>
</goal>
<!-- ======================================================================== -->
<!-- turbine:setup -->
@@ -834,6 +837,19 @@
<j:set var="${_propname}" scope="parent">${_result}</j:set>
</define:tag>
+ <define:tag name="copyTurbineDemo">
+
+ <u:available file="${plugin.resources}/demo/${frompath}">
+ <ant:copy todir="${todir}" filtering="${filtering}" overwrite="true" >
+ <ant:fileset dir="${plugin.resources}/demo/${frompath}">
+ <include name="${include}"/>
+ <exclude name="${exclude}"/>
+ </ant:fileset>
+ </ant:copy>
+ </u:available>
+
+ </define:tag>
+
</define:taglib>
</goal>
@@ -1146,4 +1162,44 @@
<!-- turbine:security-datadtd -->
<!-- ================================================================== -->
+ <!-- ======================================================================== -->
+ <!-- -->
+ <!-- turbine:install-demo -->
+ <!-- -->
+ <!-- Put the demo pages into a newly created application. Should be called -->
+ <!-- only from turbine:setup! -->
+ <!-- -->
+ <!-- ======================================================================== -->
+ <goal name="turbine:install-demo"
+ prereqs="turbine:init">
+
+ <meta:copyTurbineDemo
todir="${turbine.plugin.root.dir}/${turbine.plugin.src.templates}"
+ filtering="true"
+ frompath="templates"
+ include="**/*"/>
+
+ <meta:copyTurbineDemo
todir="${turbine.plugin.root.dir}/${turbine.plugin.src.images}"
+ filtering="false"
+ frompath="images"
+ include="**/*"/>
+
+ <meta:copyTurbineDemo
todir="${turbine.plugin.root.dir}/${turbine.plugin.src.resources}"
+ filtering="true"
+ frompath="resources"
+ include="**/*"/>
+
+ <meta:copyTurbineDemo
todir="${turbine.plugin.root.dir}/${turbine.plugin.src.style}"
+ filtering="true"
+ frompath="style"
+ include="**/*"/>
+
+ <meta:copyTurbineDemo
todir="${turbine.plugin.root.dir}/${turbine.plugin.src.pages}"
+ filtering="true"
+ frompath="pages"
+ include="**/*"/>
+ </goal>
+
+ <!-- ======================================================================== -->
+ <!-- turbine:install-demo -->
+ <!-- ======================================================================== -->
</project>
1.1.2.9 +4 -1
jakarta-turbine-2/extensions/maven-plugin/src/plugin/plugin.properties
Index: plugin.properties
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin/plugin.properties,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- plugin.properties 3 Jul 2004 16:25:44 -0000 1.1.2.8
+++ plugin.properties 4 Jul 2004 17:32:14 -0000 1.1.2.9
@@ -53,6 +53,9 @@
# create the new application in a subdirectory
turbine.app.subdir = true
+# Install the Welcome pages by default
+turbine.setup.demo = true
+
# use Tomcat Application Server
maven.appserver.name = tomcat
No revision
No revision
1.1.2.1 +79 -0
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/demo/images/Attic/jakarta-logo-blue.gif
<<Binary file>>
1.1.2.1 +10 -0
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/demo/images/Attic/powered-by-logo.gif
<<Binary file>>
No revision
No revision
1.1.2.1 +28 -0
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/demo/pages/Attic/index.html
No revision
No revision
1.1.2.1 +29 -0
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/demo/templates/layouts/Attic/Default.vm
No revision
No revision
1.1.2.1 +35 -0
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/demo/templates/screens/Attic/Index.vm
No revision
No revision
1.2.2.8 +9 -0 jakarta-turbine-2/extensions/maven-plugin/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/xdocs/properties.xml,v
retrieving revision 1.2.2.7
retrieving revision 1.2.2.8
diff -u -r1.2.2.7 -r1.2.2.8
--- properties.xml 3 Jul 2004 16:25:44 -0000 1.2.2.7
+++ properties.xml 4 Jul 2004 17:32:15 -0000 1.2.2.8
@@ -100,6 +100,15 @@
<td>Selects the properties file which is loaded to configure the <a
href="goals.html#turbine_setup">turbine:setup</a> goal.</td>
</tr>
+<tr>
+<td>turbine.setup.demo</td>
+<td>Yes</td>
+<td>true</td>
+<td>If true, copy the demo images, a default start page and a redirection page into
the newly created application. If set to false,
+ no content files are copied into the new application tree.
+</td>
+</tr>
+
</table>
</p>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
