You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2005/08/01 05:08:51 UTC
svn commit: r226726 - /portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
Author: ate
Date: Sun Jul 31 20:08:42 2005
New Revision: 226726
URL: http://svn.apache.org/viewcvs?rev=226726&view=rev
Log:
Several fixes:
- j2:run.dropdrops failed because the ScriptUtil class couldn't be found
- Even when dropdrops worked again, db.create had a prereqs on scripts.gen making it impossible to execute the just modified scripts
as they were automatically overwritten again.
prereqs on scripts.gen moved to db.recreate
- db.scripts.gen couldn't be executed directly as it would run in the context of your project, not the plugin
Still nothing done for http://issues.apache.org/jira/browse/JS2-319 :-(
Hopefully, most serious bugs are now fixed so I can start refactoring the plugin tomorrow ...
Modified:
portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
Modified: portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-plugin/plugin.jelly?rev=226726&r1=226725&r2=226726&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/plugin.jelly (original)
+++ portals/jetspeed-2/trunk/maven-plugin/plugin.jelly Sun Jul 31 20:08:42 2005
@@ -112,7 +112,13 @@
<!-- ============== DATABASE SCRIPT GENERATION ============== -->
<!-- ======================================================== -->
- <goal name="j2:db.scripts.gen" prereqs="torque:init" description="Build SQL scripts using Torque generator">
+ <!-- use local (to the plugin) invocation of the real scripts.gen goal (_db.scripts.gen) because if called directly from
+ a project it wouldn't be called within the plugin context -->
+ <goal name="j2:db.scripts.gen">
+ <attainGoal name="_db.scripts.gen"/>
+ </goal>
+
+ <goal name="_db.scripts.gen" prereqs="torque:init" description="Build SQL scripts using Torque generator">
<echo message="Using Torque schema located under: ${torque.schema.dir}" />
<echo>Plugin Root: ${org.apache.jetspeed.plugin.root}</echo> <echo message="Generating SQL schema creation scripts for HSQLDB" />
@@ -239,7 +245,7 @@
<attainGoal name="j2:db.create" />
</goal>
- <goal name="j2:db.create" prereqs="j2:db.scripts.gen">
+ <goal name="j2:db.create">
<j:set var="sql.src.path" value="${org.apache.jetspeed.plugin.root}/plugin-resources/sql/${org.apache.jetspeed.database.default.name}/generated" />
<attainGoal name="j2:run.all.scripts.in.path" />
@@ -300,7 +306,7 @@
<attainGoal name="j2:db.execute" />
</goal>
- <goal name="j2:db.recreate">
+ <goal name="j2:db.recreate" prereqs="j2:db.scripts.gen">
<attainGoal name="j2:db.create.production" />
</goal>
@@ -395,6 +401,7 @@
<classpath>
<path refid="maven.dependency.classpath" />
<pathelement path="${maven.build.dest}" />
+ <pathelement path="${org.apache.jetspeed.plugin.root}" />
</classpath>
<arg value="-drops" />
<arg value="${dropstable}" />
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org