Skip to content

Commit 36f5ab0

Browse files
author
Tony Chemit
committed
[maven-release-plugin] copy for tag webstart-1.0-beta-3
git-svn-id: file:///home/tiste/MOJOHAUS-TO-GIT/SVN-MOJO-WIP/tags/webstart-1.0-beta-3@15903 52ab4f32-60fc-0310-b215-8acea882cd1b
2 parents c870a27 + db67fba commit 36f5ab0

File tree

19 files changed

+46
-38
lines changed

19 files changed

+46
-38
lines changed

‎pom.xml

+2-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</parent>
77
<modelVersion>4.0.0</modelVersion>
88
<groupId>org.codehaus.mojo</groupId>
9-
<artifactId>webstart-parent</artifactId>
9+
<artifactId>webstart</artifactId>
1010
<packaging>pom</packaging>
1111
<version>1.0-beta-3</version>
1212
<name>MWEBSTART :: Project</name>
@@ -87,8 +87,8 @@
8787

8888
<modules>
8989
<module>webstart-pack200-api</module>
90-
<module>webstart-jnlp-servlet</module>
9190
<module>webstart-maven-plugin</module>
91+
<module>webstart-jnlp-servlet</module>
9292
</modules>
9393

9494
<properties>
@@ -99,8 +99,6 @@
9999

100100
<!-- all modules shares the same version in our projects -->
101101
<autoVersionSubmodules>true</autoVersionSubmodules>
102-
<!-- make sure tag name is webstart-XXX -->
103-
<tagNameFormat>webstart-@{project.version}</tagNameFormat>
104102
</properties>
105103

106104
<profiles>

‎src/site/apt/index.apt

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99

1010
Webstart Maven Plugin
1111

12-
This set of modules provide functionality related to the {{{./webstart-maven-plugin}Webstart Maven Plugin}}.
12+
This set of modules provide functionality related to the
13+
{{{./webstart-maven-plugin}Webstart Maven Plugin}}.
1314

1415
* Note since version 1.0-beta-3
1516

‎webstart-jnlp-servlet/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<parent>
55
<groupId>org.codehaus.mojo</groupId>
6-
<artifactId>webstart-parent</artifactId>
6+
<artifactId>webstart</artifactId>
77
<version>1.0-beta-3</version>
88
</parent>
99

‎webstart-maven-plugin/pom.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<parent>
44
<groupId>org.codehaus.mojo</groupId>
5-
<artifactId>webstart-parent</artifactId>
5+
<artifactId>webstart</artifactId>
66
<version>1.0-beta-3</version>
77
</parent>
88

@@ -117,12 +117,12 @@
117117
<scope>test</scope>
118118
</dependency>
119119

120-
<dependency>
120+
<!--dependency>
121121
<groupId>org.codehaus.mojo</groupId>
122122
<artifactId>webstart-jnlp-servlet</artifactId>
123123
<version>${project.version}</version>
124124
<scope>test</scope>
125-
</dependency>
125+
</dependency-->
126126

127127
<dependency>
128128
<groupId>org.apache.maven.shared</groupId>
@@ -292,6 +292,7 @@
292292
<settingsFile>src/it/settings.xml</settingsFile>
293293
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
294294
<postBuildHookScript>validate.groovy</postBuildHookScript>
295+
<addTestClassPath>true</addTestClassPath>
295296
</configuration>
296297
<executions>
297298
<execution>

‎webstart-maven-plugin/src/it/it002/pom.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@
1919
<dependencies>
2020

2121
<dependency>
22-
<groupId>org.codehaus.mojo</groupId>
23-
<!--groupId>com.sun.java.jnlp</groupId-->
22+
<groupId>org.codehaus.mojo.webstart</groupId>
2423
<artifactId>webstart-jnlp-servlet</artifactId>
25-
<version>@project.version@</version>
24+
<version>${webstartJnlpServletVersion}</version>
2625
<scope>runtime</scope>
2726
</dependency>
2827

‎webstart-maven-plugin/src/it/it002/webapp/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
<dependencies>
2727
<dependency>
28-
<groupId>org.codehaus.mojo</groupId>
28+
<groupId>org.codehaus.mojo.webstart</groupId>
2929
<artifactId>webstart-jnlp-servlet</artifactId>
3030
</dependency>
3131

‎webstart-maven-plugin/src/it/it003/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<dependencies>
2020

2121
<dependency>
22-
<groupId>org.codehaus.mojo</groupId>
22+
<groupId>org.codehaus.mojo.webstart</groupId>
2323
<artifactId>webstart-jnlp-servlet</artifactId>
24-
<version>@project.version@</version>
24+
<version>${webstartJnlpServletVersion}</version>
2525
<scope>runtime</scope>
2626
</dependency>
2727

‎webstart-maven-plugin/src/it/it003/webapp/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<dependencies>
2626

2727
<dependency>
28-
<groupId>org.codehaus.mojo</groupId>
28+
<groupId>org.codehaus.mojo.webstart</groupId>
2929
<artifactId>webstart-jnlp-servlet</artifactId>
3030
</dependency>
3131

‎webstart-maven-plugin/src/it/settings.xml

+5
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@
2222
<activation>
2323
<activeByDefault>true</activeByDefault>
2424
</activation>
25+
<properties>
26+
<webstartJnlpServletVersion>
27+
1.0-6.0.02_ea_b02.2
28+
</webstartJnlpServletVersion>
29+
</properties>
2530
<repositories>
2631
<repository>
2732
<id>local.central</id>

‎webstart-maven-plugin/src/site/apt/contributors.apt

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ Notes to users and contributors
1616

1717
* More generally some work is going to be done to make the JNLP goals configuration more compatible.
1818

19-
2019
* Reported missing features
2120

2221
* {{{http://jira.codehaus.org/browse/MWEBSTART-25} A mojo for deploying the bundles to a remote server}}

‎webstart-maven-plugin/src/site/apt/examples/keystore_gen.apt

+8-4
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,16 @@ Keystore generation and usage
1010

1111
To deliver signed applications, one usually needs to generate a keystore.
1212

13-
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}}.
13+
One can use the keytool command line program delivered as part of the SDK.
14+
Another way to create the keystore is to use the
15+
{{{http://mojo.codehaus.org/keytool/}Keytool Project}} via his nice java api.
1416

15-
* Keytool as part of the Keystore Maven Plugin
17+
* Keytool as part of the Keytool Maven Plugin
1618

17-
See the {{{http://mojo.codehaus.org/keytool-maven-plugin/}Keytool Maven Plugin}} documentation.
19+
See the {{{http://mojo.codehaus.org/keytool/keytool-maven-plugin/}Keytool Maven Plugin}} documentation.
1820

1921
* Keytool as part of the Webstart Maven Plugin
2022

21-
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).
23+
One can make the Webstart Plugin generate a new keystore at each build.
24+
This can be convenient for demos and other less production critical projects
25+
(where signing needs to be done appropriately).

‎webstart-maven-plugin/src/site/apt/examples/more_examples.apt

-12
This file was deleted.

‎webstart-maven-plugin/src/site/apt/examples/more_examples.apt.vm

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
------
2+
More examples
3+
------
4+
Jerome Lacoste
5+
------
6+
2008-09-23
7+
------
8+
9+
More examples
10+
11+
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}}.
12+

‎webstart-maven-plugin/src/site/apt/examples/pluggable_jar_signing.apt

+1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ Using an external JAR signer
1212

1313
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.
1414

15+
This was deprecated, since 1.0-beta-2, perharps I did not see the point ?
1516
~~ FIXME further describe here and move to an integration test

‎webstart-maven-plugin/src/site/apt/examples/simple_jnlp_download_servlet.apt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Simple JnlpDownloadServlet Example
1010

1111
In this example, we show how to use the plugin to deploy a single JNLP application within a WAR that uses
1212
the JnlpDownloadServlet. Only the most basic features are described. For a more complex example that includes
13-
multiple JNLP applications in the same WAR, and other more advanced features, see the {{{advanced_jnlp_download_servlet.html}Advanced JnlpDownloadServlet Example}}.
13+
multiple JNLP applications in the same WAR, and other more advanced features, see the {{{./advanced_jnlp_download_servlet.html}Advanced JnlpDownloadServlet Example}}.
1414

1515
*The web.xml
1616

‎webstart-maven-plugin/src/site/apt/examples/war_bundle_1.apt

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Example WAR Bundle #1
3838

3939
Because the JNLP projects have no knowledge of the webapp project, they don't need
4040
to be treated any differently from a normal standalone JNLP project as described
41-
in the {{{single_webstart_app.html}Single webstart application example}}. Follow the instructions in that example
41+
in the {{{./single_webstart_app.html}Single webstart application example}}. Follow the instructions in that example
4242
to create the <sample-jnlp1> and <sample-jnlp2> projects. They can be deployed
4343
to any repository that the webapp project will have access to.
4444

‎webstart-maven-plugin/src/site/site.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<item name="Advanced" href="examples/advanced_jnlp_download_servlet.html" />
3131
</item>
3232
<!--item name="Advanced" collapse="false"-->
33-
<item name="Advanced: Pluggable JAR signing" href="examples/pluggable_jar_signing.html" />
33+
<!--item name="Advanced: Pluggable JAR signing" href="examples/pluggable_jar_signing.html" /-->
3434
<!--/item-->
3535
<item name="More examples" href="examples/more_examples.html" />
3636
</menu>

‎webstart-pack200-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<parent>
44
<groupId>org.codehaus.mojo</groupId>
5-
<artifactId>webstart-parent</artifactId>
5+
<artifactId>webstart</artifactId>
66
<version>1.0-beta-3</version>
77
</parent>
88

‎webstart-pack200-impl/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<parent>
44
<groupId>org.codehaus.mojo</groupId>
5-
<artifactId>webstart-parent</artifactId>
5+
<artifactId>webstart</artifactId>
66
<version>1.0-beta-3</version>
77
</parent>
88

0 commit comments

Comments
 (0)