From 75985b85c89ebff700526242cade7f5ce06e80e6 Mon Sep 17 00:00:00 2001 From: Tony Chemit Date: Mon, 6 Feb 2012 13:31:32 +0000 Subject: [PATCH 1/5] [maven-release-plugin] prepare for next development iteration git-svn-id: file:///home/tiste/MOJOHAUS-TO-GIT/SVN-MOJO-WIP/trunk/mojo/webstart@15897 52ab4f32-60fc-0310-b215-8acea882cd1b --- pom.xml | 8 ++++---- webstart-jnlp-servlet/pom.xml | 2 +- webstart-maven-plugin/pom.xml | 4 ++-- webstart-pack200-api/pom.xml | 2 +- webstart-pack200-impl/pom.xml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 0145356f..5dd7a45f 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.codehaus.mojo webstart-parent pom - 1.0-beta-3 + 1.0-beta-4-SNAPSHOT MWEBSTART :: Project Webstart Maven Plugin and related modules http://mojo.codehaus.org/webstart @@ -33,9 +33,9 @@ - https://svn.codehaus.org/mojo/tags/webstart-1.0-beta-3 - scm:svn:https://svn.codehaus.org/mojo/tags/webstart-1.0-beta-3 - scm:svn:https://svn.codehaus.org/mojo/tags/webstart-1.0-beta-3 + https://svn.codehaus.org/mojo/trunk/mojo/webstart + scm:svn:https://svn.codehaus.org/mojo/trunk/mojo/webstart + scm:svn:https://svn.codehaus.org/mojo/trunk/mojo/webstart diff --git a/webstart-jnlp-servlet/pom.xml b/webstart-jnlp-servlet/pom.xml index 4b3d2083..e2223dd8 100644 --- a/webstart-jnlp-servlet/pom.xml +++ b/webstart-jnlp-servlet/pom.xml @@ -4,7 +4,7 @@ org.codehaus.mojo webstart-parent - 1.0-beta-3 + 1.0-beta-4-SNAPSHOT webstart-jnlp-servlet diff --git a/webstart-maven-plugin/pom.xml b/webstart-maven-plugin/pom.xml index 62547e40..e481dba5 100644 --- a/webstart-maven-plugin/pom.xml +++ b/webstart-maven-plugin/pom.xml @@ -3,12 +3,12 @@ org.codehaus.mojo webstart-parent - 1.0-beta-3 + 1.0-beta-4-SNAPSHOT org.codehaus.mojo webstart-maven-plugin - 1.0-beta-3 + 1.0-beta-4-SNAPSHOT maven-plugin MWEBSTART :: Webstart Maven Plugin Maven plugin that supports webstart application development. Helps generate JNLP files and supports the diff --git a/webstart-pack200-api/pom.xml b/webstart-pack200-api/pom.xml index aefce6e6..a901404f 100644 --- a/webstart-pack200-api/pom.xml +++ b/webstart-pack200-api/pom.xml @@ -3,7 +3,7 @@ org.codehaus.mojo webstart-parent - 1.0-beta-3 + 1.0-beta-4-SNAPSHOT webstart-pack200-api diff --git a/webstart-pack200-impl/pom.xml b/webstart-pack200-impl/pom.xml index f6d26b30..a6e70e38 100644 --- a/webstart-pack200-impl/pom.xml +++ b/webstart-pack200-impl/pom.xml @@ -3,7 +3,7 @@ org.codehaus.mojo webstart-parent - 1.0-beta-3 + 1.0-beta-4-SNAPSHOT webstart-pack200-impl From 7fd9db2f0551bd010e95ce5c70ed3c488c7872c4 Mon Sep 17 00:00:00 2001 From: Tony Chemit Date: Mon, 6 Feb 2012 14:36:26 +0000 Subject: [PATCH 2/5] - back to 1.0-beta-3 (release was not ok) - fix some documentation git-svn-id: file:///home/tiste/MOJOHAUS-TO-GIT/SVN-MOJO-WIP/trunk/mojo/webstart@15899 52ab4f32-60fc-0310-b215-8acea882cd1b --- pom.xml | 6 ++---- src/site/apt/index.apt | 3 ++- webstart-jnlp-servlet/pom.xml | 4 ++-- webstart-maven-plugin/pom.xml | 6 +++--- webstart-maven-plugin/src/site/apt/contributors.apt | 1 - .../src/site/apt/examples/keystore_gen.apt | 12 ++++++++---- .../src/site/apt/examples/more_examples.apt | 12 ------------ .../src/site/apt/examples/more_examples.apt.vm | 12 ++++++++++++ .../src/site/apt/examples/pluggable_jar_signing.apt | 1 + .../apt/examples/simple_jnlp_download_servlet.apt | 2 +- .../src/site/apt/examples/war_bundle_1.apt | 2 +- webstart-maven-plugin/src/site/site.xml | 2 +- webstart-pack200-api/pom.xml | 4 ++-- webstart-pack200-impl/pom.xml | 4 ++-- 14 files changed, 37 insertions(+), 34 deletions(-) delete mode 100644 webstart-maven-plugin/src/site/apt/examples/more_examples.apt create mode 100644 webstart-maven-plugin/src/site/apt/examples/more_examples.apt.vm diff --git a/pom.xml b/pom.xml index 5dd7a45f..a0c04e4a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,9 +6,9 @@ 4.0.0 org.codehaus.mojo - webstart-parent + webstart pom - 1.0-beta-4-SNAPSHOT + 1.0-beta-3-SNAPSHOT MWEBSTART :: Project Webstart Maven Plugin and related modules http://mojo.codehaus.org/webstart @@ -99,8 +99,6 @@ true - - webstart-@{project.version} diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt index 2d93e7d9..ff94529f 100644 --- a/src/site/apt/index.apt +++ b/src/site/apt/index.apt @@ -9,7 +9,8 @@ Webstart Maven Plugin - This set of modules provide functionality related to the {{{./webstart-maven-plugin}Webstart Maven Plugin}}. + This set of modules provide functionality related to the + {{{./webstart-maven-plugin}Webstart Maven Plugin}}. * Note since version 1.0-beta-3 diff --git a/webstart-jnlp-servlet/pom.xml b/webstart-jnlp-servlet/pom.xml index e2223dd8..78a598d7 100644 --- a/webstart-jnlp-servlet/pom.xml +++ b/webstart-jnlp-servlet/pom.xml @@ -3,8 +3,8 @@ org.codehaus.mojo - webstart-parent - 1.0-beta-4-SNAPSHOT + webstart + 1.0-beta-3-SNAPSHOT webstart-jnlp-servlet diff --git a/webstart-maven-plugin/pom.xml b/webstart-maven-plugin/pom.xml index e481dba5..47a11c15 100644 --- a/webstart-maven-plugin/pom.xml +++ b/webstart-maven-plugin/pom.xml @@ -2,13 +2,13 @@ 4.0.0 org.codehaus.mojo - webstart-parent - 1.0-beta-4-SNAPSHOT + webstart + 1.0-beta-3-SNAPSHOT org.codehaus.mojo webstart-maven-plugin - 1.0-beta-4-SNAPSHOT + 1.0-beta-3-SNAPSHOT maven-plugin MWEBSTART :: Webstart Maven Plugin Maven plugin that supports webstart application development. Helps generate JNLP files and supports the diff --git a/webstart-maven-plugin/src/site/apt/contributors.apt b/webstart-maven-plugin/src/site/apt/contributors.apt index a587ff75..1c0ca38d 100644 --- a/webstart-maven-plugin/src/site/apt/contributors.apt +++ b/webstart-maven-plugin/src/site/apt/contributors.apt @@ -16,7 +16,6 @@ Notes to users and contributors * More generally some work is going to be done to make the JNLP goals configuration more compatible. - * Reported missing features * {{{http://jira.codehaus.org/browse/MWEBSTART-25} A mojo for deploying the bundles to a remote server}} diff --git a/webstart-maven-plugin/src/site/apt/examples/keystore_gen.apt b/webstart-maven-plugin/src/site/apt/examples/keystore_gen.apt index c8adf07f..491494a2 100644 --- a/webstart-maven-plugin/src/site/apt/examples/keystore_gen.apt +++ b/webstart-maven-plugin/src/site/apt/examples/keystore_gen.apt @@ -10,12 +10,16 @@ Keystore generation and usage To deliver signed applications, one usually needs to generate a keystore. - One can use the keytool command line program delivered as part of the SDK. Another way to create the keystore is to use the {{{http://mojo.codehaus.org/keytool-maven-plugin/}Keytool Maven Plugin}}. + One can use the keytool command line program delivered as part of the SDK. + Another way to create the keystore is to use the + {{{http://mojo.codehaus.org/keytool/}Keytool Project}} via his nice java api. -* Keytool as part of the Keystore Maven Plugin +* Keytool as part of the Keytool Maven Plugin - See the {{{http://mojo.codehaus.org/keytool-maven-plugin/}Keytool Maven Plugin}} documentation. + See the {{{http://mojo.codehaus.org/keytool/keytool-maven-plugin/}Keytool Maven Plugin}} documentation. * Keytool as part of the Webstart Maven Plugin - One can make the Webstart Plugin generate a new keystore at each build. This can be convenient for demos and other less production critical projects (where signing needs to be done appropriately). + One can make the Webstart Plugin generate a new keystore at each build. + This can be convenient for demos and other less production critical projects + (where signing needs to be done appropriately). diff --git a/webstart-maven-plugin/src/site/apt/examples/more_examples.apt b/webstart-maven-plugin/src/site/apt/examples/more_examples.apt deleted file mode 100644 index cd92aa73..00000000 --- a/webstart-maven-plugin/src/site/apt/examples/more_examples.apt +++ /dev/null @@ -1,12 +0,0 @@ - ------ - More examples - ------ - Jerome Lacoste - ------ - 2008-09-23 - ------ - -More examples - - The plugin comes with several {{{http://svn.mojo.codehaus.org/browse/mojo/trunk/mojo/webstart/webstart-maven-plugin/src/test/projects/}test projects}} and {{{http://svn.mojo.codehaus.org/browse/mojo/trunk/mojo/webstart/webstart-maven-plugin/src/it}integration tests}}. - diff --git a/webstart-maven-plugin/src/site/apt/examples/more_examples.apt.vm b/webstart-maven-plugin/src/site/apt/examples/more_examples.apt.vm new file mode 100644 index 00000000..77418bd2 --- /dev/null +++ b/webstart-maven-plugin/src/site/apt/examples/more_examples.apt.vm @@ -0,0 +1,12 @@ + ------ + More examples + ------ + Jerome Lacoste + ------ + 2008-09-23 + ------ + +More examples + + The plugin comes with several {{{http://svn.codehaus.org/mojo/tags/webstart-${project.version}/webstart-maven-plugin/src/test/projects/}test projects}} and {{{http://svn.codehaus.org/mojo/tags/webstart-${project.version}/webstart-maven-plugin/src/it}integration tests}}. + diff --git a/webstart-maven-plugin/src/site/apt/examples/pluggable_jar_signing.apt b/webstart-maven-plugin/src/site/apt/examples/pluggable_jar_signing.apt index 450e0447..84268e16 100644 --- a/webstart-maven-plugin/src/site/apt/examples/pluggable_jar_signing.apt +++ b/webstart-maven-plugin/src/site/apt/examples/pluggable_jar_signing.apt @@ -12,4 +12,5 @@ Using an external JAR signer See {{{http://svn.mojo.codehaus.org/browse/mojo/trunk/mojo/webstart/webstart-maven-plugin/src/test/projects/project5}src/test/projects/project5}} as an example on how to use an external JAR signer. + This was deprecated, since 1.0-beta-2, perharps I did not see the point ? ~~ FIXME further describe here and move to an integration test diff --git a/webstart-maven-plugin/src/site/apt/examples/simple_jnlp_download_servlet.apt b/webstart-maven-plugin/src/site/apt/examples/simple_jnlp_download_servlet.apt index d14c308f..301a64ab 100644 --- a/webstart-maven-plugin/src/site/apt/examples/simple_jnlp_download_servlet.apt +++ b/webstart-maven-plugin/src/site/apt/examples/simple_jnlp_download_servlet.apt @@ -10,7 +10,7 @@ Simple JnlpDownloadServlet Example In this example, we show how to use the plugin to deploy a single JNLP application within a WAR that uses the JnlpDownloadServlet. Only the most basic features are described. For a more complex example that includes - multiple JNLP applications in the same WAR, and other more advanced features, see the {{{advanced_jnlp_download_servlet.html}Advanced JnlpDownloadServlet Example}}. + multiple JNLP applications in the same WAR, and other more advanced features, see the {{{./advanced_jnlp_download_servlet.html}Advanced JnlpDownloadServlet Example}}. *The web.xml diff --git a/webstart-maven-plugin/src/site/apt/examples/war_bundle_1.apt b/webstart-maven-plugin/src/site/apt/examples/war_bundle_1.apt index cdf2bf1e..6481219f 100644 --- a/webstart-maven-plugin/src/site/apt/examples/war_bundle_1.apt +++ b/webstart-maven-plugin/src/site/apt/examples/war_bundle_1.apt @@ -38,7 +38,7 @@ Example WAR Bundle #1 Because the JNLP projects have no knowledge of the webapp project, they don't need to be treated any differently from a normal standalone JNLP project as described - in the {{{single_webstart_app.html}Single webstart application example}}. Follow the instructions in that example + in the {{{./single_webstart_app.html}Single webstart application example}}. Follow the instructions in that example to create the and projects. They can be deployed to any repository that the webapp project will have access to. diff --git a/webstart-maven-plugin/src/site/site.xml b/webstart-maven-plugin/src/site/site.xml index ce2bde9f..fa838abc 100644 --- a/webstart-maven-plugin/src/site/site.xml +++ b/webstart-maven-plugin/src/site/site.xml @@ -30,7 +30,7 @@ - + diff --git a/webstart-pack200-api/pom.xml b/webstart-pack200-api/pom.xml index a901404f..4aea4661 100644 --- a/webstart-pack200-api/pom.xml +++ b/webstart-pack200-api/pom.xml @@ -2,8 +2,8 @@ 4.0.0 org.codehaus.mojo - webstart-parent - 1.0-beta-4-SNAPSHOT + webstart + 1.0-beta-3-SNAPSHOT webstart-pack200-api diff --git a/webstart-pack200-impl/pom.xml b/webstart-pack200-impl/pom.xml index a6e70e38..655e8015 100644 --- a/webstart-pack200-impl/pom.xml +++ b/webstart-pack200-impl/pom.xml @@ -2,8 +2,8 @@ 4.0.0 org.codehaus.mojo - webstart-parent - 1.0-beta-4-SNAPSHOT + webstart + 1.0-beta-3-SNAPSHOT webstart-pack200-impl From 8184b66077493208a3c2adb46c212fc2b71a3ddc Mon Sep 17 00:00:00 2001 From: Tony Chemit Date: Mon, 6 Feb 2012 14:54:35 +0000 Subject: [PATCH 3/5] fix it build git-svn-id: file:///home/tiste/MOJOHAUS-TO-GIT/SVN-MOJO-WIP/trunk/mojo/webstart@15900 52ab4f32-60fc-0310-b215-8acea882cd1b --- webstart-maven-plugin/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/webstart-maven-plugin/pom.xml b/webstart-maven-plugin/pom.xml index 47a11c15..be7ed6c7 100644 --- a/webstart-maven-plugin/pom.xml +++ b/webstart-maven-plugin/pom.xml @@ -292,6 +292,7 @@ src/it/settings.xml ${project.build.directory}/local-repo validate.groovy + true From c87248690ac896e8ae6ce72dab6046e0c102f55e Mon Sep 17 00:00:00 2001 From: Tony Chemit Date: Mon, 6 Feb 2012 15:33:14 +0000 Subject: [PATCH 4/5] use a fixed webstart-jnlp-servlet dependecy in webstart-m-p its git-svn-id: file:///home/tiste/MOJOHAUS-TO-GIT/SVN-MOJO-WIP/trunk/mojo/webstart@15901 52ab4f32-60fc-0310-b215-8acea882cd1b --- pom.xml | 2 +- webstart-maven-plugin/pom.xml | 4 ++-- webstart-maven-plugin/src/it/it002/pom.xml | 5 ++--- webstart-maven-plugin/src/it/it002/webapp/pom.xml | 2 +- webstart-maven-plugin/src/it/it003/pom.xml | 4 ++-- webstart-maven-plugin/src/it/it003/webapp/pom.xml | 2 +- webstart-maven-plugin/src/it/settings.xml | 5 +++++ 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index a0c04e4a..eee19f93 100644 --- a/pom.xml +++ b/pom.xml @@ -87,8 +87,8 @@ webstart-pack200-api - webstart-jnlp-servlet webstart-maven-plugin + webstart-jnlp-servlet diff --git a/webstart-maven-plugin/pom.xml b/webstart-maven-plugin/pom.xml index be7ed6c7..dd2285ee 100644 --- a/webstart-maven-plugin/pom.xml +++ b/webstart-maven-plugin/pom.xml @@ -117,12 +117,12 @@ test - + org.apache.maven.shared diff --git a/webstart-maven-plugin/src/it/it002/pom.xml b/webstart-maven-plugin/src/it/it002/pom.xml index 05e2f0ec..dbad39cb 100644 --- a/webstart-maven-plugin/src/it/it002/pom.xml +++ b/webstart-maven-plugin/src/it/it002/pom.xml @@ -19,10 +19,9 @@ - org.codehaus.mojo - + org.codehaus.mojo.webstart webstart-jnlp-servlet - @project.version@ + ${webstartJnlpServletVersion} runtime diff --git a/webstart-maven-plugin/src/it/it002/webapp/pom.xml b/webstart-maven-plugin/src/it/it002/webapp/pom.xml index 3ad3e66b..e1929e70 100644 --- a/webstart-maven-plugin/src/it/it002/webapp/pom.xml +++ b/webstart-maven-plugin/src/it/it002/webapp/pom.xml @@ -25,7 +25,7 @@ - org.codehaus.mojo + org.codehaus.mojo.webstart webstart-jnlp-servlet diff --git a/webstart-maven-plugin/src/it/it003/pom.xml b/webstart-maven-plugin/src/it/it003/pom.xml index 6e8fe587..f981ac04 100644 --- a/webstart-maven-plugin/src/it/it003/pom.xml +++ b/webstart-maven-plugin/src/it/it003/pom.xml @@ -19,9 +19,9 @@ - org.codehaus.mojo + org.codehaus.mojo.webstart webstart-jnlp-servlet - @project.version@ + ${webstartJnlpServletVersion} runtime diff --git a/webstart-maven-plugin/src/it/it003/webapp/pom.xml b/webstart-maven-plugin/src/it/it003/webapp/pom.xml index 61caeba1..a0ee3b85 100644 --- a/webstart-maven-plugin/src/it/it003/webapp/pom.xml +++ b/webstart-maven-plugin/src/it/it003/webapp/pom.xml @@ -25,7 +25,7 @@ - org.codehaus.mojo + org.codehaus.mojo.webstart webstart-jnlp-servlet diff --git a/webstart-maven-plugin/src/it/settings.xml b/webstart-maven-plugin/src/it/settings.xml index 4e20f55a..236ea45e 100644 --- a/webstart-maven-plugin/src/it/settings.xml +++ b/webstart-maven-plugin/src/it/settings.xml @@ -22,6 +22,11 @@ true + + + 1.0-6.0.02_ea_b02.2 + + local.central From db67fba01b3634307d9edf4aa0ae6957f27d3d30 Mon Sep 17 00:00:00 2001 From: Tony Chemit Date: Mon, 6 Feb 2012 15:36:12 +0000 Subject: [PATCH 5/5] [maven-release-plugin] prepare release webstart-1.0-beta-3 git-svn-id: file:///home/tiste/MOJOHAUS-TO-GIT/SVN-MOJO-WIP/trunk/mojo/webstart@15902 52ab4f32-60fc-0310-b215-8acea882cd1b --- pom.xml | 8 ++++---- webstart-jnlp-servlet/pom.xml | 2 +- webstart-maven-plugin/pom.xml | 4 ++-- webstart-pack200-api/pom.xml | 2 +- webstart-pack200-impl/pom.xml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index eee19f93..366022cf 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.codehaus.mojo webstart pom - 1.0-beta-3-SNAPSHOT + 1.0-beta-3 MWEBSTART :: Project Webstart Maven Plugin and related modules http://mojo.codehaus.org/webstart @@ -33,9 +33,9 @@ - https://svn.codehaus.org/mojo/trunk/mojo/webstart - scm:svn:https://svn.codehaus.org/mojo/trunk/mojo/webstart - scm:svn:https://svn.codehaus.org/mojo/trunk/mojo/webstart + https://svn.codehaus.org/mojo/tags/webstart-1.0-beta-3 + scm:svn:https://svn.codehaus.org/mojo/tags/webstart-1.0-beta-3 + scm:svn:https://svn.codehaus.org/mojo/tags/webstart-1.0-beta-3 diff --git a/webstart-jnlp-servlet/pom.xml b/webstart-jnlp-servlet/pom.xml index 78a598d7..24d87683 100644 --- a/webstart-jnlp-servlet/pom.xml +++ b/webstart-jnlp-servlet/pom.xml @@ -4,7 +4,7 @@ org.codehaus.mojo webstart - 1.0-beta-3-SNAPSHOT + 1.0-beta-3 webstart-jnlp-servlet diff --git a/webstart-maven-plugin/pom.xml b/webstart-maven-plugin/pom.xml index dd2285ee..3afbfdc1 100644 --- a/webstart-maven-plugin/pom.xml +++ b/webstart-maven-plugin/pom.xml @@ -3,12 +3,12 @@ org.codehaus.mojo webstart - 1.0-beta-3-SNAPSHOT + 1.0-beta-3 org.codehaus.mojo webstart-maven-plugin - 1.0-beta-3-SNAPSHOT + 1.0-beta-3 maven-plugin MWEBSTART :: Webstart Maven Plugin Maven plugin that supports webstart application development. Helps generate JNLP files and supports the diff --git a/webstart-pack200-api/pom.xml b/webstart-pack200-api/pom.xml index 4aea4661..d2410302 100644 --- a/webstart-pack200-api/pom.xml +++ b/webstart-pack200-api/pom.xml @@ -3,7 +3,7 @@ org.codehaus.mojo webstart - 1.0-beta-3-SNAPSHOT + 1.0-beta-3 webstart-pack200-api diff --git a/webstart-pack200-impl/pom.xml b/webstart-pack200-impl/pom.xml index 655e8015..f8b22b7c 100644 --- a/webstart-pack200-impl/pom.xml +++ b/webstart-pack200-impl/pom.xml @@ -3,7 +3,7 @@ org.codehaus.mojo webstart - 1.0-beta-3-SNAPSHOT + 1.0-beta-3 webstart-pack200-impl