henning 2004/08/22 17:27:14
Modified: extensions/maven-plugin project.xml
extensions/maven-plugin/src/plugin plugin.jelly
extensions/maven-plugin/src/plugin-resources/flavor/common/maven
project.properties
extensions/maven-plugin/src/plugin-resources/mode
inplace.properties normal.properties
extensions/maven-plugin/src/plugin-resources/setup
setup.properties
extensions/maven-plugin/xdocs changes.xml navigation.xml
Added: extensions/maven-plugin/src/plugin-resources/flavor/turbine-2.3.1/props
commons-logging.properties
Removed:
extensions/maven-plugin/src/plugin-resources/flavor/turbine-2.3.1-dev/maven
project.xml
Log:
- Add commons-logging properties for 2.3.1 release
- Call it 1.2-rc1
Revision Changes Path
1.8 +23 -8 jakarta-turbine-2/extensions/maven-plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 10 Aug 2004 13:09:55 -0000 1.7
+++ project.xml 23 Aug 2004 00:27:14 -0000 1.8
@@ -21,7 +21,7 @@
<!-- -->
<!-- Maven project.xml Datei -->
<!-- -->
-<!-- $Id$ -->
+<!-- $Id$ -->
<!-- -->
<!-- =================================================================== -->
@@ -30,14 +30,13 @@
<id>maven-turbine-plugin</id>
<name>Maven Environment for Turbine Applications Plugin</name>
<groupId>turbine</groupId>
- <currentVersion>1.2-dev</currentVersion>
+ <currentVersion>1.2-rc1</currentVersion>
<organization>
<name>Apache Software Foundation</name>
<url>http://jakarta.apache.org/</url>
<logo>/images/jakarta.png</logo>
</organization>
- <inceptionYear>2003</inceptionYear>
- <package>org.apache.turbine</package>
+ <inceptionYear>2004</inceptionYear>
<logo>/images/blue-logo.gif</logo>
<description>
The Maven Environment for Turbine Applications (M.E.T.A.) is a replacement
@@ -45,13 +44,14 @@
defined setup for starting new Turbine applications.
</description>
<shortDescription>Maven Environment for Turbine Applications</shortDescription>
- <url>http://jakarta.apache.org/turbine/turbine-2.3/maven-turbine-plugin/</url>
+ <url>http://jakarta.apache.org/turbine/meta/</url>
<issueTrackingUrl>http://issues.apache.org/scarab/issues</issueTrackingUrl>
<siteAddress>jakarta.apache.org</siteAddress>
-
<siteDirectory>/www/jakarta.apache.org/turbine/turbine-2.3/maven-turbine-plugin/</siteDirectory>
-
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-turbine-2/</distributionDirectory>
+ <siteDirectory>/www/jakarta.apache.org/turbine/meta/</siteDirectory>
+
<distributionDirectory>/www/www.apache.org/dist/jakarta/turbine/</distributionDirectory>
<repository>
- <connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-turbine-2/extensions/maven-plugin/</connection>
+ <connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-turbine-2/extensions/maven-plugin</connection>
+ <developerConnection>scm:cvs:ext:[EMAIL
PROTECTED]:/home/cvs:jakarta-turbine-2/extensions/maven-plugin</developerConnection>
<url>http://cvs.apache.org/viewcvs/jakarta-turbine-2/extensions/maven-plugin/</url>
</repository>
<mailingLists>
@@ -89,6 +89,12 @@
<timezone>2</timezone>
</developer>
</developers>
+ <versions>
+ <version>
+ <name>1.2-rc1</name>
+ <tag>META_1_2_RC1</tag>
+ </version>
+ </versions>
<contributors>
<contributor>
@@ -100,11 +106,20 @@
</contributor>
</contributors>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
<!-- ======================================================================== -->
<!-- -->
<!-- M.E.T.A. itself has no dependencies on any jars. -->
<!-- -->
<!-- ======================================================================== -->
+ <dependencies/>
<build>
<resources>
1.3 +10 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.jelly 10 Aug 2004 13:10:00 -0000 1.2
+++ plugin.jelly 23 Aug 2004 00:27:14 -0000 1.3
@@ -89,6 +89,7 @@
<filter token="TURBINE_PLUGIN_SRC_CONF" value="${turbine.plugin.src.conf}"/>
<filter token="TURBINE_PLUGIN_SRC_JAVA" value="${turbine.plugin.src.java}"/>
<filter token="TURBINE_PLUGIN_SRC_TEST" value="${turbine.plugin.src.test}"/>
+ <filter token="TURBINE_PLUGIN_SRC_PROPS" value="${turbine.plugin.src.props}"/>
<filter token="TURBINE_PLUGIN_TARGET_LIB"
value="${turbine.plugin.target.lib}"/>
@@ -155,6 +156,7 @@
<mkdir dir="${turbine.plugin.root.dir}/${turbine.plugin.src.style}"/>
<mkdir dir="${turbine.plugin.root.dir}/${turbine.plugin.src.images}"/>
<mkdir dir="${turbine.plugin.root.dir}/${turbine.plugin.src.pages}"/>
+ <mkdir dir="${turbine.plugin.root.dir}/${turbine.plugin.src.props}"/>
<mkdir dir="${turbine.plugin.root.dir}/${turbine.plugin.src.resources}"/>
<mkdir dir="${turbine.plugin.root.dir}/${turbine.plugin.src.java}/${appDir}" />
@@ -204,6 +206,11 @@
flavor="${turbine.app.flavor}"
fromfile="conf/application-web.xml" />
+ <meta:copyFlavorDir
todir="${turbine.plugin.root.dir}/${turbine.plugin.src.props}" filtering="true"
+ flavor="${turbine.app.flavor}"
+ frompath="props"
+ include="**/*" />
+
<meta:copyFlavorFile
tofile="${turbine.plugin.root.dir}/${turbine.plugin.src.conf}/${turbine.app.name}.properties"
filtering="true"
flavor="${turbine.app.flavor}"
fromfile="conf/application.properties" />
@@ -427,6 +434,7 @@
<copy todir="${turbine.target.dir}/WEB-INF/conf" flatten="true"
includeEmptyDirs="no">
<fileset dir="${turbine.plugin.src.conf}">
<exclude name="${pom.artifactId}-web.xml"/>
+ <exclude name="commons-logging.properties"/>
</fileset>
</copy>
</j:when>
@@ -571,6 +579,7 @@
<fileset dir="${maven.build.dest}">
<include name="**/*"/>
<exclude name="."/>
+ <exclude name="**/*.properties"/>
</fileset>
</ant:delete>
</j:when>
@@ -682,6 +691,7 @@
<copy todir="${webapp.build.webinf}/conf" flatten="true"
includeEmptyDirs="no">
<fileset dir="${turbine.plugin.src.conf}">
<exclude name="**/${pom.artifactId}-web.xml"/>
+ <exclude name="commons-logging.properties"/>
</fileset>
</copy>
</j:when>
1.3 +2 -1
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/flavor/common/maven/project.properties
Index: project.properties
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/flavor/common/maven/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.properties 10 Aug 2004 13:10:15 -0000 1.2
+++ project.properties 23 Aug 2004 00:27:14 -0000 1.3
@@ -82,6 +82,7 @@
turbine.plugin.src.conf = @TURBINE_PLUGIN_SRC_CONF@
turbine.plugin.src.java = @TURBINE_PLUGIN_SRC_JAVA@
turbine.plugin.src.test = @TURBINE_PLUGIN_SRC_TEST@
+turbine.plugin.src.props = @TURBINE_PLUGIN_SRC_PROPS@
turbine.plugin.target.lib = @TURBINE_PLUGIN_TARGET_LIB@
1.1
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/flavor/turbine-2.3.1/props/commons-logging.properties
Index: commons-logging.properties
===================================================================
org.apache.commons.logging.Log = org.apache.commons.logging.impl.Log4JLogger
1.3 +2 -1
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/mode/inplace.properties
Index: inplace.properties
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/mode/inplace.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- inplace.properties 10 Aug 2004 13:10:17 -0000 1.2
+++ inplace.properties 23 Aug 2004 00:27:14 -0000 1.3
@@ -48,6 +48,7 @@
turbine.plugin.src.conf = ${turbine.plugin.base.dir}/WEB-INF/conf
turbine.plugin.src.java = ${turbine.plugin.base.dir}/WEB-INF/src
turbine.plugin.src.test = ${turbine.plugin.base.dir}/WEB-INF/test
+turbine.plugin.src.props = ${turbine.plugin.base.dir}/WEB-INF/classes
turbine.plugin.target.lib = ${turbine.plugin.base.dir}/WEB-INF/lib
1.3 +3 -1
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/mode/normal.properties
Index: normal.properties
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/mode/normal.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- normal.properties 10 Aug 2004 13:10:17 -0000 1.2
+++ normal.properties 23 Aug 2004 00:27:14 -0000 1.3
@@ -46,6 +46,8 @@
turbine.plugin.src.style = src/style
turbine.plugin.src.templates = src/templates
turbine.plugin.src.test = src/test
+turbine.plugin.src.props = conf
+
turbine.plugin.webxml.dir = conf
#
1.3 +2 -1
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/setup/setup.properties
Index: setup.properties
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/setup/setup.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- setup.properties 10 Aug 2004 13:10:25 -0000 1.2
+++ setup.properties 23 Aug 2004 00:27:14 -0000 1.3
@@ -80,3 +80,4 @@
turbine.plugin.src.resources = @TURBINE_PLUGIN_SRC_RESOURCES@
turbine.plugin.src.templates = @TURBINE_PLUGIN_SRC_TEMPLATES@
turbine.plugin.src.test = @TURBINE_PLUGIN_SRC_TEST@
+turbine.plugin.src.props = @TURBINE_PLUGIN_SRC_PROPS@
1.4 +4 -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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- changes.xml 10 Aug 2004 13:10:28 -0000 1.3
+++ changes.xml 23 Aug 2004 00:27:14 -0000 1.4
@@ -24,7 +24,10 @@
</properties>
<body>
- <release version="1.2-dev" date="in CVS">
+ <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.
+ </action>
<action dev="henning" type="add">
Different OM layers can be configured when setting up the application.
Currently
only Torque and no OM layer are supported (Volunteers for Hibernate, OJB
wanted!)
1.4 +1 -3 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 10 Aug 2004 13:10:32 -0000 1.3
+++ navigation.xml 23 Aug 2004 00:27:14 -0000 1.4
@@ -22,9 +22,7 @@
</title>
<body>
<links>
- <item href="http://jakarta.apache.org/turbine/"; name="Turbine"/>
- <item href="http://db.apache.org/torque/"; name="Torque"/>
- <item href="http://maven.apache.org/"; name="Maven"/>
+ <item name="Turbine"
href="http://jakarta.apache.org/turbine/"/>
</links>
<menu name="Overview">
<item href="/index.html" name="Home"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
