michal 2003/07/29 04:07:41
Modified: src/plugins-build/jbuilder plugin.properties plugin.jelly
Log:
Fixes for MAVEN-593 and MAVEN-594
Revision Changes Path
1.3 +1 -0 maven/src/plugins-build/jbuilder/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jbuilder/plugin.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.properties 1 Jul 2003 05:13:58 -0000 1.2
+++ plugin.properties 29 Jul 2003 11:07:41 -0000 1.3
@@ -5,6 +5,7 @@
maven.jbuilder.outpath = ${maven.build.dest}
maven.jbuilder.application.runner = com.borland.jbuilder.runtime.ApplicationRunner
maven.jbuilder.applet.runner = com.borland.jbuilder.runtime.AppletRunner
+maven.jbuilder.verbose=false
# List of additional files that should be added to the JBuilder project if
# they exist. The default is the standard Maven project files.
1.11 +2 -2 maven/src/plugins-build/jbuilder/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jbuilder/plugin.jelly,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plugin.jelly 1 Jul 2003 05:13:58 -0000 1.10
+++ plugin.jelly 29 Jul 2003 11:07:41 -0000 1.11
@@ -34,8 +34,8 @@
<j:set var="home" value="${maven.jbuilder.userHome}/${dir}" />
<j:set var="defaultProject" value="${home}/Default.jpr" />
<u:available file="${defaultProject}">
- <j:expr value="${context.setVariable(userHome,home)}" />
- <j:expr value="${context.setVariable(project,defaultProject)}" />
+ <j:set var="${userHome}" value="${home}" scope="parent"/>
+ <j:set var="${project}" value="${defaultProject}" scope="parent"/>
<j:break/>
</u:available>
</j:forEach>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
