--- plugin.jelly	2005-01-13 19:49:04.593750000 +0100
+++ E:\Girya\Download\Technical\maven-plugins\abbot\plugin.jelly	2005-01-14 13:12:53.000000000 +0100
@@ -34,6 +34,7 @@
   xmlns:ant="jelly:ant"
   xmlns:doc="doc"
   xmlns:define="jelly:define"
+  xmlns:webstart="webstart"
   xmlns:jsl="jelly:jsl">
 
   <!--
@@ -193,6 +194,19 @@
 
   	</j:if>
   	
+    
+    <m:get plugin="maven-webstart-plugin" property="maven.webstart.localapp.host" var="host"/>
+    <m:get plugin="maven-webstart-plugin" property="maven.webstart.localapp.port" var="port"/>
+    <m:get plugin="maven-webstart-plugin" property="maven.webstart.localapp.resourcebase" var="resourcebase"/>
+    
+    <condition property="localwebstart" value="true">
+        <and>
+           <isset property="host"/>
+           <isset property="port"/>
+           <isset property="resourcebase"/>
+        </and>
+    </condition>    
+    
     <!-- Jnlp is modified so that local abbot libraries are referenced -->
     <doc:jsl
         input="${maven.abbot.dest.dir}/${maven.abbot.webstart.jnlp.original}"
@@ -202,21 +216,11 @@
         outputMode="xml"
         prettyPrint="true"/>
   	
+    <!-- Pass the location of the modified JNLP location to the Webstart plugin -->
+    <m:set plugin="maven-webstart-plugin" property="maven.webstart.jnlp.location" value="${maven.abbot.dest.dir}/${maven.abbot.webstart.jnlp.modified}"/>
+
   	<!-- Java webstart is launched on local modified jnlp -->
-  	<java classname="com.sun.javaws.Main" fork="true" failonerror="true">
-      <classpath>
-        <pathelement location="${maven.abbot.webstart.home}/javaws-l10n.jar"/>
-        <pathelement location="${maven.abbot.webstart.home}/javaws.jar"/>
-      </classpath>
-      <jvmarg value="-Djnlpx.home=${maven.abbot.webstart.home}"/>
-  	  <jvmarg value="-Djnlpx.heapsize=NULL,NULL"/>
-  	  <jvmarg value="-Djnlpx.jvm=${java.home}/bin/javaw.exe"/>
-  	  <jvmarg value="-Djnlpx.deployment.system.home=${maven.abbot.javaws.systemhome}"/>
-  	  <jvmarg value="-Djnlpx.deployment.user.home=${maven.abbot.javaws.userhome}"/>
-  	  <jvmarg value="-Djava.security.policy=${maven.abbot.webstart.home}/javaws.policy"/>
-  	  <jvmarg value="-DtrustProxy=true"/>
-  	  <arg value="${maven.abbot.dest.dir}/${maven.abbot.webstart.jnlp.modified}"/>
-  	</java>
+    <attainGoal name="webstart:launch"/>
 
   </goal> 
   
@@ -358,14 +362,6 @@
       <fail>Mandatory variable maven.abbot.remotejnlp is missing</fail>
     </j:if>
     
-    <j:if test="${context.getVariable('maven.abbot.javaws.systemhome') == null}">
-      <fail>Mandatory variable maven.abbot.javaws.systemhome is missing</fail>
-    </j:if>
-    
-    <j:if test="${context.getVariable('maven.abbot.javaws.userhome') == null}">
-      <fail>Mandatory variable maven.abbot.javaws.userhome is missing</fail>
-    </j:if>
-
   </goal>
 
   <!--