Author: mfortun Date: 2011-08-24 15:27:19 +0200 (Wed, 24 Aug 2011) New Revision: 1181 Url: http://nuiton.org/repositories/revision/wikitty/1181 Log: *corrections, now version for wikitty publication is a parametter for plugin *correct condition for jarclass path within evaluation Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPRunMojo.java Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java 2011-08-22 07:58:30 UTC (rev 1180) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java 2011-08-24 13:27:19 UTC (rev 1181) @@ -126,7 +126,7 @@ } sumMd5 = StringUtil.encodeMD5(sumMd5); - if (sumMd5.equals(md5ref)) { + if (!sumMd5.equals(md5ref)) { FileUtil.writeString(md5File, sumMd5); for (Wikitty w : jardatas) { String name = WikittyPubDataHelper.getName(w); 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-22 07:58:30 UTC (rev 1180) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPRunMojo.java 2011-08-24 13:27:19 UTC (rev 1181) @@ -79,7 +79,15 @@ private ArtifactFactory artifactFactory; + /** + * URL of server to use to log into server. + * + * @parameter expression="${publicationVersion}" + * @required + */ + protected String publicationVersion; + /** * Local Repository. * @@ -168,7 +176,7 @@ // metadata rather than an artifact in 2.1? Artifact artifact = artifactFactory.createArtifactWithClassifier( PUBLICATION_WAR_GROUP_ID, PUBLICATION_WAR_ARTIFACT_ID, - project.getVersion(), DEPENDCY_TYPE_WAR, StringUtils.EMPTY); + publicationVersion, DEPENDCY_TYPE_WAR, StringUtils.EMPTY); // TODO mfortun-2011-08-18 change for version try { artifactResolver.resolve(artifact, remoteRepositories, localRepository);