From 6c84adb8cee1a36e4b4306932c127d0aa7152b87 Mon Sep 17 00:00:00 2001 From: Tony Chemit Date: Sun, 12 Jan 2014 18:48:18 +0000 Subject: [PATCH] MWEBSTART-11 - Support generation of JNLP components git-svn-id: file:///home/tiste/MOJOHAUS-TO-GIT/SVN-MOJO-WIP/trunk/mojo/webstart@19254 52ab4f32-60fc-0310-b215-8acea882cd1b --- .../src/it/MWEBSTART-11/README.txt | 25 ++++ .../src/it/MWEBSTART-11/goals.txt | 1 + .../src/it/MWEBSTART-11/pom.xml | 111 ++++++++++++++++++ .../java/org/codehaus/mojo/webstart/Main.java | 29 +++++ .../src/it/MWEBSTART-11/validate.groovy | 101 ++++++++++++++++ .../mojo/webstart/AbstractBaseJnlpMojo.java | 11 +- .../mojo/webstart/AbstractJnlpMojo.java | 76 ++++++++---- .../codehaus/mojo/webstart/JnlpConfig.java | 36 +++--- .../codehaus/mojo/webstart/JnlpFileType.java | 61 ++++++++++ .../AbstractGeneratorExtraConfigWithDeps.java | 4 +- .../generator/GeneratorTechnicalConfig.java | 8 +- .../default-jnlp-component-template.vm | 34 ++++++ .../default-jnlp-installer-template.vm | 34 ++++++ .../site/apt/examples/inbuilt_templates.apt | 6 +- .../src/site/apt/upgrade.apt | 4 +- 15 files changed, 485 insertions(+), 56 deletions(-) create mode 100644 webstart-maven-plugin/src/it/MWEBSTART-11/README.txt create mode 100644 webstart-maven-plugin/src/it/MWEBSTART-11/goals.txt create mode 100644 webstart-maven-plugin/src/it/MWEBSTART-11/pom.xml create mode 100644 webstart-maven-plugin/src/it/MWEBSTART-11/src/main/java/org/codehaus/mojo/webstart/Main.java create mode 100644 webstart-maven-plugin/src/it/MWEBSTART-11/validate.groovy create mode 100644 webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/JnlpFileType.java create mode 100644 webstart-maven-plugin/src/main/resources/default-jnlp-component-template.vm create mode 100644 webstart-maven-plugin/src/main/resources/default-jnlp-installer-template.vm diff --git a/webstart-maven-plugin/src/it/MWEBSTART-11/README.txt b/webstart-maven-plugin/src/it/MWEBSTART-11/README.txt new file mode 100644 index 00000000..514fffda --- /dev/null +++ b/webstart-maven-plugin/src/it/MWEBSTART-11/README.txt @@ -0,0 +1,25 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +To check MWEBSTART-11 works fine. (see https://jira.codehaus.org/browse/MWEBSTART-11). + +We will generate here three different jnlp files : + - application + - component + - installer \ No newline at end of file diff --git a/webstart-maven-plugin/src/it/MWEBSTART-11/goals.txt b/webstart-maven-plugin/src/it/MWEBSTART-11/goals.txt new file mode 100644 index 00000000..829d60e8 --- /dev/null +++ b/webstart-maven-plugin/src/it/MWEBSTART-11/goals.txt @@ -0,0 +1 @@ +clean package \ No newline at end of file diff --git a/webstart-maven-plugin/src/it/MWEBSTART-11/pom.xml b/webstart-maven-plugin/src/it/MWEBSTART-11/pom.xml new file mode 100644 index 00000000..f9f2eb58 --- /dev/null +++ b/webstart-maven-plugin/src/it/MWEBSTART-11/pom.xml @@ -0,0 +1,111 @@ + + 4.0.0 + + org.codehaus.mojo + MWEBSTART-11 + 1.0 + Webstart MWEBSTART-11 + Test Case for MWEBSTART-11. + + + CodeHaus + + + https://jira.codehaus.org/browse/MWEBSTART-11 + + + + org.codehaus.mojo + webstart-maven-plugin + @project.version@ + + + generate-application + + jnlp-single + + package + + + application + test-application.jnlp + org.codehaus.mojo.webstart.Main + + + + + generate-component + + jnlp-single + + package + + + component + test-component.jnlp + + org.codehaus.mojo.webstart.Main + + + + + generate-installer + + jnlp-single + + package + + + installer + test-installer.jnlp + + org.codehaus.mojo.webstart.Main + + + + + + UTF-8 + false + true + + + + + ${project.build.directory}/keystore + m2m2m2 + m2m2m2 + alias + 180 + + www.example.com + None + ExampleOrg + Seattle + Washington + US + + true + + + true + true + + + true + + + + + + + + + commons-cli + commons-cli + 1.1 + + + diff --git a/webstart-maven-plugin/src/it/MWEBSTART-11/src/main/java/org/codehaus/mojo/webstart/Main.java b/webstart-maven-plugin/src/it/MWEBSTART-11/src/main/java/org/codehaus/mojo/webstart/Main.java new file mode 100644 index 00000000..66e53dde --- /dev/null +++ b/webstart-maven-plugin/src/it/MWEBSTART-11/src/main/java/org/codehaus/mojo/webstart/Main.java @@ -0,0 +1,29 @@ +package org.codehaus.mojo.webstart; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +public class Main +{ + + public static void main( String[] args ) + { + + } +} \ No newline at end of file diff --git a/webstart-maven-plugin/src/it/MWEBSTART-11/validate.groovy b/webstart-maven-plugin/src/it/MWEBSTART-11/validate.groovy new file mode 100644 index 00000000..4ef6a824 --- /dev/null +++ b/webstart-maven-plugin/src/it/MWEBSTART-11/validate.groovy @@ -0,0 +1,101 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/* +Required result : + +target/it/MWEBSTART-11/target/ +├── keystore +└── jnlp + ├── commons-cli-commons-1.1.jar + ├── MWEBSTART-11-1.0.jar + ├── test-application.jnlp + ├── test-applet.jnlp + ├── test-component.jnlp + └── test-installer.jnlp + */ + +def assertExistsDirectory( file ) +{ + if ( !file.exists() || !file.isDirectory() ) + { + println( file.getAbsolutePath() + " file is missing or is not a directory." ) + return false + } + return true +} + +def assertExistsFile( file ) +{ + if ( !file.exists() || file.isDirectory() ) + { + println( file.getAbsolutePath() + " file is missing or a directory." ) + return false + } + return true +} + +def assertContains( content, expected ) +{ + if ( !content.contains(expected) ) + { + println( expected + " was not found in \n :" + content ) + return false + } + return true +} + +String[] expectedJnlpFiles = ["test-application.jnlp", "test-component.jnlp", "test-installer.jnlp"] +String[] expectedJnlpLibFiles = ["commons-cli__V1.1.jar", "MWEBSTART-11__V1.0.jar"] + +File target = new File( basedir, "target" ) +assert assertExistsDirectory( target ) + +File jnlpDirectory = new File( target, "jnlp" ) +assert assertExistsDirectory( jnlpDirectory ) + +expectedJnlpFiles.each { + assert assertExistsFile( new File( jnlpDirectory, it ) ) +} + +File jnlpLib = jnlpDirectory; + +expectedJnlpLibFiles.each { + assert assertExistsFile( new File( jnlpLib, it ) ) +} + +assert jnlpLib.list().length == expectedJnlpLibFiles.length + expectedJnlpFiles.length // jar + jnlp files + +File applicationJnlpFile = new File( jnlpDirectory, "test-application.jnlp" ) +assert assertContains( applicationJnlpFile.text, "" ) +assert assertContains( applicationJnlpFile.text, "" ) +assert assertContains( applicationJnlpFile.text, "" ) + +File componentJnlpFile = new File( jnlpDirectory, "test-component.jnlp" ) +assert assertContains( componentJnlpFile .text, "" ) +assert assertContains( componentJnlpFile.text, "" ) +assert assertContains( componentJnlpFile .text, "" ) + +File installerJnlpFile = new File( jnlpDirectory, "test-installer.jnlp" ) +assert assertContains( installerJnlpFile .text, "" ) +assert assertContains( installerJnlpFile.text, "" ) +assert assertContains( installerJnlpFile .text, "" ) + + +return true \ No newline at end of file diff --git a/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/AbstractBaseJnlpMojo.java b/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/AbstractBaseJnlpMojo.java index 088586f4..b31cc278 100644 --- a/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/AbstractBaseJnlpMojo.java +++ b/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/AbstractBaseJnlpMojo.java @@ -739,14 +739,9 @@ protected void pack200Jars( File directory, FileFilter filter ) } } - protected URL findDefaultJnlpTemplateURL() + protected URL findDefaultTemplateURL(JnlpFileType fileType) { - return getClass().getClassLoader().getResource( "default-jnlp-template.vm" ); - } - - protected URL findDefaultJnlpExtensionTemplateURL() - { - return getClass().getClassLoader().getResource( "default-jnlp-extension-template.vm" ); + return getClass().getClassLoader().getResource( fileType.getDefaultTemplateName() ); } /** @@ -754,7 +749,7 @@ protected URL findDefaultJnlpExtensionTemplateURL() */ protected String getWebstartJarURLForVelocity() { - String url = findDefaultJnlpTemplateURL().toString(); + String url = findDefaultTemplateURL(JnlpFileType.application).toString(); return url.substring( 0, url.indexOf( "!" ) + 2 ); } diff --git a/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/AbstractJnlpMojo.java b/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/AbstractJnlpMojo.java index 6689ca19..64e6878d 100644 --- a/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/AbstractJnlpMojo.java +++ b/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/AbstractJnlpMojo.java @@ -38,7 +38,9 @@ import org.codehaus.mojo.webstart.util.IOUtil; import java.io.File; +import java.net.URL; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.List; @@ -233,8 +235,6 @@ public void execute() checkInput(); - findDefaultJnlpTemplateURL(); - getLog().debug( "using work directory " + getWorkDirectory() ); getLog().debug( "using library directory " + getLibDirectory() ); @@ -255,15 +255,15 @@ public void execute() processDependencies(); - if ( withExtensions ) + if ( jnlp.isRequireMainClass() && artifactWithMainClass == null ) { - processExtensionsDependencies(); + throw new MojoExecutionException( + "didn't find artifact with main class: " + jnlp.getMainClass() + ". Did you specify it? " ); } - if ( artifactWithMainClass == null ) + if ( withExtensions ) { - throw new MojoExecutionException( - "didn't find artifact with main class: " + jnlp.getMainClass() + ". Did you specify it? " ); + processExtensionsDependencies(); } // --- @@ -352,6 +352,22 @@ protected Dependencies getDependencies() // Private Methods // ---------------------------------------------------------------------- + void checkJnlpConfig() + throws MojoExecutionException + { + JnlpFileType type = jnlp.getType(); + if ( type == null ) + { + throw new MojoExecutionException( "jnlp must define a default jnlp type file to generate (among " + + Arrays.toString( JnlpFileType.values() ) + " )." ); + } + if ( !type.isRequireMainClass() && StringUtils.isNotBlank( jnlp.getMainClass() ) ) + { + getLog().warn( "Jnlp file of type '" + type + + "' does not support mainClass, value will not be accessible in template." ); + jnlp.setMainClass( null ); + } + } /** * Detects improper includes/excludes configuration. * @@ -516,24 +532,31 @@ private void processDependency( Artifact artifact ) packagedJnlpArtifacts.add( artifact ); - boolean containsMainClass = getArtifactUtil().artifactContainsClass( artifact, jnlp.getMainClass() ); - - if ( containsMainClass ) + if ( jnlp.isRequireMainClass() ) { - if ( artifactWithMainClass == null ) - { - artifactWithMainClass = artifact; - getLog().debug( - "Found main jar. Artifact " + artifactWithMainClass + " contains the main class: " + - jnlp.getMainClass() ); - } - else + + // try to find if this dependency contains the main class + boolean containsMainClass = + getArtifactUtil().artifactContainsClass( artifact, jnlp.getMainClass() ); + + if ( containsMainClass ) { - getLog().warn( - "artifact " + artifact + " also contains the main class: " + jnlp.getMainClass() + - ". IGNORED." ); + if ( artifactWithMainClass == null ) + { + artifactWithMainClass = artifact; + getLog().debug( + "Found main jar. Artifact " + artifactWithMainClass + " contains the main class: " + + jnlp.getMainClass() ); + } + else + { + getLog().warn( + "artifact " + artifact + " also contains the main class: " + jnlp.getMainClass() + + ". IGNORED." ); + } } } + } else // FIXME how do we deal with native libs? @@ -615,7 +638,7 @@ private void generateJnlpFile( File outputDirectory ) String templateFileName = jnlp.getInputTemplate(); GeneratorTechnicalConfig generatorTechnicalConfig = - new GeneratorTechnicalConfig( getProject(), templateDirectory, BUILT_IN_JNLP_TEMPLATE_FILENAME, + new GeneratorTechnicalConfig( getProject(), templateDirectory, jnlp.getType().getDefaultTemplateName(), jnlpOutputFile, templateFileName, jnlp.getMainClass(), getWebstartJarURLForVelocity(), getEncoding() ); @@ -694,10 +717,13 @@ private void checkInput() getLog().debug( "project " + this.getProject() ); getLog().debug( "verbose " + isVerbose() ); + checkJnlpConfig(); checkDependencyFilenameStrategy(); checkPack200(); checkDependencies(); + findDefaultTemplateURL(jnlp.getType()); + if ( jnlp != null && jnlp.getResources() != null ) { throw new MojoExecutionException( @@ -732,7 +758,11 @@ private void checkExtension( JnlpExtension extension ) throw new MojoExecutionException( "JnlpExtension need at least one include artifact. Review your project configuration." ); } + } + protected URL findDefaultJnlpExtensionTemplateURL() + { + return getClass().getClassLoader().getResource( "default-jnlp-extension-template.vm" ); } /** @@ -962,7 +992,7 @@ private void generateJnlpExtensionFile( File outputDirectory, JnlpExtension exte GeneratorTechnicalConfig generatorTechnicalConfig = new GeneratorTechnicalConfig( getProject(), templateDirectory, BUILT_IN_EXTENSION_TEMPLATE_FILENAME, - jnlpOutputFile, templateFileName, this.getJnlp().getMainClass(), + jnlpOutputFile, templateFileName, getJnlp().getMainClass(), getWebstartJarURLForVelocity(), getEncoding() ); ExtensionGeneratorConfig extensionGeneratorConfig = diff --git a/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/JnlpConfig.java b/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/JnlpConfig.java index d3733873..f5ad78f5 100644 --- a/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/JnlpConfig.java +++ b/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/JnlpConfig.java @@ -47,8 +47,6 @@ public class JnlpConfig private String offlineAllowed; - // private String codebase; - private String href; private String mainClass; @@ -61,6 +59,8 @@ public class JnlpConfig */ private File resources; + private JnlpFileType type = JnlpFileType.application; + public void setInputTemplateResourcePath( String inputTemplateResourcePath ) { this.inputTemplateResourcePath = inputTemplateResourcePath; @@ -100,11 +100,6 @@ public void setAllPermissions( String allPermissions ) { this.allPermissions = allPermissions; } - /* - public void setCodebase( String codebase ) - { - this.codebase = codebase; - }*/ public void setHref( String href ) { @@ -121,6 +116,16 @@ public void setProperties( Map properties ) this.properties = properties; } + public void setType( String type ) + { + this.type = JnlpFileType.valueOf( type ); + } + + public void setType( JnlpFileType type ) + { + this.type = type; + } + public String getInputTemplateResourcePath() { return inputTemplateResourcePath; @@ -171,13 +176,6 @@ public File getResources() return resources; } - /* - public String getCodebase() - { - return codebase; - } - */ - public String getHref() { return href; @@ -192,4 +190,14 @@ public Map getProperties() { return properties; } + + public JnlpFileType getType() + { + return type; + } + + public boolean isRequireMainClass() + { + return type.isRequireMainClass(); + } } diff --git a/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/JnlpFileType.java b/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/JnlpFileType.java new file mode 100644 index 00000000..e8a15416 --- /dev/null +++ b/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/JnlpFileType.java @@ -0,0 +1,61 @@ +package org.codehaus.mojo.webstart; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/** + * Which type of jnlp file to generate. + *

+ * Created on 1/12/14. + * + * @author Tony Chemit + * @since 1.0-beta-6 + */ +public enum JnlpFileType +{ + application( "default-jnlp-template.vm", true ), + component( "default-jnlp-component-template.vm", false ), + installer( "default-jnlp-installer-template.vm", false ); + + /** + * Default template to use to generate a jnlp type of this type. + */ + private final String defaultTemplateName; + + /** + * Is a jnlp file of this type requires a main class? + */ + private final boolean requireMainClass; + + JnlpFileType( String defaultTemplateName, boolean requireMainClass ) + { + this.defaultTemplateName = defaultTemplateName; + this.requireMainClass = requireMainClass; + } + + public String getDefaultTemplateName() + { + return defaultTemplateName; + } + + public boolean isRequireMainClass() + { + return requireMainClass; + } +} diff --git a/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/generator/AbstractGeneratorExtraConfigWithDeps.java b/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/generator/AbstractGeneratorExtraConfigWithDeps.java index 1e6535aa..cc1b84d7 100644 --- a/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/generator/AbstractGeneratorExtraConfigWithDeps.java +++ b/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/generator/AbstractGeneratorExtraConfigWithDeps.java @@ -40,7 +40,6 @@ public abstract class AbstractGeneratorExtraConfigWithDeps private final Artifact artifactWithMainClass; - private final DependencyFilenameStrategy dependencyFilenameStrategy; public AbstractGeneratorExtraConfigWithDeps( String libPath, boolean pack200, boolean outputJarVersions, @@ -84,8 +83,7 @@ public String getLibPath() */ public boolean isArtifactWithMainClass( Artifact artifact ) { - final boolean b = artifactWithMainClass.equals( artifact ); - return b; + return artifactWithMainClass != null && artifactWithMainClass.equals( artifact ); } /** diff --git a/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/generator/GeneratorTechnicalConfig.java b/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/generator/GeneratorTechnicalConfig.java index e59e1aec..8470e813 100644 --- a/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/generator/GeneratorTechnicalConfig.java +++ b/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/generator/GeneratorTechnicalConfig.java @@ -67,10 +67,10 @@ public GeneratorTechnicalConfig( MavenProject mavenProject, File resourceLoaderP throw new IllegalArgumentException( "outputFile must not be null" ); } - if ( mainClass == null ) - { - throw new IllegalArgumentException( "mainClass must not be null" ); - } +// if ( mainClass == null ) +// { +// throw new IllegalArgumentException( "mainClass must not be null" ); +// } this.mavenProject = mavenProject; this.outputFile = outputFile; diff --git a/webstart-maven-plugin/src/main/resources/default-jnlp-component-template.vm b/webstart-maven-plugin/src/main/resources/default-jnlp-component-template.vm new file mode 100644 index 00000000..5606aacb --- /dev/null +++ b/webstart-maven-plugin/src/main/resources/default-jnlp-component-template.vm @@ -0,0 +1,34 @@ + + + +#if($project.Name) + $project.Name +#end +#if($project.Organization.Name) + $project.Organization.Name +#end +#if($project.Url) + +#end +#if($project.Description) + $project.Description +#end +#if($offlineAllowed) + +#end + +#if($allPermissions) + + + +#end + + + $dependencies + + + + diff --git a/webstart-maven-plugin/src/main/resources/default-jnlp-installer-template.vm b/webstart-maven-plugin/src/main/resources/default-jnlp-installer-template.vm new file mode 100644 index 00000000..d62a5dd4 --- /dev/null +++ b/webstart-maven-plugin/src/main/resources/default-jnlp-installer-template.vm @@ -0,0 +1,34 @@ + + + +#if($project.Name) + $project.Name +#end +#if($project.Organization.Name) + $project.Organization.Name +#end +#if($project.Url) + +#end +#if($project.Description) + $project.Description +#end +#if($offlineAllowed) + +#end + +#if($allPermissions) + + + +#end + + + $dependencies + + + + diff --git a/webstart-maven-plugin/src/site/apt/examples/inbuilt_templates.apt b/webstart-maven-plugin/src/site/apt/examples/inbuilt_templates.apt index 216257d1..5d587c45 100644 --- a/webstart-maven-plugin/src/site/apt/examples/inbuilt_templates.apt +++ b/webstart-maven-plugin/src/site/apt/examples/inbuilt_templates.apt @@ -11,7 +11,11 @@ Using the Inbuilt Velocity Templates As described in the usage, the JNLP mojos depend on Velocity templates. If you don't provide one, an inbuilt template will be picked up. They are accessible below for reference. - * {{{./default-jnlp-template.vm}JNLP Mojos inbuilt template}} + * {{{./default-jnlp-template.vm}JNLP Mojos inbuilt template}} (when type is <<>>) + + * {{{./default-jnlp-component-template.vm}JNLP Mojos inbuilt component template}} (when type is <<>>) + + * {{{./default-jnlp-installer-template.vm}JNLP Mojos inbuilt installer template}} (when type is <<>>) * {{{./default-jnlp-extension-template.vm}JNLP Mojos inbuilt extension template}} diff --git a/webstart-maven-plugin/src/site/apt/upgrade.apt b/webstart-maven-plugin/src/site/apt/upgrade.apt index 4e4afcd0..fa9cf8f6 100644 --- a/webstart-maven-plugin/src/site/apt/upgrade.apt +++ b/webstart-maven-plugin/src/site/apt/upgrade.apt @@ -20,9 +20,7 @@ Upgrade from a previous version ** 2014-01-06 - Introduce the <<>> parameter and set default value to <<>>. - - To get back to old behaviour, just set the value to <<>>. + Introduce the <<>> parameter and set default value to <<>>. For more details, see {{{https://jira.codehaus.org/browse/MWEBSTART-195}MWEBSTART-195}}.