Author: mfortun Date: 2011-08-17 12:28:39 +0200 (Wed, 17 Aug 2011) New Revision: 1165 Url: http://nuiton.org/repositories/revision/wikitty/1165 Log: *reorganise Static values Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConstant.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.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 Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConstant.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConstant.java 2011-08-17 10:16:12 UTC (rev 1164) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConstant.java 2011-08-17 10:28:39 UTC (rev 1165) @@ -21,9 +21,9 @@ */ static final public String WIKITTY_VAR = "wpWikitty"; + static final public String LABEL_DELIM = "#"; - } 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-17 10:16:12 UTC (rev 1164) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java 2011-08-17 10:28:39 UTC (rev 1165) @@ -424,7 +424,7 @@ for (int i = 0; i < namPath.length - 1; i++) { label += namPath[i]; if (i < namPath.length - 2) { - label += WikittyPublicationFileSystem.WIKITTYLABEL_SEPARATOR; + label += WikittyFileUtil.WIKITTY_LABEL_SEPARATOR; } } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-08-17 10:16:12 UTC (rev 1164) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-08-17 10:28:39 UTC (rev 1165) @@ -37,6 +37,7 @@ import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; +import org.nuiton.wikitty.entities.WikittyField; import org.nuiton.wikitty.entities.WikittyImpl; import org.nuiton.wikitty.entities.WikittyLabel; import org.nuiton.wikitty.entities.WikittyLabelHelper; @@ -78,8 +79,8 @@ final static Log log = LogFactory .getLog(WikittyPublicationFileSystem.class); - static public String WIKITTYLABEL_SEPARATOR = "."; + /** * The working directory of the wikitty service */ @@ -966,7 +967,7 @@ if (child.isDirectory() && !child.getName().equals(PROPERTY_DIRECTORY)) { harvestNewCheckModificationsAndDeleted(child, label - + WIKITTYLABEL_SEPARATOR + child.getName()); + + WikittyFileUtil.WIKITTY_LABEL_SEPARATOR + child.getName()); } else if (!child.isDirectory()) { // list all of the file non dir listChildFileNonDir.add(child.getName()); 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 10:16:12 UTC (rev 1164) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/AbstractWPMojo.java 2011-08-17 10:28:39 UTC (rev 1165) @@ -38,7 +38,6 @@ 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 10:16:12 UTC (rev 1164) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPDeployMojo.java 2011-08-17 10:28:39 UTC (rev 1165) @@ -24,6 +24,8 @@ */ package org.nuiton.wikitty.plugin; +import org.nuiton.wikitty.publication.WikittyFileUtil; +import org.nuiton.wikitty.publication.WikittyPublicationConstant; import org.nuiton.wikitty.publication.synchro.WikittyPublicationSynchronize; /** @@ -39,9 +41,6 @@ */ public class WPDeployMojo extends AbstractWPMojo { - static public String LABEL_SEP = "."; - static public String LABEL_DELIM = "#"; - @Override protected void init() throws Exception { // TODO @@ -53,12 +52,13 @@ // Use syncrhonise. String origin = getProject().getBasedir().toURI().toURL() .toExternalForm(); - origin += LABEL_DELIM + SRC_DIR_NAME + LABEL_SEP + MAIN_DIR_NAME; + origin += WikittyPublicationConstant.LABEL_DELIM + SRC_DIR_NAME + + WikittyFileUtil.WIKITTY_LABEL_SEPARATOR + MAIN_DIR_NAME; String target = wikittyServiceUrl; - target += LABEL_DELIM + applicationName; + target += WikittyPublicationConstant.LABEL_DELIM + applicationName; - WikittyPublicationSynchronize.synchronisationServices(origin, target, true, - false, false); + WikittyPublicationSynchronize.synchronisationServices(origin, target, + true, false, false); } }