Thanks for working on the webstart plugin! I might have a renewed interest in it later on, so I'll be keeping an eye on your commits.
Se comment below... On 2011-09-14 15:10, tche...@codehaus.org wrote: > Revision > 14695 <http://fisheye.codehaus.org/changelog/mojo/?cs=14695> > Author > tchemit > Date > 2011-09-14 08:10:59 -0500 (Wed, 14 Sep 2011) > > > Log Message > > MWEBSTART-168 > <http://jira.codehaus.org/secure/ViewIssue.jspa?key=MWEBSTART-168> Make mojo > and reports unified > > > Modified Paths > > * > trunk/mojo/webstart/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/AbstractBaseJnlpMojo.java > > <#trunkmojowebstartwebstartmavenpluginsrcmainjavaorgcodehausmojowebstartAbstractBaseJnlpMojojava> > * > trunk/mojo/webstart/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/JnlpReportMojo.java > > <#trunkmojowebstartwebstartmavenpluginsrcmainjavaorgcodehausmojowebstartJnlpReportMojojava> > > > Diff > > > Modified: > > trunk/mojo/webstart/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/AbstractBaseJnlpMojo.java > (14694 => 14695) > > --- > trunk/mojo/webstart/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/AbstractBaseJnlpMojo.java > 2011-09-14 13:10:36 UTC (rev 14694) > +++ > trunk/mojo/webstart/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/AbstractBaseJnlpMojo.java > 2011-09-14 13:10:59 UTC (rev 14695) > @@ -189,7 +189,7 @@ > /** > * The code base to use on the generated jnlp files. > * > - * @parameter expression="${jnlp.codebase}" > default-value="${project.url}" > + * @parameter expression="${jnlp.codebase}" > default-value="${project.url}/jnlp" > * @since 1.0-beta-2 > **/ > private String codebase; > > > Modified: > > trunk/mojo/webstart/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/JnlpReportMojo.java > (14694 => 14695) > > --- > trunk/mojo/webstart/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/JnlpReportMojo.java > 2011-09-14 13:10:36 UTC (rev 14694) > +++ > trunk/mojo/webstart/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/JnlpReportMojo.java > 2011-09-14 13:10:59 UTC (rev 14695) > @@ -44,9 +44,9 @@ > extends AbstractMavenReport > { > /** > - * Location where generated html will be created. > + * Location where the site is generated. > * > - * @parameter default-value="${project.build.directory}/site" > + * @parameter default-value="${project.reporting.outputDirectory}" > */ > private File outputDirectory; > > @@ -79,9 +79,17 @@ There's a typo in the expression and variable name here. It should be siteJnlpDirectory, with a 'p' in it. > /** > * Directory in the site directory where the jnlp artifacts and jnlp > sources files reside. > * > - * @parameter default-value="jnlp/launch.jnlp" > + * @parameter expression="${jnlp.siteJnlDirectory}" default-value="jnlp" > * @required > */ > + private String siteJnlDirectory; > + > + /** > + * Name of the main jnlp file of the project. > + * > + * @parameter expression="${jnlp.siteJnlpFile}" > default-value="launch.jnlp" > + * @required > + */ > private String siteJnlpFile; > > /** > @@ -95,7 +103,7 @@ > /** > * The code base to use on the generated jnlp files. > * > - * @parameter expression="${jnlp.codebase}" > default-value="${project.url}" > + * @parameter expression="${jnlp.codebase}" > default-value="${project.url}/jnlp" > * @since 1.0-beta-2 > * > */ > @@ -117,7 +125,7 @@ > } > try > { > - File destinationDirectory = new File( outputDirectory, > siteJnlpFile ).getParentFile(); > + File destinationDirectory = new File( outputDirectory, > siteJnlDirectory); > List files = FileUtils.getFiles( jnlpSourceDirectory, "**/*", "" > ); > for ( Iterator i = files.iterator(); i.hasNext(); ) > { > @@ -144,15 +152,16 @@ > > private void fillReport( Locale locale ) > { > + ResourceBundle bundle = getBundle( locale ); > getSink().head(); > - getSink().text( getBundle( locale ).getString( > "report.jnlp-report.description" ) ); > + getSink().text( bundle.getString( "report.jnlp-report.description" ) > ); > getSink().head_(); > getSink().body(); > getSink().sectionTitle1(); > - getSink().text( getBundle( locale ).getString( > "report.jnlp-report.label.installation.header" ) ); > + getSink().text( bundle.getString( > "report.jnlp-report.label.installation.header" ) ); > getSink().sectionTitle1_(); > getSink().paragraph(); > - getSink().text( getBundle( locale ).getString( > "report.jnlp-report.label.installation.description" ) ); > + getSink().text( bundle.getString( > "report.jnlp-report.label.installation.description" ) ); > getSink().paragraph_(); > getSink().paragraph(); > if ( codebase.startsWith( "file://" ) ) > @@ -169,20 +178,20 @@ > } > getSink().link( codebase + siteJnlpFile ); > > - getSink().text( getBundle( locale ).getString( > "report.jnlp-report.label.installation.webStartMeNow" ) ); > + getSink().text( bundle.getString( > "report.jnlp-report.label.installation.webStartMeNow" ) ); > getSink().link_(); > getSink().paragraph_(); > getSink().paragraph(); > - getSink().text( getBundle( locale ).getString( > "report.jnlp-report.label.installation.getJava" ) + " " ); > + getSink().text( bundle.getString( > "report.jnlp-report.label.installation.getJava" ) + " " ); > getSink().link( "http://java.com"; ); > getSink().text( "http://java.com"; ); > getSink().link_(); > getSink().paragraph_(); > getSink().sectionTitle1(); > - getSink().text( getBundle( locale ).getString( > "report.jnlp-report.label.uninstallation.header" ) ); > + getSink().text( bundle.getString( > "report.jnlp-report.label.uninstallation.header" ) ); > getSink().sectionTitle1_(); > getSink().paragraph(); > - getSink().text( getBundle( locale ).getString( > "report.jnlp-report.label.uninstallation.description" ) ); > + getSink().text( bundle.getString( > "report.jnlp-report.label.uninstallation.description" ) ); > getSink().paragraph_(); > getSink().body_(); > getSink().flush(); > > ------------------------------------------------------------------------ > > To unsubscribe from this list please visit: > > http://xircles.codehaus.org/manage_email > -- Dennis Lundberg --------------------------------------------------------------------- To unsubscribe from this list, please visit: http://xircles.codehaus.org/manage_email
