Author: mfortun Date: 2011-08-22 09:58:30 +0200 (Mon, 22 Aug 2011) New Revision: 1180 Url: http://nuiton.org/repositories/revision/wikitty/1180 Log: *correct mavenplugin deploy jar *change variable result to wp_result *wikitty service on jar correct init when there no jar in his directory Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/AbstractWPMojo.java trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPDeployJarMojo.java trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPRunMojo.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java 2011-08-19 16:31:12 UTC (rev 1179) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java 2011-08-22 07:58:30 UTC (rev 1180) @@ -43,8 +43,8 @@ static { defaultFilterOption = new FilterOption(); - defaultFilterOption.setOpeningTemplate("var result=\""); - defaultFilterOption.setWriteString("result"); + defaultFilterOption.setOpeningTemplate("var wp_result=\""); + defaultFilterOption.setWriteString("wp_result"); defaultFilterOption.setStringDelim("\""); defaultFilterOption.setConcatChar("+"); defaultFilterOption.setEndingCar(";"); Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java 2011-08-19 16:31:12 UTC (rev 1179) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java 2011-08-22 07:58:30 UTC (rev 1180) @@ -84,7 +84,8 @@ public WikittyServiceJarLoader(ApplicationConfig config) { mimeHelper = new MimeTypePubHelper(); dirLocation = config.getOption(JAR_LOCATION_KEY); - MD5 = StringUtils.EMPTY; + index = new HashMap<JarFile, WikittyPropertieIndex>(); + MD5 = StringUtil.encodeMD5(StringUtils.EMPTY); constructIndex(); } @@ -98,8 +99,10 @@ // TODO mfortun-2011-08-18 BAD solution: need a notifier system // to allow service to rebuild his index String sumMd5 = StringUtils.EMPTY; - for (File jf : jarFiles){ - sumMd5+=jf.getAbsolutePath(); + if (jarFiles!=null){ + for (File jf : jarFiles){ + sumMd5+=jf.getAbsolutePath(); + } } sumMd5 = StringUtil.encodeMD5(sumMd5); // check if md5 is equal to the last reindaxtion Modified: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/AbstractWPMojo.java =================================================================== --- trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/AbstractWPMojo.java 2011-08-19 16:31:12 UTC (rev 1179) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/AbstractWPMojo.java 2011-08-22 07:58:30 UTC (rev 1180) @@ -52,7 +52,6 @@ * A flag to activate verbose mode. * * @parameter expression="${wp.verbose}" default-value="${maven.verbose}" - * @since 1.2.5 */ protected boolean verbose; @@ -61,7 +60,6 @@ * * @parameter expression="${wp.applicationName}" * @required - * @since 1.2.5 */ protected String applicationName; @@ -70,7 +68,6 @@ * * @parameter expression="${wp.wikittyServiceUrl}" * @required - * @since 1.2.5 */ protected String wikittyServiceUrl; Modified: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPDeployJarMojo.java =================================================================== --- trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPDeployJarMojo.java 2011-08-19 16:31:12 UTC (rev 1179) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPDeployJarMojo.java 2011-08-22 07:58:30 UTC (rev 1180) @@ -112,7 +112,6 @@ * Defaults to "true". * * @parameter expression="${maven.site.chmod}" default-value="true" - * @since 2.1 */ protected boolean chmod; @@ -121,7 +120,6 @@ * Defaults to "g+w,a+rX". * * @parameter expression="${maven.site.chmod.mode}" default-value="g+w,a+rX" - * @since 2.1 */ protected String chmodMode; @@ -130,7 +128,6 @@ * Defaults to "-Rf". * * @parameter expression="${maven.site.chmod.options}" default-value="-Rf" - * @since 2.1 */ protected String chmodOptions; @@ -150,7 +147,6 @@ * @parameter expression="${session}" * @required * @readonly - * @since 3.0-beta-2 */ protected MavenSession mavenSession; @@ -173,16 +169,26 @@ protected Wagon wagon; + /** + * file to deploy + * + * @parameter expression="${fileToDeploy}" + * @required + */ protected File fileToDeploy; @Override protected void init() throws Exception { - String file = getProject().getBuild().getDirectory(); - file+=File.separator+WPJarMojo.EXTERNALIZE_PREFIX+applicationName+".jar"; - fileToDeploy= new File(file); + + if (fileToDeploy==null || !fileToDeploy.exists()){ + String file = getProject().getBuild().getDirectory(); + file+=File.separator+WPJarMojo.EXTERNALIZE_PREFIX+applicationName+".jar"; + fileToDeploy= new File(file); + } + repository = new Repository( serverId, serverUrl Modified: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPRunMojo.java =================================================================== --- trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPRunMojo.java 2011-08-19 16:31:12 UTC (rev 1179) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPRunMojo.java 2011-08-22 07:58:30 UTC (rev 1180) @@ -86,7 +86,6 @@ * @parameter expression="${localRepository}" * @required * @readonly - * @since 1.0.0 */ protected ArtifactRepository localRepository; @@ -96,7 +95,6 @@ * @parameter expression="${project.remoteArtifactRepositories}" * @required * @readonly - * @since 1.0.0 */ protected List remoteRepositories;