henning 2004/07/04 14:53:32
Modified: extensions/maven-plugin/src/plugin Tag: TURBINE_2_3_BRANCH
plugin.jelly
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:
Add some more documentation about the turbine.app.om.layer parameter
Revision Changes Path
No revision
No revision
1.1.2.27 +1 -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.26
retrieving revision 1.1.2.27
diff -u -r1.1.2.26 -r1.1.2.27
--- plugin.jelly 4 Jul 2004 20:00:21 -0000 1.1.2.26
+++ plugin.jelly 4 Jul 2004 21:53:31 -0000 1.1.2.27
@@ -75,6 +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_PLUGIN_BASE_DIR" value="${turbine.plugin.base.dir}"/>
<filter token="TURBINE_PLUGIN_SRC_IMAGES"
value="${turbine.plugin.src.images}"/>
No revision
No revision
1.1.2.6 +2 -1
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.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- setup.properties 4 Jul 2004 20:00:22 -0000 1.1.2.5
+++ setup.properties 4 Jul 2004 21:53:31 -0000 1.1.2.6
@@ -40,6 +40,7 @@
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.9 +16 -1 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.8
retrieving revision 1.2.2.9
diff -u -r1.2.2.8 -r1.2.2.9
--- properties.xml 4 Jul 2004 17:32:15 -0000 1.2.2.8
+++ properties.xml 4 Jul 2004 21:53:32 -0000 1.2.2.9
@@ -57,7 +57,7 @@
<tr>
<td>turbine.app.flavor</td>
-<td>No</td>
+<td>Yes</td>
<td>turbine-2.3</td>
<td>Defines the dependencies and the release version of Turbine that the new
application should use. Currently supported versions are:<br/>
<ul>
@@ -68,6 +68,19 @@
</tr>
<tr>
+<a name="turbine_app_om_layer" />
+<td>turbine.app.om.layer</td>
+<td>Yes</td>
+<td>torque</td>
+<td>Defines the OM layer which is configured and used with Turbine to access
database information. Currently supported settings are:<br/>
+ <ul>
+ <li>none - don't configure an OM layer</li>
+ <li>torque - configure Torque</li>
+ </ul>
+ See the <a href="using_meta.html#OM_Layers">OM Layer Configuration</a> for more
information.</td>
+</tr>
+
+<tr>
<td>turbine.app.subdir</td>
<td>Yes</td>
<td>true</td>
@@ -94,6 +107,7 @@
</tr>
<tr>
+<a name="turbine_setup_properties" />
<td>turbine.setup.properties</td>
<td>Yes</td>
<td>setup.properties</td>
@@ -101,6 +115,7 @@
</tr>
<tr>
+<a name="turbine_setup_demo" />
<td>turbine.setup.demo</td>
<td>Yes</td>
<td>true</td>
1.1.2.5 +22 -0
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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- using_meta.xml 4 Jul 2004 17:43:25 -0000 1.1.2.4
+++ using_meta.xml 4 Jul 2004 21:53:32 -0000 1.1.2.5
@@ -186,6 +186,28 @@
]]></source>
</subsection>
+<subsection name="OM Layers">
+<p>
+Turbine supports the retrieval of information from databases through
+various OM layers. The most popular is <a
+href="http://db.apache.org/torque/";>Torque</a> and Turbine itself uses
+Torque for the <a
+href="http://jakarta.apache.org/turbine/turbine-2.3/services/security-service.html";>Security
+Service</a> and the <a
+href="http://jakarta.apache.org/turbine/turbine-2.3/services/scheduler-service.html";>Scheduler
+Service</a>. With the M.E.T.A. plugin, different OM layers can be
+configured. The default is to use Torque. The OM layer is configured
+by setting the <a
+href="properties.html#turbine_app_om_layer">turbine.app.om.layer</a>
+property. Currently supported settings are:<br/>
+
+<ul>
+<li>torque - Configure Torque</li>
+<li>none - don't use an OM layer</li>
+</ul>
+</p>
+</subsection>
+
<subsection name="Demo pages">
<p>
In the "helloworld" example from the <a
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
