henning 2004/06/27 03:22:03
Modified: extensions/maven-plugin/src/plugin Tag: TURBINE_2_3_BRANCH
plugin.jelly
Log:
Don't allow an inplace application to be deployed. You should modify your
container to serve the inplace directory instead.
Revision Changes Path
No revision
No revision
1.1.2.15 +20 -6
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.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- plugin.jelly 27 Jun 2004 09:55:35 -0000 1.1.2.14
+++ plugin.jelly 27 Jun 2004 10:22:03 -0000 1.1.2.15
@@ -12,6 +12,7 @@
xmlns:j="jelly:core"
xmlns:u="jelly:util"
xmlns:ant="jelly:ant"
+ xmlns:maven="jelly:maven"
xmlns:define="jelly:define"
xmlns:meta="http://jakarta.apache.org/turbine/meta/taglib";
>
@@ -312,6 +313,25 @@
description="Deploys the Application into a local web container for testing"
prereqs="turbine:init, turbine:check-runtime-environment">
+ <j:if
test="${context.getVariable('turbine.plugin.mode').equalsIgnoreCase('inplace')}">
+ <maven:makeAbsolutePath var="absPath" basedir="${basedir}"
path="${turbine.plugin.base.dir}" trim="true" />
+ <fail>
+--------------------------------------------------------------------------
+| Inplace Mode cannot be deployed |
+--------------------------------------------------------------------------
+
+ An inplace application cannot be deployed. Instead you should modify
+ your web container to serve an application located at
+
+ ${absPath}
+
+--------------------------------------------------------------------------
+ </fail>
+
+ </j:if>
+
+
+
<echo>Located Application Server at ${maven.appserver.home}
(${maven.appserver.name})</echo>
<attainGoal name="jar:jar"/>
@@ -320,12 +340,6 @@
<j:set var="turbine.target.dir"
value="${maven.appserver.home}/webapps/${pom.name}" />
-
- <!-- FIXME -->
- <j:if
test="${context.getVariable('turbine.plugin.mode').equalsIgnoreCase('inplace')}">
- <j:set var="turbine.target.dir" value="${turbine.plugin.inplace.dir}"/>
- </j:if>
- <!-- FIXME -->
<echo>Installing to Appserver Directory: ${turbine.target.dir}, Inplace:
${turbine.plugin.mode}</echo>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
