Removed the need to set up a <code>JAVAWS_HOME</code> property. This is now automatically inferred from <code>${java.home}</code> and defaults to <code>${java.home}/javaws</code>. You can override this value by setting the <code>maven.abbot.webstart.home</code> property.
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@116263 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
vmassol committed
1 parent
01d43701f5
commit
a4f106f158
6 files changed
+26
-27
No files matched your search
+10
-12
@@ -192,7 +192,6 @@
|
||||
storepass="${maven.abbot.sign.storepass}"/>
|
||||
|
||||
</j:if>
|
||||
|
||||
|
||||
<!-- Jnlp is modified so that local abbot libraries are referenced -->
|
||||
<doc:jsl
|
||||
@@ -206,15 +205,15 @@
|
||||
<!-- Java webstart is launched on local modified jnlp -->
|
||||
<java classname="com.sun.javaws.Main" fork="true" failonerror="true">
|
||||
<classpath>
|
||||
<pathelement location="${env.JAVAWS_HOME}/javaws-l10n.jar"/>
|
||||
<pathelement location="${env.JAVAWS_HOME}/javaws.jar"/>
|
||||
<pathelement location="${maven.abbot.webstart.home}/javaws-l10n.jar"/>
|
||||
<pathelement location="${maven.abbot.webstart.home}/javaws.jar"/>
|
||||
</classpath>
|
||||
<jvmarg value="-Djnlpx.home=${env.JAVAWS_HOME}"/>
|
||||
<jvmarg value="-Djnlpx.home=${maven.abbot.webstart.home}"/>
|
||||
<jvmarg value="-Djnlpx.heapsize=NULL,NULL"/>
|
||||
<jvmarg value="-Djnlpx.jvm=${env.JAVA_HOME}/bin/javaw.exe"/>
|
||||
<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=${env.JAVAWS_HOME}/javaws.policy"/>
|
||||
<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>
|
||||
@@ -346,10 +345,9 @@
|
||||
-->
|
||||
<goal name="abbot:check-webstart-env" prereqs="abbot:check-env">
|
||||
|
||||
<property environment="env"/>
|
||||
|
||||
<j:if test="${context.getVariable('env.JAVAWS_HOME') == null}">
|
||||
<fail>Mandatory environment variable JAVAWS_HOME must be set</fail>
|
||||
<u:file var="webstartHomeAsFile" name="${maven.abbot.webstart.home}"/>
|
||||
<j:if test="${!webstartHomeAsFile.exists()}">
|
||||
<fail>Webstart home directory not found at [${maven.abbot.webstart.home}]</fail>
|
||||
</j:if>
|
||||
|
||||
<j:if test="${context.getVariable('maven.abbot.sign') == false}">
|
||||
@@ -357,11 +355,11 @@
|
||||
</j:if>
|
||||
|
||||
<j:if test="${context.getVariable('maven.abbot.remotejnlp') == null}">
|
||||
<fail>Mandatory variable maven.abbot.remotejnlp is missing."</fail>
|
||||
<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>
|
||||
<fail>Mandatory variable maven.abbot.javaws.systemhome is missing</fail>
|
||||
</j:if>
|
||||
|
||||
<j:if test="${context.getVariable('maven.abbot.javaws.userhome') == null}">
|
||||
|
||||
@@ -74,14 +74,16 @@ maven.abbot.include = org.apache.maven.abbot.AbbotTestAll
|
||||
# execution environment and must be set in your build.properties file
|
||||
# or equivalent:
|
||||
#
|
||||
# - JAVAWS_HOME: You MUST define this environment variable and have it
|
||||
# point to where Java Webstart is installed on your machine.
|
||||
# For example: c:\apps\j2sdk1.4.2_01\jre\javaws
|
||||
# - maven.abbot.remotejnlp: This property points to the JNLP file of
|
||||
# the application you're testing.
|
||||
# - maven.abbot.javaws.systemhome: Java webstart system cache location
|
||||
# - maven.abbot.javaws.userhome: Java webstart user cache location
|
||||
|
||||
# Location of webstart executable. Override if your install does not match
|
||||
# this default location
|
||||
maven.abbot.webstart.home = ${java.home}/javaws
|
||||
|
||||
# TODO: Remove these 4 properties as I don't see any use case associated with them
|
||||
maven.abbot.webstart.jnlp.original = original.jnlp
|
||||
maven.abbot.webstart.jnlp.modified = modified.jnlp
|
||||
maven.abbot.webstart.main.jar = abbot-main.jar
|
||||
|
||||
@@ -16,10 +16,6 @@
|
||||
|
||||
# Copy this file to a build.properties file and edit to match your local
|
||||
# environment.
|
||||
#
|
||||
# Note: You MUST also define the JAVAWS_HOME environment variable and have it
|
||||
# point to where Java Webstart is installed on your machine.
|
||||
# For example: c:\apps\j2sdk1.4.2_01\jre\javaws
|
||||
|
||||
# Locations where your Java web start caches are located.
|
||||
# For example on Windows XP:
|
||||
|
||||
@@ -7,6 +7,12 @@
|
||||
</properties>
|
||||
<body>
|
||||
<release version="1.2-SNAPSHOT" date="in CVS">
|
||||
<action dev="vmassol" type="update">
|
||||
Removed the need to set up a <code>JAVAWS_HOME</code> property. This is
|
||||
now automatically inferred from <code>${java.home}</code> and defaults
|
||||
to <code>${java.home}/javaws</code>. You can override this value by
|
||||
setting the <code>maven.abbot.webstart.home</code> property.
|
||||
</action>
|
||||
</release>
|
||||
<release version="1.1" date="2004-09-27">
|
||||
<action dev="vmassol" type="update">Upgraded to Abbot 0.13.0 and JDOM 1.0 beta 10.</action>
|
||||
|
||||
@@ -68,14 +68,16 @@ maven.abbot.include = org.apache.maven.abbot.AbbotTestAll
|
||||
# execution environment and must be set in your build.properties file
|
||||
# or equivalent:
|
||||
#
|
||||
# - JAVAWS_HOME: You MUST define this environment variable and have it
|
||||
# point to where Java Webstart is installed on your machine.
|
||||
# For example: c:\apps\j2sdk1.4.2_01\jre\javaws
|
||||
# - maven.abbot.remotejnlp: This property points to the JNLP file of
|
||||
# the application you're testing.
|
||||
# - maven.abbot.javaws.systemhome: Java webstart system cache location
|
||||
# - maven.abbot.javaws.userhome: Java webstart user cache location
|
||||
|
||||
# Location of webstart executable. Override if your install does not match
|
||||
# this default location
|
||||
maven.abbot.webstart.home = ${java.home}/javaws
|
||||
|
||||
# TODO: Remove these 4 properties as I don't see any use case associated with them
|
||||
maven.abbot.webstart.jnlp.original = original.jnlp
|
||||
maven.abbot.webstart.jnlp.modified = modified.jnlp
|
||||
maven.abbot.webstart.main.jar = abbot-main.jar
|
||||
|
||||
@@ -43,11 +43,6 @@
|
||||
executing the Abbot plugin:
|
||||
</p>
|
||||
<ul>
|
||||
<li>
|
||||
The <code>JAVAWS_HOME</code> environment variable has to be set and
|
||||
it must point to the location where webstart is installed on your
|
||||
machine.
|
||||
</li>
|
||||
<li>
|
||||
Some mandatory environment-dependent properties need to be
|
||||
defined. See the <a href="properties.html">Properties</a>
|
||||
|
||||
Reference in new issue
Block a user