henning 2004/07/04 15:01:12
Modified: extensions/maven-plugin/src/plugin Tag: TURBINE_2_3_BRANCH
plugin.jelly plugin.properties
extensions/maven-plugin/src/plugin-resources/setup Tag:
TURBINE_2_3_BRANCH setup.properties
extensions/maven-plugin/xdocs Tag: TURBINE_2_3_BRANCH
properties.xml using_meta.xml
Log:
rename turbine.setup.demo to turbine.app.setup.demo. Fix up docs.
Revision Changes Path
No revision
No revision
1.1.2.28 +2 -2
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.27
retrieving revision 1.1.2.28
diff -u -r1.1.2.27 -r1.1.2.28
--- plugin.jelly 4 Jul 2004 21:53:31 -0000 1.1.2.27
+++ plugin.jelly 4 Jul 2004 22:01:11 -0000 1.1.2.28
@@ -75,7 +75,7 @@
<filter token="TURBINE_APP_SUBDIR" value="${turbine.app.subdir}"/>
<filter token="TURBINE_PLUGIN_MODE" value="${turbine.plugin.mode}"/>
<filter token="TURBINE_PLUGIN_INPLACE_DIR"
value="${turbine.plugin.inplace.dir}"/>
- <filter token="TURBINE_SETUP_DEMO" value="${turbine.setup.demo}"/>
+ <filter token="TURBINE_APP_SETUP_DEMO" value="${turbine.app.setup.demo}"/>
<filter token="TURBINE_PLUGIN_BASE_DIR" value="${turbine.plugin.base.dir}"/>
<filter token="TURBINE_PLUGIN_SRC_IMAGES"
value="${turbine.plugin.src.images}"/>
@@ -260,7 +260,7 @@
fromfile="schema/application-data.xml" />
- <j:if test="${context.getVariable('turbine.setup.demo') != null &&
context.getVariable('turbine.setup.demo') == 'true'}">
+ <j:if test="${context.getVariable('turbine.app.setup.demo') != null &&
context.getVariable('turbine.app.setup.demo') == 'true'}">
<attainGoal name="turbine:install-demo"/>
</j:if>
</goal>
1.1.2.11 +2 -2
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.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- plugin.properties 4 Jul 2004 20:00:21 -0000 1.1.2.10
+++ plugin.properties 4 Jul 2004 22:01:12 -0000 1.1.2.11
@@ -57,7 +57,7 @@
turbine.app.subdir = true
# Install the Welcome pages by default
-turbine.setup.demo = true
+turbine.app.setup.demo = true
# use Tomcat Application Server
maven.appserver.name = tomcat
No revision
No revision
1.1.2.7 +3 -2
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/setup/Attic/setup.properties
Index: setup.properties
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/setup/Attic/setup.properties,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- setup.properties 4 Jul 2004 21:53:31 -0000 1.1.2.6
+++ setup.properties 4 Jul 2004 22:01:12 -0000 1.1.2.7
@@ -38,9 +38,10 @@
turbine.app.om.security.package = @TURBINE_APP_OM_SECURITY_PACKAGE@
turbine.app.subdir = false
+turbine.app.setup.demo = @TURBINE_APP_SETUP_DEMO@
+
turbine.plugin.mode = @TURBINE_PLUGIN_MODE@
turbine.plugin.inplace.dir = @TURBINE_PLUGIN_INPLACE_DIR@
-turbine.setup.demo = @TURBINE_SETUP_DEMO@
# application server to use
maven.appserver.name = @MAVEN_APPSERVER_NAME@
No revision
No revision
1.2.2.10 +10 -10 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.9
retrieving revision 1.2.2.10
diff -u -r1.2.2.9 -r1.2.2.10
--- properties.xml 4 Jul 2004 21:53:32 -0000 1.2.2.9
+++ properties.xml 4 Jul 2004 22:01:12 -0000 1.2.2.10
@@ -91,6 +91,16 @@
</tr>
<tr>
+<a name="turbine_app_setup_demo" />
+<td>turbine.app.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. See also the <a
href="using_meta.html#Demo_pages">Demo Pages</a> section.
+</td>
+</tr>
+
+<tr>
<td>turbine.plugin.mode</td>
<td>Yes</td>
<td>normal</td>
@@ -112,16 +122,6 @@
<td>Yes</td>
<td>setup.properties</td>
<td>Selects the properties file which is loaded to configure the <a
href="goals.html#turbine_setup">turbine:setup</a> goal.</td>
-</tr>
-
-<tr>
-<a name="turbine_setup_demo" />
-<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>
1.1.2.6 +2 -2
jakarta-turbine-2/extensions/maven-plugin/xdocs/Attic/using_meta.xml
Index: using_meta.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/xdocs/Attic/using_meta.xml,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- using_meta.xml 4 Jul 2004 21:53:32 -0000 1.1.2.5
+++ using_meta.xml 4 Jul 2004 22:01:12 -0000 1.1.2.6
@@ -215,11 +215,11 @@
that a newly generated turbine application already contains a few
files which allow to check the correct setup. If you don't want
M.E.T.A. to put these files into the skeleton, you can set the <a
-href="properties.html#turbine_setup_demo">turbine.setup.demo</a>
+href="properties.html#turbine_app_setup_demo">turbine.app.setup.demo</a>
property to false:
</p>
<source><![CDATA[
-maven -Dturbine.setup.demo=false turbine:setup
+maven -Dturbine.app.setup.demo=false turbine:setup
]]></source>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
