You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by he...@apache.org on 2004/10/31 16:55:05 UTC
cvs commit: jakarta-turbine-2/extensions/maven-plugin/xdocs changes.xml config.xml development-process.xml flavors.xml getting_started.xml goals.xml ide.xml index.xml installation.xml modes.xml navigation.xml properties.xml schema.xml tree.xml using_meta.xml
henning 2004/10/31 07:55:05
Modified: extensions/maven-plugin/xdocs changes.xml config.xml
development-process.xml flavors.xml
getting_started.xml goals.xml ide.xml index.xml
installation.xml modes.xml navigation.xml
properties.xml schema.xml tree.xml using_meta.xml
Log:
Update docs and bring them in line with 1.2 release.
Revision Changes Path
1.5 +10 -1 jakarta-turbine-2/extensions/maven-plugin/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/xdocs/changes.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- changes.xml 23 Aug 2004 00:27:14 -0000 1.4
+++ changes.xml 31 Oct 2004 15:55:04 -0000 1.5
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -21,9 +21,18 @@
<properties>
<title>Changes</title>
+ <author email="hps@intermeta.de">Henning P. Schmiedehausen</author>
</properties>
<body>
+ <release version="1.2" date="2004-10-31">
+ <action dev="henning" type="add">
+ Add IDE (Eclipse) Howto.
+ </action>
+ <action dev="henning" type="update">
+ Bring 2.3.1 flavor in line with Turbine and Torque release.
+ </action>
+ </release>
<release version="1.2-rc1" date="2004-08-23">
<action dev="henning" type="add">
Add a personality for the upcoming Turbine 2.3.1 release.
1.3 +2 -2 jakarta-turbine-2/extensions/maven-plugin/xdocs/config.xml
Index: config.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/xdocs/config.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config.xml 10 Aug 2004 13:10:28 -0000 1.2
+++ config.xml 31 Oct 2004 15:55:04 -0000 1.3
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -19,7 +19,7 @@
<document>
<properties>
- <title>Configuration files</title>
+ <title>Configuration files reference</title>
<author email="hps@intermeta.de">Henning P. Schmiedehausen</author>
</properties>
1.2 +2 -2 jakarta-turbine-2/extensions/maven-plugin/xdocs/development-process.xml
Index: development-process.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/xdocs/development-process.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- development-process.xml 31 Oct 2004 15:35:10 -0000 1.1
+++ development-process.xml 31 Oct 2004 15:55:04 -0000 1.2
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -19,7 +19,7 @@
<document>
<properties>
- <title>Maven Environment for Turbine Applications (M.E.T.A.)</title>
+ <title>Development process</title>
<author email="hps@intermeta.de">Henning P. Schmiedehausen</author>
</properties>
1.3 +20 -5 jakarta-turbine-2/extensions/maven-plugin/xdocs/flavors.xml
Index: flavors.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/xdocs/flavors.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- flavors.xml 10 Aug 2004 13:10:28 -0000 1.2
+++ flavors.xml 31 Oct 2004 15:55:04 -0000 1.3
@@ -19,14 +19,14 @@
<document>
<properties>
- <title>Flavors</title>
+ <title>Flavors reference</title>
<author email="hps@intermeta.de">Henning P. Schmiedehausen</author>
</properties>
<body>
<section name="Flavors">
<p>
There is more than just one version of Turbine. You might have to build one application using
- a released version of Turbine (currently 2.3) and the next should use a developer version or
+ a released version of Turbine (currently 2.3.1) and the next should use a developer version or
even a "bleeding edge" snapshot release of the Turbine code. Whatever you want to use,
the M.E.T.A. plugin helps you selecting the right skeleton for your code.
</p>
@@ -35,14 +35,14 @@
<p>
The default flavor for a new application in <a
href="using_meta.html#Ad_hoc_setup">ad hoc setup</a> mode is the
-current stable Turbine release ("turbine-2.3"). If you want
+current stable Turbine release ("turbine-2.3.1"). If you want
to use a different flavor, you must either supply it on the command
line or in your setup.properties file.</p>
<source><![CDATA[
-Generate a Turbine 2.3.1-dev skeleton:
+Generate a Turbine 2.3 skeleton:
-maven -Dturbine.app.name=<application name> -Dturbine.app.flavor=turbine-2.3.1-dev turbine:setup
+maven -Dturbine.app.name=<application name> -Dturbine.app.flavor=turbine-2.3 turbine:setup
]]></source>
</subsection>
@@ -100,6 +100,14 @@
<td>pages</td>
<td>Other files, e.g. HTML pages, that should be put into your application root.</td>
</tr>
+ <tr>
+ <td>props</td>
+ <td>Files that should go in the application classpath (the
+ <code>WEB-INF/classes</code> directory). e.g. the
+ <code>commons-logging.properties</code> that can be used with
+ Turbine 2.3.1 and beyond.
+ </td>
+ </tr>
</table>
There is also a directory called <code>common</code> which contains
@@ -122,6 +130,13 @@
To add a new flavor, you must add at least a flavor specific <code>maven</code>
subdirectory as <code>flavor/<your flavor name>/maven</code> which contains the
template for the maven POM (<code>project.xml</code>).
+</p>
+
+<p>
+The tricky part of setting up a new flavor happens when you do
+<b>not</b> need a file from the <code>common</code> directory for your
+new flavor. In that case, you must copy this file from the <code>common</code>
+sub-tree into all other flavors and then remove it from there.
</p>
</subsection>
</section>
1.3 +2 -2 jakarta-turbine-2/extensions/maven-plugin/xdocs/getting_started.xml
Index: getting_started.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/xdocs/getting_started.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- getting_started.xml 10 Aug 2004 13:10:28 -0000 1.2
+++ getting_started.xml 31 Oct 2004 15:55:04 -0000 1.3
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -19,7 +19,7 @@
<document>
<properties>
- <title>Maven Environment for Turbine Applications (M.E.T.A.)</title>
+ <title>Getting started</title>
<author email="hps@intermeta.de">Henning P. Schmiedehausen</author>
</properties>
1.4 +16 -3 jakarta-turbine-2/extensions/maven-plugin/xdocs/goals.xml
Index: goals.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/xdocs/goals.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- goals.xml 10 Aug 2004 13:10:29 -0000 1.3
+++ goals.xml 31 Oct 2004 15:55:04 -0000 1.4
@@ -19,7 +19,7 @@
<document>
<properties>
- <title>Maven Environment for Turbine Applications (M.E.T.A.) Goals</title>
+ <title>Goals reference</title>
<author email="hps@intermeta.de">Henning P. Schmiedehausen</author>
</properties>
<body>
@@ -44,8 +44,8 @@
<description>Build the SQL files necessary for the application</description>
</goal>
<goal>
- <a name="turbine_webapp"/>
- <name>turbine:webapp</name>
+ <a name="turbine_war"/>
+ <name>turbine:war</name>
<description>Generate a Turbine based Web application (war)</description>
</goal>
<goal>
@@ -192,5 +192,18 @@
</goal>
</goals>
</section>
+
+ <section name="Deprecated goals">
+ <p>These goals should no longer be used and might be removed in a later version.</p>
+ <goals>
+ <goal>
+ <name>turbine:webapp</name>
+ <description>
+ Replaced by <a href="#turbine_war">turbine:war</a>.
+ </description>
+ </goal>
+ </goals>
+ </section>
+
</body>
</document>
1.2 +11 -5 jakarta-turbine-2/extensions/maven-plugin/xdocs/ide.xml
Index: ide.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/xdocs/ide.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ide.xml 31 Oct 2004 15:32:43 -0000 1.1
+++ ide.xml 31 Oct 2004 15:55:04 -0000 1.2
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -19,7 +19,7 @@
<document>
<properties>
- <title>Maven Environment for Turbine Applications (M.E.T.A.)</title>
+ <title>IDE Howto</title>
<author email="hps@intermeta.de">Henning P. Schmiedehausen</author>
</properties>
@@ -62,7 +62,9 @@
<p>Now configure Eclipse to your installed tomcat by setting its
home directory and server.xml location in "Window"
- -> "Preferences" -> "Tomcat":<br/>
+ -> "Preferences" -> "Tomcat":
+ </p>
+ <p>
<img src="images/eclipse-tomcat-prefs.png" width="721"
height="687" alt="Tomcat Preferences"/>
</p>
@@ -118,7 +120,9 @@
"File" -> "Import" -> "Existing
Project into Workspace" and enter the location of your new
Turbine application into the Wizard. The resulting tree should
- look like this:<br/>
+ look like this:
+ </p>
+ <p>
<img src="images/eclipse-helloworld.png" width="841"
height="644" alt="Helloworld in Eclipse"/>
</p>
@@ -128,7 +132,9 @@
application and select "File" ->
"Properties" from the Menu to open the Properties
Dialog for your application. Select the "Tomcat"
- properties:<br/>
+ properties:
+ </p>
+ <p>
<img src="images/helloworld-tomcat-prefs.png" width="676"
height="544" alt="Helloworld Tomcat Preferences"/>
</p>
1.4 +3 -3 jakarta-turbine-2/extensions/maven-plugin/xdocs/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/xdocs/index.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.xml 10 Aug 2004 13:10:31 -0000 1.3
+++ index.xml 31 Oct 2004 15:55:04 -0000 1.4
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -19,7 +19,7 @@
<document>
<properties>
- <title>Maven Environment for Turbine Applications (M.E.T.A.)</title>
+ <title>Overview</title>
<author email="hps@intermeta.de">Henning P. Schmiedehausen</author>
</properties>
@@ -37,7 +37,7 @@
M.E.T.A. builds an application skeleton from a set of prebuilt
configuration files and some user supplied parameters. Most of the
parameters have reasonable defaults, only the application name must be
-supplied at setup time.
+givened at setup time.
<br/>
Parameters are supplied either on the command line (if you want to
rapid prototype an application, you can do so by running <a
1.3 +23 -75 jakarta-turbine-2/extensions/maven-plugin/xdocs/installation.xml
Index: installation.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/xdocs/installation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- installation.xml 10 Aug 2004 13:10:31 -0000 1.2
+++ installation.xml 31 Oct 2004 15:55:04 -0000 1.3
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -19,7 +19,7 @@
<document>
<properties>
- <title>Maven Environment for Turbine Applications (M.E.T.A.)</title>
+ <title>Installation</title>
<author email="hps@intermeta.de">Henning P. Schmiedehausen</author>
</properties>
@@ -29,80 +29,50 @@
<subsection name="Installing Maven">
<p>
If you want to use M.E.T.A., you need <a
-href="http://maven.apache.org/">maven</a>. Even though maven has still
-no real release and many things are in a constant state of flux, you
-can get maven 1.0-RC4 from the <a
-href="http://maven.apache.org/start/download.html">maven download
-site</a>, which proved to be working with the M.E.T.A. plugin. You can
-either get a binary or a source distribution.
+href="http://maven.apache.org/">maven</a>. The current Maven release
+is 1.0 and proved to be stable and working well with the
+M.E.T.A. plugin. You can either get a binary or a source distribution
+from the Maven site.
</p>
</subsection>
-<subsection name="Installing the Torque plugin">
-<p>
-M.E.T.A. can use Torque as OM-Layer for Turbine applications. For this, you need
-the Torque Plugin for maven. Download it directly from the maven repository site:
-</p>
+<subsection name="Installing the M.E.T.A. plugin">
+<p>
+After installing Maven, you can use the following maven command to download and install the plugin in one go:
<source><![CDATA[
-maven -DartifactId=maven-torque-plugin -DgroupId=torque -Dversion=3.1.1-dev plugin:download
+maven -DartifactId=maven-turbine-plugin -DgroupId=turbine -Dversion=1.2 plugin:download
]]></source>
-
-<p>
-If you already had the Torque plugin installed, make sure that you
-have the Plugin from the <a
-href="http://db.apache.org/torque-31/">Torque 3.1 Branch</a>
-installed. M.E.T.A. does not work with the 3.2 development branch.
</p>
<p>
-Get the M.E.T.A. plugin through the following link:
+Installing the plugin through the <code>plugin:download</code> is the preferred to go.
+Alternatively, you can get it from the <a href="http://jakarta.apache.org/turbine/download.html">Turbine download page</a>.
</p>
<table>
<tr>
- <td><a href="http://www.apache.org/~henning/maven/maven-turbine-plugin-1.2-dev.jar">M.E.T.A. Plugin (Version 1.2-dev)</a></td>
+ <td><a href="http://www.apache.org/dist/java-repository/turbine/plugins/maven-turbine-plugin-1.2.jar">M.E.T.A. Plugin (Version 1.2)</a></td>
</tr>
</table>
<p>
-Copy it into your local plugin directory, which is
-either referenced by MAVEN_HOME_LOCAL/plugins or the global plugins
-directory at MAVEN_HOME/plugins. Which one to use depends on your
-maven installation. You find some documentation on how to do this <a
-href="http://maven.apache.org/start/install.html">on the maven install
-page</a>.<br/>
+To install it manually, you copy this jar file into your local plugin
+directory, which is either referenced by MAVEN_HOME_LOCAL/plugins or
+the global plugins directory at MAVEN_HOME/plugins. Which one to use
+depends on your maven installation. You find some documentation on how
+to do this <a href="http://maven.apache.org/start/install.html">on the
+maven install page</a>.
+</p>
+
+<p>
After the installation, run <code>maven -g</code> and check whether the following
targets are displayed in the goal list:
</p>
<source><![CDATA[
-[torque] Generates SQL files and Peer-based OM
- objects
- create-db ...................... generates the target database
- datadtd ........................ Generates the DATA DTD for your project
- datadump ....................... dump data from database into xml file
- datasql ........................ generates sql from data xml
- doc ............................ Generates documentation for your datamodel
- id-table-init-sql .............. generates initialization sql for ID Broker
- init ........................... Build classpath and define tasks
- insert-sql ..................... inserts the generated sql
- jdbc ........................... jdbc to xml
- ojb ............................ Generates the repository and om for ojb (
- experimental)
- ojb-repository ................. Generates the repository for ojb (
- experimental)
- om ............................. Generate the Peer-based object model from *
- -schema.xml files
- om-zip ......................... Moves source om files to separate jar and
- out of the source tree
- sql ............................ generates the SQL for your project
- sql-check ...................... Determine if the SQL files need to be
- generated
- sql2xml ........................ creates an xml schema from an sql schema
-...
[turbine] ( NO DEFAULT GOAL )
deploy ......................... Deploys the Application into a local web
container for testing
@@ -111,31 +81,9 @@
setup .......................... Setup a new Turbine web application
sql ............................ Build the SQL files necessary for the
application
- webapp ......................... Generate a Turbine based Web application (
+ war ............................ Generate a Turbine based Web application (
war)
]]></source>
-
-<p>If you get errors or build failures when running M.E.T.A. goals,
-because maven can not download either <code>torque-3.1.1-dev.jar</code>
-or <code>torque-gen-3.1.1-dev.jar</code>, then get these files from
-here:</p>
-
-<table>
-<tr>
- <td><a href="http://www.apache.org/~henning/maven/torque-3.1.1-dev.jar">torque-3.1.1-dev.jar</a></td>
-</tr>
-<tr>
- <td><a href="http://www.apache.org/~henning/maven/torque-gen-3.1.1-dev.jar">torque-gen-3.1.1-dev.jar</a></td>
-</tr>
-</table>
-<p>
-These files are dependencies of the Maven Torque plugin which has no
-official release and its dependencies might not be in the maven
-repository located at <a
-href="http://www.ibiblio.org/maven">ibiblio</a>. Get both files and
-put them into your local repository in the <code>torque/jars</code>
-subdirectory.
-</p>
<p>You are now ready to use M.E.T.A. Continue to the <a
href="getting_started.html">Getting Started</a> page.</p>
1.3 +11 -4 jakarta-turbine-2/extensions/maven-plugin/xdocs/modes.xml
Index: modes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/xdocs/modes.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- modes.xml 10 Aug 2004 13:10:31 -0000 1.2
+++ modes.xml 31 Oct 2004 15:55:04 -0000 1.3
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -19,7 +19,7 @@
<document>
<properties>
- <title>Maven Environment for Turbine Applications (M.E.T.A.)</title>
+ <title>Mode reference</title>
<author email="hps@intermeta.de">Henning P. Schmiedehausen</author>
</properties>
@@ -38,7 +38,7 @@
container by running the <a href="goals.html#turbine_deploy">turbine:deploy</a> goal.</li>
<li><b>inplace</b> - The source code and the class files are kept together . Your web container will access
the files in the development location and no explicit deployment to the container is necessary.
-This mode is similar to developing with the old <a href="http://jakarta.apache.org/turbine/tdk/">Turbine Development Kit</a>.</li>
+This mode is similar to developing with the deprecated <a href="http://jakarta.apache.org/turbine/tdk/">Turbine Development Kit</a>.</li>
</ul>
</p>
@@ -115,7 +115,14 @@
This mode is suitable when moving from the <a
href="http://jakarta.apache.org/turbine/tdk/">Turbine Development
Kit</a> to M.E.T.A. or when you can customize your web container to
-access your development location. Its tree layout is directly usable as a web application.
+access your development location. Its tree layout is directly usable
+as a web application.
+</p>
+
+<p>
+An application that has been set up with this mode can be loaded into
+an IDE, e.g. <a href="http://www.eclipse.org/">Eclipse</a>. Please
+refer to the <a href="ide.html">IDE Reference</a> on how to do this.
</p>
<source><![CDATA[
1.5 +10 -4 jakarta-turbine-2/extensions/maven-plugin/xdocs/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/xdocs/navigation.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- navigation.xml 23 Aug 2004 00:27:14 -0000 1.4
+++ navigation.xml 31 Oct 2004 15:55:04 -0000 1.5
@@ -18,12 +18,17 @@
-->
<project>
- <title>
- </title>
+ <title>Maven Environment for Turbine Applications (M.E.T.A.)</title>
<body>
<links>
- <item name="Turbine" href="http://jakarta.apache.org/turbine/"/>
+ <item name="Turbine Home" href="http://jakarta.apache.org/turbine/"/>
+ <item name="Fulcrum" href="http://jakarta.apache.org/turbine/fulcrum/"/>
+ <item name="META" href="http://jakarta.apache.org/turbine/meta/"/>
+ <item name="TDK" href="http://jakarta.apache.org/turbine/tdk/"/>
+ <item name="Stratum" href="http://jakarta.apache.org/turbine/stratum/"/>
+ <item name="JCS" href="http://jakarta.apache.org/turbine/jcs/"/>
</links>
+
<menu name="Overview">
<item href="/index.html" name="Home"/>
<item href="/installation.html" name="Installation"/>
@@ -31,8 +36,9 @@
<item href="/using_meta.html" name="Using M.E.T.A."/>
<item href="/tree.html" name="Directory tree reference"/>
<item href="/config.html" name="Configuration file reference"/>
- <item href="/schema.html" name="Schema file reference"/>
+ <item href="/schema.html" name="Torque Schema file reference"/>
<item href="/modes.html" name="Application development modes"/>
+ <item href="/ide.html" name="Use an IDE with M.E.T.A."/>
<item href="/flavors.html" name="Flavors of Turbine applications"/>
<item href="/goals.html" name="Goals"/>
<item href="/properties.html" name="Properties"/>
1.4 +10 -3 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- properties.xml 10 Aug 2004 13:10:32 -0000 1.3
+++ properties.xml 31 Oct 2004 15:55:04 -0000 1.4
@@ -19,7 +19,7 @@
<document>
<properties>
- <title>Properties</title>
+ <title>Properties reference</title>
<author email="hps@intermeta.de">Henning P. Schmiedehausen</author>
</properties>
<body>
@@ -58,11 +58,11 @@
<tr>
<td>turbine.app.flavor</td>
<td>Yes</td>
-<td>turbine-2.3</td>
+<td>turbine-2.3.1</td>
<td>Defines the dependencies and the release version of Turbine that the new application should use. Currently supported versions are:<br/>
<ul>
<li>turbine-2.3</li>
- <li>turbine-2.3.1-dev</li>
+ <li>turbine-2.3.1</li>
</ul>
See the <a href="flavors.html">Flavors page</a> for more information.</td>
</tr>
@@ -277,6 +277,13 @@
<td>Yes</td>
<td>depends on development mode, see <a href="tree.html">Directory tree reference</a></td>
<td>Directory where files that should go into the root of the web application are kept.</td>
+</tr>
+
+<tr>
+<td>turbine.plugin.src.props</td>
+<td>Yes</td>
+<td>depends on development mode, see <a href="tree.html">Directory tree reference</a></td>
+<td>Directory where files that should go into the WEB-INF/classes directory of the web application are kept.</td>
</tr>
<tr>
1.4 +9 -8 jakarta-turbine-2/extensions/maven-plugin/xdocs/schema.xml
Index: schema.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/xdocs/schema.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- schema.xml 30 Oct 2004 17:01:40 -0000 1.3
+++ schema.xml 31 Oct 2004 15:55:04 -0000 1.4
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -19,7 +19,7 @@
<document>
<properties>
- <title>Configuration files</title>
+ <title>Torque schema files</title>
<author email="hps@intermeta.de">Henning P. Schmiedehausen</author>
</properties>
@@ -27,7 +27,7 @@
<section name="Torque schema files">
<p>
- Most Turbine applications use <a
+ Many Turbine applications use <a
href="http://db.apache.org/torque/">Torque</a> to access
databases. M.E.T.A. supplies you with a few schema files to preset your
database and to generate some data which can be put into the
@@ -89,7 +89,7 @@
<subsection name="Turbine Security">
<p>
- Even though the default M.E.T.A. application uses no security, it still
+ Even though the default M.E.T.A. setup and the demo application use no security, M.E.T.A. still
generates the necessary tables and informations to write a
security-enabled application.<br/>
M.E.T.A. supplies table definition and preset data to be used in
@@ -105,12 +105,13 @@
file. <code>turbine-security-data.xml</code> and
<code>turbine-security-data.dtd</code> are provided as examples and
can be safely modified or removed if the values are not suitable for
- your application. There is no code inside the M.E.T.A. plugin or a M.E.T.A.
- generated application that uses the generated Users, Groups, Roles
- or Permissions.</p>
+ your application. There is no code inside the M.E.T.A. plugin or the M.E.T.A.
+ demo application that uses the generated Users, Groups, Roles
+ or Permissions. These are only for demonstration purposes on how to generate SQL
+ statements from the XML data schema.</p>
<p>
- Note that loading security objects from an XML file has a major
+ Note that loading security objects from XML files has a major
drawback: If you want to use password encryption, you must put the
encrypted strings into the <code>Password</code> attributes of the
TurbineUser elements. If you want to put cleartext passwords into
1.4 +10 -8 jakarta-turbine-2/extensions/maven-plugin/xdocs/tree.xml
Index: tree.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/xdocs/tree.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tree.xml 30 Oct 2004 17:01:40 -0000 1.3
+++ tree.xml 31 Oct 2004 15:55:04 -0000 1.4
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -19,7 +19,7 @@
<document>
<properties>
- <title>Directory Tree reference</title>
+ <title>Directory tree reference</title>
<author email="hps@intermeta.de">Henning P. Schmiedehausen</author>
</properties>
@@ -44,9 +44,11 @@
<td>Configuration data for your web application</td>
<td>This directory contains all the configuration files for your
application. All files in this directory with the exception of
-<appname>-web.xml are copied to the <code>WEB-INF/conf</code>
-location of your application.<br/> The <appname>-web.xml file
-will be copied to <code>WEB-INF/web.xml</code>.
+<appname>-web.xml and commons-logging.properties are copied to
+the <code>WEB-INF/conf</code> location of your application.<br/> The
+<appname>-web.xml file will be copied to
+<code>WEB-INF/web.xml</code> and the commons-logging.properties file
+will be put into the <code>WEB-INF/classes</code> directory.
</td>
</tr>
@@ -205,7 +207,7 @@
<td>logs</td>
<td>-</td>
<td>Log files</td>
-<td>A M.E.T.A. generated application writes a few logfiles which are useful for debugging and runtime diagnosis. These files are put here.</td>
+<td>A M.E.T.A. generated application writes logfiles for debugging and runtime diagnosis. These files are put here.</td>
</tr>
</table>
</section>
@@ -248,7 +250,7 @@
<a name="logs"/>
<td>logs</td>
<td>Log files</td>
-<td>A M.E.T.A. generated application writes a few logfiles which are useful for debugging and runtime diagnosis. These files are put here.</td>
+<td>A M.E.T.A. generated application writes logfiles for debugging and runtime diagnosis. These files are put here.</td>
</tr>
<tr>
<td>templates</td>
@@ -289,7 +291,7 @@
<p>You can run your custom deployment or web application generation by
using a <code>postGoal</code> to the <a
href="goals.html#turbine_deploy">turbine:deploy</a> or <a
-href="goals.html#turbine_webapp">turbine:webapp</a> goal. In a <a
+href="goals.html#turbine_war">turbine:war</a> goal. In a <a
href="goals.html#turbine_deploy">turbine:deploy</a> postGoal you can
access the <a href="properties.html#turbine_target_dir">turbine.target.dir</a> property as the deployment
location of your application.
1.4 +5 -5 jakarta-turbine-2/extensions/maven-plugin/xdocs/using_meta.xml
Index: using_meta.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/xdocs/using_meta.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- using_meta.xml 30 Oct 2004 17:01:40 -0000 1.3
+++ using_meta.xml 31 Oct 2004 15:55:04 -0000 1.4
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -19,7 +19,7 @@
<document>
<properties>
- <title>Maven Environment for Turbine Applications (M.E.T.A.)</title>
+ <title>Using M.E.T.A.</title>
<author email="hps@intermeta.de">Henning P. Schmiedehausen</author>
</properties>
@@ -34,9 +34,9 @@
<ul>
<li><b>normal</b> - Your application is developed outside the container tree. It must be deployed to the
container by running the <a href="goals.html#turbine_deploy">turbine:deploy</a> goal.</li>
-<li><b>inplace</b> - The source code and the class files are kept together . Your web container will access
+<li><b>inplace</b> - The source code and the class files are kept together. Your web container will access
the files in the development location and no explicit deployment to the container is necessary.
-This mode is similar to developing with the old <a href="http://jakarta.apache.org/turbine/tdk/">Turbine Development Kit</a>.</li>
+This mode is similar to developing with the deprecated <a href="http://jakarta.apache.org/turbine/tdk/">Turbine Development Kit</a>.</li>
</ul>
Modes are discussed on the <a href="modes.html">Modes</a> page.</p>
@@ -85,7 +85,7 @@
|
| yes
V
- maven turbine:webapp - bind a war file
+ maven turbine:war - bind a war file
|
V
Ship application
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org