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/05/19 17:45:04 UTC
cvs commit: jakarta-turbine-2/extensions/maven-plugin/src/plugin plugin.jelly plugin.properties
henning 2004/05/19 08:45:04
Modified: extensions/maven-plugin Tag: TURBINE_2_3_BRANCH README
extensions/maven-plugin/src/plugin Tag: TURBINE_2_3_BRANCH
plugin.jelly plugin.properties
Log:
Ah well. Due to a Bug in the texen task (it will throw a null pointer exception),
the database name must never be unset. Else you won't be able to compile the
Torque peer classes.
So the torque.database must never be unset. Use postgresql as default (this
will not influence your code unless you want to build the sql files for
inserting into the database). Test for torque.database being unset and
bail out with an error message it its not.
Revision Changes Path
No revision
No revision
1.2.2.3 +1 -7 jakarta-turbine-2/extensions/maven-plugin/README
Index: README
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/README,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- README 19 May 2004 15:24:31 -0000 1.2.2.2
+++ README 19 May 2004 15:45:04 -0000 1.2.2.3
@@ -220,7 +220,7 @@
Plugin: torque
Function: Sets the database type that this application will use
Type: String
-Default: not set
+Default: postgresql
torque.database.driver (turbine:setup)
@@ -259,9 +259,3 @@
requested database
Type: String
Default: not set
-
-
-
-
-
-
No revision
No revision
1.1.2.4 +4 -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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- plugin.jelly 19 May 2004 15:24:31 -0000 1.1.2.3
+++ plugin.jelly 19 May 2004 15:45:04 -0000 1.1.2.4
@@ -517,8 +517,11 @@
<!-- ======================================================================== -->
<goal name="turbine:check-runtime-environment"
prereqs="turbine:init">
- <j:if test="${context.getVariable('maven.appserver.name') == null}">
+ <j:if test="${context.getVariable('maven.appserver.name') == null || context.getVariable('maven.appserver.name') == ''}">
<meta:requiredPropertyMissing propname="maven.appserver.name" />
+ </j:if>
+ <j:if test="${context.getVariable('torque.database') == null || context.getVariable('torque.database') == ''}">
+ <meta:requiredPropertyMissing propname="torque.database" />
</j:if>
</goal>
1.1.2.3 +4 -1 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- plugin.properties 19 May 2004 15:24:31 -0000 1.1.2.2
+++ plugin.properties 19 May 2004 15:45:04 -0000 1.1.2.3
@@ -46,6 +46,9 @@
# use Tomcat Application Server
maven.appserver.name = tomcat
+# use PostgreSQL as the default database
+torque.database = postgresql
+
######################################################################
#
# You don't need to change anything below this line. These parameters
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org