Author: mfortun Date: 2011-08-17 12:16:12 +0200 (Wed, 17 Aug 2011) New Revision: 1164 Url: http://nuiton.org/repositories/revision/wikitty/1164 Log: *correct synchronise to allow the use with plugin, still need other correction within the commit-update mechanism *complete deploy goal Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationSynchronize.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/WPDeployMojo.java trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPInitMojo.java trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPJarMojo.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationSynchronize.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationSynchronize.java 2011-08-17 08:50:49 UTC (rev 1163) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationSynchronize.java 2011-08-17 10:16:12 UTC (rev 1164) @@ -117,20 +117,7 @@ static public String HESSIAN_URI_PREFIX = "hessian"; - - /* - * Class don't have to be instantiate - */ - private WikittyPublicationSynchronize() { - - } - - /** - * @param args - * @throws ArgumentsParserException - */ - static public void main(String[] args) throws Exception { - + static { applicationConfig = new ApplicationConfig(); /* @@ -170,14 +157,27 @@ applicationConfig .addActionAlias("update", "org.nuiton.wikitty.publication.synchro.WikittyPublication#update"); + } + + + /* + * Class don't have to be instantiate + */ + private WikittyPublicationSynchronize() { + + } + + /** + * @param args + * @throws ArgumentsParserException + */ + static public void main(String[] args) throws Exception { // parsing applicationConfig.parse(args); - // execution applicationConfig.doAction(0); - } - + static public void synchronisation(String origin, String target) throws URISyntaxException { @@ -188,6 +188,16 @@ .getOptionAsBoolean(IS_DELETE_OPTION); boolean isExisting = applicationConfig .getOptionAsBoolean(IS_EXISTING_OPTION); + + synchronisationServices(origin, target, isRecur, isDelete, isExisting); + } + + + static public void synchronisationServices(String origin, String target, + boolean isRecur, boolean isDelete, boolean isExisting) + throws URISyntaxException { + + // update operation is the default operation boolean isUpdate = !isDelete && !isExisting; 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-17 08:50:49 UTC (rev 1163) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/AbstractWPMojo.java 2011-08-17 10:16:12 UTC (rev 1164) @@ -35,6 +35,10 @@ */ public abstract class AbstractWPMojo extends AbstractPlugin { + static public String SRC_DIR_NAME = "src"; + static public String MAIN_DIR_NAME = "main"; + + /** * Project. * Modified: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPDeployMojo.java =================================================================== --- trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPDeployMojo.java 2011-08-17 08:50:49 UTC (rev 1163) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPDeployMojo.java 2011-08-17 10:16:12 UTC (rev 1164) @@ -24,9 +24,11 @@ */ package org.nuiton.wikitty.plugin; +import org.nuiton.wikitty.publication.synchro.WikittyPublicationSynchronize; + /** * To deploy a wikitty publication. - * + * * @author tchemit <chemit@codelutin.com> * @version $Id$ * @goal deploy @@ -37,17 +39,26 @@ */ public class WPDeployMojo extends AbstractWPMojo { + static public String LABEL_SEP = "."; + static public String LABEL_DELIM = "#"; + @Override protected void init() throws Exception { - //TODO + // TODO } @Override protected void doAction() throws Exception { - //TODO - getLog().info("TODO"); + // Use syncrhonise. + String origin = getProject().getBasedir().toURI().toURL() + .toExternalForm(); + origin += LABEL_DELIM + SRC_DIR_NAME + LABEL_SEP + MAIN_DIR_NAME; + String target = wikittyServiceUrl; + target += LABEL_DELIM + applicationName; + WikittyPublicationSynchronize.synchronisationServices(origin, target, true, + false, false); } } Modified: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPInitMojo.java =================================================================== --- trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPInitMojo.java 2011-08-17 08:50:49 UTC (rev 1163) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPInitMojo.java 2011-08-17 10:16:12 UTC (rev 1164) @@ -40,8 +40,7 @@ */ public class WPInitMojo extends AbstractWPMojo { - static public String SRC_DIR_NAME = "src"; - static public String MAIN_DIR_NAME = "main"; + static public String APPLICATION_DIR_NAME = "wp"; static public String RESSOURCES_DIR_NAME = "ressources"; static public String IMAGES_RESSOURCES_DIR_NAME = "images"; Modified: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPJarMojo.java =================================================================== --- trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPJarMojo.java 2011-08-17 08:50:49 UTC (rev 1163) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPJarMojo.java 2011-08-17 10:16:12 UTC (rev 1164) @@ -44,9 +44,11 @@ @Override protected void doAction() throws Exception { - + // externalise //TODO + + } }