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/06/27 18:56:20 UTC
cvs commit: jakarta-turbine-2/extensions/maven-plugin/xdocs flavors.xml getting_started.xml modes.xml tree.xml
henning 2004/06/27 09:56:20
Modified: extensions/maven-plugin/src/plugin Tag: TURBINE_2_3_BRANCH
plugin.jelly
extensions/maven-plugin/src/plugin-resources/flavor/common/maven
Tag: TURBINE_2_3_BRANCH project.properties
extensions/maven-plugin/src/plugin-resources/mode Tag:
TURBINE_2_3_BRANCH inplace.properties
normal.properties
extensions/maven-plugin/xdocs Tag: TURBINE_2_3_BRANCH
flavors.xml getting_started.xml modes.xml tree.xml
Log:
- removed unused src.webinf property
- make src.pages official (+ docs)
- add some missing docs for resources
- add some copyright notices
Revision Changes Path
No revision
No revision
1.1.2.20 +23 -1 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.19
retrieving revision 1.1.2.20
diff -u -r1.1.2.19 -r1.1.2.20
--- plugin.jelly 27 Jun 2004 14:03:42 -0000 1.1.2.19
+++ plugin.jelly 27 Jun 2004 16:56:20 -0000 1.1.2.20
@@ -1,5 +1,23 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+
<!-- ======================================================================== -->
<!-- -->
<!-- plugin.jelly for M.E.T.A. -->
@@ -65,7 +83,6 @@
<filter token="TURBINE_PLUGIN_SRC_SCRIPTS" value="${turbine.plugin.src.scripts}"/>
<filter token="TURBINE_PLUGIN_SRC_STYLE" value="${turbine.plugin.src.style}"/>
<filter token="TURBINE_PLUGIN_SRC_TEMPLATES" value="${turbine.plugin.src.templates}"/>
- <filter token="TURBINE_PLUGIN_SRC_WEBINF" value="${turbine.plugin.src.webinf}"/>
<filter token="TURBINE_PLUGIN_SRC_CONF" value="${turbine.plugin.src.conf}"/>
<filter token="TURBINE_PLUGIN_SRC_JAVA" value="${turbine.plugin.src.java}"/>
@@ -198,6 +215,11 @@
<meta:copyTurbineDir todir="${turbine.plugin.root.dir}/${turbine.plugin.src.images}" filtering="false"
flavor="${turbine.app.flavor}"
frompath="images"
+ include="**/*" />
+
+ <meta:copyTurbineDir todir="${turbine.plugin.root.dir}/${turbine.plugin.src.resources}" filtering="true"
+ flavor="${turbine.app.flavor}"
+ frompath="resources"
include="**/*" />
<meta:copyTurbineDir todir="${turbine.plugin.root.dir}/${turbine.plugin.src.pages}" filtering="true"
No revision
No revision
1.1.2.3 +18 -3 jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/flavor/common/maven/Attic/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/flavor/common/maven/Attic/project.properties,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- project.properties 26 Jun 2004 18:10:47 -0000 1.1.2.2
+++ project.properties 27 Jun 2004 16:56:20 -0000 1.1.2.3
@@ -7,6 +7,22 @@
# to do site or installation specific changes to the project build.
# -------------------------------------------------------------------
+#
+# Copyright 2001-2004 The Apache Software Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
compile.debug = on
compile.optimize = off
compile.deprecation = off
@@ -44,13 +60,12 @@
turbine.plugin.base.dir = @TURBINE_PLUGIN_BASE_DIR@
turbine.plugin.src.images = @TURBINE_PLUGIN_SRC_IMAGES@
+turbine.plugin.src.pages = @TURBINE_PLUGIN_SRC_PAGES@
turbine.plugin.src.resources = @TURBINE_PLUGIN_SRC_RESOURCES@
turbine.plugin.src.schema = @TURBINE_PLUGIN_SRC_SCHEMA@
turbine.plugin.src.scripts = @TURBINE_PLUGIN_SRC_SCRIPTS@
turbine.plugin.src.style = @TURBINE_PLUGIN_SRC_STYLE@
turbine.plugin.src.templates = @TURBINE_PLUGIN_SRC_TEMPLATES@
-
-turbine.plugin.src.webinf = @TURBINE_PLUGIN_SRC_WEBINF@
turbine.plugin.src.conf = @TURBINE_PLUGIN_SRC_CONF@
turbine.plugin.src.java = @TURBINE_PLUGIN_SRC_JAVA@
No revision
No revision
1.1.2.2 +18 -1 jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/mode/Attic/inplace.properties
Index: inplace.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/mode/Attic/inplace.properties,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- inplace.properties 26 Jun 2004 17:21:04 -0000 1.1.2.1
+++ inplace.properties 27 Jun 2004 16:56:20 -0000 1.1.2.2
@@ -7,6 +7,22 @@
# ------------------------------------------------------------------------
#
+# Copyright 2001-2004 The Apache Software Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
# Defaults for the plugin parameters. These are described in depth in
# the documentation. If you find any parameter in this file which is
# missing in the documentation, please report this to the Turbine
@@ -21,6 +37,7 @@
#
turbine.plugin.src.images = ${turbine.plugin.base.dir}/images
+turbine.plugin.src.pages = ${turbine.plugin.base.dir}
turbine.plugin.src.resources = ${turbine.plugin.base.dir}/resources
turbine.plugin.src.schema = src/schema
turbine.plugin.src.scripts = ${turbine.plugin.base.dir}/scripts
1.1.2.4 +18 -1 jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/mode/Attic/normal.properties
Index: normal.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/mode/Attic/normal.properties,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- normal.properties 27 Jun 2004 13:50:48 -0000 1.1.2.3
+++ normal.properties 27 Jun 2004 16:56:20 -0000 1.1.2.4
@@ -7,6 +7,22 @@
# ------------------------------------------------------------------------
#
+# Copyright 2001-2004 The Apache Software Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
# Defaults for the plugin parameters. These are described in depth in
# the documentation. If you find any parameter in this file which is
# missing in the documentation, please report this to the Turbine
@@ -23,6 +39,7 @@
turbine.plugin.src.conf = conf
turbine.plugin.src.images = src/images
turbine.plugin.src.java = src/java
+turbine.plugin.src.pages = src/pages
turbine.plugin.src.resources = src/resources
turbine.plugin.src.schema = src/schema
turbine.plugin.src.scripts = src/scripts
No revision
No revision
1.1.2.3 +25 -0 jakarta-turbine-2/extensions/maven-plugin/xdocs/Attic/flavors.xml
Index: flavors.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/xdocs/Attic/flavors.xml,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- flavors.xml 27 Jun 2004 14:34:15 -0000 1.1.2.2
+++ flavors.xml 27 Jun 2004 16:56:20 -0000 1.1.2.3
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
<document>
<properties>
@@ -74,6 +91,14 @@
<tr>
<td>images</td>
<td>Images to be copied into your application.</td>
+ </tr>
+ <tr>
+ <td>resources</td>
+ <td>General resources needed for your application.</td>
+ </tr>
+ <tr>
+ <td>pages</td>
+ <td>Other files, e.g. HTML pages, that should be put into your application root.</td>
</tr>
</table>
1.1.2.7 +2 -1 jakarta-turbine-2/extensions/maven-plugin/xdocs/Attic/getting_started.xml
Index: getting_started.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/xdocs/Attic/getting_started.xml,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- getting_started.xml 27 Jun 2004 14:34:15 -0000 1.1.2.6
+++ getting_started.xml 27 Jun 2004 16:56:20 -0000 1.1.2.7
@@ -85,6 +85,7 @@
| |-- navigations
| |-- pages
| `-- screens
+ |-- pages
|-- resources
|-- schema
|-- scripts
@@ -112,7 +113,7 @@
Restart your web container or force it to reload its applications.<br/>
Point your browser to the deployed application (if you use <a href="http://jakarta.apache.org/tomcat/">Tomcat</a>
running on your local machine, this would be
-<a href="http://localhost:8080/helloworld/app/">http://localhost:8080/helloworld/app/</a>).</p>
+<a href="http://localhost:8080/helloworld/">http://localhost:8080/helloworld/</a>).</p>
<p>The result should look like this:
<center><img src="images/helloworld.png" width="722" height="525"/><br/></center>
1.1.2.2 +2 -0 jakarta-turbine-2/extensions/maven-plugin/xdocs/Attic/modes.xml
Index: modes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/xdocs/Attic/modes.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- modes.xml 27 Jun 2004 14:34:15 -0000 1.1.2.1
+++ modes.xml 27 Jun 2004 16:56:20 -0000 1.1.2.2
@@ -94,6 +94,7 @@
| |-- navigations
| |-- pages
| `-- screens
+ |-- pages
|-- resources
|-- schema
|-- scripts
@@ -135,6 +136,7 @@
| | `-- screens
| `-- test
|-- images
+|-- pages
|-- resources
|-- scripts
|-- src
1.1.2.4 +17 -0 jakarta-turbine-2/extensions/maven-plugin/xdocs/Attic/tree.xml
Index: tree.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/xdocs/Attic/tree.xml,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- tree.xml 27 Jun 2004 14:34:15 -0000 1.1.2.3
+++ tree.xml 27 Jun 2004 16:56:20 -0000 1.1.2.4
@@ -67,6 +67,23 @@
<code>WEB-INF/classes</code> tree</td>
</tr>
+<a name="src_resources"/>
+<tr>
+<td>src/resources</td>
+<td>resources</td>
+<td>Misc. Turbine resource files</td>
+<td>All files in this directory will be copied to the <code>resources</code>
+subdirectory in the root of your application.</td>
+</tr>
+
+<a name="src_pages"/>
+<tr>
+<td>src/pages</td>
+<td>.</td>
+<td>HTML pages</td>
+<td>All files in this directory will be copied to the root directory of your application.</td>
+</tr>
+
<a name="src_scripts"/>
<tr>
<td>src/scripts</td>
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org